From 27f97044032c1a841fe0644046a81599d598759c Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Wed, 23 Oct 2024 14:08:32 -0400
Subject: [PATCH 001/451] chore: Remove unused script (#12597)

It has been replaced with a go script.
https://github.com/ethereum-optimism/optimism/blob/rm/check-ifaces-sh/packages/contracts-bedrock/scripts/checks/interfaces/main.go#L1
---
 .../scripts/checks/check-interfaces.sh        | 286 ------------------
 1 file changed, 286 deletions(-)
 delete mode 100755 packages/contracts-bedrock/scripts/checks/check-interfaces.sh

diff --git a/packages/contracts-bedrock/scripts/checks/check-interfaces.sh b/packages/contracts-bedrock/scripts/checks/check-interfaces.sh
deleted file mode 100755
index a2cda470d2a8..000000000000
--- a/packages/contracts-bedrock/scripts/checks/check-interfaces.sh
+++ /dev/null
@@ -1,286 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Warn users of Mac OSX who have not ever upgraded bash from the default that they may experience
-# performance issues.
-if [ "${BASH_VERSINFO[0]}" -lt 5 ]; then
-    echo "WARNING: your bash installation is very old, and may cause this script to run extremely slowly. Please upgrade bash to at least version 5 if you have performance issues."
-fi
-
-# This script checks for ABI consistency between interfaces and their corresponding contracts.
-# It compares the ABIs of interfaces (files starting with 'I') with their implementation contracts,
-# excluding certain predefined files. Constructors are expected to be represented in interfaces by a
-# pseudo-constructor function `__constructor__(...)` with arguments the same as the contract's constructor.
-# The script reports any differences found and exits with an error if inconsistencies are detected.
-# NOTE: Script is fast enough but could be parallelized if necessary.
-
-# Parse flags
-no_diff=false
-if [[ "${1:-}" == "--no-diff" ]]; then
-    no_diff=true
-fi
-
-# Grab the directory of the contracts-bedrock package
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-CONTRACTS_BASE=$(dirname "$(dirname "$SCRIPT_DIR")")
-
-# Define contracts that should be excluded from the check
-EXCLUDE_CONTRACTS=(
-    # External dependencies
-    "IERC20"
-    "IERC721"
-    "IERC721Enumerable"
-    "IERC721Upgradeable"
-    "IERC721Metadata"
-    "IERC165"
-    "IERC165Upgradeable"
-    "ERC721TokenReceiver"
-    "ERC1155TokenReceiver"
-    "ERC777TokensRecipient"
-    "Guard"
-    "IProxy"
-    "Vm"
-    "VmSafe"
-    "IMulticall3"
-    "IERC721TokenReceiver"
-    "IProxyCreationCallback"
-    "IBeacon"
-
-    # EAS
-    "IEAS"
-    "ISchemaResolver"
-    "ISchemaRegistry"
-
-    # TODO: Interfaces that need to be fixed are below this line
-    # ----------------------------------------------------------
-
-    # Inlined interface, needs to be replaced.
-    "IInitializable"
-
-    # Missing various functions.
-    "IPreimageOracle"
-    "ILegacyMintableERC20"
-    "IOptimismMintableERC20"
-    "IOptimismMintableERC721"
-
-    # Doesn't start with "I"
-    "KontrolCheatsBase"
-
-    # Currently inherit from interface, needs to be fixed.
-    "IWETH"
-    "IDelayedWETH"
-    "ISuperchainWETH"
-    "IL2ToL2CrossDomainMessenger"
-    "ICrossL2Inbox"
-    "ISystemConfigInterop"
-
-    # Enums need to be normalized
-    "ISequencerFeeVault"
-    "IBaseFeeVault"
-    "IL1FeeVault"
-    "IFeeVault"
-
-    # Solidity complains about receive but contract doens't have it.
-    "IResolvedDelegateProxy"
-)
-
-# Find all JSON files in the forge-artifacts folder
-JSON_FILES=$(find "$CONTRACTS_BASE/forge-artifacts" -type f -name "*.json")
-
-# Initialize a flag to track if any issues are detected
-issues_detected=false
-
-# Create a temporary file to store files that have already been reported
-REPORTED_INTERFACES_FILE=$(mktemp)
-
-# Clean up the temporary file on exit
-cleanup() {
-    rm -f "$REPORTED_INTERFACES_FILE"
-}
-
-# Trap exit and error signals and call cleanup function
-trap cleanup EXIT ERR
-
-# Check if a contract is excluded
-is_excluded() {
-    for exclude in "${EXCLUDE_CONTRACTS[@]}"; do
-        if [[ "$exclude" == "$1" ]]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-# Iterate over all JSON files
-for interface_file in $JSON_FILES; do
-    # Grab the contract name from the file name
-    contract_name=$(basename "$interface_file" .json | cut -d '.' -f 1)
-
-    # Extract all contract definitions in a single pass
-    contract_definitions=$(jq -r '.ast.nodes[] | select(.nodeType == "ContractDefinition") | "\(.contractKind),\(.name)"' "$interface_file")
-
-    # Continue if no contract definitions are found
-    # Can happen in Solidity files that don't declare any contracts/interfaces
-    if [ -z "$contract_definitions" ]; then
-        continue
-    fi
-
-    # Iterate over the found contract definitions and figure out which one
-    # matches the file name. We do this so that we can figure out if this is an
-    # interface or a contract based on the contract kind.
-    found=false
-    contract_temp=""
-    contract_kind=""
-    for definition in $contract_definitions; do
-        IFS=',' read -r contract_kind contract_temp <<< "$definition"
-        if [[ "$contract_name" == "$contract_temp" ]]; then
-            found=true
-            break
-        fi
-    done
-
-    # Continue if no matching contract name is found. Can happen in Solidity
-    # files where no contracts/interfaces are defined with the same name as the
-    # file. Still OK because a separate artifact *will* be generated for the
-    # specific contract/interface.
-    if [ "$found" = false ]; then
-        continue
-    fi
-
-    # If contract kind is not "interface", skip the file
-    if [ "$contract_kind" != "interface" ]; then
-        continue
-    fi
-
-    # If contract name does not start with an "I", throw an error
-    if [[ "$contract_name" != I* ]]; then
-        if ! grep -q "^$contract_name$" "$REPORTED_INTERFACES_FILE"; then
-            echo "$contract_name" >> "$REPORTED_INTERFACES_FILE"
-            if ! is_excluded "$contract_name"; then
-                echo "Issue found in ABI for interface $contract_name from file $interface_file."
-                echo "Interface $contract_name does not start with 'I'."
-                issues_detected=true
-            fi
-        fi
-        continue
-    fi
-
-    # Extract contract semver
-    contract_semver=$(jq -r '.ast.nodes[] | select(.nodeType == "PragmaDirective") | .literals | join("")' "$interface_file")
-
-    # If semver is not exactly "solidity^0.8.0", throw an error
-    if [ "$contract_semver" != "solidity^0.8.0" ]; then
-        if ! grep -q "^$contract_name$" "$REPORTED_INTERFACES_FILE"; then
-            echo "$contract_name" >> "$REPORTED_INTERFACES_FILE"
-            if ! is_excluded "$contract_name"; then
-                echo "Issue found in ABI for interface $contract_name from file $interface_file."
-                echo "Interface $contract_name does not have correct compiler version (MUST be exactly solidity ^0.8.0)."
-                issues_detected=true
-            fi
-        fi
-        continue
-    fi
-
-    # Construct the corresponding contract name by removing the leading "I"
-    contract_basename=${contract_name:1}
-    corresponding_contract_file="$CONTRACTS_BASE/forge-artifacts/$contract_basename.sol/$contract_basename.json"
-
-    # Skip the file if the corresponding contract file does not exist
-    if [ ! -f "$corresponding_contract_file" ]; then
-        continue
-    fi
-
-    # Extract and compare ABIs excluding constructors
-    interface_abi=$(jq '[.abi[]]' < "$interface_file")
-    contract_abi=$(jq '[.abi[]]' < "$corresponding_contract_file")
-
-    # Function to normalize ABI by replacing interface name with contract name.
-    # Base contracts aren't allowed to inherit from their interfaces in order
-    # to guarantee a 1:1 match between interfaces and contracts. This means
-    # that the interface will redefine types in the base contract. We normalize
-    # the ABI as if the interface and contract are the same name.
-    normalize_abi() {
-        # Here we just remove the leading "I" from any contract, enum, or
-        # struct type. It's not beautiful but it's good enough for now. It
-        # would miss certain edge cases like if an interface really is using
-        # the contract type instead of the interface type but that's unlikely
-        # to happen in practice and should be an easy fix if it does.
-        local abi="$1"
-
-        # Remove the leading "I" from types.
-        abi="${abi//\"internalType\": \"contract I/\"internalType\": \"contract }"
-        abi="${abi//\"internalType\": \"enum I/\"internalType\": \"enum }"
-        abi="${abi//\"internalType\": \"struct I/\"internalType\": \"struct }"
-
-        # Handle translating pseudo-constructors.
-        abi=$(echo "$abi" | jq 'map(if .type == "function" and .name == "__constructor__" then .type = "constructor" | del(.name) | del(.outputs) else . end)')
-
-        echo "$abi"
-    }
-
-    # Normalize the ABIs
-    normalized_interface_abi=$(normalize_abi "$interface_abi")
-    normalized_contract_abi=$(normalize_abi "$contract_abi")
-
-    # Check if the contract ABI has no constructor but the interface is missing __constructor__
-    contract_has_constructor=$(echo "$normalized_contract_abi" | jq 'any(.[]; .type == "constructor")')
-    interface_has_default_pseudo_constructor=$(echo "$normalized_interface_abi" | jq 'any(.[]; .type == "constructor" and .inputs == [])')
-
-    # If any contract has no constructor and its corresponding interface also does not have one, flag it as a detected issue
-    if [ "$contract_has_constructor" = false ] && [ "$interface_has_default_pseudo_constructor" = false ]; then
-        if ! grep -q "^$contract_name$" "$REPORTED_INTERFACES_FILE"; then
-            echo "$contract_name" >> "$REPORTED_INTERFACES_FILE"
-            if ! is_excluded "$contract_name"; then
-                echo "Issue found in ABI for interface $contract_name from file $interface_file."
-                echo "Interface $contract_name must have a function named '__constructor__' as the corresponding contract has no constructor in its ABI."
-                issues_detected=true
-            fi
-        fi
-        continue
-    fi
-
-    # removes the pseudo constructor json entry from the interface files where the corresponding contract file has no constructor
-    # this is to ensure it is not flagged as a diff in the next step below
-    if [ "$contract_has_constructor" = false ] && [ "$interface_has_default_pseudo_constructor" ]; then
-      normalized_interface_abi=$(echo "$normalized_interface_abi" | jq 'map(select(.type != "constructor"))')
-    fi
-
-    # Use jq to compare the ABIs
-    if ! diff_result=$(diff -u <(echo "$normalized_interface_abi" | jq 'sort') <(echo "$normalized_contract_abi" | jq 'sort')); then
-        if ! grep -q "^$contract_name$" "$REPORTED_INTERFACES_FILE"; then
-            echo "$contract_name" >> "$REPORTED_INTERFACES_FILE"
-            if ! is_excluded "$contract_name"; then
-                echo "Issue found in ABI for interface $contract_name from file $interface_file."
-                echo "Differences found in ABI between interface $contract_name and actual contract $contract_basename."
-                if [ "$no_diff" = false ]; then
-                    echo "$diff_result"
-                fi
-                issues_detected=true
-            fi
-        fi
-        continue
-    fi
-done
-
-# Check for unnecessary exclusions
-for exclude_item in "${EXCLUDE_CONTRACTS[@]}"; do
-    if ! grep -q "^$exclude_item$" "$REPORTED_INTERFACES_FILE"; then
-        echo "Warning: $exclude_item is in the exclude list but WAS NOT reported as an issue. It"
-        echo "may be unnecessary in the EXCLUDE_CONTRACTS list, but you MUST verify this before"
-        echo "removing it by performing a clean and full build before re-running this script."
-    fi
-done
-
-# Fail the script if any issues were detected
-if [ "$issues_detected" = true ]; then
-    echo "Issues were detected while validating interface files."
-    echo "If the interface is an external dependency or should otherwise be excluded from this"
-    echo "check, add the interface name to the EXCLUDE_CONTRACTS list in the script. This will prevent"
-    echo "the script from comparing it against a corresponding contract."
-    echo "IMPORTANT: Interface files are NOT yet generated automatically. You must fix any"
-    echo "listed discrepancies manually by updating the specified interface file. Automated"
-    echo "interface generation is dependent on a few Forge bug fixes."
-    exit 1
-else
-    exit 0
-fi

From d67991a3fc4f0a755cb507a33bca0b6c111c83fd Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Thu, 24 Oct 2024 04:23:18 +1000
Subject: [PATCH 002/451] op-dispute-mon: Use game data from previous update
 cycle if update fails (#12481)

---
 op-dispute-mon/metrics/metrics.go            | 15 +++-
 op-dispute-mon/metrics/noop.go               |  2 +
 op-dispute-mon/mon/extract/extractor.go      | 22 ++++--
 op-dispute-mon/mon/extract/extractor_test.go | 78 ++++++++++++++++----
 op-dispute-mon/mon/monitor.go                | 35 +++------
 op-dispute-mon/mon/monitor_test.go           | 75 +++++--------------
 op-dispute-mon/mon/service.go                | 17 ++---
 op-dispute-mon/mon/types/types.go            |  1 +
 op-dispute-mon/mon/update_times.go           | 34 +++++++++
 op-dispute-mon/mon/update_times_test.go      | 43 +++++++++++
 10 files changed, 208 insertions(+), 114 deletions(-)
 create mode 100644 op-dispute-mon/mon/update_times.go
 create mode 100644 op-dispute-mon/mon/update_times_test.go

diff --git a/op-dispute-mon/metrics/metrics.go b/op-dispute-mon/metrics/metrics.go
index b76c23c4ca26..aa8cd9947905 100644
--- a/op-dispute-mon/metrics/metrics.go
+++ b/op-dispute-mon/metrics/metrics.go
@@ -183,6 +183,8 @@ type Metricer interface {
 
 	RecordL2Challenges(agreement bool, count int)
 
+	RecordOldestGameUpdateTime(t time.Time)
+
 	caching.Metrics
 	contractMetrics.ContractMetricer
 }
@@ -215,7 +217,8 @@ type Metrics struct {
 	credits                   prometheus.GaugeVec
 	honestWithdrawableAmounts prometheus.GaugeVec
 
-	lastOutputFetch prometheus.Gauge
+	lastOutputFetch      prometheus.Gauge
+	oldestGameUpdateTime prometheus.Gauge
 
 	gamesAgreement             prometheus.GaugeVec
 	latestValidProposalL2Block prometheus.Gauge
@@ -269,6 +272,12 @@ func NewMetrics() *Metrics {
 			Name:      "last_output_fetch",
 			Help:      "Timestamp of the last output fetch",
 		}),
+		oldestGameUpdateTime: factory.NewGauge(prometheus.GaugeOpts{
+			Namespace: Namespace,
+			Name:      "oldest_game_update_time",
+			Help: "Timestamp the least recently updated game " +
+				"or the time of the last update cycle if there were no games in the monitoring window",
+		}),
 		honestActorClaims: *factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: Namespace,
 			Name:      "honest_actor_claims",
@@ -499,6 +508,10 @@ func (m *Metrics) RecordOutputFetchTime(timestamp float64) {
 	m.lastOutputFetch.Set(timestamp)
 }
 
+func (m *Metrics) RecordOldestGameUpdateTime(t time.Time) {
+	m.oldestGameUpdateTime.Set(float64(t.Unix()))
+}
+
 func (m *Metrics) RecordGameAgreement(status GameAgreementStatus, count int) {
 	m.gamesAgreement.WithLabelValues(labelValuesFor(status)...).Set(float64(count))
 }
diff --git a/op-dispute-mon/metrics/noop.go b/op-dispute-mon/metrics/noop.go
index 6b4982ff26ba..4459fdd9c1fb 100644
--- a/op-dispute-mon/metrics/noop.go
+++ b/op-dispute-mon/metrics/noop.go
@@ -36,6 +36,8 @@ func (*NoopMetricsImpl) RecordWithdrawalRequests(_ common.Address, _ bool, _ int
 
 func (*NoopMetricsImpl) RecordOutputFetchTime(_ float64) {}
 
+func (*NoopMetricsImpl) RecordOldestGameUpdateTime(_ time.Time) {}
+
 func (*NoopMetricsImpl) RecordGameAgreement(_ GameAgreementStatus, _ int) {}
 
 func (*NoopMetricsImpl) RecordLatestValidProposalL2Block(_ uint64) {}
diff --git a/op-dispute-mon/mon/extract/extractor.go b/op-dispute-mon/mon/extract/extractor.go
index d19cab340b66..c40b31ccb6c5 100644
--- a/op-dispute-mon/mon/extract/extractor.go
+++ b/op-dispute-mon/mon/extract/extractor.go
@@ -9,9 +9,11 @@ import (
 
 	gameTypes "github.com/ethereum-optimism/optimism/op-challenger/game/types"
 	monTypes "github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
+	"github.com/ethereum-optimism/optimism/op-service/clock"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+	"golang.org/x/exp/maps"
 )
 
 var (
@@ -29,20 +31,23 @@ type Enricher interface {
 
 type Extractor struct {
 	logger         log.Logger
+	clock          clock.Clock
 	createContract CreateGameCaller
 	fetchGames     FactoryGameFetcher
 	maxConcurrency int
 	enrichers      []Enricher
 	ignoredGames   map[common.Address]bool
+	latestGameData map[common.Address]*monTypes.EnrichedGameData
 }
 
-func NewExtractor(logger log.Logger, creator CreateGameCaller, fetchGames FactoryGameFetcher, ignoredGames []common.Address, maxConcurrency uint, enrichers ...Enricher) *Extractor {
+func NewExtractor(logger log.Logger, cl clock.Clock, creator CreateGameCaller, fetchGames FactoryGameFetcher, ignoredGames []common.Address, maxConcurrency uint, enrichers ...Enricher) *Extractor {
 	ignored := make(map[common.Address]bool)
 	for _, game := range ignoredGames {
 		ignored[game] = true
 	}
 	return &Extractor{
 		logger:         logger,
+		clock:          cl,
 		createContract: creator,
 		fetchGames:     fetchGames,
 		maxConcurrency: int(maxConcurrency),
@@ -61,7 +66,6 @@ func (e *Extractor) Extract(ctx context.Context, blockHash common.Hash, minTimes
 }
 
 func (e *Extractor) enrichGames(ctx context.Context, blockHash common.Hash, games []gameTypes.GameMetadata) ([]*monTypes.EnrichedGameData, int, int) {
-	var enrichedGames []*monTypes.EnrichedGameData
 	var ignored atomic.Int32
 	var failed atomic.Int32
 
@@ -101,8 +105,14 @@ func (e *Extractor) enrichGames(ctx context.Context, blockHash common.Hash, game
 		}()
 	}
 
-	// Push each game into the channel
+	// Create a new store for game data. This ensures any games no longer in the monitoring set are dropped.
+	updatedGameData := make(map[common.Address]*monTypes.EnrichedGameData)
+	// Push each game into the channel and store the latest cached game data as a default if fetching fails
 	for _, game := range games {
+		previousData := e.latestGameData[game.Proxy]
+		if previousData != nil {
+			updatedGameData[game.Proxy] = previousData
+		}
 		gameCh <- game
 	}
 	close(gameCh)
@@ -112,9 +122,10 @@ func (e *Extractor) enrichGames(ctx context.Context, blockHash common.Hash, game
 
 	// Read the results
 	for enrichedGame := range enrichedCh {
-		enrichedGames = append(enrichedGames, enrichedGame)
+		updatedGameData[enrichedGame.Proxy] = enrichedGame
 	}
-	return enrichedGames, int(ignored.Load()), int(failed.Load())
+	e.latestGameData = updatedGameData
+	return maps.Values(updatedGameData), int(ignored.Load()), int(failed.Load())
 }
 
 func (e *Extractor) enrichGame(ctx context.Context, blockHash common.Hash, game gameTypes.GameMetadata) (*monTypes.EnrichedGameData, error) {
@@ -138,6 +149,7 @@ func (e *Extractor) enrichGame(ctx context.Context, blockHash common.Hash, game
 		enrichedClaims[i] = monTypes.EnrichedClaim{Claim: claim}
 	}
 	enrichedGame := &monTypes.EnrichedGameData{
+		LastUpdateTime:        e.clock.Now(),
 		GameMetadata:          game,
 		L1Head:                meta.L1Head,
 		L2BlockNumber:         meta.L2BlockNum,
diff --git a/op-dispute-mon/mon/extract/extractor_test.go b/op-dispute-mon/mon/extract/extractor_test.go
index 361aeb57420e..ee4b8a63ee25 100644
--- a/op-dispute-mon/mon/extract/extractor_test.go
+++ b/op-dispute-mon/mon/extract/extractor_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
 	monTypes "github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
+	"github.com/ethereum-optimism/optimism/op-service/clock"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
 	"github.com/stretchr/testify/require"
 
@@ -26,7 +27,7 @@ var (
 
 func TestExtractor_Extract(t *testing.T) {
 	t.Run("FetchGamesError", func(t *testing.T) {
-		extractor, _, games, _ := setupExtractorTest(t)
+		extractor, _, games, _, _ := setupExtractorTest(t)
 		games.err = errors.New("boom")
 		_, _, _, err := extractor.Extract(context.Background(), common.Hash{}, 0)
 		require.ErrorIs(t, err, games.err)
@@ -34,7 +35,7 @@ func TestExtractor_Extract(t *testing.T) {
 	})
 
 	t.Run("CreateGameErrorLog", func(t *testing.T) {
-		extractor, creator, games, logs := setupExtractorTest(t)
+		extractor, creator, games, logs, _ := setupExtractorTest(t)
 		games.games = []gameTypes.GameMetadata{{}}
 		creator.err = errors.New("boom")
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
@@ -50,7 +51,7 @@ func TestExtractor_Extract(t *testing.T) {
 	})
 
 	t.Run("MetadataFetchErrorLog", func(t *testing.T) {
-		extractor, creator, games, logs := setupExtractorTest(t)
+		extractor, creator, games, logs, _ := setupExtractorTest(t)
 		games.games = []gameTypes.GameMetadata{{}}
 		creator.caller.metadataErr = errors.New("boom")
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
@@ -66,7 +67,7 @@ func TestExtractor_Extract(t *testing.T) {
 	})
 
 	t.Run("ClaimsFetchErrorLog", func(t *testing.T) {
-		extractor, creator, games, logs := setupExtractorTest(t)
+		extractor, creator, games, logs, _ := setupExtractorTest(t)
 		games.games = []gameTypes.GameMetadata{{}}
 		creator.caller.claimsErr = errors.New("boom")
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
@@ -82,7 +83,7 @@ func TestExtractor_Extract(t *testing.T) {
 	})
 
 	t.Run("Success", func(t *testing.T) {
-		extractor, creator, games, _ := setupExtractorTest(t)
+		extractor, creator, games, _, _ := setupExtractorTest(t)
 		games.games = []gameTypes.GameMetadata{{}}
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
 		require.NoError(t, err)
@@ -97,7 +98,7 @@ func TestExtractor_Extract(t *testing.T) {
 
 	t.Run("EnricherFails", func(t *testing.T) {
 		enricher := &mockEnricher{err: errors.New("whoops")}
-		extractor, _, games, logs := setupExtractorTest(t, enricher)
+		extractor, _, games, logs, _ := setupExtractorTest(t, enricher)
 		games.games = []gameTypes.GameMetadata{{}}
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
 		require.NoError(t, err)
@@ -110,7 +111,7 @@ func TestExtractor_Extract(t *testing.T) {
 
 	t.Run("EnricherSuccess", func(t *testing.T) {
 		enricher := &mockEnricher{}
-		extractor, _, games, _ := setupExtractorTest(t, enricher)
+		extractor, _, games, _, _ := setupExtractorTest(t, enricher)
 		games.games = []gameTypes.GameMetadata{{}}
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
 		require.NoError(t, err)
@@ -123,8 +124,8 @@ func TestExtractor_Extract(t *testing.T) {
 	t.Run("MultipleEnrichersMultipleGames", func(t *testing.T) {
 		enricher1 := &mockEnricher{}
 		enricher2 := &mockEnricher{}
-		extractor, _, games, _ := setupExtractorTest(t, enricher1, enricher2)
-		games.games = []gameTypes.GameMetadata{{}, {}}
+		extractor, _, games, _, _ := setupExtractorTest(t, enricher1, enricher2)
+		games.games = []gameTypes.GameMetadata{{Proxy: common.Address{0xaa}}, {Proxy: common.Address{0xbb}}}
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
 		require.NoError(t, err)
 		require.Zero(t, ignored)
@@ -136,7 +137,7 @@ func TestExtractor_Extract(t *testing.T) {
 
 	t.Run("IgnoreGames", func(t *testing.T) {
 		enricher1 := &mockEnricher{}
-		extractor, _, games, logs := setupExtractorTest(t, enricher1)
+		extractor, _, games, logs, _ := setupExtractorTest(t, enricher1)
 		// Two games, one of which is ignored
 		games.games = []gameTypes.GameMetadata{{Proxy: ignoredGames[0]}, {Proxy: common.Address{0xaa}}}
 		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
@@ -152,6 +153,47 @@ func TestExtractor_Extract(t *testing.T) {
 			testlog.NewMessageFilter("Ignoring game"),
 			testlog.NewAttributesFilter("game", ignoredGames[0].Hex())))
 	})
+
+	t.Run("UseCachedValueOnFailure", func(t *testing.T) {
+		enricher := &mockEnricher{}
+		extractor, _, games, _, cl := setupExtractorTest(t, enricher)
+		gameA := common.Address{0xaa}
+		gameB := common.Address{0xbb}
+		games.games = []gameTypes.GameMetadata{{Proxy: gameA}, {Proxy: gameB}}
+
+		// First fetch succeeds and the results should be cached
+		enriched, ignored, failed, err := extractor.Extract(context.Background(), common.Hash{}, 0)
+		require.NoError(t, err)
+		require.Zero(t, ignored)
+		require.Zero(t, failed)
+		require.Len(t, enriched, 2)
+		require.Equal(t, 2, enricher.calls)
+		firstUpdateTime := cl.Now()
+		require.Equal(t, firstUpdateTime, enriched[0].LastUpdateTime)
+		require.Equal(t, firstUpdateTime, enriched[1].LastUpdateTime)
+
+		cl.AdvanceTime(2 * time.Minute)
+		secondUpdateTime := cl.Now()
+		enricher.action = func(game *monTypes.EnrichedGameData) error {
+			if game.Proxy == gameA {
+				return errors.New("boom")
+			}
+			// Updated games will have a different status
+			game.Status = gameTypes.GameStatusChallengerWon
+			return nil
+		}
+		// Second fetch fails for one of the two games, it's cached value should be used.
+		enriched, ignored, failed, err = extractor.Extract(context.Background(), common.Hash{}, 0)
+		require.NoError(t, err)
+		require.Zero(t, ignored)
+		require.Equal(t, 1, failed)
+		require.Len(t, enriched, 2)
+		require.Equal(t, 4, enricher.calls)
+		require.Equal(t, enriched[0].Status, gameTypes.GameStatusInProgress)    // Uses cached value from game A
+		require.Equal(t, enriched[1].Status, gameTypes.GameStatusChallengerWon) // Updates game B
+		require.Equal(t, firstUpdateTime, enriched[0].LastUpdateTime)
+		require.Equal(t, secondUpdateTime, enriched[1].LastUpdateTime)
+	})
 }
 
 func verifyLogs(t *testing.T, logs *testlog.CapturingHandler, createErr, metadataErr, claimsErr, durationErr int) {
@@ -170,20 +212,22 @@ func verifyLogs(t *testing.T, logs *testlog.CapturingHandler, createErr, metadat
 	require.Len(t, l, durationErr)
 }
 
-func setupExtractorTest(t *testing.T, enrichers ...Enricher) (*Extractor, *mockGameCallerCreator, *mockGameFetcher, *testlog.CapturingHandler) {
+func setupExtractorTest(t *testing.T, enrichers ...Enricher) (*Extractor, *mockGameCallerCreator, *mockGameFetcher, *testlog.CapturingHandler, *clock.DeterministicClock) {
 	logger, capturedLogs := testlog.CaptureLogger(t, log.LvlDebug)
 	games := &mockGameFetcher{}
 	caller := &mockGameCaller{rootClaim: mockRootClaim}
 	creator := &mockGameCallerCreator{caller: caller}
+	cl := clock.NewDeterministicClock(time.Unix(48294294, 58))
 	extractor := NewExtractor(
 		logger,
+		cl,
 		creator.CreateGameCaller,
 		games.FetchGames,
 		ignoredGames,
 		5,
 		enrichers...,
 	)
-	return extractor, creator, games, capturedLogs
+	return extractor, creator, games, capturedLogs, cl
 }
 
 type mockGameFetcher struct {
@@ -311,11 +355,15 @@ func (m *mockGameCaller) IsResolved(_ context.Context, _ rpcblock.Block, claims
 }
 
 type mockEnricher struct {
-	err   error
-	calls int
+	err    error
+	calls  int
+	action func(game *monTypes.EnrichedGameData) error
 }
 
-func (m *mockEnricher) Enrich(_ context.Context, _ rpcblock.Block, _ GameCaller, _ *monTypes.EnrichedGameData) error {
+func (m *mockEnricher) Enrich(_ context.Context, _ rpcblock.Block, _ GameCaller, game *monTypes.EnrichedGameData) error {
 	m.calls++
+	if m.action != nil {
+		return m.action(game)
+	}
 	return m.err
 }
diff --git a/op-dispute-mon/mon/monitor.go b/op-dispute-mon/mon/monitor.go
index 039255608c73..5f7764adccbd 100644
--- a/op-dispute-mon/mon/monitor.go
+++ b/op-dispute-mon/mon/monitor.go
@@ -14,8 +14,6 @@ import (
 )
 
 type ForecastResolution func(games []*types.EnrichedGameData, ignoredCount, failedCount int)
-type Bonds func(games []*types.EnrichedGameData)
-type Resolutions func(games []*types.EnrichedGameData)
 type Monitor func(games []*types.EnrichedGameData)
 type BlockHashFetcher func(ctx context.Context, number *big.Int) (common.Hash, error)
 type BlockNumberFetcher func(ctx context.Context) (uint64, error)
@@ -38,11 +36,7 @@ type gameMonitor struct {
 	monitorInterval time.Duration
 
 	forecast         ForecastResolution
-	bonds            Bonds
-	resolutions      Resolutions
-	claims           Monitor
-	withdrawals      Monitor
-	l2Challenges     Monitor
+	monitors         []Monitor
 	extract          Extract
 	fetchBlockHash   BlockHashFetcher
 	fetchBlockNumber BlockNumberFetcher
@@ -55,16 +49,11 @@ func newGameMonitor(
 	metrics MonitorMetrics,
 	monitorInterval time.Duration,
 	gameWindow time.Duration,
-	forecast ForecastResolution,
-	bonds Bonds,
-	resolutions Resolutions,
-	claims Monitor,
-	withdrawals Monitor,
-	l2Challenges Monitor,
-	extract Extract,
-	fetchBlockNumber BlockNumberFetcher,
 	fetchBlockHash BlockHashFetcher,
-) *gameMonitor {
+	fetchBlockNumber BlockNumberFetcher,
+	extract Extract,
+	forecast ForecastResolution,
+	monitors ...Monitor) *gameMonitor {
 	return &gameMonitor{
 		logger:           logger,
 		clock:            cl,
@@ -74,11 +63,7 @@ func newGameMonitor(
 		monitorInterval:  monitorInterval,
 		gameWindow:       gameWindow,
 		forecast:         forecast,
-		bonds:            bonds,
-		resolutions:      resolutions,
-		claims:           claims,
-		withdrawals:      withdrawals,
-		l2Challenges:     l2Challenges,
+		monitors:         monitors,
 		extract:          extract,
 		fetchBlockNumber: fetchBlockNumber,
 		fetchBlockHash:   fetchBlockHash,
@@ -101,12 +86,10 @@ func (m *gameMonitor) monitorGames() error {
 	if err != nil {
 		return fmt.Errorf("failed to load games: %w", err)
 	}
-	m.resolutions(enrichedGames)
 	m.forecast(enrichedGames, ignored, failed)
-	m.bonds(enrichedGames)
-	m.claims(enrichedGames)
-	m.withdrawals(enrichedGames)
-	m.l2Challenges(enrichedGames)
+	for _, monitor := range m.monitors {
+		monitor(enrichedGames)
+	}
 	timeTaken := m.clock.Since(start)
 	m.metrics.RecordMonitorDuration(timeTaken)
 	m.logger.Info("Completed monitoring update", "blockNumber", blockNumber, "blockHash", blockHash, "duration", timeTaken, "games", len(enrichedGames), "ignored", ignored, "failed", failed)
diff --git a/op-dispute-mon/mon/monitor_test.go b/op-dispute-mon/mon/monitor_test.go
index 180c29bb26ce..1181c57b4ecb 100644
--- a/op-dispute-mon/mon/monitor_test.go
+++ b/op-dispute-mon/mon/monitor_test.go
@@ -25,7 +25,7 @@ func TestMonitor_MonitorGames(t *testing.T) {
 	t.Parallel()
 
 	t.Run("FailedFetchBlocknumber", func(t *testing.T) {
-		monitor, _, _, _, _, _, _, _ := setupMonitorTest(t)
+		monitor, _, _, _ := setupMonitorTest(t)
 		boom := errors.New("boom")
 		monitor.fetchBlockNumber = func(ctx context.Context) (uint64, error) {
 			return 0, boom
@@ -35,7 +35,7 @@ func TestMonitor_MonitorGames(t *testing.T) {
 	})
 
 	t.Run("FailedFetchBlockHash", func(t *testing.T) {
-		monitor, _, _, _, _, _, _, _ := setupMonitorTest(t)
+		monitor, _, _, _ := setupMonitorTest(t)
 		boom := errors.New("boom")
 		monitor.fetchBlockHash = func(ctx context.Context, number *big.Int) (common.Hash, error) {
 			return common.Hash{}, boom
@@ -45,29 +45,25 @@ func TestMonitor_MonitorGames(t *testing.T) {
 	})
 
 	t.Run("MonitorsWithNoGames", func(t *testing.T) {
-		monitor, factory, forecast, bonds, withdrawals, resolutions, claims, l2Challenges := setupMonitorTest(t)
+		monitor, factory, forecast, monitors := setupMonitorTest(t)
 		factory.games = []*monTypes.EnrichedGameData{}
 		err := monitor.monitorGames()
 		require.NoError(t, err)
 		require.Equal(t, 1, forecast.calls)
-		require.Equal(t, 1, bonds.calls)
-		require.Equal(t, 1, resolutions.calls)
-		require.Equal(t, 1, claims.calls)
-		require.Equal(t, 1, withdrawals.calls)
-		require.Equal(t, 1, l2Challenges.calls)
+		for _, m := range monitors {
+			require.Equal(t, 1, m.calls)
+		}
 	})
 
 	t.Run("MonitorsMultipleGames", func(t *testing.T) {
-		monitor, factory, forecast, bonds, withdrawals, resolutions, claims, l2Challenges := setupMonitorTest(t)
+		monitor, factory, forecast, monitors := setupMonitorTest(t)
 		factory.games = []*monTypes.EnrichedGameData{{}, {}, {}}
 		err := monitor.monitorGames()
 		require.NoError(t, err)
 		require.Equal(t, 1, forecast.calls)
-		require.Equal(t, 1, bonds.calls)
-		require.Equal(t, 1, resolutions.calls)
-		require.Equal(t, 1, claims.calls)
-		require.Equal(t, 1, withdrawals.calls)
-		require.Equal(t, 1, l2Challenges.calls)
+		for _, m := range monitors {
+			require.Equal(t, 1, m.calls)
+		}
 	})
 }
 
@@ -75,7 +71,7 @@ func TestMonitor_StartMonitoring(t *testing.T) {
 	t.Run("MonitorsGames", func(t *testing.T) {
 		addr1 := common.Address{0xaa}
 		addr2 := common.Address{0xbb}
-		monitor, factory, forecaster, _, _, _, _, _ := setupMonitorTest(t)
+		monitor, factory, forecaster, _ := setupMonitorTest(t)
 		factory.games = []*monTypes.EnrichedGameData{newEnrichedGameData(addr1, 9999), newEnrichedGameData(addr2, 9999)}
 		factory.maxSuccess = len(factory.games) // Only allow two successful fetches
 
@@ -88,7 +84,7 @@ func TestMonitor_StartMonitoring(t *testing.T) {
 	})
 
 	t.Run("FailsToFetchGames", func(t *testing.T) {
-		monitor, factory, forecaster, _, _, _, _, _ := setupMonitorTest(t)
+		monitor, factory, forecaster, _ := setupMonitorTest(t)
 		factory.fetchErr = errors.New("boom")
 
 		monitor.StartMonitoring()
@@ -110,7 +106,7 @@ func newEnrichedGameData(proxy common.Address, timestamp uint64) *monTypes.Enric
 	}
 }
 
-func setupMonitorTest(t *testing.T) (*gameMonitor, *mockExtractor, *mockForecast, *mockBonds, *mockMonitor, *mockResolutionMonitor, *mockMonitor, *mockMonitor) {
+func setupMonitorTest(t *testing.T) (*gameMonitor, *mockExtractor, *mockForecast, []*mockMonitor) {
 	logger := testlog.Logger(t, log.LvlDebug)
 	fetchBlockNum := func(ctx context.Context) (uint64, error) {
 		return 1, nil
@@ -123,37 +119,12 @@ func setupMonitorTest(t *testing.T) (*gameMonitor, *mockExtractor, *mockForecast
 	cl.Start()
 	extractor := &mockExtractor{}
 	forecast := &mockForecast{}
-	bonds := &mockBonds{}
-	resolutions := &mockResolutionMonitor{}
-	claims := &mockMonitor{}
-	withdrawals := &mockMonitor{}
-	l2Challenges := &mockMonitor{}
-	monitor := newGameMonitor(
-		context.Background(),
-		logger,
-		cl,
-		metrics.NoopMetrics,
-		monitorInterval,
-		10*time.Second,
-		forecast.Forecast,
-		bonds.CheckBonds,
-		resolutions.CheckResolutions,
-		claims.Check,
-		withdrawals.Check,
-		l2Challenges.Check,
-		extractor.Extract,
-		fetchBlockNum,
-		fetchBlockHash,
-	)
-	return monitor, extractor, forecast, bonds, withdrawals, resolutions, claims, l2Challenges
-}
-
-type mockResolutionMonitor struct {
-	calls int
-}
-
-func (m *mockResolutionMonitor) CheckResolutions(games []*monTypes.EnrichedGameData) {
-	m.calls++
+	monitor1 := &mockMonitor{}
+	monitor2 := &mockMonitor{}
+	monitor3 := &mockMonitor{}
+	monitor := newGameMonitor(context.Background(), logger, cl, metrics.NoopMetrics, monitorInterval, 10*time.Second, fetchBlockHash, fetchBlockNum,
+		extractor.Extract, forecast.Forecast, monitor1.Check, monitor2.Check, monitor3.Check)
+	return monitor, extractor, forecast, []*mockMonitor{monitor1, monitor2, monitor3}
 }
 
 type mockMonitor struct {
@@ -172,14 +143,6 @@ func (m *mockForecast) Forecast(_ []*monTypes.EnrichedGameData, _, _ int) {
 	m.calls++
 }
 
-type mockBonds struct {
-	calls int
-}
-
-func (m *mockBonds) CheckBonds(_ []*monTypes.EnrichedGameData) {
-	m.calls++
-}
-
 type mockExtractor struct {
 	fetchErr     error
 	calls        int
diff --git a/op-dispute-mon/mon/service.go b/op-dispute-mon/mon/service.go
index 8ce97b7b8dd9..083e391b9111 100644
--- a/op-dispute-mon/mon/service.go
+++ b/op-dispute-mon/mon/service.go
@@ -126,6 +126,7 @@ func (s *Service) initGameCallerCreator() {
 func (s *Service) initExtractor(cfg *config.Config) {
 	s.extractor = extract.NewExtractor(
 		s.logger,
+		s.cl,
 		s.game.CreateContract,
 		s.factoryContract.GetGamesAtOrAfter,
 		cfg.IgnoredGames,
@@ -217,23 +218,17 @@ func (s *Service) initMonitor(ctx context.Context, cfg *config.Config) {
 		return block.Hash(), nil
 	}
 	l2ChallengesMonitor := NewL2ChallengesMonitor(s.logger, s.metrics)
-	s.monitor = newGameMonitor(
-		ctx,
-		s.logger,
-		s.cl,
-		s.metrics,
-		cfg.MonitorInterval,
-		cfg.GameWindow,
+	updateTimeMonitor := NewUpdateTimeMonitor(s.cl, s.metrics)
+	s.monitor = newGameMonitor(ctx, s.logger, s.cl, s.metrics, cfg.MonitorInterval, cfg.GameWindow, blockHashFetcher,
+		s.l1Client.BlockNumber,
+		s.extractor.Extract,
 		s.forecast.Forecast,
 		s.bonds.CheckBonds,
 		s.resolutions.CheckResolutions,
 		s.claims.CheckClaims,
 		s.withdrawals.CheckWithdrawals,
 		l2ChallengesMonitor.CheckL2Challenges,
-		s.extractor.Extract,
-		s.l1Client.BlockNumber,
-		blockHashFetcher,
-	)
+		updateTimeMonitor.CheckUpdateTimes)
 }
 
 func (s *Service) Start(ctx context.Context) error {
diff --git a/op-dispute-mon/mon/types/types.go b/op-dispute-mon/mon/types/types.go
index dff06dab90bf..774ad3908cf7 100644
--- a/op-dispute-mon/mon/types/types.go
+++ b/op-dispute-mon/mon/types/types.go
@@ -18,6 +18,7 @@ type EnrichedClaim struct {
 
 type EnrichedGameData struct {
 	types.GameMetadata
+	LastUpdateTime        time.Time
 	L1Head                common.Hash
 	L1HeadNum             uint64
 	L2BlockNumber         uint64
diff --git a/op-dispute-mon/mon/update_times.go b/op-dispute-mon/mon/update_times.go
new file mode 100644
index 000000000000..3482775757b0
--- /dev/null
+++ b/op-dispute-mon/mon/update_times.go
@@ -0,0 +1,34 @@
+package mon
+
+import (
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
+	"github.com/ethereum-optimism/optimism/op-service/clock"
+)
+
+type UpdateTimeMetrics interface {
+	RecordOldestGameUpdateTime(t time.Time)
+}
+
+type UpdateTimeMonitor struct {
+	metrics UpdateTimeMetrics
+	clock   clock.Clock
+}
+
+func NewUpdateTimeMonitor(cl clock.Clock, metrics UpdateTimeMetrics) *UpdateTimeMonitor {
+	return &UpdateTimeMonitor{clock: cl, metrics: metrics}
+}
+
+func (m *UpdateTimeMonitor) CheckUpdateTimes(games []*types.EnrichedGameData) {
+	// Report the current time if there are no games
+	// Otherwise the last update time would drop to 0 when there are no games, making it appear there were errors
+	earliest := m.clock.Now()
+
+	for _, game := range games {
+		if game.LastUpdateTime.Before(earliest) {
+			earliest = game.LastUpdateTime
+		}
+	}
+	m.metrics.RecordOldestGameUpdateTime(earliest)
+}
diff --git a/op-dispute-mon/mon/update_times_test.go b/op-dispute-mon/mon/update_times_test.go
new file mode 100644
index 000000000000..a16da62b3c2e
--- /dev/null
+++ b/op-dispute-mon/mon/update_times_test.go
@@ -0,0 +1,43 @@
+package mon
+
+import (
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
+	"github.com/ethereum-optimism/optimism/op-service/clock"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUpdateTimeMonitor_NoGames(t *testing.T) {
+	m := &mockUpdateTimeMetrics{}
+	cl := clock.NewDeterministicClock(time.UnixMilli(45892))
+	monitor := NewUpdateTimeMonitor(cl, m)
+	monitor.CheckUpdateTimes(nil)
+	require.Equal(t, cl.Now(), m.oldestUpdateTime)
+
+	cl.AdvanceTime(time.Minute)
+	monitor.CheckUpdateTimes([]*types.EnrichedGameData{})
+	require.Equal(t, cl.Now(), m.oldestUpdateTime)
+}
+
+func TestUpdateTimeMonitor_ReportsOldestUpdateTime(t *testing.T) {
+	m := &mockUpdateTimeMetrics{}
+	cl := clock.NewDeterministicClock(time.UnixMilli(45892))
+	monitor := NewUpdateTimeMonitor(cl, m)
+	monitor.CheckUpdateTimes([]*types.EnrichedGameData{
+		{LastUpdateTime: time.UnixMilli(4)},
+		{LastUpdateTime: time.UnixMilli(3)},
+		{LastUpdateTime: time.UnixMilli(7)},
+		{LastUpdateTime: time.UnixMilli(9)},
+	})
+	require.Equal(t, time.UnixMilli(3), m.oldestUpdateTime)
+}
+
+type mockUpdateTimeMetrics struct {
+	oldestUpdateTime time.Time
+}
+
+func (m *mockUpdateTimeMetrics) RecordOldestGameUpdateTime(t time.Time) {
+	m.oldestUpdateTime = t
+}

From 20e35fd8540d2868aa3d5f0806da18c4e6bf16e7 Mon Sep 17 00:00:00 2001
From: John Chase <68833933+joohhnnn@users.noreply.github.com>
Date: Thu, 24 Oct 2024 04:06:27 +0800
Subject: [PATCH 003/451] MTCannon: add WakeupTraversal_WithExitedThreads test
 (#12551)

* add WakeupTraversal_WithExitedThreads

* In the TestEVM_WakeupTraversal_WithExitedThreads test, explicitly set the current active thread to exited state (activeThread.Exited = true) to test the wakeup traversal behavior when the active thread has exited && Modified test cases by resetting the active thread's index from exitedThreadIdx to avoid duplicate settings and confusion.

* setting Futex fields with varying values.
---
 .../mipsevm/tests/evm_multithreaded_test.go   | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index 813e307849db..6c297ea946d0 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -1495,6 +1495,80 @@ func TestEVM_WakeupTraversal_Full(t *testing.T) {
 	}
 }
 
+func TestEVM_WakeupTraversal_WithExitedThreads(t *testing.T) {
+	var tracer *tracing.Hooks
+	addr := Word(0x1234)
+	wakeupVal := Word(0x999)
+	cases := []struct {
+		name                  string
+		wakeupAddr            Word
+		futexAddr             Word
+		targetVal             Word
+		traverseRight         bool
+		activeStackSize       int
+		otherStackSize        int
+		exitedThreadIdx       []int
+		shouldClearWakeup     bool
+		shouldPreempt         bool
+		activeThreadFutexAddr Word
+		activeThreadFutexVal  Word
+	}{
+		{name: "Wakeable thread exists among exited threads", wakeupAddr: addr, futexAddr: addr, targetVal: wakeupVal + 1, traverseRight: false, activeStackSize: 3, otherStackSize: 1, exitedThreadIdx: []int{2}, shouldClearWakeup: false, shouldPreempt: true, activeThreadFutexAddr: addr + 8, activeThreadFutexVal: wakeupVal + 2},
+		{name: "All threads exited", wakeupAddr: addr, futexAddr: addr, targetVal: wakeupVal, traverseRight: false, activeStackSize: 3, otherStackSize: 0, exitedThreadIdx: []int{1, 2}, shouldClearWakeup: false, shouldPreempt: true, activeThreadFutexAddr: addr + 16, activeThreadFutexVal: wakeupVal + 3},
+		{name: "Exited threads, no matching futex", wakeupAddr: addr, futexAddr: addr + 4, targetVal: wakeupVal, traverseRight: false, activeStackSize: 2, otherStackSize: 1, exitedThreadIdx: []int{}, shouldClearWakeup: false, shouldPreempt: true, activeThreadFutexAddr: addr + 24, activeThreadFutexVal: wakeupVal + 4},
+		{name: "Matching addr, not wakeable, with exited threads", wakeupAddr: addr, futexAddr: addr, targetVal: wakeupVal, traverseRight: true, activeStackSize: 3, otherStackSize: 0, exitedThreadIdx: []int{1}, shouldClearWakeup: false, shouldPreempt: true, activeThreadFutexAddr: addr + 32, activeThreadFutexVal: wakeupVal + 5},
+		{name: "Non-waiting threads with exited threads", wakeupAddr: addr, futexAddr: exec.FutexEmptyAddr, targetVal: 0, traverseRight: false, activeStackSize: 2, otherStackSize: 1, exitedThreadIdx: []int{}, shouldClearWakeup: false, shouldPreempt: true, activeThreadFutexAddr: addr + 40, activeThreadFutexVal: wakeupVal + 6},
+	}
+
+	for i, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			goVm, state, contracts := setup(t, i*1000, nil)
+			mttestutil.SetupThreads(int64(i*5000), state, c.traverseRight, c.activeStackSize, c.otherStackSize)
+			step := state.Step
+
+			state.Wakeup = c.wakeupAddr
+			state.GetMemory().SetWord(c.wakeupAddr&arch.AddressMask, wakeupVal)
+
+			threads := mttestutil.GetAllThreads(state)
+			for idx, thread := range threads {
+				if slices.Contains(c.exitedThreadIdx, idx) {
+					thread.Exited = true
+				} else {
+					thread.FutexAddr = c.futexAddr
+					thread.FutexVal = c.targetVal
+					thread.FutexTimeoutStep = exec.FutexNoTimeout
+				}
+			}
+
+			activeThread := state.GetCurrentThread()
+			activeThread.Exited = true
+
+			activeThread.FutexAddr = c.activeThreadFutexAddr
+			activeThread.FutexVal = c.activeThreadFutexVal
+			activeThread.FutexTimeoutStep = exec.FutexNoTimeout
+
+			expected := mttestutil.NewExpectedMTState(state)
+			expected.Step += 1
+
+			if c.shouldClearWakeup {
+				expected.Wakeup = exec.FutexEmptyAddr
+			}
+			if c.shouldPreempt {
+				// Just preempt the current thread
+				expected.ExpectPreemption(state)
+			}
+
+			// State transition
+			var err error
+			var stepWitness *mipsevm.StepWitness
+			stepWitness, err = goVm.Step(true)
+			require.NoError(t, err)
+			expected.Validate(t, state)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+		})
+	}
+}
+
 func TestEVM_SchedQuantumThreshold(t *testing.T) {
 	var tracer *tracing.Hooks
 	cases := []struct {

From 358dd3f7d9d94cdbdd92f56c5544dc5078379d16 Mon Sep 17 00:00:00 2001
From: AgusDuha <81362284+agusduha@users.noreply.github.com>
Date: Wed, 23 Oct 2024 17:18:21 -0300
Subject: [PATCH 004/451] refactor: remove superchain erc20 modifier (#12566)

* fix: remove superchain erc20 modifier (#111)

* fix: remove superchain erc20 modifier

---------

Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com>
Co-authored-by: 0xng <ng@defi.sucks>
Co-authored-by: 0xParticle <particle@defi.sucks>
Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>

* fix: pre pr

---------

Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com>
Co-authored-by: 0xng <ng@defi.sucks>
Co-authored-by: 0xParticle <particle@defi.sucks>
Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>
---
 packages/contracts-bedrock/semver-lock.json    |  2 +-
 .../src/L2/SuperchainERC20.sol                 | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index e73dd3b4527e..433b6ce92a16 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -125,7 +125,7 @@
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-    "sourceCodeHash": "0x6a384ccfb6f2f7316c1b33873a1630b5179e52475951d31771656e06d2b11519"
+    "sourceCodeHash": "0x45b9afdc9e52c27f192673388868a803f54d8f0bffe9defd81d584642e282b6b"
   },
   "src/L2/SuperchainTokenBridge.sol": {
     "initCodeHash": "0xef7590c30630a75f105384e339e52758569c25a5aa0a5934c521e004b8f86220",
diff --git a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
index d723ed8d992b..a824dd3f9018 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
@@ -12,22 +12,18 @@ import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 ///         bridging to make it fungible across the Superchain. This construction allows the SuperchainTokenBridge to
 ///         burn and mint tokens.
 abstract contract SuperchainERC20 is ERC20, ICrosschainERC20, ISemver {
-    /// @notice A modifier that only allows the SuperchainTokenBridge to call
-    modifier onlySuperchainTokenBridge() {
-        if (msg.sender != Predeploys.SUPERCHAIN_TOKEN_BRIDGE) revert Unauthorized();
-        _;
-    }
-
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.2
+    /// @custom:semver 1.0.0-beta.3
     function version() external view virtual returns (string memory) {
-        return "1.0.0-beta.2";
+        return "1.0.0-beta.3";
     }
 
     /// @notice Allows the SuperchainTokenBridge to mint tokens.
     /// @param _to     Address to mint tokens to.
     /// @param _amount Amount of tokens to mint.
-    function crosschainMint(address _to, uint256 _amount) external onlySuperchainTokenBridge {
+    function crosschainMint(address _to, uint256 _amount) external {
+        if (msg.sender != Predeploys.SUPERCHAIN_TOKEN_BRIDGE) revert Unauthorized();
+
         _mint(_to, _amount);
 
         emit CrosschainMinted(_to, _amount);
@@ -36,7 +32,9 @@ abstract contract SuperchainERC20 is ERC20, ICrosschainERC20, ISemver {
     /// @notice Allows the SuperchainTokenBridge to burn tokens.
     /// @param _from   Address to burn tokens from.
     /// @param _amount Amount of tokens to burn.
-    function crosschainBurn(address _from, uint256 _amount) external onlySuperchainTokenBridge {
+    function crosschainBurn(address _from, uint256 _amount) external {
+        if (msg.sender != Predeploys.SUPERCHAIN_TOKEN_BRIDGE) revert Unauthorized();
+
         _burn(_from, _amount);
 
         emit CrosschainBurnt(_from, _amount);

From de38be099837055499c185e0a65917081fb72a3c Mon Sep 17 00:00:00 2001
From: AgusDuha <81362284+agusduha@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:07:04 -0300
Subject: [PATCH 005/451] refactor: rename crosschain events (#12564)

* fix: rename crosschain events (#109)

* fix: rename crosschain events

* fix: semver

---------

Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com>
Co-authored-by: 0xng <ng@defi.sucks>
Co-authored-by: 0xParticle <particle@defi.sucks>
Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>

* fix: pre pr

* fix: pre pr

---------

Co-authored-by: Disco <131301107+0xDiscotech@users.noreply.github.com>
Co-authored-by: 0xng <ng@defi.sucks>
Co-authored-by: 0xParticle <particle@defi.sucks>
Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>
---
 packages/contracts-bedrock/semver-lock.json   | 10 +++----
 .../abi/OptimismSuperchainERC20.json          |  4 +--
 .../snapshots/abi/SuperchainWETH.json         |  4 +--
 .../src/L2/OptimismSuperchainERC20.sol        |  4 +--
 .../src/L2/SuperchainERC20.sol                |  8 +++---
 .../src/L2/SuperchainWETH.sol                 |  8 +++---
 .../src/L2/interfaces/ICrosschainERC20.sol    |  4 +--
 .../test/L2/SuperchainERC20.t.sol             | 10 +++----
 .../test/L2/SuperchainWETH.t.sol              | 28 +++++++++----------
 9 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 433b6ce92a16..45944697945e 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -108,8 +108,8 @@
     "sourceCodeHash": "0x4bb08a8a9d5de37d1fb2dd8a9bcc483305510c32508f0be2d54757e6e257aedb"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0x4e25579079d73c93f1d494e1976334b77fc4ec181c67f376d8e2613c7b207f52",
-    "sourceCodeHash": "0xe41cf3b005f1ea007fc1b5f69f630be5f6ef12d6e5e94a50e3160b0ebe0a1613"
+    "initCodeHash": "0x24d85d246858d1aff78ae86c614dd0dc0f63b3326b2b662e3462c3a6f9b7965e",
+    "sourceCodeHash": "0xcb705d26e63e733051c8bd442ea69ce637a00c16d646ccc37b687b20941366fe"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
     "initCodeHash": "0x23dba3ceb9e58646695c306996c9e15251ac79acc6339c1a93d10a4c79da6dab",
@@ -125,15 +125,15 @@
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-    "sourceCodeHash": "0x45b9afdc9e52c27f192673388868a803f54d8f0bffe9defd81d584642e282b6b"
+    "sourceCodeHash": "0xba47f404e66e010ce417410476f26c704f2be4ce584cb79210bc5536a82ddb1f"
   },
   "src/L2/SuperchainTokenBridge.sol": {
     "initCodeHash": "0xef7590c30630a75f105384e339e52758569c25a5aa0a5934c521e004b8f86220",
     "sourceCodeHash": "0x4f539e9d9096d31e861982b8f751fa2d7de0849590523375cf92e175294d1036"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0x09c7efed7d6c8ae5981f6e7a75c7b8c675f73d679265d15a010844ad9b41fa9b",
-    "sourceCodeHash": "0x8d7612a71deaadfb324c4136673df96019211292ff54494fa4b7724e2e5dd22a"
+    "initCodeHash": "0xc120d1fd9edd8aa392cf112859a3a3907c3b5d55132d6a5edd80ff1d6b6baeaa",
+    "sourceCodeHash": "0x445f088aa91fafde43f558f34da4b9f85b82e6a76f8b2dec9563838eb4335928"
   },
   "src/L2/WETH.sol": {
     "initCodeHash": "0xfb253765520690623f177941c2cd9eba23e4c6d15063bccdd5e98081329d8956",
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json b/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json
index d6ad63fad9c3..24ac8a88fab4 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json
@@ -456,7 +456,7 @@
         "type": "uint256"
       }
     ],
-    "name": "CrosschainBurnt",
+    "name": "CrosschainBurn",
     "type": "event"
   },
   {
@@ -475,7 +475,7 @@
         "type": "uint256"
       }
     ],
-    "name": "CrosschainMinted",
+    "name": "CrosschainMint",
     "type": "event"
   },
   {
diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
index 59e959f9f231..d76246faf218 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
@@ -289,7 +289,7 @@
         "type": "uint256"
       }
     ],
-    "name": "CrosschainBurnt",
+    "name": "CrosschainBurn",
     "type": "event"
   },
   {
@@ -308,7 +308,7 @@
         "type": "uint256"
       }
     ],
-    "name": "CrosschainMinted",
+    "name": "CrosschainMint",
     "type": "event"
   },
   {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
index a097bb736c84..1e7cdb4a7190 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
@@ -59,8 +59,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable, ERC165 {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.7
-    string public constant override version = "1.0.0-beta.7";
+    /// @custom:semver 1.0.0-beta.8
+    string public constant override version = "1.0.0-beta.8";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
index a824dd3f9018..f18f91ad2413 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
@@ -13,9 +13,9 @@ import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 ///         burn and mint tokens.
 abstract contract SuperchainERC20 is ERC20, ICrosschainERC20, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.3
+    /// @custom:semver 1.0.0-beta.4
     function version() external view virtual returns (string memory) {
-        return "1.0.0-beta.3";
+        return "1.0.0-beta.4";
     }
 
     /// @notice Allows the SuperchainTokenBridge to mint tokens.
@@ -26,7 +26,7 @@ abstract contract SuperchainERC20 is ERC20, ICrosschainERC20, ISemver {
 
         _mint(_to, _amount);
 
-        emit CrosschainMinted(_to, _amount);
+        emit CrosschainMint(_to, _amount);
     }
 
     /// @notice Allows the SuperchainTokenBridge to burn tokens.
@@ -37,6 +37,6 @@ abstract contract SuperchainERC20 is ERC20, ICrosschainERC20, ISemver {
 
         _burn(_from, _amount);
 
-        emit CrosschainBurnt(_from, _amount);
+        emit CrosschainBurn(_from, _amount);
     }
 }
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index d27c6e7db514..a9242d9d0ab3 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -22,8 +22,8 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 ///         do not use a custom gas token.
 contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.7
-    string public constant version = "1.0.0-beta.7";
+    /// @custom:semver 1.0.0-beta.8
+    string public constant version = "1.0.0-beta.8";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
@@ -66,7 +66,7 @@ contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
             IETHLiquidity(Predeploys.ETH_LIQUIDITY).mint(_amount);
         }
 
-        emit CrosschainMinted(_to, _amount);
+        emit CrosschainMint(_to, _amount);
     }
 
     /// @notice Allows the SuperchainTokenBridge to burn tokens.
@@ -82,6 +82,6 @@ contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
             IETHLiquidity(Predeploys.ETH_LIQUIDITY).burn{ value: _amount }();
         }
 
-        emit CrosschainBurnt(_from, _amount);
+        emit CrosschainBurn(_from, _amount);
     }
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ICrosschainERC20.sol b/packages/contracts-bedrock/src/L2/interfaces/ICrosschainERC20.sol
index efdebe8f8b47..9fbfe8c65f33 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ICrosschainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ICrosschainERC20.sol
@@ -7,12 +7,12 @@ interface ICrosschainERC20 {
     /// @notice Emitted when a crosschain transfer mints tokens.
     /// @param to       Address of the account tokens are being minted for.
     /// @param amount   Amount of tokens minted.
-    event CrosschainMinted(address indexed to, uint256 amount);
+    event CrosschainMint(address indexed to, uint256 amount);
 
     /// @notice Emitted when a crosschain transfer burns tokens.
     /// @param from     Address of the account tokens are being burned from.
     /// @param amount   Amount of tokens burned.
-    event CrosschainBurnt(address indexed from, uint256 amount);
+    event CrosschainBurn(address indexed from, uint256 amount);
 
     /// @notice Mint tokens through a crosschain transfer.
     /// @param _to     Address to mint tokens to.
diff --git a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
index 07b92ae3ca7d..f814c06c76df 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
@@ -60,9 +60,9 @@ contract SuperchainERC20Test is Test {
         vm.expectEmit(address(superchainERC20));
         emit IERC20.Transfer(ZERO_ADDRESS, _to, _amount);
 
-        // Look for the emit of the `CrosschainMinted` event
+        // Look for the emit of the `CrosschainMint` event
         vm.expectEmit(address(superchainERC20));
-        emit ICrosschainERC20.CrosschainMinted(_to, _amount);
+        emit ICrosschainERC20.CrosschainMint(_to, _amount);
 
         // Call the `mint` function with the bridge caller
         vm.prank(SUPERCHAIN_TOKEN_BRIDGE);
@@ -86,7 +86,7 @@ contract SuperchainERC20Test is Test {
         superchainERC20.crosschainBurn(_from, _amount);
     }
 
-    /// @notice Tests the `burn` burns the amount and emits the `CrosschainBurnt` event.
+    /// @notice Tests the `burn` burns the amount and emits the `CrosschainBurn` event.
     function testFuzz_crosschainBurn_succeeds(address _from, uint256 _amount) public {
         // Ensure `_from` is not the zero address
         vm.assume(_from != ZERO_ADDRESS);
@@ -103,9 +103,9 @@ contract SuperchainERC20Test is Test {
         vm.expectEmit(address(superchainERC20));
         emit IERC20.Transfer(_from, ZERO_ADDRESS, _amount);
 
-        // Look for the emit of the `CrosschainBurnt` event
+        // Look for the emit of the `CrosschainBurn` event
         vm.expectEmit(address(superchainERC20));
-        emit ICrosschainERC20.CrosschainBurnt(_from, _amount);
+        emit ICrosschainERC20.CrosschainBurn(_from, _amount);
 
         // Call the `burn` function with the bridge caller
         vm.prank(SUPERCHAIN_TOKEN_BRIDGE);
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index 346631ac52ce..aa8eaab09939 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -25,10 +25,10 @@ contract SuperchainWETH_Test is CommonTest {
     event Withdrawal(address indexed src, uint256 wad);
 
     /// @notice Emitted when a crosschain transfer mints tokens.
-    event CrosschainMinted(address indexed to, uint256 amount);
+    event CrosschainMint(address indexed to, uint256 amount);
 
     /// @notice Emitted when a crosschain transfer burns tokens.
-    event CrosschainBurnt(address indexed from, uint256 amount);
+    event CrosschainBurn(address indexed from, uint256 amount);
 
     address internal constant ZERO_ADDRESS = address(0);
 
@@ -143,7 +143,7 @@ contract SuperchainWETH_Test is CommonTest {
         superchainWeth.crosschainMint(_to, _amount);
     }
 
-    /// @notice Tests the `crosschainMint` with non custom gas token succeeds and emits the `CrosschainMinted` event.
+    /// @notice Tests the `crosschainMint` with non custom gas token succeeds and emits the `CrosschainMint` event.
     function testFuzz_crosschainMint_fromBridgeNonCustomGasTokenChain_succeeds(address _to, uint256 _amount) public {
         // Ensure `_to` is not the zero address
         vm.assume(_to != ZERO_ADDRESS);
@@ -157,9 +157,9 @@ contract SuperchainWETH_Test is CommonTest {
         vm.expectEmit(address(superchainWeth));
         emit Transfer(ZERO_ADDRESS, _to, _amount);
 
-        // Look for the emit of the `CrosschainMinted` event
+        // Look for the emit of the `CrosschainMint` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainMinted(_to, _amount);
+        emit CrosschainMint(_to, _amount);
 
         // Mock the `isCustomGasToken` function to return false
         _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(false));
@@ -177,7 +177,7 @@ contract SuperchainWETH_Test is CommonTest {
         assertEq(address(superchainWeth).balance, _amount);
     }
 
-    /// @notice Tests the `crosschainMint` with custom gas token succeeds and emits the `CrosschainMinted` event.
+    /// @notice Tests the `crosschainMint` with custom gas token succeeds and emits the `CrosschainMint` event.
     function testFuzz_crosschainMint_fromBridgeCustomGasTokenChain_succeeds(address _to, uint256 _amount) public {
         // Ensure `_to` is not the zero address
         vm.assume(_to != ZERO_ADDRESS);
@@ -190,9 +190,9 @@ contract SuperchainWETH_Test is CommonTest {
         vm.expectEmit(address(superchainWeth));
         emit Transfer(ZERO_ADDRESS, _to, _amount);
 
-        // Look for the emit of the `CrosschainMinted` event
+        // Look for the emit of the `CrosschainMint` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainMinted(_to, _amount);
+        emit CrosschainMint(_to, _amount);
 
         // Mock the `isCustomGasToken` function to return false
         _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(true));
@@ -223,7 +223,7 @@ contract SuperchainWETH_Test is CommonTest {
         superchainWeth.crosschainBurn(_from, _amount);
     }
 
-    /// @notice Tests the `crosschainBurn` with non custom gas token burns the amount and emits the `CrosschainBurnt`
+    /// @notice Tests the `crosschainBurn` with non custom gas token burns the amount and emits the `CrosschainBurn`
     /// event.
     function testFuzz_crosschainBurn_fromBridgeNonCustomGasTokenChain_succeeds(address _from, uint256 _amount) public {
         // Ensure `_from` is not the zero address
@@ -243,9 +243,9 @@ contract SuperchainWETH_Test is CommonTest {
         vm.expectEmit(address(superchainWeth));
         emit Transfer(_from, ZERO_ADDRESS, _amount);
 
-        // Look for the emit of the `CrosschainBurnt` event
+        // Look for the emit of the `CrosschainBurn` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainBurnt(_from, _amount);
+        emit CrosschainBurn(_from, _amount);
 
         // Mock the `isCustomGasToken` function to return false
         _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(false));
@@ -263,7 +263,7 @@ contract SuperchainWETH_Test is CommonTest {
         assertEq(address(superchainWeth).balance, 0);
     }
 
-    /// @notice Tests the `crosschainBurn` with custom gas token burns the amount and emits the `CrosschainBurnt`
+    /// @notice Tests the `crosschainBurn` with custom gas token burns the amount and emits the `CrosschainBurn`
     /// event.
     function testFuzz_crosschainBurn_fromBridgeCustomGasTokenChain_succeeds(address _from, uint256 _amount) public {
         // Ensure `_from` is not the zero address
@@ -285,9 +285,9 @@ contract SuperchainWETH_Test is CommonTest {
         vm.expectEmit(address(superchainWeth));
         emit Transfer(_from, ZERO_ADDRESS, _amount);
 
-        // Look for the emit of the `CrosschainBurnt` event
+        // Look for the emit of the `CrosschainBurn` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainBurnt(_from, _amount);
+        emit CrosschainBurn(_from, _amount);
 
         // Expect to not call the `burn` function in the `ETHLiquidity` contract
         vm.expectCall(Predeploys.ETH_LIQUIDITY, abi.encodeCall(IETHLiquidity.burn, ()), 0);

From 7b119c533f22bd5ef86bed2455b945987ca319a9 Mon Sep 17 00:00:00 2001
From: Paul Dowman <paul@pauldowman.com>
Date: Wed, 23 Oct 2024 15:16:01 -0600
Subject: [PATCH 006/451] docs: add info about contributing to larger projects
 (#12397)

---
 CONTRIBUTING.md | 1 +
 README.md       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0534e696ff5f..c4e5686db99e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,6 +10,7 @@ You can:
 - Report issues in this repository. Great bug reports are detailed and give clear instructions for how a developer can reproduce the problem. Write good bug reports and developers will love you.
   - **IMPORTANT**: If you believe your report impacts the security of this repository, refer to the canonical [Security Policy](https://github.com/ethereum-optimism/.github/blob/master/SECURITY.md) document.
 - Fix issues that are tagged as [`D-good-first-issue`](https://github.com/ethereum-optimism/optimism/labels/D-good-first-issue) or [`S-confirmed`](https://github.com/ethereum-optimism/optimism/labels/S-confirmed).
+- Larger projects are listed on [this project board](https://github.com/orgs/ethereum-optimism/projects/31/views/9). Please talk to us if you're considering working on one of these, they may not be fully specified so it will reduce risk to discuss the approach and ensure that it's still relevant.
 - Help improve the [Optimism Developer Docs](https://github.com/ethereum-optimism/docs) by reporting issues, fixing typos, or adding missing sections.
 - Get involved in the protocol design process by joining discussions within the [OP Stack Specs](https://github.com/ethereum-optimism/specs/discussions) repository.
 
diff --git a/README.md b/README.md
index 17d74edec5ee..789b0539d8ff 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ The OP Stack is a collaborative project. By collaborating on free, open software
 
 [CONTRIBUTING.md](./CONTRIBUTING.md) contains a detailed explanation of the contributing process for this repository. Make sure to use the [Developer Quick Start](./CONTRIBUTING.md#development-quick-start) to properly set up your development environment.
 
-[Good First Issues](https://github.com/ethereum-optimism/optimism/issues?q=is:open+is:issue+label:D-good-first-issue) are a great place to look for tasks to tackle if you're not sure where to start.
+[Good First Issues](https://github.com/ethereum-optimism/optimism/issues?q=is:open+is:issue+label:D-good-first-issue) are a great place to look for tasks to tackle if you're not sure where to start, and see [CONTRIBUTING.md](./CONTRIBUTING.md) for info on larger projects.
 
 ## Security Policy and Vulnerability Reporting
 

From 239330b4b2e72b341d5d807a09a27e19ba9503e0 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 23 Oct 2024 14:37:28 -0700
Subject: [PATCH 007/451] cannon: Robust div by zero tests (#12600)

---
 cannon/mipsevm/exec/mips_instructions.go |  6 ++++++
 cannon/mipsevm/tests/evm_common_test.go  | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index af7b988c1584..1bf3849c4e3f 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -500,9 +500,15 @@ func HandleHiLo(cpu *mipsevm.CpuScalars, registers *[32]Word, fun uint32, rs Wor
 		cpu.HI = SignExtend(Word(acc>>32), 32)
 		cpu.LO = SignExtend(Word(uint32(acc)), 32)
 	case 0x1a: // div
+		if rt == 0 {
+			panic("instruction divide by zero")
+		}
 		cpu.HI = SignExtend(Word(int32(rs)%int32(rt)), 32)
 		cpu.LO = SignExtend(Word(int32(rs)/int32(rt)), 32)
 	case 0x1b: // divu
+		if rt == 0 {
+			panic("instruction divide by zero")
+		}
 		cpu.HI = SignExtend(Word(uint32(rs)%uint32(rt)), 32)
 		cpu.LO = SignExtend(Word(uint32(rs)/uint32(rt)), 32)
 	case 0x14: // dsllv
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index e204a0d96e9d..c9dfd2f09634 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -450,16 +450,16 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 		expectLo     Word
 		expectRes    Word
 		rdReg        uint32
-		expectRevert bool
+		expectRevert string
 		errMsg       string
 	}{
-		{name: "mul", funct: uint32(0x2), rs: Word(5), rt: Word(2), opcode: uint32(28), rdReg: uint32(0x8), expectRes: Word(10), expectRevert: false},                                                // mul t0, t1, t2
-		{name: "mult", funct: uint32(0x18), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00), expectRevert: false},  // mult t1, t2
-		{name: "multu", funct: uint32(0x19), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00), expectRevert: false}, // multu t1, t2
-		{name: "div", funct: uint32(0x1a), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2), expectRevert: false},                               // div t1, t2
-		{name: "div by zero", funct: uint32(0x1a), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), expectRevert: true, errMsg: "MIPS: division by zero"},                            // div t1, t2
-		{name: "divu", funct: uint32(0x1b), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2), expectRevert: false},                              // divu t1, t2
-		{name: "divu by zero", funct: uint32(0x1b), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), expectRevert: true, errMsg: "MIPS: division by zero"},                           // divu t1, t2
+		{name: "mul", funct: uint32(0x2), rs: Word(5), rt: Word(2), opcode: uint32(28), rdReg: uint32(0x8), expectRes: Word(10)},                                                                   // mul t0, t1, t2
+		{name: "mult", funct: uint32(0x18), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},                     // mult t1, t2
+		{name: "multu", funct: uint32(0x19), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},                    // multu t1, t2
+		{name: "div", funct: uint32(0x1a), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                                  // div t1, t2
+		{name: "div by zero", funct: uint32(0x1a), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), expectRevert: "instruction divide by zero", errMsg: "MIPS: division by zero"},  // div t1, t2
+		{name: "divu", funct: uint32(0x1b), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                                 // divu t1, t2
+		{name: "divu by zero", funct: uint32(0x1b), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), expectRevert: "instruction divide by zero", errMsg: "MIPS: division by zero"}, // divu t1, t2
 	}
 
 	for _, v := range versions {
@@ -477,9 +477,9 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 				state.GetRegistersRef()[baseReg] = tt.rs
 				state.GetMemory().SetUint32(0, insn)
 
-				if tt.expectRevert {
+				if tt.expectRevert != "" {
 					proofData := v.ProofGenerator(t, goVm.GetState())
-					require.Panics(t, func() {
+					require.PanicsWithValue(t, tt.expectRevert, func() {
 						_, _ = goVm.Step(
 							false)
 					})

From 93ca2941defb1579dc36375967eee55bbe5c3271 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 23 Oct 2024 15:17:05 -0700
Subject: [PATCH 008/451] cannon: Finish emulating rest of 64-bit instructions
 (#12483)

* cannon: Finish emulating rest of 64-bit instructions

This fixes the 64-bit stubs for various instructions (except lld/scd).

* review comments; fix dmult

* add todo

* test div by zero

* add a couple more dmultu tests

* remove dead code

* cannon: Fix remaining mips64 emulation bugs

* fix 64-bit Makefile build script; review comments

* fix build script
---
 cannon/Makefile                               |   4 +-
 cannon/mipsevm/README.md                      |   1 +
 cannon/mipsevm/arch/arch32.go                 |   2 +
 cannon/mipsevm/arch/arch64.go                 |  12 +-
 cannon/mipsevm/exec/mips_instructions.go      | 177 +++--
 .../multithreaded/instrumented_test.go        |   9 +-
 cannon/mipsevm/multithreaded/mips.go          |   8 +-
 .../singlethreaded/instrumented_test.go       |   3 +-
 cannon/mipsevm/tests/evm_common64_test.go     | 658 ++++++++++++++++++
 cannon/mipsevm/tests/evm_common_test.go       |  91 +++
 .../mipsevm/tests/evm_multithreaded_test.go   |   4 +-
 cannon/mipsevm/testutil/arch.go               |   6 +
 cannon/mipsevm/testutil/elf.go                |  10 +
 cannon/mipsevm/testutil/oracle.go             |   2 +-
 cannon/mipsevm/testutil/vmtests.go            |  21 +-
 cannon/testdata/example/Makefile              |  11 +-
 cannon/testdata/example/alloc/go.mod          |   2 +-
 cannon/testdata/example/claim/go.mod          |   2 +-
 cannon/testdata/example/hello/go.mod          |   4 +-
 go.mod                                        |  13 +-
 go.sum                                        |  36 +-
 packages/contracts-bedrock/semver-lock.json   |   8 +-
 .../contracts-bedrock/src/cannon/MIPS.sol     |   4 +-
 .../contracts-bedrock/src/cannon/MIPS2.sol    |   8 +-
 .../src/cannon/libraries/MIPSInstructions.sol |   6 +
 .../src/cannon/libraries/MIPSSyscalls.sol     |   2 +
 26 files changed, 1009 insertions(+), 95 deletions(-)
 create mode 100644 cannon/mipsevm/tests/evm_common64_test.go

diff --git a/cannon/Makefile b/cannon/Makefile
index 5f74904011ec..ccf959fc9d4c 100644
--- a/cannon/Makefile
+++ b/cannon/Makefile
@@ -43,7 +43,7 @@ elf:
 	make -C ./testdata/example elf
 
 sanitize-program:
-	@if ! { mips-linux-gnu-objdump -d -j .text $$GUEST_PROGRAM | awk '{print $3}' | grep -Ew -m1 '(bgezal|bltzal)'; }; then \
+	@if ! { mips-linux-gnu-objdump -d -j .text $$GUEST_PROGRAM | awk '{print $3}' | grep -Ew -m1 '(bltzal)'; }; then \
 		echo "guest program is sanitized for unsupported instructions"; \
 	else \
 		echo "found unsupported instructions in the guest program"; \
@@ -93,6 +93,8 @@ fuzz:
 	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests
 	# Multi-threaded tests
 	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests
+	# 64-bit tests
+	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateDmultInsn ./mipsevm/tests
 
 .PHONY: \
 	cannon32-impl \
diff --git a/cannon/mipsevm/README.md b/cannon/mipsevm/README.md
index df7558187992..03afec250a4a 100644
--- a/cannon/mipsevm/README.md
+++ b/cannon/mipsevm/README.md
@@ -12,6 +12,7 @@ Supported 63 instructions:
 | `Conditional Branch` | `beq`         | Branch on equal.                             |
 | `Conditional Branch` | `bgez`        | Branch on greater than or equal to zero.     |
 | `Conditional Branch` | `bgtz`        | Branch on greater than zero.                 |
+| `Conditional Branch` | `bgezal`      | Branch and link on greater than or equal to zero.     |
 | `Conditional Branch` | `blez`        | Branch on less than or equal to zero.        |
 | `Conditional Branch` | `bltz`        | Branch on less than zero.                    |
 | `Conditional Branch` | `bne`         | Branch on not equal.                         |
diff --git a/cannon/mipsevm/arch/arch32.go b/cannon/mipsevm/arch/arch32.go
index 87cad3cf504d..dbe9ee193d7a 100644
--- a/cannon/mipsevm/arch/arch32.go
+++ b/cannon/mipsevm/arch/arch32.go
@@ -79,6 +79,8 @@ const (
 	SysLlseek        = 4140
 	SysMinCore       = 4217
 	SysTgkill        = 4266
+	SysGetRLimit     = 4076
+	SysLseek         = 4019
 	// Profiling-related syscalls
 	SysSetITimer    = 4104
 	SysTimerCreate  = 4257
diff --git a/cannon/mipsevm/arch/arch64.go b/cannon/mipsevm/arch/arch64.go
index a9b7df70c583..b260ebb1bbb3 100644
--- a/cannon/mipsevm/arch/arch64.go
+++ b/cannon/mipsevm/arch/arch64.go
@@ -25,10 +25,12 @@ const (
 	AddressMask = 0xFFFFFFFFFFFFFFF8
 	ExtMask     = 0x7
 
-	HeapStart       = 0x10_00_00_00_00_00_00_00
-	HeapEnd         = 0x60_00_00_00_00_00_00_00
-	ProgramBreak    = 0x40_00_00_00_00_00_00_00
-	HighMemoryStart = 0x7F_FF_FF_FF_D0_00_00_00
+	// Ensure virtual address is limited to 48-bits as many user programs assume such to implement packed pointers
+	// limit          0x00_00_FF_FF_FF_FF_FF_FF
+	HeapStart       = 0x00_00_10_00_00_00_00_00
+	HeapEnd         = 0x00_00_60_00_00_00_00_00
+	ProgramBreak    = 0x00_00_40_00_00_00_00_00
+	HighMemoryStart = 0x00_00_7F_FF_FF_FF_F0_00
 )
 
 // MIPS64 syscall table - https://github.com/torvalds/linux/blob/3efc57369a0ce8f76bf0804f7e673982384e4ac9/arch/mips/kernel/syscalls/syscall_n64.tbl. Generate the syscall numbers using the Makefile in that directory.
@@ -85,6 +87,8 @@ const (
 	SysLlseek        = UndefinedSysNr
 	SysMinCore       = 5026
 	SysTgkill        = 5225
+	SysGetRLimit     = 5095
+	SysLseek         = 5008
 	// Profiling-related syscalls
 	SysSetITimer    = 5036
 	SysTimerCreate  = 5216
diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index 1bf3849c4e3f..b99f519fe2f9 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -2,13 +2,11 @@ package exec
 
 import (
 	"fmt"
+	"math/bits"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
-
-	// TODO(#12205): MIPS64 port. Replace with a custom library
-	u128 "lukechampine.com/uint128"
 )
 
 const (
@@ -16,6 +14,11 @@ const (
 	OpStoreConditional   = 0x38
 	OpLoadLinked64       = 0x34
 	OpStoreConditional64 = 0x3c
+	OpLoadDoubleLeft     = 0x1A
+	OpLoadDoubleRight    = 0x1B
+
+	// Return address register
+	RegRA = 31
 )
 
 func GetInstructionDetails(pc Word, memory *memory.Memory) (insn, opcode, fun uint32) {
@@ -31,7 +34,7 @@ func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory
 	if opcode == 2 || opcode == 3 {
 		linkReg := Word(0)
 		if opcode == 3 {
-			linkReg = 31
+			linkReg = RegRA
 		}
 		// Take the top bits of the next PC (its 256 MB region), and concatenate with the 26-bit offset
 		target := (cpu.NextPC & SignExtend(0xF0000000, 32)) | Word((insn&0x03FFFFFF)<<2)
@@ -77,7 +80,7 @@ func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory
 	}
 
 	if (opcode >= 4 && opcode < 8) || opcode == 1 {
-		err = HandleBranch(cpu, registers, opcode, insn, rtReg, rs)
+		err = HandleBranch(cpu, registers, opcode, insn, rtReg, rs, stackTracker)
 		return
 	}
 
@@ -85,7 +88,7 @@ func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory
 	// memory fetch (all I-type)
 	// we do the load for stores also
 	mem := Word(0)
-	if opcode >= 0x20 {
+	if opcode >= 0x20 || opcode == OpLoadDoubleLeft || opcode == OpLoadDoubleRight {
 		// M[R[rs]+SignExtImm]
 		rs += SignExtendImmediate(insn)
 		addr := rs & arch.AddressMask
@@ -311,10 +314,10 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 		case 0x3C: // dsll32
 			assertMips64(insn)
 			return rt << (((insn >> 6) & 0x1f) + 32)
-		case 0x3E: // dsll32
+		case 0x3E: // dsrl32
 			assertMips64(insn)
 			return rt >> (((insn >> 6) & 0x1f) + 32)
-		case 0x3F: // dsll32
+		case 0x3F: // dsra32
 			assertMips64(insn)
 			return Word(int64(rt) >> (((insn >> 6) & 0x1f) + 32))
 		default:
@@ -347,13 +350,25 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 			mask := Word(arch.ExtMask - 1)
 			return SignExtend((mem>>(msb-uint32(rs&mask)*8))&0xFFFF, 16)
 		case 0x22: // lwl
-			val := mem << ((rs & 3) * 8)
-			mask := Word(uint32(0xFFFFFFFF) << ((rs & 3) * 8))
-			return SignExtend(((rt & ^mask)|val)&0xFFFFFFFF, 32)
+			if arch.IsMips32 {
+				val := mem << ((rs & 3) * 8)
+				mask := Word(uint32(0xFFFFFFFF) << ((rs & 3) * 8))
+				return SignExtend(((rt & ^mask)|val)&0xFFFFFFFF, 32)
+			} else {
+				// similar to the above mips32 implementation but loads are constrained to the nearest 4-byte memory word
+				shift := 32 - ((rs & 0x4) << 3)
+				w := uint32(mem >> shift)
+				val := uint64(w << ((rs & 3) * 8))
+				mask := Word(uint32(0xFFFFFFFF) << ((rs & 3) * 8))
+				return SignExtend(((rt & ^mask)|Word(val))&0xFFFFFFFF, 32)
+			}
 		case 0x23: // lw
-			// TODO(#12205): port to MIPS64
-			return mem
-			//return SignExtend((mem>>(32-((rs&0x4)<<3)))&0xFFFFFFFF, 32)
+			if arch.IsMips32 {
+				return mem
+			} else {
+				// TODO(#12562): Simplify using LoadSubWord
+				return SignExtend((mem>>(32-((rs&0x4)<<3)))&0xFFFFFFFF, 32)
+			}
 		case 0x24: // lbu
 			msb := uint32(arch.WordSize - 8) // 24 for 32-bit and 56 for 64-bit
 			return (mem >> (msb - uint32(rs&arch.ExtMask)*8)) & 0xFF
@@ -362,9 +377,25 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 			mask := Word(arch.ExtMask - 1)
 			return (mem >> (msb - uint32(rs&mask)*8)) & 0xFFFF
 		case 0x26: //  lwr
-			val := mem >> (24 - (rs&3)*8)
-			mask := Word(uint32(0xFFFFFFFF) >> (24 - (rs&3)*8))
-			return SignExtend(((rt & ^mask)|val)&0xFFFFFFFF, 32)
+			if arch.IsMips32 {
+				val := mem >> (24 - (rs&3)*8)
+				mask := Word(uint32(0xFFFFFFFF) >> (24 - (rs&3)*8))
+				return SignExtend(((rt & ^mask)|val)&0xFFFFFFFF, 32)
+			} else {
+				// similar to the above mips32 implementation but constrained to the nearest 4-byte memory word
+				shift := 32 - ((rs & 0x4) << 3)
+				w := uint32(mem >> shift)
+				val := w >> (24 - (rs&3)*8)
+				mask := uint32(0xFFFFFFFF) >> (24 - (rs&3)*8)
+				lwrResult := ((uint32(rt) & ^mask) | val) & 0xFFFFFFFF
+				if rs&3 == 3 { // loaded bit 31
+					return SignExtend(Word(lwrResult), 32)
+				} else {
+					// NOTE: cannon64 implementation specific: We leave the upper word untouched
+					rtMask := uint64(0xFF_FF_FF_FF_00_00_00_00)
+					return (rt & Word(rtMask)) | Word(lwrResult)
+				}
+			}
 		case 0x28: //  sb
 			msb := uint32(arch.WordSize - 8) // 24 for 32-bit and 56 for 64-bit
 			val := (rt & 0xFF) << (msb - uint32(rs&arch.ExtMask)*8)
@@ -378,18 +409,45 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 			mask := ^Word(0) ^ Word(0xFFFF<<sl)
 			return (mem & mask) | val
 		case 0x2a: //  swl
-			// TODO(#12205): port to MIPS64
-			val := rt >> ((rs & 3) * 8)
-			mask := uint32(0xFFFFFFFF) >> ((rs & 3) * 8)
-			return (mem & Word(^mask)) | val
+			if arch.IsMips32 {
+				val := rt >> ((rs & 3) * 8)
+				mask := uint32(0xFFFFFFFF) >> ((rs & 3) * 8)
+				return (mem & Word(^mask)) | val
+			} else {
+				sr := (rs & 3) << 3
+				val := ((rt & 0xFFFFFFFF) >> sr) << (32 - ((rs & 0x4) << 3))
+				mask := (uint64(0xFFFFFFFF) >> sr) << (32 - ((rs & 0x4) << 3))
+				return (mem & Word(^mask)) | val
+			}
 		case 0x2b: //  sw
-			// TODO(#12205): port to MIPS64
-			return rt
+			if arch.IsMips32 {
+				return rt
+			} else {
+				sl := 32 - ((rs & 0x4) << 3)
+				val := (rt & 0xFFFFFFFF) << sl
+				mask := Word(0xFFFFFFFFFFFFFFFF ^ uint64(0xFFFFFFFF<<sl))
+				return Word(mem&mask) | Word(val)
+			}
 		case 0x2e: //  swr
-			// TODO(#12205): port to MIPS64
-			val := rt << (24 - (rs&3)*8)
-			mask := uint32(0xFFFFFFFF) << (24 - (rs&3)*8)
-			return (mem & Word(^mask)) | val
+			if arch.IsMips32 {
+				val := rt << (24 - (rs&3)*8)
+				mask := uint32(0xFFFFFFFF) << (24 - (rs&3)*8)
+				return (mem & Word(^mask)) | val
+			} else {
+				// similar to the above mips32 implementation but constrained to the nearest 4-byte memory word
+				shift := 32 - ((rs & 0x4) << 3)
+				w := uint32(mem >> shift)
+				val := rt << (24 - (rs&3)*8)
+				mask := uint32(0xFFFFFFFF) << (24 - (rs&3)*8)
+				swrResult := (w & ^mask) | uint32(val)
+				// merge with the untouched bytes in mem
+				if shift > 0 {
+					return (Word(swrResult) << 32) | (mem & Word(^uint32(0))) // nolint: staticcheck
+				} else {
+					memMask := uint64(0xFF_FF_FF_FF_00_00_00_00)
+					return (mem & Word(memMask)) | Word(swrResult & ^uint32(0))
+				}
+			}
 
 		// MIPS64
 		case 0x1A: // ldl
@@ -424,10 +482,7 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 			return mem
 		case 0x3F: // sd
 			assertMips64(insn)
-			sl := (rs & 0x7) << 3
-			val := rt << sl
-			mask := ^Word(0) << sl
-			return (mem & ^mask) | val
+			return rt
 		default:
 			panic("invalid instruction")
 		}
@@ -446,12 +501,13 @@ func SignExtend(dat Word, idx Word) Word {
 	}
 }
 
-func HandleBranch(cpu *mipsevm.CpuScalars, registers *[32]Word, opcode uint32, insn uint32, rtReg Word, rs Word) error {
+func HandleBranch(cpu *mipsevm.CpuScalars, registers *[32]Word, opcode uint32, insn uint32, rtReg Word, rs Word, stackTracker StackTracker) error {
 	if cpu.NextPC != cpu.PC+4 {
 		panic("branch in delay slot")
 	}
 
 	shouldBranch := false
+	linked := false
 	if opcode == 4 || opcode == 5 { // beq/bne
 		rt := registers[rtReg]
 		shouldBranch = (rs == rt && opcode == 4) || (rs != rt && opcode == 5)
@@ -463,10 +519,15 @@ func HandleBranch(cpu *mipsevm.CpuScalars, registers *[32]Word, opcode uint32, i
 		// regimm
 		rtv := (insn >> 16) & 0x1F
 		if rtv == 0 { // bltz
-			shouldBranch = int32(rs) < 0
+			shouldBranch = arch.SignedInteger(rs) < 0
 		}
 		if rtv == 1 { // bgez
-			shouldBranch = int32(rs) >= 0
+			shouldBranch = arch.SignedInteger(rs) >= 0
+		}
+		if rtv == 0x11 { // bgezal (i.e. bal mnemonic)
+			shouldBranch = arch.SignedInteger(rs) >= 0
+			registers[RegRA] = cpu.PC + 8 // always set regardless of branch taken
+			linked = true
 		}
 	}
 
@@ -474,12 +535,16 @@ func HandleBranch(cpu *mipsevm.CpuScalars, registers *[32]Word, opcode uint32, i
 	cpu.PC = cpu.NextPC // execute the delay slot first
 	if shouldBranch {
 		cpu.NextPC = prevPC + 4 + (SignExtend(Word(insn&0xFFFF), 16) << 2) // then continue with the instruction the branch jumps to.
+		if linked {
+			stackTracker.PushStack(prevPC, cpu.NextPC)
+		}
 	} else {
 		cpu.NextPC = cpu.NextPC + 4 // branch not taken
 	}
 	return nil
 }
 
+// HandleHiLo handles instructions that modify HI and LO registers. It also additionally handles doubleword variable shift operations
 func HandleHiLo(cpu *mipsevm.CpuScalars, registers *[32]Word, fun uint32, rs Word, rt Word, storeReg Word) error {
 	val := Word(0)
 	switch fun {
@@ -521,22 +586,44 @@ func HandleHiLo(cpu *mipsevm.CpuScalars, registers *[32]Word, fun uint32, rs Wor
 		assertMips64Fun(fun)
 		val = Word(int64(rt) >> (rs & 0x3F))
 	case 0x1c: // dmult
-		// TODO(#12205): port to MIPS64. Is signed multiply needed for dmult
 		assertMips64Fun(fun)
-		acc := u128.From64(uint64(rs)).Mul(u128.From64(uint64(rt)))
-		cpu.HI = Word(acc.Hi)
-		cpu.LO = Word(acc.Lo)
+		a := int64(rs)
+		b := int64(rt)
+		negative := (a < 0) != (b < 0) // set if operands have different signs
+
+		// Handle special case for most negative value to avoid overflow in negation
+		absA := uint64(abs64(a))
+		absB := uint64(abs64(b))
+
+		hi, lo := bits.Mul64(absA, absB)
+		if negative {
+			// Two's complement negation: flip all bits and add 1
+			hi = ^hi
+			lo = ^lo
+			if lo == 0xFFFFFFFFFFFFFFFF {
+				hi++
+			}
+			lo++
+		}
+		cpu.HI = Word(hi)
+		cpu.LO = Word(lo)
 	case 0x1d: // dmultu
 		assertMips64Fun(fun)
-		acc := u128.From64(uint64(rs)).Mul(u128.From64(uint64(rt)))
-		cpu.HI = Word(acc.Hi)
-		cpu.LO = Word(acc.Lo)
+		hi, lo := bits.Mul64(uint64(rs), uint64(rt))
+		cpu.HI = Word(hi)
+		cpu.LO = Word(lo)
 	case 0x1e: // ddiv
 		assertMips64Fun(fun)
+		if rt == 0 {
+			panic("instruction divide by zero")
+		}
 		cpu.HI = Word(int64(rs) % int64(rt))
 		cpu.LO = Word(int64(rs) / int64(rt))
 	case 0x1f: // ddivu
 		assertMips64Fun(fun)
+		if rt == 0 {
+			panic("instruction divide by zero")
+		}
 		cpu.HI = rs % rt
 		cpu.LO = rs / rt
 	}
@@ -619,3 +706,11 @@ func calculateSubWordMaskAndOffset(addr Word, byteLength Word) (dataMask, bitOff
 
 	return dataMask, bitOffset, bitLength
 }
+
+// abs64 returns the absolute value
+func abs64(x int64) int64 {
+	if x < 0 {
+		return -x
+	}
+	return x
+}
diff --git a/cannon/mipsevm/multithreaded/instrumented_test.go b/cannon/mipsevm/multithreaded/instrumented_test.go
index dd4635668458..ec079e50c8ce 100644
--- a/cannon/mipsevm/multithreaded/instrumented_test.go
+++ b/cannon/mipsevm/multithreaded/instrumented_test.go
@@ -11,11 +11,12 @@ import (
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
-func vmFactory(state *State, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer, log log.Logger) mipsevm.FPVM {
-	return NewInstrumentedState(state, po, stdOut, stdErr, log, nil)
+func vmFactory(state *State, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer, log log.Logger, meta *program.Metadata) mipsevm.FPVM {
+	return NewInstrumentedState(state, po, stdOut, stdErr, log, meta)
 }
 
 func TestInstrumentedState_OpenMips(t *testing.T) {
@@ -35,7 +36,7 @@ func TestInstrumentedState_Claim(t *testing.T) {
 
 func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 	t.Parallel()
-	state, _ := testutil.LoadELFProgram(t, "../../testdata/example/bin/multithreaded.elf", CreateInitialState, false)
+	state, _ := testutil.LoadELFProgram(t, testutil.ProgramPath("multithreaded"), CreateInitialState, false)
 	oracle := testutil.StaticOracle(t, []byte{})
 
 	var stdOutBuf, stdErrBuf bytes.Buffer
@@ -78,7 +79,7 @@ func TestInstrumentedState_Alloc(t *testing.T) {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			state, meta := testutil.LoadELFProgram(t, "../../testdata/example/bin/alloc.elf", CreateInitialState, false)
+			state, meta := testutil.LoadELFProgram(t, testutil.ProgramPath("alloc"), CreateInitialState, false)
 			oracle := testutil.AllocOracle(t, test.numAllocs, test.allocSize)
 
 			us := NewInstrumentedState(state, oracle, os.Stdout, os.Stderr, testutil.CreateLogger(), meta)
diff --git a/cannon/mipsevm/multithreaded/mips.go b/cannon/mipsevm/multithreaded/mips.go
index cddf9fd590f1..f371da2c4053 100644
--- a/cannon/mipsevm/multithreaded/mips.go
+++ b/cannon/mipsevm/multithreaded/mips.go
@@ -168,9 +168,9 @@ func (m *InstrumentedState) handleSyscall() error {
 			m.memoryTracker.TrackMemAccess(effAddr)
 			m.state.Memory.SetWord(effAddr, secs)
 			m.handleMemoryUpdate(effAddr)
-			m.memoryTracker.TrackMemAccess2(effAddr + 4)
-			m.state.Memory.SetWord(effAddr+4, nsecs)
-			m.handleMemoryUpdate(effAddr + 4)
+			m.memoryTracker.TrackMemAccess2(effAddr + arch.WordSizeBytes)
+			m.state.Memory.SetWord(effAddr+arch.WordSizeBytes, nsecs)
+			m.handleMemoryUpdate(effAddr + arch.WordSizeBytes)
 		default:
 			v0 = exec.SysErrorSignal
 			v1 = exec.MipsEINVAL
@@ -206,6 +206,8 @@ func (m *InstrumentedState) handleSyscall() error {
 	case arch.SysTimerCreate:
 	case arch.SysTimerSetTime:
 	case arch.SysTimerDelete:
+	case arch.SysGetRLimit:
+	case arch.SysLseek:
 	default:
 		// These syscalls have the same values on 64-bit. So we use if-stmts here to avoid "duplicate case" compiler error for the cannon64 build
 		if arch.IsMips32 && syscallNum == arch.SysFstat64 || syscallNum == arch.SysStat64 || syscallNum == arch.SysLlseek {
diff --git a/cannon/mipsevm/singlethreaded/instrumented_test.go b/cannon/mipsevm/singlethreaded/instrumented_test.go
index 8b4c61bd4e14..d4c190d9cd91 100644
--- a/cannon/mipsevm/singlethreaded/instrumented_test.go
+++ b/cannon/mipsevm/singlethreaded/instrumented_test.go
@@ -7,10 +7,11 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
-func vmFactory(state *State, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer, log log.Logger) mipsevm.FPVM {
+func vmFactory(state *State, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer, log log.Logger, meta *program.Metadata) mipsevm.FPVM {
 	return NewInstrumentedState(state, po, stdOut, stdErr, nil)
 }
 
diff --git a/cannon/mipsevm/tests/evm_common64_test.go b/cannon/mipsevm/tests/evm_common64_test.go
new file mode 100644
index 000000000000..70f59120abc0
--- /dev/null
+++ b/cannon/mipsevm/tests/evm_common64_test.go
@@ -0,0 +1,658 @@
+//go:build cannon64
+// +build cannon64
+
+package tests
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
+	"github.com/ethereum/go-ethereum/core/tracing"
+	"github.com/stretchr/testify/require"
+)
+
+func TestEVMSingleStep_Operators64(t *testing.T) {
+	cases := []struct {
+		name      string
+		isImm     bool
+		rs        Word
+		rt        Word
+		imm       uint16
+		opcode    uint32
+		funct     uint32
+		expectRes Word
+	}{
+		{name: "dadd. both unsigned 32", funct: 0x2c, isImm: false, rs: Word(0x12), rt: Word(0x20), expectRes: Word(0x32)},                                                                  // dadd t0, s1, s2
+		{name: "dadd. unsigned 32 and signed", funct: 0x2c, isImm: false, rs: Word(0x12), rt: Word(^uint32(0)), expectRes: Word(0x1_00_00_00_11)},                                           // dadd t0, s1, s2
+		{name: "dadd. signed and unsigned 32", funct: 0x2c, isImm: false, rs: Word(^uint32(0)), rt: Word(0x12), expectRes: Word(0x1_00_00_00_11)},                                           // dadd t0, s1, s2
+		{name: "dadd. unsigned 64 and unsigned 32", funct: 0x2c, isImm: false, rs: Word(0x0FFFFFFF_00000012), rt: Word(0x20), expectRes: Word(0x0FFFFFFF_00000032)},                         // dadd t0, s1, s2
+		{name: "dadd. unsigned 32 and signed", funct: 0x2c, isImm: false, rs: Word(12), rt: ^Word(0), expectRes: Word(11)},                                                                  // dadd t0, s1, s2
+		{name: "dadd. signed and unsigned 32", funct: 0x2c, isImm: false, rs: ^Word(0), rt: Word(12), expectRes: Word(11)},                                                                  // dadd t0, s1, s2
+		{name: "dadd. signed and unsigned 32. expect signed", funct: 0x2c, isImm: false, rs: ^Word(20), rt: Word(4), expectRes: ^Word(16)},                                                  // dadd t0, s1, s2
+		{name: "dadd. unsigned 32 and signed. expect signed", funct: 0x2c, isImm: false, rs: Word(4), rt: ^Word(20), expectRes: ^Word(16)},                                                  // dadd t0, s1, s2
+		{name: "dadd. both signed", funct: 0x2c, isImm: false, rs: ^Word(10), rt: ^Word(4), expectRes: ^Word(15)},                                                                           // dadd t0, s1, s2
+		{name: "dadd. signed and unsigned 64. expect unsigned", funct: 0x2c, isImm: false, rs: ^Word(0), rt: Word(0x000000FF_00000000), expectRes: Word(0x000000FE_FFFFFFFF)},               // dadd t0, s1, s2
+		{name: "dadd. signed and unsigned 64. expect signed", funct: 0x2c, isImm: false, rs: Word(0x80000000_00000000), rt: Word(0x40000000_00000000), expectRes: Word(0xC000000000000000)}, // dadd t0, s1, s2
+
+		{name: "daddu. both 32", funct: 0x2d, isImm: false, rs: Word(0x12), rt: Word(0x20), expectRes: Word(0x32)},                                                    // daddu t0, s1, s2
+		{name: "daddu. 32-bit. expect doubleword-sized", funct: 0x2d, isImm: false, rs: Word(0x12), rt: Word(^uint32(0)), expectRes: Word(0x1_00_00_00_11)},           // daddu t0, s1, s2
+		{name: "daddu. 32-bit. expect double-word sized x", funct: 0x2d, isImm: false, rs: Word(^uint32(0)), rt: Word(0x12), expectRes: Word(0x1_00_00_00_11)},        // dadu t0, s1, s2
+		{name: "daddu. doubleword-sized, word-sized", funct: 0x2d, isImm: false, rs: Word(0x0FFFFFFF_00000012), rt: Word(0x20), expectRes: Word(0x0FFFFFFF_00000032)}, // dadu t0, s1, s2
+		{name: "daddu. overflow. rt sign bit set", funct: 0x2d, isImm: false, rs: Word(12), rt: ^Word(0), expectRes: Word(11)},                                        // dadu t0, s1, s2
+		{name: "daddu. overflow. rs sign bit set", funct: 0x2d, isImm: false, rs: ^Word(0), rt: Word(12), expectRes: Word(11)},                                        // dadu t0, s1, s2
+		{name: "daddu. doubleword-sized and word-sized", funct: 0x2d, isImm: false, rs: ^Word(20), rt: Word(4), expectRes: ^Word(16)},                                 // dadu t0, s1, s2
+		{name: "daddu. word-sized and doubleword-sized", funct: 0x2d, isImm: false, rs: Word(4), rt: ^Word(20), expectRes: ^Word(16)},                                 // dadu t0, s1, s2
+		{name: "daddu. both doubleword-sized. expect overflow", funct: 0x2d, isImm: false, rs: ^Word(10), rt: ^Word(4), expectRes: ^Word(15)},                         // dadu t0, s1, s2
+
+		{name: "daddi word-sized", opcode: 0x18, isImm: true, rs: Word(12), rt: ^Word(0), imm: uint16(20), expectRes: Word(32)},                                           // daddi t0, s1, s2
+		{name: "daddi doubleword-sized", opcode: 0x18, isImm: true, rs: Word(0x00000010_00000000), rt: ^Word(0), imm: uint16(0x20), expectRes: Word(0x00000010_00000020)}, // daddi t0, s1, s2
+		{name: "daddi 32-bit sign", opcode: 0x18, isImm: true, rs: Word(0xFF_FF_FF_FF), rt: ^Word(0), imm: uint16(0x20), expectRes: Word(0x01_00_00_00_1F)},               // daddi t0, s1, s2
+		{name: "daddi double-word signed", opcode: 0x18, isImm: true, rs: ^Word(0), rt: ^Word(0), imm: uint16(0x20), expectRes: Word(0x1F)},                               // daddi t0, s1, s2
+		{name: "daddi double-word signed. expect signed", opcode: 0x18, isImm: true, rs: ^Word(0x10), rt: ^Word(0), imm: uint16(0x1), expectRes: ^Word(0xF)},              // daddi t0, s1, s2
+
+		{name: "daddiu word-sized", opcode: 0x19, isImm: true, rs: Word(4), rt: ^Word(0), imm: uint16(40), expectRes: Word(44)},                                            // daddiu t0, s1, 40
+		{name: "daddiu doubleword-sized", opcode: 0x19, isImm: true, rs: Word(0x00000010_00000000), rt: ^Word(0), imm: uint16(0x20), expectRes: Word(0x00000010_00000020)}, // daddiu t0, s1, 40
+		{name: "daddiu 32-bit sign", opcode: 0x19, isImm: true, rs: Word(0xFF_FF_FF_FF), rt: ^Word(0), imm: uint16(0x20), expectRes: Word(0x01_00_00_00_1F)},               // daddiu t0, s1, 40
+		{name: "daddiu overflow", opcode: 0x19, isImm: true, rs: ^Word(0), rt: ^Word(0), imm: uint16(0x20), expectRes: Word(0x1F)},                                         // daddiu t0, s1, s2
+
+		{name: "dsub. both unsigned 32", funct: 0x2e, isImm: false, rs: Word(0x12), rt: Word(0x1), expectRes: Word(0x11)},                                     // dsub t0, s1, s2
+		{name: "dsub. signed and unsigned 32", funct: 0x2e, isImm: false, rs: ^Word(1), rt: Word(0x1), expectRes: Word(^uint64(2))},                           // dsub t0, s1, s2
+		{name: "dsub. signed and unsigned 64", funct: 0x2e, isImm: false, rs: ^Word(1), rt: Word(0x00AABBCC_00000000), expectRes: ^Word(0x00AABBCC_00000001)}, // dsub t0, s1, s2
+		{name: "dsub. both signed. unsigned result", funct: 0x2e, isImm: false, rs: ^Word(1), rt: ^Word(2), expectRes: Word(1)},                               // dsub t0, s1, s2
+		{name: "dsub. both signed. signed result", funct: 0x2e, isImm: false, rs: ^Word(2), rt: ^Word(1), expectRes: ^Word(0)},                                // dsub t0, s1, s2
+		{name: "dsub. signed and zero", funct: 0x2e, isImm: false, rs: ^Word(0), rt: Word(0), expectRes: ^Word(0)},                                            // dsub t0, s1, s2
+
+		{name: "dsubu. both unsigned 32", funct: 0x2f, isImm: false, rs: Word(0x12), rt: Word(0x1), expectRes: Word(0x11)},                                       // dsubu t0, s1, s2
+		{name: "dsubu. signed and unsigned 32", funct: 0x2f, isImm: false, rs: ^Word(1), rt: Word(0x1), expectRes: Word(^uint64(2))},                             // dsubu t0, s1, s2
+		{name: "dsubu. signed and unsigned 64", funct: 0x2f, isImm: false, rs: ^Word(1), rt: Word(0x00AABBCC_00000000), expectRes: ^Word(0x00AABBCC_00000001)},   // dsubu t0, s1, s2
+		{name: "dsubu. both signed. unsigned result", funct: 0x2f, isImm: false, rs: ^Word(1), rt: ^Word(2), expectRes: Word(1)},                                 // dsubu t0, s1, s2
+		{name: "dsubu. both signed. signed result", funct: 0x2f, isImm: false, rs: ^Word(2), rt: ^Word(1), expectRes: ^Word(0)},                                  // dsubu t0, s1, s2
+		{name: "dsubu. signed and zero", funct: 0x2f, isImm: false, rs: ^Word(0), rt: Word(0), expectRes: ^Word(0)},                                              // dsubu t0, s1, s2
+		{name: "dsubu. overflow", funct: 0x2f, isImm: false, rs: Word(0x80000000_00000000), rt: Word(0x7FFFFFFF_FFFFFFFF), expectRes: Word(0x00000000_00000001)}, // dsubu t0, s1, s2
+
+		// dsllv
+		{name: "dsllv", funct: 0x14, rt: Word(0x20), rs: Word(0), expectRes: Word(0x20)},
+		{name: "dsllv", funct: 0x14, rt: Word(0x20), rs: Word(1), expectRes: Word(0x40)},
+		{name: "dsllv sign", funct: 0x14, rt: Word(0x80_00_00_00_00_00_00_20), rs: Word(1), expectRes: Word(0x00_00_00_00_00_00_00_40)},
+		{name: "dsllv max", funct: 0x14, rt: Word(0xFF_FF_FF_FF_FF_FF_FF_Fe), rs: Word(0x3f), expectRes: Word(0x0)},
+		{name: "dsllv max almost clear", funct: 0x14, rt: Word(0x1), rs: Word(0x3f), expectRes: Word(0x80_00_00_00_00_00_00_00)},
+
+		// dsrlv t0, s1, s2
+		{name: "dsrlv", funct: 0x16, rt: Word(0x20), rs: Word(0), expectRes: Word(0x20)},
+		{name: "dsrlv", funct: 0x16, rt: Word(0x20), rs: Word(1), expectRes: Word(0x10)},
+		{name: "dsrlv sign-extend", funct: 0x16, rt: Word(0x80_00_00_00_00_00_00_20), rs: Word(1), expectRes: Word(0x40_00_00_00_00_00_00_10)},
+		{name: "dsrlv max", funct: 0x16, rt: Word(0x7F_FF_00_00_00_00_00_20), rs: Word(0x3f), expectRes: Word(0x0)},
+		{name: "dsrlv max sign-extend", funct: 0x16, rt: Word(0x80_00_00_00_00_00_00_20), rs: Word(0x3f), expectRes: Word(0x1)},
+
+		// dsrav t0, s1, s2
+		{name: "dsrav", funct: 0x17, rt: Word(0x20), rs: Word(0), expectRes: Word(0x20)},
+		{name: "dsrav", funct: 0x17, rt: Word(0x20), rs: Word(1), expectRes: Word(0x10)},
+		{name: "dsrav sign-extend", funct: 0x17, rt: Word(0x80_00_00_00_00_00_00_20), rs: Word(1), expectRes: Word(0xc0_00_00_00_00_00_00_10)},
+		{name: "dsrav max", funct: 0x17, rt: Word(0x7F_FF_00_00_00_00_00_20), rs: Word(0x3f), expectRes: Word(0x0)},
+		{name: "dsrav max sign-extend", funct: 0x17, rt: Word(0x80_00_00_00_00_00_00_20), rs: Word(0x3f), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_FF)},
+	}
+
+	v := GetMultiThreadedTestCase(t)
+	for i, tt := range cases {
+		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
+		t.Run(testName, func(t *testing.T) {
+			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
+			state := goVm.GetState()
+			var insn uint32
+			var rsReg uint32 = 17
+			var rtReg uint32
+			var rdReg uint32
+			if tt.isImm {
+				rtReg = 8
+				insn = tt.opcode<<26 | rsReg<<21 | rtReg<<16 | uint32(tt.imm)
+				state.GetRegistersRef()[rtReg] = tt.rt
+				state.GetRegistersRef()[rsReg] = tt.rs
+			} else {
+				rtReg = 18
+				rdReg = 8
+				insn = rsReg<<21 | rtReg<<16 | rdReg<<11 | tt.funct
+				state.GetRegistersRef()[rsReg] = tt.rs
+				state.GetRegistersRef()[rtReg] = tt.rt
+			}
+			state.GetMemory().SetUint32(0, insn)
+			step := state.GetStep()
+
+			// Setup expectations
+			expected := testutil.NewExpectedState(state)
+			expected.ExpectStep()
+			if tt.isImm {
+				expected.Registers[rtReg] = tt.expectRes
+			} else {
+				expected.Registers[rdReg] = tt.expectRes
+			}
+
+			stepWitness, err := goVm.Step(true)
+			require.NoError(t, err)
+
+			// Check expectations
+			expected.Validate(t, state)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+		})
+	}
+}
+
+func TestEVMSingleStep_Shift(t *testing.T) {
+	cases := []struct {
+		name      string
+		rd        Word
+		rt        Word
+		sa        uint32
+		funct     uint32
+		expectRes Word
+	}{
+		{name: "dsll", funct: 0x38, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 0, expectRes: Word(0x1)},                                              // dsll t8, s2, 0
+		{name: "dsll", funct: 0x38, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 1, expectRes: Word(0x2)},                                              // dsll t8, s2, 1
+		{name: "dsll", funct: 0x38, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 31, expectRes: Word(0x80_00_00_00)},                                   // dsll t8, s2, 31
+		{name: "dsll", funct: 0x38, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_00_00_00_00), sa: 1, expectRes: Word(0xFF_FF_FF_FE_00_00_00_00)},  // dsll t8, s2, 1
+		{name: "dsll", funct: 0x38, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_00_00_00_00), sa: 31, expectRes: Word(0x80_00_00_00_00_00_00_00)}, // dsll t8, s2, 31
+
+		{name: "dsrl", funct: 0x3a, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 0, expectRes: Word(0x1)},                                             // dsrl t8, s2, 0
+		{name: "dsrl", funct: 0x3a, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 1, expectRes: Word(0x0)},                                             // dsrl t8, s2, 1
+		{name: "dsrl", funct: 0x3a, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_00_00_00_00), sa: 1, expectRes: Word(0x7F_FF_FF_FF_80_00_00_00)}, // dsrl t8, s2, 1
+		{name: "dsrl", funct: 0x3a, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_00_00_00_00), sa: 31, expectRes: Word(0x01_FF_FF_FF_FE)},         // dsrl t8, s2, 31
+
+		{name: "dsra", funct: 0x3b, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 0, expectRes: Word(0x1)},                                              // dsra t8, s2, 0
+		{name: "dsra", funct: 0x3b, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 1, expectRes: Word(0x0)},                                              // dsra t8, s2, 1
+		{name: "dsra", funct: 0x3b, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_00_00_00_00), sa: 1, expectRes: Word(0xFF_FF_FF_FF_80_00_00_00)},  // dsra t8, s2, 1
+		{name: "dsra", funct: 0x3b, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_00_00_00_00), sa: 31, expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_FE)}, // dsra t8, s2, 31
+
+		{name: "dsll32", funct: 0x3c, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 0, expectRes: Word(0x1_00_00_00_00)},                                  // dsll32 t8, s2, 0
+		{name: "dsll32", funct: 0x3c, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 1, expectRes: Word(0x2_00_00_00_00)},                                  // dsll32 t8, s2, 1
+		{name: "dsll32", funct: 0x3c, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 31, expectRes: Word(0x80_00_00_00_00_00_00_00)},                       // dsll32 t8, s2, 31
+		{name: "dsll32", funct: 0x3c, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), sa: 1, expectRes: Word(0xFF_FF_FF_FE_00_00_00_00)},  // dsll32 t8, s2, 1
+		{name: "dsll32", funct: 0x3c, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), sa: 31, expectRes: Word(0x80_00_00_00_00_00_00_00)}, // dsll32 t8, s2, 31
+
+		{name: "dsrl32", funct: 0x3e, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 0, expectRes: Word(0x0)},                                 // dsrl32 t8, s2, 0
+		{name: "dsrl32", funct: 0x3e, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 31, expectRes: Word(0x0)},                                // dsrl32 t8, s2, 31
+		{name: "dsrl32", funct: 0x3e, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), sa: 1, expectRes: Word(0x7F_FF_FF_FF)}, // dsrl32 t8, s2, 1
+		{name: "dsrl32", funct: 0x3e, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), sa: 31, expectRes: Word(0x1)},          // dsrl32 t8, s2, 31
+		{name: "dsrl32", funct: 0x3e, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1_0000_0000), sa: 0, expectRes: Word(0x1)},                       // dsrl32 t8, s2, 0
+		{name: "dsrl32", funct: 0x3e, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1_0000_0000), sa: 31, expectRes: Word(0x0)},                      // dsrl32 t8, s2, 31
+
+		{name: "dsra32", funct: 0x3f, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 0, expectRes: Word(0x0)},                                             // dsra32 t8, s2, 0
+		{name: "dsra32", funct: 0x3f, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x1), sa: 1, expectRes: Word(0x0)},                                             // dsra32 t8, s2, 1
+		{name: "dsra32", funct: 0x3f, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF), sa: 0, expectRes: Word(0x0)},                                   // dsra32 t8, s2, 0
+		{name: "dsra32", funct: 0x3f, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x01_FF_FF_FF_FF), sa: 0, expectRes: Word(0x1)},                                // dsra32 t8, s2, 0
+		{name: "dsra32", funct: 0x3f, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), sa: 1, expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_FF)}, // dsra32 t8, s2, 1
+		{name: "dsra32", funct: 0x3f, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0xFF_FF_FF_00_00_00_00_00), sa: 1, expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_80)}, // dsra32 t8, s2, 1
+		{name: "dsra32", funct: 0x3f, rd: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x7F_FF_FF_FF_FF_FF_FF_FF), sa: 31, expectRes: Word(0x0)},                      // dsra32 t8, s2, 1
+	}
+
+	v := GetMultiThreadedTestCase(t)
+	for i, tt := range cases {
+		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
+		t.Run(testName, func(t *testing.T) {
+			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
+			state := goVm.GetState()
+			var insn uint32
+			var rtReg uint32
+			var rdReg uint32
+			rtReg = 18
+			rdReg = 8
+			insn = rtReg<<16 | rdReg<<11 | tt.sa<<6 | tt.funct
+			state.GetRegistersRef()[rdReg] = tt.rd
+			state.GetRegistersRef()[rtReg] = tt.rt
+			state.GetMemory().SetUint32(0, insn)
+			step := state.GetStep()
+
+			// Setup expectations
+			expected := testutil.NewExpectedState(state)
+			expected.ExpectStep()
+			expected.Registers[rdReg] = tt.expectRes
+
+			stepWitness, err := goVm.Step(true)
+			require.NoError(t, err)
+
+			// Check expectations
+			expected.Validate(t, state)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+		})
+	}
+}
+
+func TestEVMSingleStep_LoadStore64(t *testing.T) {
+	cases := []struct {
+		name         string
+		rs           Word
+		rt           Word
+		opcode       uint32
+		memVal       Word
+		expectMemVal Word
+		expectRes    Word
+		imm          uint16
+	}{
+		{name: "lb 0", opcode: uint32(0x20), memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x71)},                                            // lb $t0, 0($t1)
+		{name: "lb 1", opcode: uint32(0x20), imm: 1, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x72)},                                    // lb $t0, 1($t1)
+		{name: "lb 2", opcode: uint32(0x20), imm: 2, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x73)},                                    // lb $t0, 2($t1)
+		{name: "lb 3", opcode: uint32(0x20), imm: 3, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x74)},                                    // lb $t0, 3($t1)
+		{name: "lb 4", opcode: uint32(0x20), imm: 4, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x75)},                                    // lb $t0, 4($t1)
+		{name: "lb 5", opcode: uint32(0x20), imm: 5, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x76)},                                    // lb $t0, 5($t1)
+		{name: "lb 6", opcode: uint32(0x20), imm: 6, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x77)},                                    // lb $t0, 6($t1)
+		{name: "lb 7", opcode: uint32(0x20), imm: 7, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x78)},                                    // lb $t0, 7($t1)
+		{name: "lb sign-extended 0", opcode: uint32(0x20), memVal: Word(0x81_72_73_74_75_76_77_78), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_81)},         // lb $t0, 0($t1)
+		{name: "lb sign-extended 1", opcode: uint32(0x20), imm: 1, memVal: Word(0x71_82_73_74_75_76_77_78), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_82)}, // lb $t0, 1($t1)
+		{name: "lb sign-extended 2", opcode: uint32(0x20), imm: 2, memVal: Word(0x71_72_83_74_75_76_77_78), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_83)}, // lb $t0, 2($t1)
+		{name: "lb sign-extended 3", opcode: uint32(0x20), imm: 3, memVal: Word(0x71_72_73_84_75_76_77_78), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_84)}, // lb $t0, 3($t1)
+		{name: "lb sign-extended 4", opcode: uint32(0x20), imm: 4, memVal: Word(0x71_72_73_74_85_76_77_78), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_85)}, // lb $t0, 4($t1)
+		{name: "lb sign-extended 5", opcode: uint32(0x20), imm: 5, memVal: Word(0x71_72_73_74_75_86_77_78), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_86)}, // lb $t0, 5($t1)
+		{name: "lb sign-extended 6", opcode: uint32(0x20), imm: 6, memVal: Word(0x71_72_73_74_75_76_87_78), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_87)}, // lb $t0, 6($t1)
+		{name: "lb sign-extended 7", opcode: uint32(0x20), imm: 7, memVal: Word(0x71_72_73_74_75_76_77_88), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_88)}, // lb $t0, 7($t1)
+
+		{name: "lh offset=0", opcode: uint32(0x21), memVal: Word(0x11223344_55667788), expectRes: Word(0x11_22)},                                         // lhu $t0, 0($t1)
+		{name: "lh offset=0 sign-extended", opcode: uint32(0x21), memVal: Word(0x81223344_55667788), expectRes: Word(0xFF_FF_FF_FF_FF_FF_81_22)},         // lhu $t0, 0($t1)
+		{name: "lh offset=2", opcode: uint32(0x21), imm: 2, memVal: Word(0x11223344_55667788), expectRes: Word(0x33_44)},                                 // lhu $t0, 2($t1)
+		{name: "lh offset=2 sign-extended", opcode: uint32(0x21), imm: 2, memVal: Word(0x11228344_55667788), expectRes: Word(0xFF_FF_FF_FF_FF_FF_83_44)}, // lhu $t0, 2($t1)
+		{name: "lh offset=4", opcode: uint32(0x21), imm: 4, memVal: Word(0x11223344_55667788), expectRes: Word(0x55_66)},                                 // lhu $t0, 4($t1)
+		{name: "lh offset=4 sign-extended", opcode: uint32(0x21), imm: 4, memVal: Word(0x11223344_85667788), expectRes: Word(0xFF_FF_FF_FF_FF_FF_85_66)}, // lhu $t0, 4($t1)
+		{name: "lh offset=6", opcode: uint32(0x21), imm: 6, memVal: Word(0x11223344_55661788), expectRes: Word(0x17_88)},                                 // lhu $t0, 6($t1)
+		{name: "lh offset=6 sign-extended", opcode: uint32(0x21), imm: 6, memVal: Word(0x11223344_55668788), expectRes: Word(0xFF_FF_FF_FF_FF_FF_87_88)}, // lhu $t0, 6($t1)
+
+		{name: "lw upper", opcode: uint32(0x23), memVal: Word(0x11223344_55667788), expectRes: Word(0x11223344)},                                // lw $t0, 0($t1)
+		{name: "lw upper sign-extended", opcode: uint32(0x23), memVal: Word(0x81223344_55667788), expectRes: Word(0xFFFFFFFF_81223344)},         // lw $t0, 0($t1)
+		{name: "lw lower", opcode: uint32(0x23), imm: 4, memVal: Word(0x11223344_55667788), expectRes: Word(0x55667788)},                        // lw $t0, 4($t1)
+		{name: "lw lower sign-extended", opcode: uint32(0x23), imm: 4, memVal: Word(0x11223344_85667788), expectRes: Word(0xFFFFFFFF_85667788)}, // lw $t0, 4($t1)
+
+		{name: "lbu 0", opcode: uint32(0x24), memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x71)},                       // lbu $t0, 0($t1)
+		{name: "lbu 1", opcode: uint32(0x24), imm: 1, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x72)},               // lbu $t0, 1($t1)
+		{name: "lbu 2", opcode: uint32(0x24), imm: 2, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x73)},               // lbu $t0, 2($t1)
+		{name: "lbu 3", opcode: uint32(0x24), imm: 3, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x74)},               // lbu $t0, 3($t1)
+		{name: "lbu 4", opcode: uint32(0x24), imm: 4, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x75)},               // lbu $t0, 4($t1)
+		{name: "lbu 5", opcode: uint32(0x24), imm: 5, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x76)},               // lbu $t0, 5($t1)
+		{name: "lbu 6", opcode: uint32(0x24), imm: 6, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x77)},               // lbu $t0, 6($t1)
+		{name: "lbu 7", opcode: uint32(0x24), imm: 7, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x78)},               // lbu $t0, 7($t1)
+		{name: "lbu sign-extended 0", opcode: uint32(0x24), memVal: Word(0x81_72_73_74_75_76_77_78), expectRes: Word(0x81)},         // lbu $t0, 0($t1)
+		{name: "lbu sign-extended 1", opcode: uint32(0x24), imm: 1, memVal: Word(0x71_82_73_74_75_76_77_78), expectRes: Word(0x82)}, // lbu $t0, 1($t1)
+		{name: "lbu sign-extended 2", opcode: uint32(0x24), imm: 2, memVal: Word(0x71_72_83_74_75_76_77_78), expectRes: Word(0x83)}, // lbu $t0, 2($t1)
+		{name: "lbu sign-extended 3", opcode: uint32(0x24), imm: 3, memVal: Word(0x71_72_73_84_75_76_77_78), expectRes: Word(0x84)}, // lbu $t0, 3($t1)
+		{name: "lbu sign-extended 4", opcode: uint32(0x24), imm: 4, memVal: Word(0x71_72_73_74_85_76_77_78), expectRes: Word(0x85)}, // lbu $t0, 4($t1)
+		{name: "lbu sign-extended 5", opcode: uint32(0x24), imm: 5, memVal: Word(0x71_72_73_74_75_86_77_78), expectRes: Word(0x86)}, // lbu $t0, 5($t1)
+		{name: "lbu sign-extended 6", opcode: uint32(0x24), imm: 6, memVal: Word(0x71_72_73_74_75_76_87_78), expectRes: Word(0x87)}, // lbu $t0, 6($t1)
+		{name: "lbu sign-extended 7", opcode: uint32(0x24), imm: 7, memVal: Word(0x71_72_73_74_75_76_77_88), expectRes: Word(0x88)}, // lbu $t0, 7($t1)
+
+		{name: "lhu offset=0", opcode: uint32(0x25), memVal: Word(0x11223344_55667788), expectRes: Word(0x11_22)},                       // lhu $t0, 0($t1)
+		{name: "lhu offset=0 zero-extended", opcode: uint32(0x25), memVal: Word(0x81223344_55667788), expectRes: Word(0x81_22)},         // lhu $t0, 0($t1)
+		{name: "lhu offset=2", opcode: uint32(0x25), imm: 2, memVal: Word(0x11223344_55667788), expectRes: Word(0x33_44)},               // lhu $t0, 2($t1)
+		{name: "lhu offset=2 zero-extended", opcode: uint32(0x25), imm: 2, memVal: Word(0x11228344_55667788), expectRes: Word(0x83_44)}, // lhu $t0, 2($t1)
+		{name: "lhu offset=4", opcode: uint32(0x25), imm: 4, memVal: Word(0x11223344_55667788), expectRes: Word(0x55_66)},               // lhu $t0, 4($t1)
+		{name: "lhu offset=4 zero-extended", opcode: uint32(0x25), imm: 4, memVal: Word(0x11223344_85667788), expectRes: Word(0x85_66)}, // lhu $t0, 4($t1)
+		{name: "lhu offset=6", opcode: uint32(0x25), imm: 6, memVal: Word(0x11223344_55661788), expectRes: Word(0x17_88)},               // lhu $t0, 6($t1)
+		{name: "lhu offset=6 zero-extended", opcode: uint32(0x25), imm: 6, memVal: Word(0x11223344_55668788), expectRes: Word(0x87_88)}, // lhu $t0, 6($t1)
+
+		{name: "lwl", opcode: uint32(0x22), rt: Word(0xaa_bb_cc_dd), imm: 4, memVal: Word(0x12_34_56_78), expectRes: Word(0x12_34_56_78)},                                                                // lwl $t0, 4($t1)
+		{name: "lwl unaligned address", opcode: uint32(0x22), rt: Word(0xaa_bb_cc_dd), imm: 5, memVal: Word(0x12_34_56_78), expectRes: Word(0x34_56_78_dd)},                                              // lwl $t0, 5($t1)
+		{name: "lwl offset 0 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_AA_BB_CC_DD)},   // lwl $t0, 0($t1)
+		{name: "lwl offset 0 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0x7A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x00_00_00_00_7A_BB_CC_DD)}, // lwl $t0, 0($t1)
+		{name: "lwl offset 1 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_BB_CC_DD_88)},   // lwl $t0, 1($t1)
+		{name: "lwl offset 1 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_7B_CC_DD_A1_B1_C1_D1), expectRes: Word(0x00_00_00_00_7B_CC_DD_88)}, // lwl $t0, 1($t1)
+		{name: "lwl offset 2 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_CC_DD_77_88)},   // lwl $t0, 2($t1)
+		{name: "lwl offset 2 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_7C_DD_A1_B1_C1_D1), expectRes: Word(0x00_00_00_00_7C_DD_77_88)}, // lwl $t0, 2($t1)
+		{name: "lwl offset 3 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_DD_66_77_88)},   // lwl $t0, 3($t1)
+		{name: "lwl offset 3 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_7D_A1_B1_C1_D1), expectRes: Word(0x00_00_00_00_7D_66_77_88)}, // lwl $t0, 3($t1)
+		{name: "lwl offset 4 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_A1_B1_C1_D1)},   // lwl $t0, 4($t1)
+		{name: "lwl offset 4 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_71_B1_C1_D1), expectRes: Word(0x00_00_00_00_71_B1_C1_D1)}, // lwl $t0, 4($t1)
+		{name: "lwl offset 5 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_B1_C1_D1_88)},   // lwl $t0, 5($t1)
+		{name: "lwl offset 5 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_71_C1_D1), expectRes: Word(0x00_00_00_00_71_C1_D1_88)}, // lwl $t0, 5($t1)
+		{name: "lwl offset 6 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_C1_D1_77_88)},   // lwl $t0, 6($t1)
+		{name: "lwl offset 6 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_71_D1), expectRes: Word(0x00_00_00_00_71_D1_77_88)}, // lwl $t0, 6($t1)
+		{name: "lwl offset 7 sign bit 31 set", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_D1_66_77_88)},   // lwl $t0, 7($t1)
+		{name: "lwl offset 7 sign bit 31 clear", opcode: uint32(0x22), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_71), expectRes: Word(0x00_00_00_00_71_66_77_88)}, // lwl $t0, 7($t1)
+
+		{name: "lwr zero-extended imm 0 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0x7A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_77_7A)}, // lwr $t0, 0($t1)
+		{name: "lwr zero-extended imm 0 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_77_AA)},   // lwr $t0, 0($t1)
+		{name: "lwr zero-extended imm 1 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0x7A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_7A_BB)}, // lwr $t0, 1($t1)
+		{name: "lwr zero-extended imm 1 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_AA_BB)},   // lwr $t0, 1($t1)
+		{name: "lwr zero-extended imm 2 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0x7A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_7A_BB_CC)}, // lwr $t0, 2($t1)
+		{name: "lwr zero-extended imm 2 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_AA_BB_CC)},   // lwr $t0, 2($t1)
+		{name: "lwr sign-extended imm 3 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0x7A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x00_00_00_00_7A_BB_CC_DD)}, // lwr $t0, 3($t1)
+		{name: "lwr sign-extended imm 3 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_AA_BB_CC_DD)},   // lwr $t0, 3($t1)
+		{name: "lwr zero-extended imm 4 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_71_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_77_71)}, // lwr $t0, 4($t1)
+		{name: "lwr zero-extended imm 4 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_85_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_85_66_77_A1)},   // lwr $t0, 4($t1)
+		{name: "lwr zero-extended imm 5 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_71_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_71_B1)}, // lwr $t0, 5($t1)
+		{name: "lwr zero-extended imm 5 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_85_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_85_66_A1_B1)},   // lwr $t0, 5($t1)
+		{name: "lwr zero-extended imm 6 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_71_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_71_B1_C1)}, // lwr $t0, 6($t1)
+		{name: "lwr zero-extended imm 6 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_85_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_85_A1_B1_C1)},   // lwr $t0, 6($t1)
+		{name: "lwr sign-extended imm 7 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_71_B1_C1_D1), expectRes: Word(0x00_00_00_00_71_B1_C1_D1)}, // lwr $t0, 7($t1)
+		{name: "lwr sign-extended imm 7 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_A1_B1_C1_D1)},   // lwr $t0, 7($t1)
+
+		{name: "sb offset=0", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, expectMemVal: Word(0x88_00_00_00_00_00_00_00)}, // sb $t0, 0($t1)
+		{name: "sb offset=1", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, expectMemVal: Word(0x00_88_00_00_00_00_00_00)}, // sb $t0, 1($t1)
+		{name: "sb offset=2", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, expectMemVal: Word(0x00_00_88_00_00_00_00_00)}, // sb $t0, 2($t1)
+		{name: "sb offset=3", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, expectMemVal: Word(0x00_00_00_88_00_00_00_00)}, // sb $t0, 3($t1)
+		{name: "sb offset=4", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, expectMemVal: Word(0x00_00_00_00_88_00_00_00)}, // sb $t0, 4($t1)
+		{name: "sb offset=5", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, expectMemVal: Word(0x00_00_00_00_00_88_00_00)}, // sb $t0, 5($t1)
+		{name: "sb offset=6", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, expectMemVal: Word(0x00_00_00_00_00_00_88_00)}, // sb $t0, 6($t1)
+		{name: "sb offset=7", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, expectMemVal: Word(0x00_00_00_00_00_00_00_88)}, // sb $t0, 7($t1)
+
+		{name: "sh offset=0", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, expectMemVal: Word(0x77_88_00_00_00_00_00_00)}, // sh $t0, 0($t1)
+		{name: "sh offset=2", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, expectMemVal: Word(0x00_00_77_88_00_00_00_00)}, // sh $t0, 2($t1)
+		{name: "sh offset=4", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, expectMemVal: Word(0x00_00_00_00_77_88_00_00)}, // sh $t0, 4($t1)
+		{name: "sh offset=6", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, expectMemVal: Word(0x00_00_00_00_00_00_77_88)}, // sh $t0, 6($t1)
+
+		{name: "swl offset=0", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 0, expectMemVal: Word(0x55_66_77_88_A1_B1_C1_D1)}, //  swl $t0, 0($t1)
+		{name: "swl offset=1", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 1, expectMemVal: Word(0xAA_55_66_77_A1_B1_C1_D1)}, //  swl $t0, 1($t1)
+		{name: "swl offset=2", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 2, expectMemVal: Word(0xAA_BB_55_66_A1_B1_C1_D1)}, //  swl $t0, 2($t1)
+		{name: "swl offset=3", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 3, expectMemVal: Word(0xAA_BB_CC_55_A1_B1_C1_D1)}, //  swl $t0, 3($t1)
+		{name: "swl offset=4", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 4, expectMemVal: Word(0xAA_BB_CC_DD_55_66_77_88)}, //  swl $t0, 4($t1)
+		{name: "swl offset=5", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 5, expectMemVal: Word(0xAA_BB_CC_DD_A1_55_66_77)}, //  swl $t0, 5($t1)
+		{name: "swl offset=6", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 6, expectMemVal: Word(0xAA_BB_CC_DD_A1_B1_55_66)}, //  swl $t0, 6($t1)
+		{name: "swl offset=7", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 7, expectMemVal: Word(0xAA_BB_CC_DD_A1_B1_C1_55)}, //  swl $t0, 7($t1)
+
+		{name: "sw offset=0", opcode: uint32(0x2b), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 0, expectMemVal: Word(0x55_66_77_88_A1_B1_C1_D1)}, // sw $t0, 0($t1)
+		{name: "sw offset=4", opcode: uint32(0x2b), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 4, expectMemVal: Word(0xAA_BB_CC_DD_55_66_77_88)}, // sw $t0, 4($t1)
+
+		{name: "swr offset=0", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x88_BB_CC_DD_A1_B1_C1_D1)}, // swr $t0, 0($t1)
+		{name: "swr offset=1", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x77_88_CC_DD_A1_B1_C1_D1)}, // swr $t0, 1($t1)
+		{name: "swr offset=2", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x66_77_88_DD_A1_B1_C1_D1)}, // swr $t0, 2($t1)
+		{name: "swr offset=3", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x55_66_77_88_A1_B1_C1_D1)}, // swr $t0, 3($t1)
+		{name: "swr offset=4", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0xAA_BB_CC_DD_88_B1_C1_D1)}, // swr $t0, 4($t1)
+		{name: "swr offset=5", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0xAA_BB_CC_DD_77_88_C1_D1)}, // swr $t0, 5($t1)
+		{name: "swr offset=6", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0xAA_BB_CC_DD_66_77_88_D1)}, // swr $t0, 6($t1)
+		{name: "swr offset=7", opcode: uint32(0x2e), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0xAA_BB_CC_DD_55_66_77_88)}, // swr $t0, 7($t1)
+
+		// 64-bit instructions
+		{name: "ldl offset 0 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xAA_BB_CC_DD_A1_B1_C1_D1)},   // ldl $t0, 0($t1)
+		{name: "ldl offset 1 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xBB_CC_DD_A1_B1_C1_D1_88)},   // ldl $t0, 1($t1)
+		{name: "ldl offset 2 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xCC_DD_A1_B1_C1_D1_77_88)},   // ldl $t0, 2($t1)
+		{name: "ldl offset 3 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xDD_A1_B1_C1_D1_66_77_88)},   // ldl $t0, 3($t1)
+		{name: "ldl offset 4 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xA1_B1_C1_D1_55_66_77_88)},   // ldl $t0, 4($t1)
+		{name: "ldl offset 5 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xB1_C1_D1_44_55_66_77_88)},   // ldl $t0, 5($t1)
+		{name: "ldl offset 6 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xC1_D1_33_44_55_66_77_88)},   // ldl $t0, 6($t1)
+		{name: "ldl offset 7 sign bit 31 set", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xD1_22_33_44_55_66_77_88)},   // ldl $t0, 7($t1)
+		{name: "ldl offset 0 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0x7A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x7A_BB_CC_DD_A1_B1_C1_D1)}, // ldl $t0, 0($t1)
+		{name: "ldl offset 1 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_7B_CC_DD_A1_B1_C1_D1), expectRes: Word(0x7B_CC_DD_A1_B1_C1_D1_88)}, // ldl $t0, 1($t1)
+		{name: "ldl offset 2 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_7C_DD_A1_B1_C1_D1), expectRes: Word(0x7C_DD_A1_B1_C1_D1_77_88)}, // ldl $t0, 2($t1)
+		{name: "ldl offset 3 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_7D_A1_B1_C1_D1), expectRes: Word(0x7D_A1_B1_C1_D1_66_77_88)}, // ldl $t0, 3($t1)
+		{name: "ldl offset 4 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_71_B1_C1_D1), expectRes: Word(0x71_B1_C1_D1_55_66_77_88)}, // ldl $t0, 4($t1)
+		{name: "ldl offset 5 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_71_C1_D1), expectRes: Word(0x71_C1_D1_44_55_66_77_88)}, // ldl $t0, 5($t1)
+		{name: "ldl offset 6 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_71_D1), expectRes: Word(0x71_D1_33_44_55_66_77_88)}, // ldl $t0, 6($t1)
+		{name: "ldl offset 7 sign bit 31 clear", opcode: uint32(0x1A), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_71), expectRes: Word(0x71_22_33_44_55_66_77_88)}, // ldl $t0, 7($t1)
+
+		{name: "ldr offset 0 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_77_3A)}, // ldr $t0, 0($t1)
+		{name: "ldr offset 1 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_3A_BB)}, // ldr $t0, 1($t1)
+		{name: "ldr offset 2 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_3A_BB_CC)}, // ldr $t0, 2($t1)
+		{name: "ldr offset 3 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_3A_BB_CC_DD)}, // ldr $t0, 3($t1)
+		{name: "ldr offset 4 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_3A_BB_CC_DD_A1)}, // ldr $t0, 4($t1)
+		{name: "ldr offset 5 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_3A_BB_CC_DD_A1_B1)}, // ldr $t0, 5($t1)
+		{name: "ldr offset 6 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_3A_BB_CC_DD_A1_B1_C1)}, // ldr $t0, 6($t1)
+		{name: "ldr offset 7 sign bit clear", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0x3A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x3A_BB_CC_DD_A1_B1_C1_D1)}, // ldr $t0, 7($t1)
+		{name: "ldr offset 0 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_77_AA)},   // ldr $t0, 0($t1)
+		{name: "ldr offset 1 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_66_AA_BB)},   // ldr $t0, 1($t1)
+		{name: "ldr offset 2 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_55_AA_BB_CC)},   // ldr $t0, 2($t1)
+		{name: "ldr offset 3 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_44_AA_BB_CC_DD)},   // ldr $t0, 3($t1)
+		{name: "ldr offset 4 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_33_AA_BB_CC_DD_A1)},   // ldr $t0, 4($t1)
+		{name: "ldr offset 5 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_22_AA_BB_CC_DD_A1_B1)},   // ldr $t0, 5($t1)
+		{name: "ldr offset 6 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x11_AA_BB_CC_DD_A1_B1_C1)},   // ldr $t0, 6($t1)
+		{name: "ldr offset 7 sign bit set", opcode: uint32(0x1b), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xAA_BB_CC_DD_A1_B1_C1_D1)},   // ldr $t0, 7($t1)
+
+		{name: "lwu upper", opcode: uint32(0x27), memVal: Word(0x11223344_55667788), expectRes: Word(0x11223344)},              // lw $t0, 0($t1)
+		{name: "lwu upper sign", opcode: uint32(0x27), memVal: Word(0x81223344_55667788), expectRes: Word(0x81223344)},         // lw $t0, 0($t1)
+		{name: "lwu lower", opcode: uint32(0x27), imm: 4, memVal: Word(0x11223344_55667788), expectRes: Word(0x55667788)},      // lw $t0, 4($t1)
+		{name: "lwu lower sign", opcode: uint32(0x27), imm: 4, memVal: Word(0x11223344_85667788), expectRes: Word(0x85667788)}, // lw $t0, 4($t1)
+
+		{name: "sdl offset=0", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 0, expectMemVal: Word(0x11_22_33_44_55_66_77_88)}, //  sdl $t0, 0($t1)
+		{name: "sdl offset=1", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 1, expectMemVal: Word(0xAA_11_22_33_44_55_66_77)}, //  sdl $t0, 1($t1)
+		{name: "sdl offset=2", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 2, expectMemVal: Word(0xAA_BB_11_22_33_44_55_66)}, //  sdl $t0, 2($t1)
+		{name: "sdl offset=3", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 3, expectMemVal: Word(0xAA_BB_CC_11_22_33_44_55)}, //  sdl $t0, 3($t1)
+		{name: "sdl offset=4", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 4, expectMemVal: Word(0xAA_BB_CC_DD_11_22_33_44)}, //  sdl $t0, 4($t1)
+		{name: "sdl offset=5", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 5, expectMemVal: Word(0xAA_BB_CC_DD_A1_11_22_33)}, //  sdl $t0, 5($t1)
+		{name: "sdl offset=6", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 6, expectMemVal: Word(0xAA_BB_CC_DD_A1_B1_11_22)}, //  sdl $t0, 6($t1)
+		{name: "sdl offset=7", opcode: uint32(0x2c), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 7, expectMemVal: Word(0xAA_BB_CC_DD_A1_B1_C1_11)}, //  sdl $t0, 7($t1)
+
+		{name: "sdr offset=0", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x88_BB_CC_DD_A1_B1_C1_D1)}, // sdr $t0, 0($t1)
+		{name: "sdr offset=1", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x77_88_CC_DD_A1_B1_C1_D1)}, // sdr $t0, 1($t1)
+		{name: "sdr offset=2", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x66_77_88_DD_A1_B1_C1_D1)}, // sdr $t0, 2($t1)
+		{name: "sdr offset=3", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x55_66_77_88_A1_B1_C1_D1)}, // sdr $t0, 3($t1)
+		{name: "sdr offset=4", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x44_55_66_77_88_B1_C1_D1)}, // sdr $t0, 4($t1)
+		{name: "sdr offset=5", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x33_44_55_66_77_88_C1_D1)}, // sdr $t0, 5($t1)
+		{name: "sdr offset=6", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x22_33_44_55_66_77_88_D1)}, // sdr $t0, 6($t1)
+		{name: "sdr offset=7", opcode: uint32(0x2d), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x11_22_33_44_55_66_77_88)}, // sdr $t0, 7($t1)
+
+		{name: "ld", opcode: uint32(0x37), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0x7A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x7A_BB_CC_DD_A1_B1_C1_D1)},        // ld $t0, 0($t1)
+		{name: "ld signed", opcode: uint32(0x37), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0x8A_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0x8A_BB_CC_DD_A1_B1_C1_D1)}, // ld $t0, 0($t1)
+
+		{name: "sd", opcode: uint32(0x3f), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x11_22_33_44_55_66_77_88)},        // sd $t0, 0($t1)
+		{name: "sd signed", opcode: uint32(0x3f), rt: Word(0x81_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x81_22_33_44_55_66_77_88)}, // sd $t0, 4($t1)
+	}
+
+	v := GetMultiThreadedTestCase(t)
+	var t1 Word = 0xFF000000_00000108
+	var baseReg uint32 = 9
+	var rtReg uint32 = 8
+	for i, tt := range cases {
+		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
+		t.Run(testName, func(t *testing.T) {
+			effAddr := arch.AddressMask & t1
+
+			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
+			state := goVm.GetState()
+
+			insn := tt.opcode<<26 | baseReg<<21 | rtReg<<16 | uint32(tt.imm)
+			state.GetRegistersRef()[rtReg] = tt.rt
+			state.GetRegistersRef()[baseReg] = t1
+
+			state.GetMemory().SetUint32(0, insn)
+			state.GetMemory().SetWord(t1&arch.AddressMask, tt.memVal)
+			step := state.GetStep()
+
+			// Setup expectations
+			expected := testutil.NewExpectedState(state)
+			expected.ExpectStep()
+			if tt.expectMemVal != 0 {
+				expected.ExpectMemoryWriteWord(effAddr, tt.expectMemVal)
+			} else {
+				expected.Registers[rtReg] = tt.expectRes
+			}
+			stepWitness, err := goVm.Step(true)
+			require.NoError(t, err)
+
+			// Check expectations
+			expected.Validate(t, state)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+		})
+	}
+}
+
+func TestEVMSingleStep_DivMult(t *testing.T) {
+	cases := []struct {
+		name        string
+		rs          Word
+		rt          Word
+		funct       uint32
+		expectLo    Word
+		expectHi    Word
+		expectPanic string
+	}{
+		// dmult s1, s2
+		// expected hi,lo were verified using qemu-mips
+		{name: "dmult 0", funct: 0x1c, rs: 0, rt: 0, expectLo: 0, expectHi: 0},
+		{name: "dmult 1", funct: 0x1c, rs: 1, rt: 1, expectLo: 1, expectHi: 0},
+		{name: "dmult 2", funct: 0x1c, rs: 0x01_00_00_00_00, rt: 2, expectLo: 0x02_00_00_00_00, expectHi: 0},
+		{name: "dmult 3", funct: 0x1c, rs: 0x01_00_00_00_00_00_00_00, rt: 2, expectLo: 0x02_00_00_00_00_00_00_00, expectHi: 0},
+		{name: "dmult 4", funct: 0x1c, rs: 0x40_00_00_00_00_00_00_00, rt: 2, expectLo: 0x80_00_00_00_00_00_00_00, expectHi: 0x0},
+		{name: "dmult 5", funct: 0x1c, rs: 0x40_00_00_00_00_00_00_00, rt: 0x1000, expectLo: 0x0, expectHi: 0x4_00},
+		{name: "dmult 6", funct: 0x1c, rs: 0x80_00_00_00_00_00_00_00, rt: 0x1000, expectLo: 0x0, expectHi: 0xFF_FF_FF_FF_FF_FF_F8_00},
+		{name: "dmult 7", funct: 0x1c, rs: 0x80_00_00_00_00_00_00_00, rt: 0x80_00_00_00_00_00_00_00, expectLo: 0x0, expectHi: 0x40_00_00_00_00_00_00_00},
+		{name: "dmult 8", funct: 0x1c, rs: 0x40_00_00_00_00_00_00_01, rt: 0x1000, expectLo: 0x1000, expectHi: 0x4_00},
+		{name: "dmult 9", funct: 0x1c, rs: 0x80_00_00_00_00_00_00_80, rt: 0x80_00_00_00_00_00_00_80, expectLo: 0x4000, expectHi: 0x3F_FF_FF_FF_FF_FF_FF_80},
+		{name: "dmult 10", funct: 0x1c, rs: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), rt: Word(0x1), expectLo: 0xFF_FF_FF_FF_FF_FF_FF_FF, expectHi: 0xFF_FF_FF_FF_FF_FF_FF_FF},
+		{name: "dmult 11", funct: 0x1c, rs: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), expectLo: 0x1, expectHi: Word(0)},
+		{name: "dmult 12", funct: 0x1c, rs: Word(0xFF_FF_FF_FF_FF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD_A1_D1_C1_E0), expectLo: 0xFC_FC_FD_0A_8E_20_EB_A0, expectHi: 0x00_00_00_00_00_00_00_0E},
+		{name: "dmult 13", funct: 0x1c, rs: Word(0x7F_FF_FF_FF_FF_FF_FF_FF), rt: Word(0xAA_BB_CC_DD_A1_D1_C1_E1), expectLo: 0xD5_44_33_22_5E_2E_3E_1F, expectHi: 0xD5_5D_E6_6E_D0_E8_E0_F0},
+		{name: "dmult 14", funct: 0x1c, rs: Word(0x7F_FF_FF_FF_FF_FF_FF_FF), rt: Word(0x8F_FF_FF_FF_FF_FF_FF_FF), expectLo: 0xF0_00_00_00_00_00_00_01, expectHi: 0xC7_FF_FF_FF_FF_FF_FF_FF},
+
+		// dmultu s1, s2
+		{name: "dmultu 0", funct: 0x1d, rs: 0, rt: 0, expectLo: 0, expectHi: 0},
+		{name: "dmultu 1", funct: 0x1d, rs: 1, rt: 1, expectLo: 1, expectHi: 0},
+		{name: "dmultu 2", funct: 0x1d, rs: 0x01_00_00_00_00, rt: 2, expectLo: 0x02_00_00_00_00, expectHi: 0},
+		{name: "dmultu 3", funct: 0x1d, rs: 0x01_00_00_00_00_00_00_00, rt: 2, expectLo: 0x02_00_00_00_00_00_00_00, expectHi: 0},
+		{name: "dmultu 4", funct: 0x1d, rs: 0x40_00_00_00_00_00_00_00, rt: 2, expectLo: 0x80_00_00_00_00_00_00_00, expectHi: 0x0},
+		{name: "dmultu 5", funct: 0x1d, rs: 0x40_00_00_00_00_00_00_00, rt: 0x1000, expectLo: 0x0, expectHi: 0x4_00},
+		{name: "dmultu 6", funct: 0x1d, rs: 0x80_00_00_00_00_00_00_00, rt: 0x1000, expectLo: 0x0, expectHi: 0x8_00},
+		{name: "dmultu 7", funct: 0x1d, rs: 0x80_00_00_00_00_00_00_00, rt: 0x80_00_00_00_00_00_00_00, expectLo: 0x0, expectHi: 0x40_00_00_00_00_00_00_00},
+		{name: "dmultu 8", funct: 0x1d, rs: 0x40_00_00_00_00_00_00_01, rt: 0x1000, expectLo: 0x1000, expectHi: 0x4_00},
+		{name: "dmultu 9", funct: 0x1d, rs: 0x80_00_00_00_00_00_00_80, rt: 0x80_00_00_00_00_00_00_80, expectLo: 0x4000, expectHi: 0x40_00_00_00_00_00_00_80},
+		{name: "dmultu 10", funct: 0x1d, rs: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), expectLo: 0x1, expectHi: Word(0xFF_FF_FF_FF_FF_FF_FF_FE)},
+		{name: "dmultu 11", funct: 0x1d, rs: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF_FF_FF_FF_FF), expectLo: 0x1, expectHi: 0xFF_FF_FF_FF_FF_FF_FF_FE},
+		{name: "dmultu 12", funct: 0x1d, rs: Word(0xFF_FF_FF_FF_FF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD_A1_D1_C1_E0), expectLo: 0xFC_FC_FD_0A_8E_20_EB_A0, expectHi: 0xAA_BB_CC_DD_A1_D1_C1_C1},
+		{name: "dmultu 13", funct: 0x1d, rs: Word(0x7F_FF_FF_FF_FF_FF_FF_FF), rt: Word(0xAA_BB_CC_DD_A1_D1_C1_E1), expectLo: 0xD5_44_33_22_5E_2E_3E_1F, expectHi: 0x55_5D_E6_6E_D0_E8_E0_EF},
+		{name: "dmultu 14", funct: 0x1d, rs: Word(0x7F_FF_FF_FF_FF_FF_FF_FF), rt: Word(0x8F_FF_FF_FF_FF_FF_FF_FF), expectLo: 0xF0_00_00_00_00_00_00_01, expectHi: 0x47_FF_FF_FF_FF_FF_FF_FE},
+
+		// ddiv rs, rt
+		{name: "ddiv", funct: 0x1e, rs: 0, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddiv", funct: 0x1e, rs: 1, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddiv", funct: 0x1e, rs: 0xFF_FF_FF_FF_FF_FF_FF_FF, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddiv", funct: 0x1e, rs: 0, rt: 1, expectLo: 0, expectHi: 0},
+		{name: "ddiv", funct: 0x1e, rs: 1, rt: 1, expectLo: 1, expectHi: 0},
+		{name: "ddiv", funct: 0x1e, rs: 10, rt: 3, expectLo: 3, expectHi: 1},
+		{name: "ddiv", funct: 0x1e, rs: 0x7F_FF_FF_FF_00_00_00_00, rt: 2, expectLo: 0x3F_FF_FF_FF_80_00_00_00, expectHi: 0},
+		{name: "ddiv", funct: 0x1e, rs: 0xFF_FF_FF_FF_00_00_00_00, rt: 2, expectLo: 0xFF_FF_FF_FF_80_00_00_00, expectHi: 0},
+		{name: "ddiv", funct: 0x1e, rs: ^Word(0), rt: ^Word(0), expectLo: 1, expectHi: 0},
+		{name: "ddiv", funct: 0x1e, rs: ^Word(0), rt: 2, expectLo: 0, expectHi: ^Word(0)},
+		{name: "ddiv", funct: 0x1e, rs: 0x7F_FF_FF_FF_00_00_00_00, rt: ^Word(0), expectLo: 0x80_00_00_01_00_00_00_00, expectHi: 0},
+
+		// ddivu
+		{name: "ddivu", funct: 0x1f, rs: 0, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddivu", funct: 0x1f, rs: 1, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddivu", funct: 0x1f, rs: 0xFF_FF_FF_FF_FF_FF_FF_FF, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddivu", funct: 0x1f, rs: 0, rt: 1, expectLo: 0, expectHi: 0},
+		{name: "ddivu", funct: 0x1f, rs: 1, rt: 1, expectLo: 1, expectHi: 0},
+		{name: "ddivu", funct: 0x1f, rs: 10, rt: 3, expectLo: 3, expectHi: 1},
+		{name: "ddivu", funct: 0x1f, rs: 0x7F_FF_FF_FF_00_00_00_00, rt: 2, expectLo: 0x3F_FF_FF_FF_80_00_00_00, expectHi: 0},
+		{name: "ddivu", funct: 0x1f, rs: 0xFF_FF_FF_FF_00_00_00_00, rt: 2, expectLo: 0x7F_FF_FF_FF_80_00_00_00, expectHi: 0},
+		{name: "ddivu", funct: 0x1f, rs: ^Word(0), rt: ^Word(0), expectLo: 1, expectHi: 0},
+		{name: "ddivu", funct: 0x1f, rs: ^Word(0), rt: 2, expectLo: 0x7F_FF_FF_FF_FF_FF_FF_FF, expectHi: 1},
+		{name: "ddivu", funct: 0x1f, rs: 0x7F_FF_FF_FF_00_00_00_00, rt: ^Word(0), expectLo: 0, expectHi: 0x7F_FF_FF_FF_00_00_00_00},
+	}
+
+	v := GetMultiThreadedTestCase(t)
+	for i, tt := range cases {
+		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
+		t.Run(testName, func(t *testing.T) {
+			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
+			state := goVm.GetState()
+			var rsReg uint32 = 17
+			var rtReg uint32 = 18
+			insn := rsReg<<21 | rtReg<<16 | tt.funct
+			state.GetRegistersRef()[rsReg] = tt.rs
+			state.GetRegistersRef()[rtReg] = tt.rt
+			state.GetMemory().SetUint32(0, insn)
+			step := state.GetStep()
+
+			// Setup expectations
+			expected := testutil.NewExpectedState(state)
+			expected.ExpectStep()
+			expected.LO = tt.expectLo
+			expected.HI = tt.expectHi
+
+			if tt.expectPanic != "" {
+				require.PanicsWithValue(t, tt.expectPanic, func() { _, _ = goVm.Step(true) })
+				// TODO(#12250): Assert EVM panic for divide by zero
+				// testutil.AssertEVMReverts(t, state, contracts, nil, proofData, errMsg)
+			} else {
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+			}
+		})
+	}
+}
+
+func TestEVMSingleStepBranch64(t *testing.T) {
+	var tracer *tracing.Hooks
+
+	versions := GetMipsVersionTestCases(t)
+	cases := []struct {
+		name         string
+		pc           Word
+		expectNextPC Word
+		opcode       uint32
+		regimm       uint32
+		expectLink   bool
+		rs           arch.SignedInteger
+		rt           Word
+		offset       uint16
+	}{
+		// blez
+		{name: "blez", pc: 0, opcode: 0x6, rs: 0x5, offset: 0x100, expectNextPC: 0x8},
+		{name: "blez large rs", pc: 0x10, opcode: 0x6, rs: 0x7F_FF_FF_FF_FF_FF_FF_FF, offset: 0x100, expectNextPC: 0x18},
+		{name: "blez zero rs", pc: 0x10, opcode: 0x6, rs: 0x0, offset: 0x100, expectNextPC: 0x414},
+		{name: "blez sign rs", pc: 0x10, opcode: 0x6, rs: -1, offset: 0x100, expectNextPC: 0x414},
+		{name: "blez rs only sign bit set", pc: 0x10, opcode: 0x6, rs: testutil.ToSignedInteger(0x80_00_00_00_00_00_00_00), offset: 0x100, expectNextPC: 0x414},
+		{name: "blez sign-extended offset", pc: 0x10, opcode: 0x6, rs: -1, offset: 0x80_00, expectNextPC: 0xFF_FF_FF_FF_FF_FE_00_14},
+
+		// bgtz
+		{name: "bgtz", pc: 0, opcode: 0x7, rs: 0x5, offset: 0x100, expectNextPC: 0x404},
+		{name: "bgtz sign-extended offset", pc: 0x10, opcode: 0x7, rs: 0x5, offset: 0x80_00, expectNextPC: 0xFF_FF_FF_FF_FF_FE_00_14},
+		{name: "bgtz large rs", pc: 0x10, opcode: 0x7, rs: 0x7F_FF_FF_FF_FF_FF_FF_FF, offset: 0x100, expectNextPC: 0x414},
+		{name: "bgtz zero rs", pc: 0x10, opcode: 0x7, rs: 0x0, offset: 0x100, expectNextPC: 0x18},
+		{name: "bgtz sign rs", pc: 0x10, opcode: 0x7, rs: -1, offset: 0x100, expectNextPC: 0x18},
+		{name: "bgtz rs only sign bit set", pc: 0x10, opcode: 0x7, rs: testutil.ToSignedInteger(0x80_00_00_00_00_00_00_00), offset: 0x100, expectNextPC: 0x18},
+
+		// bltz t0, $x
+		{name: "bltz", pc: 0, opcode: 0x1, regimm: 0x0, rs: 0x5, offset: 0x100, expectNextPC: 0x8},
+		{name: "bltz large rs", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: 0x7F_FF_FF_FF_FF_FF_FF_FF, offset: 0x100, expectNextPC: 0x18},
+		{name: "bltz zero rs", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: 0x0, offset: 0x100, expectNextPC: 0x18},
+		{name: "bltz sign rs", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x100, expectNextPC: 0x414},
+		{name: "bltz rs only sign bit set", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: testutil.ToSignedInteger(0x80_00_00_00_00_00_00_00), offset: 0x100, expectNextPC: 0x414},
+		{name: "bltz sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x80_00, expectNextPC: 0xFF_FF_FF_FF_FF_FE_00_14},
+		{name: "bltz large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x7F_FF, expectNextPC: 0x2_00_10},
+
+		// bgez t0, $x
+		{name: "bgez", pc: 0, opcode: 0x1, regimm: 0x1, rs: 0x5, offset: 0x100, expectNextPC: 0x404},
+		{name: "bgez large rs", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 0x7F_FF_FF_FF_FF_FF_FF_FF, offset: 0x100, expectNextPC: 0x414},
+		{name: "bgez zero rs", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 0x0, offset: 0x100, expectNextPC: 0x414},
+		{name: "bgez branch not taken", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: -1, offset: 0x100, expectNextPC: 0x18},
+		{name: "bgez sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 1, offset: 0x80_00, expectNextPC: 0xFF_FF_FF_FF_FF_FE_00_14},
+		{name: "bgez large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 1, offset: 0x70_00, expectNextPC: 0x1_C0_14},
+		{name: "bgez fill bit offset except sign", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 1, offset: 0x7F_FF, expectNextPC: 0x2_00_10},
+
+		// bgezal t0, $x
+		{name: "bgezal", pc: 0, opcode: 0x1, regimm: 0x11, rs: 0x5, offset: 0x100, expectNextPC: 0x404, expectLink: true},
+		{name: "bgezal large rs", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 0x7F_FF_FF_FF_FF_FF_FF_FF, offset: 0x100, expectNextPC: 0x414, expectLink: true},
+		{name: "bgezal zero rs", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 0x0, offset: 0x100, expectNextPC: 0x414, expectLink: true},
+		{name: "bgezal branch not taken", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: -1, offset: 0x100, expectNextPC: 0x18, expectLink: true},
+		{name: "bgezal sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x80_00, expectNextPC: 0xFF_FF_FF_FF_FF_FE_00_14, expectLink: true},
+		{name: "bgezal large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x70_00, expectNextPC: 0x1_C0_14, expectLink: true},
+		{name: "bgezal fill bit offset except sign", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x7F_FF, expectNextPC: 0x2_00_10, expectLink: true},
+	}
+
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(tt.pc))
+				state := goVm.GetState()
+				const rsReg = 8 // t0
+				insn := tt.opcode<<26 | rsReg<<21 | tt.regimm<<16 | uint32(tt.offset)
+				state.GetMemory().SetUint32(tt.pc, insn)
+				state.GetRegistersRef()[rsReg] = Word(tt.rs)
+				step := state.GetStep()
+
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.Step += 1
+				expected.PC = state.GetCpu().NextPC
+				expected.NextPC = tt.expectNextPC
+				if tt.expectLink {
+					expected.Registers[31] = state.GetPC() + 8
+				}
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+			})
+		}
+	}
+}
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index c9dfd2f09634..f1e08e6eda36 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -991,3 +991,94 @@ func TestEntryEVM(t *testing.T) {
 		})
 	}
 }
+
+func TestEVMSingleStepBranch(t *testing.T) {
+	var tracer *tracing.Hooks
+
+	versions := GetMipsVersionTestCases(t)
+	cases := []struct {
+		name         string
+		pc           Word
+		expectNextPC Word
+		opcode       uint32
+		regimm       uint32
+		expectLink   bool
+		rs           arch.SignedInteger
+		rt           Word
+		offset       uint16
+	}{
+		// blez
+		{name: "blez", pc: 0, opcode: 0x6, rs: 0x5, offset: 0x100, expectNextPC: 0x8},
+		{name: "blez large rs", pc: 0x10, opcode: 0x6, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x18},
+		{name: "blez zero rs", pc: 0x10, opcode: 0x6, rs: 0x0, offset: 0x100, expectNextPC: 0x414},
+		{name: "blez sign rs", pc: 0x10, opcode: 0x6, rs: -1, offset: 0x100, expectNextPC: 0x414},
+		{name: "blez rs only sign bit set", pc: 0x10, opcode: 0x6, rs: testutil.ToSignedInteger(0x80_00_00_00), offset: 0x100, expectNextPC: 0x414},
+		{name: "blez sign-extended offset", pc: 0x10, opcode: 0x6, rs: -1, offset: 0x80_00, expectNextPC: 0xFF_FE_00_14},
+
+		// bgtz
+		{name: "bgtz", pc: 0, opcode: 0x7, rs: 0x5, offset: 0x100, expectNextPC: 0x404},
+		{name: "bgtz sign-extended offset", pc: 0x10, opcode: 0x7, rs: 0x5, offset: 0x80_00, expectNextPC: 0xFF_FE_00_14},
+		{name: "bgtz large rs", pc: 0x10, opcode: 0x7, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x414},
+		{name: "bgtz zero rs", pc: 0x10, opcode: 0x7, rs: 0x0, offset: 0x100, expectNextPC: 0x18},
+		{name: "bgtz sign rs", pc: 0x10, opcode: 0x7, rs: -1, offset: 0x100, expectNextPC: 0x18},
+		{name: "bgtz rs only sign bit set", pc: 0x10, opcode: 0x7, rs: testutil.ToSignedInteger(0x80_00_00_00), offset: 0x100, expectNextPC: 0x18},
+
+		// bltz t0, $x
+		{name: "bltz", pc: 0, opcode: 0x1, regimm: 0x0, rs: 0x5, offset: 0x100, expectNextPC: 0x8},
+		{name: "bltz large rs", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x18},
+		{name: "bltz zero rs", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: 0x0, offset: 0x100, expectNextPC: 0x18},
+		{name: "bltz sign rs", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x100, expectNextPC: 0x414},
+		{name: "bltz rs only sign bit set", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: testutil.ToSignedInteger(0x80_00_00_00), offset: 0x100, expectNextPC: 0x414},
+		{name: "bltz sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x80_00, expectNextPC: 0xFF_FE_00_14},
+		{name: "bltz large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x7F_FF, expectNextPC: 0x2_00_10},
+
+		// bgez t0, $x
+		{name: "bgez", pc: 0, opcode: 0x1, regimm: 0x1, rs: 0x5, offset: 0x100, expectNextPC: 0x404},
+		{name: "bgez large rs", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x414},
+		{name: "bgez zero rs", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 0x0, offset: 0x100, expectNextPC: 0x414},
+		{name: "bgez branch not taken", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: -1, offset: 0x100, expectNextPC: 0x18},
+		{name: "bgez sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 1, offset: 0x80_00, expectNextPC: 0xFF_FE_00_14},
+		{name: "bgez large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 1, offset: 0x70_00, expectNextPC: 0x1_C0_14},
+		{name: "bgez fill bit offset except sign", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 1, offset: 0x7F_FF, expectNextPC: 0x2_00_10},
+
+		// bgezal t0, $x
+		{name: "bgezal", pc: 0, opcode: 0x1, regimm: 0x11, rs: 0x5, offset: 0x100, expectNextPC: 0x404, expectLink: true},
+		{name: "bgezal large rs", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x414, expectLink: true},
+		{name: "bgezal zero rs", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 0x0, offset: 0x100, expectNextPC: 0x414, expectLink: true},
+		{name: "bgezal branch not taken", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: -1, offset: 0x100, expectNextPC: 0x18, expectLink: true},
+		{name: "bgezal sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x80_00, expectNextPC: 0xFF_FE_00_14, expectLink: true},
+		{name: "bgezal large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x70_00, expectNextPC: 0x1_C0_14, expectLink: true},
+		{name: "bgezal fill bit offset except sign", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x7F_FF, expectNextPC: 0x2_00_10, expectLink: true},
+	}
+
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(tt.pc))
+				state := goVm.GetState()
+				const rsReg = 8 // t0
+				insn := tt.opcode<<26 | rsReg<<21 | tt.regimm<<16 | uint32(tt.offset)
+				state.GetMemory().SetUint32(tt.pc, insn)
+				state.GetRegistersRef()[rsReg] = Word(tt.rs)
+				step := state.GetStep()
+
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.Step += 1
+				expected.PC = state.GetCpu().NextPC
+				expected.NextPC = tt.expectNextPC
+				if tt.expectLink {
+					expected.Registers[31] = state.GetPC() + 8
+				}
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+			})
+		}
+	}
+}
diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index 6c297ea946d0..0ea9142a9168 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -1011,7 +1011,7 @@ func testEVM_SysClockGettime(t *testing.T, clkid Word) {
 				goVm, state, contracts := setup(t, 2101, nil)
 				mttestutil.InitializeSingleThread(2101+i, state, i%2 == 1)
 				effAddr := c.timespecAddr & arch.AddressMask
-				effAddr2 := effAddr + 4
+				effAddr2 := effAddr + arch.WordSizeBytes
 				step := state.Step
 
 				// Define LL-related params
@@ -1121,6 +1121,8 @@ var NoopSyscalls = map[string]uint32{
 	"SysLlseek":        4140,
 	"SysMinCore":       4217,
 	"SysTgkill":        4266,
+	"SysGetRLimit":     4076,
+	"SysLseek":         4019,
 	"SysMunmap":        4091,
 	"SysSetITimer":     4104,
 	"SysTimerCreate":   4257,
diff --git a/cannon/mipsevm/testutil/arch.go b/cannon/mipsevm/testutil/arch.go
index 2efa75eafcec..a69896c041e5 100644
--- a/cannon/mipsevm/testutil/arch.go
+++ b/cannon/mipsevm/testutil/arch.go
@@ -40,3 +40,9 @@ func SetMemoryUint64(t require.TestingT, mem *memory.Memory, addr Word, value ui
 	actual := mem.GetWord(effAddr)
 	require.Equal(t, Word(value), actual)
 }
+
+// ToSignedInteger converts the unsigend Word to a SignedInteger.
+// Useful for avoiding Go compiler warnings for literals that don't fit in a signed type
+func ToSignedInteger(x Word) arch.SignedInteger {
+	return arch.SignedInteger(x)
+}
diff --git a/cannon/mipsevm/testutil/elf.go b/cannon/mipsevm/testutil/elf.go
index b5b63cdeb1d3..3e1896963cda 100644
--- a/cannon/mipsevm/testutil/elf.go
+++ b/cannon/mipsevm/testutil/elf.go
@@ -6,6 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
 )
 
@@ -26,3 +27,12 @@ func LoadELFProgram[T mipsevm.FPVMState](t require.TestingT, name string, initSt
 	require.NoError(t, program.PatchStack(state), "add initial stack")
 	return state, meta
 }
+
+// ProgramPath returns the appropriate ELF test program for the current architecture
+func ProgramPath(programName string) string {
+	basename := programName + ".elf"
+	if !arch.IsMips32 {
+		basename = programName + ".64.elf"
+	}
+	return "../../testdata/example/bin/" + basename
+}
diff --git a/cannon/mipsevm/testutil/oracle.go b/cannon/mipsevm/testutil/oracle.go
index 64b0f31a897c..b5c4f7dce915 100644
--- a/cannon/mipsevm/testutil/oracle.go
+++ b/cannon/mipsevm/testutil/oracle.go
@@ -67,7 +67,7 @@ func StaticPrecompileOracle(t *testing.T, precompile common.Address, requiredGas
 }
 
 func ClaimTestOracle(t *testing.T) (po mipsevm.PreimageOracle, stdOut string, stdErr string) {
-	s := uint64(1000)
+	s := uint64(0x00FFFFFF_00001000)
 	a := uint64(3)
 	b := uint64(4)
 
diff --git a/cannon/mipsevm/testutil/vmtests.go b/cannon/mipsevm/testutil/vmtests.go
index 382c60833399..333720a4ec02 100644
--- a/cannon/mipsevm/testutil/vmtests.go
+++ b/cannon/mipsevm/testutil/vmtests.go
@@ -16,10 +16,14 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
 )
 
-type VMFactory[T mipsevm.FPVMState] func(state T, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer, log log.Logger) mipsevm.FPVM
+type VMFactory[T mipsevm.FPVMState] func(state T, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer, log log.Logger, meta *program.Metadata) mipsevm.FPVM
 type StateFactory[T mipsevm.FPVMState] func() T
 
 func RunVMTests_OpenMips[T mipsevm.FPVMState](t *testing.T, stateFactory StateFactory[T], vmFactory VMFactory[T], excludedTests ...string) {
+	if !arch.IsMips32 {
+		// TODO: guard these tests by the cannon32 build tag
+		t.Skip("Open MIPS tests are not appropriate for cannon64")
+	}
 	testFiles, err := os.ReadDir("../tests/open_mips_tests/test/bin")
 	require.NoError(t, err)
 
@@ -52,7 +56,7 @@ func RunVMTests_OpenMips[T mipsevm.FPVMState](t *testing.T, stateFactory StateFa
 			// set the return address ($ra) to jump into when test completes
 			state.GetRegistersRef()[31] = EndAddr
 
-			us := vmFactory(state, oracle, os.Stdout, os.Stderr, CreateLogger())
+			us := vmFactory(state, oracle, os.Stdout, os.Stderr, CreateLogger(), nil)
 
 			// Catch panics and check if they are expected
 			defer func() {
@@ -94,12 +98,13 @@ func RunVMTests_OpenMips[T mipsevm.FPVMState](t *testing.T, stateFactory StateFa
 }
 
 func RunVMTest_Hello[T mipsevm.FPVMState](t *testing.T, initState program.CreateInitialFPVMState[T], vmFactory VMFactory[T], doPatchGo bool) {
-	state, _ := LoadELFProgram(t, "../../testdata/example/bin/hello.elf", initState, doPatchGo)
+	state, meta := LoadELFProgram(t, ProgramPath("hello"), initState, doPatchGo)
 
 	var stdOutBuf, stdErrBuf bytes.Buffer
-	us := vmFactory(state, nil, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), CreateLogger())
+	us := vmFactory(state, nil, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), CreateLogger(), meta)
 
-	for i := 0; i < 400_000; i++ {
+	maxSteps := 430_000
+	for i := 0; i < maxSteps; i++ {
 		if us.GetState().GetExited() {
 			break
 		}
@@ -107,7 +112,7 @@ func RunVMTest_Hello[T mipsevm.FPVMState](t *testing.T, initState program.Create
 		require.NoError(t, err)
 	}
 
-	require.True(t, state.GetExited(), "must complete program")
+	require.Truef(t, state.GetExited(), "must complete program. reached %d of max %d steps", state.GetStep(), maxSteps)
 	require.Equal(t, uint8(0), state.GetExitCode(), "exit with 0")
 
 	require.Equal(t, "hello world!\n", stdOutBuf.String(), "stdout says hello")
@@ -115,12 +120,12 @@ func RunVMTest_Hello[T mipsevm.FPVMState](t *testing.T, initState program.Create
 }
 
 func RunVMTest_Claim[T mipsevm.FPVMState](t *testing.T, initState program.CreateInitialFPVMState[T], vmFactory VMFactory[T], doPatchGo bool) {
-	state, _ := LoadELFProgram(t, "../../testdata/example/bin/claim.elf", initState, doPatchGo)
+	state, meta := LoadELFProgram(t, ProgramPath("claim"), initState, doPatchGo)
 
 	oracle, expectedStdOut, expectedStdErr := ClaimTestOracle(t)
 
 	var stdOutBuf, stdErrBuf bytes.Buffer
-	us := vmFactory(state, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), CreateLogger())
+	us := vmFactory(state, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), CreateLogger(), meta)
 
 	for i := 0; i < 2000_000; i++ {
 		if us.GetState().GetExited() {
diff --git a/cannon/testdata/example/Makefile b/cannon/testdata/example/Makefile
index 7b3b8fdf019d..5b0dee96eb9a 100644
--- a/cannon/testdata/example/Makefile
+++ b/cannon/testdata/example/Makefile
@@ -1,7 +1,13 @@
 all: elf
 
+.PHONY: elf32
+elf32: $(patsubst %/go.mod,bin/%.elf,$(wildcard */go.mod))
+
+.PHONY: elf64
+elf64: $(patsubst %/go.mod,bin/%.64.elf,$(wildcard */go.mod))
+
 .PHONY: elf
-elf: $(patsubst %/go.mod,bin/%.elf,$(wildcard */go.mod))
+elf: elf32 elf64
 
 .PHONY: dump
 dump: $(patsubst %/go.mod,bin/%.dump,$(wildcard */go.mod))
@@ -9,6 +15,9 @@ dump: $(patsubst %/go.mod,bin/%.dump,$(wildcard */go.mod))
 bin:
 	mkdir bin
 
+bin/%.64.elf: bin
+	cd $(@:bin/%.64.elf=%) && GOOS=linux GOARCH=mips64 GOMIPS64=softfloat go build -o ../$@ .
+
 # take any directory with a go mod, and build an ELF
 # verify output with: readelf -h bin/<name>.elf
 # result is mips32, big endian, R3000
diff --git a/cannon/testdata/example/alloc/go.mod b/cannon/testdata/example/alloc/go.mod
index a5dd16ce8b27..c364668acc10 100644
--- a/cannon/testdata/example/alloc/go.mod
+++ b/cannon/testdata/example/alloc/go.mod
@@ -1,6 +1,6 @@
 module alloc
 
-go 1.22
+go 1.22.0
 
 toolchain go1.22.7
 
diff --git a/cannon/testdata/example/claim/go.mod b/cannon/testdata/example/claim/go.mod
index dd76391de26b..e3904911a172 100644
--- a/cannon/testdata/example/claim/go.mod
+++ b/cannon/testdata/example/claim/go.mod
@@ -1,6 +1,6 @@
 module claim
 
-go 1.22
+go 1.22.0
 
 toolchain go1.22.7
 
diff --git a/cannon/testdata/example/hello/go.mod b/cannon/testdata/example/hello/go.mod
index b54bb78c6aee..f036b5dc97fc 100644
--- a/cannon/testdata/example/hello/go.mod
+++ b/cannon/testdata/example/hello/go.mod
@@ -1,5 +1,5 @@
 module hello
 
-go 1.22
+go 1.22.0
 
-toolchain go1.22.0
+toolchain go1.22.7
diff --git a/go.mod b/go.mod
index 7478f4a18528..ab9e5725ce87 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ethereum-optimism/optimism
 
-go 1.22
+go 1.22.0
 
 toolchain go1.22.7
 
@@ -47,11 +47,10 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v2 v2.27.5
 	golang.org/x/crypto v0.28.0
-	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
 	golang.org/x/sync v0.8.0
 	golang.org/x/term v0.25.0
 	golang.org/x/time v0.7.0
-	lukechampine.com/uint128 v1.3.0
 )
 
 require (
@@ -95,7 +94,7 @@ require (
 	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
 	github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/felixge/fgprof v0.9.3 // indirect
+	github.com/felixge/fgprof v0.9.5 // indirect
 	github.com/ferranbt/fastssz v0.1.2 // indirect
 	github.com/flynn/noise v1.1.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
@@ -114,7 +113,7 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
-	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
+	github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/graph-gophers/graphql-go v1.3.0 // indirect
@@ -234,11 +233,11 @@ require (
 	go.uber.org/mock v0.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/net v0.30.0 // indirect
 	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/text v0.19.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
 	google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
diff --git a/go.sum b/go.sum
index 7b74fd565d0f..de095722c8b5 100644
--- a/go.sum
+++ b/go.sum
@@ -89,12 +89,18 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs=
+github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs=
+github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
+github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
+github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
 github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
@@ -192,8 +198,9 @@ github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=
 github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw=
+github.com/felixge/fgprof v0.9.5 h1:8+vR6yu2vvSKn08urWyEuxx75NWPEvybbkBirEpsbVY=
+github.com/felixge/fgprof v0.9.5/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZPpayhMM=
 github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=
 github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
@@ -242,6 +249,9 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
 github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY=
 github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
 github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -299,8 +309,9 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
 github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
-github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
-github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c h1:NDovD0SMpBYXlE1zJmS1q55vWB/fUQBcPAqAboZSccA=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -363,6 +374,7 @@ github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFck
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
+github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
 github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k=
 github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8=
 github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c h1:qSHzRbhzK8RdXOsAdfDgO49TtqC1oZ+acxPrkfTxcCs=
@@ -394,6 +406,7 @@ github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZl
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -443,6 +456,7 @@ github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4F
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
+github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
@@ -473,6 +487,7 @@ github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk=
 github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
 github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
@@ -593,6 +608,7 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
@@ -846,8 +862,8 @@ golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1m
 golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
 golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI=
-golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -860,8 +876,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
-golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1021,8 +1037,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
+golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1094,8 +1110,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
 lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
-lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
-lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
 rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
 sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 45944697945e..5b62da033bf0 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -140,12 +140,12 @@
     "sourceCodeHash": "0x2ab6be69795109a1ee04c5693a34d6ce0ff90b62e404cdeb18178bab18d06784"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0x8fb590d45fa06fdc7ae55860827d6b1abf070c9dc5e18cd28176e844fa1da6c9",
-    "sourceCodeHash": "0x01d3d59020ec29ce78f68f977da5b7754455743121bda65626509864ab6c9da9"
+    "initCodeHash": "0x696c3ce334c11d0f9633945babac22b1b65848ff00d2cf6c4cb18116bbf138b2",
+    "sourceCodeHash": "0x3c2e5d6d39b29a60dcd1a776363518c87fcfef9a8d80e38696f56b6eec5bd53a"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0x88acf3297642c2c9e0c1e92b48f59f7015915f25fb816cac44ee0073a1c93ccb",
-    "sourceCodeHash": "0x3dd89839f268569cbf2659beb42e3ac3c53887472cfc94a6e339d2b3a963b941"
+    "initCodeHash": "0x5c292882075bd06e68b89119be9096040bc913f51bb878ce4a9dfdd674330dd5",
+    "sourceCodeHash": "0x17c7b0edb9d20932eaf1b038e3e05e457f0461d2c8691ba1940fb4c2b0dfd123"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS.sol b/packages/contracts-bedrock/src/cannon/MIPS.sol
index 337a2d47ee2b..38989cfc7b7b 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS.sol
@@ -44,8 +44,8 @@ contract MIPS is ISemver {
     }
 
     /// @notice The semantic version of the MIPS contract.
-    /// @custom:semver 1.2.1-beta.4
-    string public constant version = "1.2.1-beta.4";
+    /// @custom:semver 1.2.1-beta.5
+    string public constant version = "1.2.1-beta.5";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index 7946cd0c3362..3f5044f14e04 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -60,8 +60,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.17
-    string public constant version = "1.0.0-beta.17";
+    /// @custom:semver 1.0.0-beta.18
+    string public constant version = "1.0.0-beta.18";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -593,6 +593,10 @@ contract MIPS2 is ISemver {
                 // ignored
             } else if (syscall_no == sys.SYS_TIMERDELETE) {
                 // ignored
+            } else if (syscall_no == sys.SYS_GETRLIMIT) {
+                // ignored
+            } else if (syscall_no == sys.SYS_LSEEK) {
+                // ignored
             } else {
                 if (syscall_no == sys.SYS_FSTAT64 || syscall_no == sys.SYS_STAT64 || syscall_no == sys.SYS_LLSEEK) {
                     // noop
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
index a2402531c82d..eab4a61db65a 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
@@ -7,6 +7,7 @@ import { MIPSState as st } from "src/cannon/libraries/MIPSState.sol";
 library MIPSInstructions {
     uint32 internal constant OP_LOAD_LINKED = 0x30;
     uint32 internal constant OP_STORE_CONDITIONAL = 0x38;
+    uint32 internal constant REG_RA = 31;
 
     struct CoreStepLogicParams {
         /// @param opcode The opcode value parsed from insn_.
@@ -501,6 +502,11 @@ library MIPSInstructions {
                 if (rtv == 1) {
                     shouldBranch = int32(_rs) >= 0;
                 }
+                // bgezal (i.e. bal mnemonic)
+                if (rtv == 0x11) {
+                    shouldBranch = int32(_rs) >= 0;
+                    _registers[REG_RA] = _cpu.pc + 8; // always set regardless of branch taken
+                }
             }
 
             // Update the state's previous PC
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
index 9b5278e052ae..4354163a9d3f 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -71,6 +71,8 @@ library MIPSSyscalls {
     uint32 internal constant SYS_LLSEEK = 4140;
     uint32 internal constant SYS_MINCORE = 4217;
     uint32 internal constant SYS_TGKILL = 4266;
+    uint32 internal constant SYS_GETRLIMIT = 4076;
+    uint32 internal constant SYS_LSEEK = 4019;
 
     // profiling-related syscalls - ignored
     uint32 internal constant SYS_SETITIMER = 4104;

From 3159e0eb4ba2934455d9fa3be0ca0b6a07c4c1d6 Mon Sep 17 00:00:00 2001
From: Gutflo <107882881+klein818@users.noreply.github.com>
Date: Thu, 24 Oct 2024 00:47:06 +0200
Subject: [PATCH 009/451] fix: fix potential error when running without any
 argument (#11812)

---
 packages/contracts-bedrock/scripts/checks/check-snapshots.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/scripts/checks/check-snapshots.sh b/packages/contracts-bedrock/scripts/checks/check-snapshots.sh
index 66a04dc331d4..18557eba52a5 100755
--- a/packages/contracts-bedrock/scripts/checks/check-snapshots.sh
+++ b/packages/contracts-bedrock/scripts/checks/check-snapshots.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 
 # Check for the --no-build flag
 # Generate snapshots
-if [ "$1" == "--no-build" ]; then
+if [ "${1:-}" == "--no-build" ]; then
     just snapshots-no-build
 else
     just snapshots

From 433f488f8e5456cd1f56cf878eb3884e6fff3b16 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 24 Oct 2024 06:40:03 +0700
Subject: [PATCH 010/451] fix(ci): apply return arg fmt rule to tests (#12546)

Applies the semgrep rule for return-arg-fmt to Solidity tests.
---
 .../test/L1/ResourceMetering.t.sol            |  4 ++--
 .../contracts-bedrock/test/L2/L2Genesis.t.sol |  2 +-
 .../contracts-bedrock/test/cannon/MIPS.t.sol  | 20 +++++++++----------
 .../contracts-bedrock/test/cannon/MIPS2.t.sol | 12 +++++------
 .../handlers/Protocol.t.sol                   |  8 ++++----
 .../helpers/HandlerGetters.t.sol              | 12 +++++------
 .../MockL2ToL2CrossDomainMessenger.t.sol      |  4 ++--
 .../test/mocks/TestERC1271Wallet.sol          | 12 +++++++++--
 semgrep/sol-rules.yaml                        |  2 +-
 9 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol b/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
index 6d01cdb30867..18f5ba82283f 100644
--- a/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
+++ b/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
@@ -374,8 +374,8 @@ contract ArtifactResourceMetering_Test is Test {
                                 // Call the metering code and catch the various
                                 // types of errors.
                                 uint256 gasConsumed = 0;
-                                try meter.use{ gas: 30_000_000 }(requestedGas) returns (uint256 _gasConsumed) {
-                                    gasConsumed = _gasConsumed;
+                                try meter.use{ gas: 30_000_000 }(requestedGas) returns (uint256 gasConsumed_) {
+                                    gasConsumed = gasConsumed_;
                                 } catch (bytes memory err) {
                                     bytes32 hash = keccak256(err);
                                     if (hash == cannotBuyMoreGas) {
diff --git a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
index 68fc374178ee..0f5ad085a822 100644
--- a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
@@ -170,7 +170,7 @@ contract L2GenesisTest is Test {
     }
 
     /// @notice Creates mock L1Dependencies for testing purposes.
-    function _dummyL1Deps() internal pure returns (L1Dependencies memory _deps) {
+    function _dummyL1Deps() internal pure returns (L1Dependencies memory deps_) {
         return L1Dependencies({
             l1CrossDomainMessengerProxy: payable(address(0x100000)),
             l1StandardBridgeProxy: payable(address(0x100001)),
diff --git a/packages/contracts-bedrock/test/cannon/MIPS.t.sol b/packages/contracts-bedrock/test/cannon/MIPS.t.sol
index 21710ef1e18e..e4221dfcf66b 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS.t.sol
@@ -1801,22 +1801,22 @@ contract MIPS_Test is CommonTest {
         uint32 val
     )
         internal
-        returns (IMIPS.State memory state, bytes memory proof)
+        returns (IMIPS.State memory state_, bytes memory proof_)
     {
-        (state.memRoot, proof) = ffi.getCannonMemoryProof(pc, insn, addr, val);
-        state.pc = pc;
-        state.nextPC = pc + 4;
+        (state_.memRoot, proof_) = ffi.getCannonMemoryProof(pc, insn, addr, val);
+        state_.pc = pc;
+        state_.nextPC = pc + 4;
     }
 
-    function encodeitype(uint8 opcode, uint8 rs, uint8 rt, uint16 imm) internal pure returns (uint32 insn) {
-        insn = uint32(opcode) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | imm;
+    function encodeitype(uint8 opcode, uint8 rs, uint8 rt, uint16 imm) internal pure returns (uint32 insn_) {
+        insn_ = uint32(opcode) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | imm;
     }
 
-    function encodespec(uint8 rs, uint8 rt, uint8 rd, uint16 funct) internal pure returns (uint32 insn) {
-        insn = uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
+    function encodespec(uint8 rs, uint8 rt, uint8 rd, uint16 funct) internal pure returns (uint32 insn_) {
+        insn_ = uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
     }
 
-    function encodespec2(uint8 rs, uint8 rt, uint8 rd, uint8 funct) internal pure returns (uint32 insn) {
-        insn = uint32(28) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
+    function encodespec2(uint8 rs, uint8 rt, uint8 rd, uint8 funct) internal pure returns (uint32 insn_) {
+        insn_ = uint32(28) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
     }
 }
diff --git a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
index 22eb49b4ef0e..0c2ad04362bb 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
@@ -2832,16 +2832,16 @@ contract MIPS2_Test is CommonTest {
         }
     }
 
-    function encodeitype(uint8 opcode, uint8 rs, uint8 rt, uint16 imm) internal pure returns (uint32 insn) {
-        insn = uint32(opcode) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | imm;
+    function encodeitype(uint8 opcode, uint8 rs, uint8 rt, uint16 imm) internal pure returns (uint32 insn_) {
+        insn_ = uint32(opcode) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | imm;
     }
 
-    function encodespec(uint8 rs, uint8 rt, uint8 rd, uint16 funct) internal pure returns (uint32 insn) {
-        insn = uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
+    function encodespec(uint8 rs, uint8 rt, uint8 rd, uint16 funct) internal pure returns (uint32 insn_) {
+        insn_ = uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
     }
 
-    function encodespec2(uint8 rs, uint8 rt, uint8 rd, uint8 funct) internal pure returns (uint32 insn) {
-        insn = uint32(28) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
+    function encodespec2(uint8 rs, uint8 rt, uint8 rd, uint8 funct) internal pure returns (uint32 insn_) {
+        insn_ = uint32(28) << 26 | uint32(rs) << 21 | uint32(rt) << 16 | uint32(rd) << 11 | uint32(funct);
     }
 }
 
diff --git a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol
index d4a12c4067bd..770be029bbbe 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol
+++ b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol
@@ -151,7 +151,7 @@ contract ProtocolHandler is TestBase, StdUtils, Actors {
         uint256 chainId
     )
         internal
-        returns (OptimismSuperchainERC20 supertoken)
+        returns (OptimismSuperchainERC20 supertoken_)
     {
         // this salt would be used in production. Tokens sharing it will be bridgable with each other
         bytes32 realSalt = keccak256(abi.encode(remoteToken, name, symbol, decimals));
@@ -162,7 +162,7 @@ contract ProtocolHandler is TestBase, StdUtils, Actors {
         // what we use in the tests to walk around two contracts needing two different addresses
         // tbf we could be using CREATE1, but this feels more verbose
         bytes32 hackySalt = keccak256(abi.encode(remoteToken, name, symbol, decimals, chainId));
-        supertoken = OptimismSuperchainERC20(
+        supertoken_ = OptimismSuperchainERC20(
             address(
                 // TODO: Use the OptimismSuperchainERC20 Beacon Proxy
                 new ERC1967Proxy{ salt: hackySalt }(
@@ -171,7 +171,7 @@ contract ProtocolHandler is TestBase, StdUtils, Actors {
                 )
             )
         );
-        MESSENGER.registerSupertoken(realSalt, chainId, address(supertoken));
-        allSuperTokens.push(address(supertoken));
+        MESSENGER.registerSupertoken(realSalt, chainId, address(supertoken_));
+        allSuperTokens.push(address(supertoken_));
     }
 }
diff --git a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/HandlerGetters.t.sol b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/HandlerGetters.t.sol
index b081aa48c6bb..d072dc92165b 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/HandlerGetters.t.sol
+++ b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/HandlerGetters.t.sol
@@ -7,16 +7,16 @@ import { EnumerableMap } from "@openzeppelin/contracts/utils/structs/EnumerableM
 contract HandlerGetters is ProtocolHandler {
     using EnumerableMap for EnumerableMap.Bytes32ToUintMap;
 
-    function deploySaltsLength() external view returns (uint256 length) {
+    function deploySaltsLength() external view returns (uint256 length_) {
         return ghost_totalSupplyAcrossChains.length();
     }
 
-    function totalSupplyAcrossChainsAtIndex(uint256 index) external view returns (bytes32 salt, uint256 supply) {
-        return ghost_totalSupplyAcrossChains.at(index);
+    function totalSupplyAcrossChainsAtIndex(uint256 _index) external view returns (bytes32 salt_, uint256 supply_) {
+        return ghost_totalSupplyAcrossChains.at(_index);
     }
 
-    function tokensInTransitForDeploySalt(bytes32 salt) external view returns (uint256 amount) {
-        (, amount) = ghost_tokensInTransit.tryGet(salt);
-        return amount;
+    function tokensInTransitForDeploySalt(bytes32 _salt) external view returns (uint256 amount_) {
+        (, amount_) = ghost_tokensInTransit.tryGet(_salt);
+        return amount_;
     }
 }
diff --git a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol
index b5d70596ed63..2d4a57c46c3c 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol
@@ -112,7 +112,7 @@ contract MockL2ToL2CrossDomainMessenger {
     //  Internal helpers  //
     ////////////////////////
 
-    function _decodePayload(bytes calldata payload) internal pure returns (address recipient, uint256 amount) {
-        (, recipient, amount) = abi.decode(payload[4:], (address, address, uint256));
+    function _decodePayload(bytes calldata payload) internal pure returns (address recipient_, uint256 amount_) {
+        (, recipient_, amount_) = abi.decode(payload[4:], (address, address, uint256));
     }
 }
diff --git a/packages/contracts-bedrock/test/mocks/TestERC1271Wallet.sol b/packages/contracts-bedrock/test/mocks/TestERC1271Wallet.sol
index c04ed608b7d7..6e2ef47f67e6 100644
--- a/packages/contracts-bedrock/test/mocks/TestERC1271Wallet.sol
+++ b/packages/contracts-bedrock/test/mocks/TestERC1271Wallet.sol
@@ -13,7 +13,15 @@ contract TestERC1271Wallet is Ownable, IERC1271 {
         transferOwnership(originalOwner);
     }
 
-    function isValidSignature(bytes32 hash, bytes memory signature) public view override returns (bytes4 magicValue) {
-        return ECDSA.recover(hash, signature) == owner() ? this.isValidSignature.selector : bytes4(0);
+    function isValidSignature(
+        bytes32 _hash,
+        bytes memory _signature
+    )
+        public
+        view
+        override
+        returns (bytes4 magicValue_)
+    {
+        return ECDSA.recover(_hash, _signature) == owner() ? this.isValidSignature.selector : bytes4(0);
     }
 }
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 3c7422c25ed3..7074fe2daff0 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -65,7 +65,7 @@ rules:
     paths:
       exclude:
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
-        - packages/contracts-bedrock/test
+        - packages/contracts-bedrock/test/safe-tools
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
         - packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol

From 280bac53d5cec211923efd8dae3848559ec6c65c Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Thu, 24 Oct 2024 09:52:09 +1000
Subject: [PATCH 011/451] op-dispute-mon: Fix flaky test that was dependent on
 map ordering (#12606)

---
 op-dispute-mon/mon/extract/extractor_test.go | 28 +++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/op-dispute-mon/mon/extract/extractor_test.go b/op-dispute-mon/mon/extract/extractor_test.go
index ee4b8a63ee25..cc0605714a04 100644
--- a/op-dispute-mon/mon/extract/extractor_test.go
+++ b/op-dispute-mon/mon/extract/extractor_test.go
@@ -155,7 +155,12 @@ func TestExtractor_Extract(t *testing.T) {
 	})
 
 	t.Run("UseCachedValueOnFailure", func(t *testing.T) {
-		enricher := &mockEnricher{}
+		enricher := &mockEnricher{
+			action: func(game *monTypes.EnrichedGameData) error {
+				game.Status = gameTypes.GameStatusDefenderWon
+				return nil
+			},
+		}
 		extractor, _, games, _, cl := setupExtractorTest(t, enricher)
 		gameA := common.Address{0xaa}
 		gameB := common.Address{0xbb}
@@ -169,8 +174,10 @@ func TestExtractor_Extract(t *testing.T) {
 		require.Len(t, enriched, 2)
 		require.Equal(t, 2, enricher.calls)
 		firstUpdateTime := cl.Now()
-		require.Equal(t, firstUpdateTime, enriched[0].LastUpdateTime)
-		require.Equal(t, firstUpdateTime, enriched[1].LastUpdateTime)
+		// All results should have current LastUpdateTime
+		for _, data := range enriched {
+			require.Equal(t, firstUpdateTime, data.LastUpdateTime)
+		}
 
 		cl.AdvanceTime(2 * time.Minute)
 		secondUpdateTime := cl.Now()
@@ -189,10 +196,17 @@ func TestExtractor_Extract(t *testing.T) {
 		require.Equal(t, 1, failed)
 		require.Len(t, enriched, 2)
 		require.Equal(t, 4, enricher.calls)
-		require.Equal(t, enriched[0].Status, gameTypes.GameStatusInProgress)    // Uses cached value from game A
-		require.Equal(t, enriched[1].Status, gameTypes.GameStatusChallengerWon) // Updates game B
-		require.Equal(t, firstUpdateTime, enriched[0].LastUpdateTime)
-		require.Equal(t, secondUpdateTime, enriched[1].LastUpdateTime)
+		// The returned games are not in a fixed order, create a map to look up the game we need to assert
+		actual := make(map[common.Address]*monTypes.EnrichedGameData)
+		for _, data := range enriched {
+			actual[data.Proxy] = data
+		}
+		require.Contains(t, actual, gameA)
+		require.Contains(t, actual, gameB)
+		require.Equal(t, actual[gameA].Status, gameTypes.GameStatusDefenderWon)   // Uses cached value from game A
+		require.Equal(t, actual[gameB].Status, gameTypes.GameStatusChallengerWon) // Updates game B
+		require.Equal(t, firstUpdateTime, actual[gameA].LastUpdateTime)
+		require.Equal(t, secondUpdateTime, actual[gameB].LastUpdateTime)
 	})
 }
 

From 03e0b881aa3aceccbbbadaaafe8b804f16542241 Mon Sep 17 00:00:00 2001
From: rickck11 <rick32377@gmail.com>
Date: Wed, 23 Oct 2024 21:02:55 -0300
Subject: [PATCH 012/451] test-kontrol: optimize the doc (#12065)

* optimize the doc

* small fix

* reomve outdated content
---
 packages/contracts-bedrock/test/kontrol/README.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/contracts-bedrock/test/kontrol/README.md b/packages/contracts-bedrock/test/kontrol/README.md
index 25660756963c..7e4dc5a2809a 100644
--- a/packages/contracts-bedrock/test/kontrol/README.md
+++ b/packages/contracts-bedrock/test/kontrol/README.md
@@ -115,12 +115,6 @@ The `runKontrolDeployment` function of [`KontrolDeployment`](./deployment/Kontro
 
 Once new deployment steps have been added to `runKontrolDeployment` the state-diff files have to [be rebuilt](#build-deployment-summary).
 
-#### Include existing tests on the new state-diff recorded bytecode
-
-The next step is to include tests for the newly included state updates in [`DeploymentSummary.t.sol`](deployment/DeploymentSummary.t.sol). These tests inherit the tests from [`test`](../L1) of the contracts deployed by `runKontrolDeployment`. This ensures that deployment steps were implemented correctly and that the state updates are correct.
-
-It might be necessary to set some of the existing tests from [`test`](../L1) as virtual because they can't be executed as is. See [`DeploymentSummary.t.sol`](deployment/DeploymentSummary.t.sol) for more concrete examples.
-
 #### Write the proof
 
 Write your proof in a `.k.sol` file in the [`proofs`](./proofs/) folder, which is the `test` directory used by the `kprove` profile to run the proofs (see [Deployment Summary Process](#deployment-summary-process)). The name of the new proofs should start with `prove` (or `check`) instead of `test` to avoid `forge test` running them. The reason for this is that if Kontrol cheatcodes (see [Kontrol's own cheatcodes](https://github.com/runtimeverification/kontrol-cheatcodes/blob/master/src/KontrolCheats.sol)) are used in a test, it will not be runnable by `forge`. Currently, none of the tests are using custom Kontrol cheatcodes, but this is something to bear in mind.
@@ -143,8 +137,7 @@ function setUp() public {
     superchainConfig = SuperchainConfig(superchainConfigProxyAddress);
 }
 ```
-
-Note that the names of the addresses come from [`DeploymentSummary.t.sol`](deployment/DeploymentSummary.t.sol) and are automatically generated by the [`make-summary-deployment.sh`](./scripts/make-summary-deployment.sh) script.
+Note that the names of the addresses are automatically generated by the [`make-summary-deployment.sh`](./scripts/make-summary-deployment.sh) script.
 
 #### Add your test to [`run-kontrol.sh`](./scripts/run-kontrol.sh)
 
@@ -155,7 +148,6 @@ As described in [Execute Proofs](#execute-proofs), there's a `script` mode for s
 ### Assumptions
 
 1. A critical invariant of the `KontrolDeployment.sol` contract is that it stays in sync with the original `Deploy.s.sol` contract.
-   Currently, this is partly enforced by running some of the standard post-`setUp` deployment assertions in `DeploymentSummary.t.sol`.
    A more rigorous approach may be to leverage the `ChainAssertions` library, but more investigation is required to determine if this is feasible without large changes to the deploy script.
 
 2. Size of `bytes[]` arguments. In [`OptimismPortal.k.sol`](./proofs/OptimismPortal.k.sol), the `prove_proveWithdrawalTransaction_paused` proof is broken down into 11 different proofs, each corresponding to a different size of the `_withdrawalProof` argument, which is of type `bytes[]`. We execute the same logic for lengths of `_withdrawalProof` ranging from 0 to 10, setting the length of each symbolic `bytes` element to 600.

From 532a1464181ea7cc954d04d40e609dd73d270fcb Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Wed, 23 Oct 2024 20:33:47 -0400
Subject: [PATCH 013/451] chore(op-service): Add missing fields to blob API
 types (#12602)

* inclusion proof

* fix test

* add inclusion proof

* goimports
---
 op-e2e/e2eutils/fakebeacon/blobs.go | 1 +
 op-service/eth/blobs_api.go         | 9 +++++----
 op-service/eth/blobs_api_test.go    | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/op-e2e/e2eutils/fakebeacon/blobs.go b/op-e2e/e2eutils/fakebeacon/blobs.go
index a96042bc7add..4ec516926742 100644
--- a/op-e2e/e2eutils/fakebeacon/blobs.go
+++ b/op-e2e/e2eutils/fakebeacon/blobs.go
@@ -127,6 +127,7 @@ func (f *FakeBeacon) Start(addr string) error {
 						Slot:      eth.Uint64String(slot),
 					},
 				},
+				InclusionProof: make([]eth.Bytes32, 0),
 			}
 			copy(sidecars[i].Blob[:], bundle.Blobs[ix])
 		}
diff --git a/op-service/eth/blobs_api.go b/op-service/eth/blobs_api.go
index 3dbff1745bc2..239f97528ede 100644
--- a/op-service/eth/blobs_api.go
+++ b/op-service/eth/blobs_api.go
@@ -1,5 +1,7 @@
 package eth
 
+import "github.com/ethereum/go-ethereum/common/hexutil"
+
 type BlobSidecar struct {
 	Blob          Blob         `json:"blob"`
 	Index         Uint64String `json:"index"`
@@ -13,8 +15,7 @@ type APIBlobSidecar struct {
 	KZGCommitment     Bytes48                 `json:"kzg_commitment"`
 	KZGProof          Bytes48                 `json:"kzg_proof"`
 	SignedBlockHeader SignedBeaconBlockHeader `json:"signed_block_header"`
-	// The inclusion-proof of the blob-sidecar into the beacon-block is ignored,
-	// since we verify blobs by their versioned hashes against the execution-layer block instead.
+	InclusionProof    []Bytes32               `json:"kzg_commitment_inclusion_proof"`
 }
 
 func (sc *APIBlobSidecar) BlobSidecar() *BlobSidecar {
@@ -27,8 +28,8 @@ func (sc *APIBlobSidecar) BlobSidecar() *BlobSidecar {
 }
 
 type SignedBeaconBlockHeader struct {
-	Message BeaconBlockHeader `json:"message"`
-	// signature is ignored, since we verify blobs against EL versioned-hashes
+	Message   BeaconBlockHeader `json:"message"`
+	Signature hexutil.Bytes     `json:"signature"`
 }
 
 type BeaconBlockHeader struct {
diff --git a/op-service/eth/blobs_api_test.go b/op-service/eth/blobs_api_test.go
index 7c585cb7ac99..babad4a50537 100644
--- a/op-service/eth/blobs_api_test.go
+++ b/op-service/eth/blobs_api_test.go
@@ -82,17 +82,19 @@ func TestAPIGetBlobSidecarsResponse(t *testing.T) {
 	var resp eth.APIGetBlobSidecarsResponse
 	require.NoError(json.Unmarshal(jsonStr, &resp))
 	require.NotEmpty(resp.Data)
-	require.Equal(5, reflect.TypeOf(*resp.Data[0]).NumField(), "APIBlobSidecar changed, adjust test")
-	require.Equal(1, reflect.TypeOf(resp.Data[0].SignedBlockHeader).NumField(), "SignedBeaconBlockHeader changed, adjust test")
+	require.Equal(6, reflect.TypeOf(*resp.Data[0]).NumField(), "APIBlobSidecar changed, adjust test")
+	require.Equal(2, reflect.TypeOf(resp.Data[0].SignedBlockHeader).NumField(), "SignedBeaconBlockHeader changed, adjust test")
 	require.Equal(5, reflect.TypeOf(resp.Data[0].SignedBlockHeader.Message).NumField(), "BeaconBlockHeader changed, adjust test")
 
 	require.NotZero(resp.Data[0].Blob)
 	require.NotZero(resp.Data[1].Index)
 	require.NotZero(resp.Data[0].KZGCommitment)
 	require.NotZero(resp.Data[0].KZGProof)
+	require.NotZero(resp.Data[0].InclusionProof)
 	require.NotZero(resp.Data[0].SignedBlockHeader.Message.Slot)
 	require.NotZero(resp.Data[0].SignedBlockHeader.Message.ParentRoot)
 	require.NotZero(resp.Data[0].SignedBlockHeader.Message.BodyRoot)
 	require.NotZero(resp.Data[0].SignedBlockHeader.Message.ProposerIndex)
 	require.NotZero(resp.Data[0].SignedBlockHeader.Message.StateRoot)
+	require.NotZero(resp.Data[0].SignedBlockHeader.Signature)
 }

From 6ec241be4d0b9da4ffa1bd0c56079d9b998532b1 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 24 Oct 2024 10:53:23 +0700
Subject: [PATCH 014/451] maint(ci): bump heavy fuzz runs (#12605)

Bumps the number of heavy fuzz runs to 20k. 10k recently missed a
flake so bumping to 20k to try to avoid that in the future. Not
perfect but it will reduce the probability a bit. Developers can
still manually set the number of fuzz runs for a particular test
with annotations if 20k is too high.
---
 packages/contracts-bedrock/foundry.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index b173f71abc33..59b16410f3a4 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -76,7 +76,7 @@ runs = 256
 depth = 32
 
 [profile.ciheavy]
-fuzz = { runs = 10000 }
+fuzz = { runs = 20000 }
 
 [profile.ciheavy.invariant]
 runs = 128

From 898383f1a6d1ce44e06da15fa029971303fdf92f Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 23 Oct 2024 21:55:49 -0600
Subject: [PATCH 015/451] op-e2e: Attempt fix for alt-da test flakiness
 (#12603)

This test fails a lot when executors are under load. This PR changes the test to find the first block with more than one batcher transaction in it, which should be sufficient to assert that the batcher is submitting multiple transactions at once.
---
 op-e2e/system/altda/concurrent_test.go | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/op-e2e/system/altda/concurrent_test.go b/op-e2e/system/altda/concurrent_test.go
index 4d6835b1fc55..a2ad1f8bcbb8 100644
--- a/op-e2e/system/altda/concurrent_test.go
+++ b/op-e2e/system/altda/concurrent_test.go
@@ -55,23 +55,20 @@ func TestBatcherConcurrentAltDARequests(t *testing.T) {
 	err = driver.StartBatchSubmitting()
 	require.NoError(t, err)
 
-	totalBatcherTxsCount := int64(0)
-	// wait for up to 5 L1 blocks, expecting 10 L2 batcher txs in them.
-	// usually only 3 is required, but it's possible additional L1 blocks will be created
-	// before the batcher starts, so we wait additional blocks.
-	for i := int64(0); i < 5; i++ {
-		block, err := geth.WaitForBlock(big.NewInt(int64(startingL1BlockNum)+i), l1Client, time.Duration(cfg.DeployConfig.L1BlockTime*2)*time.Second)
+	// Iterate over up to 10 blocks. The number of transactions sent by the batcher should
+	// exceed the number of blocks.
+	checkBlocks := 10
+	for i := 0; i < checkBlocks; i++ {
+		block, err := geth.WaitForBlock(big.NewInt(int64(startingL1BlockNum)+int64(i)), l1Client, time.Duration(cfg.DeployConfig.L1BlockTime*2)*time.Second)
 		require.NoError(t, err, "Waiting for l1 blocks")
 		// there are possibly other services (proposer/challenger) in the background sending txs
 		// so we only count the batcher txs
 		batcherTxCount, err := transactions.TransactionsBySender(block, cfg.DeployConfig.BatchSenderAddress)
 		require.NoError(t, err)
-		totalBatcherTxsCount += int64(batcherTxCount)
-
-		if totalBatcherTxsCount >= numL1TxsExpected {
+		if batcherTxCount > 1 {
 			return
 		}
 	}
 
-	t.Fatal("Expected at least 10 transactions from the batcher")
+	t.Fatalf("did not find more than 1 batcher tx per block in %d blocks", checkBlocks)
 }

From 5f2cc843fde7960cb2bc907542b528260a3f5f6f Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Thu, 24 Oct 2024 14:41:19 +1000
Subject: [PATCH 016/451] op-challenger: Add some info on run-trace to the
 README (#12607)

---
 op-challenger/README.md | 46 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/op-challenger/README.md b/op-challenger/README.md
index 69420e419cfa..3274dc47d808 100644
--- a/op-challenger/README.md
+++ b/op-challenger/README.md
@@ -23,6 +23,7 @@ accessed by running `./op-challenger --help`.
 
 To run `op-challenger` against the local devnet, first clean and run
 the devnet from the root of the repository.
+
 ```shell
 make devnet-clean
 make devnet-up
@@ -31,6 +32,7 @@ make devnet-up
 Then build the `op-challenger` with `make op-challenger`.
 
 Run the `op-challenger` with:
+
 ```shell
 DISPUTE_GAME_FACTORY=$(jq -r .DisputeGameFactoryProxy .devnet/addresses.json)
 ./op-challenger/bin/op-challenger \
@@ -85,6 +87,9 @@ in the L2 output oracle.
 Optionally, you may specify the game type (aka "trace type") using the `--trace-type`
 flag, which is set to the cannon trace type by default.
 
+For known networks, the `--game-factory-address` option can be replaced by `--network`. See the `--help` output for a
+list of predefined networks.
+
 ### move
 
 The `move` subcommand can be run with either the `--attack` or `--defend` flag,
@@ -154,7 +159,7 @@ If the game is resolved successfully, the result is printed.
 ```shell
 ./bin/op-challenger list-games \
   --l1-eth-rpc <L1_ETH_RPC> \
-  --network <Predefined_Network>
+  --game-factory-address <GAME_FACTORY_ADDRESS>
 ```
 
 Prints the games created by the game factory along with their current status.
@@ -162,6 +167,9 @@ Prints the games created by the game factory along with their current status.
 * `L1_ETH_RPC` - the RPC endpoint of the L1 endpoint to use (e.g. `http://localhost:8545`).
 * `GAME_FACTORY_ADDRESS` - the address of the dispute game factory contract on L1.
 
+For known networks, the `--game-factory-address` option can be replaced by `--network`. See the `--help` output for a
+list of predefined networks.
+
 ### list-claims
 
 ```shell
@@ -174,3 +182,39 @@ Prints the list of current claims in a dispute game.
 
 * `L1_ETH_RPC` - the RPC endpoint of the L1 endpoint to use (e.g. `http://localhost:8545`).
 * `GAME_ADDRESS` - the address of the dispute game to list the move in.
+
+### run-trace
+
+```shell
+./bin/op-challenger run-trace \
+  --network <PREDEFINED_NETWORK> \
+  --l1-eth-rpc=<L1_ETH_RPC> \
+  --l1-beacon=<L1_BEACON> \
+  --l2-eth-rpc=<L2_ETH_RPC> \
+  --rollup-rpc=<ROLLUP_RPC> \
+  --data-dir=<DATA_DIR> \
+  --prestates-url=<PRESTATES_URL> \
+  --run=<RUN_CONFIG>
+```
+
+* `PREDEFINED_NETWORK` - the name of a predefined L2 network.
+* `L1_ETH_RPC` - the RPC endpoint of the L1 endpoint to use (e.g. `http://localhost:8545`).
+* `L1_BEACON` - the REST endpoint of the L1 beacon node to use (e.g. `http://localhost:5100`).
+* `L2_ETH_RPC` - the RPC endpoint of the L2 execution client to use
+* `ROLLUP_RPC` - the RPC endpoint of the L2 consensus client to use
+* `DATA_DIR` - the directory to use to store data
+* `PRESTATES_URL` - the base URL to download required prestates from
+* `RUN_CONFIG` - the trace providers and prestates to run. e.g. `cannon,asterisc-kona/kona-0.1.0-alpha.5/0x03c50fbef46a05f93ea7665fa89015c2108e10c1b4501799c0663774bd35a9c5`
+
+Testing utility that continuously runs the specified trace providers against real chain data. The trace providers can be
+configured with multiple different prestates. This allows testing both the current and potential future prestates with
+the fault proofs virtual machine used by the trace provider.
+
+The same CLI options as `op-challenger` itself are supported to configure the trace providers. The additional `--run`
+option allows specifying which prestates to use. The format is `traceType/name/prestateHash` where traceType is the
+trace type to use with the prestate (e.g cannon or asterisc-kona), name is an arbitrary name for the prestate to use
+when reporting metrics and prestateHash is the hex encoded absolute prestate commitment to use. If name is omitted the
+trace type name is used.If the prestateHash is omitted, the absolute prestate hash used for new games on-chain.
+
+For example to run both the production cannon prestate and a custom
+prestate, use `--run cannon,cannon/next-prestate/0x03c1f0d45248190f80430a4c31e24f8108f05f80ff8b16ecb82d20df6b1b43f3`.

From c23daa008fa7a9757c484cdddcd29d75f18ca298 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 24 Oct 2024 14:51:54 +0700
Subject: [PATCH 017/451] maint(ci): apply expectRevert rule to tests (#12543)

Updates semgrep config to apply expectRevert to tests. Fixes a few
instances where this wasn't being followed.
---
 packages/contracts-bedrock/test/L2/ETHLiquidity.t.sol          | 2 +-
 packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol        | 2 +-
 .../contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol     | 2 +-
 semgrep/sol-rules.yaml                                         | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/contracts-bedrock/test/L2/ETHLiquidity.t.sol b/packages/contracts-bedrock/test/L2/ETHLiquidity.t.sol
index d9d2d92a8928..9814e776b2e5 100644
--- a/packages/contracts-bedrock/test/L2/ETHLiquidity.t.sol
+++ b/packages/contracts-bedrock/test/L2/ETHLiquidity.t.sol
@@ -105,7 +105,7 @@ contract ETHLiquidity_Test is CommonTest {
         uint256 amount = STARTING_LIQUIDITY_BALANCE + 1;
 
         // Act
-        vm.expectRevert();
+        vm.expectRevert(); // nosemgrep: sol-safety-expectrevert-no-args
         ethLiquidity.mint(amount);
 
         // Assert
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index aa8eaab09939..4710274baac5 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -314,7 +314,7 @@ contract SuperchainWETH_Test is CommonTest {
         superchainWeth.deposit{ value: _amount }();
 
         // Act
-        vm.expectRevert();
+        vm.expectRevert(); // nosemgrep: sol-safety-expectrevert-no-args
         superchainWeth.crosschainBurn(_from, _amount + 1);
     }
 
diff --git a/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol b/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol
index 7b5c7c6357b2..781ada343335 100644
--- a/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol
+++ b/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol
@@ -351,7 +351,7 @@ contract MerkleTrie_get_Test is Test {
 
         // Ambiguous revert check- all that we care is that it *does* fail. This case may
         // fail within different branches.
-        vm.expectRevert();
+        vm.expectRevert(); // nosemgrep: sol-safety-expectrevert-no-args
         MerkleTrie.get(key, proof, root);
     }
 
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 7074fe2daff0..81b128f229b2 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -37,7 +37,7 @@ rules:
       - pattern: vm.expectRevert()
     paths:
       exclude:
-        - packages/contracts-bedrock/test
+        - packages/contracts-bedrock/test/dispute/WETH98.t.sol
 
   - id: sol-style-input-arg-fmt
     languages: [solidity]
@@ -80,7 +80,6 @@ rules:
       exclude:
         - packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol
 
-
   - id: sol-style-malformed-require
     languages: [solidity]
     severity: ERROR

From 196613d916bbb866f87391b43bc76cb2259abd4a Mon Sep 17 00:00:00 2001
From: Disco <131301107+0xDiscotech@users.noreply.github.com>
Date: Thu, 24 Oct 2024 05:01:40 -0300
Subject: [PATCH 018/451] feat: support permit2 on superchainweth (#12596)

* feat: support permit2 on superchainweth

* chore: run pre-pr

---------

Co-authored-by: agusduha <agusnduha@gmail.com>
Co-authored-by: gotzenx <78360669+gotzenx@users.noreply.github.com>
---
 packages/contracts-bedrock/semver-lock.json   | 12 +--
 .../snapshots/abi/DelayedWETH.json            |  6 +-
 .../snapshots/abi/SuperchainWETH.json         |  6 +-
 .../contracts-bedrock/snapshots/abi/WETH.json |  6 +-
 .../snapshots/abi/WETH98.json                 |  6 +-
 .../snapshots/storageLayout/DelayedWETH.json  |  4 +-
 .../storageLayout/SuperchainWETH.json         |  4 +-
 .../snapshots/storageLayout/WETH.json         |  4 +-
 .../snapshots/storageLayout/WETH98.json       |  4 +-
 .../src/L2/SuperchainWETH.sol                 | 15 +++-
 packages/contracts-bedrock/src/L2/WETH.sol    |  4 +-
 .../src/dispute/DelayedWETH.sol               |  6 +-
 .../src/universal/WETH98.sol                  | 35 +++++---
 .../test/L2/SuperchainWETH.t.sol              | 80 +++++++++++++++++++
 14 files changed, 145 insertions(+), 47 deletions(-)

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 5b62da033bf0..26828dd40f8e 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -132,12 +132,12 @@
     "sourceCodeHash": "0x4f539e9d9096d31e861982b8f751fa2d7de0849590523375cf92e175294d1036"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0xc120d1fd9edd8aa392cf112859a3a3907c3b5d55132d6a5edd80ff1d6b6baeaa",
-    "sourceCodeHash": "0x445f088aa91fafde43f558f34da4b9f85b82e6a76f8b2dec9563838eb4335928"
+    "initCodeHash": "0xc72cb486b815a65daa8bd5d0af8c965b6708cf8caf03de0a18023a63a6e6c604",
+    "sourceCodeHash": "0x39fff1d4702a2fec3dcba29c7f9604eabf20d32e9c5bf4377edeb620624aa467"
   },
   "src/L2/WETH.sol": {
-    "initCodeHash": "0xfb253765520690623f177941c2cd9eba23e4c6d15063bccdd5e98081329d8956",
-    "sourceCodeHash": "0x2ab6be69795109a1ee04c5693a34d6ce0ff90b62e404cdeb18178bab18d06784"
+    "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
+    "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0x696c3ce334c11d0f9633945babac22b1b65848ff00d2cf6c4cb18116bbf138b2",
@@ -156,8 +156,8 @@
     "sourceCodeHash": "0x1d918a536d9f6c900efdf069e96c2a27bb49340d6d1ebaa92dd6b481835a9a82"
   },
   "src/dispute/DelayedWETH.sol": {
-    "initCodeHash": "0x835b322de7d5c84b415e99f2cb1000411df18995b5476f2116ac6f897f2d0910",
-    "sourceCodeHash": "0xdbd64724b73f8f9d6f1cc72bb662a99b9955ab72950a8f6ffeb1d2454997f60b"
+    "initCodeHash": "0xb31e0ff80fd69bc3f3b7d53f3fa42da4cdae393e41b8816719ce5ebe3d248688",
+    "sourceCodeHash": "0x1dfc68560c0805faa78360e3d4ef2d768e2f3d6c0c7183d2077a2c4277c778db"
   },
   "src/dispute/DisputeGameFactory.sol": {
     "initCodeHash": "0xd72eced7cb5400d93188038a707fe6c1b04077f059cd8e2f5253e871de2cee3b",
diff --git a/packages/contracts-bedrock/snapshots/abi/DelayedWETH.json b/packages/contracts-bedrock/snapshots/abi/DelayedWETH.json
index a84394e6b003..a6f0dd660468 100644
--- a/packages/contracts-bedrock/snapshots/abi/DelayedWETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/DelayedWETH.json
@@ -22,12 +22,12 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "owner",
         "type": "address"
       },
       {
         "internalType": "address",
-        "name": "",
+        "name": "spender",
         "type": "address"
       }
     ],
@@ -70,7 +70,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "src",
         "type": "address"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
index d76246faf218..fe53a4cbfb5e 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
@@ -11,12 +11,12 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "owner",
         "type": "address"
       },
       {
         "internalType": "address",
-        "name": "",
+        "name": "spender",
         "type": "address"
       }
     ],
@@ -59,7 +59,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "src",
         "type": "address"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/WETH.json b/packages/contracts-bedrock/snapshots/abi/WETH.json
index 9430e99a4c85..03cf2880ccce 100644
--- a/packages/contracts-bedrock/snapshots/abi/WETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/WETH.json
@@ -11,12 +11,12 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "owner",
         "type": "address"
       },
       {
         "internalType": "address",
-        "name": "",
+        "name": "spender",
         "type": "address"
       }
     ],
@@ -59,7 +59,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "src",
         "type": "address"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/WETH98.json b/packages/contracts-bedrock/snapshots/abi/WETH98.json
index 364d6b0591dc..019b5c37a1af 100644
--- a/packages/contracts-bedrock/snapshots/abi/WETH98.json
+++ b/packages/contracts-bedrock/snapshots/abi/WETH98.json
@@ -11,12 +11,12 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "owner",
         "type": "address"
       },
       {
         "internalType": "address",
-        "name": "",
+        "name": "spender",
         "type": "address"
       }
     ],
@@ -59,7 +59,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "src",
         "type": "address"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/DelayedWETH.json b/packages/contracts-bedrock/snapshots/storageLayout/DelayedWETH.json
index 4e8b771cd9bb..6fdbd4718b69 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/DelayedWETH.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/DelayedWETH.json
@@ -36,14 +36,14 @@
   },
   {
     "bytes": "32",
-    "label": "balanceOf",
+    "label": "_balanceOf",
     "offset": 0,
     "slot": "101",
     "type": "mapping(address => uint256)"
   },
   {
     "bytes": "32",
-    "label": "allowance",
+    "label": "_allowance",
     "offset": 0,
     "slot": "102",
     "type": "mapping(address => mapping(address => uint256))"
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/SuperchainWETH.json b/packages/contracts-bedrock/snapshots/storageLayout/SuperchainWETH.json
index ac5f38a75a04..93eac8f28429 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/SuperchainWETH.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/SuperchainWETH.json
@@ -1,14 +1,14 @@
 [
   {
     "bytes": "32",
-    "label": "balanceOf",
+    "label": "_balanceOf",
     "offset": 0,
     "slot": "0",
     "type": "mapping(address => uint256)"
   },
   {
     "bytes": "32",
-    "label": "allowance",
+    "label": "_allowance",
     "offset": 0,
     "slot": "1",
     "type": "mapping(address => mapping(address => uint256))"
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/WETH.json b/packages/contracts-bedrock/snapshots/storageLayout/WETH.json
index ac5f38a75a04..93eac8f28429 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/WETH.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/WETH.json
@@ -1,14 +1,14 @@
 [
   {
     "bytes": "32",
-    "label": "balanceOf",
+    "label": "_balanceOf",
     "offset": 0,
     "slot": "0",
     "type": "mapping(address => uint256)"
   },
   {
     "bytes": "32",
-    "label": "allowance",
+    "label": "_allowance",
     "offset": 0,
     "slot": "1",
     "type": "mapping(address => mapping(address => uint256))"
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/WETH98.json b/packages/contracts-bedrock/snapshots/storageLayout/WETH98.json
index ac5f38a75a04..93eac8f28429 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/WETH98.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/WETH98.json
@@ -1,14 +1,14 @@
 [
   {
     "bytes": "32",
-    "label": "balanceOf",
+    "label": "_balanceOf",
     "offset": 0,
     "slot": "0",
     "type": "mapping(address => uint256)"
   },
   {
     "bytes": "32",
-    "label": "allowance",
+    "label": "_allowance",
     "offset": 0,
     "slot": "1",
     "type": "mapping(address => mapping(address => uint256))"
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index a9242d9d0ab3..e03b689ba150 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -6,6 +6,7 @@ import { WETH98 } from "src/universal/WETH98.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -22,8 +23,8 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 ///         do not use a custom gas token.
 contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.8
-    string public constant version = "1.0.0-beta.8";
+    /// @custom:semver 1.0.0-beta.9
+    string public constant version = "1.0.0-beta.9";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
@@ -37,11 +38,17 @@ contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
         super.withdraw(_amount);
     }
 
+    /// @inheritdoc WETH98
+    function allowance(address owner, address spender) public view override returns (uint256) {
+        if (spender == Preinstalls.Permit2) return type(uint256).max;
+        return super.allowance(owner, spender);
+    }
+
     /// @notice Mints WETH to an address.
     /// @param _to The address to mint WETH to.
     /// @param _amount The amount of WETH to mint.
     function _mint(address _to, uint256 _amount) internal {
-        balanceOf[_to] += _amount;
+        _balanceOf[_to] += _amount;
         emit Transfer(address(0), _to, _amount);
     }
 
@@ -49,7 +56,7 @@ contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
     /// @param _from The address to burn WETH from.
     /// @param _amount The amount of WETH to burn.
     function _burn(address _from, uint256 _amount) internal {
-        balanceOf[_from] -= _amount;
+        _balanceOf[_from] -= _amount;
         emit Transfer(_from, address(0), _amount);
     }
 
diff --git a/packages/contracts-bedrock/src/L2/WETH.sol b/packages/contracts-bedrock/src/L2/WETH.sol
index fb24f0747338..dacd62c36de9 100644
--- a/packages/contracts-bedrock/src/L2/WETH.sol
+++ b/packages/contracts-bedrock/src/L2/WETH.sol
@@ -14,8 +14,8 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 /// @title WETH contract that reads the name and symbol from the L1Block contract.
 ///        Allows for nice rendering of token names for chains using custom gas token.
 contract WETH is WETH98, ISemver {
-    /// @custom:semver 1.1.0-beta.2
-    string public constant version = "1.1.0-beta.2";
+    /// @custom:semver 1.1.0-beta.3
+    string public constant version = "1.1.0-beta.3";
 
     /// @notice Returns the name of the wrapped native asset. Will be "Wrapped Ether"
     ///         if the native asset is Ether.
diff --git a/packages/contracts-bedrock/src/dispute/DelayedWETH.sol b/packages/contracts-bedrock/src/dispute/DelayedWETH.sol
index 42b6022d12fe..3438c22e3679 100644
--- a/packages/contracts-bedrock/src/dispute/DelayedWETH.sol
+++ b/packages/contracts-bedrock/src/dispute/DelayedWETH.sol
@@ -32,8 +32,8 @@ contract DelayedWETH is OwnableUpgradeable, WETH98, ISemver {
     event Unwrap(address indexed src, uint256 wad);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.2.0-beta.2
-    string public constant version = "1.2.0-beta.2";
+    /// @custom:semver 1.2.0-beta.3
+    string public constant version = "1.2.0-beta.3";
 
     /// @notice Returns a withdrawal request for the given address.
     mapping(address => mapping(address => WithdrawalRequest)) public withdrawals;
@@ -112,7 +112,7 @@ contract DelayedWETH is OwnableUpgradeable, WETH98, ISemver {
     /// @param _wad The amount of WETH to recover.
     function hold(address _guy, uint256 _wad) external {
         require(msg.sender == owner(), "DelayedWETH: not owner");
-        allowance[_guy][msg.sender] = _wad;
+        _allowance[_guy][msg.sender] = _wad;
         emit Approval(_guy, msg.sender, _wad);
     }
 }
diff --git a/packages/contracts-bedrock/src/universal/WETH98.sol b/packages/contracts-bedrock/src/universal/WETH98.sol
index 5665e5f9210f..e211db22b473 100644
--- a/packages/contracts-bedrock/src/universal/WETH98.sol
+++ b/packages/contracts-bedrock/src/universal/WETH98.sol
@@ -26,8 +26,8 @@ import { IWETH } from "src/universal/interfaces/IWETH.sol";
 contract WETH98 is IWETH {
     uint8 public constant decimals = 18;
 
-    mapping(address => uint256) public balanceOf;
-    mapping(address => mapping(address => uint256)) public allowance;
+    mapping(address => uint256) internal _balanceOf;
+    mapping(address => mapping(address => uint256)) internal _allowance;
 
     /// @notice Pipes to deposit.
     receive() external payable {
@@ -49,16 +49,26 @@ contract WETH98 is IWETH {
         return "WETH";
     }
 
+    /// @inheritdoc IWETH
+    function allowance(address owner, address spender) public view virtual returns (uint256) {
+        return _allowance[owner][spender];
+    }
+
+    /// @inheritdoc IWETH
+    function balanceOf(address src) public view returns (uint256) {
+        return _balanceOf[src];
+    }
+
     /// @inheritdoc IWETH
     function deposit() public payable virtual {
-        balanceOf[msg.sender] += msg.value;
+        _balanceOf[msg.sender] += msg.value;
         emit Deposit(msg.sender, msg.value);
     }
 
     /// @inheritdoc IWETH
     function withdraw(uint256 wad) public virtual {
-        require(balanceOf[msg.sender] >= wad);
-        balanceOf[msg.sender] -= wad;
+        require(_balanceOf[msg.sender] >= wad);
+        _balanceOf[msg.sender] -= wad;
         payable(msg.sender).transfer(wad);
         emit Withdrawal(msg.sender, wad);
     }
@@ -70,7 +80,7 @@ contract WETH98 is IWETH {
 
     /// @inheritdoc IWETH
     function approve(address guy, uint256 wad) external returns (bool) {
-        allowance[msg.sender][guy] = wad;
+        _allowance[msg.sender][guy] = wad;
         emit Approval(msg.sender, guy, wad);
         return true;
     }
@@ -82,15 +92,16 @@ contract WETH98 is IWETH {
 
     /// @inheritdoc IWETH
     function transferFrom(address src, address dst, uint256 wad) public returns (bool) {
-        require(balanceOf[src] >= wad);
+        require(_balanceOf[src] >= wad);
 
-        if (src != msg.sender && allowance[src][msg.sender] != type(uint256).max) {
-            require(allowance[src][msg.sender] >= wad);
-            allowance[src][msg.sender] -= wad;
+        uint256 senderAllowance = allowance(src, msg.sender);
+        if (src != msg.sender && senderAllowance != type(uint256).max) {
+            require(senderAllowance >= wad);
+            _allowance[src][msg.sender] -= wad;
         }
 
-        balanceOf[src] -= wad;
-        balanceOf[dst] += wad;
+        _balanceOf[src] -= wad;
+        _balanceOf[dst] += wad;
 
         emit Transfer(src, dst, wad);
 
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index 4710274baac5..b428dc4cd191 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -7,6 +7,7 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { NotCustomGasToken } from "src/libraries/errors/CommonErrors.sol";
+import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 // Interfaces
 import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
@@ -373,4 +374,83 @@ contract SuperchainWETH_Test is CommonTest {
         // Assert
         assertFalse(success);
     }
+
+    /// @notice Tests that the allowance function returns the max uint256 value when the spender is Permit.
+    /// @param _randomCaller The address that will call the function - used to fuzz better since the behaviour should be
+    ///                       the same regardless of the caller.
+    /// @param _src The funds owner.
+    function testFuzz_allowance_fromPermit2_succeeds(address _randomCaller, address _src) public {
+        vm.prank(_randomCaller);
+        uint256 _allowance = superchainWeth.allowance(_src, Preinstalls.Permit2);
+
+        assertEq(_allowance, type(uint256).max);
+    }
+
+    /// @notice Tests that the allowance function returns the correct allowance when the spender is not Permit.
+    /// @param _randomCaller The address that will call the function - used to fuzz better
+    ///                       since the behaviour should be the same regardless of the caller.
+    /// @param _src The funds owner.
+    /// @param _guy The address of the spender - It cannot be Permit2.
+    function testFuzz_allowance_succeeds(address _randomCaller, address _src, address _guy, uint256 _wad) public {
+        // Assume
+        vm.assume(_guy != Preinstalls.Permit2);
+
+        // Arrange
+        vm.prank(_src);
+        superchainWeth.approve(_guy, _wad);
+
+        // Act
+        vm.prank(_randomCaller);
+        uint256 _allowance = superchainWeth.allowance(_src, _guy);
+
+        // Assert
+        assertEq(_allowance, _wad);
+    }
+
+    /// @notice Tests that `transferFrom` works when the caller (spender) is Permit2, without any explicit approval.
+    /// @param _src The funds owner.
+    /// @param _dst The address of the recipient.
+    /// @param _wad The amount of WETH to transfer.
+    function testFuzz_transferFrom_whenPermit2IsCaller_succeeds(address _src, address _dst, uint256 _wad) public {
+        vm.assume(_src != _dst);
+
+        // Arrange
+        deal(address(superchainWeth), _src, _wad);
+
+        vm.expectEmit(address(superchainWeth));
+        emit Transfer(_src, _dst, _wad);
+
+        // Act
+        vm.prank(Preinstalls.Permit2);
+        superchainWeth.transferFrom(_src, _dst, _wad);
+
+        // Assert
+        assertEq(superchainWeth.balanceOf(_src), 0);
+        assertEq(superchainWeth.balanceOf(_dst), _wad);
+    }
+
+    /// @notice Tests that `transferFrom` works when the caller (spender) is Permit2, and `_src` equals `_dst` without
+    ///         an explicit approval.
+    ///         The balance should remain the same on this scenario.
+    /// @param _user The source and destination address.
+    /// @param _wad The amount of WETH to transfer.
+    function testFuzz_transferFrom_whenPermit2IsCallerAndSourceIsDestination_succeeds(
+        address _user,
+        uint256 _wad
+    )
+        public
+    {
+        // Arrange
+        deal(address(superchainWeth), _user, _wad);
+
+        vm.expectEmit(address(superchainWeth));
+        emit Transfer(_user, _user, _wad);
+
+        // Act
+        vm.prank(Preinstalls.Permit2);
+        superchainWeth.transferFrom(_user, _user, _wad);
+
+        // Assert
+        assertEq(superchainWeth.balanceOf(_user), _wad);
+    }
 }

From d73a4bccb3cf252f61264643b6a0ba3bd190460a Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 24 Oct 2024 08:45:27 -0600
Subject: [PATCH 019/451] op-service, op-deployer: Support marshaling
 systemconfig in pre-Holocene format (#12619)

op-deployer generates rollup configs, and those rollup configs are currently broken for older versions of op-node that don't support reading the EIP1559Params field in the SystemConfig. This PR adds a meta field within the SystemConfig that, when enabled, marshals the SystemConfig without the EIP1559Params field. This solution is backwards-compatible and minimally invasive, requiring no changes to the consensus-critical code that consumes the SystemConfig elsewhere.

Closes https://github.com/ethereum-optimism/optimism/issues/12615.
---
 op-deployer/pkg/deployer/inspect/rollup.go |  3 ++
 op-service/eth/types.go                    | 37 +++++++++++++++++++++-
 op-service/eth/types_test.go               | 21 ++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/op-deployer/pkg/deployer/inspect/rollup.go b/op-deployer/pkg/deployer/inspect/rollup.go
index 59e49c904541..d094427d951f 100644
--- a/op-deployer/pkg/deployer/inspect/rollup.go
+++ b/op-deployer/pkg/deployer/inspect/rollup.go
@@ -22,6 +22,9 @@ func RollupCLI(cliCtx *cli.Context) error {
 	}
 
 	_, rollupConfig, err := GenesisAndRollup(globalState, cfg.ChainID)
+	if rollupConfig.HoloceneTime == nil {
+		rollupConfig.Genesis.SystemConfig.MarshalPreHolocene = true
+	}
 	if err != nil {
 		return fmt.Errorf("failed to generate rollup config: %w", err)
 	}
diff --git a/op-service/eth/types.go b/op-service/eth/types.go
index 8cbc9eb7eec7..e23a903ebca4 100644
--- a/op-service/eth/types.go
+++ b/op-service/eth/types.go
@@ -3,6 +3,7 @@ package eth
 import (
 	"bytes"
 	"encoding/binary"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math"
@@ -419,8 +420,42 @@ type SystemConfig struct {
 	// EIP1559Params contains the Holocene-encoded EIP-1559 parameters. This
 	// value will be 0 if Holocene is not active, or if derivation has yet to
 	// process any EIP_1559_PARAMS system config update events.
-	EIP1559Params Bytes8 `json:"eip1559Params,omitempty"`
+	EIP1559Params Bytes8 `json:"eip1559Params"`
 	// More fields can be added for future SystemConfig versions.
+
+	// MarshalPreHolocene indicates whether or not this struct should be
+	// marshaled in the pre-Holocene format. The pre-Holocene format does
+	// not marshal the EIP1559Params field. The presence of this field in
+	// pre-Holocene codebases causes the rollup config to be rejected.
+	MarshalPreHolocene bool `json:"-"`
+}
+
+func (sysCfg SystemConfig) MarshalJSON() ([]byte, error) {
+	if sysCfg.MarshalPreHolocene {
+		return jsonMarshalPreHolocene(sysCfg)
+	}
+	return jsonMarshalHolocene(sysCfg)
+}
+
+func jsonMarshalHolocene(sysCfg SystemConfig) ([]byte, error) {
+	type sysCfgMarshaling SystemConfig
+	return json.Marshal(sysCfgMarshaling(sysCfg))
+}
+
+func jsonMarshalPreHolocene(sysCfg SystemConfig) ([]byte, error) {
+	type sysCfgMarshaling struct {
+		BatcherAddr common.Address `json:"batcherAddr"`
+		Overhead    Bytes32        `json:"overhead"`
+		Scalar      Bytes32        `json:"scalar"`
+		GasLimit    uint64         `json:"gasLimit"`
+	}
+	sc := sysCfgMarshaling{
+		BatcherAddr: sysCfg.BatcherAddr,
+		Overhead:    sysCfg.Overhead,
+		Scalar:      sysCfg.Scalar,
+		GasLimit:    sysCfg.GasLimit,
+	}
+	return json.Marshal(sc)
 }
 
 // The Ecotone upgrade introduces a versioned L1 scalar format
diff --git a/op-service/eth/types_test.go b/op-service/eth/types_test.go
index f62c14691a16..36aae514be48 100644
--- a/op-service/eth/types_test.go
+++ b/op-service/eth/types_test.go
@@ -1,10 +1,13 @@
 package eth
 
 import (
+	"encoding/json"
 	"errors"
 	"math"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/stretchr/testify/require"
 )
 
@@ -66,3 +69,21 @@ func FuzzEncodeScalar(f *testing.F) {
 		require.Equal(t, baseFeeScalar, scalars.BaseFeeScalar)
 	})
 }
+
+func TestSystemConfigMarshaling(t *testing.T) {
+	sysConfig := SystemConfig{
+		BatcherAddr: common.Address{'A'},
+		Overhead:    Bytes32{0x4, 0x5, 0x6},
+		Scalar:      Bytes32{0x7, 0x8, 0x9},
+		GasLimit:    1234,
+		// Leave EIP1559 params empty to prove that the
+		// zero value is sent.
+	}
+	j, err := json.Marshal(sysConfig)
+	require.NoError(t, err)
+	require.Equal(t, `{"batcherAddr":"0x4100000000000000000000000000000000000000","overhead":"0x0405060000000000000000000000000000000000000000000000000000000000","scalar":"0x0708090000000000000000000000000000000000000000000000000000000000","gasLimit":1234,"eip1559Params":"0x0000000000000000"}`, string(j))
+	sysConfig.MarshalPreHolocene = true
+	j, err = json.Marshal(sysConfig)
+	require.NoError(t, err)
+	require.Equal(t, `{"batcherAddr":"0x4100000000000000000000000000000000000000","overhead":"0x0405060000000000000000000000000000000000000000000000000000000000","scalar":"0x0708090000000000000000000000000000000000000000000000000000000000","gasLimit":1234}`, string(j))
+}

From 21527c63e80e05b35a5fdafd2cdae6ac42a72174 Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Thu, 24 Oct 2024 11:12:32 -0400
Subject: [PATCH 020/451] op-program: Compile op-program for Cannon64 (#12574)

* op-program: Compile op-program for Cannon64

* op-program: Update comment
---
 op-program/Dockerfile.repro | 19 +++++++++++++------
 op-program/Makefile         | 13 ++++++++++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/op-program/Dockerfile.repro b/op-program/Dockerfile.repro
index e3293b7908f7..fd713162e013 100644
--- a/op-program/Dockerfile.repro
+++ b/op-program/Dockerfile.repro
@@ -26,17 +26,16 @@ ARG OP_PROGRAM_VERSION=v0.0.0
 
 ARG TARGETOS TARGETARCH
 
-# Build the cannon, op-program, and op-program-client.elf binaries.
+# Build the cannon and op-program-client.elf binaries.
 RUN --mount=type=cache,target=/root/.cache/go-build cd cannon && make cannon  \
   GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$CANNON_VERSION"
-RUN --mount=type=cache,target=/root/.cache/go-build cd op-program && make op-program-host  \
-  GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROGRAM_VERSION"
 RUN --mount=type=cache,target=/root/.cache/go-build cd op-program && make op-program-client-mips  \
   GOOS=linux GOARCH=mips GOMIPS=softfloat GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROGRAM_VERSION"
 
 # Run the op-program-client.elf binary directly through cannon's load-elf subcommand.
-RUN /app/cannon/bin/cannon load-elf --type singlethreaded-2 --path /app/op-program/bin/op-program-client.elf --out /app/op-program/bin/prestate.bin.gz --meta ""
-RUN /app/cannon/bin/cannon load-elf --type multithreaded --path /app/op-program/bin/op-program-client.elf --out /app/op-program/bin/prestate-mt.bin.gz --meta ""
+RUN /app/cannon/bin/cannon load-elf --type singlethreaded-2 --path /app/op-program/bin/op-program-client.elf --out /app/op-program/bin/prestate.bin.gz --meta "/app/op-program/bin/meta.json"
+RUN /app/cannon/bin/cannon load-elf --type multithreaded --path /app/op-program/bin/op-program-client.elf --out /app/op-program/bin/prestate-mt.bin.gz --meta "/app/op-program/bin/meta-mt.json"
+RUN /app/cannon/bin/cannon load-elf --type multithreaded64 --path /app/op-program/bin/op-program-client64.elf --out /app/op-program/bin/prestate-mt64.bin.gz --meta "/app/op-program/bin/meta-mt64.json"
 
 # Generate the prestate proof containing the absolute pre-state hash.
 RUN /app/cannon/bin/cannon run --proof-at '=0' --stop-at '=1' --input /app/op-program/bin/prestate.bin.gz --meta "" --proof-fmt '/app/op-program/bin/%d.json' --output ""
@@ -45,13 +44,21 @@ RUN mv /app/op-program/bin/0.json /app/op-program/bin/prestate-proof.json
 RUN /app/cannon/bin/cannon run --proof-at '=0' --stop-at '=1' --input /app/op-program/bin/prestate-mt.bin.gz --meta "" --proof-fmt '/app/op-program/bin/%d-mt.json' --output ""
 RUN mv /app/op-program/bin/0-mt.json /app/op-program/bin/prestate-proof-mt.json
 
+RUN /app/cannon/bin/cannon run --proof-at '=0' --stop-at '=1' --input /app/op-program/bin/prestate-mt64.bin.gz --meta "" --proof-fmt '/app/op-program/bin/%d-mt64.json' --output ""
+RUN mv /app/op-program/bin/0-mt64.json /app/op-program/bin/prestate-proof-mt64.json
+
 # Exports files to the specified output location.
 # Writing files to host requires buildkit to be enabled.
 # e.g. `BUILDKIT=1 docker build ...`
 FROM scratch AS export-stage
-COPY --from=builder /app/op-program/bin/op-program .
 COPY --from=builder /app/op-program/bin/op-program-client.elf .
+COPY --from=builder /app/op-program/bin/op-program-client64.elf .
+COPY --from=builder /app/op-program/bin/meta.json .
 COPY --from=builder /app/op-program/bin/prestate.bin.gz .
 COPY --from=builder /app/op-program/bin/prestate-proof.json .
+COPY --from=builder /app/op-program/bin/meta-mt.json .
 COPY --from=builder /app/op-program/bin/prestate-mt.bin.gz .
 COPY --from=builder /app/op-program/bin/prestate-proof-mt.json .
+COPY --from=builder /app/op-program/bin/meta-mt64.json .
+COPY --from=builder /app/op-program/bin/prestate-mt64.bin.gz .
+COPY --from=builder /app/op-program/bin/prestate-proof-mt64.json .
diff --git a/op-program/Makefile b/op-program/Makefile
index 983c795ac929..30cbaeea4c42 100644
--- a/op-program/Makefile
+++ b/op-program/Makefile
@@ -26,11 +26,18 @@ op-program-host:
 op-program-client:
 	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build -v -ldflags "$(PC_LDFLAGSSTRING)" -o ./bin/op-program-client ./client/cmd/main.go
 
-op-program-client-mips:
+op-program-client-mips: op-program-client-mips32 op-program-client-mips64
+
+op-program-client-mips32:
 	env GO111MODULE=on GOOS=linux GOARCH=mips GOMIPS=softfloat go build -v -ldflags "$(PC_LDFLAGSSTRING)" -o ./bin/op-program-client.elf ./client/cmd/main.go
 	# verify output with: readelf -h bin/op-program-client.elf
 	# result is mips32, big endian, R3000
 
+op-program-client-mips64:
+	env GO111MODULE=on GOOS=linux GOARCH=mips64 GOMIPS64=softfloat go build -v -ldflags "$(PC_LDFLAGSSTRING)" -o ./bin/op-program-client64.elf ./client/cmd/main.go
+	# verify output with: readelf -h bin/op-program-client64.elf
+	# result is mips64, big endian, R3000
+
 op-program-client-riscv:
 	env GO111MODULE=on GOOS=linux GOARCH=riscv64 go build -v -gcflags="all=-d=softfloat" -ldflags "$(PC_LDFLAGSSTRING)" -o ./bin/op-program-client-riscv.elf ./client/cmd/main.go
 
@@ -40,6 +47,8 @@ reproducible-prestate:
 	@cat ./bin/prestate-proof.json | jq -r .pre
 	@echo "MT-Cannon Absolute prestate hash: "
 	@cat ./bin/prestate-proof-mt.json | jq -r .pre
+	@echo "Cannon64 Absolute prestate hash: "
+	@cat ./bin/prestate-proof-mt64.json | jq -r .pre
 .PHONY: reproducible-prestate
 
 verify-reproducibility:
@@ -101,6 +110,8 @@ verify-compat: verify-sepolia-delta verify-sepolia-ecotone verify-mainnet-genesi
 	op-program-host \
 	op-program-client \
 	op-program-client-mips \
+	op-program-client-mips32 \
+	op-program-client-mips64 \
 	op-program-client-riscv \
 	clean \
 	test \

From a71c4926cf8ee3559fa7b159e3ae8ce22ef3f2c1 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Thu, 24 Oct 2024 18:20:28 +0200
Subject: [PATCH 021/451] op-supervisor: DB improvements for cross-safe updates
 (#12622)

Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
Co-authored-by: Tyler Smith <mail@tcry.pt>
---
 op-supervisor/supervisor/backend/backend.go   |  11 +-
 .../supervisor/backend/backend_test.go        |   5 +-
 op-supervisor/supervisor/backend/db/db.go     |  27 +-
 .../supervisor/backend/db/fromda/db.go        | 162 ++++++++++-
 .../supervisor/backend/db/fromda/db_test.go   | 265 ++++++++++++++++--
 .../supervisor/backend/db/fromda/entry.go     |   5 +-
 .../supervisor/backend/db/fromda/update.go    |  17 +-
 .../backend/db/fromda/update_test.go          |  31 +-
 .../supervisor/backend/db/logs/db.go          | 117 ++++++--
 .../supervisor/backend/db/logs/db_test.go     | 156 ++++++++---
 .../supervisor/backend/db/logs/entries.go     |  15 +-
 .../supervisor/backend/db/logs/iterator.go    |  11 +-
 .../supervisor/backend/db/logs/state.go       |  18 +-
 op-supervisor/supervisor/backend/db/query.go  | 230 ++++++++++++++-
 op-supervisor/supervisor/backend/db/update.go |  17 +-
 .../backend/processors/contracts/l2inbox.go   |   2 +-
 .../processors/contracts/l2inbox_test.go      |   4 +-
 .../{backend/db/entrydb => types}/error.go    |   9 +-
 op-supervisor/supervisor/types/types.go       |  47 +++-
 19 files changed, 972 insertions(+), 177 deletions(-)
 rename op-supervisor/supervisor/{backend/db/entrydb => types}/error.go (63%)

diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 7a1eb2eaf78a..27ed1ec3e984 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -17,7 +17,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/processors"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/frontend"
@@ -71,7 +70,7 @@ func NewSupervisorBackend(ctx context.Context, logger log.Logger, m Metrics, cfg
 	chains := depSet.Chains()
 
 	// create initial per-chain resources
-	chainsDBs := db.NewChainsDB(logger)
+	chainsDBs := db.NewChainsDB(logger, depSet)
 	chainProcessors := make(map[types.ChainID]*processors.ChainProcessor, len(chains))
 	chainMetrics := make(map[types.ChainID]*chainMetrics, len(chains))
 
@@ -167,7 +166,7 @@ func (su *SupervisorBackend) attachRPC(ctx context.Context, rpc string) error {
 		return err
 	}
 	if !su.depSet.HasChain(chainID) {
-		return fmt.Errorf("chain %s is not part of the interop dependency set: %w", chainID, db.ErrUnknownChain)
+		return fmt.Errorf("chain %s is not part of the interop dependency set: %w", chainID, types.ErrUnknownChain)
 	}
 	cm, ok := su.chainMetrics[chainID]
 	if !ok {
@@ -273,10 +272,10 @@ func (su *SupervisorBackend) CheckMessage(identifier types.Identifier, payloadHa
 	blockNum := identifier.BlockNumber
 	logIdx := identifier.LogIndex
 	_, err := su.chainDBs.Check(chainID, blockNum, uint32(logIdx), payloadHash)
-	if errors.Is(err, entrydb.ErrFuture) {
+	if errors.Is(err, types.ErrFuture) {
 		return types.LocalUnsafe, nil
 	}
-	if errors.Is(err, entrydb.ErrConflict) {
+	if errors.Is(err, types.ErrConflict) {
 		return types.Invalid, nil
 	}
 	if err != nil {
@@ -378,7 +377,7 @@ func (su *SupervisorBackend) UpdateLocalUnsafe(chainID types.ChainID, head eth.B
 	defer su.mu.RUnlock()
 	ch, ok := su.chainProcessors[chainID]
 	if !ok {
-		return db.ErrUnknownChain
+		return types.ErrUnknownChain
 	}
 	return ch.OnNewHead(head)
 }
diff --git a/op-supervisor/supervisor/backend/backend_test.go b/op-supervisor/supervisor/backend/backend_test.go
index 5bdb49caaaf9..80c773a5ea46 100644
--- a/op-supervisor/supervisor/backend/backend_test.go
+++ b/op-supervisor/supervisor/backend/backend_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/testutils"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/metrics"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -89,7 +88,7 @@ func TestBackendLifetime(t *testing.T) {
 	t.Log("started!")
 
 	_, err = b.UnsafeView(context.Background(), chainA, types.ReferenceView{})
-	require.ErrorIs(t, err, entrydb.ErrFuture, "no data yet, need local-unsafe")
+	require.ErrorIs(t, err, types.ErrFuture, "no data yet, need local-unsafe")
 
 	src.ExpectL1BlockRefByNumber(0, blockX, nil)
 	src.ExpectFetchReceipts(blockX.Hash, &testutils.MockBlockInfo{
@@ -118,7 +117,7 @@ func TestBackendLifetime(t *testing.T) {
 	b.chainProcessors[chainA].ProcessToHead()
 
 	_, err = b.UnsafeView(context.Background(), chainA, types.ReferenceView{})
-	require.ErrorIs(t, err, entrydb.ErrFuture, "still no data yet, need cross-unsafe")
+	require.ErrorIs(t, err, types.ErrFuture, "still no data yet, need cross-unsafe")
 
 	err = b.chainDBs.UpdateCrossUnsafe(chainA, types.BlockSeal{
 		Hash:      blockX.Hash,
diff --git a/op-supervisor/supervisor/backend/db/db.go b/op-supervisor/supervisor/backend/db/db.go
index ab8a9a652e5b..922f849dea05 100644
--- a/op-supervisor/supervisor/backend/db/db.go
+++ b/op-supervisor/supervisor/backend/db/db.go
@@ -12,13 +12,10 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/fromda"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/logs"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
-var (
-	ErrUnknownChain = errors.New("unknown chain")
-)
-
 type LogStorage interface {
 	io.Closer
 
@@ -46,13 +43,22 @@ type LogStorage interface {
 	// The block-seal of the blockNum block, that the log was included in, is returned.
 	// This seal may be fully zeroed, without error, if the block isn't fully known yet.
 	Contains(blockNum uint64, logIdx uint32, logHash common.Hash) (includedIn types.BlockSeal, err error)
+
+	// OpenBlock accumulates the ExecutingMessage events for a block and returns them
+	OpenBlock(blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
 }
 
 type LocalDerivedFromStorage interface {
+	First() (derivedFrom types.BlockSeal, derived types.BlockSeal, err error)
 	Latest() (derivedFrom types.BlockSeal, derived types.BlockSeal, err error)
 	AddDerived(derivedFrom eth.BlockRef, derived eth.BlockRef) error
 	LastDerivedAt(derivedFrom eth.BlockID) (derived types.BlockSeal, err error)
 	DerivedFrom(derived eth.BlockID) (derivedFrom types.BlockSeal, err error)
+	FirstAfter(derivedFrom, derived eth.BlockID) (nextDerivedFrom, nextDerived types.BlockSeal, err error)
+	NextDerivedFrom(derivedFrom eth.BlockID) (nextDerivedFrom types.BlockSeal, err error)
+	NextDerived(derived eth.BlockID) (derivedFrom types.BlockSeal, nextDerived types.BlockSeal, err error)
+	PreviousDerivedFrom(derivedFrom eth.BlockID) (prevDerivedFrom types.BlockSeal, err error)
+	PreviousDerived(derived eth.BlockID) (prevDerived types.BlockSeal, err error)
 }
 
 var _ LocalDerivedFromStorage = (*fromda.DB)(nil)
@@ -65,7 +71,7 @@ type CrossDerivedFromStorage interface {
 var _ LogStorage = (*logs.DB)(nil)
 
 // ChainsDB is a database that stores logs and derived-from data for multiple chains.
-// it implements the ChainsStorage interface.
+// it implements the LogStorage interface, as well as several DB interfaces needed by the cross package.
 type ChainsDB struct {
 	// RW mutex:
 	// Read = chains can be read / mutated.
@@ -90,16 +96,21 @@ type ChainsDB struct {
 	// an error until it has this L1 finality to work with.
 	finalizedL1 eth.L1BlockRef
 
+	// depSet is the dependency set, used to determine what may be tracked,
+	// what is missing, and to provide it to DB users.
+	depSet depset.DependencySet
+
 	logger log.Logger
 }
 
-func NewChainsDB(l log.Logger) *ChainsDB {
+func NewChainsDB(l log.Logger, depSet depset.DependencySet) *ChainsDB {
 	return &ChainsDB{
 		logDBs:      make(map[types.ChainID]LogStorage),
 		logger:      l,
 		localDBs:    make(map[types.ChainID]LocalDerivedFromStorage),
 		crossDBs:    make(map[types.ChainID]CrossDerivedFromStorage),
 		crossUnsafe: make(map[types.ChainID]types.BlockSeal),
+		depSet:      depSet,
 	}
 }
 
@@ -168,6 +179,10 @@ func (db *ChainsDB) ResumeFromLastSealedBlock() error {
 	return nil
 }
 
+func (db *ChainsDB) DependencySet() depset.DependencySet {
+	return db.depSet
+}
+
 func (db *ChainsDB) Close() error {
 	db.mu.Lock()
 	defer db.mu.Unlock()
diff --git a/op-supervisor/supervisor/backend/db/fromda/db.go b/op-supervisor/supervisor/backend/db/fromda/db.go
index 7016fc6b25cb..5ee609ecdfe7 100644
--- a/op-supervisor/supervisor/backend/db/fromda/db.go
+++ b/op-supervisor/supervisor/backend/db/fromda/db.go
@@ -3,6 +3,7 @@ package fromda
 import (
 	"cmp"
 	"fmt"
+	"io"
 	"sort"
 	"sync"
 
@@ -64,12 +65,48 @@ func (db *DB) Rewind(derivedFrom uint64) error {
 	return nil
 }
 
+// First returns the first known values, alike to Latest.
+func (db *DB) First() (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+	lastIndex := db.store.LastEntryIdx()
+	if lastIndex < 0 {
+		return types.BlockSeal{}, types.BlockSeal{}, types.ErrFuture
+	}
+	last, err := db.readAt(0)
+	if err != nil {
+		return types.BlockSeal{}, types.BlockSeal{}, fmt.Errorf("failed to read first derivation data: %w", err)
+	}
+	return last.derivedFrom, last.derived, nil
+}
+
+func (db *DB) PreviousDerived(derived eth.BlockID) (prevDerived types.BlockSeal, err error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+	// get the last time this L2 block was seen.
+	selfIndex, self, err := db.firstDerivedFrom(derived.Number)
+	if err != nil {
+		return types.BlockSeal{}, fmt.Errorf("failed to find derived %d: %w", derived.Number, err)
+	}
+	if self.derived.ID() != derived {
+		return types.BlockSeal{}, fmt.Errorf("found %s, but expected %s: %w", self.derived, derived, types.ErrConflict)
+	}
+	if selfIndex == 0 { // genesis block has a zeroed block as parent block
+		return types.BlockSeal{}, nil
+	}
+	prev, err := db.readAt(selfIndex - 1)
+	if err != nil {
+		return types.BlockSeal{}, fmt.Errorf("cannot find previous derived before %s: %w", derived, err)
+	}
+	return prev.derived, nil
+}
+
 // Latest returns the last known values:
 // derivedFrom: the L1 block that the L2 block is safe for (not necessarily the first, multiple L2 blocks may be derived from the same L1 block).
 // derived: the L2 block that was derived (not necessarily the first, the L1 block may have been empty and repeated the last safe L2 block).
 func (db *DB) Latest() (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
-	db.rwLock.Lock()
-	defer db.rwLock.Unlock()
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
 	return db.latest()
 }
 
@@ -77,7 +114,7 @@ func (db *DB) Latest() (derivedFrom types.BlockSeal, derived types.BlockSeal, er
 func (db *DB) latest() (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
 	lastIndex := db.store.LastEntryIdx()
 	if lastIndex < 0 {
-		return types.BlockSeal{}, types.BlockSeal{}, entrydb.ErrFuture
+		return types.BlockSeal{}, types.BlockSeal{}, types.ErrFuture
 	}
 	last, err := db.readAt(lastIndex)
 	if err != nil {
@@ -96,11 +133,30 @@ func (db *DB) LastDerivedAt(derivedFrom eth.BlockID) (derived types.BlockSeal, e
 	}
 	if link.derivedFrom.ID() != derivedFrom {
 		return types.BlockSeal{}, fmt.Errorf("searched for last derived-from %s but found %s: %w",
-			derivedFrom, link.derivedFrom, entrydb.ErrConflict)
+			derivedFrom, link.derivedFrom, types.ErrConflict)
 	}
 	return link.derived, nil
 }
 
+// NextDerived finds the next L2 block after derived, and what it was derived from
+func (db *DB) NextDerived(derived eth.BlockID) (derivedFrom types.BlockSeal, nextDerived types.BlockSeal, err error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+	// get the last time this L2 block was seen.
+	selfIndex, self, err := db.lastDerivedFrom(derived.Number)
+	if err != nil {
+		return types.BlockSeal{}, types.BlockSeal{}, fmt.Errorf("failed to find derived %d: %w", derived.Number, err)
+	}
+	if self.derived.ID() != derived {
+		return types.BlockSeal{}, types.BlockSeal{}, fmt.Errorf("found %s, but expected %s: %w", self.derived, derived, types.ErrConflict)
+	}
+	next, err := db.readAt(selfIndex + 1)
+	if err != nil {
+		return types.BlockSeal{}, types.BlockSeal{}, fmt.Errorf("cannot find next derived after %s: %w", derived, err)
+	}
+	return next.derivedFrom, next.derived, nil
+}
+
 // DerivedFrom determines where a L2 block was first derived from.
 // (a L2 block may repeat if the following L1 blocks are empty and don't produce additional L2 blocks)
 func (db *DB) DerivedFrom(derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
@@ -112,17 +168,94 @@ func (db *DB) DerivedFrom(derived eth.BlockID) (derivedFrom types.BlockSeal, err
 	}
 	if link.derived.ID() != derived {
 		return types.BlockSeal{}, fmt.Errorf("searched for first derived %s but found %s: %w",
-			derived, link.derived, entrydb.ErrConflict)
+			derived, link.derived, types.ErrConflict)
 	}
 	return link.derivedFrom, nil
 }
 
+func (db *DB) PreviousDerivedFrom(derivedFrom eth.BlockID) (prevDerivedFrom types.BlockSeal, err error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+	// get the last time this L1 block was seen.
+	selfIndex, self, err := db.firstDerivedAt(derivedFrom.Number)
+	if err != nil {
+		return types.BlockSeal{}, fmt.Errorf("failed to find derived %d: %w", derivedFrom.Number, err)
+	}
+	if self.derivedFrom.ID() != derivedFrom {
+		return types.BlockSeal{}, fmt.Errorf("found %s, but expected %s: %w", self.derivedFrom, derivedFrom, types.ErrConflict)
+	}
+	if selfIndex == 0 { // genesis block has a zeroed block as parent block
+		return types.BlockSeal{}, nil
+	}
+	prev, err := db.readAt(selfIndex - 1)
+	if err != nil {
+		return types.BlockSeal{}, fmt.Errorf("cannot find previous derived before %s: %w", derivedFrom, err)
+	}
+	return prev.derivedFrom, nil
+}
+
+// NextDerivedFrom finds the next L1 block after derivedFrom
+func (db *DB) NextDerivedFrom(derivedFrom eth.BlockID) (nextDerivedFrom types.BlockSeal, err error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+	selfIndex, self, err := db.lastDerivedAt(derivedFrom.Number)
+	if err != nil {
+		return types.BlockSeal{}, fmt.Errorf("failed to find derived-from %d: %w", derivedFrom.Number, err)
+	}
+	if self.derivedFrom.ID() != derivedFrom {
+		return types.BlockSeal{}, fmt.Errorf("found %s, but expected %s: %w", self.derivedFrom, derivedFrom, types.ErrConflict)
+	}
+	next, err := db.readAt(selfIndex + 1)
+	if err != nil {
+		return types.BlockSeal{}, fmt.Errorf("cannot find next derived-from after %s: %w", derivedFrom, err)
+	}
+	return next.derivedFrom, nil
+}
+
+// FirstAfter determines the next entry after the given pair of derivedFrom, derived.
+// Either one or both of the two entries will be an increment by 1
+func (db *DB) FirstAfter(derivedFrom, derived eth.BlockID) (nextDerivedFrom, nextDerived types.BlockSeal, err error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+	selfIndex, selfLink, err := db.lookup(derivedFrom.Number, derived.Number)
+	if err != nil {
+		return types.BlockSeal{}, types.BlockSeal{}, err
+	}
+	if selfLink.derivedFrom.ID() != derivedFrom {
+		return types.BlockSeal{}, types.BlockSeal{}, fmt.Errorf("DB has derived-from %s but expected %s: %w", selfLink.derivedFrom, derivedFrom, types.ErrConflict)
+	}
+	if selfLink.derived.ID() != derived {
+		return types.BlockSeal{}, types.BlockSeal{}, fmt.Errorf("DB has derived %s but expected %s: %w", selfLink.derived, derived, types.ErrConflict)
+	}
+	next, err := db.readAt(selfIndex + 1)
+	if err != nil {
+		return types.BlockSeal{}, types.BlockSeal{}, err
+	}
+	return next.derivedFrom, next.derived, nil
+}
+
+func (db *DB) lastDerivedFrom(derived uint64) (entrydb.EntryIdx, LinkEntry, error) {
+	return db.find(true, func(link LinkEntry) int {
+		return cmp.Compare(derived, link.derived.Number)
+	})
+}
+
 func (db *DB) firstDerivedFrom(derived uint64) (entrydb.EntryIdx, LinkEntry, error) {
 	return db.find(false, func(link LinkEntry) int {
 		return cmp.Compare(link.derived.Number, derived)
 	})
 }
 
+func (db *DB) lookup(derivedFrom, derived uint64) (entrydb.EntryIdx, LinkEntry, error) {
+	return db.find(false, func(link LinkEntry) int {
+		res := cmp.Compare(link.derived.Number, derived)
+		if res == 0 {
+			return cmp.Compare(link.derivedFrom.Number, derivedFrom)
+		}
+		return res
+	})
+}
+
 func (db *DB) lastDerivedAt(derivedFrom uint64) (entrydb.EntryIdx, LinkEntry, error) {
 	// Reverse: prioritize the last entry.
 	return db.find(true, func(link LinkEntry) int {
@@ -130,13 +263,19 @@ func (db *DB) lastDerivedAt(derivedFrom uint64) (entrydb.EntryIdx, LinkEntry, er
 	})
 }
 
+func (db *DB) firstDerivedAt(derivedFrom uint64) (entrydb.EntryIdx, LinkEntry, error) {
+	return db.find(false, func(link LinkEntry) int {
+		return cmp.Compare(link.derivedFrom.Number, derivedFrom)
+	})
+}
+
 // find finds the first entry for which cmpFn(link) returns 0.
 // The cmpFn entries to the left should return -1, entries to the right 1.
 // If reverse, the cmpFn should be flipped too, and the last entry for which cmpFn(link) is 0 will be found.
 func (db *DB) find(reverse bool, cmpFn func(link LinkEntry) int) (entrydb.EntryIdx, LinkEntry, error) {
 	n := db.store.Size()
 	if n == 0 {
-		return -1, LinkEntry{}, entrydb.ErrFuture
+		return -1, LinkEntry{}, types.ErrFuture
 	}
 	var searchErr error
 	// binary-search for the smallest index i for which cmp(i) >= 0
@@ -157,9 +296,9 @@ func (db *DB) find(reverse bool, cmpFn func(link LinkEntry) int) (entrydb.EntryI
 	}
 	if result == int(n) {
 		if reverse {
-			return -1, LinkEntry{}, fmt.Errorf("no entry found: %w", entrydb.ErrSkipped)
+			return -1, LinkEntry{}, fmt.Errorf("no entry found: %w", types.ErrSkipped)
 		} else {
-			return -1, LinkEntry{}, fmt.Errorf("no entry found: %w", entrydb.ErrFuture)
+			return -1, LinkEntry{}, fmt.Errorf("no entry found: %w", types.ErrFuture)
 		}
 	}
 	if reverse {
@@ -171,9 +310,9 @@ func (db *DB) find(reverse bool, cmpFn func(link LinkEntry) int) (entrydb.EntryI
 	}
 	if cmpFn(link) != 0 {
 		if reverse {
-			return -1, LinkEntry{}, fmt.Errorf("lowest entry %s is too high: %w", link, entrydb.ErrFuture)
+			return -1, LinkEntry{}, fmt.Errorf("lowest entry %s is too high: %w", link, types.ErrFuture)
 		} else {
-			return -1, LinkEntry{}, fmt.Errorf("lowest entry %s is too high: %w", link, entrydb.ErrSkipped)
+			return -1, LinkEntry{}, fmt.Errorf("lowest entry %s is too high: %w", link, types.ErrSkipped)
 		}
 	}
 	if cmpFn(link) != 0 {
@@ -187,6 +326,9 @@ func (db *DB) find(reverse bool, cmpFn func(link LinkEntry) int) (entrydb.EntryI
 func (db *DB) readAt(i entrydb.EntryIdx) (LinkEntry, error) {
 	entry, err := db.store.Read(i)
 	if err != nil {
+		if err == io.EOF {
+			return LinkEntry{}, types.ErrFuture
+		}
 		return LinkEntry{}, err
 	}
 	var out LinkEntry
diff --git a/op-supervisor/supervisor/backend/db/fromda/db_test.go b/op-supervisor/supervisor/backend/db/fromda/db_test.go
index bfc44ec00aaa..fbcf82ab194e 100644
--- a/op-supervisor/supervisor/backend/db/fromda/db_test.go
+++ b/op-supervisor/supervisor/backend/db/fromda/db_test.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -74,16 +73,31 @@ func TestEmptyDB(t *testing.T) {
 		func(t *testing.T, db *DB, m *stubMetrics) {},
 		func(t *testing.T, db *DB, m *stubMetrics) {
 			_, _, err := db.Latest()
-			require.ErrorIs(t, err, entrydb.ErrFuture)
+			require.ErrorIs(t, err, types.ErrFuture)
 
-			_, _, err = db.Latest()
-			require.ErrorIs(t, err, entrydb.ErrFuture)
+			_, _, err = db.First()
+			require.ErrorIs(t, err, types.ErrFuture)
 
 			_, err = db.LastDerivedAt(eth.BlockID{})
-			require.ErrorIs(t, err, entrydb.ErrFuture)
+			require.ErrorIs(t, err, types.ErrFuture)
 
 			_, err = db.DerivedFrom(eth.BlockID{})
-			require.ErrorIs(t, err, entrydb.ErrFuture)
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			_, err = db.PreviousDerived(eth.BlockID{})
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			_, _, err = db.NextDerived(eth.BlockID{})
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			_, err = db.PreviousDerivedFrom(eth.BlockID{})
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			_, err = db.NextDerivedFrom(eth.BlockID{})
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			_, _, err = db.FirstAfter(eth.BlockID{}, eth.BlockID{})
+			require.ErrorIs(t, err, types.ErrFuture)
 		})
 }
 
@@ -129,23 +143,63 @@ func TestSingleEntryDB(t *testing.T) {
 			require.Equal(t, expectedDerivedFrom, derivedFrom)
 			require.Equal(t, expectedDerived, derived)
 
+			derivedFrom, derived, err = db.First()
+			require.NoError(t, err)
+			require.Equal(t, expectedDerivedFrom, derivedFrom)
+			require.Equal(t, expectedDerived, derived)
+
 			derived, err = db.LastDerivedAt(expectedDerivedFrom.ID())
 			require.NoError(t, err)
 			require.Equal(t, expectedDerived, derived)
 
 			_, err = db.LastDerivedAt(eth.BlockID{Hash: common.Hash{0xaa}, Number: expectedDerivedFrom.Number})
-			require.ErrorIs(t, err, entrydb.ErrConflict)
+			require.ErrorIs(t, err, types.ErrConflict)
+
+			// No block known, yet, after the given block pair
+			_, _, err = db.FirstAfter(derivedFrom.ID(), derived.ID())
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			// Not after a non-existent block pair
+			_, _, err = db.FirstAfter(eth.BlockID{Hash: common.Hash{0xaa}, Number: expectedDerivedFrom.Number}, expectedDerived.ID())
+			require.ErrorIs(t, err, types.ErrConflict)
+			_, _, err = db.FirstAfter(expectedDerivedFrom.ID(), eth.BlockID{Hash: common.Hash{0xaa}, Number: expectedDerived.Number})
+			require.ErrorIs(t, err, types.ErrConflict)
 
 			derivedFrom, err = db.DerivedFrom(expectedDerived.ID())
 			require.NoError(t, err)
 			require.Equal(t, expectedDerivedFrom, derivedFrom)
 
 			_, err = db.DerivedFrom(eth.BlockID{Hash: common.Hash{0xbb}, Number: expectedDerived.Number})
-			require.ErrorIs(t, err, entrydb.ErrConflict)
+			require.ErrorIs(t, err, types.ErrConflict)
+
+			prev, err := db.PreviousDerived(expectedDerived.ID())
+			require.NoError(t, err)
+			require.Equal(t, types.BlockSeal{}, prev, "zeroed seal before first entry")
+
+			_, _, err = db.NextDerived(expectedDerived.ID())
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			// if 1 was the first inserted entry, then we skipped 0
+			_, _, err = db.NextDerived(mockL2(0).ID())
+			require.ErrorIs(t, err, types.ErrSkipped)
+
+			prev, err = db.PreviousDerivedFrom(expectedDerivedFrom.ID())
+			require.NoError(t, err)
+			require.Equal(t, types.BlockSeal{}, prev, "zeroed seal before first entry")
+
+			_, err = db.NextDerivedFrom(expectedDerivedFrom.ID())
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			// if 1 was the first inserted entry, then we skipped 0
+			_, err = db.NextDerivedFrom(mockL1(0).ID())
+			require.ErrorIs(t, err, types.ErrSkipped)
+
+			_, _, err = db.FirstAfter(expectedDerivedFrom.ID(), expectedDerived.ID())
+			require.ErrorIs(t, err, types.ErrFuture)
 		})
 }
 
-func TestTwoEntryDB(t *testing.T) {
+func TestThreeEntryDB(t *testing.T) {
 	l1Block0 := mockL1(0)
 	l1Block1 := mockL1(1)
 	l1Block2 := mockL1(2)
@@ -165,19 +219,24 @@ func TestTwoEntryDB(t *testing.T) {
 		require.Equal(t, l1Block2, derivedFrom)
 		require.Equal(t, l2Block2, derived)
 
+		derivedFrom, derived, err = db.First()
+		require.NoError(t, err)
+		require.Equal(t, l1Block0, derivedFrom)
+		require.Equal(t, l2Block0, derived)
+
 		derived, err = db.LastDerivedAt(l1Block2.ID())
 		require.NoError(t, err)
 		require.Equal(t, l2Block2, derived)
 
 		_, err = db.LastDerivedAt(eth.BlockID{Hash: common.Hash{0xaa}, Number: l1Block2.Number})
-		require.ErrorIs(t, err, entrydb.ErrConflict)
+		require.ErrorIs(t, err, types.ErrConflict)
 
 		derivedFrom, err = db.DerivedFrom(l2Block2.ID())
 		require.NoError(t, err)
 		require.Equal(t, l1Block2, derivedFrom)
 
 		_, err = db.DerivedFrom(eth.BlockID{Hash: common.Hash{0xbb}, Number: l2Block2.Number})
-		require.ErrorIs(t, err, entrydb.ErrConflict)
+		require.ErrorIs(t, err, types.ErrConflict)
 
 		derived, err = db.LastDerivedAt(l1Block1.ID())
 		require.NoError(t, err)
@@ -194,6 +253,67 @@ func TestTwoEntryDB(t *testing.T) {
 		derivedFrom, err = db.DerivedFrom(l2Block0.ID())
 		require.NoError(t, err)
 		require.Equal(t, l1Block0, derivedFrom)
+
+		derived, err = db.PreviousDerived(l2Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, types.BlockSeal{}, derived)
+
+		derived, err = db.PreviousDerived(l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block0, derived)
+
+		derived, err = db.PreviousDerived(l2Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block1, derived)
+
+		derivedFrom, derived, err = db.NextDerived(l2Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block1, derived)
+		require.Equal(t, l1Block1, derivedFrom)
+
+		derivedFrom, derived, err = db.NextDerived(l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block2, derived)
+		require.Equal(t, l1Block2, derivedFrom)
+
+		_, _, err = db.NextDerived(l2Block2.ID())
+		require.ErrorIs(t, err, types.ErrFuture)
+
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, types.BlockSeal{}, derivedFrom)
+
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block0, derivedFrom)
+
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+
+		derivedFrom, err = db.NextDerivedFrom(l1Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+
+		derivedFrom, err = db.NextDerivedFrom(l1Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block2, derivedFrom)
+
+		_, err = db.NextDerivedFrom(l1Block2.ID())
+		require.ErrorIs(t, err, types.ErrFuture)
+
+		_, _, err = db.FirstAfter(l1Block2.ID(), l2Block2.ID())
+		require.ErrorIs(t, err, types.ErrFuture)
+
+		derivedFrom, derived, err = db.FirstAfter(l1Block0.ID(), l2Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		require.Equal(t, l2Block1, derived)
+
+		derivedFrom, derived, err = db.FirstAfter(l1Block1.ID(), l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block2, derivedFrom)
+		require.Equal(t, l2Block2, derived)
 	})
 }
 
@@ -249,6 +369,65 @@ func TestFastL2Batcher(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, l2Block4, derived)
 
+		derived, err = db.PreviousDerived(l2Block5.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block4, derived)
+		derived, err = db.PreviousDerived(l2Block4.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block3, derived)
+		derived, err = db.PreviousDerived(l2Block3.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block2, derived)
+		derived, err = db.PreviousDerived(l2Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block1, derived)
+		derived, err = db.PreviousDerived(l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block0, derived)
+
+		derivedFrom, derived, err = db.NextDerived(l2Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		require.Equal(t, l2Block1, derived)
+		derivedFrom, derived, err = db.NextDerived(l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		require.Equal(t, l2Block2, derived)
+		derivedFrom, derived, err = db.NextDerived(l2Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		require.Equal(t, l2Block3, derived)
+		derivedFrom, derived, err = db.NextDerived(l2Block3.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		require.Equal(t, l2Block4, derived)
+		derivedFrom, derived, err = db.NextDerived(l2Block4.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block2, derivedFrom) // derived from later L1 block
+		require.Equal(t, l2Block5, derived)
+		_, _, err = db.NextDerived(l2Block5.ID())
+		require.ErrorIs(t, err, types.ErrFuture)
+
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block0, derivedFrom)
+
+		derivedFrom, err = db.NextDerivedFrom(l1Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		derivedFrom, err = db.NextDerivedFrom(l1Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block2, derivedFrom)
+		_, err = db.NextDerivedFrom(l1Block2.ID())
+		require.ErrorIs(t, err, types.ErrFuture)
+
+		derivedFrom, derived, err = db.FirstAfter(l1Block1.ID(), l2Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom) // no increment in L1 yet, the next after is L2 block 3
+		require.Equal(t, l2Block3, derived)
 	})
 }
 
@@ -299,6 +478,60 @@ func TestSlowL2Batcher(t *testing.T) {
 		derivedFrom, err = db.DerivedFrom(l2Block1.ID())
 		require.NoError(t, err)
 		require.Equal(t, l1Block1, derivedFrom)
+
+		derived, err = db.PreviousDerived(l2Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block1, derived)
+		derived, err = db.PreviousDerived(l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l2Block0, derived)
+
+		derivedFrom, derived, err = db.NextDerived(l2Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		require.Equal(t, l2Block1, derived)
+		derivedFrom, derived, err = db.NextDerived(l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block5, derivedFrom)
+		require.Equal(t, l2Block2, derived)
+		_, _, err = db.NextDerived(l2Block2.ID())
+		require.ErrorIs(t, err, types.ErrFuture)
+
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block5.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block4, derivedFrom)
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block4.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block3, derivedFrom)
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block3.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block2, derivedFrom)
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		derivedFrom, err = db.PreviousDerivedFrom(l1Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block0, derivedFrom)
+
+		derivedFrom, err = db.NextDerivedFrom(l1Block0.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block1, derivedFrom)
+		derivedFrom, err = db.NextDerivedFrom(l1Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block2, derivedFrom)
+		derivedFrom, err = db.NextDerivedFrom(l1Block2.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block3, derivedFrom)
+		derivedFrom, err = db.NextDerivedFrom(l1Block4.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block5, derivedFrom)
+		_, err = db.NextDerivedFrom(l1Block5.ID())
+		require.ErrorIs(t, err, types.ErrFuture)
+
+		derivedFrom, derived, err = db.FirstAfter(l1Block2.ID(), l2Block1.ID())
+		require.NoError(t, err)
+		require.Equal(t, l1Block3, derivedFrom)
+		require.Equal(t, l2Block1, derived) // no increment in L2 yet, the next after is L1 block 3
 	})
 }
 
@@ -378,17 +611,17 @@ func testManyEntryDB(t *testing.T, offsetL1 uint64, offsetL2 uint64) {
 		// if not started at genesis, try to read older data, assert it's unavailable.
 		if offsetL1 > 0 {
 			_, err := db.LastDerivedAt(mockL1(0).ID())
-			require.ErrorIs(t, err, entrydb.ErrSkipped)
+			require.ErrorIs(t, err, types.ErrSkipped)
 
 			_, err = db.LastDerivedAt(mockL1(offsetL1 - 1).ID())
-			require.ErrorIs(t, err, entrydb.ErrSkipped)
+			require.ErrorIs(t, err, types.ErrSkipped)
 		}
 		if offsetL2 > 0 {
 			_, err := db.DerivedFrom(mockL2(0).ID())
-			require.ErrorIs(t, err, entrydb.ErrSkipped)
+			require.ErrorIs(t, err, types.ErrSkipped)
 
 			_, err = db.DerivedFrom(mockL2(offsetL2 - 1).ID())
-			require.ErrorIs(t, err, entrydb.ErrSkipped)
+			require.ErrorIs(t, err, types.ErrSkipped)
 		}
 	})
 }
@@ -425,7 +658,7 @@ func TestRewind(t *testing.T) {
 		require.Equal(t, l2Block2, derived)
 
 		// Rewind to the future
-		require.ErrorIs(t, db.Rewind(6), entrydb.ErrFuture)
+		require.ErrorIs(t, db.Rewind(6), types.ErrFuture)
 
 		// Rewind to the exact block we're at
 		require.NoError(t, db.Rewind(l1Block5.Number))
diff --git a/op-supervisor/supervisor/backend/db/fromda/entry.go b/op-supervisor/supervisor/backend/db/fromda/entry.go
index 651643b4eb43..4e4f9876d3e8 100644
--- a/op-supervisor/supervisor/backend/db/fromda/entry.go
+++ b/op-supervisor/supervisor/backend/db/fromda/entry.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -57,10 +56,10 @@ func (d LinkEntry) String() string {
 
 func (d *LinkEntry) decode(e Entry) error {
 	if e.Type() != DerivedFromV0 {
-		return fmt.Errorf("%w: unexpected entry type: %s", entrydb.ErrDataCorruption, e.Type())
+		return fmt.Errorf("%w: unexpected entry type: %s", types.ErrDataCorruption, e.Type())
 	}
 	if [3]byte(e[1:4]) != ([3]byte{}) {
-		return fmt.Errorf("%w: expected empty data, to pad entry size to round number: %x", entrydb.ErrDataCorruption, e[1:4])
+		return fmt.Errorf("%w: expected empty data, to pad entry size to round number: %x", types.ErrDataCorruption, e[1:4])
 	}
 	offset := 4
 	d.derivedFrom.Number = binary.BigEndian.Uint64(e[offset : offset+8])
diff --git a/op-supervisor/supervisor/backend/db/fromda/update.go b/op-supervisor/supervisor/backend/db/fromda/update.go
index 07174cb8495a..146e558cf266 100644
--- a/op-supervisor/supervisor/backend/db/fromda/update.go
+++ b/op-supervisor/supervisor/backend/db/fromda/update.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -60,19 +59,19 @@ func (db *DB) AddDerived(derivedFrom eth.BlockRef, derived eth.BlockRef) error {
 		// I.e. we encountered an empty L1 block, and the same L2 block continues to be the last block that was derived from it.
 		if lastDerived.Hash != derived.Hash {
 			return fmt.Errorf("derived block %s conflicts with known derived block %s at same height: %w",
-				derived, lastDerived, entrydb.ErrConflict)
+				derived, lastDerived, types.ErrConflict)
 		}
 	} else if lastDerived.Number+1 == derived.Number {
 		if lastDerived.Hash != derived.ParentHash {
 			return fmt.Errorf("derived block %s (parent %s) does not build on %s: %w",
-				derived, derived.ParentHash, lastDerived, entrydb.ErrConflict)
+				derived, derived.ParentHash, lastDerived, types.ErrConflict)
 		}
 	} else if lastDerived.Number+1 < derived.Number {
 		return fmt.Errorf("derived block %s (parent: %s) is too new, expected to build on top of %s: %w",
-			derived, derived.ParentHash, lastDerived, entrydb.ErrOutOfOrder)
+			derived, derived.ParentHash, lastDerived, types.ErrOutOfOrder)
 	} else {
 		return fmt.Errorf("derived block %s is older than current derived block %s: %w",
-			derived, lastDerived, entrydb.ErrOutOfOrder)
+			derived, lastDerived, types.ErrOutOfOrder)
 	}
 
 	// Check derived-from relation: multiple L2 blocks may be derived from the same L1 block. But everything in sequence.
@@ -80,22 +79,22 @@ func (db *DB) AddDerived(derivedFrom eth.BlockRef, derived eth.BlockRef) error {
 		// Same block height? Then it must be the same block.
 		if lastDerivedFrom.Hash != derivedFrom.Hash {
 			return fmt.Errorf("cannot add block %s as derived from %s, expected to be derived from %s at this block height: %w",
-				derived, derivedFrom, lastDerivedFrom, entrydb.ErrConflict)
+				derived, derivedFrom, lastDerivedFrom, types.ErrConflict)
 		}
 	} else if lastDerivedFrom.Number+1 == derivedFrom.Number {
 		// parent hash check
 		if lastDerivedFrom.Hash != derivedFrom.ParentHash {
 			return fmt.Errorf("cannot add block %s as derived from %s (parent %s) derived on top of %s: %w",
-				derived, derivedFrom, derivedFrom.ParentHash, lastDerivedFrom, entrydb.ErrConflict)
+				derived, derivedFrom, derivedFrom.ParentHash, lastDerivedFrom, types.ErrConflict)
 		}
 	} else if lastDerivedFrom.Number+1 < derivedFrom.Number {
 		// adding block that is derived from something too far into the future
 		return fmt.Errorf("cannot add block %s as derived from %s, still deriving from %s: %w",
-			derived, derivedFrom, lastDerivedFrom, entrydb.ErrOutOfOrder)
+			derived, derivedFrom, lastDerivedFrom, types.ErrOutOfOrder)
 	} else {
 		// adding block that is derived from something too old
 		return fmt.Errorf("cannot add block %s as derived from %s, deriving already at %s: %w",
-			derived, derivedFrom, lastDerivedFrom, entrydb.ErrOutOfOrder)
+			derived, derivedFrom, lastDerivedFrom, types.ErrOutOfOrder)
 	}
 
 	link := LinkEntry{
diff --git a/op-supervisor/supervisor/backend/db/fromda/update_test.go b/op-supervisor/supervisor/backend/db/fromda/update_test.go
index 72141947110e..41be48ae0815 100644
--- a/op-supervisor/supervisor/backend/db/fromda/update_test.go
+++ b/op-supervisor/supervisor/backend/db/fromda/update_test.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -42,14 +41,14 @@ func TestBadUpdates(t *testing.T) {
 		{
 			name: "add on old derivedFrom",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(bDerivedFrom, aDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(bDerivedFrom, aDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "repeat parent derivedFrom",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(cDerivedFrom, bDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(cDerivedFrom, bDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
@@ -60,14 +59,14 @@ func TestBadUpdates(t *testing.T) {
 					Hash:      common.Hash{0xba, 0xd},
 					Number:    dDerivedFrom.Number,
 					Timestamp: dDerivedFrom.Timestamp,
-				}, cDerivedFrom.Hash), toRef(eDerived, dDerived.Hash)), entrydb.ErrConflict)
+				}, cDerivedFrom.Hash), toRef(eDerived, dDerived.Hash)), types.ErrConflict)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "DerivedFrom with conflicting parent root, same L1 height, new L2: accepted, L1 parent-hash is used only on L1 increments.",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.NoError(t, db.AddDerived(toRef(dDerivedFrom, common.Hash{0x42}), toRef(eDerived, dDerived.Hash)), entrydb.ErrConflict)
+				require.NoError(t, db.AddDerived(toRef(dDerivedFrom, common.Hash{0x42}), toRef(eDerived, dDerived.Hash)), types.ErrConflict)
 			},
 			assertFn: func(t *testing.T, db *DB, m *stubMetrics) {
 				derivedFrom, derived, err := db.Latest()
@@ -79,28 +78,28 @@ func TestBadUpdates(t *testing.T) {
 		{
 			name: "Conflicting derivedFrom parent root, new L1 height, same L2",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(eDerivedFrom, common.Hash{0x42}), toRef(dDerived, cDerived.Hash)), entrydb.ErrConflict)
+				require.ErrorIs(t, db.AddDerived(toRef(eDerivedFrom, common.Hash{0x42}), toRef(dDerived, cDerived.Hash)), types.ErrConflict)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "add on too new derivedFrom (even if parent-hash looks correct)",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(fDerivedFrom, dDerivedFrom.Hash), toRef(eDerived, dDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(fDerivedFrom, dDerivedFrom.Hash), toRef(eDerived, dDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "add on old derivedFrom (even if parent-hash looks correct)",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(cDerivedFrom, bDerivedFrom.Hash), toRef(cDerived, dDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(cDerivedFrom, bDerivedFrom.Hash), toRef(cDerived, dDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "add on even older derivedFrom",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(bDerivedFrom, aDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(bDerivedFrom, aDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
@@ -111,14 +110,14 @@ func TestBadUpdates(t *testing.T) {
 					Hash:      common.Hash{0x42},
 					Number:    dDerived.Number,
 					Timestamp: dDerived.Timestamp,
-				}, cDerived.Hash)), entrydb.ErrConflict)
+				}, cDerived.Hash)), types.ErrConflict)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "add derived with conflicting parent hash, new L1 height, same L2 height: accepted, L2 parent-hash is only checked on L2 increments.",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.NoError(t, db.AddDerived(toRef(eDerivedFrom, dDerivedFrom.Hash), toRef(dDerived, common.Hash{0x42})), entrydb.ErrConflict)
+				require.NoError(t, db.AddDerived(toRef(eDerivedFrom, dDerivedFrom.Hash), toRef(dDerived, common.Hash{0x42})), types.ErrConflict)
 			},
 			assertFn: func(t *testing.T, db *DB, m *stubMetrics) {
 				derivedFrom, derived, err := db.Latest()
@@ -130,28 +129,28 @@ func TestBadUpdates(t *testing.T) {
 		{
 			name: "add derived with conflicting parent hash, same L1 height, new L2 height",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(eDerived, common.Hash{0x42})), entrydb.ErrConflict)
+				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(eDerived, common.Hash{0x42})), types.ErrConflict)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "add on too new derived (even if parent-hash looks correct)",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(fDerived, dDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(fDerived, dDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "add on old derived (even if parent-hash looks correct)",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(cDerived, bDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(cDerived, bDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
 		{
 			name: "add on even older derived",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(bDerived, aDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(bDerived, aDerived.Hash)), types.ErrOutOfOrder)
 			},
 			assertFn: noChange,
 		},
@@ -159,7 +158,7 @@ func TestBadUpdates(t *testing.T) {
 			name: "repeat self, silent no-op",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
 				pre := m.DBDerivedEntryCount
-				require.NoError(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), entrydb.ErrOutOfOrder)
+				require.NoError(t, db.AddDerived(toRef(dDerivedFrom, cDerivedFrom.Hash), toRef(dDerived, cDerived.Hash)), types.ErrOutOfOrder)
 				require.Equal(t, pre, m.DBDerivedEntryCount)
 			},
 			assertFn: noChange,
diff --git a/op-supervisor/supervisor/backend/db/logs/db.go b/op-supervisor/supervisor/backend/db/logs/db.go
index 009499755059..dc98b7472074 100644
--- a/op-supervisor/supervisor/backend/db/logs/db.go
+++ b/op-supervisor/supervisor/backend/db/logs/db.go
@@ -139,8 +139,8 @@ func (db *DB) FindSealedBlock(number uint64) (seal types.BlockSeal, err error) {
 	db.rwLock.RLock()
 	defer db.rwLock.RUnlock()
 	iter, err := db.newIteratorAt(number, 0)
-	if errors.Is(err, entrydb.ErrFuture) {
-		return types.BlockSeal{}, fmt.Errorf("block %d is not known yet: %w", number, entrydb.ErrFuture)
+	if errors.Is(err, types.ErrFuture) {
+		return types.BlockSeal{}, fmt.Errorf("block %d is not known yet: %w", number, types.ErrFuture)
 	} else if err != nil {
 		return types.BlockSeal{}, fmt.Errorf("failed to find sealed block %d: %w", number, err)
 	}
@@ -162,6 +162,89 @@ func (db *DB) FindSealedBlock(number uint64) (seal types.BlockSeal, err error) {
 	}, nil
 }
 
+// StartingBlock returns the first block seal in the DB, if any.
+func (db *DB) StartingBlock() (seal types.BlockSeal, err error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+	iter := db.newIterator(0)
+	if err := iter.NextBlock(); err != nil {
+		return types.BlockSeal{}, err
+	}
+	h, n, _ := iter.SealedBlock()
+	t, _ := iter.SealedTimestamp()
+	return types.BlockSeal{
+		Hash:      h,
+		Number:    n,
+		Timestamp: t,
+	}, err
+}
+
+// OpenBlock returns the Executing Messages for the block at the given number.
+// it returns identification of the block, the parent block, and the executing messages.
+func (db *DB) OpenBlock(blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, retErr error) {
+	db.rwLock.RLock()
+	defer db.rwLock.RUnlock()
+
+	if blockNum == 0 {
+		seal, err := db.StartingBlock()
+		if err != nil {
+			retErr = err
+			return
+		}
+		ref = eth.BlockRef{
+			Hash:       seal.Hash,
+			Number:     seal.Number,
+			ParentHash: common.Hash{},
+			Time:       seal.Timestamp,
+		}
+		logCount = 0
+		execMsgs = nil
+		return
+	}
+
+	// start at the first log (if any) after the block-seal of the parent block
+	blockIter, err := db.newIteratorAt(blockNum-1, 0)
+	if err != nil {
+		retErr = err
+		return
+	}
+	// register the parent block
+	parentHash, _, ok := blockIter.SealedBlock()
+	if ok {
+		ref.ParentHash = parentHash
+	}
+	// walk to the end of the block, and remember what we see in the block.
+	logCount = 0
+	execMsgs = make(map[uint32]*types.ExecutingMessage, 0)
+	retErr = blockIter.TraverseConditional(func(state IteratorState) error {
+		_, logIndex, ok := state.InitMessage()
+		if ok {
+			logCount = logIndex + 1
+		}
+		if m := state.ExecMessage(); m != nil {
+			execMsgs[logIndex] = m
+		}
+		h, n, ok := state.SealedBlock()
+		if !ok {
+			return nil
+		}
+		if n == blockNum {
+			ref.Number = n
+			ref.Hash = h
+			ref.Time, _ = state.SealedTimestamp()
+			return types.ErrStop
+		}
+		if n > blockNum {
+			return fmt.Errorf("expected to run into block %d, but did not find it, found %d: %w", blockNum, n, types.ErrDataCorruption)
+		}
+		return nil
+	})
+	if errors.Is(retErr, types.ErrStop) {
+		retErr = nil
+	}
+	return
+}
+
 // LatestSealedBlockNum returns the block number of the block that was last sealed,
 // or ok=false if there is no sealed block (i.e. empty DB)
 func (db *DB) LatestSealedBlockNum() (n uint64, ok bool) {
@@ -213,21 +296,21 @@ func (db *DB) Contains(blockNum uint64, logIdx uint32, logHash common.Hash) (typ
 			return nil
 		}
 		if n == blockNum {
-			return entrydb.ErrStop
+			return types.ErrStop
 		}
 		if n > blockNum {
-			return entrydb.ErrDataCorruption
+			return types.ErrDataCorruption
 		}
 		return nil
 	})
 	if err == nil {
 		panic("expected iterator to stop with error")
 	}
-	if errors.Is(err, entrydb.ErrFuture) {
+	if errors.Is(err, types.ErrFuture) {
 		// Log is known, but as part of an unsealed block.
 		return types.BlockSeal{}, nil
 	}
-	if errors.Is(err, entrydb.ErrStop) {
+	if errors.Is(err, types.ErrStop) {
 		h, n, _ := iter.SealedBlock()
 		timestamp, _ := iter.SealedTimestamp()
 		return types.BlockSeal{
@@ -241,12 +324,12 @@ func (db *DB) Contains(blockNum uint64, logIdx uint32, logHash common.Hash) (typ
 
 func (db *DB) findLogInfo(blockNum uint64, logIdx uint32) (common.Hash, Iterator, error) {
 	if blockNum == 0 {
-		return common.Hash{}, nil, entrydb.ErrConflict // no logs in block 0
+		return common.Hash{}, nil, types.ErrConflict // no logs in block 0
 	}
 	// blockNum-1, such that we find a log that came after the parent num-1 was sealed.
 	// logIdx, such that all entries before logIdx can be skipped, but logIdx itself is still readable.
 	iter, err := db.newIteratorAt(blockNum-1, logIdx)
-	if errors.Is(err, entrydb.ErrFuture) {
+	if errors.Is(err, types.ErrFuture) {
 		db.log.Trace("Could not find log yet", "blockNum", blockNum, "logIdx", logIdx)
 		return common.Hash{}, nil, err
 	} else if err != nil {
@@ -261,7 +344,7 @@ func (db *DB) findLogInfo(blockNum uint64, logIdx uint32) (common.Hash, Iterator
 	} else if x < blockNum-1 {
 		panic(fmt.Errorf("bug in newIteratorAt, expected to have found parent block %d but got %d", blockNum-1, x))
 	} else if x > blockNum-1 {
-		return common.Hash{}, nil, fmt.Errorf("log does not exist, found next block already: %w", entrydb.ErrConflict)
+		return common.Hash{}, nil, fmt.Errorf("log does not exist, found next block already: %w", types.ErrConflict)
 	}
 	logHash, x, ok := iter.InitMessage()
 	if !ok {
@@ -282,7 +365,7 @@ func (db *DB) newIteratorAt(blockNum uint64, logIndex uint32) (*iterator, error)
 	searchCheckpointIndex, err := db.searchCheckpoint(blockNum, logIndex)
 	if errors.Is(err, io.EOF) {
 		// Did not find a checkpoint to start reading from so the log cannot be present.
-		return nil, entrydb.ErrFuture
+		return nil, types.ErrFuture
 	} else if err != nil {
 		return nil, err
 	}
@@ -298,9 +381,9 @@ func (db *DB) newIteratorAt(blockNum uint64, logIndex uint32) (*iterator, error)
 		if _, n, ok := iter.SealedBlock(); ok && n == blockNum { // we may already have it exactly
 			break
 		}
-		if err := iter.NextBlock(); errors.Is(err, entrydb.ErrFuture) {
+		if err := iter.NextBlock(); errors.Is(err, types.ErrFuture) {
 			db.log.Trace("ran out of data, could not find block", "nextIndex", iter.NextIndex(), "target", blockNum)
-			return nil, entrydb.ErrFuture
+			return nil, types.ErrFuture
 		} else if err != nil {
 			db.log.Error("failed to read next block", "nextIndex", iter.NextIndex(), "target", blockNum, "err", err)
 			return nil, err
@@ -314,7 +397,7 @@ func (db *DB) newIteratorAt(blockNum uint64, logIndex uint32) (*iterator, error)
 			continue
 		}
 		if num != blockNum { // block does not contain
-			return nil, fmt.Errorf("looking for %d, but already at %d: %w", blockNum, num, entrydb.ErrConflict)
+			return nil, fmt.Errorf("looking for %d, but already at %d: %w", blockNum, num, types.ErrConflict)
 		}
 		break
 	}
@@ -323,7 +406,7 @@ func (db *DB) newIteratorAt(blockNum uint64, logIndex uint32) (*iterator, error)
 	// so two logs before quiting (and not 3 to then quit after).
 	for iter.current.logsSince < logIndex {
 		if err := iter.NextInitMsg(); err == io.EOF {
-			return nil, entrydb.ErrFuture
+			return nil, types.ErrFuture
 		} else if err != nil {
 			return nil, err
 		}
@@ -333,7 +416,7 @@ func (db *DB) newIteratorAt(blockNum uint64, logIndex uint32) (*iterator, error)
 		}
 		if num > blockNum {
 			// we overshot, the block did not contain as many seen log events as requested
-			return nil, entrydb.ErrConflict
+			return nil, types.ErrConflict
 		}
 		_, idx, ok := iter.InitMessage()
 		if !ok {
@@ -367,7 +450,7 @@ func (db *DB) newIterator(index entrydb.EntryIdx) *iterator {
 // Returns the index of the searchCheckpoint to begin reading from or an error.
 func (db *DB) searchCheckpoint(sealedBlockNum uint64, logsSince uint32) (entrydb.EntryIdx, error) {
 	if db.lastEntryContext.nextEntryIndex == 0 {
-		return 0, entrydb.ErrFuture // empty DB, everything is in the future
+		return 0, types.ErrFuture // empty DB, everything is in the future
 	}
 	n := (db.lastEntryIdx() / searchCheckpointFrequency) + 1
 	// Define: x is the array of known checkpoints
@@ -404,7 +487,7 @@ func (db *DB) searchCheckpoint(sealedBlockNum uint64, logsSince uint32) (entrydb
 	if checkpoint.blockNum > sealedBlockNum ||
 		(checkpoint.blockNum == sealedBlockNum && checkpoint.logsSince > logsSince) {
 		return 0, fmt.Errorf("missing data, earliest search checkpoint is %d with %d logs, cannot find something before or at %d with %d logs: %w",
-			checkpoint.blockNum, checkpoint.logsSince, sealedBlockNum, logsSince, entrydb.ErrSkipped)
+			checkpoint.blockNum, checkpoint.logsSince, sealedBlockNum, logsSince, types.ErrSkipped)
 	}
 	return result, nil
 }
diff --git a/op-supervisor/supervisor/backend/db/logs/db_test.go b/op-supervisor/supervisor/backend/db/logs/db_test.go
index 718bc68a04f4..9e7e9c51a68f 100644
--- a/op-supervisor/supervisor/backend/db/logs/db_test.go
+++ b/op-supervisor/supervisor/backend/db/logs/db_test.go
@@ -89,8 +89,8 @@ func TestLatestSealedBlockNum(t *testing.T) {
 				require.False(t, ok, "empty db expected")
 				require.Zero(t, n)
 				idx, err := db.searchCheckpoint(0, 0)
-				require.ErrorIs(t, err, entrydb.ErrFuture, "no checkpoint in empty db")
-				require.ErrorIs(t, err, entrydb.ErrFuture, "no checkpoint in empty db")
+				require.ErrorIs(t, err, types.ErrFuture, "no checkpoint in empty db")
+				require.ErrorIs(t, err, types.ErrFuture, "no checkpoint in empty db")
 				require.Zero(t, idx)
 			})
 	})
@@ -107,6 +107,14 @@ func TestLatestSealedBlockNum(t *testing.T) {
 				idx, err := db.searchCheckpoint(0, 0)
 				require.NoError(t, err)
 				require.Zero(t, idx, "genesis block as checkpoint 0")
+
+				// Test if we can open the genesis block
+				ref, logCount, execMsgs, err := db.OpenBlock(0)
+				require.NoError(t, err)
+				require.Empty(t, execMsgs)
+				require.Zero(t, logCount)
+				require.Equal(t, genesis, ref.ID())
+				require.Equal(t, uint64(5000), ref.Time)
 			})
 	})
 	t.Run("Later genesis case", func(t *testing.T) {
@@ -123,8 +131,16 @@ func TestLatestSealedBlockNum(t *testing.T) {
 				require.NoError(t, err)
 				require.Zero(t, idx, "anchor block as checkpoint 0")
 				_, err = db.searchCheckpoint(0, 0)
-				require.ErrorIs(t, err, entrydb.ErrSkipped, "no checkpoint before genesis")
-				require.ErrorIs(t, err, entrydb.ErrSkipped, "no checkpoint before genesis")
+				require.ErrorIs(t, err, types.ErrSkipped, "no checkpoint before genesis")
+				require.ErrorIs(t, err, types.ErrSkipped, "no checkpoint before genesis")
+
+				// Test if we can open the starting block
+				_, _, _, err = db.OpenBlock(genesis.Number)
+				// no data to find the parent-hash.
+				// OpenBlock cannot start from the first entry, when not 0.
+				// To start at a non-zero block, index the seal of the parent-block block before it,
+				// and then that parent-hash will be available.
+				require.ErrorIs(t, err, types.ErrSkipped)
 			})
 	})
 	t.Run("Block 1 case", func(t *testing.T) {
@@ -142,6 +158,22 @@ func TestLatestSealedBlockNum(t *testing.T) {
 				idx, err := db.searchCheckpoint(block1.Number, 0)
 				require.NoError(t, err)
 				require.Equal(t, entrydb.EntryIdx(0), idx, "checkpoint 0 still for block 1")
+
+				// Test if we can open the starting block
+				ref, logCount, execMsgs, err := db.OpenBlock(genesis.Number)
+				require.NoError(t, err)
+				require.Empty(t, execMsgs)
+				require.Zero(t, logCount)
+				require.Equal(t, genesis, ref.ID())
+				require.Equal(t, uint64(5000), ref.Time)
+
+				// Test if we can open the first block after genesis
+				ref, logCount, execMsgs, err = db.OpenBlock(block1.Number)
+				require.NoError(t, err)
+				require.Empty(t, execMsgs)
+				require.Zero(t, logCount)
+				require.Equal(t, block1, ref.ID())
+				require.Equal(t, uint64(5001), ref.Time)
 			})
 	})
 	t.Run("Using checkpoint case", func(t *testing.T) {
@@ -151,7 +183,7 @@ func TestLatestSealedBlockNum(t *testing.T) {
 				require.NoError(t, db.SealBlock(common.Hash{}, genesis, 5000), "seal genesis")
 				for i := 1; i <= 260; i++ {
 					id := eth.BlockID{Hash: createHash(i), Number: uint64(i)}
-					require.NoError(t, db.SealBlock(createHash(i-1), id, 5001), "seal block %d", i)
+					require.NoError(t, db.SealBlock(createHash(i-1), id, 5000+uint64(i)), "seal block %d", i)
 				}
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
@@ -164,6 +196,14 @@ func TestLatestSealedBlockNum(t *testing.T) {
 				// It costs 2 entries per block, so if we add more than 1 checkpoint worth of blocks,
 				// then we get to checkpoint 2
 				require.Equal(t, entrydb.EntryIdx(searchCheckpointFrequency*2), idx, "checkpoint 1 reached")
+
+				// Test if we can open the block
+				ref, logCount, execMsgs, err := db.OpenBlock(n)
+				require.NoError(t, err)
+				require.Empty(t, execMsgs)
+				require.Zero(t, logCount)
+				require.Equal(t, createHash(int(n)), ref.Hash)
+				require.Equal(t, uint64(5000)+n, ref.Time)
 			})
 	})
 }
@@ -176,8 +216,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				genesis := eth.BlockID{Hash: createHash(15), Number: 0}
 				err := db.AddLog(createHash(1), genesis, 0, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
 			})
 	})
 
@@ -192,6 +232,12 @@ func TestAddLog(t *testing.T) {
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				requireContains(t, db, 16, 0, createHash(1))
+
+				ref, logCount, execMsgs, err := db.OpenBlock(16)
+				require.NoError(t, err)
+				require.Empty(t, execMsgs)
+				require.Equal(t, uint32(1), logCount)
+				require.Equal(t, eth.BlockRef{Hash: createHash(16), Number: 16, ParentHash: createHash(15), Time: 5001}, ref)
 			})
 	})
 
@@ -221,6 +267,18 @@ func TestAddLog(t *testing.T) {
 				requireContains(t, db, 16, 0, createHash(1))
 				requireContains(t, db, 16, 1, createHash(2))
 				requireContains(t, db, 16, 2, createHash(3))
+
+				ref, logCount, execMsgs, err := db.OpenBlock(13)
+				require.NoError(t, err)
+				require.Empty(t, execMsgs)
+				require.Equal(t, uint32(0), logCount)
+				require.Equal(t, eth.BlockRef{Hash: createHash(13), Number: 13, ParentHash: createHash(12), Time: 5013}, ref)
+
+				ref, logCount, execMsgs, err = db.OpenBlock(16)
+				require.NoError(t, err)
+				require.Empty(t, execMsgs)
+				require.Equal(t, uint32(3), logCount)
+				require.Equal(t, eth.BlockRef{Hash: createHash(16), Number: 16, ParentHash: createHash(15), Time: 5016}, ref)
 			})
 	})
 
@@ -267,8 +325,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				bl14 := eth.BlockID{Hash: createHash(14), Number: 14}
 				err := db.SealBlock(createHash(13), bl14, 5000)
-				require.ErrorIs(t, err, entrydb.ErrConflict)
-				require.ErrorIs(t, err, entrydb.ErrConflict)
+				require.ErrorIs(t, err, types.ErrConflict)
+				require.ErrorIs(t, err, types.ErrConflict)
 			})
 	})
 
@@ -285,8 +343,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				onto := eth.BlockID{Hash: createHash(14), Number: 14}
 				err := db.AddLog(createHash(1), onto, 0, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "cannot build logs on 14 when 15 is already sealed")
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "cannot build logs on 14 when 15 is already sealed")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "cannot build logs on 14 when 15 is already sealed")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "cannot build logs on 14 when 15 is already sealed")
 			})
 	})
 
@@ -302,8 +360,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				bl15 := eth.BlockID{Hash: createHash(15), Number: 15}
 				err := db.AddLog(createHash(1), bl15, 0, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "already at log index 2")
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "already at log index 2")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "already at log index 2")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "already at log index 2")
 			})
 	})
 
@@ -318,8 +376,8 @@ func TestAddLog(t *testing.T) {
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				err := db.AddLog(createHash(1), eth.BlockID{Hash: createHash(16), Number: 16}, 0, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
 			})
 	})
 
@@ -335,8 +393,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				bl15 := eth.BlockID{Hash: createHash(15), Number: 15}
 				err := db.AddLog(createHash(1), bl15, 1, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "already at log index 2")
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "already at log index 2")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "already at log index 2")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "already at log index 2")
 			})
 	})
 
@@ -352,8 +410,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				bl15 := eth.BlockID{Hash: createHash(16), Number: 16}
 				err := db.AddLog(createHash(1), bl15, 2, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
 			})
 	})
 
@@ -368,8 +426,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				bl15 := eth.BlockID{Hash: createHash(15), Number: 15}
 				err := db.AddLog(createHash(1), bl15, 2, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
 			})
 	})
 
@@ -382,8 +440,8 @@ func TestAddLog(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				bl15 := eth.BlockID{Hash: createHash(15), Number: 15}
 				err := db.AddLog(createHash(1), bl15, 5, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
 			})
 	})
 
@@ -404,8 +462,8 @@ func TestAddLog(t *testing.T) {
 				err = db.SealBlock(bl15.Hash, bl16, 5001)
 				require.NoError(t, err)
 				err = db.AddLog(createHash(1), bl16, 1, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
 			})
 	})
 
@@ -701,6 +759,14 @@ func TestExecutes(t *testing.T) {
 
 			// 51 only contained 3 logs, not 4
 			requireConflicts(t, db, 51, 3, createHash(2))
+
+			// 51 contains an executing message, and 2 other non-executing logs
+			ref, logCount, execMsgs, err := db.OpenBlock(51)
+			require.NoError(t, err)
+			require.Len(t, execMsgs, 1)
+			require.Equal(t, &execMsg1, execMsgs[1])
+			require.Equal(t, uint32(3), logCount)
+			require.Equal(t, eth.BlockRef{Hash: createHash(51), Number: 51, ParentHash: createHash(50), Time: 5001}, ref)
 		})
 }
 
@@ -710,9 +776,9 @@ func TestGetBlockInfo(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				_, err := db.FindSealedBlock(10)
-				require.ErrorIs(t, err, entrydb.ErrFuture)
+				require.ErrorIs(t, err, types.ErrFuture)
 				_, err = db.FindSealedBlock(10)
-				require.ErrorIs(t, err, entrydb.ErrFuture)
+				require.ErrorIs(t, err, types.ErrFuture)
 			})
 	})
 
@@ -727,9 +793,9 @@ func TestGetBlockInfo(t *testing.T) {
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				// if the DB starts at 11, then shouldn't find 10
 				_, err := db.FindSealedBlock(10)
-				require.ErrorIs(t, err, entrydb.ErrSkipped)
+				require.ErrorIs(t, err, types.ErrSkipped)
 				_, err = db.FindSealedBlock(10)
-				require.ErrorIs(t, err, entrydb.ErrSkipped)
+				require.ErrorIs(t, err, types.ErrSkipped)
 			})
 	})
 
@@ -772,8 +838,8 @@ func requireConflicts(t *testing.T, db *DB, blockNum uint64, logIdx uint32, logH
 	m, ok := db.m.(*stubMetrics)
 	require.True(t, ok, "Did not get the expected metrics type")
 	_, err := db.Contains(blockNum, logIdx, logHash)
-	require.ErrorIs(t, err, entrydb.ErrConflict, "canonical chain must not include this log")
-	require.ErrorIs(t, err, entrydb.ErrConflict, "canonical chain must not include this log")
+	require.ErrorIs(t, err, types.ErrConflict, "canonical chain must not include this log")
+	require.ErrorIs(t, err, types.ErrConflict, "canonical chain must not include this log")
 	require.LessOrEqual(t, m.entriesReadForSearch, int64(searchCheckpointFrequency*2), "Should not need to read more than between two checkpoints")
 }
 
@@ -781,8 +847,8 @@ func requireFuture(t *testing.T, db *DB, blockNum uint64, logIdx uint32, logHash
 	m, ok := db.m.(*stubMetrics)
 	require.True(t, ok, "Did not get the expected metrics type")
 	_, err := db.Contains(blockNum, logIdx, logHash)
-	require.ErrorIs(t, err, entrydb.ErrFuture, "canonical chain does not yet include this log")
-	require.ErrorIs(t, err, entrydb.ErrFuture, "canonical chain does not yet include this log")
+	require.ErrorIs(t, err, types.ErrFuture, "canonical chain does not yet include this log")
+	require.ErrorIs(t, err, types.ErrFuture, "canonical chain does not yet include this log")
 	require.LessOrEqual(t, m.entriesReadForSearch, int64(searchCheckpointFrequency*2), "Should not need to read more than between two checkpoints")
 }
 
@@ -943,11 +1009,11 @@ func TestRewind(t *testing.T) {
 	t.Run("WhenEmpty", func(t *testing.T) {
 		runDBTest(t, func(t *testing.T, db *DB, m *stubMetrics) {},
 			func(t *testing.T, db *DB, m *stubMetrics) {
-				require.ErrorIs(t, db.Rewind(100), entrydb.ErrFuture)
-				require.ErrorIs(t, db.Rewind(100), entrydb.ErrFuture)
+				require.ErrorIs(t, db.Rewind(100), types.ErrFuture)
+				require.ErrorIs(t, db.Rewind(100), types.ErrFuture)
 				// Genesis is a block to, not present in an empty DB
-				require.ErrorIs(t, db.Rewind(0), entrydb.ErrFuture)
-				require.ErrorIs(t, db.Rewind(0), entrydb.ErrFuture)
+				require.ErrorIs(t, db.Rewind(0), types.ErrFuture)
+				require.ErrorIs(t, db.Rewind(0), types.ErrFuture)
 			})
 	})
 
@@ -965,8 +1031,8 @@ func TestRewind(t *testing.T) {
 				require.NoError(t, db.SealBlock(bl51.Hash, bl52, 504))
 				require.NoError(t, db.AddLog(createHash(4), bl52, 0, nil))
 				// cannot rewind to a block that is not sealed yet
-				require.ErrorIs(t, db.Rewind(53), entrydb.ErrFuture)
-				require.ErrorIs(t, db.Rewind(53), entrydb.ErrFuture)
+				require.ErrorIs(t, db.Rewind(53), types.ErrFuture)
+				require.ErrorIs(t, db.Rewind(53), types.ErrFuture)
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				requireContains(t, db, 51, 0, createHash(1))
@@ -985,8 +1051,8 @@ func TestRewind(t *testing.T) {
 				require.NoError(t, db.AddLog(createHash(1), bl50, 0, nil))
 				require.NoError(t, db.AddLog(createHash(2), bl50, 1, nil))
 				// cannot go back to an unknown block
-				require.ErrorIs(t, db.Rewind(25), entrydb.ErrSkipped)
-				require.ErrorIs(t, db.Rewind(25), entrydb.ErrSkipped)
+				require.ErrorIs(t, db.Rewind(25), types.ErrSkipped)
+				require.ErrorIs(t, db.Rewind(25), types.ErrSkipped)
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				requireContains(t, db, 51, 0, createHash(1))
@@ -1111,14 +1177,14 @@ func TestRewind(t *testing.T) {
 				bl29 := eth.BlockID{Hash: createHash(29), Number: 29}
 				// 29 was deleted
 				err := db.AddLog(createHash(2), bl29, 1, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "Cannot add log on removed block")
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder, "Cannot add log on removed block")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "Cannot add log on removed block")
+				require.ErrorIs(t, err, types.ErrOutOfOrder, "Cannot add log on removed block")
 				// 15 is older, we have up to 16
 				bl15 := eth.BlockID{Hash: createHash(15), Number: 15}
 				// try to add a third log to 15
 				err = db.AddLog(createHash(10), bl15, 2, nil)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
-				require.ErrorIs(t, err, entrydb.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
+				require.ErrorIs(t, err, types.ErrOutOfOrder)
 				bl16 := eth.BlockID{Hash: createHash(16), Number: 16}
 				// try to add a log to 17, on top of 16
 				err = db.AddLog(createHash(42), bl16, 0, nil)
diff --git a/op-supervisor/supervisor/backend/db/logs/entries.go b/op-supervisor/supervisor/backend/db/logs/entries.go
index acb0d2b55626..5c5472c522b7 100644
--- a/op-supervisor/supervisor/backend/db/logs/entries.go
+++ b/op-supervisor/supervisor/backend/db/logs/entries.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -29,7 +28,7 @@ func newSearchCheckpoint(blockNum uint64, logsSince uint32, timestamp uint64) se
 
 func newSearchCheckpointFromEntry(data Entry) (searchCheckpoint, error) {
 	if data.Type() != TypeSearchCheckpoint {
-		return searchCheckpoint{}, fmt.Errorf("%w: attempting to decode search checkpoint but was type %s", entrydb.ErrDataCorruption, data.Type())
+		return searchCheckpoint{}, fmt.Errorf("%w: attempting to decode search checkpoint but was type %s", types.ErrDataCorruption, data.Type())
 	}
 	return searchCheckpoint{
 		blockNum:  binary.LittleEndian.Uint64(data[1:9]),
@@ -59,7 +58,7 @@ func newCanonicalHash(hash common.Hash) canonicalHash {
 
 func newCanonicalHashFromEntry(data Entry) (canonicalHash, error) {
 	if data.Type() != TypeCanonicalHash {
-		return canonicalHash{}, fmt.Errorf("%w: attempting to decode canonical hash but was type %s", entrydb.ErrDataCorruption, data.Type())
+		return canonicalHash{}, fmt.Errorf("%w: attempting to decode canonical hash but was type %s", types.ErrDataCorruption, data.Type())
 	}
 	return newCanonicalHash(common.Hash(data[1:33])), nil
 }
@@ -78,7 +77,7 @@ type initiatingEvent struct {
 
 func newInitiatingEventFromEntry(data Entry) (initiatingEvent, error) {
 	if data.Type() != TypeInitiatingEvent {
-		return initiatingEvent{}, fmt.Errorf("%w: attempting to decode initiating event but was type %s", entrydb.ErrDataCorruption, data.Type())
+		return initiatingEvent{}, fmt.Errorf("%w: attempting to decode initiating event but was type %s", types.ErrDataCorruption, data.Type())
 	}
 	flags := data[1]
 	return initiatingEvent{
@@ -109,7 +108,7 @@ func (i initiatingEvent) encode() Entry {
 }
 
 type executingLink struct {
-	chain     uint32
+	chain     uint32 // chain index, not a chain ID
 	blockNum  uint64
 	logIdx    uint32
 	timestamp uint64
@@ -120,7 +119,7 @@ func newExecutingLink(msg types.ExecutingMessage) (executingLink, error) {
 		return executingLink{}, fmt.Errorf("log idx is too large (%v)", msg.LogIdx)
 	}
 	return executingLink{
-		chain:     msg.Chain,
+		chain:     uint32(msg.Chain),
 		blockNum:  msg.BlockNum,
 		logIdx:    msg.LogIdx,
 		timestamp: msg.Timestamp,
@@ -129,7 +128,7 @@ func newExecutingLink(msg types.ExecutingMessage) (executingLink, error) {
 
 func newExecutingLinkFromEntry(data Entry) (executingLink, error) {
 	if data.Type() != TypeExecutingLink {
-		return executingLink{}, fmt.Errorf("%w: attempting to decode executing link but was type %s", entrydb.ErrDataCorruption, data.Type())
+		return executingLink{}, fmt.Errorf("%w: attempting to decode executing link but was type %s", types.ErrDataCorruption, data.Type())
 	}
 	timestamp := binary.LittleEndian.Uint64(data[16:24])
 	return executingLink{
@@ -166,7 +165,7 @@ func newExecutingCheck(hash common.Hash) executingCheck {
 
 func newExecutingCheckFromEntry(data Entry) (executingCheck, error) {
 	if data.Type() != TypeExecutingCheck {
-		return executingCheck{}, fmt.Errorf("%w: attempting to decode executing check but was type %s", entrydb.ErrDataCorruption, data.Type())
+		return executingCheck{}, fmt.Errorf("%w: attempting to decode executing check but was type %s", types.ErrDataCorruption, data.Type())
 	}
 	return newExecutingCheck(common.Hash(data[1:33])), nil
 }
diff --git a/op-supervisor/supervisor/backend/db/logs/iterator.go b/op-supervisor/supervisor/backend/db/logs/iterator.go
index 5a7015ca4fda..c107a2a9fb86 100644
--- a/op-supervisor/supervisor/backend/db/logs/iterator.go
+++ b/op-supervisor/supervisor/backend/db/logs/iterator.go
@@ -41,7 +41,7 @@ type traverseConditionalFn func(state IteratorState) error
 func (i *iterator) End() error {
 	for {
 		_, err := i.next()
-		if errors.Is(err, entrydb.ErrFuture) {
+		if errors.Is(err, types.ErrFuture) {
 			return nil
 		} else if err != nil {
 			return err
@@ -49,7 +49,7 @@ func (i *iterator) End() error {
 	}
 }
 
-// NextInitMsg returns the next initiating message in the iterator.
+// NextInitMsg advances the iterator until it reads the next Initiating Message into the current state.
 // It scans forward until it finds and fully reads an initiating event, skipping any blocks.
 func (i *iterator) NextInitMsg() error {
 	seenLog := false
@@ -73,9 +73,8 @@ func (i *iterator) NextInitMsg() error {
 	}
 }
 
-// NextExecMsg returns the next executing message in the iterator.
+// NextExecMsg advances the iterator until it reads the next Executing Message into the current state.
 // It scans forward until it finds and fully reads an initiating event, skipping any blocks.
-// This does not stay at the executing message of the current initiating message, if there is any.
 func (i *iterator) NextExecMsg() error {
 	for {
 		err := i.NextInitMsg()
@@ -88,7 +87,7 @@ func (i *iterator) NextExecMsg() error {
 	}
 }
 
-// NextBlock returns the next block in the iterator.
+// NextBlock advances the iterator until it reads the next block into the current state.
 // It scans forward until it finds and fully reads a block, skipping any events.
 func (i *iterator) NextBlock() error {
 	seenBlock := false
@@ -134,7 +133,7 @@ func (i *iterator) next() (EntryType, error) {
 	entry, err := i.db.store.Read(index)
 	if err != nil {
 		if errors.Is(err, io.EOF) {
-			return 0, entrydb.ErrFuture
+			return 0, types.ErrFuture
 		}
 		return 0, fmt.Errorf("failed to read entry %d: %w", index, err)
 	}
diff --git a/op-supervisor/supervisor/backend/db/logs/state.go b/op-supervisor/supervisor/backend/db/logs/state.go
index 2e51295c93df..3c90102b1ad0 100644
--- a/op-supervisor/supervisor/backend/db/logs/state.go
+++ b/op-supervisor/supervisor/backend/db/logs/state.go
@@ -200,7 +200,7 @@ func (l *logContext) processEntry(entry Entry) error {
 			return err
 		}
 		l.execMsg = &types.ExecutingMessage{
-			Chain:     link.chain,
+			Chain:     types.ChainIndex(link.chain), // TODO(#11105): translate chain ID to chain index
 			BlockNum:  link.blockNum,
 			LogIdx:    link.logIdx,
 			Timestamp: link.timestamp,
@@ -352,13 +352,13 @@ func (l *logContext) SealBlock(parent common.Hash, upd eth.BlockID, timestamp ui
 			return err
 		}
 		if l.blockHash != parent {
-			return fmt.Errorf("%w: cannot apply block %s (parent %s) on top of %s", entrydb.ErrConflict, upd, parent, l.blockHash)
+			return fmt.Errorf("%w: cannot apply block %s (parent %s) on top of %s", types.ErrConflict, upd, parent, l.blockHash)
 		}
 		if l.blockHash != (common.Hash{}) && l.blockNum+1 != upd.Number {
-			return fmt.Errorf("%w: cannot apply block %d on top of %d", entrydb.ErrConflict, upd.Number, l.blockNum)
+			return fmt.Errorf("%w: cannot apply block %d on top of %d", types.ErrConflict, upd.Number, l.blockNum)
 		}
 		if l.timestamp > timestamp {
-			return fmt.Errorf("%w: block timestamp %d must be equal or larger than current timestamp %d", entrydb.ErrConflict, timestamp, l.timestamp)
+			return fmt.Errorf("%w: block timestamp %d must be equal or larger than current timestamp %d", types.ErrConflict, timestamp, l.timestamp)
 		}
 	}
 	l.blockHash = upd.Hash
@@ -375,28 +375,28 @@ func (l *logContext) SealBlock(parent common.Hash, upd eth.BlockID, timestamp ui
 // The parent-block that the log comes after must be applied with ApplyBlock first.
 func (l *logContext) ApplyLog(parentBlock eth.BlockID, logIdx uint32, logHash common.Hash, execMsg *types.ExecutingMessage) error {
 	if parentBlock == (eth.BlockID{}) {
-		return fmt.Errorf("genesis does not have logs: %w", entrydb.ErrOutOfOrder)
+		return fmt.Errorf("genesis does not have logs: %w", types.ErrOutOfOrder)
 	}
 	if err := l.inferFull(); err != nil { // ensure we can start applying
 		return err
 	}
 	if !l.hasCompleteBlock() {
 		if l.blockNum == 0 {
-			return fmt.Errorf("%w: should not have logs in block 0", entrydb.ErrOutOfOrder)
+			return fmt.Errorf("%w: should not have logs in block 0", types.ErrOutOfOrder)
 		} else {
 			return errors.New("cannot append log before last known block is sealed")
 		}
 	}
 	// check parent block
 	if l.blockHash != parentBlock.Hash {
-		return fmt.Errorf("%w: log builds on top of block %s, but have block %s", entrydb.ErrOutOfOrder, parentBlock, l.blockHash)
+		return fmt.Errorf("%w: log builds on top of block %s, but have block %s", types.ErrOutOfOrder, parentBlock, l.blockHash)
 	}
 	if l.blockNum != parentBlock.Number {
-		return fmt.Errorf("%w: log builds on top of block %d, but have block %d", entrydb.ErrOutOfOrder, parentBlock.Number, l.blockNum)
+		return fmt.Errorf("%w: log builds on top of block %d, but have block %d", types.ErrOutOfOrder, parentBlock.Number, l.blockNum)
 	}
 	// check if log fits on top. The length so far == the index of the next log.
 	if logIdx != l.logsSince {
-		return fmt.Errorf("%w: expected event index %d, cannot append %d", entrydb.ErrOutOfOrder, l.logsSince, logIdx)
+		return fmt.Errorf("%w: expected event index %d, cannot append %d", types.ErrOutOfOrder, l.logsSince, logIdx)
 	}
 	l.logHash = logHash
 	l.execMsg = execMsg
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index c331379f9a28..5db821396c8a 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -7,7 +7,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/entrydb"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/logs"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -18,7 +17,7 @@ func (db *ChainsDB) FindSealedBlock(chain types.ChainID, number uint64) (seal ty
 
 	logDB, ok := db.logDBs[chain]
 	if !ok {
-		return types.BlockSeal{}, fmt.Errorf("%w: %v", ErrUnknownChain, chain)
+		return types.BlockSeal{}, fmt.Errorf("%w: %v", types.ErrUnknownChain, chain)
 	}
 	return logDB.FindSealedBlock(number)
 }
@@ -37,17 +36,69 @@ func (db *ChainsDB) LatestBlockNum(chain types.ChainID) (num uint64, ok bool) {
 	return logDB.LatestSealedBlockNum()
 }
 
+func (db *ChainsDB) IsCrossUnsafe(chainID types.ChainID, block eth.BlockID) error {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+	v, ok := db.crossUnsafe[chainID]
+	if !ok {
+		return types.ErrUnknownChain
+	}
+	if v == (types.BlockSeal{}) {
+		return types.ErrFuture
+	}
+	if block.Number > v.Number {
+		return types.ErrFuture
+	}
+	// TODO(#11693): make cross-unsafe reorg safe
+	return nil
+}
+
+func (db *ChainsDB) ParentBlock(chainID types.ChainID, parentOf eth.BlockID) (parent eth.BlockID, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+	logDB, ok := db.logDBs[chainID]
+	if !ok {
+		return eth.BlockID{}, types.ErrUnknownChain
+	}
+	if parentOf.Number == 0 {
+		return eth.BlockID{}, nil
+	}
+	// TODO(#11693): make parent-lookup reorg safe
+	got, err := logDB.FindSealedBlock(parentOf.Number - 1)
+	if err != nil {
+		return eth.BlockID{}, err
+	}
+	return got.ID(), nil
+}
+
+func (db *ChainsDB) IsLocalUnsafe(chainID types.ChainID, block eth.BlockID) error {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+	logDB, ok := db.logDBs[chainID]
+	if !ok {
+		return types.ErrUnknownChain
+	}
+	got, err := logDB.FindSealedBlock(block.Number)
+	if err != nil {
+		return err
+	}
+	if got.ID() != block {
+		return fmt.Errorf("found %s but was looking for unsafe block %s: %w", got, block, types.ErrConflict)
+	}
+	return nil
+}
+
 func (db *ChainsDB) LocalUnsafe(chainID types.ChainID) (types.BlockSeal, error) {
 	db.mu.RLock()
 	defer db.mu.RUnlock()
 
 	eventsDB, ok := db.logDBs[chainID]
 	if !ok {
-		return types.BlockSeal{}, ErrUnknownChain
+		return types.BlockSeal{}, types.ErrUnknownChain
 	}
 	n, ok := eventsDB.LatestSealedBlockNum()
 	if !ok {
-		return types.BlockSeal{}, entrydb.ErrFuture
+		return types.BlockSeal{}, types.ErrFuture
 	}
 	return eventsDB.FindSealedBlock(n)
 }
@@ -58,7 +109,7 @@ func (db *ChainsDB) CrossUnsafe(chainID types.ChainID) (types.BlockSeal, error)
 
 	result, ok := db.crossUnsafe[chainID]
 	if !ok {
-		return types.BlockSeal{}, ErrUnknownChain
+		return types.BlockSeal{}, types.ErrUnknownChain
 	}
 	// Fall back to cross-safe if cross-unsafe is not known yet
 	if result == (types.BlockSeal{}) {
@@ -77,7 +128,7 @@ func (db *ChainsDB) LocalSafe(chainID types.ChainID) (derivedFrom types.BlockSea
 
 	localDB, ok := db.localDBs[chainID]
 	if !ok {
-		return types.BlockSeal{}, types.BlockSeal{}, ErrUnknownChain
+		return types.BlockSeal{}, types.BlockSeal{}, types.ErrUnknownChain
 	}
 	return localDB.Latest()
 }
@@ -88,7 +139,7 @@ func (db *ChainsDB) CrossSafe(chainID types.ChainID) (derivedFrom types.BlockSea
 
 	crossDB, ok := db.crossDBs[chainID]
 	if !ok {
-		return types.BlockSeal{}, types.BlockSeal{}, ErrUnknownChain
+		return types.BlockSeal{}, types.BlockSeal{}, types.ErrUnknownChain
 	}
 	return crossDB.Latest()
 }
@@ -111,7 +162,7 @@ func (db *ChainsDB) Finalized(chainID types.ChainID) (types.BlockSeal, error) {
 func (db *ChainsDB) LastDerivedFrom(chainID types.ChainID, derivedFrom eth.BlockID) (derived types.BlockSeal, err error) {
 	crossDB, ok := db.crossDBs[chainID]
 	if !ok {
-		return types.BlockSeal{}, ErrUnknownChain
+		return types.BlockSeal{}, types.ErrUnknownChain
 	}
 	return crossDB.LastDerivedAt(derivedFrom)
 }
@@ -122,7 +173,7 @@ func (db *ChainsDB) DerivedFrom(chainID types.ChainID, derived eth.BlockID) (der
 
 	localDB, ok := db.localDBs[chainID]
 	if !ok {
-		return types.BlockSeal{}, ErrUnknownChain
+		return types.BlockSeal{}, types.ErrUnknownChain
 	}
 	return localDB.DerivedFrom(derived)
 }
@@ -135,11 +186,168 @@ func (db *ChainsDB) Check(chain types.ChainID, blockNum uint64, logIdx uint32, l
 
 	logDB, ok := db.logDBs[chain]
 	if !ok {
-		return types.BlockSeal{}, fmt.Errorf("%w: %v", ErrUnknownChain, chain)
+		return types.BlockSeal{}, fmt.Errorf("%w: %v", types.ErrUnknownChain, chain)
 	}
 	return logDB.Contains(blockNum, logIdx, logHash)
 }
 
+// OpenBlock returns the Executing Messages for the block at the given number on the given chain.
+// it routes the request to the appropriate logDB.
+func (db *ChainsDB) OpenBlock(chainID types.ChainID, blockNum uint64) (seal eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+
+	logDB, ok := db.logDBs[chainID]
+	if !ok {
+		return eth.BlockRef{}, 0, nil, types.ErrUnknownChain
+	}
+	return logDB.OpenBlock(blockNum)
+}
+
+// LocalDerivedFrom returns the block that the given block was derived from, if it exists in the local derived-from storage.
+// it routes the request to the appropriate localDB.
+func (db *ChainsDB) LocalDerivedFrom(chain types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+
+	lDB, ok := db.localDBs[chain]
+	if !ok {
+		return types.BlockSeal{}, types.ErrUnknownChain
+	}
+	return lDB.DerivedFrom(derived)
+}
+
+// CrossDerivedFrom returns the block that the given block was derived from, if it exists in the cross derived-from storage.
+// it routes the request to the appropriate crossDB.
+func (db *ChainsDB) CrossDerivedFrom(chain types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+
+	xDB, ok := db.crossDBs[chain]
+	if !ok {
+		return types.BlockSeal{}, types.ErrUnknownChain
+	}
+	return xDB.DerivedFrom(derived)
+}
+
+// CandidateCrossSafe returns the candidate local-safe block that may become cross-safe.
+//
+// This returns ErrFuture if no block is known yet.
+//
+// Or ErrConflict if there is an inconsistency between the local-safe and cross-safe DB.
+//
+// Or ErrOutOfScope, with non-zero derivedFromScope,
+// if additional L1 data is needed to cross-verify the candidate L2 block.
+func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, crossSafe eth.BlockRef, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+
+	xDB, ok := db.crossDBs[chain]
+	if !ok {
+		return eth.BlockRef{}, eth.BlockRef{}, types.ErrUnknownChain
+	}
+
+	lDB, ok := db.localDBs[chain]
+	if !ok {
+		return eth.BlockRef{}, eth.BlockRef{}, types.ErrUnknownChain
+	}
+
+	// Example:
+	// A B C D      <- L1
+	// 1     2      <- L2
+	// return:
+	// (A, 0) -> initial scope, no L2 block yet. Genesis found to be cross-safe
+	// (A, 1) -> 1 is determined cross-safe, won't be a candidate anymore after. 2 is the new candidate
+	// (B, 2) -> 2 is out of scope, go to B
+	// (C, 2) -> 2 is out of scope, go to C
+	// (D, 2) -> 2 is in scope, stay on D, promote candidate to cross-safe
+	// (D, 3) -> look at 3 next, see if we have to bump L1 yet, try with same L1 scope first
+
+	crossDerivedFrom, crossDerived, err := xDB.Latest()
+	if err != nil {
+		if errors.Is(err, types.ErrFuture) {
+			// If we do not have any cross-safe block yet, then return the first local-safe block.
+			derivedFrom, derived, err := lDB.First()
+			if err != nil {
+				return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find first local-safe block: %w", err)
+			}
+			// First block has no parent
+			return derivedFrom.WithParent(eth.BlockID{}),
+				derived.WithParent(eth.BlockID{}), nil
+		}
+		return eth.BlockRef{}, eth.BlockRef{}, err
+	}
+	// Find the local-safe block that comes right after the last seen cross-safe block.
+	// Just L2 block by block traversal, conditional on being local-safe.
+	// This will be the candidate L2 block to promote.
+
+	// While the local-safe block isn't cross-safe given limited L1 scope, we'll keep bumping the L1 scope,
+	// And update cross-safe accordingly.
+	// This method will keep returning the latest known scope that has been verified to be cross-safe.
+	candidateFrom, candidate, err := lDB.NextDerived(crossDerived.ID())
+	if err != nil {
+		return eth.BlockRef{}, eth.BlockRef{}, err
+	}
+
+	candidateRef := candidate.WithParent(crossDerived.ID())
+
+	parentDerivedFrom, err := lDB.PreviousDerivedFrom(candidateFrom.ID())
+	if err != nil {
+		return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find parent-block of derived-from %s: %w", candidateFrom, err)
+	}
+	candidateFromRef := candidateFrom.WithParent(parentDerivedFrom.ID())
+
+	// Allow increment of DA by 1, if we know the floor (due to local safety) is 1 ahead of the current cross-safe L1 scope.
+	if candidateFrom.Number > crossDerivedFrom.Number+1 {
+		// If we are not ready to process the candidate block,
+		// then we need to stick to the current scope, so the caller can bump up from there.
+		parent, err := lDB.PreviousDerivedFrom(crossDerivedFrom.ID())
+		if err != nil {
+			return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find parent-block of cross-derived-from %s: %w",
+				crossDerivedFrom, err)
+		}
+		crossDerivedFromRef := crossDerivedFrom.WithParent(parent.ID())
+		return crossDerivedFromRef, eth.BlockRef{},
+			fmt.Errorf("candidate is from %s, while current scope is %s: %w",
+				candidateFrom, crossDerivedFrom, types.ErrOutOfScope)
+	}
+	return candidateFromRef, candidateRef, nil
+}
+
+func (db *ChainsDB) PreviousDerived(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+	lDB, ok := db.localDBs[chain]
+	if !ok {
+		return types.BlockSeal{}, types.ErrUnknownChain
+	}
+	return lDB.PreviousDerived(derived)
+}
+
+func (db *ChainsDB) PreviousDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID) (prevDerivedFrom types.BlockSeal, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+	lDB, ok := db.localDBs[chain]
+	if !ok {
+		return types.BlockSeal{}, types.ErrUnknownChain
+	}
+	return lDB.PreviousDerivedFrom(derivedFrom)
+}
+
+func (db *ChainsDB) NextDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error) {
+	db.mu.RLock()
+	defer db.mu.RUnlock()
+	lDB, ok := db.localDBs[chain]
+	if !ok {
+		return eth.BlockRef{}, types.ErrUnknownChain
+	}
+	v, err := lDB.NextDerivedFrom(derivedFrom)
+	if err != nil {
+		return eth.BlockRef{}, err
+	}
+	return v.WithParent(derivedFrom), nil
+}
+
 // Safest returns the strongest safety level that can be guaranteed for the given log entry.
 // it assumes the log entry has already been checked and is valid, this function only checks safety levels.
 // Cross-safety levels are all considered to be more safe than any form of local-safety.
@@ -181,7 +389,7 @@ func (db *ChainsDB) Safest(chainID types.ChainID, blockNum uint64, index uint32)
 func (db *ChainsDB) IteratorStartingAt(chain types.ChainID, sealedNum uint64, logIndex uint32) (logs.Iterator, error) {
 	logDB, ok := db.logDBs[chain]
 	if !ok {
-		return nil, fmt.Errorf("%w: %v", ErrUnknownChain, chain)
+		return nil, fmt.Errorf("%w: %v", types.ErrUnknownChain, chain)
 	}
 	return logDB.IteratorStartingAt(sealedNum, logIndex)
 }
diff --git a/op-supervisor/supervisor/backend/db/update.go b/op-supervisor/supervisor/backend/db/update.go
index 9825b76fdafc..e45fd3f469a5 100644
--- a/op-supervisor/supervisor/backend/db/update.go
+++ b/op-supervisor/supervisor/backend/db/update.go
@@ -20,7 +20,7 @@ func (db *ChainsDB) AddLog(
 
 	logDB, ok := db.logDBs[chain]
 	if !ok {
-		return fmt.Errorf("cannot AddLog: %w: %v", ErrUnknownChain, chain)
+		return fmt.Errorf("cannot AddLog: %w: %v", types.ErrUnknownChain, chain)
 	}
 	return logDB.AddLog(logHash, parentBlock, logIdx, execMsg)
 }
@@ -31,8 +31,9 @@ func (db *ChainsDB) SealBlock(chain types.ChainID, block eth.BlockRef) error {
 
 	logDB, ok := db.logDBs[chain]
 	if !ok {
-		return fmt.Errorf("cannot SealBlock: %w: %v", ErrUnknownChain, chain)
+		return fmt.Errorf("cannot SealBlock: %w: %v", types.ErrUnknownChain, chain)
 	}
+	db.logger.Debug("Updating local unsafe", "chain", chain, "block", block)
 	err := logDB.SealBlock(block.ParentHash, block.ID(), block.Time)
 	if err != nil {
 		return fmt.Errorf("failed to seal block %v: %w", block, err)
@@ -46,7 +47,7 @@ func (db *ChainsDB) Rewind(chain types.ChainID, headBlockNum uint64) error {
 
 	logDB, ok := db.logDBs[chain]
 	if !ok {
-		return fmt.Errorf("cannot Rewind: %w: %s", ErrUnknownChain, chain)
+		return fmt.Errorf("cannot Rewind: %w: %s", types.ErrUnknownChain, chain)
 	}
 	return logDB.Rewind(headBlockNum)
 }
@@ -57,8 +58,9 @@ func (db *ChainsDB) UpdateLocalSafe(chain types.ChainID, derivedFrom eth.BlockRe
 
 	localDB, ok := db.localDBs[chain]
 	if !ok {
-		return fmt.Errorf("cannot UpdateLocalSafe: %w: %v", ErrUnknownChain, chain)
+		return fmt.Errorf("cannot UpdateLocalSafe: %w: %v", types.ErrUnknownChain, chain)
 	}
+	db.logger.Debug("Updating local safe", "chain", chain, "derivedFrom", derivedFrom, "lastDerived", lastDerived)
 	return localDB.AddDerived(derivedFrom, lastDerived)
 }
 
@@ -67,8 +69,9 @@ func (db *ChainsDB) UpdateCrossUnsafe(chain types.ChainID, crossUnsafe types.Blo
 	defer db.mu.RUnlock()
 
 	if _, ok := db.crossUnsafe[chain]; !ok {
-		return fmt.Errorf("cannot UpdateCrossUnsafe: %w: %s", ErrUnknownChain, chain)
+		return fmt.Errorf("cannot UpdateCrossUnsafe: %w: %s", types.ErrUnknownChain, chain)
 	}
+	db.logger.Debug("Updating cross unsafe", "chain", chain, "crossUnsafe", crossUnsafe)
 	db.crossUnsafe[chain] = crossUnsafe
 	return nil
 }
@@ -79,8 +82,9 @@ func (db *ChainsDB) UpdateCrossSafe(chain types.ChainID, l1View eth.BlockRef, la
 
 	crossDB, ok := db.crossDBs[chain]
 	if !ok {
-		return fmt.Errorf("cannot UpdateCrossSafe: %w: %s", ErrUnknownChain, chain)
+		return fmt.Errorf("cannot UpdateCrossSafe: %w: %s", types.ErrUnknownChain, chain)
 	}
+	db.logger.Debug("Updating cross safe", "chain", chain, "l1View", l1View, "lastCrossDerived", lastCrossDerived)
 	return crossDB.AddDerived(l1View, lastCrossDerived)
 }
 
@@ -91,6 +95,7 @@ func (db *ChainsDB) UpdateFinalizedL1(finalized eth.BlockRef) error {
 	if db.finalizedL1.Number > finalized.Number {
 		return fmt.Errorf("cannot rewind finalized L1 head from %s to %s", db.finalizedL1, finalized)
 	}
+	db.logger.Debug("Updating finalized L1", "finalizedL1", finalized)
 	db.finalizedL1 = finalized
 	return nil
 }
diff --git a/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go b/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
index 213b6ce1bad9..07c05ac6dc67 100644
--- a/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
+++ b/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
@@ -76,7 +76,7 @@ func (i *CrossL2Inbox) DecodeExecutingMessageLog(l *ethTypes.Log) (types.Executi
 	}
 	hash := payloadHashToLogHash(msgHash, identifier.Origin)
 	return types.ExecutingMessage{
-		Chain:     chainID,
+		Chain:     types.ChainIndex(chainID), // TODO(#11105): translate chain ID to chain index
 		Hash:      hash,
 		BlockNum:  identifier.BlockNumber.Uint64(),
 		LogIdx:    uint32(identifier.LogIndex.Uint64()),
diff --git a/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go b/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
index 302b188e5cdf..de5fe0eb2706 100644
--- a/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
+++ b/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
@@ -20,14 +20,14 @@ func TestDecodeExecutingMessageEvent(t *testing.T) {
 	payload := bytes.Repeat([]byte{0xaa, 0xbb}, 50)
 	payloadHash := crypto.Keccak256Hash(payload)
 	expected := types.ExecutingMessage{
-		Chain:     42424,
+		Chain:     42424, // TODO(#11105): translate chain ID to chain index
 		BlockNum:  12345,
 		LogIdx:    98,
 		Timestamp: 9578295,
 	}
 	contractIdent := contractIdentifier{
 		Origin:      common.Address{0xbb, 0xcc},
-		ChainId:     new(big.Int).SetUint64(uint64(expected.Chain)),
+		ChainId:     new(big.Int).SetUint64(uint64(expected.Chain)), // TODO(#11105): translate chain ID to chain index
 		BlockNumber: new(big.Int).SetUint64(expected.BlockNum),
 		Timestamp:   new(big.Int).SetUint64(expected.Timestamp),
 		LogIndex:    new(big.Int).SetUint64(uint64(expected.LogIdx)),
diff --git a/op-supervisor/supervisor/backend/db/entrydb/error.go b/op-supervisor/supervisor/types/error.go
similarity index 63%
rename from op-supervisor/supervisor/backend/db/entrydb/error.go
rename to op-supervisor/supervisor/types/error.go
index 42ae26dcf112..b4e1c57ba908 100644
--- a/op-supervisor/supervisor/backend/db/entrydb/error.go
+++ b/op-supervisor/supervisor/types/error.go
@@ -1,4 +1,4 @@
-package entrydb
+package types
 
 import "errors"
 
@@ -17,4 +17,11 @@ var (
 	ErrConflict = errors.New("conflicting data")
 	// ErrStop can be used in iterators to indicate iteration has to stop
 	ErrStop = errors.New("iter stop")
+	// ErrOutOfScope is when data is accessed, but access is not allowed, because of a limited scope.
+	// E.g. when limiting scope to L2 blocks derived from a specific subset of the L1 chain.
+	ErrOutOfScope = errors.New("out of scope")
+	// ErrUnknownChain is when a chain is unknown, not in the dependency set.
+	ErrUnknownChain = errors.New("unknown chain")
+	// ErrNoRPCSource happens when a sub-service needs an RPC data source, but is not configured with one.
+	ErrNoRPCSource = errors.New("no RPC client configured")
 )
diff --git a/op-supervisor/supervisor/types/types.go b/op-supervisor/supervisor/types/types.go
index 05a9b1633126..1c97a9119ce6 100644
--- a/op-supervisor/supervisor/types/types.go
+++ b/op-supervisor/supervisor/types/types.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"math"
 	"math/big"
+	"strconv"
 
 	"github.com/holiman/uint256"
 
@@ -15,8 +16,28 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
+// ChainIndex represents the lifetime of a chain in a dependency set.
+type ChainIndex uint32
+
+func (ci ChainIndex) String() string {
+	return strconv.FormatUint(uint64(ci), 10)
+}
+
+func (ci ChainIndex) MarshalText() ([]byte, error) {
+	return []byte(ci.String()), nil
+}
+
+func (ci *ChainIndex) UnmarshalText(data []byte) error {
+	v, err := strconv.ParseUint(string(data), 10, 32)
+	if err != nil {
+		return err
+	}
+	*ci = ChainIndex(v)
+	return nil
+}
+
 type ExecutingMessage struct {
-	Chain     uint32 // same as ChainID for now, but will be indirect, i.e. translated to full ID, later
+	Chain     ChainIndex // same as ChainID for now, but will be indirect, i.e. translated to full ID, later
 	BlockNum  uint64
 	LogIdx    uint32
 	Timestamp uint64
@@ -24,7 +45,7 @@ type ExecutingMessage struct {
 }
 
 func (s *ExecutingMessage) String() string {
-	return fmt.Sprintf("ExecMsg(chain: %d, block: %d, log: %d, time: %d, logHash: %s)",
+	return fmt.Sprintf("ExecMsg(chainIndex: %s, block: %d, log: %d, time: %d, logHash: %s)",
 		s.Chain, s.BlockNum, s.LogIdx, s.Timestamp, s.Hash)
 }
 
@@ -208,3 +229,25 @@ func (s BlockSeal) String() string {
 func (s BlockSeal) ID() eth.BlockID {
 	return eth.BlockID{Hash: s.Hash, Number: s.Number}
 }
+
+func (s BlockSeal) WithParent(parent eth.BlockID) eth.BlockRef {
+	// prevent parent attachment if the parent is not the previous block,
+	// and the block is not the genesis block
+	if s.Number != parent.Number+1 && s.Number != 0 {
+		panic(fmt.Errorf("invalid parent block %s to combine with %s", parent, s))
+	}
+	return eth.BlockRef{
+		Hash:       s.Hash,
+		Number:     s.Number,
+		ParentHash: parent.Hash,
+		Time:       s.Timestamp,
+	}
+}
+
+func BlockSealFromRef(ref eth.BlockRef) BlockSeal {
+	return BlockSeal{
+		Hash:      ref.Hash,
+		Number:    ref.Number,
+		Timestamp: ref.Time,
+	}
+}

From 8772224726eb280cc2bea9844c51d08c58e384cc Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Thu, 24 Oct 2024 18:38:41 +0200
Subject: [PATCH 022/451] Op-supervisor: dependency set improvements (#12623)

* op-supervisor: DB improvements for cross-safe updates

Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
Co-authored-by: Tyler Smith <mail@tcry.pt>

* op-supervisor: dependency-set improvements

Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
Co-authored-by: Tyler Smith <mail@tcry.pt>

---------

Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
Co-authored-by: Tyler Smith <mail@tcry.pt>
---
 op-e2e/interop/supersystem.go                 | 15 ++--
 op-supervisor/config/config_test.go           | 14 +--
 op-supervisor/supervisor/backend/backend.go   |  7 ++
 .../supervisor/backend/backend_test.go        | 37 ++++----
 .../supervisor/backend/depset/depset.go       |  6 ++
 .../supervisor/backend/depset/depset_test.go  | 10 ++-
 .../supervisor/backend/depset/static.go       | 89 ++++++++++++++++---
 op-supervisor/supervisor/service_test.go      |  9 +-
 8 files changed, 141 insertions(+), 46 deletions(-)

diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index b973a30d50cc..7e9e20519567 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -438,18 +438,23 @@ func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 		L2RPCs:  []string{},
 		Datadir: path.Join(s.t.TempDir(), "supervisor"),
 	}
-	depSet := &depset.StaticConfigDependencySet{
-		Dependencies: make(map[supervisortypes.ChainID]*depset.StaticConfigDependency),
-	}
+	depSet := make(map[supervisortypes.ChainID]*depset.StaticConfigDependency)
+
 	// Iterate over the L2 chain configs. The L2 nodes don't exist yet.
 	for _, l2Out := range s.worldOutput.L2s {
 		chainID := supervisortypes.ChainIDFromBig(l2Out.Genesis.Config.ChainID)
-		depSet.Dependencies[chainID] = &depset.StaticConfigDependency{
+		index, err := chainID.ToUInt32()
+		require.NoError(s.t, err)
+		depSet[chainID] = &depset.StaticConfigDependency{
+			ChainIndex:     supervisortypes.ChainIndex(index),
 			ActivationTime: 0,
 			HistoryMinTime: 0,
 		}
 	}
-	cfg.DependencySetSource = depSet
+	stDepSet, err := depset.NewStaticConfigDependencySet(depSet)
+	require.NoError(s.t, err)
+	cfg.DependencySetSource = stDepSet
+
 	// Create the supervisor with the configuration
 	super, err := supervisor.SupervisorFromConfig(context.Background(), cfg, logger)
 	require.NoError(s.t, err)
diff --git a/op-supervisor/config/config_test.go b/op-supervisor/config/config_test.go
index fd57c7b95d97..0d354ca134a5 100644
--- a/op-supervisor/config/config_test.go
+++ b/op-supervisor/config/config_test.go
@@ -56,13 +56,15 @@ func TestValidateRPCConfig(t *testing.T) {
 }
 
 func validConfig() *Config {
-	depSet := &depset.StaticConfigDependencySet{
-		Dependencies: map[types.ChainID]*depset.StaticConfigDependency{
-			types.ChainIDFromUInt64(900): &depset.StaticConfigDependency{
-				ActivationTime: 0,
-				HistoryMinTime: 0,
-			},
+	depSet, err := depset.NewStaticConfigDependencySet(map[types.ChainID]*depset.StaticConfigDependency{
+		types.ChainIDFromUInt64(900): &depset.StaticConfigDependency{
+			ChainIndex:     900,
+			ActivationTime: 0,
+			HistoryMinTime: 0,
 		},
+	})
+	if err != nil {
+		panic(err)
 	}
 	// Should be valid using only the required arguments passed in via the constructor.
 	return NewConfig([]string{"http://localhost:8545"}, depSet, "./supervisor_testdir")
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 27ed1ec3e984..506bcefd67c0 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -261,6 +261,13 @@ func (su *SupervisorBackend) AddL2RPC(ctx context.Context, rpc string) error {
 	return su.attachRPC(ctx, rpc)
 }
 
+// Internal methods, for processors
+// ----------------------------
+
+func (su *SupervisorBackend) DependencySet() depset.DependencySet {
+	return su.depSet
+}
+
 // Query methods
 // ----------------------------
 
diff --git a/op-supervisor/supervisor/backend/backend_test.go b/op-supervisor/supervisor/backend/backend_test.go
index 80c773a5ea46..3d2b5ad123a5 100644
--- a/op-supervisor/supervisor/backend/backend_test.go
+++ b/op-supervisor/supervisor/backend/backend_test.go
@@ -31,24 +31,27 @@ func TestBackendLifetime(t *testing.T) {
 	dataDir := t.TempDir()
 	chainA := types.ChainIDFromUInt64(900)
 	chainB := types.ChainIDFromUInt64(901)
-	cfg := &config.Config{
-		Version:       "test",
-		LogConfig:     oplog.CLIConfig{},
-		MetricsConfig: opmetrics.CLIConfig{},
-		PprofConfig:   oppprof.CLIConfig{},
-		RPC:           oprpc.CLIConfig{},
-		DependencySetSource: &depset.StaticConfigDependencySet{
-			Dependencies: map[types.ChainID]*depset.StaticConfigDependency{
-				chainA: {
-					ActivationTime: 42,
-					HistoryMinTime: 100,
-				},
-				chainB: {
-					ActivationTime: 30,
-					HistoryMinTime: 20,
-				},
+	depSet, err := depset.NewStaticConfigDependencySet(
+		map[types.ChainID]*depset.StaticConfigDependency{
+			chainA: {
+				ChainIndex:     900,
+				ActivationTime: 42,
+				HistoryMinTime: 100,
+			},
+			chainB: {
+				ChainIndex:     901,
+				ActivationTime: 30,
+				HistoryMinTime: 20,
 			},
-		},
+		})
+	require.NoError(t, err)
+	cfg := &config.Config{
+		Version:               "test",
+		LogConfig:             oplog.CLIConfig{},
+		MetricsConfig:         opmetrics.CLIConfig{},
+		PprofConfig:           oppprof.CLIConfig{},
+		RPC:                   oprpc.CLIConfig{},
+		DependencySetSource:   depSet,
 		SynchronousProcessors: true,
 		MockRun:               false,
 		L2RPCs:                nil,
diff --git a/op-supervisor/supervisor/backend/depset/depset.go b/op-supervisor/supervisor/backend/depset/depset.go
index 06127726f000..da32b7719008 100644
--- a/op-supervisor/supervisor/backend/depset/depset.go
+++ b/op-supervisor/supervisor/backend/depset/depset.go
@@ -32,4 +32,10 @@ type DependencySet interface {
 	// HasChain determines if a chain is being tracked for interop purposes.
 	// See CanExecuteAt and CanInitiateAt to check if a chain may message at a given time.
 	HasChain(chainID types.ChainID) bool
+
+	// ChainIndexFromID converts a ChainID to a ChainIndex.
+	ChainIndexFromID(id types.ChainID) (types.ChainIndex, error)
+
+	// ChainIDFromIndex converts a ChainIndex to a ChainID.
+	ChainIDFromIndex(index types.ChainIndex) (types.ChainID, error)
 }
diff --git a/op-supervisor/supervisor/backend/depset/depset_test.go b/op-supervisor/supervisor/backend/depset/depset_test.go
index 42dbb284d6e2..8b71b38ef46e 100644
--- a/op-supervisor/supervisor/backend/depset/depset_test.go
+++ b/op-supervisor/supervisor/backend/depset/depset_test.go
@@ -15,18 +15,20 @@ import (
 func TestDependencySet(t *testing.T) {
 	d := path.Join(t.TempDir(), "tmp_dep_set.json")
 
-	depSet := &StaticConfigDependencySet{
-		Dependencies: map[types.ChainID]*StaticConfigDependency{
+	depSet, err := NewStaticConfigDependencySet(
+		map[types.ChainID]*StaticConfigDependency{
 			types.ChainIDFromUInt64(900): {
+				ChainIndex:     900,
 				ActivationTime: 42,
 				HistoryMinTime: 100,
 			},
 			types.ChainIDFromUInt64(901): {
+				ChainIndex:     901,
 				ActivationTime: 30,
 				HistoryMinTime: 20,
 			},
-		},
-	}
+		})
+	require.NoError(t, err)
 	data, err := json.Marshal(depSet)
 	require.NoError(t, err)
 
diff --git a/op-supervisor/supervisor/backend/depset/static.go b/op-supervisor/supervisor/backend/depset/static.go
index 0ef2874bb527..f7cf1c166de5 100644
--- a/op-supervisor/supervisor/backend/depset/static.go
+++ b/op-supervisor/supervisor/backend/depset/static.go
@@ -2,14 +2,18 @@ package depset
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
+	"slices"
 	"sort"
 
-	"golang.org/x/exp/maps"
-
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
 type StaticConfigDependency struct {
+	// ChainIndex is the unique short identifier of this chain.
+	ChainIndex types.ChainIndex `json:"chainIndex"`
+
 	// ActivationTime is when the chain becomes part of the dependency set.
 	// This is the minimum timestamp of the inclusion of an executing message.
 	ActivationTime uint64 `json:"activationTime"`
@@ -23,9 +27,62 @@ type StaticConfigDependency struct {
 // StaticConfigDependencySet statically declares a DependencySet.
 // It can be used as a DependencySetSource itself, by simply returning the itself when loading the set.
 type StaticConfigDependencySet struct {
+	// dependency info per chain
+	dependencies map[types.ChainID]*StaticConfigDependency
+	// cached mapping of chain index to chain ID
+	indexToID map[types.ChainIndex]types.ChainID
+	// cached list of chain IDs, sorted by ID value
+	chainIDs []types.ChainID
+}
+
+func NewStaticConfigDependencySet(dependencies map[types.ChainID]*StaticConfigDependency) (*StaticConfigDependencySet, error) {
+	out := &StaticConfigDependencySet{dependencies: dependencies}
+	if err := out.hydrate(); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// jsonStaticConfigDependencySet is a util for JSON encoding/decoding,
+// to encode/decode just the attributes that matter,
+// while wrapping the decoding functionality with additional hydration step.
+type jsonStaticConfigDependencySet struct {
 	Dependencies map[types.ChainID]*StaticConfigDependency `json:"dependencies"`
 }
 
+func (ds *StaticConfigDependencySet) MarshalJSON() ([]byte, error) {
+	out := &jsonStaticConfigDependencySet{
+		Dependencies: ds.dependencies,
+	}
+	return json.Marshal(out)
+}
+
+func (ds *StaticConfigDependencySet) UnmarshalJSON(data []byte) error {
+	var v jsonStaticConfigDependencySet
+	if err := json.Unmarshal(data, &v); err != nil {
+		return err
+	}
+	ds.dependencies = v.Dependencies
+	return ds.hydrate()
+}
+
+// hydrate sets all the cached values, based on the dependencies attribute
+func (ds *StaticConfigDependencySet) hydrate() error {
+	ds.indexToID = make(map[types.ChainIndex]types.ChainID)
+	ds.chainIDs = make([]types.ChainID, 0, len(ds.dependencies))
+	for id, dep := range ds.dependencies {
+		if existing, ok := ds.indexToID[dep.ChainIndex]; ok {
+			return fmt.Errorf("chain %s cannot have the same index (%d) as chain %s", id, dep.ChainIndex, existing)
+		}
+		ds.indexToID[dep.ChainIndex] = id
+		ds.chainIDs = append(ds.chainIDs, id)
+	}
+	sort.Slice(ds.chainIDs, func(i, j int) bool {
+		return ds.chainIDs[i].Cmp(ds.chainIDs[j]) < 0
+	})
+	return nil
+}
+
 var _ DependencySetSource = (*StaticConfigDependencySet)(nil)
 
 var _ DependencySet = (*StaticConfigDependencySet)(nil)
@@ -35,7 +92,7 @@ func (ds *StaticConfigDependencySet) LoadDependencySet(ctx context.Context) (Dep
 }
 
 func (ds *StaticConfigDependencySet) CanExecuteAt(chainID types.ChainID, execTimestamp uint64) (bool, error) {
-	dep, ok := ds.Dependencies[chainID]
+	dep, ok := ds.dependencies[chainID]
 	if !ok {
 		return false, nil
 	}
@@ -43,7 +100,7 @@ func (ds *StaticConfigDependencySet) CanExecuteAt(chainID types.ChainID, execTim
 }
 
 func (ds *StaticConfigDependencySet) CanInitiateAt(chainID types.ChainID, initTimestamp uint64) (bool, error) {
-	dep, ok := ds.Dependencies[chainID]
+	dep, ok := ds.dependencies[chainID]
 	if !ok {
 		return false, nil
 	}
@@ -51,14 +108,26 @@ func (ds *StaticConfigDependencySet) CanInitiateAt(chainID types.ChainID, initTi
 }
 
 func (ds *StaticConfigDependencySet) Chains() []types.ChainID {
-	out := maps.Keys(ds.Dependencies)
-	sort.Slice(out, func(i, j int) bool {
-		return out[i].Cmp(out[j]) < 0
-	})
-	return out
+	return slices.Clone(ds.chainIDs)
 }
 
 func (ds *StaticConfigDependencySet) HasChain(chainID types.ChainID) bool {
-	_, ok := ds.Dependencies[chainID]
+	_, ok := ds.dependencies[chainID]
 	return ok
 }
+
+func (ds *StaticConfigDependencySet) ChainIndexFromID(id types.ChainID) (types.ChainIndex, error) {
+	dep, ok := ds.dependencies[id]
+	if !ok {
+		return 0, types.ErrUnknownChain
+	}
+	return dep.ChainIndex, nil
+}
+
+func (ds *StaticConfigDependencySet) ChainIDFromIndex(index types.ChainIndex) (types.ChainID, error) {
+	id, ok := ds.indexToID[index]
+	if !ok {
+		return types.ChainID{}, types.ErrUnknownChain
+	}
+	return id, nil
+}
diff --git a/op-supervisor/supervisor/service_test.go b/op-supervisor/supervisor/service_test.go
index fad118e96a82..9fce3ec48b4c 100644
--- a/op-supervisor/supervisor/service_test.go
+++ b/op-supervisor/supervisor/service_test.go
@@ -22,6 +22,9 @@ import (
 )
 
 func TestSupervisorService(t *testing.T) {
+	depSet, err := depset.NewStaticConfigDependencySet(make(map[types.ChainID]*depset.StaticConfigDependency))
+	require.NoError(t, err)
+
 	cfg := &config.Config{
 		Version: "",
 		LogConfig: oplog.CLIConfig{
@@ -47,10 +50,8 @@ func TestSupervisorService(t *testing.T) {
 			ListenPort:  0, // pick a port automatically
 			EnableAdmin: true,
 		},
-		DependencySetSource: &depset.StaticConfigDependencySet{
-			Dependencies: make(map[types.ChainID]*depset.StaticConfigDependency),
-		},
-		MockRun: true,
+		DependencySetSource: depSet,
+		MockRun:             true,
 	}
 	logger := testlog.Logger(t, log.LevelError)
 	supervisor, err := SupervisorFromConfig(context.Background(), cfg, logger)

From bf28a04e72a4c168262cef4c638c3c9eacaa32e6 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Thu, 24 Oct 2024 15:47:03 -0400
Subject: [PATCH 023/451] chore(op-e2e): Run `BadTxInBatch` tests on Granite
 only (#12629)

---
 op-e2e/actions/proofs/bad_tx_in_batch_test.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/op-e2e/actions/proofs/bad_tx_in_batch_test.go b/op-e2e/actions/proofs/bad_tx_in_batch_test.go
index f67e216f76cb..6aed725f2be8 100644
--- a/op-e2e/actions/proofs/bad_tx_in_batch_test.go
+++ b/op-e2e/actions/proofs/bad_tx_in_batch_test.go
@@ -144,14 +144,14 @@ func Test_ProgramAction_BadTxInBatch(gt *testing.T) {
 	matrix.AddTestCase(
 		"HonestClaim",
 		nil,
-		helpers.LatestForkOnly,
+		helpers.NewForkMatrix(helpers.Granite),
 		runBadTxInBatchTest,
 		helpers.ExpectNoError(),
 	)
 	matrix.AddTestCase(
 		"JunkClaim",
 		nil,
-		helpers.LatestForkOnly,
+		helpers.NewForkMatrix(helpers.Granite),
 		runBadTxInBatchTest,
 		helpers.ExpectError(claim.ErrClaimNotValid),
 		helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
@@ -159,14 +159,14 @@ func Test_ProgramAction_BadTxInBatch(gt *testing.T) {
 	matrix.AddTestCase(
 		"ResubmitBadFirstFrame-HonestClaim",
 		nil,
-		helpers.LatestForkOnly,
+		helpers.NewForkMatrix(helpers.Granite),
 		runBadTxInBatch_ResubmitBadFirstFrame_Test,
 		helpers.ExpectNoError(),
 	)
 	matrix.AddTestCase(
 		"ResubmitBadFirstFrame-JunkClaim",
 		nil,
-		helpers.LatestForkOnly,
+		helpers.NewForkMatrix(helpers.Granite),
 		runBadTxInBatch_ResubmitBadFirstFrame_Test,
 		helpers.ExpectError(claim.ErrClaimNotValid),
 		helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),

From 0f9897b0686f8b883cdf0d232c6696447a5c185c Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 24 Oct 2024 13:54:34 -0600
Subject: [PATCH 024/451] op-e2e: Improve WaitForBlock timeouts (#12627)

Update WaitForBlock to maintain two timeouts: a no-change timeout, which fires if the chain's head does not change within a specified window, and an absolute timeout, which fires if the chain's head does not meet or exceed the specified block.

These changes should ideally reduce the number of test flakes we're seeing. Everything takes longer when test executors are under load; by maintaining these two timeouts we can provide longer-running tests with more buffer while retaining the ability to fail fast if the chain gets stuck.

As part of this PR I also refactored the wait method to use polling rather than WebSockets. I've found WebSockets to be unreliable in tests.
---
 op-e2e/e2eutils/disputegame/helper.go         |  2 +-
 op-e2e/e2eutils/geth/wait.go                  | 88 +++++++++++++++----
 op-e2e/system/altda/concurrent_test.go        |  4 +-
 op-e2e/system/da/multi_test.go                |  4 +-
 op-e2e/system/da/startstop_test.go            |  4 +-
 op-e2e/system/e2esys/setup.go                 |  2 +-
 op-e2e/system/fees/eip1559params_test.go      |  2 +-
 op-e2e/system/fees/fees_test.go               |  3 +-
 op-e2e/system/fees/l1info_test.go             |  4 +-
 op-e2e/system/p2p/txpool_test.go              |  3 +-
 op-e2e/system/proofs/proposer_fp_test.go      |  2 +-
 op-e2e/system/proofs/proposer_l2oo_test.go    |  2 +-
 .../system/verifier/sequencer_window_test.go  |  2 +-
 13 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/op-e2e/e2eutils/disputegame/helper.go b/op-e2e/e2eutils/disputegame/helper.go
index 07ee4c659ff9..658eedffc514 100644
--- a/op-e2e/e2eutils/disputegame/helper.go
+++ b/op-e2e/e2eutils/disputegame/helper.go
@@ -291,7 +291,7 @@ func (h *FactoryHelper) WaitForBlock(l2Node string, l2BlockNumber uint64, cfg *G
 
 	l2Client := h.System.NodeClient(l2Node)
 	if cfg.allowUnsafe {
-		_, err := geth.WaitForBlock(new(big.Int).SetUint64(l2BlockNumber), l2Client, 1*time.Minute)
+		_, err := geth.WaitForBlock(new(big.Int).SetUint64(l2BlockNumber), l2Client, geth.WithAbsoluteTimeout(time.Minute))
 		h.Require.NoErrorf(err, "Block number %v did not become unsafe", l2BlockNumber)
 	} else {
 		_, err := geth.WaitForBlockToBeSafe(new(big.Int).SetUint64(l2BlockNumber), l2Client, 1*time.Minute)
diff --git a/op-e2e/e2eutils/geth/wait.go b/op-e2e/e2eutils/geth/wait.go
index 267e589f021c..8356058afda7 100644
--- a/op-e2e/e2eutils/geth/wait.go
+++ b/op-e2e/e2eutils/geth/wait.go
@@ -17,7 +17,10 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
-const errStrTxIdxingInProgress = "transaction indexing is in progress"
+const (
+	errStrTxIdxingInProgress = "transaction indexing is in progress"
+	waitForBlockMaxRetries   = 3
+)
 
 // errTimeout represents a timeout
 var errTimeout = errors.New("timeout")
@@ -83,25 +86,80 @@ func WaitForTransaction(hash common.Hash, client *ethclient.Client, timeout time
 	}
 }
 
-func WaitForBlock(number *big.Int, client *ethclient.Client, timeout time.Duration) (*types.Block, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
+type waitForBlockOptions struct {
+	noChangeTimeout time.Duration
+	absoluteTimeout time.Duration
+}
 
-	headChan := make(chan *types.Header, 100)
-	headSub, err := client.SubscribeNewHead(ctx, headChan)
-	if err != nil {
-		return nil, err
+func WithNoChangeTimeout(timeout time.Duration) WaitForBlockOption {
+	return func(o *waitForBlockOptions) {
+		o.noChangeTimeout = timeout
 	}
-	defer headSub.Unsubscribe()
+}
+
+func WithAbsoluteTimeout(timeout time.Duration) WaitForBlockOption {
+	return func(o *waitForBlockOptions) {
+		o.absoluteTimeout = timeout
+	}
+}
+
+type WaitForBlockOption func(*waitForBlockOptions)
+
+// WaitForBlock waits for the chain to advance to the provided block number. It can be configured with
+// two different timeout: an absolute timeout, and a no change timeout. The absolute timeout caps
+// the maximum amount of time this method will run. The no change timeout will return an error if the
+// block number does not change within that time window. This is useful to bail out early in the event
+// of a stuck chain, but allow things to continue if the chain is still advancing.
+//
+// This function will also retry fetch errors up to three times before returning an error in order to
+// protect against transient network problems. This function uses polling rather than websockets.
+func WaitForBlock(number *big.Int, client *ethclient.Client, opts ...WaitForBlockOption) (*types.Block, error) {
+	defaultOpts := &waitForBlockOptions{
+		noChangeTimeout: 30 * time.Second,
+		absoluteTimeout: 3 * time.Minute,
+	}
+	for _, opt := range opts {
+		opt(defaultOpts)
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), defaultOpts.absoluteTimeout)
+	defer cancel()
+
+	lastAdvancement := time.Now()
+	lastBlockNumber := big.NewInt(0)
+
+	pollTicker := time.NewTicker(500 * time.Millisecond)
+	defer pollTicker.Stop()
+	var errCount int
 
 	for {
-		select {
-		case head := <-headChan:
-			if head.Number.Cmp(number) >= 0 {
-				return client.BlockByNumber(ctx, number)
+		head, err := client.BlockByNumber(ctx, nil)
+		if err != nil {
+			errCount++
+			if errCount >= waitForBlockMaxRetries {
+				return nil, fmt.Errorf("head fetching exceeded max retries. last error: %w", err)
 			}
-		case err := <-headSub.Err():
-			return nil, fmt.Errorf("error in head subscription: %w", err)
+			continue
+		}
+
+		errCount = 0
+
+		if head.Number().Cmp(number) >= 0 {
+			return client.BlockByNumber(ctx, number)
+		}
+
+		if head.Number().Cmp(lastBlockNumber) != 0 {
+			lastBlockNumber = head.Number()
+			lastAdvancement = time.Now()
+		}
+
+		if time.Since(lastAdvancement) > defaultOpts.noChangeTimeout {
+			return nil, fmt.Errorf("block number %d has not changed in %s", lastBlockNumber, defaultOpts.noChangeTimeout)
+		}
+
+		select {
+		case <-pollTicker.C:
+			continue
 		case <-ctx.Done():
 			return nil, ctx.Err()
 		}
diff --git a/op-e2e/system/altda/concurrent_test.go b/op-e2e/system/altda/concurrent_test.go
index a2ad1f8bcbb8..32506e5c4a10 100644
--- a/op-e2e/system/altda/concurrent_test.go
+++ b/op-e2e/system/altda/concurrent_test.go
@@ -43,7 +43,7 @@ func TestBatcherConcurrentAltDARequests(t *testing.T) {
 	l2Seq := sys.NodeClient("sequencer")
 
 	// we wait for numL1TxsExpected L2 blocks to have been produced, just to make sure the sequencer is working properly
-	_, err = geth.WaitForBlock(big.NewInt(numL1TxsExpected), l2Seq, time.Duration(cfg.DeployConfig.L2BlockTime*uint64(numL1TxsExpected))*time.Second)
+	_, err = geth.WaitForBlock(big.NewInt(numL1TxsExpected), l2Seq)
 	require.NoError(t, err, "Waiting for L2 blocks")
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
@@ -59,7 +59,7 @@ func TestBatcherConcurrentAltDARequests(t *testing.T) {
 	// exceed the number of blocks.
 	checkBlocks := 10
 	for i := 0; i < checkBlocks; i++ {
-		block, err := geth.WaitForBlock(big.NewInt(int64(startingL1BlockNum)+int64(i)), l1Client, time.Duration(cfg.DeployConfig.L1BlockTime*2)*time.Second)
+		block, err := geth.WaitForBlock(big.NewInt(int64(startingL1BlockNum)+int64(i)), l1Client)
 		require.NoError(t, err, "Waiting for l1 blocks")
 		// there are possibly other services (proposer/challenger) in the background sending txs
 		// so we only count the batcher txs
diff --git a/op-e2e/system/da/multi_test.go b/op-e2e/system/da/multi_test.go
index 8272930da765..3d150010a0f3 100644
--- a/op-e2e/system/da/multi_test.go
+++ b/op-e2e/system/da/multi_test.go
@@ -29,7 +29,7 @@ func TestBatcherMultiTx(t *testing.T) {
 	l1Client := sys.NodeClient("l1")
 	l2Seq := sys.NodeClient("sequencer")
 
-	_, err = geth.WaitForBlock(big.NewInt(10), l2Seq, time.Duration(cfg.DeployConfig.L2BlockTime*15)*time.Second)
+	_, err = geth.WaitForBlock(big.NewInt(10), l2Seq)
 	require.NoError(t, err, "Waiting for L2 blocks")
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -47,7 +47,7 @@ func TestBatcherMultiTx(t *testing.T) {
 	// possible additional L1 blocks will be created before the batcher starts,
 	// so we wait additional blocks.
 	for i := int64(0); i < 5; i++ {
-		block, err := geth.WaitForBlock(big.NewInt(int64(l1Number)+i), l1Client, time.Duration(cfg.DeployConfig.L1BlockTime*2)*time.Second)
+		block, err := geth.WaitForBlock(big.NewInt(int64(l1Number)+i), l1Client)
 		require.NoError(t, err, "Waiting for l1 blocks")
 		// there are possibly other services (proposer/challenger) in the background sending txs
 		// so we only count the batcher txs
diff --git a/op-e2e/system/da/startstop_test.go b/op-e2e/system/da/startstop_test.go
index e085029983af..2a5e0826f06e 100644
--- a/op-e2e/system/da/startstop_test.go
+++ b/op-e2e/system/da/startstop_test.go
@@ -72,7 +72,7 @@ func testStartStopBatcher(t *testing.T, cfgMod func(*e2esys.SystemConfig)) {
 
 	// wait until the block the tx was first included in shows up in the safe chain on the verifier
 	safeBlockInclusionDuration := time.Duration(6*cfg.DeployConfig.L1BlockTime) * time.Second
-	_, err = geth.WaitForBlock(receipt.BlockNumber, l2Verif, safeBlockInclusionDuration)
+	_, err = geth.WaitForBlock(receipt.BlockNumber, l2Verif)
 	require.NoError(t, err, "Waiting for block on verifier")
 	require.NoError(t, wait.ForProcessingFullBatch(context.Background(), rollupClient))
 
@@ -111,7 +111,7 @@ func testStartStopBatcher(t *testing.T, cfgMod func(*e2esys.SystemConfig)) {
 	receipt = sendTx()
 
 	// wait until the block the tx was first included in shows up in the safe chain on the verifier
-	_, err = geth.WaitForBlock(receipt.BlockNumber, l2Verif, safeBlockInclusionDuration)
+	_, err = geth.WaitForBlock(receipt.BlockNumber, l2Verif)
 	require.NoError(t, err, "Waiting for block on verifier")
 	require.NoError(t, wait.ForProcessingFullBatch(context.Background(), rollupClient))
 
diff --git a/op-e2e/system/e2esys/setup.go b/op-e2e/system/e2esys/setup.go
index fc557aa1a932..5d046b3c649c 100644
--- a/op-e2e/system/e2esys/setup.go
+++ b/op-e2e/system/e2esys/setup.go
@@ -690,7 +690,7 @@ func (cfg SystemConfig) Start(t *testing.T, startOpts ...StartOption) (*System,
 	}
 
 	l1Client := sys.NodeClient(RoleL1)
-	_, err = geth.WaitForBlock(big.NewInt(2), l1Client, 6*time.Second*time.Duration(cfg.DeployConfig.L1BlockTime))
+	_, err = geth.WaitForBlock(big.NewInt(2), l1Client)
 	if err != nil {
 		return nil, fmt.Errorf("waiting for blocks: %w", err)
 	}
diff --git a/op-e2e/system/fees/eip1559params_test.go b/op-e2e/system/fees/eip1559params_test.go
index b9f5d66f02fb..e1b1098cac12 100644
--- a/op-e2e/system/fees/eip1559params_test.go
+++ b/op-e2e/system/fees/eip1559params_test.go
@@ -95,7 +95,7 @@ func TestEIP1559Params(t *testing.T) {
 	delta := ((gasTarget - int64(h.GasUsed)) * h.BaseFee.Int64() / gasTarget / int64(expectedDenom))
 	expectedNextFee := h.BaseFee.Int64() - delta
 
-	b, err := geth.WaitForBlock(big.NewInt(h.Number.Int64()+1), l2Seq, txTimeoutDuration)
+	b, err := geth.WaitForBlock(big.NewInt(h.Number.Int64()+1), l2Seq)
 	require.NoError(t, err, "waiting for next L2 block")
 	require.Equal(t, expectedNextFee, b.Header().BaseFee.Int64())
 
diff --git a/op-e2e/system/fees/fees_test.go b/op-e2e/system/fees/fees_test.go
index 61590313cbc4..6296b0ee7ab4 100644
--- a/op-e2e/system/fees/fees_test.go
+++ b/op-e2e/system/fees/fees_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"math/big"
 	"testing"
-	"time"
 
 	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
 
@@ -90,7 +89,7 @@ func testFees(t *testing.T, cfg e2esys.SystemConfig) {
 	l1 := sys.NodeClient("l1")
 
 	// Wait for first block after genesis. The genesis block has zero L1Block values and will throw off the GPO checks
-	_, err = geth.WaitForBlock(big.NewInt(1), l2Verif, time.Minute)
+	_, err = geth.WaitForBlock(big.NewInt(1), l2Verif)
 	require.NoError(t, err)
 
 	config := sys.L2Genesis().Config
diff --git a/op-e2e/system/fees/l1info_test.go b/op-e2e/system/fees/l1info_test.go
index 2fdd3f70747a..a4fc16d94a59 100644
--- a/op-e2e/system/fees/l1info_test.go
+++ b/op-e2e/system/fees/l1info_test.go
@@ -113,9 +113,9 @@ func TestL1InfoContract(t *testing.T) {
 
 	endVerifBlockNumber := big.NewInt(4)
 	endSeqBlockNumber := big.NewInt(6)
-	endVerifBlock, err := geth.WaitForBlock(endVerifBlockNumber, l2Verif, time.Minute)
+	endVerifBlock, err := geth.WaitForBlock(endVerifBlockNumber, l2Verif)
 	require.Nil(t, err)
-	endSeqBlock, err := geth.WaitForBlock(endSeqBlockNumber, l2Seq, time.Minute)
+	endSeqBlock, err := geth.WaitForBlock(endSeqBlockNumber, l2Seq)
 	require.Nil(t, err)
 
 	seqL1Info, err := bindings.NewL1Block(cfg.L1InfoPredeployAddress, l2Seq)
diff --git a/op-e2e/system/p2p/txpool_test.go b/op-e2e/system/p2p/txpool_test.go
index dde89ecdefb1..bb5b3e4ef339 100644
--- a/op-e2e/system/p2p/txpool_test.go
+++ b/op-e2e/system/p2p/txpool_test.go
@@ -3,7 +3,6 @@ package p2p
 import (
 	"math/big"
 	"testing"
-	"time"
 
 	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
 
@@ -31,7 +30,7 @@ func TestTxGossip(t *testing.T) {
 	geth.ConnectP2P(t, seqClient, verifClient)
 
 	// This prevents the below tx-sending from flaking in CI
-	_, err = geth.WaitForBlock(big.NewInt(10), verifClient, time.Minute)
+	_, err = geth.WaitForBlock(big.NewInt(10), verifClient)
 	require.NoError(t, err)
 
 	// Send a transaction to the verifier and it should be gossiped to the sequencer and included in a block.
diff --git a/op-e2e/system/proofs/proposer_fp_test.go b/op-e2e/system/proofs/proposer_fp_test.go
index 6be17baaaf25..971ed06a4630 100644
--- a/op-e2e/system/proofs/proposer_fp_test.go
+++ b/op-e2e/system/proofs/proposer_fp_test.go
@@ -40,7 +40,7 @@ func TestL2OutputSubmitterFaultProofs(t *testing.T) {
 	require.Nil(t, err)
 
 	l2Verif := sys.NodeClient("verifier")
-	_, err = geth.WaitForBlock(big.NewInt(6), l2Verif, 10*time.Duration(cfg.DeployConfig.L2BlockTime)*time.Second)
+	_, err = geth.WaitForBlock(big.NewInt(6), l2Verif)
 	require.Nil(t, err)
 
 	timeoutCh := time.After(15 * time.Second)
diff --git a/op-e2e/system/proofs/proposer_l2oo_test.go b/op-e2e/system/proofs/proposer_l2oo_test.go
index f82c93b64b46..bf718c616538 100644
--- a/op-e2e/system/proofs/proposer_l2oo_test.go
+++ b/op-e2e/system/proofs/proposer_l2oo_test.go
@@ -42,7 +42,7 @@ func TestL2OutputSubmitter(t *testing.T) {
 	// for that block and subsequently reorgs to match what the verifier derives when running the
 	// reconcillation process.
 	l2Verif := sys.NodeClient("verifier")
-	_, err = geth.WaitForBlock(big.NewInt(6), l2Verif, 20*time.Duration(cfg.DeployConfig.L2BlockTime)*time.Second)
+	_, err = geth.WaitForBlock(big.NewInt(6), l2Verif)
 	require.Nil(t, err)
 
 	// Wait for batch submitter to update L2 output oracle.
diff --git a/op-e2e/system/verifier/sequencer_window_test.go b/op-e2e/system/verifier/sequencer_window_test.go
index aa836402e99b..04b88c54da94 100644
--- a/op-e2e/system/verifier/sequencer_window_test.go
+++ b/op-e2e/system/verifier/sequencer_window_test.go
@@ -48,7 +48,7 @@ func TestMissingBatchE2E(t *testing.T) {
 	})
 
 	// Wait until the block it was first included in shows up in the safe chain on the verifier
-	_, err = geth.WaitForBlock(receipt.BlockNumber, l2Verif, time.Duration((sys.RollupConfig.SeqWindowSize+4)*cfg.DeployConfig.L1BlockTime)*time.Second)
+	_, err = geth.WaitForBlock(receipt.BlockNumber, l2Verif)
 	require.Nil(t, err, "Waiting for block on verifier")
 
 	// Assert that the transaction is not found on the verifier

From f59d257e565e0d747ebe70e971cf9c73bd6eec08 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Thu, 24 Oct 2024 13:44:05 -0700
Subject: [PATCH 025/451] cannon: Remove memory.SetUint32 (#12617)

* cannon: Remove memory.SetUint32

Remove uint32 word stores from the `mipsevm.memory` interface. `SetUint32` is inflexible
due to its word-alignment constraints. This prevents tests for 32 and 64-bit VMs from
using the same program counter values when writing instructions to memory.

Instead, tests should use the new `testutil.StoreInstruction` utility function to write instructions to any naturally aligned memory location.

* use arch.Word csats in go-ffi
---
 cannon/Makefile                               |  2 -
 cannon/mipsevm/memory/memory.go               | 19 -------
 .../multithreaded/testutil/expectations.go    |  6 ---
 cannon/mipsevm/tests/evm_common64_test.go     | 10 ++--
 cannon/mipsevm/tests/evm_common_test.go       | 22 ++++----
 .../mipsevm/tests/evm_multithreaded64_test.go |  8 +--
 .../mipsevm/tests/evm_multithreaded_test.go   | 54 +++++++++----------
 .../mipsevm/tests/evm_singlethreaded_test.go  | 16 +++---
 cannon/mipsevm/tests/fuzz_evm_common_test.go  | 23 ++++----
 .../tests/fuzz_evm_multithreaded_test.go      |  2 +-
 .../tests/fuzz_evm_singlethreaded_test.go     |  2 +-
 cannon/mipsevm/testutil/memory.go             | 20 ++++++-
 cannon/mipsevm/testutil/state.go              |  5 --
 .../scripts/go-ffi/differential-testing.go    | 27 +++++-----
 14 files changed, 101 insertions(+), 115 deletions(-)

diff --git a/cannon/Makefile b/cannon/Makefile
index ccf959fc9d4c..7f553ad60abf 100644
--- a/cannon/Makefile
+++ b/cannon/Makefile
@@ -93,8 +93,6 @@ fuzz:
 	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests
 	# Multi-threaded tests
 	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests
-	# 64-bit tests
-	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateDmultInsn ./mipsevm/tests
 
 .PHONY: \
 	cannon32-impl \
diff --git a/cannon/mipsevm/memory/memory.go b/cannon/mipsevm/memory/memory.go
index 209d1d431e6f..805267ee7fc4 100644
--- a/cannon/mipsevm/memory/memory.go
+++ b/cannon/mipsevm/memory/memory.go
@@ -192,25 +192,6 @@ func (m *Memory) pageLookup(pageIndex Word) (*CachedPage, bool) {
 	return p, ok
 }
 
-func (m *Memory) SetUint32(addr Word, v uint32) {
-	// addr must be aligned to WordSizeBytes bytes
-	if addr&arch.ExtMask != 0 {
-		panic(fmt.Errorf("unaligned memory access: %x", addr))
-	}
-
-	pageIndex := addr >> PageAddrSize
-	pageAddr := addr & PageAddrMask
-	p, ok := m.pageLookup(pageIndex)
-	if !ok {
-		// allocate the page if we have not already.
-		// Go may mmap relatively large ranges, but we only allocate the pages just in time.
-		p = m.AllocPage(pageIndex)
-	} else {
-		m.invalidate(addr) // invalidate this branch of memory, now that the value changed
-	}
-	binary.BigEndian.PutUint32(p.Data[pageAddr:pageAddr+4], v)
-}
-
 // SetWord stores [arch.Word] sized values at the specified address
 func (m *Memory) SetWord(addr Word, v Word) {
 	// addr must be aligned to WordSizeBytes bytes
diff --git a/cannon/mipsevm/multithreaded/testutil/expectations.go b/cannon/mipsevm/multithreaded/testutil/expectations.go
index 113a2253aa89..16971d347cb0 100644
--- a/cannon/mipsevm/multithreaded/testutil/expectations.go
+++ b/cannon/mipsevm/multithreaded/testutil/expectations.go
@@ -138,12 +138,6 @@ func (e *ExpectedMTState) ExpectMemoryWordWrite(addr arch.Word, val arch.Word) {
 	e.MemoryRoot = e.expectedMemory.MerkleRoot()
 }
 
-func (e *ExpectedMTState) ExpectMemoryWriteMultiple(addr arch.Word, val uint32, addr2 arch.Word, val2 uint32) {
-	e.expectedMemory.SetUint32(addr, val)
-	e.expectedMemory.SetUint32(addr2, val2)
-	e.MemoryRoot = e.expectedMemory.MerkleRoot()
-}
-
 func (e *ExpectedMTState) ExpectPreemption(preState *multithreaded.State) {
 	e.ActiveThreadId = FindNextThread(preState).ThreadId
 	e.StepsSinceLastContextSwitch = 0
diff --git a/cannon/mipsevm/tests/evm_common64_test.go b/cannon/mipsevm/tests/evm_common64_test.go
index 70f59120abc0..9c340f6b095f 100644
--- a/cannon/mipsevm/tests/evm_common64_test.go
+++ b/cannon/mipsevm/tests/evm_common64_test.go
@@ -117,7 +117,7 @@ func TestEVMSingleStep_Operators64(t *testing.T) {
 				state.GetRegistersRef()[rsReg] = tt.rs
 				state.GetRegistersRef()[rtReg] = tt.rt
 			}
-			state.GetMemory().SetUint32(0, insn)
+			testutil.StoreInstruction(state.GetMemory(), 0, insn)
 			step := state.GetStep()
 
 			// Setup expectations
@@ -200,7 +200,7 @@ func TestEVMSingleStep_Shift(t *testing.T) {
 			insn = rtReg<<16 | rdReg<<11 | tt.sa<<6 | tt.funct
 			state.GetRegistersRef()[rdReg] = tt.rd
 			state.GetRegistersRef()[rtReg] = tt.rt
-			state.GetMemory().SetUint32(0, insn)
+			testutil.StoreInstruction(state.GetMemory(), 0, insn)
 			step := state.GetStep()
 
 			// Setup expectations
@@ -438,7 +438,7 @@ func TestEVMSingleStep_LoadStore64(t *testing.T) {
 			state.GetRegistersRef()[rtReg] = tt.rt
 			state.GetRegistersRef()[baseReg] = t1
 
-			state.GetMemory().SetUint32(0, insn)
+			testutil.StoreInstruction(state.GetMemory(), 0, insn)
 			state.GetMemory().SetWord(t1&arch.AddressMask, tt.memVal)
 			step := state.GetStep()
 
@@ -543,7 +543,7 @@ func TestEVMSingleStep_DivMult(t *testing.T) {
 			insn := rsReg<<21 | rtReg<<16 | tt.funct
 			state.GetRegistersRef()[rsReg] = tt.rs
 			state.GetRegistersRef()[rtReg] = tt.rt
-			state.GetMemory().SetUint32(0, insn)
+			testutil.StoreInstruction(state.GetMemory(), 0, insn)
 			step := state.GetStep()
 
 			// Setup expectations
@@ -633,7 +633,7 @@ func TestEVMSingleStepBranch64(t *testing.T) {
 				state := goVm.GetState()
 				const rsReg = 8 // t0
 				insn := tt.opcode<<26 | rsReg<<21 | tt.regimm<<16 | uint32(tt.offset)
-				state.GetMemory().SetUint32(tt.pc, insn)
+				testutil.StoreInstruction(state.GetMemory(), tt.pc, insn)
 				state.GetRegistersRef()[rsReg] = Word(tt.rs)
 				step := state.GetStep()
 
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index f1e08e6eda36..6f5063ec12bd 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -140,7 +140,7 @@ func TestEVMSingleStep_Jump(t *testing.T) {
 			t.Run(testName, func(t *testing.T) {
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(tt.pc), testutil.WithNextPC(tt.nextPC))
 				state := goVm.GetState()
-				state.GetMemory().SetUint32(tt.pc, tt.insn)
+				testutil.StoreInstruction(state.GetMemory(), tt.pc, tt.insn)
 				step := state.GetStep()
 
 				// Setup expectations
@@ -217,7 +217,7 @@ func TestEVMSingleStep_Operators(t *testing.T) {
 					state.GetRegistersRef()[baseReg] = tt.rs
 					state.GetRegistersRef()[rtReg] = tt.rt
 				}
-				state.GetMemory().SetUint32(0, insn)
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
 				step := state.GetStep()
 
 				// Setup expectations
@@ -311,7 +311,7 @@ func TestEVMSingleStep_LoadStore(t *testing.T) {
 				insn := tt.opcode<<26 | baseReg<<21 | rtReg<<16 | tt.imm
 				state.GetRegistersRef()[rtReg] = tt.rt
 				state.GetRegistersRef()[baseReg] = tt.base
-				state.GetMemory().SetUint32(0, insn)
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
 				state.GetMemory().SetWord(effAddr, tt.memVal)
 				step := state.GetStep()
 
@@ -365,7 +365,7 @@ func TestEVMSingleStep_MovzMovn(t *testing.T) {
 				state.GetRegistersRef()[rtReg] = t2
 				state.GetRegistersRef()[rsReg] = Word(0xb)
 				state.GetRegistersRef()[rdReg] = Word(0xa)
-				state.GetMemory().SetUint32(0, insn)
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
 				step := state.GetStep()
 				// Setup expectations
 				expected := testutil.NewExpectedState(state)
@@ -420,7 +420,7 @@ func TestEVMSingleStep_MfhiMflo(t *testing.T) {
 				state := goVm.GetState()
 				rdReg := uint32(8)
 				insn := rdReg<<11 | tt.funct
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				step := state.GetStep()
 				// Setup expectations
 				expected := testutil.NewExpectedState(state)
@@ -475,7 +475,7 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 				insn = tt.opcode<<26 | baseReg<<21 | rtReg<<16 | tt.rdReg<<11 | tt.funct
 				state.GetRegistersRef()[rtReg] = tt.rt
 				state.GetRegistersRef()[baseReg] = tt.rs
-				state.GetMemory().SetUint32(0, insn)
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
 
 				if tt.expectRevert != "" {
 					proofData := v.ProofGenerator(t, goVm.GetState())
@@ -529,7 +529,7 @@ func TestEVMSingleStep_MthiMtlo(t *testing.T) {
 				state := goVm.GetState()
 				rsReg := uint32(8)
 				insn := rsReg<<21 | tt.funct
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				state.GetRegistersRef()[rsReg] = val
 				step := state.GetStep()
 				// Setup expectations
@@ -580,7 +580,7 @@ func TestEVM_MMap(t *testing.T) {
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithHeap(c.heap))
 				state := goVm.GetState()
 
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 				state.GetRegistersRef()[2] = arch.SysMmap
 				state.GetRegistersRef()[4] = c.address
 				state.GetRegistersRef()[5] = c.size
@@ -788,7 +788,7 @@ func TestEVMSysWriteHint(t *testing.T) {
 
 				err := state.GetMemory().SetMemoryRange(arch.Word(tt.memOffset), bytes.NewReader(tt.hintData))
 				require.NoError(t, err)
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				step := state.GetStep()
 
 				expected := testutil.NewExpectedState(state)
@@ -832,7 +832,7 @@ func TestEVMFault(t *testing.T) {
 			t.Run(testName, func(t *testing.T) {
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithNextPC(tt.nextPC))
 				state := goVm.GetState()
-				state.GetMemory().SetUint32(0, tt.insn)
+				testutil.StoreInstruction(state.GetMemory(), 0, tt.insn)
 				// set the return address ($ra) to jump into when test completes
 				state.GetRegistersRef()[31] = testutil.EndAddr
 
@@ -1059,7 +1059,7 @@ func TestEVMSingleStepBranch(t *testing.T) {
 				state := goVm.GetState()
 				const rsReg = 8 // t0
 				insn := tt.opcode<<26 | rsReg<<21 | tt.regimm<<16 | uint32(tt.offset)
-				state.GetMemory().SetUint32(tt.pc, insn)
+				testutil.StoreInstruction(state.GetMemory(), tt.pc, insn)
 				state.GetRegistersRef()[rsReg] = Word(tt.rs)
 				step := state.GetStep()
 
diff --git a/cannon/mipsevm/tests/evm_multithreaded64_test.go b/cannon/mipsevm/tests/evm_multithreaded64_test.go
index a8c891b1d252..9af5f212a221 100644
--- a/cannon/mipsevm/tests/evm_multithreaded64_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded64_test.go
@@ -56,7 +56,7 @@ func TestEVM_MT64_LL(t *testing.T) {
 				step := state.GetStep()
 
 				// Set up state
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				state.GetMemory().SetWord(effAddr, c.memVal)
 				state.GetRegistersRef()[baseReg] = c.base
 				if withExistingReservation {
@@ -158,7 +158,7 @@ func TestEVM_MT64_SC(t *testing.T) {
 
 				// Setup state
 				state.GetCurrentThread().ThreadId = c.threadId
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				state.GetRegistersRef()[baseReg] = c.base
 				state.GetRegistersRef()[rtReg] = c.value
 				state.LLReservationStatus = v.llReservationStatus
@@ -232,7 +232,7 @@ func TestEVM_MT64_LLD(t *testing.T) {
 				step := state.GetStep()
 
 				// Set up state
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				state.GetMemory().SetWord(effAddr, c.memVal)
 				state.GetRegistersRef()[baseReg] = c.base
 				if withExistingReservation {
@@ -335,7 +335,7 @@ func TestEVM_MT64_SCD(t *testing.T) {
 
 				// Setup state
 				state.GetCurrentThread().ThreadId = c.threadId
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				state.GetRegistersRef()[baseReg] = c.base
 				state.GetRegistersRef()[rtReg] = value
 				state.LLReservationStatus = v.llReservationStatus
diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index 0ea9142a9168..3d873730306a 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -63,7 +63,7 @@ func TestEVM_MT_LL(t *testing.T) {
 
 				// Set up state
 				testutil.SetMemoryUint64(t, state.GetMemory(), Word(c.expectedAddr), c.memValue)
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				state.GetRegistersRef()[baseReg] = Word(c.base)
 				if withExistingReservation {
 					state.LLReservationStatus = multithreaded.LLStatusActive32bit
@@ -160,7 +160,7 @@ func TestEVM_MT_SC(t *testing.T) {
 				// Setup state
 				testutil.SetMemoryUint64(t, state.GetMemory(), Word(c.expectedAddr), memValue)
 				state.GetCurrentThread().ThreadId = c.threadId
-				state.GetMemory().SetUint32(state.GetPC(), insn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
 				state.GetRegistersRef()[baseReg] = c.base
 				state.GetRegistersRef()[rtReg] = Word(c.storeValue)
 				state.LLReservationStatus = v.llReservationStatus
@@ -224,8 +224,8 @@ func TestEVM_MT_SysRead_Preimage(t *testing.T) {
 		count          Word
 		writeLen       Word
 		preimageOffset Word
-		prestateMem    uint32
-		postateMem     uint32
+		prestateMem    Word
+		postateMem     Word
 		shouldPanic    bool
 	}{
 		{name: "Aligned addr, write 1 byte", addr: 0x00_00_FF_00, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: 0xFF_FF_FF_FF, postateMem: 0x12_FF_FF_FF},
@@ -269,11 +269,11 @@ func TestEVM_MT_SysRead_Preimage(t *testing.T) {
 				state.GetRegistersRef()[4] = exec.FdPreimageRead
 				state.GetRegistersRef()[5] = c.addr
 				state.GetRegistersRef()[6] = c.count
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 				state.LLReservationStatus = v.llReservationStatus
 				state.LLAddress = llAddress
 				state.LLOwnerThread = llOwnerThread
-				state.GetMemory().SetUint32(effAddr, c.prestateMem)
+				state.GetMemory().SetWord(effAddr, c.prestateMem)
 
 				// Setup expectations
 				expected := mttestutil.NewExpectedMTState(state)
@@ -281,7 +281,7 @@ func TestEVM_MT_SysRead_Preimage(t *testing.T) {
 				expected.ActiveThread().Registers[2] = c.writeLen
 				expected.ActiveThread().Registers[7] = 0 // no error
 				expected.PreimageOffset += c.writeLen
-				expected.ExpectMemoryWriteUint32(t, effAddr, c.postateMem)
+				expected.ExpectMemoryWordWrite(effAddr, c.postateMem)
 				if v.shouldClearReservation {
 					expected.LLReservationStatus = multithreaded.LLStatusNone
 					expected.LLAddress = 0
@@ -334,8 +334,8 @@ func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
 		offset  int
 		base    Word
 		effAddr Word
-		preMem  uint32
-		postMem uint32
+		preMem  Word
+		postMem Word
 	}{
 		{name: "Store byte", opcode: 0b10_1000, base: 0xFF_00_00_04, offset: 0xFF_00_00_08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x78_FF_FF_FF},
 		{name: "Store halfword", opcode: 0b10_1001, base: 0xFF_00_00_04, offset: 0xFF_00_00_08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x56_78_FF_FF},
@@ -361,8 +361,8 @@ func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
 				// Setup state
 				state.GetRegistersRef()[rtReg] = rt
 				state.GetRegistersRef()[baseReg] = c.base
-				state.GetMemory().SetUint32(state.GetPC(), insn)
-				state.GetMemory().SetUint32(c.effAddr, c.preMem)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
+				state.GetMemory().SetWord(c.effAddr, c.preMem)
 				state.LLReservationStatus = v.llReservationStatus
 				state.LLAddress = llAddress
 				state.LLOwnerThread = llOwnerThread
@@ -370,7 +370,7 @@ func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
 				// Setup expectations
 				expected := mttestutil.NewExpectedMTState(state)
 				expected.ExpectStep()
-				expected.ExpectMemoryWriteUint32(t, c.effAddr, c.postMem)
+				expected.ExpectMemoryWordWrite(c.effAddr, c.postMem)
 				if v.shouldClearReservation {
 					expected.LLReservationStatus = multithreaded.LLStatusNone
 					expected.LLAddress = 0
@@ -411,7 +411,7 @@ func TestEVM_SysClone_FlagHandling(t *testing.T) {
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			state := multithreaded.CreateEmptyState()
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysClone // Set syscall number
 			state.GetRegistersRef()[4] = c.flags       // Set first argument
 			curStep := state.Step
@@ -464,7 +464,7 @@ func TestEVM_SysClone_Successful(t *testing.T) {
 
 			goVm, state, contracts := setup(t, i, nil)
 			mttestutil.InitializeSingleThread(i*333, state, c.traverseRight)
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysClone        // the syscall number
 			state.GetRegistersRef()[4] = exec.ValidCloneFlags // a0 - first argument, clone flags
 			state.GetRegistersRef()[5] = stackPtr             // a1 - the stack pointer
@@ -527,7 +527,7 @@ func TestEVM_SysGetTID(t *testing.T) {
 			mttestutil.InitializeSingleThread(i*789, state, false)
 
 			state.GetCurrentThread().ThreadId = c.threadId
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysGetTID // Set syscall number
 			step := state.Step
 
@@ -570,7 +570,7 @@ func TestEVM_SysExit(t *testing.T) {
 			goVm, state, contracts := setup(t, i*133, nil)
 			mttestutil.SetupThreads(int64(i*1111), state, i%2 == 0, c.threadCount, 0)
 
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysExit   // Set syscall number
 			state.GetRegistersRef()[4] = Word(exitCode) // The first argument (exit code)
 			step := state.Step
@@ -678,7 +678,7 @@ func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
 			goVm, state, contracts := setup(t, i*1234, nil)
 			step := state.GetStep()
 
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.Memory.SetWord(c.effAddr, c.actualValue)
 			state.GetRegistersRef()[2] = arch.SysFutex // Set syscall number
 			state.GetRegistersRef()[4] = c.addressParam
@@ -749,7 +749,7 @@ func TestEVM_SysFutex_WakePrivate(t *testing.T) {
 			mttestutil.SetupThreads(int64(i*2244), state, c.traverseRight, c.activeThreadCount, c.inactiveThreadCount)
 			step := state.Step
 
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysFutex // Set syscall number
 			state.GetRegistersRef()[4] = c.addressParam
 			state.GetRegistersRef()[5] = exec.FutexWakePrivate
@@ -834,7 +834,7 @@ func TestEVM_SysFutex_UnsupportedOp(t *testing.T) {
 			goVm, state, contracts := setup(t, int(op), nil)
 			step := state.GetStep()
 
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysFutex // Set syscall number
 			state.GetRegistersRef()[5] = op
 
@@ -889,7 +889,7 @@ func runPreemptSyscall(t *testing.T, syscallName string, syscallNum uint32) {
 				goVm, state, contracts := setup(t, i*789, nil)
 				mttestutil.SetupThreads(int64(i*3259), state, traverseRight, c.activeThreads, c.inactiveThreads)
 
-				state.Memory.SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 				state.GetRegistersRef()[2] = Word(syscallNum) // Set syscall number
 				step := state.Step
 
@@ -919,7 +919,7 @@ func TestEVM_SysOpen(t *testing.T) {
 
 	goVm, state, contracts := setup(t, 5512, nil)
 
-	state.Memory.SetUint32(state.GetPC(), syscallInsn)
+	testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 	state.GetRegistersRef()[2] = arch.SysOpen // Set syscall number
 	step := state.Step
 
@@ -944,7 +944,7 @@ func TestEVM_SysGetPID(t *testing.T) {
 	var tracer *tracing.Hooks
 	goVm, state, contracts := setup(t, 1929, nil)
 
-	state.Memory.SetUint32(state.GetPC(), syscallInsn)
+	testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 	state.GetRegistersRef()[2] = arch.SysGetpid // Set syscall number
 	step := state.Step
 
@@ -1029,7 +1029,7 @@ func testEVM_SysClockGettime(t *testing.T, clkid Word) {
 					llOwnerThread = state.GetCurrentThread().ThreadId + 1
 				}
 
-				state.Memory.SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 				state.GetRegistersRef()[2] = arch.SysClockGetTime // Set syscall number
 				state.GetRegistersRef()[4] = clkid                // a0
 				state.GetRegistersRef()[5] = c.timespecAddr       // a1
@@ -1073,7 +1073,7 @@ func TestEVM_SysClockGettimeNonMonotonic(t *testing.T) {
 	goVm, state, contracts := setup(t, 2101, nil)
 
 	timespecAddr := Word(0x1000)
-	state.Memory.SetUint32(state.GetPC(), syscallInsn)
+	testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 	state.GetRegistersRef()[2] = arch.SysClockGetTime // Set syscall number
 	state.GetRegistersRef()[4] = 0xDEAD               // a0 - invalid clockid
 	state.GetRegistersRef()[5] = timespecAddr         // a1
@@ -1136,7 +1136,7 @@ func TestEVM_NoopSyscall(t *testing.T) {
 		t.Run(noopName, func(t *testing.T) {
 			goVm, state, contracts := setup(t, int(noopVal), nil)
 
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = Word(noopVal) // Set syscall number
 			step := state.Step
 
@@ -1183,7 +1183,7 @@ func TestEVM_UnsupportedSyscall(t *testing.T) {
 			t.Parallel()
 			goVm, state, contracts := setup(t, i*3434, nil)
 			// Setup basic getThreadId syscall instruction
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = Word(syscallNum)
 			proofData := multiThreadedProofGenerator(t, state)
 			// Set up post-state expectations
@@ -1587,7 +1587,7 @@ func TestEVM_SchedQuantumThreshold(t *testing.T) {
 		t.Run(c.name, func(t *testing.T) {
 			goVm, state, contracts := setup(t, i*789, nil)
 			// Setup basic getThreadId syscall instruction
-			state.Memory.SetUint32(state.GetPC(), syscallInsn)
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysGetTID // Set syscall number
 			state.StepsSinceLastContextSwitch = c.stepsSinceLastContextSwitch
 			step := state.Step
diff --git a/cannon/mipsevm/tests/evm_singlethreaded_test.go b/cannon/mipsevm/tests/evm_singlethreaded_test.go
index cf19a83a14ce..159bc2bf4dbd 100644
--- a/cannon/mipsevm/tests/evm_singlethreaded_test.go
+++ b/cannon/mipsevm/tests/evm_singlethreaded_test.go
@@ -42,7 +42,7 @@ func TestEVM_LL(t *testing.T) {
 			insn := uint32((0b11_0000 << 26) | (baseReg & 0x1F << 21) | (rtReg & 0x1F << 16) | (0xFFFF & c.offset))
 			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(pc), testutil.WithNextPC(pc+4))
 			state := goVm.GetState()
-			state.GetMemory().SetUint32(pc, insn)
+			testutil.StoreInstruction(state.GetMemory(), pc, insn)
 			state.GetMemory().SetWord(c.effAddr, c.value)
 			state.GetRegistersRef()[baseReg] = c.base
 			step := state.GetStep()
@@ -92,7 +92,7 @@ func TestEVM_SC(t *testing.T) {
 			insn := uint32((0b11_1000 << 26) | (baseReg & 0x1F << 21) | (rtReg & 0x1F << 16) | (0xFFFF & c.offset))
 			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(pc), testutil.WithNextPC(pc+4))
 			state := goVm.GetState()
-			state.GetMemory().SetUint32(pc, insn)
+			testutil.StoreInstruction(state.GetMemory(), pc, insn)
 			state.GetRegistersRef()[baseReg] = c.base
 			state.GetRegistersRef()[rtReg] = c.value
 			step := state.GetStep()
@@ -103,7 +103,7 @@ func TestEVM_SC(t *testing.T) {
 			expected.PC = pc + 4
 			expected.NextPC = pc + 8
 			expectedMemory := memory.NewMemory()
-			expectedMemory.SetUint32(pc, insn)
+			testutil.StoreInstruction(expectedMemory, pc, insn)
 			expectedMemory.SetWord(c.effAddr, c.value)
 			expected.MemoryRoot = expectedMemory.MerkleRoot()
 			if rtReg != 0 {
@@ -135,8 +135,8 @@ func TestEVM_SysRead_Preimage(t *testing.T) {
 		count          Word
 		writeLen       Word
 		preimageOffset Word
-		prestateMem    uint32
-		postateMem     uint32
+		prestateMem    Word
+		postateMem     Word
 		shouldPanic    bool
 	}{
 		{name: "Aligned addr, write 1 byte", addr: 0x00_00_FF_00, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: 0xFF_FF_FF_FF, postateMem: 0x12_FF_FF_FF},
@@ -170,8 +170,8 @@ func TestEVM_SysRead_Preimage(t *testing.T) {
 			state.GetRegistersRef()[4] = exec.FdPreimageRead
 			state.GetRegistersRef()[5] = c.addr
 			state.GetRegistersRef()[6] = c.count
-			state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
-			state.GetMemory().SetUint32(effAddr, c.prestateMem)
+			testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
+			state.GetMemory().SetWord(effAddr, c.prestateMem)
 
 			// Setup expectations
 			expected := testutil.NewExpectedState(state)
@@ -179,7 +179,7 @@ func TestEVM_SysRead_Preimage(t *testing.T) {
 			expected.Registers[2] = c.writeLen
 			expected.Registers[7] = 0 // no error
 			expected.PreimageOffset += c.writeLen
-			expected.ExpectMemoryWrite(effAddr, c.postateMem)
+			expected.ExpectMemoryWriteWord(effAddr, c.postateMem)
 
 			if c.shouldPanic {
 				require.Panics(t, func() { _, _ = goVm.Step(true) })
diff --git a/cannon/mipsevm/tests/fuzz_evm_common_test.go b/cannon/mipsevm/tests/fuzz_evm_common_test.go
index 8c7081456af8..2c992b5b7a3f 100644
--- a/cannon/mipsevm/tests/fuzz_evm_common_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_common_test.go
@@ -2,7 +2,6 @@ package tests
 
 import (
 	"bytes"
-	"encoding/binary"
 	"math"
 	"os"
 	"testing"
@@ -28,7 +27,7 @@ func FuzzStateSyscallBrk(f *testing.F) {
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(seed))
 				state := goVm.GetState()
 				state.GetRegistersRef()[2] = arch.SysBrk
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 				step := state.GetStep()
 
 				expected := testutil.NewExpectedState(state)
@@ -68,7 +67,7 @@ func FuzzStateSyscallMmap(f *testing.F) {
 				state.GetRegistersRef()[2] = arch.SysMmap
 				state.GetRegistersRef()[4] = addr
 				state.GetRegistersRef()[5] = siz
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 
 				expected := testutil.NewExpectedState(state)
 				expected.Step += 1
@@ -114,7 +113,7 @@ func FuzzStateSyscallExitGroup(f *testing.F) {
 				state := goVm.GetState()
 				state.GetRegistersRef()[2] = arch.SysExitGroup
 				state.GetRegistersRef()[4] = Word(exitCode)
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 				step := state.GetStep()
 
 				expected := testutil.NewExpectedState(state)
@@ -144,7 +143,7 @@ func FuzzStateSyscallFcntl(f *testing.F) {
 				state.GetRegistersRef()[2] = arch.SysFcntl
 				state.GetRegistersRef()[4] = fd
 				state.GetRegistersRef()[5] = cmd
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 				step := state.GetStep()
 
 				expected := testutil.NewExpectedState(state)
@@ -205,7 +204,7 @@ func FuzzStateHintRead(f *testing.F) {
 				state.GetRegistersRef()[4] = exec.FdHintRead
 				state.GetRegistersRef()[5] = addr
 				state.GetRegistersRef()[6] = count
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 				step := state.GetStep()
 
 				expected := testutil.NewExpectedState(state)
@@ -249,8 +248,8 @@ func FuzzStatePreimageRead(f *testing.F) {
 				state.GetRegistersRef()[4] = exec.FdPreimageRead
 				state.GetRegistersRef()[5] = addr
 				state.GetRegistersRef()[6] = count
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
-				state.GetMemory().SetUint32(effAddr, binary.BigEndian.Uint32(preexistingMemoryVal[:]))
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
+				state.GetMemory().SetWord(effAddr, arch.ByteOrderWord.Word(preexistingMemoryVal[:]))
 				step := state.GetStep()
 
 				alignment := addr & arch.ExtMask
@@ -275,7 +274,7 @@ func FuzzStatePreimageRead(f *testing.F) {
 					// Expect a memory write
 					expectedMemory := preexistingMemoryVal
 					copy(expectedMemory[alignment:], preimageData[preimageOffset:preimageOffset+writeLen])
-					expected.ExpectMemoryWrite(effAddr, binary.BigEndian.Uint32(expectedMemory[:]))
+					expected.ExpectMemoryWriteWord(effAddr, arch.ByteOrderWord.Word(expectedMemory[:]))
 				}
 
 				stepWitness, err := goVm.Step(true)
@@ -331,7 +330,7 @@ func FuzzStateHintWrite(f *testing.F) {
 				step := state.GetStep()
 				err := state.GetMemory().SetMemoryRange(addr, bytes.NewReader(hintData[int(lastHintLen):]))
 				require.NoError(t, err)
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 
 				// Set up expectations
 				expected := testutil.NewExpectedState(state)
@@ -394,8 +393,8 @@ func FuzzStatePreimageWrite(f *testing.F) {
 				state.GetRegistersRef()[4] = exec.FdPreimageWrite
 				state.GetRegistersRef()[5] = addr
 				state.GetRegistersRef()[6] = count
-				state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
-				state.GetMemory().SetUint32(effAddr, binary.BigEndian.Uint32(preexistingMemoryVal[:]))
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
+				state.GetMemory().SetWord(effAddr, arch.ByteOrderWord.Word(preexistingMemoryVal[:]))
 				step := state.GetStep()
 
 				expectBytesWritten := count
diff --git a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
index d898391ba4d9..09ad014189fe 100644
--- a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
@@ -27,7 +27,7 @@ func FuzzStateSyscallCloneMT(f *testing.F) {
 
 		// Setup
 		state.NextThreadId = nextThreadId
-		state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+		testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 		state.GetRegistersRef()[2] = arch.SysClone
 		state.GetRegistersRef()[4] = exec.ValidCloneFlags
 		state.GetRegistersRef()[5] = stackPtr
diff --git a/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go b/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go
index 7d2c8ff6f28a..4c6542269a72 100644
--- a/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go
@@ -17,7 +17,7 @@ func FuzzStateSyscallCloneST(f *testing.F) {
 		goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(seed))
 		state := goVm.GetState()
 		state.GetRegistersRef()[2] = arch.SysClone
-		state.GetMemory().SetUint32(state.GetPC(), syscallInsn)
+		testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
 		step := state.GetStep()
 
 		expected := testutil.NewExpectedState(state)
diff --git a/cannon/mipsevm/testutil/memory.go b/cannon/mipsevm/testutil/memory.go
index 7d90893d6b9f..0c6fddf8f140 100644
--- a/cannon/mipsevm/testutil/memory.go
+++ b/cannon/mipsevm/testutil/memory.go
@@ -1,6 +1,12 @@
 package testutil
 
-import "encoding/binary"
+import (
+	"encoding/binary"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
+)
 
 func Uint32ToBytes(val uint32) []byte {
 	data := make([]byte, 4)
@@ -15,3 +21,15 @@ func Uint64ToBytes(val uint64) []byte {
 
 	return data
 }
+
+// StoreInstruction writes a 4-byte instruction to memory
+func StoreInstruction(mem *memory.Memory, pc Word, insn uint32) {
+	if pc&0x3 != 0 {
+		panic(fmt.Errorf("unaligned memory access: %x", pc))
+	}
+	exec.StoreSubWord(mem, pc, 4, Word(insn), new(noopMemTracker))
+}
+
+type noopMemTracker struct{}
+
+func (n *noopMemTracker) TrackMemAccess(Word) {}
diff --git a/cannon/mipsevm/testutil/state.go b/cannon/mipsevm/testutil/state.go
index 10abb59be8d7..42e4b8851ac3 100644
--- a/cannon/mipsevm/testutil/state.go
+++ b/cannon/mipsevm/testutil/state.go
@@ -177,11 +177,6 @@ func (e *ExpectedState) ExpectStep() {
 	e.NextPC += 4
 }
 
-func (e *ExpectedState) ExpectMemoryWrite(addr arch.Word, val uint32) {
-	e.expectedMemory.SetUint32(addr, val)
-	e.MemoryRoot = e.expectedMemory.MerkleRoot()
-}
-
 func (e *ExpectedState) ExpectMemoryWriteWord(addr arch.Word, val arch.Word) {
 	e.expectedMemory.SetWord(addr, val)
 	e.MemoryRoot = e.expectedMemory.MerkleRoot()
diff --git a/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go b/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go
index 5eef7f138977..b81bbeb2b153 100644
--- a/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go
+++ b/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go
@@ -17,6 +17,7 @@ import (
 	"github.com/ethereum/go-ethereum/triedb"
 	"github.com/ethereum/go-ethereum/triedb/hashdb"
 
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
@@ -369,7 +370,7 @@ func DiffTestUtils() {
 		checkErr(err, "Error decoding addr")
 		insn, err := strconv.ParseUint(args[2], 10, 32)
 		checkErr(err, "Error decoding insn")
-		mem.SetUint32(uint32(pc), uint32(insn))
+		mem.SetWord(arch.Word(pc), arch.Word(insn))
 
 		var insnProof, memProof [896]byte
 		if len(args) >= 5 {
@@ -377,18 +378,18 @@ func DiffTestUtils() {
 			checkErr(err, "Error decoding memAddr")
 			memValue, err := strconv.ParseUint(args[4], 10, 32)
 			checkErr(err, "Error decoding memValue")
-			mem.SetUint32(uint32(memAddr), uint32(memValue))
-			memProof = mem.MerkleProof(uint32(memAddr))
+			mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
+			memProof = mem.MerkleProof(arch.Word(memAddr))
 		}
 		if len(args) == 7 {
 			memAddr, err := strconv.ParseUint(args[5], 10, 32)
 			checkErr(err, "Error decoding memAddr")
 			memValue, err := strconv.ParseUint(args[6], 10, 32)
 			checkErr(err, "Error decoding memValue")
-			mem.SetUint32(uint32(memAddr), uint32(memValue))
-			memProof = mem.MerkleProof(uint32(memAddr))
+			mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
+			memProof = mem.MerkleProof(arch.Word(memAddr))
 		}
-		insnProof = mem.MerkleProof(uint32(pc))
+		insnProof = mem.MerkleProof(arch.Word(pc))
 
 		output := struct {
 			MemRoot common.Hash
@@ -411,18 +412,18 @@ func DiffTestUtils() {
 		checkErr(err, "Error decoding addr")
 		insn, err := strconv.ParseUint(args[2], 10, 32)
 		checkErr(err, "Error decoding insn")
-		mem.SetUint32(uint32(pc), uint32(insn))
+		mem.SetWord(arch.Word(pc), arch.Word(insn))
 
 		var memProof [896]byte
 		memAddr, err := strconv.ParseUint(args[3], 10, 32)
 		checkErr(err, "Error decoding memAddr")
 		memValue, err := strconv.ParseUint(args[4], 10, 32)
 		checkErr(err, "Error decoding memValue")
-		mem.SetUint32(uint32(memAddr), uint32(memValue))
+		mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
 
 		memAddr2, err := strconv.ParseUint(args[5], 10, 32)
 		checkErr(err, "Error decoding memAddr")
-		memProof = mem.MerkleProof(uint32(memAddr2))
+		memProof = mem.MerkleProof(arch.Word(memAddr2))
 
 		output := struct {
 			MemRoot common.Hash
@@ -444,18 +445,18 @@ func DiffTestUtils() {
 		checkErr(err, "Error decoding addr")
 		insn, err := strconv.ParseUint(args[2], 10, 32)
 		checkErr(err, "Error decoding insn")
-		mem.SetUint32(uint32(pc), uint32(insn))
+		mem.SetWord(arch.Word(pc), arch.Word(insn))
 
 		var insnProof, memProof [896]byte
 		memAddr, err := strconv.ParseUint(args[3], 10, 32)
 		checkErr(err, "Error decoding memAddr")
 		memValue, err := strconv.ParseUint(args[4], 10, 32)
 		checkErr(err, "Error decoding memValue")
-		mem.SetUint32(uint32(memAddr), uint32(memValue))
+		mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
 
 		// Compute a valid proof for the root, but for the wrong leaves.
-		memProof = mem.MerkleProof(uint32(memAddr + 32))
-		insnProof = mem.MerkleProof(uint32(pc + 32))
+		memProof = mem.MerkleProof(arch.Word(memAddr + 32))
+		insnProof = mem.MerkleProof(arch.Word(pc + 32))
 
 		output := struct {
 			MemRoot common.Hash

From 1b7a414001c48e90c036d5e5d94fae8e8f1d1275 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Thu, 24 Oct 2024 14:13:29 -0700
Subject: [PATCH 026/451] cannon: Simplify load/stores with helper functions
 (#12599)

* cannon: Simplify load/stores with helper functions

* use subword utils in MIPS.sol

* lint MIPS.sol

* add natspec to MIPSInstructions.sol

* use updateSubWord in MIPSInstructions.sol

* bump MIPS contract semver

* fix nits
---
 cannon/mipsevm/exec/mips_instructions.go      | 112 +++++++-----------
 cannon/mipsevm/tests/evm_common64_test.go     |  26 ++--
 packages/contracts-bedrock/semver-lock.json   |   8 +-
 .../contracts-bedrock/src/cannon/MIPS.sol     |   4 +-
 .../contracts-bedrock/src/cannon/MIPS2.sol    |   4 +-
 .../src/cannon/libraries/MIPSInstructions.sol |  85 +++++++++++--
 6 files changed, 138 insertions(+), 101 deletions(-)

diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index b99f519fe2f9..9cc94e98e50c 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -343,12 +343,9 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 		case 0x0F: // lui
 			return SignExtend(rt<<16, 32)
 		case 0x20: // lb
-			msb := uint32(arch.WordSize - 8) // 24 for 32-bit and 56 for 64-bit
-			return SignExtend((mem>>(msb-uint32(rs&arch.ExtMask)*8))&0xFF, 8)
+			return SelectSubWord(rs, mem, 1, true)
 		case 0x21: // lh
-			msb := uint32(arch.WordSize - 16) // 16 for 32-bit and 48 for 64-bit
-			mask := Word(arch.ExtMask - 1)
-			return SignExtend((mem>>(msb-uint32(rs&mask)*8))&0xFFFF, 16)
+			return SelectSubWord(rs, mem, 2, true)
 		case 0x22: // lwl
 			if arch.IsMips32 {
 				val := mem << ((rs & 3) * 8)
@@ -356,26 +353,17 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 				return SignExtend(((rt & ^mask)|val)&0xFFFFFFFF, 32)
 			} else {
 				// similar to the above mips32 implementation but loads are constrained to the nearest 4-byte memory word
-				shift := 32 - ((rs & 0x4) << 3)
-				w := uint32(mem >> shift)
-				val := uint64(w << ((rs & 3) * 8))
+				w := uint32(SelectSubWord(rs, mem, 4, false))
+				val := w << ((rs & 3) * 8)
 				mask := Word(uint32(0xFFFFFFFF) << ((rs & 3) * 8))
 				return SignExtend(((rt & ^mask)|Word(val))&0xFFFFFFFF, 32)
 			}
 		case 0x23: // lw
-			if arch.IsMips32 {
-				return mem
-			} else {
-				// TODO(#12562): Simplify using LoadSubWord
-				return SignExtend((mem>>(32-((rs&0x4)<<3)))&0xFFFFFFFF, 32)
-			}
+			return SelectSubWord(rs, mem, 4, true)
 		case 0x24: // lbu
-			msb := uint32(arch.WordSize - 8) // 24 for 32-bit and 56 for 64-bit
-			return (mem >> (msb - uint32(rs&arch.ExtMask)*8)) & 0xFF
+			return SelectSubWord(rs, mem, 1, false)
 		case 0x25: //  lhu
-			msb := uint32(arch.WordSize - 16) // 16 for 32-bit and 48 for 64-bit
-			mask := Word(arch.ExtMask - 1)
-			return (mem >> (msb - uint32(rs&mask)*8)) & 0xFFFF
+			return SelectSubWord(rs, mem, 2, false)
 		case 0x26: //  lwr
 			if arch.IsMips32 {
 				val := mem >> (24 - (rs&3)*8)
@@ -383,8 +371,7 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 				return SignExtend(((rt & ^mask)|val)&0xFFFFFFFF, 32)
 			} else {
 				// similar to the above mips32 implementation but constrained to the nearest 4-byte memory word
-				shift := 32 - ((rs & 0x4) << 3)
-				w := uint32(mem >> shift)
+				w := uint32(SelectSubWord(rs, mem, 4, false))
 				val := w >> (24 - (rs&3)*8)
 				mask := uint32(0xFFFFFFFF) >> (24 - (rs&3)*8)
 				lwrResult := ((uint32(rt) & ^mask) | val) & 0xFFFFFFFF
@@ -397,17 +384,9 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 				}
 			}
 		case 0x28: //  sb
-			msb := uint32(arch.WordSize - 8) // 24 for 32-bit and 56 for 64-bit
-			val := (rt & 0xFF) << (msb - uint32(rs&arch.ExtMask)*8)
-			mask := ^Word(0) ^ Word(0xFF<<(msb-uint32(rs&arch.ExtMask)*8))
-			return (mem & mask) | val
+			return UpdateSubWord(rs, mem, 1, rt)
 		case 0x29: //  sh
-			msb := uint32(arch.WordSize - 16) // 16 for 32-bit and 48 for 64-bit
-			rsMask := Word(arch.ExtMask - 1)  // 2 for 32-bit and 6 for 64-bit
-			sl := msb - uint32(rs&rsMask)*8
-			val := (rt & 0xFFFF) << sl
-			mask := ^Word(0) ^ Word(0xFFFF<<sl)
-			return (mem & mask) | val
+			return UpdateSubWord(rs, mem, 2, rt)
 		case 0x2a: //  swl
 			if arch.IsMips32 {
 				val := rt >> ((rs & 3) * 8)
@@ -420,14 +399,7 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 				return (mem & Word(^mask)) | val
 			}
 		case 0x2b: //  sw
-			if arch.IsMips32 {
-				return rt
-			} else {
-				sl := 32 - ((rs & 0x4) << 3)
-				val := (rt & 0xFFFFFFFF) << sl
-				mask := Word(0xFFFFFFFFFFFFFFFF ^ uint64(0xFFFFFFFF<<sl))
-				return Word(mem&mask) | Word(val)
-			}
+			return UpdateSubWord(rs, mem, 4, rt)
 		case 0x2e: //  swr
 			if arch.IsMips32 {
 				val := rt << (24 - (rs&3)*8)
@@ -435,18 +407,11 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 				return (mem & Word(^mask)) | val
 			} else {
 				// similar to the above mips32 implementation but constrained to the nearest 4-byte memory word
-				shift := 32 - ((rs & 0x4) << 3)
-				w := uint32(mem >> shift)
+				w := uint32(SelectSubWord(rs, mem, 4, false))
 				val := rt << (24 - (rs&3)*8)
 				mask := uint32(0xFFFFFFFF) << (24 - (rs&3)*8)
 				swrResult := (w & ^mask) | uint32(val)
-				// merge with the untouched bytes in mem
-				if shift > 0 {
-					return (Word(swrResult) << 32) | (mem & Word(^uint32(0))) // nolint: staticcheck
-				} else {
-					memMask := uint64(0xFF_FF_FF_FF_00_00_00_00)
-					return (mem & Word(memMask)) | Word(swrResult & ^uint32(0))
-				}
+				return UpdateSubWord(rs, mem, 4, Word(swrResult))
 			}
 
 		// MIPS64
@@ -663,45 +628,56 @@ func HandleRd(cpu *mipsevm.CpuScalars, registers *[32]Word, storeReg Word, val W
 	return nil
 }
 
-func LoadSubWord(memory *memory.Memory, addr Word, byteLength Word, signExtend bool, memoryTracker MemTracker) Word {
+// LoadSubWord loads a subword of byteLength size from memory based on the low-order bits of vaddr
+func LoadSubWord(memory *memory.Memory, vaddr Word, byteLength Word, signExtend bool, memoryTracker MemTracker) Word {
 	// Pull data from memory
-	effAddr := (addr) & arch.AddressMask
+	effAddr := (vaddr) & arch.AddressMask
 	memoryTracker.TrackMemAccess(effAddr)
 	mem := memory.GetWord(effAddr)
 
-	// Extract a sub-word based on the low-order bits in addr
-	dataMask, bitOffset, bitLength := calculateSubWordMaskAndOffset(addr, byteLength)
-	retVal := (mem >> bitOffset) & dataMask
-	if signExtend {
-		retVal = SignExtend(retVal, bitLength)
-	}
-
-	return retVal
+	return SelectSubWord(vaddr, mem, byteLength, signExtend)
 }
 
-func StoreSubWord(memory *memory.Memory, addr Word, byteLength Word, value Word, memoryTracker MemTracker) {
+// StoreSubWord stores a [Word] that has been updated by the specified value at bit positions determined by the vaddr
+func StoreSubWord(memory *memory.Memory, vaddr Word, byteLength Word, value Word, memoryTracker MemTracker) {
 	// Pull data from memory
-	effAddr := (addr) & arch.AddressMask
+	effAddr := (vaddr) & arch.AddressMask
 	memoryTracker.TrackMemAccess(effAddr)
 	mem := memory.GetWord(effAddr)
 
 	// Modify isolated sub-word within mem
-	dataMask, bitOffset, _ := calculateSubWordMaskAndOffset(addr, byteLength)
+	newMemVal := UpdateSubWord(vaddr, mem, byteLength, value)
+	memory.SetWord(effAddr, newMemVal)
+}
+
+// SelectSubWord selects a subword of byteLength size contained in memWord based on the low-order bits of vaddr
+// This is the nearest subword that is naturally aligned by the specified byteLength
+func SelectSubWord(vaddr Word, memWord Word, byteLength Word, signExtend bool) Word {
+	// Extract a sub-word based on the low-order bits in vaddr
+	dataMask, bitOffset, bitLength := calculateSubWordMaskAndOffset(vaddr, byteLength)
+	retVal := (memWord >> bitOffset) & dataMask
+	if signExtend {
+		retVal = SignExtend(retVal, bitLength)
+	}
+	return retVal
+}
+
+// UpdateSubWord returns a [Word] that has been updated by the specified value at bit positions determined by the vaddr
+func UpdateSubWord(vaddr Word, memWord Word, byteLength Word, value Word) Word {
+	dataMask, bitOffset, _ := calculateSubWordMaskAndOffset(vaddr, byteLength)
 	subWordValue := dataMask & value
 	memUpdateMask := dataMask << bitOffset
-	newMemVal := subWordValue<<bitOffset | (^memUpdateMask)&mem
-
-	memory.SetWord(effAddr, newMemVal)
+	return subWordValue<<bitOffset | (^memUpdateMask)&memWord
 }
 
-func calculateSubWordMaskAndOffset(addr Word, byteLength Word) (dataMask, bitOffset, bitLength Word) {
+func calculateSubWordMaskAndOffset(vaddr Word, byteLength Word) (dataMask, bitOffset, bitLength Word) {
 	bitLength = byteLength << 3
 	dataMask = ^Word(0) >> (arch.WordSize - bitLength)
 
-	// Figure out sub-word index based on the low-order bits in addr
-	byteIndexMask := addr & arch.ExtMask & ^(byteLength - 1)
+	// Figure out sub-word index based on the low-order bits in vaddr
+	byteIndexMask := vaddr & arch.ExtMask & ^(byteLength - 1)
 	maxByteShift := arch.WordSizeBytes - byteLength
-	byteIndex := addr & byteIndexMask
+	byteIndex := vaddr & byteIndexMask
 	bitOffset = (maxByteShift - byteIndex) << 3
 
 	return dataMask, bitOffset, bitLength
diff --git a/cannon/mipsevm/tests/evm_common64_test.go b/cannon/mipsevm/tests/evm_common64_test.go
index 9c340f6b095f..cf51ad09038c 100644
--- a/cannon/mipsevm/tests/evm_common64_test.go
+++ b/cannon/mipsevm/tests/evm_common64_test.go
@@ -322,19 +322,19 @@ func TestEVMSingleStep_LoadStore64(t *testing.T) {
 		{name: "lwr sign-extended imm 7 sign bit 31 clear", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_71_B1_C1_D1), expectRes: Word(0x00_00_00_00_71_B1_C1_D1)}, // lwr $t0, 7($t1)
 		{name: "lwr sign-extended imm 7 sign bit 31 set", opcode: uint32(0x26), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectRes: Word(0xFF_FF_FF_FF_A1_B1_C1_D1)},   // lwr $t0, 7($t1)
 
-		{name: "sb offset=0", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, expectMemVal: Word(0x88_00_00_00_00_00_00_00)}, // sb $t0, 0($t1)
-		{name: "sb offset=1", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, expectMemVal: Word(0x00_88_00_00_00_00_00_00)}, // sb $t0, 1($t1)
-		{name: "sb offset=2", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, expectMemVal: Word(0x00_00_88_00_00_00_00_00)}, // sb $t0, 2($t1)
-		{name: "sb offset=3", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, expectMemVal: Word(0x00_00_00_88_00_00_00_00)}, // sb $t0, 3($t1)
-		{name: "sb offset=4", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, expectMemVal: Word(0x00_00_00_00_88_00_00_00)}, // sb $t0, 4($t1)
-		{name: "sb offset=5", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, expectMemVal: Word(0x00_00_00_00_00_88_00_00)}, // sb $t0, 5($t1)
-		{name: "sb offset=6", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, expectMemVal: Word(0x00_00_00_00_00_00_88_00)}, // sb $t0, 6($t1)
-		{name: "sb offset=7", opcode: uint32(0x28), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, expectMemVal: Word(0x00_00_00_00_00_00_00_88)}, // sb $t0, 7($t1)
-
-		{name: "sh offset=0", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, expectMemVal: Word(0x77_88_00_00_00_00_00_00)}, // sh $t0, 0($t1)
-		{name: "sh offset=2", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, expectMemVal: Word(0x00_00_77_88_00_00_00_00)}, // sh $t0, 2($t1)
-		{name: "sh offset=4", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, expectMemVal: Word(0x00_00_00_00_77_88_00_00)}, // sh $t0, 4($t1)
-		{name: "sh offset=6", opcode: uint32(0x29), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, expectMemVal: Word(0x00_00_00_00_00_00_77_88)}, // sh $t0, 6($t1)
+		{name: "sb offset=0", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, expectMemVal: Word(0x88_BB_CC_DD_A1_B1_C1_D1)}, // sb $t0, 0($t1)
+		{name: "sb offset=1", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 1, expectMemVal: Word(0xAA_88_CC_DD_A1_B1_C1_D1)}, // sb $t0, 1($t1)
+		{name: "sb offset=2", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, expectMemVal: Word(0xAA_BB_88_DD_A1_B1_C1_D1)}, // sb $t0, 2($t1)
+		{name: "sb offset=3", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 3, expectMemVal: Word(0xAA_BB_CC_88_A1_B1_C1_D1)}, // sb $t0, 3($t1)
+		{name: "sb offset=4", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, expectMemVal: Word(0xAA_BB_CC_DD_88_B1_C1_D1)}, // sb $t0, 4($t1)
+		{name: "sb offset=5", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 5, expectMemVal: Word(0xAA_BB_CC_DD_A1_88_C1_D1)}, // sb $t0, 5($t1)
+		{name: "sb offset=6", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, expectMemVal: Word(0xAA_BB_CC_DD_A1_B1_88_D1)}, // sb $t0, 6($t1)
+		{name: "sb offset=7", opcode: uint32(0x28), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 7, expectMemVal: Word(0xAA_BB_CC_DD_A1_B1_C1_88)}, // sb $t0, 7($t1)
+
+		{name: "sh offset=0", opcode: uint32(0x29), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 0, expectMemVal: Word(0x77_88_CC_DD_A1_B1_C1_D1)}, // sh $t0, 0($t1)
+		{name: "sh offset=2", opcode: uint32(0x29), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 2, expectMemVal: Word(0xAA_BB_77_88_A1_B1_C1_D1)}, // sh $t0, 2($t1)
+		{name: "sh offset=4", opcode: uint32(0x29), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 4, expectMemVal: Word(0xAA_BB_CC_DD_77_88_C1_D1)}, // sh $t0, 4($t1)
+		{name: "sh offset=6", opcode: uint32(0x29), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), rt: Word(0x11_22_33_44_55_66_77_88), imm: 6, expectMemVal: Word(0xAA_BB_CC_DD_A1_B1_77_88)}, // sh $t0, 6($t1)
 
 		{name: "swl offset=0", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 0, expectMemVal: Word(0x55_66_77_88_A1_B1_C1_D1)}, //  swl $t0, 0($t1)
 		{name: "swl offset=1", opcode: uint32(0x2a), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), imm: 1, expectMemVal: Word(0xAA_55_66_77_A1_B1_C1_D1)}, //  swl $t0, 1($t1)
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 26828dd40f8e..896b9534439f 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -140,12 +140,12 @@
     "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0x696c3ce334c11d0f9633945babac22b1b65848ff00d2cf6c4cb18116bbf138b2",
-    "sourceCodeHash": "0x3c2e5d6d39b29a60dcd1a776363518c87fcfef9a8d80e38696f56b6eec5bd53a"
+    "initCodeHash": "0x94f2e8f7818a990c009cccb501216a7f6df29b05d8f178cfff10a40288bf588e",
+    "sourceCodeHash": "0x786d4947488a771a426cc38de307ae99b2c2af1efca38b7655c60be7c019371f"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0x5c292882075bd06e68b89119be9096040bc913f51bb878ce4a9dfdd674330dd5",
-    "sourceCodeHash": "0x17c7b0edb9d20932eaf1b038e3e05e457f0461d2c8691ba1940fb4c2b0dfd123"
+    "initCodeHash": "0x3744036fa240c7d57f39307c0bf27cb7027d05d6b4f52142d5122b6e538ee0b2",
+    "sourceCodeHash": "0x5f79a0f99a288d570df243ea9560e67a319d1685b3209ae457fc714a76ff2908"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS.sol b/packages/contracts-bedrock/src/cannon/MIPS.sol
index 38989cfc7b7b..7e16d48a3dbb 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS.sol
@@ -44,8 +44,8 @@ contract MIPS is ISemver {
     }
 
     /// @notice The semantic version of the MIPS contract.
-    /// @custom:semver 1.2.1-beta.5
-    string public constant version = "1.2.1-beta.5";
+    /// @custom:semver 1.2.1-beta.6
+    string public constant version = "1.2.1-beta.6";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index 3f5044f14e04..b01b5a78d3de 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -60,8 +60,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.18
-    string public constant version = "1.0.0-beta.18";
+    /// @custom:semver 1.0.0-beta.19
+    string public constant version = "1.0.0-beta.19";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
index eab4a61db65a..32ec9007fd7e 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
@@ -379,11 +379,11 @@ library MIPSInstructions {
                 }
                 // lb
                 else if (_opcode == 0x20) {
-                    return signExtend((_mem >> (24 - (_rs & 3) * 8)) & 0xFF, 8);
+                    return selectSubWord(_rs, _mem, 1, true);
                 }
                 // lh
                 else if (_opcode == 0x21) {
-                    return signExtend((_mem >> (16 - (_rs & 2) * 8)) & 0xFFFF, 16);
+                    return selectSubWord(_rs, _mem, 2, true);
                 }
                 // lwl
                 else if (_opcode == 0x22) {
@@ -393,15 +393,15 @@ library MIPSInstructions {
                 }
                 // lw
                 else if (_opcode == 0x23) {
-                    return _mem;
+                    return selectSubWord(_rs, _mem, 4, true);
                 }
                 // lbu
                 else if (_opcode == 0x24) {
-                    return (_mem >> (24 - (_rs & 3) * 8)) & 0xFF;
+                    return selectSubWord(_rs, _mem, 1, false);
                 }
                 //  lhu
                 else if (_opcode == 0x25) {
-                    return (_mem >> (16 - (_rs & 2) * 8)) & 0xFFFF;
+                    return selectSubWord(_rs, _mem, 2, false);
                 }
                 //  lwr
                 else if (_opcode == 0x26) {
@@ -411,15 +411,11 @@ library MIPSInstructions {
                 }
                 //  sb
                 else if (_opcode == 0x28) {
-                    uint32 val = (_rt & 0xFF) << (24 - (_rs & 3) * 8);
-                    uint32 mask = 0xFFFFFFFF ^ uint32(0xFF << (24 - (_rs & 3) * 8));
-                    return (_mem & mask) | val;
+                    return updateSubWord(_rs, _mem, 1, _rt);
                 }
                 //  sh
                 else if (_opcode == 0x29) {
-                    uint32 val = (_rt & 0xFFFF) << (16 - (_rs & 2) * 8);
-                    uint32 mask = 0xFFFFFFFF ^ uint32(0xFFFF << (16 - (_rs & 2) * 8));
-                    return (_mem & mask) | val;
+                    return updateSubWord(_rs, _mem, 2, _rt);
                 }
                 //  swl
                 else if (_opcode == 0x2a) {
@@ -429,7 +425,7 @@ library MIPSInstructions {
                 }
                 //  sw
                 else if (_opcode == 0x2b) {
-                    return _rt;
+                    return updateSubWord(_rs, _mem, 4, _rt);
                 }
                 //  swr
                 else if (_opcode == 0x2e) {
@@ -667,4 +663,69 @@ library MIPSInstructions {
             _cpu.nextPC = _cpu.nextPC + 4;
         }
     }
+
+    /// @notice Selects a subword of byteLength size contained in memWord based on the low-order bits of vaddr
+    /// @param _vaddr The virtual address of the the subword.
+    /// @param _memWord The full word to select a subword from.
+    /// @param _byteLength The size of the subword.
+    /// @param _signExtend Whether to sign extend the selected subwrod.
+    function selectSubWord(
+        uint32 _vaddr,
+        uint32 _memWord,
+        uint32 _byteLength,
+        bool _signExtend
+    )
+        internal
+        pure
+        returns (uint32 retval_)
+    {
+        (uint32 dataMask, uint32 bitOffset, uint32 bitLength) = calculateSubWordMaskAndOffset(_vaddr, _byteLength);
+        retval_ = (_memWord >> bitOffset) & dataMask;
+        if (_signExtend) {
+            retval_ = signExtend(retval_, bitLength);
+        }
+        return retval_;
+    }
+
+    /// @notice Returns a word that has been updated by the specified subword at bit positions determined by the virtual
+    /// address
+    /// @param _vaddr The virtual address of the subword.
+    /// @param _memWord The full word to update.
+    /// @param _byteLength The size of the subword.
+    /// @param _value The subword that updates _memWord.
+    function updateSubWord(
+        uint32 _vaddr,
+        uint32 _memWord,
+        uint32 _byteLength,
+        uint32 _value
+    )
+        internal
+        pure
+        returns (uint32 word_)
+    {
+        (uint32 dataMask, uint32 bitOffset,) = calculateSubWordMaskAndOffset(_vaddr, _byteLength);
+        uint32 subWordValue = dataMask & _value;
+        uint32 memUpdateMask = dataMask << bitOffset;
+        return subWordValue << bitOffset | (~memUpdateMask) & _memWord;
+    }
+
+    function calculateSubWordMaskAndOffset(
+        uint32 _vaddr,
+        uint32 _byteLength
+    )
+        internal
+        pure
+        returns (uint32 dataMask_, uint32 bitOffset_, uint32 bitLength_)
+    {
+        uint32 bitLength = _byteLength << 3;
+        uint32 dataMask = ~uint32(0) >> (32 - bitLength);
+
+        // Figure out sub-word index based on the low-order bits in vaddr
+        uint32 byteIndexMask = _vaddr & 0x3 & ~(_byteLength - 1);
+        uint32 maxByteShift = 4 - _byteLength;
+        uint32 byteIndex = _vaddr & byteIndexMask;
+        uint32 bitOffset = (maxByteShift - byteIndex) << 3;
+
+        return (dataMask, bitOffset, bitLength);
+    }
 }

From dda07ca0997899f2dfbcce49bf77e7c69f506ae1 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Fri, 25 Oct 2024 08:49:30 +1000
Subject: [PATCH 027/451] op-e2e: Fix how output_cannon_test waits for resolved
 game status (#12630)

---
 op-e2e/faultproofs/output_cannon_test.go | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/op-e2e/faultproofs/output_cannon_test.go b/op-e2e/faultproofs/output_cannon_test.go
index 80dea8bfb8dd..0b0aea509feb 100644
--- a/op-e2e/faultproofs/output_cannon_test.go
+++ b/op-e2e/faultproofs/output_cannon_test.go
@@ -252,9 +252,7 @@ func testOutputCannonDefendStep(t *testing.T, allocType config.AllocType) {
 	sys.TimeTravelClock.AdvanceTime(game.MaxClockDuration(ctx))
 	require.NoError(t, wait.ForNextBlock(ctx, l1Client))
 
-	game.WaitForInactivity(ctx, 10, true)
-	game.LogGameData(ctx)
-	require.EqualValues(t, gameTypes.GameStatusChallengerWon, game.Status(ctx))
+	game.WaitForGameStatus(ctx, gameTypes.GameStatusChallengerWon)
 }
 
 func TestOutputCannonStepWithLargePreimage_Standard(t *testing.T) {
@@ -502,9 +500,7 @@ func testOutputCannonProposedOutputRootValid(t *testing.T, allocType config.Allo
 			sys.TimeTravelClock.AdvanceTime(game.MaxClockDuration(ctx))
 			require.NoError(t, wait.ForNextBlock(ctx, l1Client))
 
-			game.WaitForInactivity(ctx, 10, true)
-			game.LogGameData(ctx)
-			require.EqualValues(t, gameTypes.GameStatusDefenderWon, game.Status(ctx))
+			game.WaitForGameStatus(ctx, gameTypes.GameStatusDefenderWon)
 		})
 	}
 }
@@ -1003,9 +999,7 @@ func testOutputCannonHonestSafeTraceExtensionValidRoot(t *testing.T, allocType c
 	sys.TimeTravelClock.AdvanceTime(game.MaxClockDuration(ctx))
 	require.NoError(t, wait.ForNextBlock(ctx, l1Client))
 
-	game.WaitForInactivity(ctx, 10, true)
-	game.LogGameData(ctx)
-	require.EqualValues(t, gameTypes.GameStatusDefenderWon, game.Status(ctx))
+	game.WaitForGameStatus(ctx, gameTypes.GameStatusDefenderWon)
 }
 
 func TestOutputCannonHonestSafeTraceExtension_InvalidRoot_Standard(t *testing.T) {
@@ -1052,9 +1046,7 @@ func testOutputCannonHonestSafeTraceExtensionInvalidRoot(t *testing.T, allocType
 	sys.TimeTravelClock.AdvanceTime(game.MaxClockDuration(ctx))
 	require.NoError(t, wait.ForNextBlock(ctx, l1Client))
 
-	game.WaitForInactivity(ctx, 10, true)
-	game.LogGameData(ctx)
-	require.EqualValues(t, gameTypes.GameStatusChallengerWon, game.Status(ctx))
+	game.WaitForGameStatus(ctx, gameTypes.GameStatusChallengerWon)
 }
 
 func TestAgreeFirstBlockWithOriginOf1_Standard(t *testing.T) {

From d317e96c2add4a4e7fae72d6637ad241457f16c7 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 25 Oct 2024 08:06:52 +0700
Subject: [PATCH 028/451] feat(ct): add semgrep rule to use encodeCall (#12626)

* feat(ct): add semgrep rule to use encodeCall

encodeCall is almost always better than encodeWithSelector because
it maintains type safety. Prefer encodeCall unless
encodeWithSelector is actually necessary.

* maint(ct): update contracts to use encodeCall

Updates a number of contracts to use encodeCall instead of
encodeWithSelector where possible.
---
 .../scripts/DeployImplementations.s.sol            |  8 ++------
 packages/contracts-bedrock/semver-lock.json        |  8 ++++----
 .../contracts-bedrock/src/L1/L1ERC721Bridge.sol    |  8 ++++----
 .../contracts-bedrock/src/L2/L2ERC721Bridge.sol    |  8 ++++----
 semgrep/sol-rules.yaml                             | 14 ++++++++++++++
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/DeployImplementations.s.sol b/packages/contracts-bedrock/scripts/DeployImplementations.s.sol
index 3179ea3d6426..af5f75e6125c 100644
--- a/packages/contracts-bedrock/scripts/DeployImplementations.s.sol
+++ b/packages/contracts-bedrock/scripts/DeployImplementations.s.sol
@@ -570,9 +570,7 @@ contract DeployImplementations is Script {
             OPContractsManager.InitializerInputs(_blueprints, _setters, _release, true);
 
         vm.startBroadcast(msg.sender);
-        proxy.upgradeToAndCall(
-            address(opcmImpl), abi.encodeWithSelector(opcmImpl.initialize.selector, initializerInputs)
-        );
+        proxy.upgradeToAndCall(address(opcmImpl), abi.encodeCall(opcmImpl.initialize, (initializerInputs)));
 
         proxy.changeAdmin(address(opcmProxyOwner)); // transfer ownership of Proxy contract to the ProxyAdmin contract
         vm.stopBroadcast();
@@ -1146,9 +1144,7 @@ contract DeployImplementationsInterop is DeployImplementations {
             OPContractsManager.InitializerInputs(_blueprints, _setters, _release, true);
 
         vm.startBroadcast(msg.sender);
-        proxy.upgradeToAndCall(
-            address(opcmImpl), abi.encodeWithSelector(opcmImpl.initialize.selector, initializerInputs)
-        );
+        proxy.upgradeToAndCall(address(opcmImpl), abi.encodeCall(opcmImpl.initialize, (initializerInputs)));
 
         proxy.changeAdmin(opcmProxyOwner); // transfer ownership of Proxy contract to the ProxyAdmin contract
         vm.stopBroadcast();
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 896b9534439f..3ba87ad738b0 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -12,8 +12,8 @@
     "sourceCodeHash": "0x848ec3774be17bcc8ba65a23d08e35e979b3f39f9d2ac8a810188f945c69c9ea"
   },
   "src/L1/L1ERC721Bridge.sol": {
-    "initCodeHash": "0x63dc4da75200f4b968f57e27e81834e6eb3f6625826410882526ab1eec7847ff",
-    "sourceCodeHash": "0xfec29cfbb7aa05473e32a6c2484deebfc1ff50c0e08c42e8ee70696ad701ceaa"
+    "initCodeHash": "0xb3bf093ea83a24574a6093bebf5b2aea707355ed8d6702b2b5eb292e75b6ae42",
+    "sourceCodeHash": "0x289de9f40898b6305deecc6b60cdf566aa6c6a1444f713c3a0af23ea7878207e"
   },
   "src/L1/L1StandardBridge.sol": {
     "initCodeHash": "0x2868b09ecbe9f2bbc885605c2886b4c79f1c8e4171626c63776603b1b84698a8",
@@ -88,8 +88,8 @@
     "sourceCodeHash": "0x56edf0f36366326a92722ae3c7502bce3d80b2ee5e354181dc09ba801437a488"
   },
   "src/L2/L2ERC721Bridge.sol": {
-    "initCodeHash": "0x558fff5939a26b9d5d86e6b907d9dd9c7c917eaef7657a8b5acfeb58de1442f0",
-    "sourceCodeHash": "0xca9acd19fd5f42e6a7a5b1de6359f2d841814fb54d377664c2fe9c3f9c6be34a"
+    "initCodeHash": "0xb8236514beabcc1830e5e7e9eccb965e30d01f8bbb5a2d8b4f3d241c2d12819b",
+    "sourceCodeHash": "0x268e34289b7b8a5d1785af1907bd07d1c8ce4a9e3ea1685bdd9a77904dab3557"
   },
   "src/L2/L2StandardBridge.sol": {
     "initCodeHash": "0x651eed10044d0b19b7e4eba864345df15e252be1401f39a552ec0d2f9c4df064",
diff --git a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
index dd01ff5cd2d3..bd9b31c1e589 100644
--- a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
@@ -28,8 +28,8 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
     ISuperchainConfig public superchainConfig;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.1.1-beta.4
-    string public constant version = "2.1.1-beta.4";
+    /// @custom:semver 2.2.0-beta.1
+    string public constant version = "2.2.0-beta.1";
 
     /// @notice Constructs the L1ERC721Bridge contract.
     constructor() ERC721Bridge() {
@@ -107,8 +107,8 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
         require(_remoteToken != address(0), "L1ERC721Bridge: remote token cannot be address(0)");
 
         // Construct calldata for _l2Token.finalizeBridgeERC721(_to, _tokenId)
-        bytes memory message = abi.encodeWithSelector(
-            IL2ERC721Bridge.finalizeBridgeERC721.selector, _remoteToken, _localToken, _from, _to, _tokenId, _extraData
+        bytes memory message = abi.encodeCall(
+            IL2ERC721Bridge.finalizeBridgeERC721, (_remoteToken, _localToken, _from, _to, _tokenId, _extraData)
         );
 
         // Lock token into bridge
diff --git a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
index 950f25203981..7db9cc17aaa7 100644
--- a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
@@ -26,8 +26,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 ///         wait for the one-week challenge period to elapse before their Optimism-native NFT
 ///         can be refunded on L2.
 contract L2ERC721Bridge is ERC721Bridge, ISemver {
-    /// @custom:semver 1.7.1-beta.3
-    string public constant version = "1.7.1-beta.3";
+    /// @custom:semver 1.8.0-beta.1
+    string public constant version = "1.8.0-beta.1";
 
     /// @notice Constructs the L2ERC721Bridge contract.
     constructor() ERC721Bridge() {
@@ -117,8 +117,8 @@ contract L2ERC721Bridge is ERC721Bridge, ISemver {
         // slither-disable-next-line reentrancy-events
         IOptimismMintableERC721(_localToken).burn(_from, _tokenId);
 
-        bytes memory message = abi.encodeWithSelector(
-            IL1ERC721Bridge.finalizeBridgeERC721.selector, remoteToken, _localToken, _from, _to, _tokenId, _extraData
+        bytes memory message = abi.encodeCall(
+            IL1ERC721Bridge.finalizeBridgeERC721, (remoteToken, _localToken, _from, _to, _tokenId, _extraData)
         );
 
         // Send message to L1 bridge
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 81b128f229b2..96238b41b367 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -118,3 +118,17 @@ rules:
       exclude:
         - packages/contracts-bedrock/test
         - packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
+
+  - id: sol-style-use-abi-encodecall
+    languages: [solidity]
+    severity: ERROR
+    message: Use abi.encodeCall instead of abi.encodeWithSelector
+    patterns:
+      - pattern: |
+          abi.encodeWithSelector(...);
+    paths:
+      exclude:
+        - packages/contracts-bedrock/test
+        - packages/contracts-bedrock/src/L1/OPContractsManager.sol
+        - packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+        - packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol

From 38db5117cd4cc4ff97be0701049f8dd98bd56cb8 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 25 Oct 2024 03:29:13 +0100
Subject: [PATCH 029/451] update test folder so segrep require and revert
 checks pass (#12628)

* update test folder so that smegrep require and revert checks pass for it

* fix test
---
 packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol | 4 ++--
 packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol      | 4 ++--
 .../contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol | 5 ++++-
 .../contracts-bedrock/test/dispute/FaultDisputeGame.t.sol    | 2 +-
 .../contracts-bedrock/test/invariants/FaultDisputeGame.t.sol | 2 +-
 .../OptimismSuperchainERC20/handlers/Protocol.t.sol          | 4 +++-
 .../helpers/MockL2ToL2CrossDomainMessenger.t.sol             | 2 +-
 packages/contracts-bedrock/test/mocks/Callers.sol            | 2 +-
 .../test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol   | 2 +-
 packages/contracts-bedrock/test/universal/Proxy.t.sol        | 4 ++--
 semgrep/sol-rules.yaml                                       | 2 --
 11 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index 0f2c51b4bf3b..50e1ac91c977 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -80,7 +80,7 @@ contract SystemConfigInterop_Test is CommonTest {
 
     /// @dev Tests that adding a dependency as not the dependency manager reverts.
     function testFuzz_addDependency_notDependencyManager_reverts(uint256 _chainId) public {
-        require(alice != _systemConfigInterop().dependencyManager(), "SystemConfigInterop_Test-100");
+        require(alice != _systemConfigInterop().dependencyManager(), "SystemConfigInterop_Test: 100");
         vm.expectRevert("SystemConfig: caller is not the dependency manager");
         vm.prank(alice);
         _systemConfigInterop().addDependency(_chainId);
@@ -102,7 +102,7 @@ contract SystemConfigInterop_Test is CommonTest {
 
     /// @dev Tests that removing a dependency as not the dependency manager reverts.
     function testFuzz_removeDependency_notDependencyManager_reverts(uint256 _chainId) public {
-        require(alice != _systemConfigInterop().dependencyManager(), "SystemConfigInterop_Test-100");
+        require(alice != _systemConfigInterop().dependencyManager(), "SystemConfigInterop_Test: 100");
         vm.expectRevert("SystemConfig: caller is not the dependency manager");
         vm.prank(alice);
         _systemConfigInterop().removeDependency(_chainId);
diff --git a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
index f81d96b040f4..ed4d598f4392 100644
--- a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
+++ b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
@@ -131,7 +131,7 @@ contract GasPriceOracleEcotone_Test is GasPriceOracle_Test {
         // Execute the function call
         vm.prank(depositor);
         (bool success,) = address(l1Block).call(calldataPacked);
-        require(success, "Function call failed");
+        require(success, "GasPriceOracleEcotone_Test: Function call failed");
     }
 
     /// @dev Tests that `setEcotone` is only callable by the depositor.
@@ -222,7 +222,7 @@ contract GasPriceOracleFjordActive_Test is GasPriceOracle_Test {
 
         vm.prank(depositor);
         (bool success,) = address(l1Block).call(calldataPacked);
-        require(success, "Function call failed");
+        require(success, "GasPriceOracleFjordActive_Test: Function call failed");
     }
 
     /// @dev Tests that `setFjord` cannot be called when Fjord is already activate
diff --git a/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol b/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol
index b5dbac76f6c6..c3cdf2c58d44 100644
--- a/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol
+++ b/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol
@@ -138,7 +138,10 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
     function test_setAnchorState_invalidGame_fails() public {
         // Confirm that the anchor state is older than the game state.
         (Hash root, uint256 l2BlockNumber) = anchorStateRegistry.anchors(gameProxy.gameType());
-        require(l2BlockNumber < gameProxy.l2BlockNumber(), "l2BlockNumber < gameProxy.l2BlockNumber()");
+        require(
+            l2BlockNumber < gameProxy.l2BlockNumber(),
+            "AnchorStateRegistry_TryUpdateAnchorState_Test: l2BlockNumber < gameProxy.l2BlockNumber()"
+        );
 
         // Mock the state that we want.
         vm.mockCall(
diff --git a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
index 8bb25273972a..00f3a8b19f9c 100644
--- a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
@@ -2641,7 +2641,7 @@ contract FaultDispute_1v1_Actors_Test is FaultDisputeGame_Init {
             (uint256 numMovesA,) = dishonest.move();
             (uint256 numMovesB, bool success) = honest.move();
 
-            require(success, "Honest actor's moves should always be successful");
+            require(success, "FaultDispute_1v1_Actors_Test: Honest actor's moves should always be successful");
 
             // If both actors have run out of moves, we're done.
             if (numMovesA == 0 && numMovesB == 0) break;
diff --git a/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol b/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol
index 49bf2a106bbf..94b46930ad49 100644
--- a/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol
@@ -69,7 +69,7 @@ contract FaultDisputeGame_Solvency_Invariant is FaultDisputeGame_Init {
             assertEq(DEFAULT_SENDER.balance, type(uint96).max - rootBond);
             assertEq(address(actor).balance, actor.totalBonded() + rootBond);
         } else {
-            revert("unreachable");
+            revert("FaultDisputeGame_Solvency_Invariant: unreachable");
         }
 
         assertEq(address(gameProxy).balance, 0);
diff --git a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol
index 770be029bbbe..490a38bec1cf 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol
+++ b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/handlers/Protocol.t.sol
@@ -157,7 +157,9 @@ contract ProtocolHandler is TestBase, StdUtils, Actors {
         bytes32 realSalt = keccak256(abi.encode(remoteToken, name, symbol, decimals));
         // Foundry invariant erroneously show other unrelated invariant breaking
         // when this deployment fails due to a create2 collision, so we revert eagerly instead
-        require(MESSENGER.superTokenAddresses(chainId, realSalt) == address(0), "skip duplicate deployment");
+        require(
+            MESSENGER.superTokenAddresses(chainId, realSalt) == address(0), "ProtocolHandler: skip duplicate deployment"
+        );
 
         // what we use in the tests to walk around two contracts needing two different addresses
         // tbf we could be using CREATE1, but this feels more verbose
diff --git a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol
index 2d4a57c46c3c..94f275e26551 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/helpers/MockL2ToL2CrossDomainMessenger.t.sol
@@ -89,7 +89,7 @@ contract MockL2ToL2CrossDomainMessenger {
     function sendMessage(uint256 chainId, address, /*recipient*/ bytes calldata data) external {
         address crossChainRecipient = superTokenAddresses[chainId][superTokenInitDeploySalts[msg.sender]];
         if (crossChainRecipient == msg.sender) {
-            require(false, "same chain");
+            require(false, "MockL2ToL2CrossDomainMessenger: same chain");
         }
         (address recipient, uint256 amount) = _decodePayload(data);
 
diff --git a/packages/contracts-bedrock/test/mocks/Callers.sol b/packages/contracts-bedrock/test/mocks/Callers.sol
index aa7a2dc8b228..b8dd70df15e1 100644
--- a/packages/contracts-bedrock/test/mocks/Callers.sol
+++ b/packages/contracts-bedrock/test/mocks/Callers.sol
@@ -84,7 +84,7 @@ contract ConfigurableCaller {
 /// @dev Any call will revert
 contract Reverter {
     function doRevert() public pure {
-        revert("Reverter reverted");
+        revert("Reverter: Reverter reverted");
     }
 
     fallback() external {
diff --git a/packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol b/packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol
index ac0c264d3038..89536e2e4493 100644
--- a/packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol
+++ b/packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol
@@ -93,7 +93,7 @@ contract CompatibilityFallbackHandler is DefaultCallbackHandler, ISignatureValid
         GnosisSafe safe = GnosisSafe(payable(msg.sender));
         bytes32 messageHash = getMessageHashForSafe(safe, _data);
         if (_signature.length == 0) {
-            require(safe.signedMessages(messageHash) != 0, "Hash not approved");
+            require(safe.signedMessages(messageHash) != 0, "CompatibilityFallbackHandler: Hash not approved");
         } else {
             safe.checkSignatures(messageHash, _data, _signature);
         }
diff --git a/packages/contracts-bedrock/test/universal/Proxy.t.sol b/packages/contracts-bedrock/test/universal/Proxy.t.sol
index 66c3f1d24268..90d70d261775 100644
--- a/packages/contracts-bedrock/test/universal/Proxy.t.sol
+++ b/packages/contracts-bedrock/test/universal/Proxy.t.sol
@@ -19,7 +19,7 @@ contract SimpleStorage {
 
 contract Clasher {
     function upgradeTo(address) external pure {
-        revert("upgradeTo");
+        revert("Clasher: upgradeTo");
     }
 }
 
@@ -228,7 +228,7 @@ contract Proxy_Test is Test {
         // not as the owner so that the call passes through.
         // The implementation will revert so we can be
         // sure that the call passed through.
-        vm.expectRevert(bytes("upgradeTo"));
+        vm.expectRevert(bytes("Clasher: upgradeTo"));
         proxy.upgradeTo(address(0));
 
         {
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 96238b41b367..08cc5f74685d 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -94,7 +94,6 @@ rules:
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
     paths:
       exclude:
-        - packages/contracts-bedrock/test
         - packages/contracts-bedrock/src/libraries/Bytes.sol
         - packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
         - packages/contracts-bedrock/src/cannon/MIPS.sol
@@ -116,7 +115,6 @@ rules:
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
     paths:
       exclude:
-        - packages/contracts-bedrock/test
         - packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
 
   - id: sol-style-use-abi-encodecall

From 9f22034fe49f301532f362b5d2dd02017bb4556a Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Fri, 25 Oct 2024 15:45:36 +0800
Subject: [PATCH 030/451] do forge clean when make clean (#12635)

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 641e4b11699e..791eba38d453 100644
--- a/Makefile
+++ b/Makefile
@@ -164,6 +164,7 @@ mod-tidy: ## Cleans up unused dependencies in Go modules
 
 clean: ## Removes all generated files under bin/
 	rm -rf ./bin
+	cd packages/contracts-bedrock/ && forge clean
 .PHONY: clean
 
 nuke: clean devnet-clean ## Completely clean the project directory

From da4c33c50e6ecbada5704477132fc35a9e8ad15b Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 25 Oct 2024 20:47:33 +0700
Subject: [PATCH 031/451] op-supervisor: Cross-safe updates [rebased] (#12624)

* op-supervisor: cross-safe-updates PR squashed

op-supervisor: experimental cross-safety, with hazard detection

tweak: Add some errors/error returns in backend/cross.

wip: Chain index <> ID mapping.

fix: Check parent instead of re-checking hazardBlock.

Remove Hazard Work

Write missing DB Bindings OpenBlock, LocallyDerivedFrom, CrossDerivedFrom

Configurable WorkFn for Workers

op-supervisor: move chain-index <> chain ID translation into dependency set, fix some interfaces

op-supervisor: update cross-safety worker routine

op-supervisor: update more error handling

op-supervisor: move errors to types package

op-supervisor: check CanExecuteAt and CanInitiateAt

op-supervisor: determine cross-safe candidate and L1 scope, and more fixes

todo L1 scope increment

op-supervisor: cross-safe L1 scope bump

op-supervisor: dependency set getter

op-supervisor: L1 scope increment fix

op-supervisor: fix cross-safe updates typing

op-node: signal L1 traversal of derivation to supervisor

op-supervisor: fromda fixes and tests

op-supervisor: fix OpenBlock, fix/add missing interface methods, hook up cross-safe worker routines

OpenBlock to return map[uint32]ExecutingMessage

Add Frontier Unit Tests

fix WithParent panic

op-node: register L1 traversal with op-supervisor

op-node,op-supervisor: add logging, temp work around for interop local-safe updates

Add safe_start_test, unsafe_start_test

Add safe_update_test and unsafe_update_test

add worker_test

op-supervisor: fix cross-safe L1 scope bumping

op-supervisor: fix logs DB test

Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
Co-authored-by: Tyler Smith <mail@tcry.pt>

* op-node: fix interop deriver test

* op-e2e: fix interop action test

* op-supervisor: improve map init

* op-node: link interop TODO comment to issue, in engine events emitter

* op-supervisor: cleanup Worker instances of tests

---------

Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
Co-authored-by: Tyler Smith <mail@tcry.pt>
---
 op-e2e/actions/interop/interop_test.go        |  22 +-
 op-node/rollup/derive/deriver.go              |   3 +-
 op-node/rollup/engine/events.go               |  14 +
 op-node/rollup/interop/interop.go             |  14 +-
 op-node/rollup/interop/interop_test.go        |   2 +-
 op-supervisor/supervisor/backend/backend.go   |  55 ++-
 .../supervisor/backend/cross/safe_frontier.go |  59 +++
 .../backend/cross/safe_frontier_test.go       | 201 +++++++++
 .../supervisor/backend/cross/safe_start.go    | 104 +++++
 .../backend/cross/safe_start_test.go          | 341 +++++++++++++++
 .../supervisor/backend/cross/safe_update.go   | 116 +++++
 .../backend/cross/safe_update_test.go         | 399 ++++++++++++++++++
 .../backend/cross/unsafe_frontier.go          |  63 +++
 .../backend/cross/unsafe_frontier_test.go     | 130 ++++++
 .../supervisor/backend/cross/unsafe_start.go  | 100 +++++
 .../backend/cross/unsafe_start_test.go        | 280 ++++++++++++
 .../supervisor/backend/cross/unsafe_update.go |  79 ++++
 .../backend/cross/unsafe_update_test.go       | 212 ++++++++++
 .../supervisor/backend/cross/worker.go        | 103 +++++
 .../supervisor/backend/cross/worker_test.go   | 106 +++++
 .../backend/processors/chain_processor.go     |   6 +-
 .../backend/processors/log_processor_test.go  |   2 +-
 22 files changed, 2390 insertions(+), 21 deletions(-)
 create mode 100644 op-supervisor/supervisor/backend/cross/safe_frontier.go
 create mode 100644 op-supervisor/supervisor/backend/cross/safe_frontier_test.go
 create mode 100644 op-supervisor/supervisor/backend/cross/safe_start.go
 create mode 100644 op-supervisor/supervisor/backend/cross/safe_start_test.go
 create mode 100644 op-supervisor/supervisor/backend/cross/safe_update.go
 create mode 100644 op-supervisor/supervisor/backend/cross/safe_update_test.go
 create mode 100644 op-supervisor/supervisor/backend/cross/unsafe_frontier.go
 create mode 100644 op-supervisor/supervisor/backend/cross/unsafe_frontier_test.go
 create mode 100644 op-supervisor/supervisor/backend/cross/unsafe_start.go
 create mode 100644 op-supervisor/supervisor/backend/cross/unsafe_start_test.go
 create mode 100644 op-supervisor/supervisor/backend/cross/unsafe_update.go
 create mode 100644 op-supervisor/supervisor/backend/cross/unsafe_update_test.go
 create mode 100644 op-supervisor/supervisor/backend/cross/worker.go
 create mode 100644 op-supervisor/supervisor/backend/cross/worker_test.go

diff --git a/op-e2e/actions/interop/interop_test.go b/op-e2e/actions/interop/interop_test.go
index c345404907b0..b04a07da4826 100644
--- a/op-e2e/actions/interop/interop_test.go
+++ b/op-e2e/actions/interop/interop_test.go
@@ -41,6 +41,18 @@ func TestInteropVerifier(gt *testing.T) {
 		l1Miner.L1Client(t, sd.RollupCfg), l1Miner.BlobStore(), &sync.Config{},
 		helpers.WithInteropBackend(verMockBackend))
 
+	// Genesis block will be registered as local-safe when we first trigger the derivation pipeline
+	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+		require.Equal(t, sd.RollupCfg.Genesis.L1, derivedFrom.ID())
+		require.Equal(t, sd.RollupCfg.Genesis.L2, lastDerived.ID())
+		return nil
+	}
+	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+		require.Equal(t, sd.RollupCfg.Genesis.L1, derivedFrom.ID())
+		require.Equal(t, sd.RollupCfg.Genesis.L2, lastDerived.ID())
+		return nil
+	}
+
 	seq.ActL2PipelineFull(t)
 	ver.ActL2PipelineFull(t)
 
@@ -93,8 +105,10 @@ func TestInteropVerifier(gt *testing.T) {
 
 	// Sync the L1 block, to verify the L2 block as local-safe.
 	seqMockBackend.UpdateLocalUnsafeFn = nil
+	nextL2 := uint64(0)
 	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
-		require.Equal(t, uint64(1), lastDerived.Number)
+		require.Equal(t, nextL2, lastDerived.Number)
+		nextL2 += 1
 		return nil
 	}
 	seqMockBackend.SafeViewFn = func(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error) {
@@ -106,6 +120,7 @@ func TestInteropVerifier(gt *testing.T) {
 	seq.ActL1HeadSignal(t)
 	l1Head := seq.SyncStatus().HeadL1
 	seq.ActL2PipelineFull(t)
+	require.Equal(t, uint64(2), nextL2)
 
 	status = seq.SyncStatus()
 	require.Equal(t, uint64(1), status.UnsafeL2.Number)
@@ -143,8 +158,10 @@ func TestInteropVerifier(gt *testing.T) {
 		require.Equal(t, uint64(1), head.Number)
 		return nil
 	}
+	nextL2 = 0
 	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
-		require.Equal(t, uint64(1), lastDerived.Number)
+		require.Equal(t, nextL2, lastDerived.Number)
+		nextL2 += 1
 		require.Equal(t, l1Head.ID(), derivedFrom.ID())
 		return nil
 	}
@@ -163,6 +180,7 @@ func TestInteropVerifier(gt *testing.T) {
 	}
 	ver.ActL1HeadSignal(t)
 	ver.ActL2PipelineFull(t)
+	require.Equal(t, uint64(2), nextL2)
 	status = ver.SyncStatus()
 	require.Equal(t, uint64(1), status.UnsafeL2.Number, "synced the block")
 	require.Equal(t, uint64(0), status.CrossUnsafeL2.Number, "not cross-verified yet")
diff --git a/op-node/rollup/derive/deriver.go b/op-node/rollup/derive/deriver.go
index 760891648524..4a897f4ee4ec 100644
--- a/op-node/rollup/derive/deriver.go
+++ b/op-node/rollup/derive/deriver.go
@@ -20,6 +20,7 @@ func (d DeriverIdleEvent) String() string {
 
 type DeriverL1StatusEvent struct {
 	Origin eth.L1BlockRef
+	LastL2 eth.L2BlockRef
 }
 
 func (d DeriverL1StatusEvent) String() string {
@@ -99,7 +100,7 @@ func (d *PipelineDeriver) OnEvent(ev event.Event) bool {
 		attrib, err := d.pipeline.Step(d.ctx, x.PendingSafe)
 		postOrigin := d.pipeline.Origin()
 		if preOrigin != postOrigin {
-			d.emitter.Emit(DeriverL1StatusEvent{Origin: postOrigin})
+			d.emitter.Emit(DeriverL1StatusEvent{Origin: postOrigin, LastL2: x.PendingSafe})
 		}
 		if err == io.EOF {
 			d.pipeline.log.Debug("Derivation process went idle", "progress", d.pipeline.Origin(), "err", err)
diff --git a/op-node/rollup/engine/events.go b/op-node/rollup/engine/events.go
index b05410a6dcef..73d0a77abb52 100644
--- a/op-node/rollup/engine/events.go
+++ b/op-node/rollup/engine/events.go
@@ -98,6 +98,15 @@ func (ev PendingSafeUpdateEvent) String() string {
 	return "pending-safe-update"
 }
 
+type InteropPendingSafeChangedEvent struct {
+	Ref         eth.L2BlockRef
+	DerivedFrom eth.L1BlockRef
+}
+
+func (ev InteropPendingSafeChangedEvent) String() string {
+	return "interop-pending-safe-changed"
+}
+
 // PromotePendingSafeEvent signals that a block can be marked as pending-safe, and/or safe.
 type PromotePendingSafeEvent struct {
 	Ref         eth.L2BlockRef
@@ -407,6 +416,11 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 				DerivedFrom: x.DerivedFrom,
 			})
 		}
+		// TODO(#12646): temporary interop work-around, assumes Holocene local-safe progression behavior.
+		d.emitter.Emit(InteropPendingSafeChangedEvent{
+			Ref:         x.Ref,
+			DerivedFrom: x.DerivedFrom,
+		})
 	case PromoteLocalSafeEvent:
 		d.ec.SetLocalSafeHead(x.Ref)
 		d.emitter.Emit(LocalSafeUpdateEvent(x))
diff --git a/op-node/rollup/interop/interop.go b/op-node/rollup/interop/interop.go
index 904f93d94112..2421fcd31377 100644
--- a/op-node/rollup/interop/interop.go
+++ b/op-node/rollup/interop/interop.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/event"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/finality"
@@ -83,10 +84,17 @@ func (d *InteropDeriver) OnEvent(ev event.Event) bool {
 	switch x := ev.(type) {
 	case engine.UnsafeUpdateEvent:
 		d.onLocalUnsafeUpdate(x)
-	case engine.LocalSafeUpdateEvent:
-		d.onLocalSafeUpdate(x)
+	case engine.InteropPendingSafeChangedEvent:
+		d.onInteropPendingSafeChangedEvent(x)
 	case finality.FinalizeL1Event:
 		d.onFinalizedL1(x)
+	case derive.DeriverL1StatusEvent:
+		d.log.Debug("deriver L1 traversal event", "l1", x.Origin, "l2", x.LastL2)
+		// Register traversal of L1, repeat the last local-safe L2
+		d.onInteropPendingSafeChangedEvent(engine.InteropPendingSafeChangedEvent{
+			Ref:         x.LastL2,
+			DerivedFrom: x.Origin,
+		})
 	case engine.CrossUnsafeUpdateEvent:
 		if err := d.onCrossUnsafe(x); err != nil {
 			d.log.Error("Failed to process cross-unsafe update", "err", err)
@@ -117,7 +125,7 @@ func (d *InteropDeriver) onLocalUnsafeUpdate(x engine.UnsafeUpdateEvent) {
 	d.emitter.Emit(engine.RequestCrossUnsafeEvent{})
 }
 
-func (d *InteropDeriver) onLocalSafeUpdate(x engine.LocalSafeUpdateEvent) {
+func (d *InteropDeriver) onInteropPendingSafeChangedEvent(x engine.InteropPendingSafeChangedEvent) {
 	d.log.Debug("Signaling derived-from update to interop backend", "derivedFrom", x.DerivedFrom, "block", x.Ref)
 	ctx, cancel := context.WithTimeout(d.driverCtx, rpcTimeout)
 	defer cancel()
diff --git a/op-node/rollup/interop/interop_test.go b/op-node/rollup/interop/interop_test.go
index 4078e4881a07..3dc0e7708d04 100644
--- a/op-node/rollup/interop/interop_test.go
+++ b/op-node/rollup/interop/interop_test.go
@@ -93,7 +93,7 @@ func TestInteropDeriver(t *testing.T) {
 		derivedFrom := testutils.RandomBlockRef(rng)
 		localSafe := testutils.RandomL2BlockRef(rng)
 		interopBackend.ExpectUpdateLocalSafe(chainID, derivedFrom, localSafe, nil)
-		interopDeriver.OnEvent(engine.LocalSafeUpdateEvent{
+		interopDeriver.OnEvent(engine.InteropPendingSafeChangedEvent{
 			Ref:         localSafe,
 			DerivedFrom: derivedFrom,
 		})
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 506bcefd67c0..898157558931 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/cross"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/processors"
@@ -43,6 +44,12 @@ type SupervisorBackend struct {
 	// chainProcessors are notified of new unsafe blocks, and add the unsafe log events data into the events DB
 	chainProcessors map[types.ChainID]*processors.ChainProcessor
 
+	// crossSafeProcessors take local-safe data and promote it to cross-safe when verified
+	crossSafeProcessors map[types.ChainID]*cross.Worker
+
+	// crossUnsafeProcessors take local-unsafe data and promote it to cross-unsafe when verified
+	crossUnsafeProcessors map[types.ChainID]*cross.Worker
+
 	// synchronousProcessors disables background-workers,
 	// requiring manual triggers for the backend to process anything.
 	synchronousProcessors bool
@@ -71,18 +78,18 @@ func NewSupervisorBackend(ctx context.Context, logger log.Logger, m Metrics, cfg
 
 	// create initial per-chain resources
 	chainsDBs := db.NewChainsDB(logger, depSet)
-	chainProcessors := make(map[types.ChainID]*processors.ChainProcessor, len(chains))
-	chainMetrics := make(map[types.ChainID]*chainMetrics, len(chains))
 
 	// create the supervisor backend
 	super := &SupervisorBackend{
-		logger:          logger,
-		m:               m,
-		dataDir:         cfg.Datadir,
-		depSet:          depSet,
-		chainDBs:        chainsDBs,
-		chainProcessors: chainProcessors,
-		chainMetrics:    chainMetrics,
+		logger:                logger,
+		m:                     m,
+		dataDir:               cfg.Datadir,
+		depSet:                depSet,
+		chainDBs:              chainsDBs,
+		chainProcessors:       make(map[types.ChainID]*processors.ChainProcessor, len(chains)),
+		chainMetrics:          make(map[types.ChainID]*chainMetrics, len(chains)),
+		crossUnsafeProcessors: make(map[types.ChainID]*cross.Worker, len(chains)),
+		crossSafeProcessors:   make(map[types.ChainID]*cross.Worker, len(chains)),
 		// For testing we can avoid running the processors.
 		synchronousProcessors: cfg.SynchronousProcessors,
 	}
@@ -117,6 +124,17 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 		su.chainProcessors[chainID] = chainProcessor
 	}
 
+	// initialize all cross-unsafe processors
+	for _, chainID := range chains {
+		worker := cross.NewCrossUnsafeWorker(su.logger, chainID, su.chainDBs)
+		su.crossUnsafeProcessors[chainID] = worker
+	}
+	// initialize all cross-safe processors
+	for _, chainID := range chains {
+		worker := cross.NewCrossSafeWorker(su.logger, chainID, su.chainDBs)
+		su.crossSafeProcessors[chainID] = worker
+	}
+
 	// the config has some RPC connections to attach to the chain-processors
 	for _, rpc := range cfg.L2RPCs {
 		err := su.attachRPC(ctx, rpc)
@@ -231,6 +249,12 @@ func (su *SupervisorBackend) Start(ctx context.Context) error {
 		for _, processor := range su.chainProcessors {
 			processor.StartBackground()
 		}
+		for _, worker := range su.crossUnsafeProcessors {
+			worker.StartBackground()
+		}
+		for _, worker := range su.crossSafeProcessors {
+			worker.StartBackground()
+		}
 	}
 
 	return nil
@@ -249,6 +273,19 @@ func (su *SupervisorBackend) Stop(ctx context.Context) error {
 		processor.Close()
 	}
 	clear(su.chainProcessors)
+
+	for id, worker := range su.crossUnsafeProcessors {
+		su.logger.Info("stopping cross-unsafe processor", "chainID", id)
+		worker.Close()
+	}
+	clear(su.crossUnsafeProcessors)
+
+	for id, worker := range su.crossSafeProcessors {
+		su.logger.Info("stopping cross-safe processor", "chainID", id)
+		worker.Close()
+	}
+	clear(su.crossSafeProcessors)
+
 	// close the databases
 	return su.chainDBs.Close()
 }
diff --git a/op-supervisor/supervisor/backend/cross/safe_frontier.go b/op-supervisor/supervisor/backend/cross/safe_frontier.go
new file mode 100644
index 000000000000..31b48843fd9a
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/safe_frontier.go
@@ -0,0 +1,59 @@
+package cross
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type SafeFrontierCheckDeps interface {
+	CandidateCrossSafe(chain types.ChainID) (derivedFromScope, crossSafe eth.BlockRef, err error)
+
+	CrossDerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error)
+
+	DependencySet() depset.DependencySet
+}
+
+// HazardSafeFrontierChecks verifies all the hazard blocks are either:
+//   - already cross-safe.
+//   - the first (if not first: local blocks to verify before proceeding)
+//     local-safe block, after the cross-safe block.
+func HazardSafeFrontierChecks(d SafeFrontierCheckDeps, inL1DerivedFrom eth.BlockID, hazards map[types.ChainIndex]types.BlockSeal) error {
+	depSet := d.DependencySet()
+	for hazardChainIndex, hazardBlock := range hazards {
+		hazardChainID, err := depSet.ChainIDFromIndex(hazardChainIndex)
+		if err != nil {
+			if errors.Is(err, types.ErrUnknownChain) {
+				err = fmt.Errorf("cannot cross-safe verify block %s of unknown chain index %s: %w", hazardBlock, hazardChainIndex, types.ErrConflict)
+			}
+			return err
+		}
+		initDerivedFrom, err := d.CrossDerivedFrom(hazardChainID, hazardBlock.ID())
+		if err != nil {
+			if errors.Is(err, types.ErrFuture) {
+				// If not in cross-safe scope, then check if it's the candidate cross-safe block.
+				initDerivedFrom, initSelf, err := d.CandidateCrossSafe(hazardChainID)
+				if err != nil {
+					return fmt.Errorf("failed to determine cross-safe candidate block of hazard dependency %s (chain %s): %w", hazardBlock, hazardChainID, err)
+				}
+				if initSelf.Number == hazardBlock.Number && initSelf.ID() != hazardBlock.ID() {
+					return fmt.Errorf("expected block %s (chain %d) does not match candidate local-safe block %s: %w",
+						hazardBlock, hazardChainID, initSelf, types.ErrConflict)
+				}
+				if initDerivedFrom.Number > inL1DerivedFrom.Number {
+					return fmt.Errorf("local-safe hazard block %s derived from L1 block %s is after scope %s: %w",
+						hazardBlock.ID(), initDerivedFrom, inL1DerivedFrom, types.ErrOutOfScope)
+				}
+			} else {
+				return fmt.Errorf("failed to determine cross-derived of hazard block %s (chain %s): %w", hazardBlock, hazardChainID, err)
+			}
+		} else if initDerivedFrom.Number > inL1DerivedFrom.Number {
+			return fmt.Errorf("cross-safe hazard block %s derived from L1 block %s is after scope %s: %w",
+				hazardBlock.ID(), initDerivedFrom, inL1DerivedFrom, types.ErrOutOfScope)
+		}
+	}
+	return nil
+}
diff --git a/op-supervisor/supervisor/backend/cross/safe_frontier_test.go b/op-supervisor/supervisor/backend/cross/safe_frontier_test.go
new file mode 100644
index 000000000000..6848acf841cd
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/safe_frontier_test.go
@@ -0,0 +1,201 @@
+package cross
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHazardSafeFrontierChecks(t *testing.T) {
+	t.Run("empty hazards", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{}
+		l1DerivedFrom := eth.BlockID{}
+		hazards := map[types.ChainIndex]types.BlockSeal{}
+		// when there are no hazards,
+		// no work is done, and no error is returned
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.NoError(t, err)
+	})
+	t.Run("unknown chain", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{
+			deps: mockDependencySet{
+				chainIDFromIndexfn: func() (types.ChainID, error) {
+					return types.ChainID{}, types.ErrUnknownChain
+				},
+			},
+		}
+		l1DerivedFrom := eth.BlockID{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		// when there is one hazard, and ChainIDFromIndex returns ErrUnknownChain,
+		// an error is returned as a ErrConflict
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.ErrorIs(t, err, types.ErrConflict)
+	})
+	t.Run("initDerivedFrom in scope", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{}
+		sfcd.crossDerivedFromFn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 1}, nil
+		}
+		l1DerivedFrom := eth.BlockID{Number: 2}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		// when there is one hazard, and CrossDerivedFrom returns a BlockSeal within scope
+		// (ie the hazard's block number is less than or equal to the derivedFrom block number),
+		// no error is returned
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.NoError(t, err)
+	})
+	t.Run("initDerivedFrom out of scope", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{}
+		sfcd.crossDerivedFromFn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 3}, nil
+		}
+		l1DerivedFrom := eth.BlockID{Number: 2}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		// when there is one hazard, and CrossDerivedFrom returns a BlockSeal out of scope
+		// (ie the hazard's block number is greater than the derivedFrom block number),
+		// an error is returned as a ErrOutOfScope
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.ErrorIs(t, err, types.ErrOutOfScope)
+	})
+	t.Run("errFuture: candidate cross safe failure", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{}
+		sfcd.crossDerivedFromFn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 3}, types.ErrFuture
+		}
+		sfcd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{},
+				eth.BlockRef{Number: 3, Hash: common.BytesToHash([]byte{0x01})},
+				errors.New("some error")
+		}
+		l1DerivedFrom := eth.BlockID{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		// when there is one hazard, and CrossDerivedFrom returns an ErrFuture,
+		// and CandidateCrossSafe returns an error,
+		// the error from CandidateCrossSafe is returned
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("errFuture: expected block does not match candidate", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{}
+		sfcd.crossDerivedFromFn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{}, types.ErrFuture
+		}
+		sfcd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{},
+				eth.BlockRef{Number: 3, Hash: common.BytesToHash([]byte{0x01})},
+				nil
+		}
+		l1DerivedFrom := eth.BlockID{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {Number: 3, Hash: common.BytesToHash([]byte{0x02})}}
+		// when there is one hazard, and CrossDerivedFrom returns an ErrFuture,
+		// and CandidateCrossSafe returns a candidate that does not match the hazard,
+		// (ie the candidate's block number is the same as the hazard's block number, but the hashes are different),
+		// an error is returned as a ErrConflict
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.ErrorIs(t, err, types.ErrConflict)
+	})
+	t.Run("errFuture: local-safe hazard out of scope", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{}
+		sfcd.crossDerivedFromFn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{}, types.ErrFuture
+		}
+		sfcd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{Number: 9},
+				eth.BlockRef{},
+				nil
+		}
+		l1DerivedFrom := eth.BlockID{Number: 8}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {Number: 3, Hash: common.BytesToHash([]byte{0x02})}}
+		// when there is one hazard, and CrossDerivedFrom returns an ErrFuture,
+		// and the initDerivedFrom is out of scope,
+		// an error is returned as a ErrOutOfScope
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.ErrorIs(t, err, types.ErrOutOfScope)
+	})
+	t.Run("CrossDerivedFrom Error", func(t *testing.T) {
+		sfcd := &mockSafeFrontierCheckDeps{}
+		sfcd.crossDerivedFromFn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		sfcd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{Number: 9},
+				eth.BlockRef{},
+				nil
+		}
+		l1DerivedFrom := eth.BlockID{Number: 8}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {Number: 3, Hash: common.BytesToHash([]byte{0x02})}}
+		// when there is one hazard, and CrossDerivedFrom returns an ErrFuture,
+		// and the initDerivedFrom is out of scope,
+		// an error is returned as a ErrOutOfScope
+		err := HazardSafeFrontierChecks(sfcd, l1DerivedFrom, hazards)
+		require.ErrorContains(t, err, "some error")
+	})
+}
+
+type mockSafeFrontierCheckDeps struct {
+	deps                 mockDependencySet
+	candidateCrossSafeFn func() (derivedFromScope, crossSafe eth.BlockRef, err error)
+	crossDerivedFromFn   func() (derivedFrom types.BlockSeal, err error)
+}
+
+func (m *mockSafeFrontierCheckDeps) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, crossSafe eth.BlockRef, err error) {
+	if m.candidateCrossSafeFn != nil {
+		return m.candidateCrossSafeFn()
+	}
+	return eth.BlockRef{}, eth.BlockRef{}, nil
+}
+
+func (m *mockSafeFrontierCheckDeps) CrossDerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
+	if m.crossDerivedFromFn != nil {
+		return m.crossDerivedFromFn()
+	}
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockSafeFrontierCheckDeps) DependencySet() depset.DependencySet {
+	return m.deps
+}
+
+type mockDependencySet struct {
+	chainIDFromIndexfn func() (types.ChainID, error)
+	canExecuteAtfn     func() (bool, error)
+	canInitiateAtfn    func() (bool, error)
+}
+
+func (m mockDependencySet) CanExecuteAt(chain types.ChainID, timestamp uint64) (bool, error) {
+	if m.canExecuteAtfn != nil {
+		return m.canExecuteAtfn()
+	}
+	return true, nil
+}
+
+func (m mockDependencySet) CanInitiateAt(chain types.ChainID, timestamp uint64) (bool, error) {
+	if m.canInitiateAtfn != nil {
+		return m.canInitiateAtfn()
+	}
+	return true, nil
+}
+
+func (m mockDependencySet) ChainIDFromIndex(index types.ChainIndex) (types.ChainID, error) {
+	if m.chainIDFromIndexfn != nil {
+		return m.chainIDFromIndexfn()
+	}
+	return types.ChainID{}, nil
+}
+
+func (m mockDependencySet) ChainIndexFromID(chain types.ChainID) (types.ChainIndex, error) {
+	return types.ChainIndex(0), nil
+}
+
+func (m mockDependencySet) Chains() []types.ChainID {
+	return nil
+}
+
+func (m mockDependencySet) HasChain(chain types.ChainID) bool {
+	return true
+}
diff --git a/op-supervisor/supervisor/backend/cross/safe_start.go b/op-supervisor/supervisor/backend/cross/safe_start.go
new file mode 100644
index 000000000000..acd97304ed14
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/safe_start.go
@@ -0,0 +1,104 @@
+package cross
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type SafeStartDeps interface {
+	Check(chain types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (includedIn types.BlockSeal, err error)
+
+	CrossDerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error)
+
+	DependencySet() depset.DependencySet
+}
+
+// CrossSafeHazards checks if the given messages all exist and pass invariants.
+// It returns a hazard-set: if any intra-block messaging happened,
+// these hazard blocks have to be verified.
+func CrossSafeHazards(d SafeStartDeps, chainID types.ChainID, inL1DerivedFrom eth.BlockID,
+	candidate types.BlockSeal, execMsgs []*types.ExecutingMessage) (hazards map[types.ChainIndex]types.BlockSeal, err error) {
+
+	hazards = make(map[types.ChainIndex]types.BlockSeal)
+
+	// Warning for future: If we have sub-second distinct blocks (different block number),
+	// we need to increase precision on the above timestamp invariant.
+	// Otherwise a local block can depend on a future local block of the same chain,
+	// simply by pulling in a block of another chain,
+	// which then depends on a block of the original chain,
+	// all with the same timestamp, without message cycles.
+
+	depSet := d.DependencySet()
+
+	if len(execMsgs) > 0 {
+		if ok, err := depSet.CanExecuteAt(chainID, candidate.Timestamp); err != nil {
+			return nil, fmt.Errorf("cannot check message execution of block %s (chain %s): %w", candidate, chainID, err)
+		} else if !ok {
+			return nil, fmt.Errorf("cannot execute messages in block %s (chain %s): %w", candidate, chainID, types.ErrConflict)
+		}
+	}
+
+	// check all executing messages
+	for _, msg := range execMsgs {
+		initChainID, err := depSet.ChainIDFromIndex(msg.Chain)
+		if err != nil {
+			if errors.Is(err, types.ErrUnknownChain) {
+				err = fmt.Errorf("msg %s may not execute from unknown chain %s: %w", msg, msg.Chain, types.ErrConflict)
+			}
+			return nil, err
+		}
+		if ok, err := depSet.CanInitiateAt(initChainID, msg.Timestamp); err != nil {
+			return nil, fmt.Errorf("cannot check message initiation of msg %s (chain %s): %w", msg, chainID, err)
+		} else if !ok {
+			return nil, fmt.Errorf("cannot allow initiating message %s (chain %s): %w", msg, chainID, types.ErrConflict)
+		}
+		if msg.Timestamp < candidate.Timestamp {
+			// If timestamp is older: invariant ensures non-cyclic ordering relative to other messages.
+			// Check that the block that they are included in is cross-safe already.
+			includedIn, err := d.Check(initChainID, msg.BlockNum, msg.LogIdx, msg.Hash)
+			if err != nil {
+				return nil, fmt.Errorf("executing msg %s failed check: %w", msg, err)
+			}
+			initDerivedFrom, err := d.CrossDerivedFrom(initChainID, includedIn.ID())
+			if err != nil {
+				return nil, fmt.Errorf("msg %s included in non-cross-safe block %s: %w", msg, includedIn, err)
+			}
+			if initDerivedFrom.Number > inL1DerivedFrom.Number {
+				return nil, fmt.Errorf("msg %s was included in block %s derived from %s which is not in cross-safe scope %s: %w",
+					msg, includedIn, initDerivedFrom, inL1DerivedFrom, types.ErrOutOfScope)
+			}
+		} else if msg.Timestamp == candidate.Timestamp {
+			// If timestamp is equal: we have to inspect ordering of individual
+			// log events to ensure non-cyclic cross-chain message ordering.
+			// And since we may have back-and-forth messaging, we cannot wait till the initiating side is cross-safe.
+			// Thus check that it was included in a local-safe block,
+			// and then proceed with transitive block checks,
+			// to ensure the local block we depend on is becoming cross-safe also.
+			includedIn, err := d.Check(initChainID, msg.BlockNum, msg.LogIdx, msg.Hash)
+			if err != nil {
+				return nil, fmt.Errorf("executing msg %s failed check: %w", msg, err)
+			}
+			// As a hazard block, it will be checked to be included in a cross-safe block,
+			// or right after a cross-safe block in a local-safe block, in HazardSafeFrontierChecks.
+			if existing, ok := hazards[msg.Chain]; ok {
+				if existing != includedIn {
+					return nil, fmt.Errorf("found dependency on %s (chain %d), but already depend on %s", includedIn, initChainID, chainID)
+				}
+			} else {
+				// Mark it as hazard block
+				hazards[msg.Chain] = includedIn
+			}
+		} else {
+			// Timestamp invariant is broken: executing message tries to execute future block.
+			// The predeploy inbox contract should not have allowed this executing message through.
+			return nil, fmt.Errorf("executing message %s in %s breaks timestamp invariant", msg, candidate)
+		}
+	}
+	return hazards, nil
+}
diff --git a/op-supervisor/supervisor/backend/cross/safe_start_test.go b/op-supervisor/supervisor/backend/cross/safe_start_test.go
new file mode 100644
index 000000000000..cb6bd4757214
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/safe_start_test.go
@@ -0,0 +1,341 @@
+package cross
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCrossSafeHazards(t *testing.T) {
+	t.Run("empty execMsgs", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{}
+		// when there are no execMsgs,
+		// no work is done, and no error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.NoError(t, err)
+		require.Empty(t, hazards)
+	})
+	t.Run("CanExecuteAt returns false", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.deps = mockDependencySet{
+			canExecuteAtfn: func() (bool, error) {
+				return false, nil
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanExecuteAt returns false,
+		// no work is done and an error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorIs(t, err, types.ErrConflict)
+		require.Empty(t, hazards)
+	})
+	t.Run("CanExecuteAt returns error", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.deps = mockDependencySet{
+			canExecuteAtfn: func() (bool, error) {
+				return false, errors.New("some error")
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanExecuteAt returns false,
+		// no work is done and an error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("unknown chain", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.deps = mockDependencySet{
+			chainIDFromIndexfn: func() (types.ChainID, error) {
+				return types.ChainID{}, types.ErrUnknownChain
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and ChainIDFromIndex returns ErrUnknownChain,
+		// an error is returned as a ErrConflict
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorIs(t, err, types.ErrConflict)
+		require.Empty(t, hazards)
+	})
+	t.Run("ChainIDFromUInt64 returns error", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.deps = mockDependencySet{
+			chainIDFromIndexfn: func() (types.ChainID, error) {
+				return types.ChainID{}, errors.New("some error")
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and ChainIDFromIndex returns some other error,
+		// the error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("CanInitiateAt returns false", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.deps = mockDependencySet{
+			canInitiateAtfn: func() (bool, error) {
+				return false, nil
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanInitiateAt returns false,
+		// the error is returned as a ErrConflict
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorIs(t, err, types.ErrConflict)
+		require.Empty(t, hazards)
+	})
+	t.Run("CanInitiateAt returns error", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.deps = mockDependencySet{
+			canInitiateAtfn: func() (bool, error) {
+				return false, errors.New("some error")
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanInitiateAt returns an error,
+		// the error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is greater than candidate", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 10}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is greater than the candidate,
+		// an error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "breaks timestamp invariant")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is equal, Check returns error", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timetamp is equal to the candidate,
+		// and check returns an error,
+		// that error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is equal, same hazard twice", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		em2 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		execMsgs := []*types.ExecutingMessage{em1, em2}
+		// when there are two execMsgs, and both are equal time to the candidate,
+		// and check returns the same includedIn for both
+		// they load the hazards once, and return no error
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.NoError(t, err)
+		require.Equal(t, hazards, map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): sampleBlockSeal})
+	})
+	t.Run("timestamp is equal, different hazards", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		// set the check function to return a different BlockSeal for the second call
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		sampleBlockSeal2 := types.BlockSeal{Number: 333, Hash: common.BytesToHash([]byte{0x22})}
+		calls := 0
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			defer func() { calls++ }()
+			if calls == 0 {
+				return sampleBlockSeal, nil
+			}
+			return sampleBlockSeal2, nil
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		em2 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		execMsgs := []*types.ExecutingMessage{em1, em2}
+		// when there are two execMsgs, and both are equal time to the candidate,
+		// and check returns different includedIn for the two,
+		// an error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "but already depend on")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, check returns error", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and check returns an error,
+		// that error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, DerivedFrom returns error", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		ssd.derivedFromFn = func() (derivedFrom types.BlockSeal, err error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and CrossDerivedFrom returns aan error,
+		// that error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, DerivedFrom Number is greater", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		sampleDerivedFrom := types.BlockSeal{Number: 4, Hash: common.BytesToHash([]byte{0x03})}
+		ssd.derivedFromFn = func() (derivedFrom types.BlockSeal, err error) {
+			return sampleDerivedFrom, nil
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and CrossDerivedFrom returns a BlockSeal with a greater Number than the inL1DerivedFrom,
+		// an error is returned as a ErrOutOfScope
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.ErrorIs(t, err, types.ErrOutOfScope)
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, DerivedFrom Number less", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		sampleDerivedFrom := types.BlockSeal{Number: 1, Hash: common.BytesToHash([]byte{0x03})}
+		ssd.derivedFromFn = func() (derivedFrom types.BlockSeal, err error) {
+			return sampleDerivedFrom, nil
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{Number: 10}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and CrossDerivedFrom returns a BlockSeal with a smaller Number than the inL1DerivedFrom,
+		// no error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.NoError(t, err)
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, DerivedFrom Number equal", func(t *testing.T) {
+		ssd := &mockSafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		sampleDerivedFrom := types.BlockSeal{Number: 1, Hash: common.BytesToHash([]byte{0x03})}
+		ssd.derivedFromFn = func() (derivedFrom types.BlockSeal, err error) {
+			return sampleDerivedFrom, nil
+		}
+		ssd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		inL1DerivedFrom := eth.BlockID{Number: 1}
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and CrossDerivedFrom returns a BlockSeal with a equal to the Number of inL1DerivedFrom,
+		// no error is returned
+		hazards, err := CrossSafeHazards(ssd, chainID, inL1DerivedFrom, candidate, execMsgs)
+		require.NoError(t, err)
+		require.Empty(t, hazards)
+	})
+}
+
+type mockSafeStartDeps struct {
+	deps          mockDependencySet
+	checkFn       func() (includedIn types.BlockSeal, err error)
+	derivedFromFn func() (derivedFrom types.BlockSeal, err error)
+}
+
+func (m *mockSafeStartDeps) Check(chain types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (includedIn types.BlockSeal, err error) {
+	if m.checkFn != nil {
+		return m.checkFn()
+	}
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockSafeStartDeps) CrossDerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
+	if m.derivedFromFn != nil {
+		return m.derivedFromFn()
+	}
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockSafeStartDeps) DependencySet() depset.DependencySet {
+	return m.deps
+}
diff --git a/op-supervisor/supervisor/backend/cross/safe_update.go b/op-supervisor/supervisor/backend/cross/safe_update.go
new file mode 100644
index 000000000000..172277db52de
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/safe_update.go
@@ -0,0 +1,116 @@
+package cross
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type CrossSafeDeps interface {
+	CrossSafe(chainID types.ChainID) (derivedFrom types.BlockSeal, derived types.BlockSeal, err error)
+
+	SafeFrontierCheckDeps
+	SafeStartDeps
+
+	CandidateCrossSafe(chain types.ChainID) (derivedFromScope, crossSafe eth.BlockRef, err error)
+	NextDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error)
+	PreviousDerived(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error)
+
+	OpenBlock(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
+
+	UpdateCrossSafe(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error
+}
+
+func CrossSafeUpdate(ctx context.Context, logger log.Logger, chainID types.ChainID, d CrossSafeDeps) error {
+	logger.Debug("Cross-safe update call")
+	// TODO(#11693): establish L1 reorg-lock of scopeDerivedFrom
+	// defer unlock once we are done checking the chain
+	candidateScope, err := scopedCrossSafeUpdate(logger, chainID, d)
+	if err == nil {
+		// if we made progress, and no errors, then there is no need to bump the L1 scope yet.
+		return nil
+	}
+	if !errors.Is(err, types.ErrOutOfScope) {
+		return err
+	}
+	// candidateScope is expected to be set if ErrOutOfScope is returned.
+	if candidateScope == (eth.BlockRef{}) {
+		return fmt.Errorf("expected L1 scope to be defined with ErrOutOfScope: %w", err)
+	}
+	logger.Debug("Cross-safe updating ran out of L1 scope", "scope", candidateScope, "err", err)
+	// bump the L1 scope up, and repeat the prev L2 block, not the candidate
+	newScope, err := d.NextDerivedFrom(chainID, candidateScope.ID())
+	if err != nil {
+		return fmt.Errorf("failed to identify new L1 scope to expand to after %s: %w", candidateScope, err)
+	}
+	_, currentCrossSafe, err := d.CrossSafe(chainID)
+	if err != nil {
+		// TODO: if genesis isn't cross-safe by default, then we can't register something as cross-safe here
+		return fmt.Errorf("failed to identify cross-safe scope to repeat: %w", err)
+	}
+	parent, err := d.PreviousDerived(chainID, currentCrossSafe.ID())
+	if err != nil {
+		return fmt.Errorf("cannot find parent-block of cross-safe: %w", err)
+	}
+	crossSafeRef := currentCrossSafe.WithParent(parent.ID())
+	logger.Debug("Bumping cross-safe scope", "scope", newScope, "crossSafe", crossSafeRef)
+	if err := d.UpdateCrossSafe(chainID, newScope, crossSafeRef); err != nil {
+		return fmt.Errorf("failed to update cross-safe head with L1 scope increment to %s and repeat of L2 block %s: %w", candidateScope, crossSafeRef, err)
+	}
+	return nil
+}
+
+// scopedCrossSafeUpdate runs through the cross-safe update checks.
+// If no L2 cross-safe progress can be made without additional L1 input data,
+// then a types.ErrOutOfScope error is returned,
+// with the current scope that will need to be expanded for further progress.
+func scopedCrossSafeUpdate(logger log.Logger, chainID types.ChainID, d CrossSafeDeps) (scope eth.BlockRef, err error) {
+	candidateScope, candidate, err := d.CandidateCrossSafe(chainID)
+	if err != nil {
+		return candidateScope, fmt.Errorf("failed to determine candidate block for cross-safe: %w", err)
+	}
+	logger.Debug("Candidate cross-safe", "scope", candidateScope, "candidate", candidate)
+	opened, _, execMsgs, err := d.OpenBlock(chainID, candidate.Number)
+	if err != nil {
+		return candidateScope, fmt.Errorf("failed to open block %s: %w", candidate, err)
+	}
+	if opened.ID() != candidate.ID() {
+		return candidateScope, fmt.Errorf("unsafe L2 DB has %s, but candidate cross-safe was %s: %w", opened, candidate, types.ErrConflict)
+	}
+	hazards, err := CrossSafeHazards(d, chainID, candidateScope.ID(), types.BlockSealFromRef(opened), sliceOfExecMsgs(execMsgs))
+	if err != nil {
+		return candidateScope, fmt.Errorf("failed to determine dependencies of cross-safe candidate %s: %w", candidate, err)
+	}
+	if err := HazardSafeFrontierChecks(d, candidateScope.ID(), hazards); err != nil {
+		return candidateScope, fmt.Errorf("failed to verify block %s in cross-safe frontier: %w", candidate, err)
+	}
+	//if err := HazardCycleChecks(d, candidate.Timestamp, hazards); err != nil {
+	// TODO
+	//}
+
+	// promote the candidate block to cross-safe
+	if err := d.UpdateCrossSafe(chainID, candidateScope, candidate); err != nil {
+		return candidateScope, fmt.Errorf("failed to update cross-safe head to %s, derived from scope %s: %w", candidate, candidateScope, err)
+	}
+	return candidateScope, nil
+}
+
+func NewCrossSafeWorker(logger log.Logger, chainID types.ChainID, d CrossSafeDeps) *Worker {
+	logger = logger.New("chain", chainID)
+	return NewWorker(logger, func(ctx context.Context) error {
+		return CrossSafeUpdate(ctx, logger, chainID, d)
+	})
+}
+
+func sliceOfExecMsgs(execMsgs map[uint32]*types.ExecutingMessage) []*types.ExecutingMessage {
+	msgs := make([]*types.ExecutingMessage, 0, len(execMsgs))
+	for _, msg := range execMsgs {
+		msgs = append(msgs, msg)
+	}
+	return msgs
+}
diff --git a/op-supervisor/supervisor/backend/cross/safe_update_test.go b/op-supervisor/supervisor/backend/cross/safe_update_test.go
new file mode 100644
index 000000000000..fec5f69b8ca4
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/safe_update_test.go
@@ -0,0 +1,399 @@
+package cross
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCrossSafeUpdate(t *testing.T) {
+	t.Run("scopedCrossSafeUpdate passes", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		opened := eth.BlockRef{Number: 1}
+		execs := map[uint32]*types.ExecutingMessage{1: {}}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return opened, 10, execs, nil
+		}
+		csd.deps = mockDependencySet{}
+		// when scopedCrossSafeUpdate returns no error,
+		// no error is returned
+		err := CrossSafeUpdate(ctx, logger, chainID, csd)
+		require.NoError(t, err)
+	})
+	t.Run("scopedCrossSafeUpdate reuturns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return eth.BlockRef{}, 0, nil, errors.New("some error")
+		}
+		csd.deps = mockDependencySet{}
+		// when scopedCrossSafeUpdate returns an error,
+		// (by way of OpenBlock returning an error),
+		// the error is returned
+		err := CrossSafeUpdate(ctx, logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("scopedCrossSafeUpdate reuturns ErrOutOfScope", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return eth.BlockRef{}, 0, nil, types.ErrOutOfScope
+		}
+		newScope := eth.BlockRef{Number: 3}
+		csd.nextDerivedFromFn = func(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error) {
+			return newScope, nil
+		}
+		currentCrossSafe := types.BlockSeal{Number: 5}
+		csd.crossSafeFn = func(chainID types.ChainID) (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
+			return types.BlockSeal{}, currentCrossSafe, nil
+		}
+		parent := types.BlockSeal{Number: 4}
+		csd.previousDerivedFn = func(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error) {
+			return parent, nil
+		}
+		csd.deps = mockDependencySet{}
+		var updatingChain types.ChainID
+		var updatingCandidateScope eth.BlockRef
+		var updatingCandidate eth.BlockRef
+		csd.updateCrossSafeFn = func(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error {
+			updatingChain = chain
+			updatingCandidateScope = l1View
+			updatingCandidate = lastCrossDerived
+			return nil
+		}
+		// when scopedCrossSafeUpdate returns Out of Scope error,
+		// CrossSafeUpdate proceeds anyway and calls UpdateCrossSafe
+		// the update uses the new scope returned by NextDerivedFrom
+		// and a crossSafeRef made from the current crossSafe and its parent
+		err := CrossSafeUpdate(ctx, logger, chainID, csd)
+		require.NoError(t, err)
+		require.Equal(t, chainID, updatingChain)
+		require.Equal(t, newScope, updatingCandidateScope)
+		crossSafeRef := currentCrossSafe.WithParent(parent.ID())
+		require.Equal(t, crossSafeRef, updatingCandidate)
+	})
+	t.Run("NextDerivedFrom returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return eth.BlockRef{}, 0, nil, types.ErrOutOfScope
+		}
+		csd.nextDerivedFromFn = func(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error) {
+			return eth.BlockRef{}, errors.New("some error")
+		}
+		csd.deps = mockDependencySet{}
+		// when scopedCrossSafeUpdate returns Out of Scope error,
+		// and NextDerivedFrom returns an error,
+		// the error is returned
+		err := CrossSafeUpdate(ctx, logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("PreviousDerived returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return eth.BlockRef{}, 0, nil, types.ErrOutOfScope
+		}
+		csd.previousDerivedFn = func(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		csd.deps = mockDependencySet{}
+		// when scopedCrossSafeUpdate returns Out of Scope error,
+		// and PreviousDerived returns an error,
+		// the error is returned
+		err := CrossSafeUpdate(ctx, logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("UpdateCrossSafe returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return eth.BlockRef{}, 0, nil, types.ErrOutOfScope
+		}
+		csd.updateCrossSafeFn = func(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error {
+			return errors.New("some error")
+		}
+		csd.deps = mockDependencySet{}
+		// when scopedCrossSafeUpdate returns Out of Scope error,
+		// and UpdateCrossSafe returns an error,
+		// the error is returned
+		err := CrossSafeUpdate(ctx, logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+	})
+}
+
+func TestScopedCrossSafeUpdate(t *testing.T) {
+	t.Run("CandidateCrossSafe returns error", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{}, eth.BlockRef{}, errors.New("some error")
+		}
+		// when CandidateCrossSafe returns an error,
+		// the error is returned
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+		require.Equal(t, eth.BlockRef{}, blockRef)
+	})
+	t.Run("CandidateCrossSafe returns error", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return eth.BlockRef{}, 0, nil, errors.New("some error")
+		}
+		// when OpenBlock returns an error,
+		// the error is returned
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+		require.Equal(t, eth.BlockRef{}, blockRef)
+	})
+	t.Run("candidate does not match opened block", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{}, candidate, nil
+		}
+		opened := eth.BlockRef{Number: 2}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return opened, 0, nil, nil
+		}
+		// when OpenBlock and CandidateCrossSafe return different blocks,
+		// an ErrConflict is returned
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.ErrorIs(t, err, types.ErrConflict)
+		require.Equal(t, eth.BlockRef{}, blockRef)
+	})
+	t.Run("CrossSafeHazards returns error", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{}, candidate, nil
+		}
+		opened := eth.BlockRef{Number: 1}
+		execs := map[uint32]*types.ExecutingMessage{1: {}}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return opened, 10, execs, nil
+		}
+		// cause CrossSafeHazards to return an error by making ChainIDFromIndex return an error
+		csd.deps = mockDependencySet{}
+		csd.deps.chainIDFromIndexfn = func() (types.ChainID, error) {
+			return types.ChainID{}, errors.New("some error")
+		}
+		// when CrossSafeHazards returns an error,
+		// the error is returned
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+		require.ErrorContains(t, err, "dependencies of cross-safe candidate")
+		require.Equal(t, eth.BlockRef{}, blockRef)
+	})
+	t.Run("HazardSafeFrontierChecks returns error", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return eth.BlockRef{}, candidate, nil
+		}
+		opened := eth.BlockRef{Number: 1}
+		execs := map[uint32]*types.ExecutingMessage{1: {}}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return opened, 10, execs, nil
+		}
+		count := 0
+		csd.deps = mockDependencySet{}
+		// cause CrossSafeHazards to return an error by making ChainIDFromIndex return an error
+		// but only on the second call (which will be used by HazardSafeFrontierChecks)
+		csd.deps.chainIDFromIndexfn = func() (types.ChainID, error) {
+			defer func() { count++ }()
+			if count == 0 {
+				return types.ChainID{}, nil
+			}
+			return types.ChainID{}, errors.New("some error")
+		}
+		// when CrossSafeHazards returns an error,
+		// the error is returned
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+		require.ErrorContains(t, err, "frontier")
+		require.Equal(t, eth.BlockRef{}, blockRef)
+	})
+	t.Run("UpdateCrossSafe returns error", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		opened := eth.BlockRef{Number: 1}
+		execs := map[uint32]*types.ExecutingMessage{1: {}}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return opened, 10, execs, nil
+		}
+		csd.deps = mockDependencySet{}
+		csd.updateCrossSafeFn = func(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error {
+			return errors.New("some error")
+		}
+		// when UpdateCrossSafe returns an error,
+		// the error is returned
+		_, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.ErrorContains(t, err, "some error")
+		require.ErrorContains(t, err, "failed to update")
+	})
+	t.Run("successful update", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		opened := eth.BlockRef{Number: 1}
+		execs := map[uint32]*types.ExecutingMessage{1: {}}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return opened, 10, execs, nil
+		}
+		csd.deps = mockDependencySet{}
+		var updatingChain types.ChainID
+		var updatingCandidateScope eth.BlockRef
+		var updatingCandidate eth.BlockRef
+		csd.updateCrossSafeFn = func(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error {
+			updatingChain = chain
+			updatingCandidateScope = l1View
+			updatingCandidate = lastCrossDerived
+			return nil
+		}
+		// when no errors occur, the update is carried out
+		// the used candidate and scope are from CandidateCrossSafe
+		// the candidateScope is returned
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.Equal(t, chainID, updatingChain)
+		require.Equal(t, candidateScope, updatingCandidateScope)
+		require.Equal(t, candidate, updatingCandidate)
+		require.Equal(t, candidateScope, blockRef)
+		require.NoError(t, err)
+	})
+}
+
+type mockCrossSafeDeps struct {
+	deps                 mockDependencySet
+	crossSafeFn          func(chainID types.ChainID) (derivedFrom types.BlockSeal, derived types.BlockSeal, err error)
+	candidateCrossSafeFn func() (derivedFromScope, crossSafe eth.BlockRef, err error)
+	openBlockFn          func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
+	updateCrossSafeFn    func(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error
+	nextDerivedFromFn    func(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error)
+	previousDerivedFn    func(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error)
+}
+
+func (m *mockCrossSafeDeps) CrossSafe(chainID types.ChainID) (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
+	if m.crossSafeFn != nil {
+		return m.crossSafeFn(chainID)
+	}
+	return types.BlockSeal{}, types.BlockSeal{}, nil
+}
+
+func (m *mockCrossSafeDeps) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, crossSafe eth.BlockRef, err error) {
+	if m.candidateCrossSafeFn != nil {
+		return m.candidateCrossSafeFn()
+	}
+	return eth.BlockRef{}, eth.BlockRef{}, nil
+}
+
+func (m *mockCrossSafeDeps) DependencySet() depset.DependencySet {
+	return m.deps
+}
+
+func (m *mockCrossSafeDeps) CrossDerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockCrossSafeDeps) Check(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockCrossSafeDeps) NextDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error) {
+	if m.nextDerivedFromFn != nil {
+		return m.nextDerivedFromFn(chain, derivedFrom)
+	}
+	return eth.BlockRef{}, nil
+}
+
+func (m *mockCrossSafeDeps) PreviousDerived(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error) {
+	if m.previousDerivedFn != nil {
+		return m.previousDerivedFn(chain, derived)
+	}
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockCrossSafeDeps) OpenBlock(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+	if m.openBlockFn != nil {
+		return m.openBlockFn(chainID, blockNum)
+	}
+	return eth.BlockRef{}, 0, nil, nil
+}
+
+func (m *mockCrossSafeDeps) UpdateCrossSafe(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error {
+	if m.updateCrossSafeFn != nil {
+		return m.updateCrossSafeFn(chain, l1View, lastCrossDerived)
+	}
+	return nil
+}
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_frontier.go b/op-supervisor/supervisor/backend/cross/unsafe_frontier.go
new file mode 100644
index 000000000000..5e30da999eb1
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/unsafe_frontier.go
@@ -0,0 +1,63 @@
+package cross
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type UnsafeFrontierCheckDeps interface {
+	ParentBlock(chainID types.ChainID, parentOf eth.BlockID) (parent eth.BlockID, err error)
+
+	IsCrossUnsafe(chainID types.ChainID, block eth.BlockID) error
+	IsLocalUnsafe(chainID types.ChainID, block eth.BlockID) error
+
+	DependencySet() depset.DependencySet
+}
+
+// HazardUnsafeFrontierChecks verifies all the hazard blocks are either:
+//   - already cross-unsafe.
+//   - the first (if not first: local blocks to verify before proceeding)
+//     local-unsafe block, after the cross-unsafe block.
+func HazardUnsafeFrontierChecks(d UnsafeFrontierCheckDeps, hazards map[types.ChainIndex]types.BlockSeal) error {
+	depSet := d.DependencySet()
+	for hazardChainIndex, hazardBlock := range hazards {
+		hazardChainID, err := depSet.ChainIDFromIndex(hazardChainIndex)
+		if err != nil {
+			if errors.Is(err, types.ErrUnknownChain) {
+				err = fmt.Errorf("cannot cross-unsafe verify block %s of unknown chain index %s: %w", hazardBlock, hazardChainIndex, types.ErrConflict)
+			}
+			return err
+		}
+		// Anything we depend on in this timestamp must be cross-unsafe already, or the first block after.
+		err = d.IsCrossUnsafe(hazardChainID, hazardBlock.ID())
+		if err != nil {
+			if errors.Is(err, types.ErrFuture) {
+				// Not already cross-unsafe, so we check if the block is local-unsafe
+				// (a sanity check if part of the canonical chain).
+				err = d.IsLocalUnsafe(hazardChainID, hazardBlock.ID())
+				if err != nil {
+					// can be ErrFuture (missing data) or ErrConflict (non-canonical)
+					return fmt.Errorf("hazard block %s (chain %d) is not local-unsafe: %w", hazardBlock, hazardChainID, err)
+				}
+				// If it doesn't have a parent block, then there is no prior block required to be cross-safe
+				if hazardBlock.Number > 0 {
+					// Check that parent of hazardBlockID is cross-safe within view
+					parent, err := d.ParentBlock(hazardChainID, hazardBlock.ID())
+					if err != nil {
+						return fmt.Errorf("failed to retrieve parent-block of hazard block %s (chain %s): %w", hazardBlock, hazardChainID, err)
+					}
+					if err := d.IsCrossUnsafe(hazardChainID, parent); err != nil {
+						return fmt.Errorf("cannot rely on hazard-block %s (chain %s), parent block %s is not cross-unsafe: %w", hazardBlock, hazardChainID, parent, err)
+					}
+				}
+			} else {
+				return fmt.Errorf("failed to determine cross-derived of hazard block %s (chain %s): %w", hazardBlock, hazardChainID, err)
+			}
+		}
+	}
+	return nil
+}
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_frontier_test.go b/op-supervisor/supervisor/backend/cross/unsafe_frontier_test.go
new file mode 100644
index 000000000000..09086e0e8738
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/unsafe_frontier_test.go
@@ -0,0 +1,130 @@
+package cross
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHazardUnsafeFrontierChecks(t *testing.T) {
+	t.Run("empty hazards", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{}
+		hazards := map[types.ChainIndex]types.BlockSeal{}
+		// when there are no hazards,
+		// no work is done, and no error is returned
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.NoError(t, err)
+	})
+	t.Run("unknown chain", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{
+			deps: mockDependencySet{
+				chainIDFromIndexfn: func() (types.ChainID, error) {
+					return types.ChainID{}, types.ErrUnknownChain
+				},
+			},
+		}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		// when there is one hazard, and ChainIDFromIndex returns ErrUnknownChain,
+		// an error is returned as a ErrConflict
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.ErrorIs(t, err, types.ErrConflict)
+	})
+	t.Run("is cross unsafe", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		ufcd.isCrossUnsafe = nil
+		// when there is one hazard, and IsCrossUnsafe returns nil (no error)
+		// no error is returned
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.NoError(t, err)
+	})
+	t.Run("errFuture: is not local unsafe", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		ufcd.isCrossUnsafe = types.ErrFuture
+		ufcd.isLocalUnsafe = errors.New("some error")
+		// when there is one hazard, and IsCrossUnsafe returns an ErrFuture,
+		// and IsLocalUnsafe returns an error,
+		// the error from IsLocalUnsafe is (wrapped and) returned
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("errFuture: genesis block", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {}}
+		ufcd.isCrossUnsafe = types.ErrFuture
+		// when there is one hazard, and IsCrossUnsafe returns an ErrFuture,
+		// BUT the hazard's block number is 0,
+		// no error is returned
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.NoError(t, err)
+	})
+	t.Run("errFuture: error getting parent block", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {Number: 3}}
+		ufcd.isCrossUnsafe = types.ErrFuture
+		ufcd.parentBlockFn = func() (parent eth.BlockID, err error) {
+			return eth.BlockID{}, errors.New("some error")
+		}
+		// when there is one hazard, and IsCrossUnsafe returns an ErrFuture,
+		// and there is an error getting the parent block,
+		// the error from ParentBlock is (wrapped and) returned
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("errFuture: parent block is not cross unsafe", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {Number: 3}}
+		ufcd.isCrossUnsafe = types.ErrFuture
+		ufcd.parentBlockFn = func() (parent eth.BlockID, err error) {
+			// when getting the parent block, prep isCrossSafe to be err
+			ufcd.isCrossUnsafe = errors.New("not cross unsafe!")
+			return eth.BlockID{}, nil
+		}
+		// when there is one hazard, and IsCrossUnsafe returns an ErrFuture,
+		// and the parent block is not cross unsafe,
+		// the error from IsCrossUnsafe is (wrapped and) returned
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.ErrorContains(t, err, "not cross unsafe!")
+	})
+	t.Run("IsCrossUnsafe Error", func(t *testing.T) {
+		ufcd := &mockUnsafeFrontierCheckDeps{}
+		hazards := map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): {Number: 3, Hash: common.BytesToHash([]byte{0x02})}}
+		ufcd.isCrossUnsafe = errors.New("some error")
+		// when there is one hazard, and IsCrossUnsafe returns an error,
+		// the error from IsCrossUnsafe is (wrapped and) returned
+		err := HazardUnsafeFrontierChecks(ufcd, hazards)
+		require.ErrorContains(t, err, "some error")
+	})
+}
+
+type mockUnsafeFrontierCheckDeps struct {
+	deps          mockDependencySet
+	parentBlockFn func() (parent eth.BlockID, err error)
+	isCrossUnsafe error
+	isLocalUnsafe error
+}
+
+func (m *mockUnsafeFrontierCheckDeps) DependencySet() depset.DependencySet {
+	return m.deps
+}
+
+func (m *mockUnsafeFrontierCheckDeps) ParentBlock(chainID types.ChainID, block eth.BlockID) (parent eth.BlockID, err error) {
+	if m.parentBlockFn != nil {
+		return m.parentBlockFn()
+	}
+	return eth.BlockID{}, nil
+}
+
+func (m *mockUnsafeFrontierCheckDeps) IsCrossUnsafe(chainID types.ChainID, block eth.BlockID) error {
+	return m.isCrossUnsafe
+}
+
+func (m *mockUnsafeFrontierCheckDeps) IsLocalUnsafe(chainID types.ChainID, block eth.BlockID) error {
+	return m.isLocalUnsafe
+}
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_start.go b/op-supervisor/supervisor/backend/cross/unsafe_start.go
new file mode 100644
index 000000000000..9b4568a7b622
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/unsafe_start.go
@@ -0,0 +1,100 @@
+package cross
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type UnsafeStartDeps interface {
+	Check(chain types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (includedIn types.BlockSeal, err error)
+
+	IsCrossUnsafe(chainID types.ChainID, block eth.BlockID) error
+
+	DependencySet() depset.DependencySet
+}
+
+// CrossUnsafeHazards checks if the given messages all exist and pass invariants.
+// It returns a hazard-set: if any intra-block messaging happened,
+// these hazard blocks have to be verified.
+func CrossUnsafeHazards(d UnsafeStartDeps, chainID types.ChainID,
+	candidate types.BlockSeal, execMsgs []*types.ExecutingMessage) (hazards map[types.ChainIndex]types.BlockSeal, err error) {
+
+	hazards = make(map[types.ChainIndex]types.BlockSeal)
+
+	// Warning for future: If we have sub-second distinct blocks (different block number),
+	// we need to increase precision on the above timestamp invariant.
+	// Otherwise a local block can depend on a future local block of the same chain,
+	// simply by pulling in a block of another chain,
+	// which then depends on a block of the original chain,
+	// all with the same timestamp, without message cycles.
+
+	depSet := d.DependencySet()
+
+	if len(execMsgs) > 0 {
+		if ok, err := depSet.CanExecuteAt(chainID, candidate.Timestamp); err != nil {
+			return nil, fmt.Errorf("cannot check message execution of block %s (chain %s): %w", candidate, chainID, err)
+		} else if !ok {
+			return nil, fmt.Errorf("cannot execute messages in block %s (chain %s): %w", candidate, chainID, types.ErrConflict)
+		}
+	}
+
+	// check all executing messages
+	for _, msg := range execMsgs {
+		initChainID, err := depSet.ChainIDFromIndex(msg.Chain)
+		if err != nil {
+			if errors.Is(err, types.ErrUnknownChain) {
+				err = fmt.Errorf("msg %s may not execute from unknown chain %s: %w", msg, msg.Chain, types.ErrConflict)
+			}
+			return nil, err
+		}
+		if ok, err := depSet.CanInitiateAt(initChainID, msg.Timestamp); err != nil {
+			return nil, fmt.Errorf("cannot check message initiation of msg %s (chain %s): %w", msg, chainID, err)
+		} else if !ok {
+			return nil, fmt.Errorf("cannot allow initiating message %s (chain %s): %w", msg, chainID, types.ErrConflict)
+		}
+		if msg.Timestamp < candidate.Timestamp {
+			// If timestamp is older: invariant ensures non-cyclic ordering relative to other messages.
+			// Check that the block that they are included in is cross-safe already.
+			includedIn, err := d.Check(initChainID, msg.BlockNum, msg.LogIdx, msg.Hash)
+			if err != nil {
+				return nil, fmt.Errorf("executing msg %s failed check: %w", msg, err)
+			}
+			if err := d.IsCrossUnsafe(initChainID, includedIn.ID()); err != nil {
+				return nil, fmt.Errorf("msg %s included in non-cross-unsafe block %s: %w", msg, includedIn, err)
+			}
+		} else if msg.Timestamp == candidate.Timestamp {
+			// If timestamp is equal: we have to inspect ordering of individual
+			// log events to ensure non-cyclic cross-chain message ordering.
+			// And since we may have back-and-forth messaging, we cannot wait till the initiating side is cross-unsafe.
+			// Thus check that it was included in a local-unsafe block,
+			// and then proceed with transitive block checks,
+			// to ensure the local block we depend on is becoming cross-unsafe also.
+			includedIn, err := d.Check(initChainID, msg.BlockNum, msg.LogIdx, msg.Hash)
+			if err != nil {
+				return nil, fmt.Errorf("executing msg %s failed check: %w", msg, err)
+			}
+
+			// As a hazard block, it will be checked to be included in a cross-unsafe block,
+			// or right after a cross-unsafe block, in HazardUnsafeFrontierChecks.
+			if existing, ok := hazards[msg.Chain]; ok {
+				if existing != includedIn {
+					return nil, fmt.Errorf("found dependency on %s (chain %d), but already depend on %s", includedIn, initChainID, chainID)
+				}
+			} else {
+				// Mark it as hazard block
+				hazards[msg.Chain] = includedIn
+			}
+		} else {
+			// Timestamp invariant is broken: executing message tries to execute future block.
+			// The predeploy inbox contract should not have allowed this executing message through.
+			return nil, fmt.Errorf("executing message %s in %s breaks timestamp invariant", msg, candidate)
+		}
+	}
+	return hazards, nil
+}
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_start_test.go b/op-supervisor/supervisor/backend/cross/unsafe_start_test.go
new file mode 100644
index 000000000000..123fc70abe17
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/unsafe_start_test.go
@@ -0,0 +1,280 @@
+package cross
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCrossUnsafeHazards(t *testing.T) {
+	t.Run("empty execMsgs", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{}
+		// when there are no execMsgs,
+		// no work is done, and no error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.NoError(t, err)
+		require.Empty(t, hazards)
+	})
+	t.Run("CanExecuteAt returns false", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.deps = mockDependencySet{
+			canExecuteAtfn: func() (bool, error) {
+				return false, nil
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanExecuteAt returns false,
+		// no work is done and an error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorIs(t, err, types.ErrConflict)
+		require.Empty(t, hazards)
+	})
+	t.Run("CanExecuteAt returns error", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.deps = mockDependencySet{
+			canExecuteAtfn: func() (bool, error) {
+				return false, errors.New("some error")
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanExecuteAt returns false,
+		// no work is done and an error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("unknown chain", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.deps = mockDependencySet{
+			chainIDFromIndexfn: func() (types.ChainID, error) {
+				return types.ChainID{}, types.ErrUnknownChain
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and ChainIDFromIndex returns ErrUnknownChain,
+		// an error is returned as a ErrConflict
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorIs(t, err, types.ErrConflict)
+		require.Empty(t, hazards)
+	})
+	t.Run("ChainIDFromUInt64 returns error", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.deps = mockDependencySet{
+			chainIDFromIndexfn: func() (types.ChainID, error) {
+				return types.ChainID{}, errors.New("some error")
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and ChainIDFromIndex returns some other error,
+		// the error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("CanInitiateAt returns false", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.deps = mockDependencySet{
+			canInitiateAtfn: func() (bool, error) {
+				return false, nil
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanInitiateAt returns false,
+		// the error is returned as a ErrConflict
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorIs(t, err, types.ErrConflict)
+		require.Empty(t, hazards)
+	})
+	t.Run("CanInitiateAt returns error", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.deps = mockDependencySet{
+			canInitiateAtfn: func() (bool, error) {
+				return false, errors.New("some error")
+			},
+		}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{}
+		execMsgs := []*types.ExecutingMessage{{}}
+		// when there is one execMsg, and CanInitiateAt returns an error,
+		// the error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is greater than candidate", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 10}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is greater than the candidate,
+		// an error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "breaks timestamp invariant")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is equal, Check returns error", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		usd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timetamp is equal to the candidate,
+		// and check returns an error,
+		// that error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is equal, same hazard twice", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		usd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		usd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		em2 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		execMsgs := []*types.ExecutingMessage{em1, em2}
+		// when there are two execMsgs, and both are equal time to the candidate,
+		// and check returns the same includedIn for both
+		// they load the hazards once, and return no error
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.NoError(t, err)
+		require.Equal(t, hazards, map[types.ChainIndex]types.BlockSeal{types.ChainIndex(0): sampleBlockSeal})
+	})
+	t.Run("timestamp is equal, different hazards", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		// set the check function to return a different BlockSeal for the second call
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		sampleBlockSeal2 := types.BlockSeal{Number: 333, Hash: common.BytesToHash([]byte{0x22})}
+		calls := 0
+		usd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			defer func() { calls++ }()
+			if calls == 0 {
+				return sampleBlockSeal, nil
+			}
+			return sampleBlockSeal2, nil
+		}
+		usd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		em2 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 2}
+		execMsgs := []*types.ExecutingMessage{em1, em2}
+		// when there are two execMsgs, and both are equal time to the candidate,
+		// and check returns different includedIn for the two,
+		// an error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "but already depend on")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, check returns error", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		usd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		usd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and check returns an error,
+		// that error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, IsCrossUnsafe returns error", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		usd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		usd.isCrossUnsafeFn = func() error {
+			return errors.New("some error")
+		}
+		usd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and IsCrossUnsafe returns an error,
+		// that error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.ErrorContains(t, err, "some error")
+		require.Empty(t, hazards)
+	})
+	t.Run("timestamp is less, IsCrossUnsafe", func(t *testing.T) {
+		usd := &mockUnsafeStartDeps{}
+		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
+		usd.checkFn = func() (includedIn types.BlockSeal, err error) {
+			return sampleBlockSeal, nil
+		}
+		usd.isCrossUnsafeFn = func() error {
+			return nil
+		}
+		usd.deps = mockDependencySet{}
+		chainID := types.ChainIDFromUInt64(0)
+		candidate := types.BlockSeal{Timestamp: 2}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1}
+		execMsgs := []*types.ExecutingMessage{em1}
+		// when there is one execMsg, and the timestamp is less than the candidate,
+		// and IsCrossUnsafe returns no error,
+		// no error is returned
+		hazards, err := CrossUnsafeHazards(usd, chainID, candidate, execMsgs)
+		require.NoError(t, err)
+		require.Empty(t, hazards)
+	})
+}
+
+type mockUnsafeStartDeps struct {
+	deps            mockDependencySet
+	checkFn         func() (includedIn types.BlockSeal, err error)
+	isCrossUnsafeFn func() error
+}
+
+func (m *mockUnsafeStartDeps) Check(chain types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (includedIn types.BlockSeal, err error) {
+	if m.checkFn != nil {
+		return m.checkFn()
+	}
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockUnsafeStartDeps) IsCrossUnsafe(chainID types.ChainID, derived eth.BlockID) error {
+	if m.isCrossUnsafeFn != nil {
+		return m.isCrossUnsafeFn()
+	}
+	return nil
+}
+
+func (m *mockUnsafeStartDeps) DependencySet() depset.DependencySet {
+	return m.deps
+}
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_update.go b/op-supervisor/supervisor/backend/cross/unsafe_update.go
new file mode 100644
index 000000000000..bc13146d38ff
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/unsafe_update.go
@@ -0,0 +1,79 @@
+package cross
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type CrossUnsafeDeps interface {
+	CrossUnsafe(chainID types.ChainID) (types.BlockSeal, error)
+
+	UnsafeStartDeps
+	UnsafeFrontierCheckDeps
+
+	OpenBlock(chainID types.ChainID, blockNum uint64) (block eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
+
+	UpdateCrossUnsafe(chain types.ChainID, crossUnsafe types.BlockSeal) error
+}
+
+func CrossUnsafeUpdate(ctx context.Context, logger log.Logger, chainID types.ChainID, d CrossUnsafeDeps) error {
+	var candidate types.BlockSeal
+	var execMsgs []*types.ExecutingMessage
+
+	// fetch cross-head to determine next cross-unsafe candidate
+	if crossUnsafe, err := d.CrossUnsafe(chainID); err != nil {
+		if errors.Is(err, types.ErrFuture) {
+			// If genesis / no cross-safe block yet, then defer update
+			logger.Debug("No cross-unsafe starting point yet")
+			return nil
+		} else {
+			return err
+		}
+	} else {
+		// Open block N+1: this is a local-unsafe block,
+		// just after cross-safe, that can be promoted if it passes the dependency checks.
+		bl, _, msgs, err := d.OpenBlock(chainID, crossUnsafe.Number+1)
+		if err != nil {
+			return fmt.Errorf("failed to open block %d: %w", crossUnsafe.Number+1, err)
+		}
+		if bl.ParentHash != crossUnsafe.Hash {
+			return fmt.Errorf("cannot use block %s, it does not build on cross-unsafe block %s: %w", bl, crossUnsafe, types.ErrConflict)
+		}
+		candidate = types.BlockSealFromRef(bl)
+		execMsgs = sliceOfExecMsgs(msgs)
+	}
+
+	hazards, err := CrossUnsafeHazards(d, chainID, candidate, execMsgs)
+	if err != nil {
+		// TODO(#11693): reorgs can be detected by checking if the error is ErrConflict,
+		// missing data is identified by ErrFuture,
+		// and other errors (e.g. DB issues) are identifier by remaining error kinds.
+		return fmt.Errorf("failed to check for cross-chain hazards: %w", err)
+	}
+
+	if err := HazardUnsafeFrontierChecks(d, hazards); err != nil {
+		return fmt.Errorf("failed to verify block %s in cross-unsafe frontier: %w", candidate, err)
+	}
+	//if err := HazardCycleChecks(d, candidate.Timestamp, hazards); err != nil {
+	//// TODO
+	//}
+
+	// promote the candidate block to cross-unsafe
+	if err := d.UpdateCrossUnsafe(chainID, candidate); err != nil {
+		return fmt.Errorf("failed to update cross-unsafe head to %s: %w", candidate, err)
+	}
+	return nil
+}
+
+func NewCrossUnsafeWorker(logger log.Logger, chainID types.ChainID, d CrossUnsafeDeps) *Worker {
+	logger = logger.New("chain", chainID)
+	return NewWorker(logger, func(ctx context.Context) error {
+		return CrossUnsafeUpdate(ctx, logger, chainID, d)
+	})
+}
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_update_test.go b/op-supervisor/supervisor/backend/cross/unsafe_update_test.go
new file mode 100644
index 000000000000..c0e264c97206
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/unsafe_update_test.go
@@ -0,0 +1,212 @@
+package cross
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCrossUnsafeUpdate(t *testing.T) {
+	t.Run("CrossUnsafe returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		usd.crossUnsafeFn = func(chainID types.ChainID) (types.BlockSeal, error) {
+			return types.BlockSeal{}, errors.New("some error")
+		}
+		usd.deps = mockDependencySet{}
+		// when an error is returned by CrossUnsafe,
+		// the error is returned
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("CrossUnsafe returns ErrFuture", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		usd.crossUnsafeFn = func(chainID types.ChainID) (types.BlockSeal, error) {
+			return types.BlockSeal{}, types.ErrFuture
+		}
+		usd.deps = mockDependencySet{}
+		// when a ErrFuture is returned by CrossUnsafe,
+		// no error is returned
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.NoError(t, err)
+	})
+	t.Run("OpenBlock returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		usd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return eth.BlockRef{}, 0, nil, errors.New("some error")
+		}
+		usd.deps = mockDependencySet{}
+		// when an error is returned by OpenBlock,
+		// the error is returned
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("opened block parent hash does not match", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		crossUnsafe := types.BlockSeal{Hash: common.Hash{0x11}}
+		usd.crossUnsafeFn = func(chainID types.ChainID) (types.BlockSeal, error) {
+			return crossUnsafe, nil
+		}
+		bl := eth.BlockRef{ParentHash: common.Hash{0x01}}
+		usd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return bl, 0, nil, nil
+		}
+		usd.deps = mockDependencySet{}
+		// when the parent hash of the opened block does not match the cross-unsafe block,
+		// an ErrConflict is returned
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.ErrorIs(t, err, types.ErrConflict)
+	})
+	t.Run("CrossSafeHazards returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		crossUnsafe := types.BlockSeal{Hash: common.Hash{0x01}}
+		usd.crossUnsafeFn = func(chainID types.ChainID) (types.BlockSeal, error) {
+			return crossUnsafe, nil
+		}
+		bl := eth.BlockRef{ParentHash: common.Hash{0x01}}
+		usd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			// include one executing message to trigger the CanExecuteAt check
+			return bl, 0, map[uint32]*types.ExecutingMessage{1: {}}, nil
+		}
+		usd.deps = mockDependencySet{}
+		// make CrossSafeHazards return an error by setting CanExecuteAtfn to return an error
+		usd.deps.canExecuteAtfn = func() (bool, error) {
+			return false, errors.New("some error")
+		}
+		// when CrossSafeHazards returns an error,
+		// the error is returned
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("HazardUnsafeFrontierChecks returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		crossUnsafe := types.BlockSeal{Hash: common.Hash{0x01}}
+		usd.crossUnsafeFn = func(chainID types.ChainID) (types.BlockSeal, error) {
+			return crossUnsafe, nil
+		}
+		bl := eth.BlockRef{ParentHash: common.Hash{0x01}, Time: 1}
+		em1 := &types.ExecutingMessage{Timestamp: 1}
+		usd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			// include one executing message to ensure one hazard is returned
+			return bl, 0, map[uint32]*types.ExecutingMessage{1: em1}, nil
+		}
+		usd.deps = mockDependencySet{}
+		count := 0
+		// make HazardUnsafeFrontierChecks return an error by failing the second ChainIDFromIndex call
+		// (the first one is in CrossSafeHazards)
+		usd.deps.chainIDFromIndexfn = func() (types.ChainID, error) {
+			defer func() { count++ }()
+			if count == 1 {
+				return types.ChainID{}, errors.New("some error")
+			}
+			return types.ChainID{}, nil
+		}
+		// when HazardUnsafeFrontierChecks returns an error,
+		// the error is returned
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.ErrorContains(t, err, "some error")
+	})
+	t.Run("successful update", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		crossUnsafe := types.BlockSeal{Hash: common.Hash{0x01}}
+		usd.crossUnsafeFn = func(chainID types.ChainID) (types.BlockSeal, error) {
+			return crossUnsafe, nil
+		}
+		bl := eth.BlockRef{ParentHash: common.Hash{0x01}, Time: 1}
+		em1 := &types.ExecutingMessage{Timestamp: 1}
+		usd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			// include one executing message to ensure one hazard is returned
+			return bl, 0, map[uint32]*types.ExecutingMessage{1: em1}, nil
+		}
+		usd.deps = mockDependencySet{}
+		var updatingChainID types.ChainID
+		var updatingBlock types.BlockSeal
+		usd.updateCrossUnsafeFn = func(chain types.ChainID, crossUnsafe types.BlockSeal) error {
+			updatingChainID = chain
+			updatingBlock = crossUnsafe
+			return nil
+		}
+		// when there are no errors, the cross-unsafe block is updated
+		// the updated block is the block opened in OpenBlock
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.NoError(t, err)
+		require.Equal(t, chainID, updatingChainID)
+		require.Equal(t, types.BlockSealFromRef(bl), updatingBlock)
+	})
+}
+
+type mockCrossUnsafeDeps struct {
+	deps                mockDependencySet
+	crossUnsafeFn       func(chainID types.ChainID) (types.BlockSeal, error)
+	openBlockFn         func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
+	updateCrossUnsafeFn func(chain types.ChainID, crossUnsafe types.BlockSeal) error
+}
+
+func (m *mockCrossUnsafeDeps) CrossUnsafe(chainID types.ChainID) (derived types.BlockSeal, err error) {
+	if m.crossUnsafeFn != nil {
+		return m.crossUnsafeFn(chainID)
+	}
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockCrossUnsafeDeps) DependencySet() depset.DependencySet {
+	return m.deps
+}
+
+func (m *mockCrossUnsafeDeps) Check(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+	return types.BlockSeal{}, nil
+}
+
+func (m *mockCrossUnsafeDeps) OpenBlock(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+	if m.openBlockFn != nil {
+		return m.openBlockFn(chainID, blockNum)
+	}
+	return eth.BlockRef{}, 0, nil, nil
+}
+
+func (m *mockCrossUnsafeDeps) UpdateCrossUnsafe(chain types.ChainID, block types.BlockSeal) error {
+	if m.updateCrossUnsafeFn != nil {
+		return m.updateCrossUnsafeFn(chain, block)
+	}
+	return nil
+}
+
+func (m *mockCrossUnsafeDeps) IsCrossUnsafe(chainID types.ChainID, blockNum eth.BlockID) error {
+	return nil
+}
+
+func (m *mockCrossUnsafeDeps) IsLocalUnsafe(chainID types.ChainID, blockNum eth.BlockID) error {
+	return nil
+}
+
+func (m *mockCrossUnsafeDeps) ParentBlock(chainID types.ChainID, blockNum eth.BlockID) (eth.BlockID, error) {
+	return eth.BlockID{}, nil
+}
diff --git a/op-supervisor/supervisor/backend/cross/worker.go b/op-supervisor/supervisor/backend/cross/worker.go
new file mode 100644
index 000000000000..1342d7048fab
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/worker.go
@@ -0,0 +1,103 @@
+package cross
+
+import (
+	"context"
+	"errors"
+	"sync"
+	"time"
+
+	"github.com/ethereum/go-ethereum/log"
+)
+
+// Worker iterates work
+type Worker struct {
+	log log.Logger
+
+	// workFn is the function to call to process the scope
+	workFn workFn
+
+	// channel with capacity of 1, full if there is work to do
+	poke         chan struct{}
+	pollDuration time.Duration
+
+	// lifetime management of the chain processor
+	ctx    context.Context
+	cancel context.CancelFunc
+	wg     sync.WaitGroup
+}
+
+// workFn is a function used by the worker
+// it is opaque to the worker, and is set by the constructor
+type workFn func(ctx context.Context) error
+
+// NewWorker creates a new worker to process updates
+func NewWorker(log log.Logger, workFn workFn) *Worker {
+	ctx, cancel := context.WithCancel(context.Background())
+	out := &Worker{
+		log:  log,
+		poke: make(chan struct{}, 1),
+		// The data may have changed, and we may have missed a poke, so re-attempt regularly.
+		pollDuration: time.Second * 4,
+		ctx:          ctx,
+		cancel:       cancel,
+	}
+	out.workFn = workFn
+	return out
+}
+
+func (s *Worker) StartBackground() {
+	s.wg.Add(1)
+	go s.worker()
+}
+
+func (s *Worker) ProcessWork() error {
+	return s.workFn(s.ctx)
+}
+
+func (s *Worker) worker() {
+	defer s.wg.Done()
+
+	delay := time.NewTicker(s.pollDuration)
+	for {
+		if s.ctx.Err() != nil { // check if we are closing down
+			return
+		}
+
+		// do the work
+		err := s.workFn(s.ctx)
+		if err != nil {
+			if errors.Is(err, s.ctx.Err()) {
+				return
+			}
+			s.log.Error("Failed to process work", "err", err)
+		}
+
+		// await next time we process, or detect shutdown
+		select {
+		case <-s.ctx.Done():
+			delay.Stop()
+			return
+		case <-s.poke:
+			s.log.Debug("Continuing cross-safe verification after hint of new data")
+			continue
+		case <-delay.C:
+			s.log.Debug("Checking for cross-safe updates")
+			continue
+		}
+	}
+}
+
+func (s *Worker) OnNewData() error {
+	// signal that we have something to process
+	select {
+	case s.poke <- struct{}{}:
+	default:
+		// already requested an update
+	}
+	return nil
+}
+
+func (s *Worker) Close() {
+	s.cancel()
+	s.wg.Wait()
+}
diff --git a/op-supervisor/supervisor/backend/cross/worker_test.go b/op-supervisor/supervisor/backend/cross/worker_test.go
new file mode 100644
index 000000000000..64f4d2d8d12f
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/worker_test.go
@@ -0,0 +1,106 @@
+package cross
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestWorker(t *testing.T) {
+	logger := testlog.Logger(t, log.LevelDebug)
+	t.Run("do work", func(t *testing.T) {
+		count := 0
+		w := NewWorker(logger, func(ctx context.Context) error {
+			count++
+			return nil
+		})
+		t.Cleanup(w.Close)
+		// when ProcessWork is called, the workFn is called once
+		require.NoError(t, w.ProcessWork())
+		require.Equal(t, 1, count)
+	})
+	t.Run("background worker", func(t *testing.T) {
+		count := 0
+		w := NewWorker(logger, func(ctx context.Context) error {
+			count++
+			return nil
+		})
+		t.Cleanup(w.Close)
+		// set a long poll duration so the worker does not auto-run
+		w.pollDuration = 100 * time.Second
+		// when StartBackground is called, the worker runs in the background
+		// the count should increment once
+		w.StartBackground()
+		require.Eventually(t, func() bool {
+			return count == 1
+		}, 2*time.Second, 100*time.Millisecond)
+	})
+	t.Run("background worker OnNewData", func(t *testing.T) {
+		count := 0
+		w := NewWorker(logger, func(ctx context.Context) error {
+			count++
+			return nil
+		})
+		t.Cleanup(w.Close)
+		// set a long poll duration so the worker does not auto-run
+		w.pollDuration = 100 * time.Second
+		// when StartBackground is called, the worker runs in the background
+		// the count should increment once
+		w.StartBackground()
+		require.Eventually(t, func() bool {
+			return count == 1
+		}, 2*time.Second, 100*time.Millisecond)
+		// when OnNewData is called, the worker runs again
+		require.NoError(t, w.OnNewData())
+		require.Eventually(t, func() bool {
+			return count == 2
+		}, 2*time.Second, 100*time.Millisecond)
+		// and due to the long poll duration, the worker does not run again
+		require.Never(t, func() bool {
+			return count > 2
+		}, 10*time.Second, 100*time.Millisecond)
+	})
+	t.Run("background fast poll", func(t *testing.T) {
+		count := 0
+		w := NewWorker(logger, func(ctx context.Context) error {
+			count++
+			return nil
+		})
+		t.Cleanup(w.Close)
+		// set a long poll duration so the worker does not auto-run
+		w.pollDuration = 100 * time.Millisecond
+		// when StartBackground is called, the worker runs in the background
+		// the count should increment rapidly and reach 10 in 1 second
+		w.StartBackground()
+		require.Eventually(t, func() bool {
+			return count == 10
+		}, 2*time.Second, 100*time.Millisecond)
+	})
+	t.Run("close", func(t *testing.T) {
+		count := 0
+		w := NewWorker(logger, func(ctx context.Context) error {
+			count++
+			return nil
+		})
+		t.Cleanup(w.Close) // close on cleanup in case of early error
+		// set a long poll duration so the worker does not auto-run
+		w.pollDuration = 100 * time.Millisecond
+		// when StartBackground is called, the worker runs in the background
+		// the count should increment rapidly and reach 10 in 1 second
+		w.StartBackground()
+		require.Eventually(t, func() bool {
+			return count == 10
+		}, 2*time.Second, 100*time.Millisecond)
+		// once the worker is closed, it stops running
+		// and the count does not increment
+		w.Close()
+		stopCount := count
+		require.Never(t, func() bool {
+			return count != stopCount
+		}, 3*time.Second, 100*time.Millisecond)
+	})
+}
diff --git a/op-supervisor/supervisor/backend/processors/chain_processor.go b/op-supervisor/supervisor/backend/processors/chain_processor.go
index d27c26fe2bbc..db57e977aae0 100644
--- a/op-supervisor/supervisor/backend/processors/chain_processor.go
+++ b/op-supervisor/supervisor/backend/processors/chain_processor.go
@@ -17,8 +17,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
-var ErrNoRPCSource = errors.New("no RPC client configured")
-
 type Source interface {
 	L1BlockRefByNumber(ctx context.Context, number uint64) (eth.L1BlockRef, error)
 	FetchReceipts(ctx context.Context, blockHash common.Hash) (eth.BlockInfo, gethtypes.Receipts, error)
@@ -137,7 +135,7 @@ func (s *ChainProcessor) work() {
 		if err := s.update(target); err != nil {
 			if errors.Is(err, ethereum.NotFound) {
 				s.log.Info("Cannot find next block yet", "target", target)
-			} else if errors.Is(err, ErrNoRPCSource) {
+			} else if errors.Is(err, types.ErrNoRPCSource) {
 				s.log.Warn("No RPC source configured, cannot process new blocks")
 			} else {
 				s.log.Error("Failed to process new block", "err", err)
@@ -158,7 +156,7 @@ func (s *ChainProcessor) update(nextNum uint64) error {
 	defer s.clientLock.Unlock()
 
 	if s.client == nil {
-		return ErrNoRPCSource
+		return types.ErrNoRPCSource
 	}
 
 	ctx, cancel := context.WithTimeout(s.ctx, time.Second*10)
diff --git a/op-supervisor/supervisor/backend/processors/log_processor_test.go b/op-supervisor/supervisor/backend/processors/log_processor_test.go
index de28b1f6f508..e23ad6933f74 100644
--- a/op-supervisor/supervisor/backend/processors/log_processor_test.go
+++ b/op-supervisor/supervisor/backend/processors/log_processor_test.go
@@ -108,7 +108,7 @@ func TestLogProcessor(t *testing.T) {
 			},
 		}
 		execMsg := types.ExecutingMessage{
-			Chain:     4,
+			Chain:     4, // TODO(#11105): translate chain ID to chain index
 			BlockNum:  6,
 			LogIdx:    8,
 			Timestamp: 10,

From d69e922bc9d0dfef3e55e16bbfe91681863d0849 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 25 Oct 2024 15:54:24 +0100
Subject: [PATCH 032/451] add interfaces for safe contracts (#12650)

* add interfaces for safe contracts, use named imports for DeputyGuardianModule

* fix failing test
---
 packages/contracts-bedrock/semver-lock.json   |  4 +--
 .../src/safe/DeputyGuardianModule.sol         |  6 ++--
 .../safe/interfaces/IDeputyGuardianModule.sol | 32 +++++++++++++++++
 .../src/safe/interfaces/ILivenessGuard.sol    | 32 +++++++++++++++++
 .../src/safe/interfaces/ILivenessModule.sol   | 34 +++++++++++++++++++
 .../test/universal/Specs.t.sol                |  3 +-
 6 files changed, 105 insertions(+), 6 deletions(-)
 create mode 100644 packages/contracts-bedrock/src/safe/interfaces/IDeputyGuardianModule.sol
 create mode 100644 packages/contracts-bedrock/src/safe/interfaces/ILivenessGuard.sol
 create mode 100644 packages/contracts-bedrock/src/safe/interfaces/ILivenessModule.sol

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 3ba87ad738b0..712a014680e4 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -196,8 +196,8 @@
     "sourceCodeHash": "0x3a0a294932d6deba043f6a2b46b4e8477ee96e7fb054d7e7229a43ce4352c68d"
   },
   "src/safe/DeputyGuardianModule.sol": {
-    "initCodeHash": "0x308212d163aad169a5e42ce703a1ce36f5425ad96037850c0747177041f6596e",
-    "sourceCodeHash": "0xde1a289c1cb0bf92138daf8f3db7457be2f84bedaa111b536f646dd6e121718c"
+    "initCodeHash": "0xd95e562f395d4eb6e332f4474dffab660ada9e9da7c79f58fb6052278e0904df",
+    "sourceCodeHash": "0x45daabe094de0287e244e6fea4f1887b9adc09b07c47dc77361b1678645a1470"
   },
   "src/safe/LivenessGuard.sol": {
     "initCodeHash": "0x9ac0b039b1591f7c00cf11cb758d118c9b42e6e08250b619d6b6fd605a43d5ee",
diff --git a/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol b/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol
index 0882910d5072..673cf2a1efb6 100644
--- a/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol
+++ b/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol
@@ -7,7 +7,7 @@ import { Enum } from "safe-contracts/common/Enum.sol";
 
 // Libraries
 import { Unauthorized } from "src/libraries/PortalErrors.sol";
-import "src/dispute/lib/Types.sol";
+import { GameType, Timestamp } from "src/dispute/lib/Types.sol";
 
 // Interfaces
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
@@ -48,8 +48,8 @@ contract DeputyGuardianModule is ISemver {
     address internal immutable DEPUTY_GUARDIAN;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.0.1-beta.3
-    string public constant version = "2.0.1-beta.3";
+    /// @custom:semver 2.0.1-beta.4
+    string public constant version = "2.0.1-beta.4";
 
     // Constructor to initialize the Safe and baseModule instances
     constructor(Safe _safe, ISuperchainConfig _superchainConfig, address _deputyGuardian) {
diff --git a/packages/contracts-bedrock/src/safe/interfaces/IDeputyGuardianModule.sol b/packages/contracts-bedrock/src/safe/interfaces/IDeputyGuardianModule.sol
new file mode 100644
index 000000000000..da74cf4dd983
--- /dev/null
+++ b/packages/contracts-bedrock/src/safe/interfaces/IDeputyGuardianModule.sol
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
+import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { GameType, Timestamp } from "src/dispute/lib/Types.sol";
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
+
+interface IDeputyGuardianModule is ISemver {
+    error ExecutionFailed(string);
+    error Unauthorized();
+
+    event Paused(string identifier);
+    event Unpaused();
+    event DisputeGameBlacklisted(IDisputeGame indexed game);
+    event RespectedGameTypeSet(GameType indexed gameType, Timestamp indexed updatedAt);
+
+    function version() external view returns (string memory);
+    function __constructor__(Safe _safe, ISuperchainConfig _superchainConfig, address _deputyGuardian) external;
+    function safe() external view returns (Safe safe_);
+    function superchainConfig() external view returns (ISuperchainConfig superchainConfig_);
+    function deputyGuardian() external view returns (address deputyGuardian_);
+    function pause() external;
+    function unpause() external;
+    function setAnchorState(IAnchorStateRegistry _registry, IFaultDisputeGame _game) external;
+    function blacklistDisputeGame(IOptimismPortal2 _portal, IDisputeGame _game) external;
+    function setRespectedGameType(IOptimismPortal2 _portal, GameType _gameType) external;
+}
diff --git a/packages/contracts-bedrock/src/safe/interfaces/ILivenessGuard.sol b/packages/contracts-bedrock/src/safe/interfaces/ILivenessGuard.sol
new file mode 100644
index 000000000000..a69921211955
--- /dev/null
+++ b/packages/contracts-bedrock/src/safe/interfaces/ILivenessGuard.sol
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
+import { Enum } from "safe-contracts/common/Enum.sol";
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
+interface ILivenessGuard is ISemver {
+    event OwnerRecorded(address owner);
+
+    function lastLive(address) external view returns (uint256);
+    function version() external view returns (string memory);
+    function __constructor__(Safe _safe) external;
+
+    function safe() external view returns (Safe safe_);
+    function checkTransaction(
+        address _to,
+        uint256 _value,
+        bytes memory _data,
+        Enum.Operation _operation,
+        uint256 _safeTxGas,
+        uint256 _baseGas,
+        uint256 _gasPrice,
+        address _gasToken,
+        address payable _refundReceiver,
+        bytes memory _signatures,
+        address _msgSender
+    )
+        external;
+    function checkAfterExecution(bytes32, bool) external;
+    function showLiveness() external;
+}
diff --git a/packages/contracts-bedrock/src/safe/interfaces/ILivenessModule.sol b/packages/contracts-bedrock/src/safe/interfaces/ILivenessModule.sol
new file mode 100644
index 000000000000..43711d508597
--- /dev/null
+++ b/packages/contracts-bedrock/src/safe/interfaces/ILivenessModule.sol
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
+import { LivenessGuard } from "src/safe/LivenessGuard.sol";
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
+interface ILivenessModule is ISemver {
+    error OwnerRemovalFailed(string);
+
+    event RemovedOwner(address indexed owner);
+    event OwnershipTransferredToFallback();
+
+    function ownershipTransferredToFallback() external view returns (bool);
+    function version() external view returns (string memory);
+    function __constructor__(
+        Safe _safe,
+        LivenessGuard _livenessGuard,
+        uint256 _livenessInterval,
+        uint256 _minOwners,
+        uint256 _thresholdPercentage,
+        address _fallbackOwner
+    )
+        external;
+    function getRequiredThreshold(uint256 _numOwners) external view returns (uint256 threshold_);
+    function safe() external view returns (Safe safe_);
+    function livenessGuard() external view returns (LivenessGuard livenessGuard_);
+    function livenessInterval() external view returns (uint256 livenessInterval_);
+    function minOwners() external view returns (uint256 minOwners_);
+    function thresholdPercentage() external view returns (uint256 thresholdPercentage_);
+    function fallbackOwner() external view returns (address fallbackOwner_);
+    function canRemove(address _owner) external view returns (bool canRemove_);
+    function removeOwners(address[] memory _previousOwners, address[] memory _ownersToRemove) external;
+}
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index f6f6b989896b..9c22e178a5f4 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -953,12 +953,13 @@ contract Specification_Test is CommonTest {
 
     /// @notice Ensures that there's an auth spec for every L1 contract function.
     function testContractAuth() public {
-        string[] memory pathExcludes = new string[](5);
+        string[] memory pathExcludes = new string[](6);
         pathExcludes[0] = "src/dispute/interfaces/*";
         pathExcludes[1] = "src/dispute/lib/*";
         pathExcludes[2] = "src/safe/SafeSigners.sol";
         pathExcludes[3] = "src/L1/interfaces/*";
         pathExcludes[4] = "src/governance/interfaces/*";
+        pathExcludes[5] = "src/safe/interfaces/*";
         Abi[] memory abis = ForgeArtifacts.getContractFunctionAbis(
             "src/{L1,dispute,governance,safe,universal/ProxyAdmin.sol,universal/WETH98.sol}", pathExcludes
         );

From 02d5832349a1f469adb00191459333e2032b09b4 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 25 Oct 2024 22:29:57 +0700
Subject: [PATCH 033/451] maint(ct): rm fee vault withdrawal script (#12638)

Removes the FeeVaultWithdrawal.s.sol script that was previously
used to trigger withdrawals manually. All of this is automated now
and you can just use Etherscan if you really want to do things
manually so the value of the script is minimal.
---
 .../scripts/ops/FeeVaultWithdrawal.s.sol      | 74 -------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 packages/contracts-bedrock/scripts/ops/FeeVaultWithdrawal.s.sol

diff --git a/packages/contracts-bedrock/scripts/ops/FeeVaultWithdrawal.s.sol b/packages/contracts-bedrock/scripts/ops/FeeVaultWithdrawal.s.sol
deleted file mode 100644
index 9e5bb96cfe31..000000000000
--- a/packages/contracts-bedrock/scripts/ops/FeeVaultWithdrawal.s.sol
+++ /dev/null
@@ -1,74 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { console } from "forge-std/console.sol";
-import { Script } from "forge-std/Script.sol";
-import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
-import { IFeeVault } from "src/L2/interfaces/IFeeVault.sol";
-
-/// @title FeeVaultWithdrawal
-/// @notice A script to make it very simple to withdraw from the fee vaults.
-///         The usage is as follows:
-///         $ forge script scripts/FeeVaultWithdrawal.s.sol \
-///             --rpc-url $ETH_RPC_URL --broadcast \
-///             --private-key $PRIVATE_KEY
-contract FeeVaultWithdrawal is Script {
-    IMulticall3 private constant multicall = IMulticall3(MULTICALL3_ADDRESS);
-    IMulticall3.Call3[] internal calls;
-
-    /// @notice The entrypoint function. Determines which FeeVaults can be withdrawn from and then
-    ///        will send the transaction via Multicall3 to withdraw all FeeVaults.
-    function run() external {
-        require(address(multicall).code.length > 0);
-
-        address[] memory vaults = new address[](3);
-        vaults[0] = Predeploys.SEQUENCER_FEE_WALLET;
-        vaults[1] = Predeploys.BASE_FEE_VAULT;
-        vaults[2] = Predeploys.L1_FEE_VAULT;
-
-        for (uint256 i; i < vaults.length; i++) {
-            address vault = vaults[i];
-            bool shouldCall = canWithdrawal(vault);
-            if (shouldCall) {
-                calls.push(
-                    IMulticall3.Call3({
-                        target: vault,
-                        allowFailure: false,
-                        callData: abi.encodeWithSelector(IFeeVault.withdraw.selector)
-                    })
-                );
-
-                address recipient = IFeeVault(payable(vault)).RECIPIENT();
-                uint256 balance = vault.balance;
-                log(balance, recipient, vault);
-            } else {
-                string memory logline =
-                    string.concat(vm.toString(vault), " does not have a large enough balance to withdraw.");
-                console.log(logline);
-            }
-        }
-
-        if (calls.length > 0) {
-            vm.broadcast();
-            multicall.aggregate3(calls);
-            console.log("Success.");
-        }
-    }
-
-    /// @notice Checks whether or not a FeeVault can be withdrawn. The balance of the account must
-    ///         be larger than the `MIN_WITHDRAWAL_AMOUNT`.
-    function canWithdrawal(address _vault) internal view returns (bool) {
-        uint256 minWithdrawalAmount = IFeeVault(payable(_vault)).MIN_WITHDRAWAL_AMOUNT();
-        uint256 balance = _vault.balance;
-        return balance >= minWithdrawalAmount;
-    }
-
-    /// @notice Logs the information relevant to the user.
-    function log(uint256 _balance, address _recipient, address _vault) internal pure {
-        string memory logline = string.concat(
-            "Withdrawing ", vm.toString(_balance), " to ", vm.toString(_recipient), " from ", vm.toString(_vault)
-        );
-        console.log(logline);
-    }
-}

From a095d32da8ddfd1a9007a7db8a78dea2c3b1cff2 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Sat, 26 Oct 2024 05:00:57 +0100
Subject: [PATCH 034/451] fix failing interfaces (#12648)

* fix failing interfaces

* fix crossl2inbox, revert some changes

* fix semgrep error
---
 .../contracts-bedrock/scripts/L2Genesis.s.sol |  4 -
 .../scripts/checks/interfaces/main.go         |  5 +-
 packages/contracts-bedrock/semver-lock.json   | 44 +++++-----
 .../snapshots/abi/CrossL2Inbox.json           |  6 +-
 .../abi/L2ToL2CrossDomainMessenger.json       |  2 +-
 .../src/L1/L1StandardBridge.sol               |  4 +-
 .../contracts-bedrock/src/L2/CrossL2Inbox.sol | 16 +++-
 .../src/L2/L2ERC721Bridge.sol                 |  4 +-
 .../src/L2/L2StandardBridge.sol               |  4 +-
 .../src/L2/L2StandardBridgeInterop.sol        |  4 +-
 .../src/L2/L2ToL2CrossDomainMessenger.sol     | 19 ++---
 .../src/L2/interfaces/ICrossL2Inbox.sol       | 69 ++++++++++------
 .../IL2ToL2CrossDomainMessenger.sol           | 73 ++++++++++++++---
 .../src/L2/interfaces/ISuperchainWETH.sol     |  7 +-
 .../src/dispute/FaultDisputeGame.sol          |  4 +-
 .../src/dispute/interfaces/IDelayedWETH.sol   | 10 ++-
 .../src/legacy/LegacyMintableERC20.sol        |  2 +-
 .../src/universal/OptimismMintableERC20.sol   | 29 ++-----
 .../OptimismMintableERC20Factory.sol          |  4 +-
 .../src/universal/OptimismMintableERC721.sol  | 40 ++++++---
 .../OptimismMintableERC721Factory.sol         |  4 +-
 .../src/universal/StandardBridge.sol          |  3 +-
 .../src/universal/WETH98.sol                  | 71 ++++++++++++----
 .../interfaces/ILegacyMintableERC20.sol       | 17 ++++
 .../interfaces/IOptimismMintableERC20.sol     | 13 ---
 .../interfaces/IOptimismMintableERC721.sol    | 72 +++++++++++------
 .../src/universal/interfaces/IWETH.sol        | 81 -------------------
 .../src/universal/interfaces/IWETH98.sol      | 39 +++++++++
 .../test/L2/CrossL2Inbox.t.sol                | 41 ++++------
 .../test/L2/L2ToL2CrossDomainMessenger.t.sol  | 44 +++++-----
 .../contracts-bedrock/test/setup/Setup.sol    |  4 +-
 .../universal/OptimismMintableERC20.t.sol     |  3 +-
 .../test/universal/StandardBridge.t.sol       |  2 +-
 semgrep/sol-rules.yaml                        |  3 +
 34 files changed, 418 insertions(+), 329 deletions(-)
 create mode 100644 packages/contracts-bedrock/src/universal/interfaces/ILegacyMintableERC20.sol
 delete mode 100644 packages/contracts-bedrock/src/universal/interfaces/IWETH.sol
 create mode 100644 packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol

diff --git a/packages/contracts-bedrock/scripts/L2Genesis.s.sol b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
index 4c4079d78064..207c59732146 100644
--- a/packages/contracts-bedrock/scripts/L2Genesis.s.sol
+++ b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
@@ -32,10 +32,6 @@ import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMesseng
 import { IGasPriceOracle } from "src/L2/interfaces/IGasPriceOracle.sol";
 import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 
-interface IInitializable {
-    function initialize(address _addr) external;
-}
-
 struct L1Dependencies {
     address payable l1CrossDomainMessengerProxy;
     address payable l1StandardBridgeProxy;
diff --git a/packages/contracts-bedrock/scripts/checks/interfaces/main.go b/packages/contracts-bedrock/scripts/checks/interfaces/main.go
index 73d3af062707..5d62a2e3b4ff 100644
--- a/packages/contracts-bedrock/scripts/checks/interfaces/main.go
+++ b/packages/contracts-bedrock/scripts/checks/interfaces/main.go
@@ -26,9 +26,8 @@ var excludeContracts = []string{
 	"IEAS", "ISchemaResolver", "ISchemaRegistry",
 
 	// TODO: Interfaces that need to be fixed
-	"IInitializable", "ILegacyMintableERC20", "IOptimismMintableERC20",
-	"IOptimismMintableERC721", "KontrolCheatsBase", "IWETH", "IDelayedWETH", "ISuperchainWETH",
-	"IL2ToL2CrossDomainMessenger", "ICrossL2Inbox", "ISystemConfigInterop", "IResolvedDelegateProxy",
+	"IInitializable", "IOptimismMintableERC20", "ILegacyMintableERC20",
+	"KontrolCheatsBase", "ISystemConfigInterop", "IResolvedDelegateProxy",
 }
 
 type ContractDefinition struct {
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 712a014680e4..57567ec570c7 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -16,8 +16,8 @@
     "sourceCodeHash": "0x289de9f40898b6305deecc6b60cdf566aa6c6a1444f713c3a0af23ea7878207e"
   },
   "src/L1/L1StandardBridge.sol": {
-    "initCodeHash": "0x2868b09ecbe9f2bbc885605c2886b4c79f1c8e4171626c63776603b1b84698a8",
-    "sourceCodeHash": "0xc03da137b3ea72e0109fb284229283b21a0303104afbe37d2fe86ad806392a7f"
+    "initCodeHash": "0x802f72745bb9a82dc049377bb9cf6b58f35aec388aeb957b28a5e14f28d91bc1",
+    "sourceCodeHash": "0x24b784645b065a5393a2115a078d67f91eb09afd5e70baf81daf975381f16155"
   },
   "src/L1/L2OutputOracle.sol": {
     "initCodeHash": "0x1182bfb87c4ab399b912ca7fe18cdbf4b24c414e078fb0a55bd3c44d442d3ed1",
@@ -60,8 +60,8 @@
     "sourceCodeHash": "0x983e8e248c61e362ba6a01dd2e217a535c9bb828dc0b4421f5f27e0577f2e14c"
   },
   "src/L2/CrossL2Inbox.sol": {
-    "initCodeHash": "0x66b052adce7e9194d054952d67d08b53964120067600358243ec86c85b90877b",
-    "sourceCodeHash": "0x38e6127ec6be99eb8c38c2c9d6e82761b33dde446bba250dc2c1b84983449e4e"
+    "initCodeHash": "0x31ecaebf368ab3333e80c6dc004b3c9f9a31f813c3138ab388bb3eead9f1b4ee",
+    "sourceCodeHash": "0xa1779d84a14332dcdd167293171d0fe2629d759a23d7cc34ffe2bde7e1605dbc"
   },
   "src/L2/ETHLiquidity.sol": {
     "initCodeHash": "0x713c18f95a6a746d0703f475f3ae10c106c9b9ecb64d881a2e61b8969b581371",
@@ -88,24 +88,24 @@
     "sourceCodeHash": "0x56edf0f36366326a92722ae3c7502bce3d80b2ee5e354181dc09ba801437a488"
   },
   "src/L2/L2ERC721Bridge.sol": {
-    "initCodeHash": "0xb8236514beabcc1830e5e7e9eccb965e30d01f8bbb5a2d8b4f3d241c2d12819b",
-    "sourceCodeHash": "0x268e34289b7b8a5d1785af1907bd07d1c8ce4a9e3ea1685bdd9a77904dab3557"
+    "initCodeHash": "0xaed0528e8b81817a0c3b41513c02e7fd678f58e34b98f02ea33d5a770a064c2f",
+    "sourceCodeHash": "0xf8569c75b801f38f8a5a41e94e90f159ddc5f5412804b26e3e564755a50631b8"
   },
   "src/L2/L2StandardBridge.sol": {
-    "initCodeHash": "0x651eed10044d0b19b7e4eba864345df15e252be1401f39a552ec0d2f9c4df064",
-    "sourceCodeHash": "0xb55e58b5d4912edf05026878a5f5ac8019372212ed2a77843775d595fbf51b84"
+    "initCodeHash": "0xcb4aa19f0cd43a35cb5c65f26c3cfd7c41f1d1e5bcc15aef6096d385df7272c9",
+    "sourceCodeHash": "0x89771b53b7f6e64d943afb2a4bf15395efcf20d5302b76a18e52fa7cce8cdc56"
   },
   "src/L2/L2StandardBridgeInterop.sol": {
-    "initCodeHash": "0xd43d07c2ba5a73af56181c0221c28f3b495851b03cf8e35f9b009857bb9538a6",
-    "sourceCodeHash": "0x36087332a4365ee172eed8fa35aa48e804b08279e97332058a588c2d4ae30c6b"
+    "initCodeHash": "0xc4eaece28d2cfca3c51247c3cce320a167a83c7fd13aea5736549d2b25e0b139",
+    "sourceCodeHash": "0x9e80044adf5f83c30b520ee153b75be5a152081c9e1271e7e618ecfccd1fb4ac"
   },
   "src/L2/L2ToL1MessagePasser.sol": {
     "initCodeHash": "0x13fe3729beb9ed966c97bef09acb9fe5043fe651d453145073d05f2567fa988d",
     "sourceCodeHash": "0xd08a2e6514dbd44e16aa312a1b27b2841a9eab5622cbd05a39c30f543fad673c"
   },
   "src/L2/L2ToL2CrossDomainMessenger.sol": {
-    "initCodeHash": "0x6eb3718548d97b69c201a75c27a3a5a77400ebd5e0a9bdcc06e2cc28f9b4a689",
-    "sourceCodeHash": "0x4bb08a8a9d5de37d1fb2dd8a9bcc483305510c32508f0be2d54757e6e257aedb"
+    "initCodeHash": "0x2a1a1ee4f47175ce661ee8e4e50cfa879b082dcb5278b1d66ddda00ed77bb744",
+    "sourceCodeHash": "0xa76133db7f449ae742f9ba988ad86ccb5672475f61298b9fefe411b63b63e9f6"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
     "initCodeHash": "0x24d85d246858d1aff78ae86c614dd0dc0f63b3326b2b662e3462c3a6f9b7965e",
@@ -164,8 +164,8 @@
     "sourceCodeHash": "0x9cb0851b6e471461f2bb369bd72eef4cffe8a0d1345546608a2aa6795540211d"
   },
   "src/dispute/FaultDisputeGame.sol": {
-    "initCodeHash": "0xf97d35adc72c7bcbb5415ff1b183af0a4e3c951696d1dde213df61df50c848b9",
-    "sourceCodeHash": "0x27b4ab6f75004d01ff177b2b26e500a8ad06e906fcd36b920daa067f27f97da6"
+    "initCodeHash": "0x1480098a19f71ce6b4f4548880c8794402315ed3efa6793241a3df0fae864205",
+    "sourceCodeHash": "0x2f084f3f0e52017beb2ecf571178b94ba885cca987ada472d9e178b486a91d9e"
   },
   "src/legacy/DeployerWhitelist.sol": {
     "initCodeHash": "0x0b8177ed75b69eddbb9ce6537683f69a9935efed86a1d6faa8feaafbd151c1bd",
@@ -208,20 +208,20 @@
     "sourceCodeHash": "0xd1479c60087f352385b6d5379ef3cc07839f671d617626b4c94ece91da781ef2"
   },
   "src/universal/OptimismMintableERC20.sol": {
-    "initCodeHash": "0x28c88484e1932253d6d12954492ac8a70744dc15c84429089af9944e5b158fd9",
-    "sourceCodeHash": "0x740b4043436d1b314ee3ba145acfcde60b6abd8416ea594f2b8e890b5d0bce6b"
+    "initCodeHash": "0x9cd677275b175812f1d5f90a127dbf7b3592714fd842a7a0de3988d716ca3eac",
+    "sourceCodeHash": "0x5611d8082f68af566554d7f09640b4b1f0e3efee4da1372b68fc7fc538a35ac7"
   },
   "src/universal/OptimismMintableERC20Factory.sol": {
-    "initCodeHash": "0x9cd4102d3ca811d5dc67ae99ce7de95812264575a789f96a6057600e55dcab64",
-    "sourceCodeHash": "0xc70c8c11d6e754eabe746bbee47a5e1051f71f7a83913f62ebcce8db989a1357"
+    "initCodeHash": "0x03ad07bd7f89a29f1850fa8b5d377daf0e1d5aef6cb458a127df520549e8e8e6",
+    "sourceCodeHash": "0xdb6ec93782a4a217475195507740794a4f5553b9032e7ba31dc48b81f579a940"
   },
   "src/universal/OptimismMintableERC721.sol": {
-    "initCodeHash": "0xec037be7fc28e072944b0a9e55d4278b92d6c68ccb41049ab52eafca59c6e023",
-    "sourceCodeHash": "0x5ea7c1b0cef5609f25c4193f5795fc9ce8f3ae08dbbf2945afe38e5af58f32c3"
+    "initCodeHash": "0x8aa309f2676d5267b6c9e411f88dc6e4badce414b8d66b330df3f60e9836380e",
+    "sourceCodeHash": "0x03bf7ad4d2b751bdead9930fc8f89b8e55d40dd4b2f5670fd339e87ae81f8b49"
   },
   "src/universal/OptimismMintableERC721Factory.sol": {
-    "initCodeHash": "0x63d2ceafd3f3b3b54e31749574563e8022fef9c6da7bb8c7a113b3dbf571cfa2",
-    "sourceCodeHash": "0x705e270925fcad14e805b5ec1bbbb9e78b5b44e3b128f284b0113a4d68c82ef6"
+    "initCodeHash": "0x5ea977ba35558c3b75bebe28900548c763d205e40d6cf7660292b8e96bf3aea8",
+    "sourceCodeHash": "0x063ca3a0a2e3c592173af6157e383b5aaeff752000f98648a5c71260bb26590a"
   },
   "src/universal/StorageSetter.sol": {
     "initCodeHash": "0x21b3059e9b13b330f76d02b61f61dcfa3abf3517a0b56afa0895c4b8291740bf",
diff --git a/packages/contracts-bedrock/snapshots/abi/CrossL2Inbox.json b/packages/contracts-bedrock/snapshots/abi/CrossL2Inbox.json
index 6f8c10e82eed..47eeab3f07f1 100644
--- a/packages/contracts-bedrock/snapshots/abi/CrossL2Inbox.json
+++ b/packages/contracts-bedrock/snapshots/abi/CrossL2Inbox.json
@@ -55,7 +55,7 @@
             "type": "uint256"
           }
         ],
-        "internalType": "struct ICrossL2Inbox.Identifier",
+        "internalType": "struct Identifier",
         "name": "_id",
         "type": "tuple"
       },
@@ -164,7 +164,7 @@
             "type": "uint256"
           }
         ],
-        "internalType": "struct ICrossL2Inbox.Identifier",
+        "internalType": "struct Identifier",
         "name": "_id",
         "type": "tuple"
       },
@@ -230,7 +230,7 @@
           }
         ],
         "indexed": false,
-        "internalType": "struct ICrossL2Inbox.Identifier",
+        "internalType": "struct Identifier",
         "name": "id",
         "type": "tuple"
       }
diff --git a/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json
index daefa3a74386..6434233930db 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json
@@ -99,7 +99,7 @@
             "type": "uint256"
           }
         ],
-        "internalType": "struct ICrossL2Inbox.Identifier",
+        "internalType": "struct Identifier",
         "name": "_id",
         "type": "tuple"
       },
diff --git a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
index 6dd648f0d541..54cc833fe673 100644
--- a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
@@ -75,8 +75,8 @@ contract L1StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 2.2.1-beta.1
-    string public constant version = "2.2.1-beta.1";
+    /// @custom:semver 2.2.1-beta.2
+    string public constant version = "2.2.1-beta.2";
 
     /// @notice Address of the SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
diff --git a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
index 7939dccddbb4..b330dfb0ceb4 100644
--- a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
+++ b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.25;
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { TransientContext, TransientReentrancyAware } from "src/libraries/TransientContext.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ICrossL2Inbox } from "src/L2/interfaces/ICrossL2Inbox.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { IDependencySet } from "src/L2/interfaces/IDependencySet.sol";
 import { IL1BlockInterop } from "src/L2/interfaces/IL1BlockInterop.sol";
@@ -30,12 +29,21 @@ error TargetCallFailed();
 /// @notice Thrown when trying to execute a cross chain message on a deposit transaction.
 error NoExecutingDeposits();
 
+/// @notice The struct for a pointer to a message payload in a remote (or local) chain.
+struct Identifier {
+    address origin;
+    uint256 blockNumber;
+    uint256 logIndex;
+    uint256 timestamp;
+    uint256 chainId;
+}
+
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000022
 /// @title CrossL2Inbox
 /// @notice The CrossL2Inbox is responsible for executing a cross chain message on the destination
 ///         chain. It is permissionless to execute a cross chain message on behalf of any user.
-contract CrossL2Inbox is ICrossL2Inbox, ISemver, TransientReentrancyAware {
+contract CrossL2Inbox is ISemver, TransientReentrancyAware {
     /// @notice Storage slot that the interop start timestamp is stored at.
     ///         Equal to bytes32(uint256(keccak256("crossl2inbox.interopstart")) - 1)
     bytes32 internal constant INTEROP_START_SLOT = 0x5c769ee0ee8887661922049dc52480bb60322d765161507707dd9b190af5c149;
@@ -65,8 +73,8 @@ contract CrossL2Inbox is ICrossL2Inbox, ISemver, TransientReentrancyAware {
     address internal constant DEPOSITOR_ACCOUNT = 0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.8
-    string public constant version = "1.0.0-beta.8";
+    /// @custom:semver 1.0.0-beta.9
+    string public constant version = "1.0.0-beta.9";
 
     /// @notice Emitted when a cross chain message is being executed.
     /// @param msgHash Hash of message payload being executed.
diff --git a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
index 7db9cc17aaa7..85c6856e629d 100644
--- a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
@@ -26,8 +26,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 ///         wait for the one-week challenge period to elapse before their Optimism-native NFT
 ///         can be refunded on L2.
 contract L2ERC721Bridge is ERC721Bridge, ISemver {
-    /// @custom:semver 1.8.0-beta.1
-    string public constant version = "1.8.0-beta.1";
+    /// @custom:semver 1.8.0-beta.2
+    string public constant version = "1.8.0-beta.2";
 
     /// @notice Constructs the L2ERC721Bridge contract.
     constructor() ERC721Bridge() {
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
index 1c7e2e307cc3..63bda3209fbb 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
@@ -58,9 +58,9 @@ contract L2StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.11.1-beta.2
+    /// @custom:semver 1.11.1-beta.3
     function version() public pure virtual returns (string memory) {
-        return "1.11.1-beta.2";
+        return "1.11.1-beta.3";
     }
 
     /// @notice Constructs the L2StandardBridge contract.
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
index eb25a406ede7..e17ef29dd964 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
@@ -40,9 +40,9 @@ contract L2StandardBridgeInterop is L2StandardBridge {
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
     /// @notice Semantic version.
-    /// @custom:semver +interop-beta.1
+    /// @custom:semver +interop-beta.2
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.1");
+        return string.concat(super.version(), "+interop-beta.2");
     }
 
     /// @notice Converts `amount` of `from` token to `to` token.
diff --git a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
index c8afe8be5d92..6b1d7327dbc0 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
@@ -4,9 +4,7 @@ pragma solidity 0.8.25;
 import { Encoding } from "src/libraries/Encoding.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { CrossL2Inbox } from "src/L2/CrossL2Inbox.sol";
-import { ICrossL2Inbox } from "src/L2/interfaces/ICrossL2Inbox.sol";
-import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
+import { CrossL2Inbox, Identifier } from "src/L2/CrossL2Inbox.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { TransientReentrancyAware } from "src/libraries/TransientContext.sol";
@@ -47,7 +45,7 @@ error TargetCallFailed();
 /// @notice The L2ToL2CrossDomainMessenger is a higher level abstraction on top of the CrossL2Inbox that provides
 ///         features necessary for secure transfers ERC20 tokens between L2 chains. Messages sent through the
 ///         L2ToL2CrossDomainMessenger on the source chain receive both replay protection as well as domain binding.
-contract L2ToL2CrossDomainMessenger is IL2ToL2CrossDomainMessenger, ISemver, TransientReentrancyAware {
+contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
     /// @notice Storage slot for the sender of the current cross domain message.
     ///         Equal to bytes32(uint256(keccak256("l2tol2crossdomainmessenger.sender")) - 1)
     bytes32 internal constant CROSS_DOMAIN_MESSAGE_SENDER_SLOT =
@@ -67,8 +65,8 @@ contract L2ToL2CrossDomainMessenger is IL2ToL2CrossDomainMessenger, ISemver, Tra
     uint16 public constant messageVersion = uint16(0);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.9
-    string public constant version = "1.0.0-beta.9";
+    /// @custom:semver 1.0.0-beta.10
+    string public constant version = "1.0.0-beta.10";
 
     /// @notice Mapping of message hashes to boolean receipt values. Note that a message will only be present in this
     ///         mapping if it has successfully been relayed on this chain, and can therefore not be relayed again.
@@ -153,14 +151,7 @@ contract L2ToL2CrossDomainMessenger is IL2ToL2CrossDomainMessenger, ISemver, Tra
     ///         currently being replayed.
     /// @param _id          Identifier of the SentMessage event to be relayed
     /// @param _sentMessage Message payload of the `SentMessage` event
-    function relayMessage(
-        ICrossL2Inbox.Identifier calldata _id,
-        bytes calldata _sentMessage
-    )
-        external
-        payable
-        nonReentrant
-    {
+    function relayMessage(Identifier calldata _id, bytes calldata _sentMessage) external payable nonReentrant {
         // Ensure the log came from the messenger. Since the log origin is the CDM, there isn't a scenario where
         // this can be invoked from the CrossL2Inbox as the SentMessage log is not calldata for this function
         if (_id.origin != Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER) {
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ICrossL2Inbox.sol b/packages/contracts-bedrock/src/L2/interfaces/ICrossL2Inbox.sol
index 3267122fc0b1..bbd8c09afd8c 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ICrossL2Inbox.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ICrossL2Inbox.sol
@@ -1,53 +1,70 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+struct Identifier {
+    address origin;
+    uint256 blockNumber;
+    uint256 logIndex;
+    uint256 timestamp;
+    uint256 chainId;
+}
+
 /// @title ICrossL2Inbox
 /// @notice Interface for the CrossL2Inbox contract.
 interface ICrossL2Inbox {
-    /// @notice The struct for a pointer to a message payload in a remote (or local) chain.
-    struct Identifier {
-        address origin;
-        uint256 blockNumber;
-        uint256 logIndex;
-        uint256 timestamp;
-        uint256 chainId;
-    }
+    error ReentrantCall();
+
+    /// @notice Thrown when the caller is not DEPOSITOR_ACCOUNT when calling `setInteropStart()`
+    error NotDepositor();
+
+    /// @notice Thrown when attempting to set interop start when it's already set.
+    error InteropStartAlreadySet();
+
+    /// @notice Thrown when a non-written transient storage slot is attempted to be read from.
+    error NotEntered();
+
+    /// @notice Thrown when trying to execute a cross chain message with an invalid Identifier timestamp.
+    error InvalidTimestamp();
+
+    /// @notice Thrown when trying to execute a cross chain message with an invalid Identifier chain ID.
+    error InvalidChainId();
+
+    /// @notice Thrown when trying to execute a cross chain message and the target call fails.
+    error TargetCallFailed();
+
+    /// @notice Thrown when trying to execute a cross chain message on a deposit transaction.
+    error NoExecutingDeposits();
+
+    event ExecutingMessage(bytes32 indexed msgHash, Identifier id);
+
+    function version() external view returns (string memory);
 
     /// @notice Returns the interop start timestamp.
     /// @return interopStart_ interop start timestamp.
     function interopStart() external view returns (uint256 interopStart_);
 
     /// @notice Returns the origin address of the Identifier.
-    /// @return origin_ The origin address of the Identifier.
-    function origin() external view returns (address origin_);
+    function origin() external view returns (address);
 
     /// @notice Returns the block number of the Identifier.
-    /// @return blockNumber_ The block number of the Identifier.
-    function blockNumber() external view returns (uint256 blockNumber_);
+    function blockNumber() external view returns (uint256);
 
     /// @notice Returns the log index of the Identifier.
-    /// @return logIndex_ The log index of the Identifier.
-    function logIndex() external view returns (uint256 logIndex_);
+    function logIndex() external view returns (uint256);
 
     /// @notice Returns the timestamp of the Identifier.
-    /// @return timestamp_ The timestamp of the Identifier.
-    function timestamp() external view returns (uint256 timestamp_);
+    function timestamp() external view returns (uint256);
 
     /// @notice Returns the chain ID of the Identifier.
-    /// @return chainId_ The chain ID of the Identifier.
-    function chainId() external view returns (uint256 chainId_);
+    function chainId() external view returns (uint256);
+
+    function setInteropStart() external;
 
     /// @notice Executes a cross chain message on the destination chain.
     /// @param _id An Identifier pointing to the initiating message.
     /// @param _target Account that is called with _msg.
-    /// @param _msg The message payload, matching the initiating message.
-    function executeMessage(
-        ICrossL2Inbox.Identifier calldata _id,
-        address _target,
-        bytes calldata _msg
-    )
-        external
-        payable;
+    /// @param _message The message payload, matching the initiating message.
+    function executeMessage(Identifier calldata _id, address _target, bytes calldata _message) external payable;
 
     /// @notice Validates a cross chain message on the destination chain
     ///         and emits an ExecutingMessage event. This function is useful
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol
index f8a803d78be8..00ca4906b5c4 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol
@@ -1,17 +1,70 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossL2Inbox } from "src/L2/interfaces/ICrossL2Inbox.sol";
+struct Identifier {
+    address origin;
+    uint256 blockNumber;
+    uint256 logIndex;
+    uint256 timestamp;
+    uint256 chainId;
+}
 
 /// @title IL2ToL2CrossDomainMessenger
 /// @notice Interface for the L2ToL2CrossDomainMessenger contract.
 interface IL2ToL2CrossDomainMessenger {
+    /// @notice Thrown when a non-written slot in transient storage is attempted to be read from.
+    error NotEntered();
+
+    /// @notice Thrown when attempting to relay a message where payload origin is not L2ToL2CrossDomainMessenger.
+    error IdOriginNotL2ToL2CrossDomainMessenger();
+
+    /// @notice Thrown when the payload provided to the relay is not a SentMessage event.
+    error EventPayloadNotSentMessage();
+
+    /// @notice Thrown when attempting to send a message to the chain that the message is being sent from.
+    error MessageDestinationSameChain();
+
+    /// @notice Thrown when attempting to relay a message whose destination chain is not the chain relaying it.
+    error MessageDestinationNotRelayChain();
+
+    /// @notice Thrown when attempting to relay a message whose target is CrossL2Inbox.
+    error MessageTargetCrossL2Inbox();
+
+    /// @notice Thrown when attempting to relay a message whose target is L2ToL2CrossDomainMessenger.
+    error MessageTargetL2ToL2CrossDomainMessenger();
+
+    /// @notice Thrown when attempting to relay a message that has already been relayed.
+    error MessageAlreadyRelayed();
+
+    /// @notice Thrown when a reentrant call is detected.
+    error ReentrantCall();
+
+    /// @notice Thrown when a call to the target contract during message relay fails.
+    error TargetCallFailed();
+
+    /// @notice Emitted whenever a message is sent to a destination
+    /// @param destination  Chain ID of the destination chain.
+    /// @param target       Target contract or wallet address.
+    /// @param messageNonce Nonce associated with the messsage sent
+    /// @param sender       Address initiating this message call
+    /// @param message      Message payload to call target with.
+    event SentMessage(
+        uint256 indexed destination, address indexed target, uint256 indexed messageNonce, address sender, bytes message
+    );
+
+    /// @notice Emitted whenever a message is successfully relayed on this chain.
+    /// @param source       Chain ID of the source chain.
+    /// @param messageNonce Nonce associated with the messsage sent
+    /// @param messageHash  Hash of the message that was relayed.
+    event RelayedMessage(uint256 indexed source, uint256 indexed messageNonce, bytes32 indexed messageHash);
+
+    function version() external view returns (string memory);
+
     /// @notice Mapping of message hashes to boolean receipt values. Note that a message will only
     ///         be present in this mapping if it has successfully been relayed on this chain, and
     ///         can therefore not be relayed again.
-    /// @param _msgHash message hash to check.
     /// @return Returns true if the message corresponding to the `_msgHash` was successfully relayed.
-    function successfulMessages(bytes32 _msgHash) external view returns (bool);
+    function successfulMessages(bytes32) external view returns (bool);
 
     /// @notice Retrieves the next message nonce. Message version will be added to the upper two
     ///         bytes of the message nonce. Message version allows us to treat messages as having
@@ -41,18 +94,16 @@ interface IL2ToL2CrossDomainMessenger {
     /// @param _message     Message to trigger the target address with.
     /// @return msgHash_ The hash of the message being sent, which can be used for tracking whether
     ///                  the message has successfully been relayed.
-    function sendMessage(
-        uint256 _destination,
-        address _target,
-        bytes calldata _message
-    )
-        external
-        returns (bytes32 msgHash_);
+    function sendMessage(uint256 _destination, address _target, bytes calldata _message) external returns (bytes32);
 
     /// @notice Relays a message that was sent by the other CrossDomainMessenger contract. Can only
     ///         be executed via cross-chain call from the other messenger OR if the message was
     ///         already received once and is currently being replayed.
     /// @param _id          Identifier of the SentMessage event to be relayed
     /// @param _sentMessage Message payload of the `SentMessage` event
-    function relayMessage(ICrossL2Inbox.Identifier calldata _id, bytes calldata _sentMessage) external payable;
+    function relayMessage(Identifier calldata _id, bytes calldata _sentMessage) external payable;
+
+    function messageVersion() external view returns (uint16);
+
+    function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
index 4c91322c6b12..1935b4d5b0b5 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
@@ -1,13 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IWETH } from "src/universal/interfaces/IWETH.sol";
+import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
 import { ICrosschainERC20 } from "src/L2/interfaces/ICrosschainERC20.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
-interface ISuperchainWETH is IWETH, ICrosschainERC20, ISemver {
+interface ISuperchainWETH is IWETH98, ICrosschainERC20, ISemver {
     error Unauthorized();
     error NotCustomGasToken();
 
+    function balanceOf(address src) external view returns (uint256);
+    function withdraw(uint256 _amount) external;
+
     function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
index 884fb00b4a65..9466465bd7ff 100644
--- a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
@@ -147,8 +147,8 @@ contract FaultDisputeGame is Clone, ISemver {
     uint256 internal constant HEADER_BLOCK_NUMBER_INDEX = 8;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.5
-    string public constant version = "1.3.1-beta.5";
+    /// @custom:semver 1.3.1-beta.6
+    string public constant version = "1.3.1-beta.6";
 
     /// @notice The starting timestamp of the game
     Timestamp public createdAt;
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol b/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
index 55b940c2d9dd..6db9cdeaada1 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
@@ -1,15 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IWETH } from "src/universal/interfaces/IWETH.sol";
+import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 
-interface IDelayedWETH is IWETH {
+interface IDelayedWETH is IWETH98 {
     struct WithdrawalRequest {
         uint256 amount;
         uint256 timestamp;
     }
 
+    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+    event Initialized(uint8 version);
     event Unwrap(address indexed src, uint256 wad);
 
     fallback() external payable;
@@ -25,8 +27,10 @@ interface IDelayedWETH is IWETH {
     function renounceOwnership() external;
     function unlock(address _guy, uint256 _wad) external;
     function withdraw(address _guy, uint256 _wad) external;
-    function withdrawals(address _owner, address _guy) external view returns (uint256, uint256);
+    function withdrawals(address, address) external view returns (uint256 amount, uint256 timestamp);
     function version() external view returns (string memory);
 
+    function withdraw(uint256 _wad) external override;
+
     function __constructor__(uint256 _delay) external;
 }
diff --git a/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol b/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
index 2508b34e43b3..b3b588258242 100644
--- a/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
+++ b/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
@@ -7,7 +7,7 @@ import { ILegacyMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 /// @title LegacyMintableERC20
 /// @notice The legacy implementation of the OptimismMintableERC20. This
 ///         contract is deprecated and should no longer be used.
-contract LegacyMintableERC20 is ILegacyMintableERC20, ERC20 {
+contract LegacyMintableERC20 is ERC20 {
     /// @notice Emitted when the token is minted by the bridge.
     event Mint(address indexed _account, uint256 _amount);
 
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
index 838a21af5662..34d601cbb65b 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
@@ -4,7 +4,8 @@ pragma solidity 0.8.15;
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { ERC20Permit } from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import { ILegacyMintableERC20, IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
+import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
+import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
@@ -14,7 +15,7 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 ///         use an OptimismMintablERC20 as the L2 representation of an L1 token, or vice-versa.
 ///         Designed to be backwards compatible with the older StandardL2ERC20 token which was only
 ///         meant for use on L2.
-contract OptimismMintableERC20 is IOptimismMintableERC20, ILegacyMintableERC20, ERC20Permit, ISemver {
+contract OptimismMintableERC20 is ERC20Permit, ISemver {
     /// @notice Address of the corresponding version of this token on the remote chain.
     address public immutable REMOTE_TOKEN;
 
@@ -41,8 +42,8 @@ contract OptimismMintableERC20 is IOptimismMintableERC20, ILegacyMintableERC20,
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.0-beta.1
-    string public constant version = "1.4.0-beta.1";
+    /// @custom:semver 1.4.0-beta.2
+    string public constant version = "1.4.0-beta.2";
 
     /// @notice Getter function for the permit2 address. It deterministically deployed
     ///         so it will always be at the same address. It is also included as a preinstall,
@@ -96,15 +97,7 @@ contract OptimismMintableERC20 is IOptimismMintableERC20, ILegacyMintableERC20,
     /// @notice Allows the StandardBridge on this network to mint tokens.
     /// @param _to     Address to mint tokens to.
     /// @param _amount Amount of tokens to mint.
-    function mint(
-        address _to,
-        uint256 _amount
-    )
-        external
-        virtual
-        override(IOptimismMintableERC20, ILegacyMintableERC20)
-        onlyBridge
-    {
+    function mint(address _to, uint256 _amount) external virtual onlyBridge {
         _mint(_to, _amount);
         emit Mint(_to, _amount);
     }
@@ -112,15 +105,7 @@ contract OptimismMintableERC20 is IOptimismMintableERC20, ILegacyMintableERC20,
     /// @notice Allows the StandardBridge on this network to burn tokens.
     /// @param _from   Address to burn tokens from.
     /// @param _amount Amount of tokens to burn.
-    function burn(
-        address _from,
-        uint256 _amount
-    )
-        external
-        virtual
-        override(IOptimismMintableERC20, ILegacyMintableERC20)
-        onlyBridge
-    {
+    function burn(address _from, uint256 _amount) external virtual onlyBridge {
         _burn(_from, _amount);
         emit Burn(_from, _amount);
     }
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
index e179c6408dad..d7a9cd3372cd 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
@@ -48,8 +48,8 @@ contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20F
     ///         the OptimismMintableERC20 token contract since this contract
     ///         is responsible for deploying OptimismMintableERC20 contracts.
     /// @notice Semantic version.
-    /// @custom:semver 1.10.1-beta.3
-    string public constant version = "1.10.1-beta.3";
+    /// @custom:semver 1.10.1-beta.4
+    string public constant version = "1.10.1-beta.4";
 
     /// @notice Constructs the OptimismMintableERC20Factory contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
index 955a34072205..9dd05e10d1fe 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
@@ -3,7 +3,6 @@ pragma solidity 0.8.15;
 
 import { ERC721Enumerable } from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -12,14 +11,24 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 /// @notice This contract is the remote representation for some token that lives on another network,
 ///         typically an Optimism representation of an Ethereum-based token. Standard reference
 ///         implementation that can be extended or modified according to your needs.
-contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, ISemver {
-    /// @inheritdoc IOptimismMintableERC721
+contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
+    /// @notice Emitted when a token is minted.
+    /// @param account Address of the account the token was minted to.
+    /// @param tokenId Token ID of the minted token.
+    event Mint(address indexed account, uint256 tokenId);
+
+    /// @notice Emitted when a token is burned.
+    /// @param account Address of the account the token was burned from.
+    /// @param tokenId Token ID of the burned token.
+    event Burn(address indexed account, uint256 tokenId);
+
+    /// @notice Chain ID of the chain where the remote token is deployed.
     uint256 public immutable REMOTE_CHAIN_ID;
 
-    /// @inheritdoc IOptimismMintableERC721
+    /// @notice Address of the token on the remote domain.
     address public immutable REMOTE_TOKEN;
 
-    /// @inheritdoc IOptimismMintableERC721
+    /// @notice Address of the ERC721 bridge on this network.
     address public immutable BRIDGE;
 
     /// @notice Base token URI for this token.
@@ -32,8 +41,8 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, IS
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.2
-    string public constant version = "1.3.1-beta.2";
+    /// @custom:semver 1.3.1-beta.3
+    string public constant version = "1.3.1-beta.3";
 
     /// @param _bridge        Address of the bridge on this network.
     /// @param _remoteChainId Chain ID where the remote token is deployed.
@@ -70,29 +79,34 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, IS
         );
     }
 
-    /// @inheritdoc IOptimismMintableERC721
+    /// @notice Chain ID of the chain where the remote token is deployed.
     function remoteChainId() external view returns (uint256) {
         return REMOTE_CHAIN_ID;
     }
 
-    /// @inheritdoc IOptimismMintableERC721
+    /// @notice Address of the token on the remote domain.
     function remoteToken() external view returns (address) {
         return REMOTE_TOKEN;
     }
 
-    /// @inheritdoc IOptimismMintableERC721
+    /// @notice Address of the ERC721 bridge on this network.
     function bridge() external view returns (address) {
         return BRIDGE;
     }
 
-    /// @inheritdoc IOptimismMintableERC721
+    /// @notice Mints some token ID for a user, checking first that contract recipients
+    ///         are aware of the ERC721 protocol to prevent tokens from being forever locked.
+    /// @param _to      Address of the user to mint the token for.
+    /// @param _tokenId Token ID to mint.
     function safeMint(address _to, uint256 _tokenId) external virtual onlyBridge {
         _safeMint(_to, _tokenId);
 
         emit Mint(_to, _tokenId);
     }
 
-    /// @inheritdoc IOptimismMintableERC721
+    /// @notice Burns a token ID from a user.
+    /// @param _from    Address of the user to burn the token from.
+    /// @param _tokenId Token ID to burn.
     function burn(address _from, uint256 _tokenId) external virtual onlyBridge {
         _burn(_tokenId);
 
@@ -102,7 +116,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, IS
     /// @notice Checks if a given interface ID is supported by this contract.
     /// @param _interfaceId The interface ID to check.
     /// @return True if the interface ID is supported, false otherwise.
-    function supportsInterface(bytes4 _interfaceId) public view override(ERC721Enumerable, IERC165) returns (bool) {
+    function supportsInterface(bytes4 _interfaceId) public view override(ERC721Enumerable) returns (bool) {
         bytes4 iface = type(IOptimismMintableERC721).interfaceId;
         return _interfaceId == iface || super.supportsInterface(_interfaceId);
     }
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
index 943859a7db1c..7350e0fae0de 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
@@ -25,8 +25,8 @@ contract OptimismMintableERC721Factory is ISemver {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.1-beta.3
-    string public constant version = "1.4.1-beta.3";
+    /// @custom:semver 1.4.1-beta.4
+    string public constant version = "1.4.1-beta.4";
 
     /// @notice The semver MUST be bumped any time that there is a change in
     ///         the OptimismMintableERC721 token contract since this contract
diff --git a/packages/contracts-bedrock/src/universal/StandardBridge.sol b/packages/contracts-bedrock/src/universal/StandardBridge.sol
index 476d3ba54c93..57af2247a65a 100644
--- a/packages/contracts-bedrock/src/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/StandardBridge.sol
@@ -6,7 +6,8 @@ import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC16
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
-import { IOptimismMintableERC20, ILegacyMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
+import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
+import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
diff --git a/packages/contracts-bedrock/src/universal/WETH98.sol b/packages/contracts-bedrock/src/universal/WETH98.sol
index e211db22b473..c2909e6fa6f7 100644
--- a/packages/contracts-bedrock/src/universal/WETH98.sol
+++ b/packages/contracts-bedrock/src/universal/WETH98.sol
@@ -19,16 +19,38 @@
 
 pragma solidity 0.8.15;
 
-import { IWETH } from "src/universal/interfaces/IWETH.sol";
-
 /// @title WETH98
 /// @notice WETH98 is a version of WETH9 upgraded for Solidity 0.8.x.
-contract WETH98 is IWETH {
+contract WETH98 {
+    /// @notice Returns the number of decimals the token uses.
+    /// @return The number of decimals the token uses.
     uint8 public constant decimals = 18;
 
     mapping(address => uint256) internal _balanceOf;
     mapping(address => mapping(address => uint256)) internal _allowance;
 
+    /// @notice Emitted when an approval is made.
+    /// @param src The address that approved the transfer.
+    /// @param guy The address that was approved to transfer.
+    /// @param wad The amount that was approved to transfer.
+    event Approval(address indexed src, address indexed guy, uint256 wad);
+
+    /// @notice Emitted when a transfer is made.
+    /// @param src The address that transferred the WETH.
+    /// @param dst The address that received the WETH.
+    /// @param wad The amount of WETH that was transferred.
+    event Transfer(address indexed src, address indexed dst, uint256 wad);
+
+    /// @notice Emitted when a deposit is made.
+    /// @param dst The address that deposited the WETH.
+    /// @param wad The amount of WETH that was deposited.
+    event Deposit(address indexed dst, uint256 wad);
+
+    /// @notice Emitted when a withdrawal is made.
+    /// @param src The address that withdrew the WETH.
+    /// @param wad The amount of WETH that was withdrawn.
+    event Withdrawal(address indexed src, uint256 wad);
+
     /// @notice Pipes to deposit.
     receive() external payable {
         deposit();
@@ -39,33 +61,41 @@ contract WETH98 is IWETH {
         deposit();
     }
 
-    /// @inheritdoc IWETH
-    function name() external view virtual override returns (string memory) {
+    /// @notice Returns the name of the token.
+    /// @return name_ The name of the token.
+    function name() external view virtual returns (string memory) {
         return "Wrapped Ether";
     }
 
-    /// @inheritdoc IWETH
-    function symbol() external view virtual override returns (string memory) {
+    /// @notice Returns the symbol of the token.
+    /// @return symbol_ The symbol of the token.
+    function symbol() external view virtual returns (string memory) {
         return "WETH";
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Returns the amount of WETH that the spender can transfer on behalf of the owner.
+    /// @param owner The address that owns the WETH.
+    /// @param spender The address that is approved to transfer the WETH.
+    /// @return The amount of WETH that the spender can transfer on behalf of the owner.
     function allowance(address owner, address spender) public view virtual returns (uint256) {
         return _allowance[owner][spender];
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Returns the balance of the given address.
+    /// @param src The address to query the balance of.
+    /// @return The balance of the given address.
     function balanceOf(address src) public view returns (uint256) {
         return _balanceOf[src];
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Allows WETH to be deposited by sending ether to the contract.
     function deposit() public payable virtual {
         _balanceOf[msg.sender] += msg.value;
         emit Deposit(msg.sender, msg.value);
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Withdraws an amount of ETH.
+    /// @param wad The amount of ETH to withdraw.
     function withdraw(uint256 wad) public virtual {
         require(_balanceOf[msg.sender] >= wad);
         _balanceOf[msg.sender] -= wad;
@@ -73,24 +103,35 @@ contract WETH98 is IWETH {
         emit Withdrawal(msg.sender, wad);
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Returns the total supply of WETH.
+    /// @return The total supply of WETH.
     function totalSupply() external view returns (uint256) {
         return address(this).balance;
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Approves the given address to transfer the WETH on behalf of the caller.
+    /// @param guy The address that is approved to transfer the WETH.
+    /// @param wad The amount that is approved to transfer.
+    /// @return True if the approval was successful.
     function approve(address guy, uint256 wad) external returns (bool) {
         _allowance[msg.sender][guy] = wad;
         emit Approval(msg.sender, guy, wad);
         return true;
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Transfers the given amount of WETH to the given address.
+    /// @param dst The address to transfer the WETH to.
+    /// @param wad The amount of WETH to transfer.
+    /// @return True if the transfer was successful.
     function transfer(address dst, uint256 wad) external returns (bool) {
         return transferFrom(msg.sender, dst, wad);
     }
 
-    /// @inheritdoc IWETH
+    /// @notice Transfers the given amount of WETH from the given address to the given address.
+    /// @param src The address to transfer the WETH from.
+    /// @param dst The address to transfer the WETH to.
+    /// @param wad The amount of WETH to transfer.
+    /// @return True if the transfer was successful.
     function transferFrom(address src, address dst, uint256 wad) public returns (bool) {
         require(_balanceOf[src] >= wad);
 
diff --git a/packages/contracts-bedrock/src/universal/interfaces/ILegacyMintableERC20.sol b/packages/contracts-bedrock/src/universal/interfaces/ILegacyMintableERC20.sol
new file mode 100644
index 000000000000..ad518b8b4d77
--- /dev/null
+++ b/packages/contracts-bedrock/src/universal/interfaces/ILegacyMintableERC20.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+/// @custom:legacy
+/// @title ILegacyMintableERC20
+/// @notice This interface was available on the legacy L2StandardERC20 contract.
+///         It remains available on the OptimismMintableERC20 contract for
+///         backwards compatibility.
+
+interface ILegacyMintableERC20 is IERC165 {
+    function l1Token() external view returns (address);
+
+    function mint(address _to, uint256 _amount) external;
+
+    function burn(address _from, uint256 _amount) external;
+}
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20.sol b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20.sol
index b261902c72ee..caf54b807314 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20.sol
@@ -16,16 +16,3 @@ interface IOptimismMintableERC20 is IERC165 {
 
     function burn(address _from, uint256 _amount) external;
 }
-
-/// @custom:legacy
-/// @title ILegacyMintableERC20
-/// @notice This interface was available on the legacy L2StandardERC20 contract.
-///         It remains available on the OptimismMintableERC20 contract for
-///         backwards compatibility.
-interface ILegacyMintableERC20 is IERC165 {
-    function l1Token() external view returns (address);
-
-    function mint(address _to, uint256 _amount) external;
-
-    function burn(address _from, uint256 _amount) external;
-}
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
index 0f9133d7dc67..7d745ad8436e 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
@@ -1,48 +1,74 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IERC721Enumerable } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol";
-
 /// @title IOptimismMintableERC721
 /// @notice Interface for contracts that are compatible with the OptimismMintableERC721 standard.
 ///         Tokens that follow this standard can be easily transferred across the ERC721 bridge.
-interface IOptimismMintableERC721 is IERC721Enumerable {
-    /// @notice Emitted when a token is minted.
-    /// @param account Address of the account the token was minted to.
-    /// @param tokenId Token ID of the minted token.
-    event Mint(address indexed account, uint256 tokenId);
+interface IOptimismMintableERC721 {
+    function __constructor__(
+        address _bridge,
+        uint256 _remoteChainId,
+        address _remoteToken,
+        string memory _name,
+        string memory _symbol
+    )
+        external;
 
-    /// @notice Emitted when a token is burned.
-    /// @param account Address of the account the token was burned from.
-    /// @param tokenId Token ID of the burned token.
+    event ApprovalForAll(address indexed owner, address indexed operator, bool approved);
+    event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);
     event Burn(address indexed account, uint256 tokenId);
+    event Mint(address indexed account, uint256 tokenId);
+    event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);
+
+    function totalSupply() external view returns (uint256);
+
+    function approve(address to, uint256 tokenId) external;
+
+    function isApprovedForAll(address owner, address operator) external view returns (bool);
+
+    function symbol() external view returns (string memory);
+
+    function tokenByIndex(uint256 index) external view returns (uint256);
+
+    function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);
+
+    function transferFrom(address from, address to, uint256 tokenId) external;
+
+    function balanceOf(address owner) external view returns (uint256);
+
+    function baseTokenURI() external view returns (string memory);
+
+    function getApproved(uint256 tokenId) external view returns (address);
+
+    function name() external view returns (string memory);
+
+    function ownerOf(uint256 tokenId) external view returns (address);
+
+    function safeTransferFrom(address from, address to, uint256 tokenId) external;
+
+    function safeTransferFrom(address from, address to, uint256 tokenId, bytes memory data) external;
+
+    function setApprovalForAll(address operator, bool approved) external;
+
+    function supportsInterface(bytes4 _interfaceId) external view returns (bool);
+
+    function tokenURI(uint256 tokenId) external view returns (string memory);
+
+    function version() external view returns (string memory);
 
-    /// @notice Mints some token ID for a user, checking first that contract recipients
-    ///         are aware of the ERC721 protocol to prevent tokens from being forever locked.
-    /// @param _to      Address of the user to mint the token for.
-    /// @param _tokenId Token ID to mint.
     function safeMint(address _to, uint256 _tokenId) external;
 
-    /// @notice Burns a token ID from a user.
-    /// @param _from    Address of the user to burn the token from.
-    /// @param _tokenId Token ID to burn.
     function burn(address _from, uint256 _tokenId) external;
 
-    /// @notice Chain ID of the chain where the remote token is deployed.
     function REMOTE_CHAIN_ID() external view returns (uint256);
 
-    /// @notice Address of the token on the remote domain.
     function REMOTE_TOKEN() external view returns (address);
 
-    /// @notice Address of the ERC721 bridge on this network.
     function BRIDGE() external view returns (address);
 
-    /// @notice Chain ID of the chain where the remote token is deployed.
     function remoteChainId() external view returns (uint256);
 
-    /// @notice Address of the token on the remote domain.
     function remoteToken() external view returns (address);
 
-    /// @notice Address of the ERC721 bridge on this network.
     function bridge() external view returns (address);
 }
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IWETH.sol b/packages/contracts-bedrock/src/universal/interfaces/IWETH.sol
deleted file mode 100644
index 73ef0e954577..000000000000
--- a/packages/contracts-bedrock/src/universal/interfaces/IWETH.sol
+++ /dev/null
@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-/// @title IWETH
-/// @notice Interface for WETH9.
-interface IWETH {
-    /// @notice Emitted when an approval is made.
-    /// @param src The address that approved the transfer.
-    /// @param guy The address that was approved to transfer.
-    /// @param wad The amount that was approved to transfer.
-    event Approval(address indexed src, address indexed guy, uint256 wad);
-
-    /// @notice Emitted when a transfer is made.
-    /// @param src The address that transferred the WETH.
-    /// @param dst The address that received the WETH.
-    /// @param wad The amount of WETH that was transferred.
-    event Transfer(address indexed src, address indexed dst, uint256 wad);
-
-    /// @notice Emitted when a deposit is made.
-    /// @param dst The address that deposited the WETH.
-    /// @param wad The amount of WETH that was deposited.
-    event Deposit(address indexed dst, uint256 wad);
-
-    /// @notice Emitted when a withdrawal is made.
-    /// @param src The address that withdrew the WETH.
-    /// @param wad The amount of WETH that was withdrawn.
-    event Withdrawal(address indexed src, uint256 wad);
-
-    /// @notice Returns the name of the token.
-    /// @return The name of the token.
-    function name() external view returns (string memory);
-
-    /// @notice Returns the symbol of the token.
-    /// @return The symbol of the token.
-    function symbol() external view returns (string memory);
-
-    /// @notice Returns the number of decimals the token uses.
-    /// @return The number of decimals the token uses.
-    function decimals() external pure returns (uint8);
-
-    /// @notice Returns the balance of the given address.
-    /// @param owner The address to query the balance of.
-    /// @return The balance of the given address.
-    function balanceOf(address owner) external view returns (uint256);
-
-    /// @notice Returns the amount of WETH that the spender can transfer on behalf of the owner.
-    /// @param owner The address that owns the WETH.
-    /// @param spender The address that is approved to transfer the WETH.
-    /// @return The amount of WETH that the spender can transfer on behalf of the owner.
-    function allowance(address owner, address spender) external view returns (uint256);
-
-    /// @notice Allows WETH to be deposited by sending ether to the contract.
-    function deposit() external payable;
-
-    /// @notice Withdraws an amount of ETH.
-    /// @param wad The amount of ETH to withdraw.
-    function withdraw(uint256 wad) external;
-
-    /// @notice Returns the total supply of WETH.
-    /// @return The total supply of WETH.
-    function totalSupply() external view returns (uint256);
-
-    /// @notice Approves the given address to transfer the WETH on behalf of the caller.
-    /// @param guy The address that is approved to transfer the WETH.
-    /// @param wad The amount that is approved to transfer.
-    /// @return True if the approval was successful.
-    function approve(address guy, uint256 wad) external returns (bool);
-
-    /// @notice Transfers the given amount of WETH to the given address.
-    /// @param dst The address to transfer the WETH to.
-    /// @param wad The amount of WETH to transfer.
-    /// @return True if the transfer was successful.
-    function transfer(address dst, uint256 wad) external returns (bool);
-
-    /// @notice Transfers the given amount of WETH from the given address to the given address.
-    /// @param src The address to transfer the WETH from.
-    /// @param dst The address to transfer the WETH to.
-    /// @param wad The amount of WETH to transfer.
-    /// @return True if the transfer was successful.
-    function transferFrom(address src, address dst, uint256 wad) external returns (bool);
-}
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol b/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
new file mode 100644
index 000000000000..87f8844ae584
--- /dev/null
+++ b/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @title IWETH
+/// @notice Interface for WETH9.
+interface IWETH98 {
+    receive() external payable;
+    fallback() external payable;
+
+    event Approval(address indexed src, address indexed guy, uint256 wad);
+
+    event Transfer(address indexed src, address indexed dst, uint256 wad);
+
+    event Deposit(address indexed dst, uint256 wad);
+
+    event Withdrawal(address indexed src, uint256 wad);
+
+    function name() external view returns (string memory);
+
+    function symbol() external view returns (string memory);
+
+    function decimals() external view returns (uint8);
+
+    function balanceOf(address src) external view returns (uint256);
+
+    function allowance(address owner, address spender) external view returns (uint256);
+
+    function deposit() external payable;
+
+    function withdraw(uint256 wad) external;
+
+    function totalSupply() external view returns (uint256);
+
+    function approve(address guy, uint256 wad) external returns (bool);
+
+    function transfer(address dst, uint256 wad) external returns (bool);
+
+    function transferFrom(address src, address dst, uint256 wad) external returns (bool);
+}
diff --git a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
index 8078e2c01c74..643b684e07d9 100644
--- a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
@@ -11,6 +11,7 @@ import { TransientContext } from "src/libraries/TransientContext.sol";
 // Target contracts
 import {
     CrossL2Inbox,
+    Identifier,
     NotEntered,
     NoExecutingDeposits,
     InvalidTimestamp,
@@ -20,7 +21,6 @@ import {
     InteropStartAlreadySet
 } from "src/L2/CrossL2Inbox.sol";
 import { IL1BlockInterop } from "src/L2/interfaces/IL1BlockInterop.sol";
-import { ICrossL2Inbox } from "src/L2/interfaces/ICrossL2Inbox.sol";
 
 /// @title CrossL2InboxWithModifiableTransientStorage
 /// @dev CrossL2Inbox contract with methods to modify the transient storage.
@@ -141,7 +141,7 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Tests that the `executeMessage` function succeeds.
     function testFuzz_executeMessage_succeeds(
-        ICrossL2Inbox.Identifier memory _id,
+        Identifier memory _id,
         address _target,
         bytes calldata _message,
         uint256 _value
@@ -200,14 +200,14 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Mock reentrant function that calls the `executeMessage` function.
     /// @param _id Identifier to pass to the `executeMessage` function.
-    function mockReentrant(ICrossL2Inbox.Identifier calldata _id) external payable {
+    function mockReentrant(Identifier calldata _id) external payable {
         crossL2Inbox.executeMessage({ _id: _id, _target: address(0), _message: "" });
     }
 
     /// @dev Tests that the `executeMessage` function successfully handles reentrant calls.
     function testFuzz_executeMessage_reentrant_succeeds(
-        ICrossL2Inbox.Identifier memory _id1, // identifier passed to `executeMessage` by the initial call.
-        ICrossL2Inbox.Identifier memory _id2, // identifier passed to `executeMessage` by the reentrant call.
+        Identifier memory _id1, // identifier passed to `executeMessage` by the initial call.
+        Identifier memory _id2, // identifier passed to `executeMessage` by the reentrant call.
         uint256 _value
     )
         external
@@ -272,7 +272,7 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Tests that the `executeMessage` function reverts if the transaction comes from a deposit.
     function testFuzz_executeMessage_isDeposit_reverts(
-        ICrossL2Inbox.Identifier calldata _id,
+        Identifier calldata _id,
         address _target,
         bytes calldata _message,
         uint256 _value
@@ -298,7 +298,7 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Tests that the `executeMessage` function reverts when called with an identifier with an invalid timestamp.
     function testFuzz_executeMessage_invalidTimestamp_reverts(
-        ICrossL2Inbox.Identifier calldata _id,
+        Identifier calldata _id,
         address _target,
         bytes calldata _message,
         uint256 _value
@@ -329,7 +329,7 @@ contract CrossL2InboxTest is Test {
     /// @dev Tests that the `executeMessage` function reverts when called with an identifier with a timestamp earlier
     /// than INTEROP_START timestamp
     function testFuzz_executeMessage_invalidTimestamp_interopStart_reverts(
-        ICrossL2Inbox.Identifier memory _id,
+        Identifier memory _id,
         address _target,
         bytes calldata _message,
         uint256 _value
@@ -360,7 +360,7 @@ contract CrossL2InboxTest is Test {
     /// @dev Tests that the `executeMessage` function reverts when called with an identifier with a chain ID not in
     /// dependency set.
     function testFuzz_executeMessage_invalidChainId_reverts(
-        ICrossL2Inbox.Identifier memory _id,
+        Identifier memory _id,
         address _target,
         bytes calldata _message,
         uint256 _value
@@ -398,7 +398,7 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Tests that the `executeMessage` function reverts when the target call fails.
     function testFuzz_executeMessage_targetCallFailed_reverts(
-        ICrossL2Inbox.Identifier memory _id,
+        Identifier memory _id,
         address _target,
         bytes calldata _message,
         uint256 _value
@@ -443,13 +443,7 @@ contract CrossL2InboxTest is Test {
         crossL2Inbox.executeMessage{ value: _value }({ _id: _id, _target: _target, _message: _message });
     }
 
-    function testFuzz_validateMessage_succeeds(
-        ICrossL2Inbox.Identifier memory _id,
-        bytes32 _messageHash
-    )
-        external
-        setInteropStart
-    {
+    function testFuzz_validateMessage_succeeds(Identifier memory _id, bytes32 _messageHash) external setInteropStart {
         // Ensure that the id's timestamp is valid (less than or equal to the current block timestamp and greater than
         // interop start time)
         _id.timestamp = bound(_id.timestamp, interopStartTime + 1, block.timestamp);
@@ -476,12 +470,7 @@ contract CrossL2InboxTest is Test {
         crossL2Inbox.validateMessage(_id, _messageHash);
     }
 
-    function testFuzz_validateMessage_isDeposit_reverts(
-        ICrossL2Inbox.Identifier calldata _id,
-        bytes32 _messageHash
-    )
-        external
-    {
+    function testFuzz_validateMessage_isDeposit_reverts(Identifier calldata _id, bytes32 _messageHash) external {
         // Ensure it is a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -499,7 +488,7 @@ contract CrossL2InboxTest is Test {
     /// @dev Tests that the `validateMessage` function reverts when called with an identifier with a timestamp later
     /// than current block.timestamp.
     function testFuzz_validateMessage_invalidTimestamp_reverts(
-        ICrossL2Inbox.Identifier calldata _id,
+        Identifier calldata _id,
         bytes32 _messageHash
     )
         external
@@ -525,7 +514,7 @@ contract CrossL2InboxTest is Test {
     /// @dev Tests that the `validateMessage` function reverts when called with an identifier with a timestamp earlier
     /// than INTEROP_START timestamp
     function testFuzz_validateMessage_invalidTimestamp_interopStart_reverts(
-        ICrossL2Inbox.Identifier memory _id,
+        Identifier memory _id,
         bytes32 _messageHash
     )
         external
@@ -551,7 +540,7 @@ contract CrossL2InboxTest is Test {
     /// @dev Tests that the `validateMessage` function reverts when called with an identifier with a chain ID not in the
     /// dependency set.
     function testFuzz_validateMessage_invalidChainId_reverts(
-        ICrossL2Inbox.Identifier memory _id,
+        Identifier memory _id,
         bytes32 _messageHash
     )
         external
diff --git a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
index 36b36973af8d..2c413bcfbe89 100644
--- a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
@@ -10,8 +10,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 
 // Target contract
-import { CrossL2Inbox } from "src/L2/CrossL2Inbox.sol";
-import { ICrossL2Inbox } from "src/L2/interfaces/ICrossL2Inbox.sol";
+import { CrossL2Inbox, Identifier } from "src/L2/CrossL2Inbox.sol";
 import {
     L2ToL2CrossDomainMessenger,
     NotEntered,
@@ -218,8 +217,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         vm.mockCall({ callee: _target, msgValue: _value, data: _message, returnData: abi.encode(true) });
 
         // Construct the SentMessage payload & identifier
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, _target, _nonce), // topics
             abi.encode(_sender, _message) // data
@@ -264,8 +263,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         vm.expectRevert(EventPayloadNotSentMessage.selector);
 
         // Point to a different remote log that the inbox validates
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage =
             abi.encode(L2ToL2CrossDomainMessenger.RelayedMessage.selector, _source, _nonce, _msgHash);
 
@@ -325,8 +324,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         vm.expectCall({ callee: target, msgValue: _value, data: message });
 
         // Construct and relay the message
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, target, _nonce), // topics
             abi.encode(_sender, message) // data
@@ -368,8 +367,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
 
         vm.expectRevert(ReentrantCall.selector);
 
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, 1, 1, 1, _source);
+        Identifier memory id = Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, 1, 1, 1, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, address(0), _nonce), // topics
             abi.encode(_sender, "") // data
@@ -407,8 +405,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         vm.expectCall({ callee: target, msgValue: _value, data: message });
 
         // Construct and relay the message
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source1);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source1);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, target, _nonce), // topics
             abi.encode(_sender1, message) // data
@@ -457,7 +455,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Expect a revert with the IdOriginNotL2ToL2CrossDomainMessenger
         vm.expectRevert(IdOriginNotL2ToL2CrossDomainMessenger.selector);
 
-        ICrossL2Inbox.Identifier memory id = ICrossL2Inbox.Identifier(_origin, _blockNum, _logIndex, _time, _source);
+        Identifier memory id = Identifier(_origin, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, _target, _nonce), // topics
             abi.encode(_sender, _message) // data
@@ -489,8 +487,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Expect a revert with the MessageDestinationNotRelayChain selector
         vm.expectRevert(MessageDestinationNotRelayChain.selector);
 
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, _destination, _target, _nonce), // topics
             abi.encode(_sender, _message) // data
@@ -526,8 +524,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
 
         // Call `relayMessage` with CrossL2Inbox as the target to provoke revert. The current chain is the destination
         // to prevent revert due to invalid destination
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(
                 L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, Predeploys.CROSS_L2_INBOX, _nonce
@@ -565,8 +563,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
 
         // Call `relayMessage` with L2ToL2CrossDomainMessenger as the target to provoke revert. The current chain is the
         // destination to prevent revert due to invalid destination
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(
                 L2ToL2CrossDomainMessenger.SentMessage.selector,
@@ -620,8 +618,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
             _source, _nonce, keccak256(abi.encode(block.chainid, _source, _nonce, _sender, _target, _message))
         );
 
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, _target, _nonce), // topics
             abi.encode(_sender, _message) // data
@@ -670,8 +668,8 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure that the target contract reverts
         vm.mockCallRevert({ callee: _target, msgValue: _value, data: _message, revertData: abi.encode(false) });
 
-        ICrossL2Inbox.Identifier memory id =
-            ICrossL2Inbox.Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
+        Identifier memory id =
+            Identifier(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER, _blockNum, _logIndex, _time, _source);
         bytes memory sentMessage = abi.encodePacked(
             abi.encode(L2ToL2CrossDomainMessenger.SentMessage.selector, block.chainid, _target, _nonce), // topics
             abi.encode(_sender, _message) // data
diff --git a/packages/contracts-bedrock/test/setup/Setup.sol b/packages/contracts-bedrock/test/setup/Setup.sol
index 10ee252218fc..ef2b654b2410 100644
--- a/packages/contracts-bedrock/test/setup/Setup.sol
+++ b/packages/contracts-bedrock/test/setup/Setup.sol
@@ -45,7 +45,7 @@ import { IGasPriceOracle } from "src/L2/interfaces/IGasPriceOracle.sol";
 import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 import { ISuperchainWETH } from "src/L2/interfaces/ISuperchainWETH.sol";
 import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
-import { IWETH } from "src/universal/interfaces/IWETH.sol";
+import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
 import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
 import { ILegacyMessagePasser } from "src/legacy/interfaces/ILegacyMessagePasser.sol";
 import { ISuperchainTokenBridge } from "src/L2/interfaces/ISuperchainTokenBridge.sol";
@@ -105,7 +105,7 @@ contract Setup {
     IL1Block l1Block = IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
     IGovernanceToken governanceToken = IGovernanceToken(Predeploys.GOVERNANCE_TOKEN);
     ILegacyMessagePasser legacyMessagePasser = ILegacyMessagePasser(Predeploys.LEGACY_MESSAGE_PASSER);
-    IWETH weth = IWETH(payable(Predeploys.WETH));
+    IWETH98 weth = IWETH98(payable(Predeploys.WETH));
     ISuperchainWETH superchainWeth = ISuperchainWETH(payable(Predeploys.SUPERCHAIN_WETH));
     IETHLiquidity ethLiquidity = IETHLiquidity(Predeploys.ETH_LIQUIDITY);
     ISuperchainTokenBridge superchainTokenBridge = ISuperchainTokenBridge(Predeploys.SUPERCHAIN_TOKEN_BRIDGE);
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
index 1e84ce2958cf..19b156e2f6e6 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
@@ -2,7 +2,8 @@
 pragma solidity 0.8.15;
 
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
-import { ILegacyMintableERC20, IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
+import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
+import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 contract OptimismMintableERC20_Test is Bridge_Initializer {
diff --git a/packages/contracts-bedrock/test/universal/StandardBridge.t.sol b/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
index e2f62b32b843..be7f8a51107c 100644
--- a/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
@@ -30,7 +30,7 @@ contract StandardBridgeTester is StandardBridge {
 
 /// @title LegacyMintable
 /// @notice Simple implementation of the legacy OptimismMintableERC20.
-contract LegacyMintable is ERC20, ILegacyMintableERC20 {
+contract LegacyMintable is ERC20 {
     constructor(string memory _name, string memory _ticker) ERC20(_name, _ticker) { }
 
     function l1Token() external pure returns (address) {
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 08cc5f74685d..9456de1ff920 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -46,6 +46,8 @@ rules:
     pattern-regex: function\s+\w+\s*\(\s*([^)]*?\b\w+\s+(?!_)(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+\s*(?=,|\)))
     paths:
       exclude:
+        - packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
+        - packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
@@ -64,6 +66,7 @@ rules:
     pattern-regex: returns\s*(\w+\s*)?\(\s*([^)]*?\b\w+\s+(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+(?<!_)\s*(?=,|\)))
     paths:
       exclude:
+        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test/safe-tools
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol

From 34f61011a0fca20c78e8b40e36789abeec22a535 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 21:17:38 -0700
Subject: [PATCH 035/451] dependabot(gomod): bump github.com/minio/minio-go/v7
 (#12654)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.78 to 7.0.79.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](https://github.com/minio/minio-go/compare/v7.0.78...v7.0.79)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index ab9e5725ce87..758d076028e8 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/libp2p/go-libp2p-pubsub v0.12.0
 	github.com/libp2p/go-libp2p-testing v0.12.0
 	github.com/mattn/go-isatty v0.0.20
-	github.com/minio/minio-go/v7 v7.0.78
+	github.com/minio/minio-go/v7 v7.0.79
 	github.com/multiformats/go-base32 v0.1.0
 	github.com/multiformats/go-multiaddr v0.13.0
 	github.com/multiformats/go-multiaddr-dns v0.4.0
diff --git a/go.sum b/go.sum
index de095722c8b5..a2dc3af16462 100644
--- a/go.sum
+++ b/go.sum
@@ -524,8 +524,8 @@ github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod h1:cGKTAVKx4S
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.78 h1:LqW2zy52fxnI4gg8C2oZviTaKHcBV36scS+RzJnxUFs=
-github.com/minio/minio-go/v7 v7.0.78/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
+github.com/minio/minio-go/v7 v7.0.79 h1:SvJZpj3hT0RN+4KiuX/FxLfPZdsuegy6d/2PiemM/bM=
+github.com/minio/minio-go/v7 v7.0.79/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=

From 6d57ace1a5102b70fb874d111d739757a3e7aeae Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Sat, 26 Oct 2024 11:19:49 +0700
Subject: [PATCH 036/451] maint(ct): replace natspec semver check with semgrep
 (#12625)

Replaces the golang package for natspec/semver matching with a
semgrep rule. Code reduction is good.
---
 .circleci/config.yml                          |   3 -
 packages/contracts-bedrock/justfile           |   9 -
 .../scripts/checks/semver-natspec/main.go     | 220 ------------------
 .../checks/semver-natspec/main_test.go        | 124 ----------
 semgrep/sol-rules.t.sol                       |  34 +++
 semgrep/sol-rules.yaml                        |  26 +++
 6 files changed, 60 insertions(+), 356 deletions(-)
 delete mode 100644 packages/contracts-bedrock/scripts/checks/semver-natspec/main.go
 delete mode 100644 packages/contracts-bedrock/scripts/checks/semver-natspec/main_test.go

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 648217dbcdf8..1a8539db65c6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -684,8 +684,6 @@ jobs:
           command: semver-lock
       - run-contracts-check:
           command: semver-diff-check-no-build
-      - run-contracts-check:
-          command: semver-natspec-check-no-build
       - run-contracts-check:
           command: validate-deploy-configs
       - run-contracts-check:
@@ -864,7 +862,6 @@ jobs:
               op-service
               op-supervisor
               op-deployer
-              packages/contracts-bedrock/scripts/checks/semver-natspec
             )
             formatted_packages=""
             for package in "${packages[@]}"; do
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 897114cdc11a..11bd9ed4946b 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -155,14 +155,6 @@ semver-diff-check-no-build:
 # Checks that any contracts with a modified semver lock also have a modified semver version.
 semver-diff-check: build semver-diff-check-no-build
 
-# Checks that semver natspec is equal to the actual semver version.
-# Does not build contracts.
-semver-natspec-check-no-build:
-    go run ./scripts/checks/semver-natspec
-
-# Checks that semver natspec is equal to the actual semver version.
-semver-natspec-check: build semver-natspec-check-no-build
-
 # Checks that the semgrep tests are valid.
 semgrep-test-validity-check:
   forge fmt ../../semgrep/sol-rules.t.sol --check
@@ -206,7 +198,6 @@ check:
   snapshots-check-no-build \
   lint-check \
   semver-diff-check-no-build \
-  semver-natspec-check-no-build \
   validate-deploy-configs \
   validate-spacers-no-build \
   interfaces-check-no-build
diff --git a/packages/contracts-bedrock/scripts/checks/semver-natspec/main.go b/packages/contracts-bedrock/scripts/checks/semver-natspec/main.go
deleted file mode 100644
index 1be082dda763..000000000000
--- a/packages/contracts-bedrock/scripts/checks/semver-natspec/main.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-	"sync"
-	"sync/atomic"
-)
-
-type ArtifactsWrapper struct {
-	RawMetadata string `json:"rawMetadata"`
-}
-
-type Artifacts struct {
-	Output struct {
-		Devdoc struct {
-			StateVariables struct {
-				Version struct {
-					Semver string `json:"custom:semver"`
-				} `json:"version"`
-			} `json:"stateVariables,omitempty"`
-			Methods struct {
-				Version struct {
-					Semver string `json:"custom:semver"`
-				} `json:"version()"`
-			} `json:"methods,omitempty"`
-		} `json:"devdoc"`
-	} `json:"output"`
-}
-
-var ConstantVersionPattern = regexp.MustCompile(`string.*constant.*version\s+=\s+"([^"]+)";`)
-
-var FunctionVersionPattern = regexp.MustCompile(`^\s+return\s+"((?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)";$`)
-
-var InteropVersionPattern = regexp.MustCompile(`^\s+return\s+string\.concat\(super\.version\(\), "((.*)\+interop(.*)?)"\);`)
-
-func main() {
-	if err := run(); err != nil {
-		writeStderr("an error occurred: %v", err)
-		os.Exit(1)
-	}
-}
-
-func writeStderr(msg string, args ...any) {
-	_, _ = fmt.Fprintf(os.Stderr, msg+"\n", args...)
-}
-
-func run() error {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return fmt.Errorf("failed to get current working directory: %w", err)
-	}
-
-	writeStderr("working directory: %s", cwd)
-
-	artifactsDir := filepath.Join(cwd, "forge-artifacts")
-	srcDir := filepath.Join(cwd, "src")
-
-	artifactFiles, err := glob(artifactsDir, ".json")
-	if err != nil {
-		return fmt.Errorf("failed to get artifact files: %w", err)
-	}
-	contractFiles, err := glob(srcDir, ".sol")
-	if err != nil {
-		return fmt.Errorf("failed to get contract files: %w", err)
-	}
-
-	var hasErr int32
-	var outMtx sync.Mutex
-	fail := func(msg string, args ...any) {
-		outMtx.Lock()
-		writeStderr("❌  "+msg, args...)
-		outMtx.Unlock()
-		atomic.StoreInt32(&hasErr, 1)
-	}
-
-	sem := make(chan struct{}, runtime.NumCPU())
-	for contractName, artifactPath := range artifactFiles {
-		contractName := contractName
-		artifactPath := artifactPath
-
-		sem <- struct{}{}
-
-		go func() {
-			defer func() {
-				<-sem
-			}()
-
-			af, err := os.Open(artifactPath)
-			if err != nil {
-				fail("%s: failed to open contract artifact: %v", contractName, err)
-				return
-			}
-			defer af.Close()
-
-			var wrapper ArtifactsWrapper
-			if err := json.NewDecoder(af).Decode(&wrapper); err != nil {
-				fail("%s: failed to parse artifact file: %v", contractName, err)
-				return
-			}
-
-			if wrapper.RawMetadata == "" {
-				return
-			}
-
-			var artifactData Artifacts
-			if err := json.Unmarshal([]byte(wrapper.RawMetadata), &artifactData); err != nil {
-				fail("%s: failed to unwrap artifact metadata: %v", contractName, err)
-				return
-			}
-
-			artifactVersion := artifactData.Output.Devdoc.StateVariables.Version.Semver
-
-			isConstant := true
-			if artifactData.Output.Devdoc.StateVariables.Version.Semver == "" {
-				artifactVersion = artifactData.Output.Devdoc.Methods.Version.Semver
-				isConstant = false
-			}
-
-			if artifactVersion == "" {
-				return
-			}
-
-			// Skip mock contracts
-			if strings.HasPrefix(contractName, "Mock") {
-				return
-			}
-
-			contractPath := contractFiles[contractName]
-			if contractPath == "" {
-				fail("%s: Source file not found (For test mock contracts, prefix the name with 'Mock' to ignore this warning)", contractName)
-				return
-			}
-
-			cf, err := os.Open(contractPath)
-			if err != nil {
-				fail("%s: failed to open contract source: %v", contractName, err)
-				return
-			}
-			defer cf.Close()
-
-			sourceData, err := io.ReadAll(cf)
-			if err != nil {
-				fail("%s: failed to read contract source: %v", contractName, err)
-				return
-			}
-
-			var sourceVersion string
-
-			if isConstant {
-				sourceVersion = findLine(sourceData, ConstantVersionPattern)
-			} else {
-				sourceVersion = findLine(sourceData, FunctionVersionPattern)
-			}
-
-			// Need to define a special case for interop contracts since they technically
-			// use an invalid semver format. Checking for sourceVersion == "" allows the
-			// team to update the format to a valid semver format in the future without
-			// needing to change this program.
-			if sourceVersion == "" && strings.HasSuffix(contractName, "Interop") {
-				sourceVersion = findLine(sourceData, InteropVersionPattern)
-			}
-
-			if sourceVersion == "" {
-				fail("%s: version not found in source", contractName)
-				return
-			}
-
-			if sourceVersion != artifactVersion {
-				fail("%s: version mismatch: source=%s, artifact=%s", contractName, sourceVersion, artifactVersion)
-				return
-			}
-
-			_, _ = fmt.Fprintf(os.Stderr, "✅  %s: code: %s, artifact: %s\n", contractName, sourceVersion, artifactVersion)
-		}()
-	}
-
-	for i := 0; i < cap(sem); i++ {
-		sem <- struct{}{}
-	}
-
-	if atomic.LoadInt32(&hasErr) == 1 {
-		return fmt.Errorf("semver check failed, see logs above")
-	}
-
-	return nil
-}
-
-func glob(dir string, ext string) (map[string]string, error) {
-	out := make(map[string]string)
-	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-		if !info.IsDir() && filepath.Ext(path) == ext {
-			out[strings.TrimSuffix(filepath.Base(path), ext)] = path
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to walk directory: %w", err)
-	}
-	return out, nil
-}
-
-func findLine(in []byte, pattern *regexp.Regexp) string {
-	scanner := bufio.NewScanner(bytes.NewReader(in))
-	for scanner.Scan() {
-		match := pattern.FindStringSubmatch(scanner.Text())
-		if len(match) > 0 {
-			return match[1]
-		}
-	}
-	return ""
-}
diff --git a/packages/contracts-bedrock/scripts/checks/semver-natspec/main_test.go b/packages/contracts-bedrock/scripts/checks/semver-natspec/main_test.go
deleted file mode 100644
index 7a8872d76d78..000000000000
--- a/packages/contracts-bedrock/scripts/checks/semver-natspec/main_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package main
-
-import (
-	"regexp"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestRegexes(t *testing.T) {
-	t.Run("ConstantVersionPattern", func(t *testing.T) {
-		testRegex(t, ConstantVersionPattern, []regexTest{
-			{
-				name:    "constant version",
-				input:   `string constant version = "1.2.3";`,
-				capture: "1.2.3",
-			},
-			{
-				name:    "constant version with weird spaces",
-				input:   ` string   constant   version =  "1.2.3";`,
-				capture: "1.2.3",
-			},
-			{
-				name:    "constant version with visibility",
-				input:   `string public constant version = "1.2.3";`,
-				capture: "1.2.3",
-			},
-			{
-				name:    "different variable name",
-				input:   `string constant VERSION = "1.2.3";`,
-				capture: "",
-			},
-			{
-				name:    "different type",
-				input:   `uint constant version = 1;`,
-				capture: "",
-			},
-			{
-				name:    "not constant",
-				input:   `string version = "1.2.3";`,
-				capture: "",
-			},
-			{
-				name:    "unterminated",
-				input:   `string constant version = "1.2.3"`,
-				capture: "",
-			},
-		})
-	})
-
-	t.Run("FunctionVersionPattern", func(t *testing.T) {
-		testRegex(t, FunctionVersionPattern, []regexTest{
-			{
-				name:    "function version",
-				input:   `    return "1.2.3";`,
-				capture: "1.2.3",
-			},
-			{
-				name:    "function version with weird spaces",
-				input:   `    return   "1.2.3";`,
-				capture: "1.2.3",
-			},
-			{
-				name:    "function version with prerelease",
-				input:   `    return "1.2.3-alpha.1";`,
-				capture: "1.2.3-alpha.1",
-			},
-			{
-				name:    "invalid semver",
-				input:   `    return "1.2.cabdab";`,
-				capture: "",
-			},
-			{
-				name:    "not a return statement",
-				input:   `function foo()`,
-				capture: "",
-			},
-		})
-	})
-
-	t.Run("InteropVersionPattern", func(t *testing.T) {
-		testRegex(t, InteropVersionPattern, []regexTest{
-			{
-				name:    "interop version",
-				input:   `    return string.concat(super.version(), "+interop");`,
-				capture: "+interop",
-			},
-			{
-				name:    "interop version but as a valid semver",
-				input:   `    return string.concat(super.version(), "0.0.0+interop");`,
-				capture: "0.0.0+interop",
-			},
-			{
-				name:    "not an interop version",
-				input:   `	return string.concat(super.version(), "hello!");`,
-				capture: "",
-			},
-			{
-				name:    "invalid syntax",
-				input:   `	return string.concat(super.version(), "0.0.0+interop`,
-				capture: "",
-			},
-			{
-				name:    "something else is concatted",
-				input:   `	return string.concat("superduper", "mart");`,
-				capture: "",
-			},
-		})
-	})
-}
-
-type regexTest struct {
-	name    string
-	input   string
-	capture string
-}
-
-func testRegex(t *testing.T, re *regexp.Regexp, tests []regexTest) {
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			require.Equal(t, test.capture, findLine([]byte(test.input), re))
-		})
-	}
-}
diff --git a/semgrep/sol-rules.t.sol b/semgrep/sol-rules.t.sol
index b697d94e934c..b2b769e144e6 100644
--- a/semgrep/sol-rules.t.sol
+++ b/semgrep/sol-rules.t.sol
@@ -120,6 +120,40 @@ contract SemgrepTest__sol_safety_expectrevert_no_args {
     }
 }
 
+contract SemgrepTest__sol_safety_natspec_semver_match {
+    // ok: sol-safety-natspec-semver-match
+    /// @custom:semver 2.8.1-beta.4
+    string public constant version = "2.8.1-beta.4";
+
+    // ok: sol-safety-natspec-semver-match
+    /// @custom:semver 2.8.1-beta.3
+    function version() public pure virtual returns (string memory) {
+        return "2.8.1-beta.3";
+    }
+
+    // ok: sol-safety-natspec-semver-match
+    /// @custom:semver +interop-beta.1
+    function version() public pure override returns (string memory) {
+        return string.concat(super.version(), "+interop-beta.1");
+    }
+
+    // ruleid: sol-safety-natspec-semver-match
+    /// @custom:semver 2.8.1-beta.5
+    string public constant version = "2.8.1-beta.4";
+
+    // ruleid: sol-safety-natspec-semver-match
+    /// @custom:semver 2.8.1-beta.4
+    function version() public pure virtual returns (string memory) {
+        return "2.8.1-beta.3";
+    }
+
+    // ruleid: sol-safety-natspec-semver-match
+    /// @custom:semver +interop-beta.2
+    function version() public pure override returns (string memory) {
+        return string.concat(super.version(), "+interop-beta.1");
+    }
+}
+
 contract SemgrepTest__sol_style_input_arg_fmt {
     // ok: sol-style-input-arg-fmt
     event Test(address indexed src, address indexed guy, uint256 wad);
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 9456de1ff920..5646182a04f2 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -39,6 +39,32 @@ rules:
       exclude:
         - packages/contracts-bedrock/test/dispute/WETH98.t.sol
 
+  - id: sol-safety-natspec-semver-match
+    languages: [generic]
+    severity: ERROR
+    message: Semgrep defined in contract must match natspec $VERSION1 $VERSION2
+    patterns:
+      - pattern-either:
+          - pattern-regex: /// @custom:semver
+              (?P<VERSION1>[0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z0-9.]+)?)\s+string
+              public constant version =
+              "(?P<VERSION2>[0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z0-9.]+)?)";
+          - pattern-regex: /// @custom:semver
+              (?P<VERSION1>[0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z0-9.]+)?)\s+function
+              version\(\) public pure virtual returns \(string memory\)
+              \{\s+return
+              "(?P<VERSION2>[0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z0-9.]+)?)";
+          - pattern-regex: /// @custom:semver (?P<VERSION1>[a-zA-Z0-9.+-]+)\s+function
+              version\(\) public pure override returns \(string memory\)
+              \{\s+return string\.concat\(super\.version\(\),
+              "(?P<VERSION2>[a-zA-Z0-9.+-]+)"\);
+      - metavariable-comparison:
+          comparison: $VERSION1 != $VERSION2
+          metavariable: $VERSION1
+    paths:
+      include:
+        - packages/contracts-bedrock/src
+
   - id: sol-style-input-arg-fmt
     languages: [solidity]
     severity: ERROR

From 96468b797644a794243b81f06f9c5b9c8169967e Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 25 Oct 2024 22:20:00 -0600
Subject: [PATCH 037/451] op-deployer: Add Docker builds (#12660)

* op-deployer: Add Docker builds

* fix job syntax

* specify dockerfile

* remove accidental whitespace changes
---
 .circleci/config.yml           | 20 ++++++++++++++++++--
 op-deployer/.goreleaser.yaml   | 14 ++++++++++++++
 op-deployer/Dockerfile.default |  3 +++
 op-deployer/Dockerfile.minimal |  3 +++
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 op-deployer/Dockerfile.default
 create mode 100644 op-deployer/Dockerfile.minimal

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1a8539db65c6..a041bedb9ecb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1242,9 +1242,25 @@ jobs:
         description: Goreleaser config file
         default: .goreleaser.yaml
         type: string
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
+    resource_class: large
     steps:
+      - setup_remote_docker
+      - gcp-cli/install
+      - gcp-oidc-authenticate
+      - run:
+          name: Install goreleaser pro
+          command: |
+            mkdir goreleaser
+            curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.3.2-pro/goreleaser-pro_Linux_x86_64.tar.gz
+            tar -xzvf goreleaser.tgz
+            mv goreleaser /usr/local/bin/goreleaser
+            rm -rf goreleaser
+      - run:
+          name: Configure Docker
+          command: |
+            gcloud auth configure-docker us-docker.pkg.dev
       - checkout
       - run:
           name: Run goreleaser
diff --git a/op-deployer/.goreleaser.yaml b/op-deployer/.goreleaser.yaml
index a17f171783b4..0104574ec865 100644
--- a/op-deployer/.goreleaser.yaml
+++ b/op-deployer/.goreleaser.yaml
@@ -50,6 +50,20 @@ archives:
       - goos: windows
         format: zip
 
+dockers:
+  - id: default
+    goos: linux
+    goarch: amd64
+    dockerfile: Dockerfile.default
+    image_templates:
+      - "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:{{ .Tag }}"
+  - id: minimal
+    goos: linux
+    goarch: amd64
+    dockerfile: Dockerfile.minimal
+    image_templates:
+      - "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-deployer:{{ .Tag }}-minimal"
+
 changelog:
   sort: asc
   filters:
diff --git a/op-deployer/Dockerfile.default b/op-deployer/Dockerfile.default
new file mode 100644
index 000000000000..cc5ca8d95e4f
--- /dev/null
+++ b/op-deployer/Dockerfile.default
@@ -0,0 +1,3 @@
+FROM debian:bookworm-20240812-slim
+ENTRYPOINT ["/op-deployer"]
+COPY op-deployer /op-deployer
\ No newline at end of file
diff --git a/op-deployer/Dockerfile.minimal b/op-deployer/Dockerfile.minimal
new file mode 100644
index 000000000000..9e8811980090
--- /dev/null
+++ b/op-deployer/Dockerfile.minimal
@@ -0,0 +1,3 @@
+FROM scratch
+ENTRYPOINT ["/op-deployer"]
+COPY op-deployer /op-deployer
\ No newline at end of file

From 7873831f805508c8d4d418a80a1bde5ad79314a3 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Sat, 26 Oct 2024 06:18:41 +0100
Subject: [PATCH 038/451] Sc/use deployutils in tests (#12656)

* use deploy utils over new* in tests

* replace new * with use of deployUtils

* fix failing test

* use deployutils for weth98 test file

* fix semgrep

* fixes

* fixes

* fixes...
---
 .../scripts/libraries/DeployUtils.sol         |  2 +-
 .../src/dispute/interfaces/IDelayedWETH.sol   | 33 ++++++-
 .../src/universal/interfaces/IWETH98.sol      |  2 +
 .../test/L1/DelayedVetoable.t.sol             | 22 ++---
 .../test/L1/SuperchainConfig.t.sol            | 19 +++-
 .../test/L2/OptimismSuperchainERC20.t.sol     | 30 +++---
 .../test/L2/SequencerFeeVault.t.sol           | 21 +++--
 .../test/dispute/WETH98.t.sol                 | 12 ++-
 .../test/governance/MintManager.t.sol         | 19 ++--
 .../test/invariants/SystemConfig.t.sol        | 18 +++-
 .../test/legacy/DeployerWhitelist.t.sol       | 12 ++-
 .../test/legacy/L1BlockNumber.t.sol           | 14 ++-
 .../test/legacy/ResolvedDelegateProxy.t.sol   | 43 +++++++--
 .../test/safe/DeputyGuardianModule.t.sol      | 20 ++--
 .../test/universal/BenchmarkTest.t.sol        | 12 ++-
 .../test/universal/Proxy.t.sol                | 12 ++-
 .../test/universal/ProxyAdmin.t.sol           | 94 ++++++++++++-------
 .../test/vendor/InitializableOZv5.t.sol       | 14 ++-
 semgrep/sol-rules.yaml                        |  1 +
 19 files changed, 285 insertions(+), 115 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
index c58c00b5a180..08bfd99f0131 100644
--- a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
+++ b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Scripts
 import { Vm } from "forge-std/Vm.sol";
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol b/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
index 6db9cdeaada1..98b221285b56 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 
-interface IDelayedWETH is IWETH98 {
+interface IDelayedWETH {
     struct WithdrawalRequest {
         uint256 amount;
         uint256 timestamp;
@@ -30,7 +29,35 @@ interface IDelayedWETH is IWETH98 {
     function withdrawals(address, address) external view returns (uint256 amount, uint256 timestamp);
     function version() external view returns (string memory);
 
-    function withdraw(uint256 _wad) external override;
+    function withdraw(uint256 _wad) external;
+
+    event Approval(address indexed src, address indexed guy, uint256 wad);
+
+    event Transfer(address indexed src, address indexed dst, uint256 wad);
+
+    event Deposit(address indexed dst, uint256 wad);
+
+    event Withdrawal(address indexed src, uint256 wad);
+
+    function name() external view returns (string memory);
+
+    function symbol() external view returns (string memory);
+
+    function decimals() external view returns (uint8);
+
+    function balanceOf(address src) external view returns (uint256);
+
+    function allowance(address owner, address spender) external view returns (uint256);
+
+    function deposit() external payable;
+
+    function totalSupply() external view returns (uint256);
+
+    function approve(address guy, uint256 wad) external returns (bool);
+
+    function transfer(address dst, uint256 wad) external returns (bool);
+
+    function transferFrom(address src, address dst, uint256 wad) external returns (bool);
 
     function __constructor__(uint256 _delay) external;
 }
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol b/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
index 87f8844ae584..c7a77b7a36cd 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
@@ -36,4 +36,6 @@ interface IWETH98 {
     function transfer(address dst, uint256 wad) external returns (bool);
 
     function transferFrom(address src, address dst, uint256 wad) external returns (bool);
+
+    function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol b/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
index 4d33a0784972..6eade75e8ffa 100644
--- a/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
+++ b/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { DelayedVetoable } from "src/L1/DelayedVetoable.sol";
 import { IDelayedVetoable } from "src/L1/interfaces/IDelayedVetoable.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DelayedVetoable_Init is Test {
     error Unauthorized(address expected, address actual);
@@ -27,14 +27,12 @@ contract DelayedVetoable_Init is Test {
         vm.deal(vetoer, 10000 ether);
 
         delayedVetoable = IDelayedVetoable(
-            address(
-                new DelayedVetoable({
-                    _initiator: initiator,
-                    _vetoer: vetoer,
-                    _target: address(target),
-                    _operatingDelay: operatingDelay
-                })
-            )
+            DeployUtils.create1({
+                _name: "DelayedVetoable",
+                _args: DeployUtils.encodeConstructor(
+                    abi.encodeCall(IDelayedVetoable.__constructor__, (vetoer, initiator, address(target), operatingDelay))
+                )
+            })
         );
 
         // Most tests will use the operating delay, so we call as the initiator with null data
@@ -155,7 +153,7 @@ contract DelayedVetoable_HandleCall_Test is DelayedVetoable_Init {
 contract DelayedVetoable_HandleCall_TestFail is DelayedVetoable_Init {
     /// @dev Only the initiator can initiate a call.
     function test_handleCall_unauthorizedInitiation_reverts() external {
-        vm.expectRevert(abi.encodeWithSelector(DelayedVetoable.Unauthorized.selector, initiator, address(this)));
+        vm.expectRevert(abi.encodeWithSelector(IDelayedVetoable.Unauthorized.selector, initiator, address(this)));
         (bool revertsAsExpected,) = address(delayedVetoable).call(hex"00001234");
         assertTrue(revertsAsExpected);
     }
@@ -167,7 +165,7 @@ contract DelayedVetoable_HandleCall_TestFail is DelayedVetoable_Init {
         (bool success,) = address(delayedVetoable).call(data);
         assertTrue(success);
 
-        vm.expectRevert(DelayedVetoable.ForwardingEarly.selector);
+        vm.expectRevert(IDelayedVetoable.ForwardingEarly.selector);
         (bool revertsAsExpected,) = address(delayedVetoable).call(data);
         assertTrue(revertsAsExpected);
     }
@@ -191,7 +189,7 @@ contract DelayedVetoable_HandleCall_TestFail is DelayedVetoable_Init {
         assertTrue(success);
 
         // Attempt to forward the same call again.
-        vm.expectRevert(abi.encodeWithSelector(DelayedVetoable.Unauthorized.selector, initiator, address(this)));
+        vm.expectRevert(abi.encodeWithSelector(IDelayedVetoable.Unauthorized.selector, initiator, address(this)));
         (bool revertsAsExpected,) = address(delayedVetoable).call(data);
         assertTrue(revertsAsExpected);
     }
diff --git a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
index ece5c68254c9..48206cd13ef9 100644
--- a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
@@ -4,12 +4,13 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Target contract dependencies
-import { Proxy } from "src/universal/Proxy.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
 
 // Target contract
-import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
 contract SuperchainConfig_Init_Test is CommonTest {
     /// @dev Tests that initialization sets the correct values. These are defined in CommonTest.sol.
     function test_initialize_unpaused_succeeds() external view {
@@ -19,8 +20,18 @@ contract SuperchainConfig_Init_Test is CommonTest {
 
     /// @dev Tests that it can be intialized as paused.
     function test_initialize_paused_succeeds() external {
-        Proxy newProxy = new Proxy(alice);
-        ISuperchainConfig newImpl = ISuperchainConfig(address(new SuperchainConfig()));
+        IProxy newProxy = IProxy(
+            DeployUtils.create1({
+                _name: "Proxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (alice)))
+            })
+        );
+        ISuperchainConfig newImpl = ISuperchainConfig(
+            DeployUtils.create1({
+                _name: "SuperchainConfig",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(ISuperchainConfig.__constructor__, ()))
+            })
+        );
 
         vm.startPrank(alice);
         newProxy.upgradeToAndCall(
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
index 825e09bdd808..77ce7936b0fd 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
@@ -17,8 +17,8 @@ import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 // Target contract
-import { OptimismSuperchainERC20 } from "src/L2/OptimismSuperchainERC20.sol";
 import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 /// @title OptimismSuperchainERC20Test
 /// @notice Contract for testing the OptimismSuperchainERC20 contract.
@@ -31,12 +31,17 @@ contract OptimismSuperchainERC20Test is Test {
     address internal constant L2_BRIDGE = Predeploys.L2_STANDARD_BRIDGE;
     address internal constant MESSENGER = Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER;
 
-    OptimismSuperchainERC20 public optimismSuperchainERC20Impl;
-    OptimismSuperchainERC20 public optimismSuperchainERC20;
+    IOptimismSuperchainERC20 public optimismSuperchainERC20Impl;
+    IOptimismSuperchainERC20 public optimismSuperchainERC20;
 
     /// @notice Sets up the test suite.
     function setUp() public {
-        optimismSuperchainERC20Impl = new OptimismSuperchainERC20();
+        optimismSuperchainERC20Impl = IOptimismSuperchainERC20(
+            DeployUtils.create1({
+                _name: "OptimismSuperchainERC20",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismSuperchainERC20.__constructor__, ()))
+            })
+        );
 
         // Deploy the OptimismSuperchainERC20Beacon contract
         _deployBeacon();
@@ -73,13 +78,13 @@ contract OptimismSuperchainERC20Test is Test {
         uint8 _decimals
     )
         internal
-        returns (OptimismSuperchainERC20)
+        returns (IOptimismSuperchainERC20)
     {
-        return OptimismSuperchainERC20(
+        return IOptimismSuperchainERC20(
             address(
                 new BeaconProxy(
                     Predeploys.OPTIMISM_SUPERCHAIN_ERC20_BEACON,
-                    abi.encodeCall(OptimismSuperchainERC20.initialize, (_remoteToken, _name, _symbol, _decimals))
+                    abi.encodeCall(IOptimismSuperchainERC20.initialize, (_remoteToken, _name, _symbol, _decimals))
                 )
             )
         );
@@ -219,25 +224,28 @@ contract OptimismSuperchainERC20Test is Test {
 
     /// @notice Tests the `decimals` function always returns the correct value.
     function testFuzz_decimals_succeeds(uint8 _decimals) public {
-        OptimismSuperchainERC20 _newSuperchainERC20 = _deploySuperchainERC20Proxy(REMOTE_TOKEN, NAME, SYMBOL, _decimals);
+        IOptimismSuperchainERC20 _newSuperchainERC20 =
+            _deploySuperchainERC20Proxy(REMOTE_TOKEN, NAME, SYMBOL, _decimals);
         assertEq(_newSuperchainERC20.decimals(), _decimals);
     }
 
     /// @notice Tests the `REMOTE_TOKEN` function always returns the correct value.
     function testFuzz_remoteToken_succeeds(address _remoteToken) public {
-        OptimismSuperchainERC20 _newSuperchainERC20 = _deploySuperchainERC20Proxy(_remoteToken, NAME, SYMBOL, DECIMALS);
+        IOptimismSuperchainERC20 _newSuperchainERC20 = _deploySuperchainERC20Proxy(_remoteToken, NAME, SYMBOL, DECIMALS);
         assertEq(_newSuperchainERC20.remoteToken(), _remoteToken);
     }
 
     /// @notice Tests the `name` function always returns the correct value.
     function testFuzz_name_succeeds(string memory _name) public {
-        OptimismSuperchainERC20 _newSuperchainERC20 = _deploySuperchainERC20Proxy(REMOTE_TOKEN, _name, SYMBOL, DECIMALS);
+        IOptimismSuperchainERC20 _newSuperchainERC20 =
+            _deploySuperchainERC20Proxy(REMOTE_TOKEN, _name, SYMBOL, DECIMALS);
         assertEq(_newSuperchainERC20.name(), _name);
     }
 
     /// @notice Tests the `symbol` function always returns the correct value.
     function testFuzz_symbol_succeeds(string memory _symbol) public {
-        OptimismSuperchainERC20 _newSuperchainERC20 = _deploySuperchainERC20Proxy(REMOTE_TOKEN, NAME, _symbol, DECIMALS);
+        IOptimismSuperchainERC20 _newSuperchainERC20 =
+            _deploySuperchainERC20Proxy(REMOTE_TOKEN, NAME, _symbol, DECIMALS);
         assertEq(_newSuperchainERC20.symbol(), _symbol);
     }
 
diff --git a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
index 2d6ba4e94ec8..ca8c3806b38b 100644
--- a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
@@ -7,12 +7,13 @@ import { Reverter } from "test/mocks/Callers.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Contracts
-import { SequencerFeeVault } from "src/L2/SequencerFeeVault.sol";
+import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Types } from "src/libraries/Types.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract SequencerFeeVault_Test is CommonTest {
     address recipient;
@@ -112,11 +113,19 @@ contract SequencerFeeVault_L2Withdrawal_Test is CommonTest {
         vm.etch(
             EIP1967Helper.getImplementation(Predeploys.SEQUENCER_FEE_WALLET),
             address(
-                new SequencerFeeVault(
-                    deploy.cfg().sequencerFeeVaultRecipient(),
-                    deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
-                    Types.WithdrawalNetwork.L2
-                )
+                DeployUtils.create1({
+                    _name: "SequencerFeeVault",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(
+                            ISequencerFeeVault.__constructor__,
+                            (
+                                deploy.cfg().sequencerFeeVaultRecipient(),
+                                deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
+                                Types.WithdrawalNetwork.L2
+                            )
+                        )
+                    )
+                })
             ).code
         );
 
diff --git a/packages/contracts-bedrock/test/dispute/WETH98.t.sol b/packages/contracts-bedrock/test/dispute/WETH98.t.sol
index a248e1901885..b26cd927f12c 100644
--- a/packages/contracts-bedrock/test/dispute/WETH98.t.sol
+++ b/packages/contracts-bedrock/test/dispute/WETH98.t.sol
@@ -5,7 +5,8 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Contracts
-import { WETH98 } from "src/universal/WETH98.sol";
+import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract WETH98_Test is Test {
     event Approval(address indexed src, address indexed guy, uint256 wad);
@@ -13,12 +14,17 @@ contract WETH98_Test is Test {
     event Deposit(address indexed dst, uint256 wad);
     event Withdrawal(address indexed src, uint256 wad);
 
-    WETH98 public weth;
+    IWETH98 public weth;
     address alice;
     address bob;
 
     function setUp() public {
-        weth = new WETH98();
+        weth = IWETH98(
+            DeployUtils.create1({
+                _name: "WETH98",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IWETH98.__constructor__, ()))
+            })
+        );
         alice = makeAddr("alice");
         bob = makeAddr("bob");
         deal(alice, 1 ether);
diff --git a/packages/contracts-bedrock/test/governance/MintManager.t.sol b/packages/contracts-bedrock/test/governance/MintManager.t.sol
index 4c008863ed69..c29e25602834 100644
--- a/packages/contracts-bedrock/test/governance/MintManager.t.sol
+++ b/packages/contracts-bedrock/test/governance/MintManager.t.sol
@@ -4,13 +4,10 @@ pragma solidity 0.8.15;
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
 
-// Contracts
-import { GovernanceToken } from "src/governance/GovernanceToken.sol";
-import { MintManager } from "src/governance/MintManager.sol";
-
 // Interfaces
 import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
 import { IMintManager } from "src/governance/interfaces/IMintManager.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract MintManager_Initializer is CommonTest {
     address constant owner = address(0x1234);
@@ -23,10 +20,20 @@ contract MintManager_Initializer is CommonTest {
         super.setUp();
 
         vm.prank(owner);
-        gov = IGovernanceToken(address(new GovernanceToken()));
+        gov = IGovernanceToken(
+            DeployUtils.create1({
+                _name: "GovernanceToken",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IGovernanceToken.__constructor__, ()))
+            })
+        );
 
         vm.prank(owner);
-        manager = IMintManager(address(new MintManager(owner, address(gov))));
+        manager = IMintManager(
+            DeployUtils.create1({
+                _name: "MintManager",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IMintManager.__constructor__, (owner, address(gov))))
+            })
+        );
 
         vm.prank(owner);
         gov.transferOwnership(address(manager));
diff --git a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
index 1321499462b7..5b0b300abda0 100644
--- a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
@@ -2,17 +2,27 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { SystemConfig } from "src/L1/SystemConfig.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { Proxy } from "src/universal/Proxy.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
 import { Constants } from "src/libraries/Constants.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract SystemConfig_GasLimitBoundaries_Invariant is Test {
     ISystemConfig public config;
 
     function setUp() external {
-        Proxy proxy = new Proxy(msg.sender);
-        ISystemConfig configImpl = ISystemConfig(address(new SystemConfig()));
+        IProxy proxy = IProxy(
+            DeployUtils.create1({
+                _name: "Proxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
+            })
+        );
+        ISystemConfig configImpl = ISystemConfig(
+            DeployUtils.create1({
+                _name: "SystemConfig",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfig.__constructor__, ()))
+            })
+        );
 
         vm.prank(msg.sender);
         proxy.upgradeToAndCall(
diff --git a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
index ab624df2b322..3f140e9a0725 100644
--- a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
+++ b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
@@ -5,14 +5,20 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Target contract
-import { DeployerWhitelist } from "src/legacy/DeployerWhitelist.sol";
+import { IDeployerWhitelist } from "src/legacy/interfaces/IDeployerWhitelist.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeployerWhitelist_Test is Test {
-    DeployerWhitelist list;
+    IDeployerWhitelist list;
 
     /// @dev Sets up the test suite.
     function setUp() public {
-        list = new DeployerWhitelist();
+        list = IDeployerWhitelist(
+            DeployUtils.create1({
+                _name: "DeployerWhitelist",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IDeployerWhitelist.__constructor__, ()))
+            })
+        );
     }
 
     /// @dev Tests that `owner` is initialized to the zero address.
diff --git a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
index 633a324e4043..49758739d2da 100644
--- a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
@@ -5,23 +5,29 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Contracts
-import { L1BlockNumber } from "src/legacy/L1BlockNumber.sol";
+import { IL1BlockNumber } from "src/legacy/interfaces/IL1BlockNumber.sol";
 import { L1Block } from "src/L2/L1Block.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract L1BlockNumberTest is Test {
     L1Block lb;
-    L1BlockNumber bn;
+    IL1BlockNumber bn;
 
     uint64 constant number = 99;
 
     /// @dev Sets up the test suite.
     function setUp() external {
-        vm.etch(Predeploys.L1_BLOCK_ATTRIBUTES, address(new L1Block()).code);
+        vm.etch(Predeploys.L1_BLOCK_ATTRIBUTES, vm.getDeployedCode("L1Block.sol:L1Block"));
         lb = L1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
-        bn = new L1BlockNumber();
+        bn = IL1BlockNumber(
+            DeployUtils.create1({
+                _name: "L1BlockNumber",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1BlockNumber.__constructor__, ()))
+            })
+        );
         vm.prank(lb.DEPOSITOR_ACCOUNT());
 
         lb.setL1BlockValues({
diff --git a/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol b/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
index 33a81bc2ca0e..84c743c97aa3 100644
--- a/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
+++ b/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
@@ -5,25 +5,40 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Target contract dependencies
-import { AddressManager } from "src/legacy/AddressManager.sol";
+import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
 
 // Target contract
-import { ResolvedDelegateProxy } from "src/legacy/ResolvedDelegateProxy.sol";
+import { IResolvedDelegateProxy } from "src/legacy/interfaces/IResolvedDelegateProxy.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract ResolvedDelegateProxy_Test is Test {
-    AddressManager internal addressManager;
+    IAddressManager internal addressManager;
     SimpleImplementation internal impl;
     SimpleImplementation internal proxy;
 
     /// @dev Sets up the test suite.
     function setUp() public {
         // Set up the address manager.
-        addressManager = new AddressManager();
+        addressManager = IAddressManager(
+            DeployUtils.create1({
+                _name: "AddressManager",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IAddressManager.__constructor__, ()))
+            })
+        );
         impl = new SimpleImplementation();
         addressManager.setAddress("SimpleImplementation", address(impl));
 
         // Set up the proxy.
-        proxy = SimpleImplementation(address(new ResolvedDelegateProxy(addressManager, "SimpleImplementation")));
+        proxy = SimpleImplementation(
+            address(
+                DeployUtils.create1({
+                    _name: "ResolvedDelegateProxy",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(IResolvedDelegateProxy.__constructor__, (addressManager, "SimpleImplementation"))
+                    )
+                })
+            )
+        );
     }
 
     /// @dev Tests that the proxy properly bubbles up returndata when the delegatecall succeeds.
@@ -42,8 +57,22 @@ contract ResolvedDelegateProxy_Test is Test {
     /// @dev Tests that the proxy fallback reverts as expected if the implementation within the
     ///      address manager is not set.
     function test_fallback_addressManagerNotSet_reverts() public {
-        AddressManager am = new AddressManager();
-        SimpleImplementation p = SimpleImplementation(address(new ResolvedDelegateProxy(am, "SimpleImplementation")));
+        IAddressManager am = IAddressManager(
+            DeployUtils.create1({
+                _name: "AddressManager",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IAddressManager.__constructor__, ()))
+            })
+        );
+        SimpleImplementation p = SimpleImplementation(
+            address(
+                DeployUtils.create1({
+                    _name: "ResolvedDelegateProxy",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(IResolvedDelegateProxy.__constructor__, (am, "SimpleImplementation"))
+                    )
+                })
+            )
+        );
 
         vm.expectRevert("ResolvedDelegateProxy: target address must be initialized");
         p.foo(0);
diff --git a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
index 47158c2ebace..2fec587211f7 100644
--- a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
+++ b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
@@ -8,7 +8,7 @@ import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
 // Contracts
-import { DeputyGuardianModule } from "src/safe/DeputyGuardianModule.sol";
+import { IDeputyGuardianModule } from "src/safe/interfaces/IDeputyGuardianModule.sol";
 
 // Libraries
 import "src/dispute/lib/Types.sol";
@@ -17,6 +17,7 @@ import "src/dispute/lib/Types.sol";
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeputyGuardianModule_TestInit is CommonTest, SafeTestTools {
     using SafeTestLib for SafeInstance;
@@ -26,7 +27,7 @@ contract DeputyGuardianModule_TestInit is CommonTest, SafeTestTools {
 
     event ExecutionFromModuleSuccess(address indexed);
 
-    DeputyGuardianModule deputyGuardianModule;
+    IDeputyGuardianModule deputyGuardianModule;
     SafeInstance safeInstance;
     address deputyGuardian;
 
@@ -47,11 +48,16 @@ contract DeputyGuardianModule_TestInit is CommonTest, SafeTestTools {
 
         deputyGuardian = makeAddr("deputyGuardian");
 
-        deputyGuardianModule = new DeputyGuardianModule({
-            _safe: safeInstance.safe,
-            _superchainConfig: superchainConfig,
-            _deputyGuardian: deputyGuardian
-        });
+        deputyGuardianModule = IDeputyGuardianModule(
+            DeployUtils.create1({
+                _name: "DeputyGuardianModule",
+                _args: DeployUtils.encodeConstructor(
+                    abi.encodeCall(
+                        IDeputyGuardianModule.__constructor__, (safeInstance.safe, superchainConfig, deputyGuardian)
+                    )
+                )
+            })
+        );
         safeInstance.enableModule(address(deputyGuardianModule));
     }
 }
diff --git a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
index f53310055e2b..454158566f6c 100644
--- a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
+++ b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
@@ -10,11 +10,12 @@ import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 // Libraries
 import { Types } from "src/libraries/Types.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
-import { L1BlockInterop } from "src/L2/L1BlockInterop.sol";
+import { IL1BlockInterop } from "src/L2/interfaces/IL1BlockInterop.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 
 // Interfaces
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Free function for setting the prevBaseFee param in the OptimismPortal.
 function setPrevBaseFee(Vm _vm, address _op, uint128 _prevBaseFee) {
@@ -257,11 +258,16 @@ contract GasBenchMark_L1Block_SetValuesEcotone_Warm is GasBenchMark_L1Block {
 }
 
 contract GasBenchMark_L1BlockInterop is GasBenchMark_L1Block {
-    L1BlockInterop l1BlockInterop;
+    IL1BlockInterop l1BlockInterop;
 
     function setUp() public virtual override {
         super.setUp();
-        l1BlockInterop = new L1BlockInterop();
+        l1BlockInterop = IL1BlockInterop(
+            DeployUtils.create1({
+                _name: "L1BlockInterop",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1BlockInterop.__constructor__, ()))
+            })
+        );
         setValuesCalldata = Encoding.encodeSetL1BlockValuesInterop(
             type(uint32).max,
             type(uint32).max,
diff --git a/packages/contracts-bedrock/test/universal/Proxy.t.sol b/packages/contracts-bedrock/test/universal/Proxy.t.sol
index 90d70d261775..9df4e1799aa0 100644
--- a/packages/contracts-bedrock/test/universal/Proxy.t.sol
+++ b/packages/contracts-bedrock/test/universal/Proxy.t.sol
@@ -2,8 +2,9 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { Proxy } from "src/universal/Proxy.sol";
 import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract SimpleStorage {
     mapping(uint256 => uint256) internal store;
@@ -33,13 +34,18 @@ contract Proxy_Test is Test {
 
     bytes32 internal constant OWNER_KEY = bytes32(uint256(keccak256("eip1967.proxy.admin")) - 1);
 
-    Proxy proxy;
+    IProxy proxy;
     SimpleStorage simpleStorage;
 
     function setUp() external {
         // Deploy a proxy and simple storage contract as
         // the implementation
-        proxy = new Proxy(alice);
+        proxy = IProxy(
+            DeployUtils.create1({
+                _name: "Proxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (alice)))
+            })
+        );
         simpleStorage = new SimpleStorage();
 
         vm.prank(alice);
diff --git a/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol b/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
index e212644c9d50..e6d6ced1f971 100644
--- a/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
+++ b/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
@@ -5,47 +5,73 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { SimpleStorage } from "test/universal/Proxy.t.sol";
 
-// Contracts
-import { Proxy } from "src/universal/Proxy.sol";
-import { ProxyAdmin } from "src/universal/ProxyAdmin.sol";
-import { AddressManager } from "src/legacy/AddressManager.sol";
-import { L1ChugSplashProxy } from "src/legacy/L1ChugSplashProxy.sol";
-import { ResolvedDelegateProxy } from "src/legacy/ResolvedDelegateProxy.sol";
-
 // Interfaces
 import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
+import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
+import { IResolvedDelegateProxy } from "src/legacy/interfaces/IResolvedDelegateProxy.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
+
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract ProxyAdmin_Test is Test {
     address alice = address(64);
 
-    Proxy proxy;
-    L1ChugSplashProxy chugsplash;
-    ResolvedDelegateProxy resolved;
+    IProxy proxy;
+    IL1ChugSplashProxy chugsplash;
+    IResolvedDelegateProxy resolved;
 
-    AddressManager addressManager;
+    IAddressManager addressManager;
 
-    ProxyAdmin admin;
+    IProxyAdmin admin;
 
     SimpleStorage implementation;
 
     function setUp() external {
         // Deploy the proxy admin
-        admin = new ProxyAdmin(alice);
+        admin = IProxyAdmin(
+            DeployUtils.create1({
+                _name: "ProxyAdmin",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxyAdmin.__constructor__, (alice)))
+            })
+        );
+
         // Deploy the standard proxy
-        proxy = new Proxy(address(admin));
+        proxy = IProxy(
+            DeployUtils.create1({
+                _name: "Proxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (address(admin))))
+            })
+        );
 
         // Deploy the legacy L1ChugSplashProxy with the admin as the owner
-        chugsplash = new L1ChugSplashProxy(address(admin));
+        chugsplash = IL1ChugSplashProxy(
+            DeployUtils.create1({
+                _name: "L1ChugSplashProxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1ChugSplashProxy.__constructor__, (address(admin))))
+            })
+        );
 
         // Deploy the legacy AddressManager
-        addressManager = new AddressManager();
+        addressManager = IAddressManager(
+            DeployUtils.create1({
+                _name: "AddressManager",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IAddressManager.__constructor__, ()))
+            })
+        );
         // The proxy admin must be the new owner of the address manager
         addressManager.transferOwnership(address(admin));
         // Deploy a legacy ResolvedDelegateProxy with the name `a`.
         // Whatever `a` is set to in AddressManager will be the address
         // that is used for the implementation.
-        resolved = new ResolvedDelegateProxy(addressManager, "a");
-
+        resolved = IResolvedDelegateProxy(
+            DeployUtils.create1({
+                _name: "ResolvedDelegateProxy",
+                _args: DeployUtils.encodeConstructor(
+                    abi.encodeCall(IResolvedDelegateProxy.__constructor__, (addressManager, "a"))
+                )
+            })
+        );
         // Impersonate alice for setting up the admin.
         vm.startPrank(alice);
         // Set the address of the address manager in the admin so that it
@@ -57,9 +83,9 @@ contract ProxyAdmin_Test is Test {
         admin.setImplementationName(address(resolved), "a");
 
         // Set the proxy types
-        admin.setProxyType(address(proxy), ProxyAdmin.ProxyType.ERC1967);
-        admin.setProxyType(address(chugsplash), ProxyAdmin.ProxyType.CHUGSPLASH);
-        admin.setProxyType(address(resolved), ProxyAdmin.ProxyType.RESOLVED);
+        admin.setProxyType(address(proxy), IProxyAdmin.ProxyType.ERC1967);
+        admin.setProxyType(address(chugsplash), IProxyAdmin.ProxyType.CHUGSPLASH);
+        admin.setProxyType(address(resolved), IProxyAdmin.ProxyType.RESOLVED);
         vm.stopPrank();
 
         implementation = new SimpleStorage();
@@ -83,7 +109,7 @@ contract ProxyAdmin_Test is Test {
 
     function test_setProxyType_notOwner_reverts() external {
         vm.expectRevert("Ownable: caller is not the owner");
-        admin.setProxyType(address(0), ProxyAdmin.ProxyType.CHUGSPLASH);
+        admin.setProxyType(address(0), IProxyAdmin.ProxyType.CHUGSPLASH);
     }
 
     function test_owner_succeeds() external view {
@@ -91,9 +117,9 @@ contract ProxyAdmin_Test is Test {
     }
 
     function test_proxyType_succeeds() external view {
-        assertEq(uint256(admin.proxyType(address(proxy))), uint256(ProxyAdmin.ProxyType.ERC1967));
-        assertEq(uint256(admin.proxyType(address(chugsplash))), uint256(ProxyAdmin.ProxyType.CHUGSPLASH));
-        assertEq(uint256(admin.proxyType(address(resolved))), uint256(ProxyAdmin.ProxyType.RESOLVED));
+        assertEq(uint256(admin.proxyType(address(proxy))), uint256(IProxyAdmin.ProxyType.ERC1967));
+        assertEq(uint256(admin.proxyType(address(chugsplash))), uint256(IProxyAdmin.ProxyType.CHUGSPLASH));
+        assertEq(uint256(admin.proxyType(address(resolved))), uint256(IProxyAdmin.ProxyType.RESOLVED));
     }
 
     function test_erc1967GetProxyImplementation_succeeds() external {
@@ -153,7 +179,7 @@ contract ProxyAdmin_Test is Test {
     }
 
     function changeProxyAdmin(address payable _proxy) internal {
-        ProxyAdmin.ProxyType proxyType = admin.proxyType(address(_proxy));
+        IProxyAdmin.ProxyType proxyType = admin.proxyType(address(_proxy));
 
         vm.prank(alice);
         admin.changeProxyAdmin(_proxy, address(128));
@@ -162,13 +188,13 @@ contract ProxyAdmin_Test is Test {
         // no longer call the proxy interface except for
         // the ResolvedDelegate type on which anybody can
         // call the admin interface.
-        if (proxyType == ProxyAdmin.ProxyType.ERC1967) {
+        if (proxyType == IProxyAdmin.ProxyType.ERC1967) {
             vm.expectRevert("Proxy: implementation not initialized");
             admin.getProxyAdmin(_proxy);
-        } else if (proxyType == ProxyAdmin.ProxyType.CHUGSPLASH) {
+        } else if (proxyType == IProxyAdmin.ProxyType.CHUGSPLASH) {
             vm.expectRevert("L1ChugSplashProxy: implementation is not set yet");
             admin.getProxyAdmin(_proxy);
-        } else if (proxyType == ProxyAdmin.ProxyType.RESOLVED) {
+        } else if (proxyType == IProxyAdmin.ProxyType.RESOLVED) {
             // Just an empty block to show that all cases are covered
         } else {
             vm.expectRevert("ProxyAdmin: unknown proxy type");
@@ -177,11 +203,11 @@ contract ProxyAdmin_Test is Test {
         // Call the proxy contract directly to get the admin.
         // Different proxy types have different interfaces.
         vm.prank(address(128));
-        if (proxyType == ProxyAdmin.ProxyType.ERC1967) {
-            assertEq(Proxy(payable(_proxy)).admin(), address(128));
-        } else if (proxyType == ProxyAdmin.ProxyType.CHUGSPLASH) {
-            assertEq(L1ChugSplashProxy(payable(_proxy)).getOwner(), address(128));
-        } else if (proxyType == ProxyAdmin.ProxyType.RESOLVED) {
+        if (proxyType == IProxyAdmin.ProxyType.ERC1967) {
+            assertEq(IProxy(payable(_proxy)).admin(), address(128));
+        } else if (proxyType == IProxyAdmin.ProxyType.CHUGSPLASH) {
+            assertEq(IL1ChugSplashProxy(payable(_proxy)).getOwner(), address(128));
+        } else if (proxyType == IProxyAdmin.ProxyType.RESOLVED) {
             assertEq(addressManager.owner(), address(128));
         } else {
             assert(false);
diff --git a/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol b/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol
index 0820f987414a..4b663d697ba6 100644
--- a/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol
+++ b/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol
@@ -2,12 +2,13 @@
 pragma solidity 0.8.25;
 
 import { Test } from "forge-std/Test.sol";
-import { OptimismSuperchainERC20 } from "src/L2/OptimismSuperchainERC20.sol";
+import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
 import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
-
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 /// @title InitializerOZv5_Test
 /// @dev Ensures that the `initialize()` function on contracts cannot be called more than
 ///      once. Tests the contracts inheriting from `Initializable` from OpenZeppelin Contracts v5.
+
 contract InitializerOZv5_Test is Test {
     /// @notice The storage slot of the `initialized` flag in the `Initializable` contract from OZ v5.
     /// keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.Initializable")) - 1)) & ~bytes32(uint256(0xff))
@@ -31,8 +32,13 @@ contract InitializerOZv5_Test is Test {
         // OptimismSuperchainERC20
         contracts.push(
             InitializeableContract({
-                target: address(new OptimismSuperchainERC20()),
-                initCalldata: abi.encodeCall(OptimismSuperchainERC20.initialize, (address(0), "", "", 18))
+                target: address(
+                    DeployUtils.create1({
+                        _name: "OptimismSuperchainERC20",
+                        _args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismSuperchainERC20.__constructor__, ()))
+                    })
+                ),
+                initCalldata: abi.encodeCall(IOptimismSuperchainERC20.initialize, (address(0), "", "", 18))
             })
         );
     }
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 5646182a04f2..71df6566d4c5 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -74,6 +74,7 @@ rules:
       exclude:
         - packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
         - packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
+        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol

From 12d6cb3cea0c6990f6ad79f5ee5ae6c18bf00c8e Mon Sep 17 00:00:00 2001
From: DenseDenise <DenseDenise12@proton.me>
Date: Sat, 26 Oct 2024 05:19:02 +0000
Subject: [PATCH 039/451] cannon: supplement the example cannon command
 (#12658)

* optimize the example cannon command

* Update cannon/README.md

Co-authored-by: smartcontracts <kelvinfichter@gmail.com>

* Update cannon/README.md

Co-authored-by: smartcontracts <kelvinfichter@gmail.com>

---------

Co-authored-by: smartcontracts <kelvinfichter@gmail.com>
---
 cannon/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cannon/README.md b/cannon/README.md
index be1615b45f8a..a5af5b2e7ece 100644
--- a/cannon/README.md
+++ b/cannon/README.md
@@ -39,6 +39,7 @@ make cannon
 # Note:
 #  - The L2 RPC is an archive L2 node on OP MAINNET.
 #  - The L1 RPC is a non-archive RPC, also change `--l1.rpckind` to reflect the correct L1 RPC type.
+#  - The network flag is only suitable for specific networks(https://github.com/ethereum-optimism/superchain-registry/blob/main/chainList.json). If you are running on the devnet, please use '--l2.genesis' to supply a path to the L2 devnet genesis file.
 ./bin/cannon run \
     --pprof.cpu \
     --info-at '%10000000' \
@@ -48,7 +49,7 @@ make cannon
     --input ./state.bin.gz \
     -- \
     ../op-program/bin/op-program \
-    --network op-mainnet \
+    --network <network name> \
     --l1 <L1_URL> \
     --l2 <L2_URL> \
     --l1.head <L1_HEAD> \

From 44f814cea84e03418fb993479795887c12e5391f Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Sat, 26 Oct 2024 12:42:12 +0700
Subject: [PATCH 040/451] feat(ci): check that Kontrol summary files are
 unchanged (#12592)

Updates CI to check that the Kontrol summary dummy files are not
modified by any PR unless the change is deliberate. Committed files
are dummy files and aren't meant to change.

Alternative here would be to generate the dummy files with a
script that gets triggered before forge builds stuff. Main concern
with using an autogen script is that the script would need to be
added in front of build commands all over the place. Committing
the files and checking that they aren't changed is slightly more
janky but people rarely re-generate these files anyway so the
projected impact is minimal.

If this becomes a devx hassle we can consider autogen.
---
 .circleci/config.yml                          |  2 ++
 packages/contracts-bedrock/justfile           |  6 ++++
 .../scripts/checks/check-file-unchanged.sh    | 30 +++++++++++++++++++
 .../check-kontrol-summaries-unchanged.sh      | 10 +++++++
 4 files changed, 48 insertions(+)
 create mode 100755 packages/contracts-bedrock/scripts/checks/check-file-unchanged.sh
 create mode 100755 packages/contracts-bedrock/scripts/checks/check-kontrol-summaries-unchanged.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a041bedb9ecb..bac526521686 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -676,6 +676,8 @@ jobs:
       - run:
           name: print forge version
           command: forge --version
+      - run-contracts-check:
+          command: check-kontrol-summaries-unchanged
       - run-contracts-check:
           command: semgrep-test-validity-check
       - run-contracts-check:
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 11bd9ed4946b..23f91c5779c3 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -185,6 +185,12 @@ validate-spacers-no-build:
 # Checks that spacer variables are correctly inserted.
 validate-spacers: build validate-spacers-no-build
 
+# Checks that the Kontrol summary dummy files have not been modified.
+# If you have changed the summary files deliberately, update the hashes in the script.
+# Use `openssl dgst -sha256` to generate the hash for a file.
+check-kontrol-summaries-unchanged:
+  ./scripts/checks/check-kontrol-summaries-unchanged.sh
+
 # Runs semgrep on the contracts.
 semgrep:
   cd ../../ && semgrep scan --config=semgrep ./packages/contracts-bedrock
diff --git a/packages/contracts-bedrock/scripts/checks/check-file-unchanged.sh b/packages/contracts-bedrock/scripts/checks/check-file-unchanged.sh
new file mode 100755
index 000000000000..0949503efe32
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/checks/check-file-unchanged.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Check if both arguments are provided
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 <file_path> <expected_hash>"
+    exit 1
+fi
+
+file_path="$1"
+expected_hash="$2"
+
+# Check if the file exists
+if [ ! -f "$file_path" ]; then
+    echo "Error: File '$file_path' does not exist."
+    exit 1
+fi
+
+# Calculate the actual hash of the file
+actual_hash=$(openssl dgst -sha256 -r "$file_path" | awk '{print $1}')
+
+# Compare the hashes
+if [ "$actual_hash" = "$expected_hash" ]; then
+    exit 0
+else
+    echo "File '$file_path' has changed when it shouldn't have"
+    echo "Expected hash: $expected_hash"
+    echo "Actual hash:   $actual_hash"
+    exit 1
+fi
diff --git a/packages/contracts-bedrock/scripts/checks/check-kontrol-summaries-unchanged.sh b/packages/contracts-bedrock/scripts/checks/check-kontrol-summaries-unchanged.sh
new file mode 100755
index 000000000000..32c764c188a8
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/checks/check-kontrol-summaries-unchanged.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Runs the file unchanged script for each of the Kontrol summary files.
+# Update these hashes if you have changed the summary files deliberately.
+# Use `openssl dgst -sha256` to generate the hash for a file.
+./scripts/checks/check-file-unchanged.sh ./test/kontrol/proofs/utils/DeploymentSummary.sol 73e1ed1f3c8bd9e46bb348b774443458206b2399e4eac303e2a92ac987eeefc6
+./scripts/checks/check-file-unchanged.sh ./test/kontrol/proofs/utils/DeploymentSummaryCode.sol ffe7298024464a6a282ceb549db401cce4b36fe3342113250a6c674a3b4203ba
+./scripts/checks/check-file-unchanged.sh ./test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol 5ec8b19a00b47f15a2a8c8d632ab83933e19b0c2bbb04c905a2cda926e56038f
+./scripts/checks/check-file-unchanged.sh ./test/kontrol/proofs/utils/DeploymentSummaryFaultProofsCode.sol 1215a561a2bffb5af62b532a2608c4048a22368e505f7ae1d237c16b4ef6a45e

From f5591ca62fb0bbfeda5d708a81be723fca68b13d Mon Sep 17 00:00:00 2001
From: Delweng <delweng@gmail.com>
Date: Sat, 26 Oct 2024 15:10:28 +0800
Subject: [PATCH 041/451] op-service/client: rm unnecessary type arguments
 (#12651)

Signed-off-by: jsvisa <delweng@gmail.com>
---
 op-service/client/client.go | 56 ++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/op-service/client/client.go b/op-service/client/client.go
index 22f71866926b..9f4dac659424 100644
--- a/op-service/client/client.go
+++ b/op-service/client/client.go
@@ -79,43 +79,43 @@ func (ic *InstrumentedClient) RPC() RPC {
 }
 
 func (ic *InstrumentedClient) ChainID(ctx context.Context) (*big.Int, error) {
-	return instrument2[*big.Int](ic.m, "eth_chainId", func() (*big.Int, error) {
+	return instrument2(ic.m, "eth_chainId", func() (*big.Int, error) {
 		return ic.c.ChainID(ctx)
 	})
 }
 
 func (ic *InstrumentedClient) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) {
-	return instrument2[*types.Block](ic.m, "eth_getBlockByHash", func() (*types.Block, error) {
+	return instrument2(ic.m, "eth_getBlockByHash", func() (*types.Block, error) {
 		return ic.c.BlockByHash(ctx, hash)
 	})
 }
 
 func (ic *InstrumentedClient) BlockByNumber(ctx context.Context, number *big.Int) (*types.Block, error) {
-	return instrument2[*types.Block](ic.m, "eth_getBlockByNumber", func() (*types.Block, error) {
+	return instrument2(ic.m, "eth_getBlockByNumber", func() (*types.Block, error) {
 		return ic.c.BlockByNumber(ctx, number)
 	})
 }
 
 func (ic *InstrumentedClient) BlockNumber(ctx context.Context) (uint64, error) {
-	return instrument2[uint64](ic.m, "eth_blockNumber", func() (uint64, error) {
+	return instrument2(ic.m, "eth_blockNumber", func() (uint64, error) {
 		return ic.c.BlockNumber(ctx)
 	})
 }
 
 func (ic *InstrumentedClient) PeerCount(ctx context.Context) (uint64, error) {
-	return instrument2[uint64](ic.m, "net_peerCount", func() (uint64, error) {
+	return instrument2(ic.m, "net_peerCount", func() (uint64, error) {
 		return ic.c.PeerCount(ctx)
 	})
 }
 
 func (ic *InstrumentedClient) HeaderByHash(ctx context.Context, hash common.Hash) (*types.Header, error) {
-	return instrument2[*types.Header](ic.m, "eth_getHeaderByHash", func() (*types.Header, error) {
+	return instrument2(ic.m, "eth_getHeaderByHash", func() (*types.Header, error) {
 		return ic.c.HeaderByHash(ctx, hash)
 	})
 }
 
 func (ic *InstrumentedClient) HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error) {
-	return instrument2[*types.Header](ic.m, "eth_getHeaderByNumber", func() (*types.Header, error) {
+	return instrument2(ic.m, "eth_getHeaderByNumber", func() (*types.Header, error) {
 		return ic.c.HeaderByNumber(ctx, number)
 	})
 }
@@ -132,25 +132,25 @@ func (ic *InstrumentedClient) TransactionSender(ctx context.Context, tx *types.T
 }
 
 func (ic *InstrumentedClient) TransactionCount(ctx context.Context, blockHash common.Hash) (uint, error) {
-	return instrument2[uint](ic.m, "eth_getTransactionCount", func() (uint, error) {
+	return instrument2(ic.m, "eth_getTransactionCount", func() (uint, error) {
 		return ic.c.TransactionCount(ctx, blockHash)
 	})
 }
 
 func (ic *InstrumentedClient) TransactionInBlock(ctx context.Context, blockHash common.Hash, index uint) (*types.Transaction, error) {
-	return instrument2[*types.Transaction](ic.m, "eth_getTransactionByBlockHashAndIndex", func() (*types.Transaction, error) {
+	return instrument2(ic.m, "eth_getTransactionByBlockHashAndIndex", func() (*types.Transaction, error) {
 		return ic.c.TransactionInBlock(ctx, blockHash, index)
 	})
 }
 
 func (ic *InstrumentedClient) TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error) {
-	return instrument2[*types.Receipt](ic.m, "eth_getTransactionReceipt", func() (*types.Receipt, error) {
+	return instrument2(ic.m, "eth_getTransactionReceipt", func() (*types.Receipt, error) {
 		return ic.c.TransactionReceipt(ctx, txHash)
 	})
 }
 
 func (ic *InstrumentedClient) SyncProgress(ctx context.Context) (*ethereum.SyncProgress, error) {
-	return instrument2[*ethereum.SyncProgress](ic.m, "eth_syncing", func() (*ethereum.SyncProgress, error) {
+	return instrument2(ic.m, "eth_syncing", func() (*ethereum.SyncProgress, error) {
 		return ic.c.SyncProgress(ctx)
 	})
 }
@@ -160,37 +160,37 @@ func (ic *InstrumentedClient) SubscribeNewHead(ctx context.Context, ch chan<- *t
 }
 
 func (ic *InstrumentedClient) NetworkID(ctx context.Context) (*big.Int, error) {
-	return instrument2[*big.Int](ic.m, "net_version", func() (*big.Int, error) {
+	return instrument2(ic.m, "net_version", func() (*big.Int, error) {
 		return ic.c.NetworkID(ctx)
 	})
 }
 
 func (ic *InstrumentedClient) BalanceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error) {
-	return instrument2[*big.Int](ic.m, "eth_getBalance", func() (*big.Int, error) {
+	return instrument2(ic.m, "eth_getBalance", func() (*big.Int, error) {
 		return ic.c.BalanceAt(ctx, account, blockNumber)
 	})
 }
 
 func (ic *InstrumentedClient) StorageAt(ctx context.Context, account common.Address, key common.Hash, blockNumber *big.Int) ([]byte, error) {
-	return instrument2[[]byte](ic.m, "eth_getStorageAt", func() ([]byte, error) {
+	return instrument2(ic.m, "eth_getStorageAt", func() ([]byte, error) {
 		return ic.c.StorageAt(ctx, account, key, blockNumber)
 	})
 }
 
 func (ic *InstrumentedClient) CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error) {
-	return instrument2[[]byte](ic.m, "eth_getCode", func() ([]byte, error) {
+	return instrument2(ic.m, "eth_getCode", func() ([]byte, error) {
 		return ic.c.CodeAt(ctx, account, blockNumber)
 	})
 }
 
 func (ic *InstrumentedClient) NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error) {
-	return instrument2[uint64](ic.m, "eth_getTransactionCount", func() (uint64, error) {
+	return instrument2(ic.m, "eth_getTransactionCount", func() (uint64, error) {
 		return ic.c.NonceAt(ctx, account, blockNumber)
 	})
 }
 
 func (ic *InstrumentedClient) FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) {
-	return instrument2[[]types.Log](ic.m, "eth_getLogs", func() ([]types.Log, error) {
+	return instrument2(ic.m, "eth_getLogs", func() ([]types.Log, error) {
 		return ic.c.FilterLogs(ctx, q)
 	})
 }
@@ -200,67 +200,67 @@ func (ic *InstrumentedClient) SubscribeFilterLogs(ctx context.Context, q ethereu
 }
 
 func (ic *InstrumentedClient) PendingBalanceAt(ctx context.Context, account common.Address) (*big.Int, error) {
-	return instrument2[*big.Int](ic.m, "eth_getBalance", func() (*big.Int, error) {
+	return instrument2(ic.m, "eth_getBalance", func() (*big.Int, error) {
 		return ic.c.PendingBalanceAt(ctx, account)
 	})
 }
 
 func (ic *InstrumentedClient) PendingStorageAt(ctx context.Context, account common.Address, key common.Hash) ([]byte, error) {
-	return instrument2[[]byte](ic.m, "eth_getStorageAt", func() ([]byte, error) {
+	return instrument2(ic.m, "eth_getStorageAt", func() ([]byte, error) {
 		return ic.c.PendingStorageAt(ctx, account, key)
 	})
 }
 
 func (ic *InstrumentedClient) PendingCodeAt(ctx context.Context, account common.Address) ([]byte, error) {
-	return instrument2[[]byte](ic.m, "eth_getCode", func() ([]byte, error) {
+	return instrument2(ic.m, "eth_getCode", func() ([]byte, error) {
 		return ic.c.PendingCodeAt(ctx, account)
 	})
 }
 
 func (ic *InstrumentedClient) PendingNonceAt(ctx context.Context, account common.Address) (uint64, error) {
-	return instrument2[uint64](ic.m, "eth_getTransactionCount", func() (uint64, error) {
+	return instrument2(ic.m, "eth_getTransactionCount", func() (uint64, error) {
 		return ic.c.PendingNonceAt(ctx, account)
 	})
 }
 
 func (ic *InstrumentedClient) PendingTransactionCount(ctx context.Context) (uint, error) {
-	return instrument2[uint](ic.m, "eth_getBlockTransactionCountByNumber", func() (uint, error) {
+	return instrument2(ic.m, "eth_getBlockTransactionCountByNumber", func() (uint, error) {
 		return ic.c.PendingTransactionCount(ctx)
 	})
 }
 
 func (ic *InstrumentedClient) CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error) {
-	return instrument2[[]byte](ic.m, "eth_call", func() ([]byte, error) {
+	return instrument2(ic.m, "eth_call", func() ([]byte, error) {
 		return ic.c.CallContract(ctx, msg, blockNumber)
 	})
 }
 
 func (ic *InstrumentedClient) CallContractAtHash(ctx context.Context, msg ethereum.CallMsg, blockHash common.Hash) ([]byte, error) {
-	return instrument2[[]byte](ic.m, "eth_call", func() ([]byte, error) {
+	return instrument2(ic.m, "eth_call", func() ([]byte, error) {
 		return ic.c.CallContractAtHash(ctx, msg, blockHash)
 	})
 }
 
 func (ic *InstrumentedClient) PendingCallContract(ctx context.Context, msg ethereum.CallMsg) ([]byte, error) {
-	return instrument2[[]byte](ic.m, "eth_call", func() ([]byte, error) {
+	return instrument2(ic.m, "eth_call", func() ([]byte, error) {
 		return ic.c.PendingCallContract(ctx, msg)
 	})
 }
 
 func (ic *InstrumentedClient) SuggestGasPrice(ctx context.Context) (*big.Int, error) {
-	return instrument2[*big.Int](ic.m, "eth_gasPrice", func() (*big.Int, error) {
+	return instrument2(ic.m, "eth_gasPrice", func() (*big.Int, error) {
 		return ic.c.SuggestGasPrice(ctx)
 	})
 }
 
 func (ic *InstrumentedClient) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
-	return instrument2[*big.Int](ic.m, "eth_maxPriorityFeePerGas", func() (*big.Int, error) {
+	return instrument2(ic.m, "eth_maxPriorityFeePerGas", func() (*big.Int, error) {
 		return ic.c.SuggestGasPrice(ctx)
 	})
 }
 
 func (ic *InstrumentedClient) EstimateGas(ctx context.Context, msg ethereum.CallMsg) (uint64, error) {
-	return instrument2[uint64](ic.m, "eth_estimateGas", func() (uint64, error) {
+	return instrument2(ic.m, "eth_estimateGas", func() (uint64, error) {
 		return ic.c.EstimateGas(ctx, msg)
 	})
 }

From df8a3e39905e39878718a0887f1ac6b5bae94025 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Sat, 26 Oct 2024 06:56:54 -0500
Subject: [PATCH 042/451] Fix DerivedFrom Client Signature (#12661)

---
 op-e2e/actions/interop/interop_test.go       |  5 ++---
 op-node/rollup/interop/interop.go            |  8 ++++++--
 op-node/rollup/interop/interop_test.go       |  7 ++++++-
 op-service/sources/supervisor_client.go      |  6 ++----
 op-service/testutils/fake_interop_backend.go |  8 +++-----
 op-service/testutils/mock_interop_backend.go | 10 ++++------
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/op-e2e/actions/interop/interop_test.go b/op-e2e/actions/interop/interop_test.go
index b04a07da4826..1375275e178d 100644
--- a/op-e2e/actions/interop/interop_test.go
+++ b/op-e2e/actions/interop/interop_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
@@ -137,8 +136,8 @@ func TestInteropVerifier(gt *testing.T) {
 		out.Cross = request.Local
 		return out, nil
 	}
-	seqMockBackend.DerivedFromFn = func(ctx context.Context, chainID types.ChainID, blockHash common.Hash, blockNumber uint64) (eth.L1BlockRef, error) {
-		require.Equal(t, uint64(1), blockNumber)
+	seqMockBackend.DerivedFromFn = func(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
+		require.Equal(t, uint64(1), derived.Number)
 		return l1Head, nil
 	}
 	seqMockBackend.FinalizedFn = func(ctx context.Context, chainID types.ChainID) (eth.BlockID, error) {
diff --git a/op-node/rollup/interop/interop.go b/op-node/rollup/interop/interop.go
index 2421fcd31377..293402fee389 100644
--- a/op-node/rollup/interop/interop.go
+++ b/op-node/rollup/interop/interop.go
@@ -25,7 +25,7 @@ type InteropBackend interface {
 	SafeView(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error)
 	Finalized(ctx context.Context, chainID types.ChainID) (eth.BlockID, error)
 
-	DerivedFrom(ctx context.Context, chainID types.ChainID, blockHash common.Hash, blockNumber uint64) (eth.L1BlockRef, error)
+	DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error)
 
 	UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error
 	UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error
@@ -220,7 +220,11 @@ func (d *InteropDeriver) onCrossSafeUpdateEvent(x engine.CrossSafeUpdateEvent) e
 		//  and then reset derivation, so this op-node can help get the supervisor back in sync.
 		return nil
 	}
-	derivedFrom, err := d.backend.DerivedFrom(ctx, d.chainID, result.Cross.Hash, result.Cross.Number)
+	derived := eth.BlockID{
+		Hash:   result.Cross.Hash,
+		Number: result.Cross.Number,
+	}
+	derivedFrom, err := d.backend.DerivedFrom(ctx, d.chainID, derived)
 	if err != nil {
 		return fmt.Errorf("failed to get derived-from of %s: %w", result.Cross, err)
 	}
diff --git a/op-node/rollup/interop/interop_test.go b/op-node/rollup/interop/interop_test.go
index 3dc0e7708d04..fc6bf59cacea 100644
--- a/op-node/rollup/interop/interop_test.go
+++ b/op-node/rollup/interop/interop_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/finality"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum-optimism/optimism/op-service/testutils"
 	supervisortypes "github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
@@ -114,7 +115,11 @@ func TestInteropDeriver(t *testing.T) {
 			Cross: nextCrossSafe.ID(),
 		}
 		interopBackend.ExpectSafeView(chainID, localView, supervisorView, nil)
-		interopBackend.ExpectDerivedFrom(chainID, nextCrossSafe.Hash, nextCrossSafe.Number, derivedFrom, nil)
+		derived := eth.BlockID{
+			Hash:   nextCrossSafe.Hash,
+			Number: nextCrossSafe.Number,
+		}
+		interopBackend.ExpectDerivedFrom(chainID, derived, derivedFrom, nil)
 		l2Source.ExpectL2BlockRefByHash(nextCrossSafe.Hash, nextCrossSafe, nil)
 		emitter.ExpectOnce(engine.PromoteSafeEvent{
 			Ref:         nextCrossSafe,
diff --git a/op-service/sources/supervisor_client.go b/op-service/sources/supervisor_client.go
index 48063e351e54..fc4c85b10a45 100644
--- a/op-service/sources/supervisor_client.go
+++ b/op-service/sources/supervisor_client.go
@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/common"
-
 	"github.com/ethereum-optimism/optimism/op-service/client"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
@@ -99,9 +97,9 @@ func (cl *SupervisorClient) Finalized(ctx context.Context, chainID types.ChainID
 	return result, err
 }
 
-func (cl *SupervisorClient) DerivedFrom(ctx context.Context, chainID types.ChainID, blockHash common.Hash, blockNumber uint64) (eth.L1BlockRef, error) {
+func (cl *SupervisorClient) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
 	var result eth.L1BlockRef
-	err := cl.client.CallContext(ctx, &result, "supervisor_derivedFrom", chainID, blockHash, blockNumber)
+	err := cl.client.CallContext(ctx, &result, "supervisor_derivedFrom", chainID, derived)
 	return result, err
 }
 
diff --git a/op-service/testutils/fake_interop_backend.go b/op-service/testutils/fake_interop_backend.go
index 7c6287031229..b73b4ac07225 100644
--- a/op-service/testutils/fake_interop_backend.go
+++ b/op-service/testutils/fake_interop_backend.go
@@ -3,8 +3,6 @@ package testutils
 import (
 	"context"
 
-	"github.com/ethereum/go-ethereum/common"
-
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -13,7 +11,7 @@ type FakeInteropBackend struct {
 	UnsafeViewFn        func(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error)
 	SafeViewFn          func(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error)
 	FinalizedFn         func(ctx context.Context, chainID types.ChainID) (eth.BlockID, error)
-	DerivedFromFn       func(ctx context.Context, chainID types.ChainID, blockHash common.Hash, blockNumber uint64) (eth.L1BlockRef, error)
+	DerivedFromFn       func(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error)
 	UpdateLocalUnsafeFn func(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error
 	UpdateLocalSafeFn   func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error
 	UpdateFinalizedL1Fn func(ctx context.Context, chainID types.ChainID, finalized eth.L1BlockRef) error
@@ -31,8 +29,8 @@ func (m *FakeInteropBackend) Finalized(ctx context.Context, chainID types.ChainI
 	return m.FinalizedFn(ctx, chainID)
 }
 
-func (m *FakeInteropBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, blockHash common.Hash, blockNumber uint64) (eth.L1BlockRef, error) {
-	return m.DerivedFromFn(ctx, chainID, blockHash, blockNumber)
+func (m *FakeInteropBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
+	return m.DerivedFromFn(ctx, chainID, derived)
 }
 
 func (m *FakeInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error {
diff --git a/op-service/testutils/mock_interop_backend.go b/op-service/testutils/mock_interop_backend.go
index 4bb300a95ff2..087b2f9c28cf 100644
--- a/op-service/testutils/mock_interop_backend.go
+++ b/op-service/testutils/mock_interop_backend.go
@@ -5,8 +5,6 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.com/ethereum/go-ethereum/common"
-
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -60,13 +58,13 @@ func (m *MockInteropBackend) ExpectFinalized(chainID types.ChainID, result eth.B
 	m.Mock.On("Finalized", chainID).Once().Return(result, &err)
 }
 
-func (m *MockInteropBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, blockHash common.Hash, blockNumber uint64) (eth.L1BlockRef, error) {
-	result := m.Mock.MethodCalled("DerivedFrom", chainID, blockHash, blockNumber)
+func (m *MockInteropBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
+	result := m.Mock.MethodCalled("DerivedFrom", chainID, derived)
 	return result.Get(0).(eth.L1BlockRef), *result.Get(1).(*error)
 }
 
-func (m *MockInteropBackend) ExpectDerivedFrom(chainID types.ChainID, blockHash common.Hash, blockNumber uint64, result eth.L1BlockRef, err error) {
-	m.Mock.On("DerivedFrom", chainID, blockHash, blockNumber).Once().Return(result, &err)
+func (m *MockInteropBackend) ExpectDerivedFrom(chainID types.ChainID, derived eth.BlockID, result eth.L1BlockRef, err error) {
+	m.Mock.On("DerivedFrom", chainID, derived).Once().Return(result, &err)
 }
 
 func (m *MockInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error {

From 71fd67043d4748e55ea6e43d9b6cc288e1207ffe Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Sat, 26 Oct 2024 23:08:21 -0600
Subject: [PATCH 043/451] ci: fix goreleaser (#12667)

The Docker release requires special args.
---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bac526521686..27ac27532834 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1250,7 +1250,9 @@ jobs:
     steps:
       - setup_remote_docker
       - gcp-cli/install
-      - gcp-oidc-authenticate
+      - gcp-oidc-authenticate:
+          gcp_cred_config_file_path: /root/gcp_cred_config.json
+          oidc_token_file_path: /root/oidc_token.json
       - run:
           name: Install goreleaser pro
           command: |

From 3e31ea4f5718963aae930bca5398b928c931c115 Mon Sep 17 00:00:00 2001
From: Karl Bartel <karl.bartel@clabs.co>
Date: Sun, 27 Oct 2024 11:07:29 +0100
Subject: [PATCH 044/451] Makefile: Fix executable command detection (#12080)

`$(command -v geth)` is valid shell syntax, but it gets processed by
make first, so that this never gets correctly executed by the shell. As
a result, `make install-geth` and `make install-eth2-testnet-genesis`
are always executed and not, as intended, just when the commands are not
present.

The fix is easy: escape the dollar by duplicating it, so that make won't
do anything and the correct command reaches the shell.
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 791eba38d453..3f6f759c59fc 100644
--- a/Makefile
+++ b/Makefile
@@ -173,10 +173,10 @@ nuke: clean devnet-clean ## Completely clean the project directory
 
 ## Prepares for running a local devnet
 pre-devnet: submodules $(DEVNET_CANNON_PRESTATE_FILES)
-	@if ! [ -x "$(command -v geth)" ]; then \
+	@if ! [ -x "$$(command -v geth)" ]; then \
 		make install-geth; \
 	fi
-	@if ! [ -x "$(command -v eth2-testnet-genesis)" ]; then \
+	@if ! [ -x "$$(command -v eth2-testnet-genesis)" ]; then \
 		make install-eth2-testnet-genesis; \
 	fi
 .PHONY: pre-devnet

From 84ba885e668ae722a8349ce0a2702f81829deb88 Mon Sep 17 00:00:00 2001
From: I love OP <odysseasmankt@gmail.com>
Date: Sun, 27 Oct 2024 11:03:13 -0300
Subject: [PATCH 045/451] fix Makefile (#12668)

---
 op-chain-ops/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-chain-ops/Makefile b/op-chain-ops/Makefile
index 6c4b57652855..99cd1aa80d2c 100644
--- a/op-chain-ops/Makefile
+++ b/op-chain-ops/Makefile
@@ -36,7 +36,7 @@ test:
 	go test ./...
 
 op-deployer:
-	GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-deployer ./cmd/op-deployer/main.go
+	GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-deployer ../op-deployer/cmd/op-deployer/main.go
 
 fuzz:
 	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzEncodeDecodeWithdrawal ./crossdomain
@@ -49,4 +49,4 @@ sync-standard-version:
 	curl -Lo ./deployer/opcm/standard-versions-mainnet.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions-mainnet.toml
 	curl -Lo ./deployer/opcm/standard-versions-sepolia.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions-sepolia.toml
 
-.PHONY: test fuzz op-deployer sync-standard-version
\ No newline at end of file
+.PHONY: test fuzz op-deployer sync-standard-version

From 067446aa5528e46464f09c04c0e6b938b7aa81ac Mon Sep 17 00:00:00 2001
From: Julian Meyer <julian.meyer@coinbase.com>
Date: Sun, 27 Oct 2024 15:26:12 -0700
Subject: [PATCH 046/451] op-program: add experimental L2 source flag to enable
 execution witnesses (#12558)

* feat: add experimental L2 source flag

* Move L2 experimental client methods to eth client

* Fix missing return

* Improve config handling for experimental features

* Add l2 experimental test
---
 op-e2e/actions/proofs/helpers/env.go     |   2 +-
 op-program/host/cmd/main_test.go         |  13 ++
 op-program/host/config/config.go         |   7 +-
 op-program/host/flags/flags.go           |   6 +
 op-program/host/host.go                  |  24 ++--
 op-program/host/l2_source.go             | 151 +++++++++++++++++++++++
 op-program/host/prefetcher/prefetcher.go |   5 +
 op-service/eth/execution_witness.go      |   9 ++
 op-service/sources/eth_client.go         |  16 +++
 9 files changed, 215 insertions(+), 18 deletions(-)
 create mode 100644 op-program/host/l2_source.go
 create mode 100644 op-service/eth/execution_witness.go

diff --git a/op-e2e/actions/proofs/helpers/env.go b/op-e2e/actions/proofs/helpers/env.go
index 4283d0d1e162..75b7f2554f4c 100644
--- a/op-e2e/actions/proofs/helpers/env.go
+++ b/op-e2e/actions/proofs/helpers/env.go
@@ -195,7 +195,7 @@ func (env *L2FaultProofEnv) RunFaultProofProgram(t helpers.Testing, l2ClaimBlock
 			l2RPC := env.Engine.RPCClient()
 			l2Client, err := host.NewL2Client(l2RPC, env.log, nil, &host.L2ClientConfig{L2ClientConfig: l2ClCfg, L2Head: cfg.L2Head})
 			require.NoError(t, err, "failed to create L2 client")
-			l2DebugCl := &host.L2Source{L2Client: l2Client, DebugClient: sources.NewDebugClient(l2RPC.CallContext)}
+			l2DebugCl := host.NewL2SourceWithClient(logger, l2Client, sources.NewDebugClient(l2RPC.CallContext))
 
 			return prefetcher.NewPrefetcher(logger, l1Cl, l1BlobFetcher, l2DebugCl, kv), nil
 		})
diff --git a/op-program/host/cmd/main_test.go b/op-program/host/cmd/main_test.go
index cee90a956646..35ca46d2472d 100644
--- a/op-program/host/cmd/main_test.go
+++ b/op-program/host/cmd/main_test.go
@@ -274,6 +274,19 @@ func TestL2Claim(t *testing.T) {
 	})
 }
 
+func TestL2Experimental(t *testing.T) {
+	t.Run("DefaultEmpty", func(t *testing.T) {
+		cfg := configForArgs(t, addRequiredArgs())
+		require.Equal(t, cfg.L2ExperimentalURL, "")
+	})
+
+	t.Run("Valid", func(t *testing.T) {
+		expected := "https://example.com:8545"
+		cfg := configForArgs(t, replaceRequiredArg("--l2.experimental", expected))
+		require.EqualValues(t, expected, cfg.L2ExperimentalURL)
+	})
+}
+
 func TestL2BlockNumber(t *testing.T) {
 	t.Run("Required", func(t *testing.T) {
 		verifyArgsInvalid(t, "flag l2.blocknumber is required", addRequiredArgsExcept("--l2.blocknumber"))
diff --git a/op-program/host/config/config.go b/op-program/host/config/config.go
index bb9f9d868e45..46442e07f43d 100644
--- a/op-program/host/config/config.go
+++ b/op-program/host/config/config.go
@@ -56,7 +56,11 @@ type Config struct {
 	L2Head common.Hash
 	// L2OutputRoot is the agreed L2 output root to start derivation from
 	L2OutputRoot common.Hash
-	L2URL        string
+	// L2URL is the URL of the L2 node to fetch L2 data from, this is the canonical URL for L2 data
+	// This URL is used as a fallback for L2ExperimentalURL if the experimental URL fails or cannot retrieve the desired data
+	L2URL string
+	// L2ExperimentalURL is the URL of the L2 node (non hash db archival node, for example, reth archival node) to fetch L2 data from
+	L2ExperimentalURL string
 	// L2Claim is the claimed L2 output root to verify
 	L2Claim common.Hash
 	// L2ClaimBlockNumber is the block number the claimed L2 output root is from
@@ -218,6 +222,7 @@ func NewConfigFromCLI(log log.Logger, ctx *cli.Context) (*Config, error) {
 		DataDir:             ctx.String(flags.DataDir.Name),
 		DataFormat:          dbFormat,
 		L2URL:               ctx.String(flags.L2NodeAddr.Name),
+		L2ExperimentalURL:   ctx.String(flags.L2NodeExperimentalAddr.Name),
 		L2ChainConfig:       l2ChainConfig,
 		L2Head:              l2Head,
 		L2OutputRoot:        l2OutputRoot,
diff --git a/op-program/host/flags/flags.go b/op-program/host/flags/flags.go
index 15489cf22c94..b7c598451530 100644
--- a/op-program/host/flags/flags.go
+++ b/op-program/host/flags/flags.go
@@ -47,6 +47,11 @@ var (
 		Usage:   "Address of L2 JSON-RPC endpoint to use (eth and debug namespace required)",
 		EnvVars: prefixEnvVars("L2_RPC"),
 	}
+	L2NodeExperimentalAddr = &cli.StringFlag{
+		Name:    "l2.experimental",
+		Usage:   "Address of L2 JSON-RPC endpoint to use for experimental features (debug_executionWitness)",
+		EnvVars: prefixEnvVars("L2_RPC_EXPERIMENTAL_RPC"),
+	}
 	L1Head = &cli.StringFlag{
 		Name:    "l1.head",
 		Usage:   "Hash of the L1 head block. Derivation stops after this block is processed.",
@@ -131,6 +136,7 @@ var programFlags = []cli.Flag{
 	DataDir,
 	DataFormat,
 	L2NodeAddr,
+	L2NodeExperimentalAddr,
 	L2GenesisPath,
 	L1NodeAddr,
 	L1BeaconAddr,
diff --git a/op-program/host/host.go b/op-program/host/host.go
index d12920275558..cd30421f9383 100644
--- a/op-program/host/host.go
+++ b/op-program/host/host.go
@@ -24,11 +24,6 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
-type L2Source struct {
-	*L2Client
-	*sources.DebugClient
-}
-
 type Prefetcher interface {
 	Hint(hint string) error
 	GetPreimage(ctx context.Context, key common.Hash) ([]byte, error)
@@ -235,26 +230,23 @@ func makeDefaultPrefetcher(ctx context.Context, logger log.Logger, kv kvstore.KV
 		return nil, fmt.Errorf("failed to setup L1 RPC: %w", err)
 	}
 
-	logger.Info("Connecting to L2 node", "l2", cfg.L2URL)
-	l2RPC, err := client.NewRPC(ctx, logger, cfg.L2URL, client.WithDialAttempts(10))
-	if err != nil {
-		return nil, fmt.Errorf("failed to setup L2 RPC: %w", err)
-	}
-
 	l1ClCfg := sources.L1ClientDefaultConfig(cfg.Rollup, cfg.L1TrustRPC, cfg.L1RPCKind)
-	l2ClCfg := sources.L2ClientDefaultConfig(cfg.Rollup, true)
 	l1Cl, err := sources.NewL1Client(l1RPC, logger, nil, l1ClCfg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create L1 client: %w", err)
 	}
+
+	logger.Info("Connecting to L1 beacon", "l1", cfg.L1BeaconURL)
 	l1Beacon := sources.NewBeaconHTTPClient(client.NewBasicHTTPClient(cfg.L1BeaconURL, logger))
 	l1BlobFetcher := sources.NewL1BeaconClient(l1Beacon, sources.L1BeaconClientConfig{FetchAllSidecars: false})
-	l2Cl, err := NewL2Client(l2RPC, logger, nil, &L2ClientConfig{L2ClientConfig: l2ClCfg, L2Head: cfg.L2Head})
+
+	logger.Info("Initializing L2 clients")
+	l2Client, err := NewL2Source(ctx, logger, cfg)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create L2 client: %w", err)
+		return nil, fmt.Errorf("failed to create L2 source: %w", err)
 	}
-	l2DebugCl := &L2Source{L2Client: l2Cl, DebugClient: sources.NewDebugClient(l2RPC.CallContext)}
-	return prefetcher.NewPrefetcher(logger, l1Cl, l1BlobFetcher, l2DebugCl, kv), nil
+
+	return prefetcher.NewPrefetcher(logger, l1Cl, l1BlobFetcher, l2Client, kv), nil
 }
 
 func routeHints(logger log.Logger, hHostRW io.ReadWriter, hinter preimage.HintHandler) chan error {
diff --git a/op-program/host/l2_source.go b/op-program/host/l2_source.go
new file mode 100644
index 000000000000..38906f70b87a
--- /dev/null
+++ b/op-program/host/l2_source.go
@@ -0,0 +1,151 @@
+package host
+
+import (
+	"context"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-program/host/config"
+	"github.com/ethereum-optimism/optimism/op-program/host/prefetcher"
+	"github.com/ethereum-optimism/optimism/op-service/client"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+// L2Source is a source of L2 data, it abstracts away the details of how to fetch L2 data between canonical and experimental sources.
+// It also tracks metrics for each of the apis. Once experimental sources are stable, this will only route to the "experimental" source.
+type L2Source struct {
+	logger log.Logger
+
+	// canonical source, used as a fallback if experimental source is enabled but fails
+	// the underlying node should be a geth hash scheme archival node.
+	canonicalEthClient   *L2Client
+	canonicalDebugClient *sources.DebugClient
+
+	// experimental source, used as the primary source if enabled
+	experimentalClient *L2Client
+}
+
+var _ prefetcher.L2Source = &L2Source{}
+
+// NewL2SourceWithClient creates a new L2 source with the given client as the canonical client.
+// This doesn't configure the experimental source, but is useful for testing.
+func NewL2SourceWithClient(logger log.Logger, canonicalL2Client *L2Client, canonicalDebugClient *sources.DebugClient) *L2Source {
+	source := &L2Source{
+		logger:               logger,
+		canonicalEthClient:   canonicalL2Client,
+		canonicalDebugClient: canonicalDebugClient,
+	}
+
+	return source
+}
+
+func NewL2Source(ctx context.Context, logger log.Logger, config *config.Config) (*L2Source, error) {
+	logger.Info("Connecting to canonical L2 source", "url", config.L2URL)
+
+	// eth_getProof calls are expensive and takes time, so we use a longer timeout
+	canonicalL2RPC, err := client.NewRPC(ctx, logger, config.L2URL, client.WithDialAttempts(10), client.WithCallTimeout(5*time.Minute))
+	if err != nil {
+		return nil, err
+	}
+	canonicalDebugClient := sources.NewDebugClient(canonicalL2RPC.CallContext)
+
+	canonicalL2ClientCfg := sources.L2ClientDefaultConfig(config.Rollup, true)
+	canonicalL2Client, err := NewL2Client(canonicalL2RPC, logger, nil, &L2ClientConfig{L2ClientConfig: canonicalL2ClientCfg, L2Head: config.L2Head})
+	if err != nil {
+		return nil, err
+	}
+
+	source := NewL2SourceWithClient(logger, canonicalL2Client, canonicalDebugClient)
+
+	if len(config.L2ExperimentalURL) == 0 {
+		return source, nil
+	}
+
+	logger.Info("Connecting to experimental L2 source", "url", config.L2ExperimentalURL)
+	// debug_executionWitness calls are expensive and takes time, so we use a longer timeout
+	experimentalRPC, err := client.NewRPC(ctx, logger, config.L2ExperimentalURL, client.WithDialAttempts(10), client.WithCallTimeout(5*time.Minute))
+	if err != nil {
+		return nil, err
+	}
+	experimentalL2ClientCfg := sources.L2ClientDefaultConfig(config.Rollup, true)
+	experimentalL2Client, err := NewL2Client(experimentalRPC, logger, nil, &L2ClientConfig{L2ClientConfig: experimentalL2ClientCfg, L2Head: config.L2Head})
+	if err != nil {
+		return nil, err
+	}
+
+	source.experimentalClient = experimentalL2Client
+
+	return source, nil
+}
+
+func (l *L2Source) ExperimentalEnabled() bool {
+	return l.experimentalClient != nil
+}
+
+// CodeByHash implements prefetcher.L2Source.
+func (l *L2Source) CodeByHash(ctx context.Context, hash common.Hash) ([]byte, error) {
+	if l.ExperimentalEnabled() {
+		// This means experimental source was not able to retrieve relevant information from eth_getProof or debug_executionWitness
+		// We should fall back to the canonical source, and log a warning, and record a metric
+		l.logger.Warn("Experimental source failed to retrieve code by hash, falling back to canonical source", "hash", hash)
+	}
+	return l.canonicalDebugClient.CodeByHash(ctx, hash)
+}
+
+// NodeByHash implements prefetcher.L2Source.
+func (l *L2Source) NodeByHash(ctx context.Context, hash common.Hash) ([]byte, error) {
+	if l.ExperimentalEnabled() {
+		// This means experimental source was not able to retrieve relevant information from eth_getProof or debug_executionWitness
+		// We should fall back to the canonical source, and log a warning, and record a metric
+		l.logger.Warn("Experimental source failed to retrieve node by hash, falling back to canonical source", "hash", hash)
+	}
+	return l.canonicalDebugClient.NodeByHash(ctx, hash)
+}
+
+// InfoAndTxsByHash implements prefetcher.L2Source.
+func (l *L2Source) InfoAndTxsByHash(ctx context.Context, blockHash common.Hash) (eth.BlockInfo, types.Transactions, error) {
+	if l.ExperimentalEnabled() {
+		return l.experimentalClient.InfoAndTxsByHash(ctx, blockHash)
+	}
+	return l.canonicalEthClient.InfoAndTxsByHash(ctx, blockHash)
+}
+
+// OutputByRoot implements prefetcher.L2Source.
+func (l *L2Source) OutputByRoot(ctx context.Context, root common.Hash) (eth.Output, error) {
+	if l.ExperimentalEnabled() {
+		return l.experimentalClient.OutputByRoot(ctx, root)
+	}
+	return l.canonicalEthClient.OutputByRoot(ctx, root)
+}
+
+// ExecutionWitness implements prefetcher.L2Source.
+func (l *L2Source) ExecutionWitness(ctx context.Context, blockNum uint64) (*eth.ExecutionWitness, error) {
+	if !l.ExperimentalEnabled() {
+		l.logger.Error("Experimental source is not enabled, cannot fetch execution witness", "blockNum", blockNum)
+		return nil, prefetcher.ErrExperimentalPrefetchDisabled
+	}
+
+	// log errors, but return standard error so we know to retry with legacy source
+	witness, err := l.experimentalClient.ExecutionWitness(ctx, blockNum)
+	if err != nil {
+		l.logger.Error("Failed to fetch execution witness from experimental source", "blockNum", blockNum, "err", err)
+		return nil, prefetcher.ErrExperimentalPrefetchFailed
+	}
+	return witness, nil
+}
+
+// GetProof implements prefetcher.L2Source.
+func (l *L2Source) GetProof(ctx context.Context, address common.Address, storage []common.Hash, blockTag string) (*eth.AccountResult, error) {
+	if l.ExperimentalEnabled() {
+		return l.experimentalClient.GetProof(ctx, address, storage, blockTag)
+	}
+	proof, err := l.canonicalEthClient.GetProof(ctx, address, storage, blockTag)
+	if err != nil {
+		l.logger.Error("Failed to fetch proof from canonical source", "address", address, "storage", storage, "blockTag", blockTag, "err", err)
+		return nil, prefetcher.ErrExperimentalPrefetchFailed
+	}
+	return proof, nil
+}
diff --git a/op-program/host/prefetcher/prefetcher.go b/op-program/host/prefetcher/prefetcher.go
index cb5a52fa88ce..60aa67d63360 100644
--- a/op-program/host/prefetcher/prefetcher.go
+++ b/op-program/host/prefetcher/prefetcher.go
@@ -28,6 +28,11 @@ var (
 	precompileFailure = [1]byte{0}
 )
 
+var (
+	ErrExperimentalPrefetchFailed   = errors.New("experimental prefetch failed")
+	ErrExperimentalPrefetchDisabled = errors.New("experimental prefetch disabled")
+)
+
 var acceleratedPrecompiles = []common.Address{
 	common.BytesToAddress([]byte{0x1}),  // ecrecover
 	common.BytesToAddress([]byte{0x8}),  // bn256Pairing
diff --git a/op-service/eth/execution_witness.go b/op-service/eth/execution_witness.go
new file mode 100644
index 000000000000..91f274b23d7e
--- /dev/null
+++ b/op-service/eth/execution_witness.go
@@ -0,0 +1,9 @@
+package eth
+
+import "github.com/ethereum/go-ethereum/common/hexutil"
+
+type ExecutionWitness struct {
+	Keys  map[string]hexutil.Bytes `json:"keys"`
+	Codes map[string]hexutil.Bytes `json:"codes"`
+	State map[string]hexutil.Bytes `json:"state"`
+}
diff --git a/op-service/sources/eth_client.go b/op-service/sources/eth_client.go
index 0c83b52336a6..39587fd19750 100644
--- a/op-service/sources/eth_client.go
+++ b/op-service/sources/eth_client.go
@@ -315,6 +315,22 @@ func (s *EthClient) FetchReceipts(ctx context.Context, blockHash common.Hash) (e
 	return info, receipts, nil
 }
 
+// ExecutionWitness fetches execution witness data for a block number.
+func (s *EthClient) ExecutionWitness(ctx context.Context, blockNum uint64) (*eth.ExecutionWitness, error) {
+	var witness *eth.ExecutionWitness
+
+	err := s.client.CallContext(ctx, &witness, "debug_executionWitness", hexutil.EncodeUint64(blockNum), true)
+	if err != nil {
+		return nil, err
+	}
+
+	if witness == nil {
+		return nil, ethereum.NotFound
+	}
+
+	return witness, nil
+}
+
 // GetProof returns an account proof result, with any optional requested storage proofs.
 // The retrieval does sanity-check that storage proofs for the expected keys are present in the response,
 // but does not verify the result. Call accountResult.Verify(stateRoot) to verify the result.

From 4696908a0ba14acb6e1c34fe02753b7a9c66a049 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Sun, 27 Oct 2024 22:55:45 -0600
Subject: [PATCH 047/451] ci: Check out first (#12680)

CircleCI barfs if there's anything in the project folder.
---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 27ac27532834..ac1a5c55702a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1253,6 +1253,7 @@ jobs:
       - gcp-oidc-authenticate:
           gcp_cred_config_file_path: /root/gcp_cred_config.json
           oidc_token_file_path: /root/oidc_token.json
+      - checkout
       - run:
           name: Install goreleaser pro
           command: |
@@ -1265,7 +1266,6 @@ jobs:
           name: Configure Docker
           command: |
             gcloud auth configure-docker us-docker.pkg.dev
-      - checkout
       - run:
           name: Run goreleaser
           command: |

From 06a7ce2301bbcc8663863468a01a2386222a0f0d Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Sun, 27 Oct 2024 23:14:16 -0600
Subject: [PATCH 048/451] ci: Install goreleaser pro in a separate directory
 (#12681)

Turns our GoReleaser also barfs if there's anything extraneous in the git directory.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ac1a5c55702a..f0789a504ef6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1257,11 +1257,11 @@ jobs:
       - run:
           name: Install goreleaser pro
           command: |
-            mkdir goreleaser
+            mkdir -p /tmp/goreleaser
+            cd /tmp/goreleaser
             curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.3.2-pro/goreleaser-pro_Linux_x86_64.tar.gz
             tar -xzvf goreleaser.tgz
             mv goreleaser /usr/local/bin/goreleaser
-            rm -rf goreleaser
       - run:
           name: Configure Docker
           command: |

From bf1b4d9751f56b72acc0910a9e18d9e06c07fdd4 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Mon, 28 Oct 2024 13:57:46 +0700
Subject: [PATCH 049/451] maint(ct): remove safe.json (#12669)

Not sure how I managed to commit that... removes a safe.json file
that was accidentally committed a few months ago.
---
 packages/contracts-bedrock/safe.json | 155 ---------------------------
 1 file changed, 155 deletions(-)
 delete mode 100644 packages/contracts-bedrock/safe.json

diff --git a/packages/contracts-bedrock/safe.json b/packages/contracts-bedrock/safe.json
deleted file mode 100644
index 1168ce3d5150..000000000000
--- a/packages/contracts-bedrock/safe.json
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  "version": "1.0",
-  "chainId": "11155111",
-  "createdAt": 1718216278,
-  "meta": {
-    "name": "Transactions Batch",
-    "description": "",
-    "txBuilderVersion": "1.16.5",
-    "createdFromSafeAddress": "0x422c32c10b16c442426Eb7E93b07f7B521294565",
-    "createdFromOwnerAddress": "",
-    "checksum": "0xc2d69412777b9d9ba16c95d12f3aca13820b37a8db5f9d436f63058c48994cde"
-  },
-  "transactions": [
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000176f7065726174696f6e735f73657175656e6365725f7632000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0xee8ca3b568c76a8fa53bf566fc0934edddf25deba2199a53772b6c3a05ce20f5b8d220f8",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000166f7065726174696f6e735f70726f706f7365725f763200000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0xee8ca3b5c790be67575b95a6b0c9f618fbdce9b72b6e7202233f0afe087bb641e3d1f0e8",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000146f7065726174696f6e735f67656c61746f5f7632000000000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0xee8ca3b5f666fe8af1ff0032744dcf71fbbeada5e47079f37425a8a0069350bbb508c3db",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000186f7065726174696f6e735f6368616c6c656e6765725f76310000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0xee8ca3b53fa0ce0493ae4a3e182ec7ed727076c63bf2d7761a43e328e118b2afdf86afc3",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0xe551cdaa0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000176f7065726174696f6e735f73657175656e6365725f763400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e10000000000000000000000000af8c77cfeb57620c4d9dcc81df75a1f0da7064af00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000400000000000000000000000008f23bb38f531600e5d8fddaaec41f13fab46e98c00000000000000000000000000000000000000000000003635c9adc5dea00000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000008f23bb38f531600e5d8fddaaec41f13fab46e98c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000056bc75e2d63100000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0x3323b467000000000000000000000000a0ff2a54adc3fb33c44a141e67d194cf249258cb000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006467148cd2000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000176f7065726174696f6e735f73657175656e6365725f763400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000176f7065726174696f6e735f73657175656e6365725f763400000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000057e40",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000176f7065726174696f6e735f73657175656e6365725f7634000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0xe551cdaa0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000166f7065726174696f6e735f70726f706f7365725f76330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015180000000000000000000000000af8c77cfeb57620c4d9dcc81df75a1f0da7064af00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000004000000000000000000000000049277ee36a024120ee218127354c4a3591dc90a90000000000000000000000000000000000000000000000056bc75e2d631000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000049277ee36a024120ee218127354c4a3591dc90a90000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000001158e460913d00000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0x3323b467000000000000000000000000a0ff2a54adc3fb33c44a141e67d194cf249258cb000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006467148cd2000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000166f7065726174696f6e735f70726f706f7365725f76330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000166f7065726174696f6e735f70726f706f7365725f76330000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083d600",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000166f7065726174696f6e735f70726f706f7365725f763300000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0xe551cdaa0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000186f7065726174696f6e735f6368616c6c656e6765725f7632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e10000000000000000000000000af8c77cfeb57620c4d9dcc81df75a1f0da7064af00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000ffb026f67da0869eb3abb090cb7f015ce0925cdf00000000000000000000000000000000000000000000003635c9adc5dea000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000049277ee36a024120ee218127354c4a3591dc90a900000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000056bc75e2d63100000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0x3323b467000000000000000000000000a0ff2a54adc3fb33c44a141e67d194cf249258cb000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006467148cd2000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000186f7065726174696f6e735f6368616c6c656e6765725f7632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000186f7065726174696f6e735f6368616c6c656e6765725f7632000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000057e40",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000186f7065726174696f6e735f6368616c6c656e6765725f76320000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0xe551cdaa0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000146f7065726174696f6e735f67656c61746f5f7633000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000151800000000000000000000000000ff11afac4146a0babf7f9f042a22c8053a5467400000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000600000000000000000000000007506c12a824d73d9b08564d5afc22c949434755e0000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000cd438409d5cac9d2e076ac7bd0bf2377e99bb6e4000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000007506c12a824d73d9b08564d5afc22c949434755e00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002100000000000000000000000000cd438409d5cac9d2e076ac7bd0bf2377e99bb6e400000000000000000000000000000000000000000000000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0x2a6c106ae13b558bb9e2ec64bd2f1f7beff3a5e0",
-      "value": "0",
-      "data": "0x3323b467000000000000000000000000a0ff2a54adc3fb33c44a141e67d194cf249258cb000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006467148cd2000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000146f7065726174696f6e735f67656c61746f5f763300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000146f7065726174696f6e735f67656c61746f5f763300000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083d600",
-      "contractMethod": null,
-      "contractInputsValues": null
-    },
-    {
-      "to": "0xa0ff2a54adc3fb33c44a141e67d194cf249258cb",
-      "value": "0",
-      "data": "0x9bc94d010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000146f7065726174696f6e735f67656c61746f5f7633000000000000000000000000",
-      "contractMethod": null,
-      "contractInputsValues": null
-    }
-  ]
-}
\ No newline at end of file

From be455ca4fc0862d15f29f9964d53d54de0b9e4fa Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Mon, 28 Oct 2024 15:23:46 +0700
Subject: [PATCH 050/451] op-node: disable finality based on local-safe when
 interop is active (#12690)

* op-node: disable finality based on local-safe when interop is active

* op-e2e: fix interop action-test, relies on op-supervisor finality signal now
---
 op-e2e/actions/interop/interop_test.go    |  4 +++
 op-node/rollup/finality/finalizer.go      | 11 ++++++++
 op-node/rollup/finality/finalizer_test.go | 31 +++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/op-e2e/actions/interop/interop_test.go b/op-e2e/actions/interop/interop_test.go
index 1375275e178d..b005baf5f0fa 100644
--- a/op-e2e/actions/interop/interop_test.go
+++ b/op-e2e/actions/interop/interop_test.go
@@ -191,6 +191,10 @@ func TestInteropVerifier(gt *testing.T) {
 		require.Equal(t, l1Head, finalized)
 		return nil
 	}
+	// Allow the supervisor to promote the cross-safe L2 block to finalized.
+	seqMockBackend.FinalizedFn = func(ctx context.Context, chainID types.ChainID) (eth.BlockID, error) {
+		return seq.SyncStatus().SafeL2.ID(), nil
+	}
 	// signal that L1 finalized; the cross-safe block we have should get finalized too
 	l1Miner.ActL1SafeNext(t)
 	l1Miner.ActL1FinalizeNext(t)
diff --git a/op-node/rollup/finality/finalizer.go b/op-node/rollup/finality/finalizer.go
index 046b94664e05..fb49bf7afd09 100644
--- a/op-node/rollup/finality/finalizer.go
+++ b/op-node/rollup/finality/finalizer.go
@@ -73,6 +73,8 @@ type Finalizer struct {
 
 	ctx context.Context
 
+	cfg *rollup.Config
+
 	emitter event.Emitter
 
 	// finalizedL1 is the currently perceived finalized L1 block.
@@ -98,6 +100,7 @@ func NewFinalizer(ctx context.Context, log log.Logger, cfg *rollup.Config, l1Fet
 	lookback := calcFinalityLookback(cfg)
 	return &Finalizer{
 		ctx:              ctx,
+		cfg:              cfg,
 		log:              log,
 		finalizedL1:      eth.L1BlockRef{},
 		triedFinalizeAt:  0,
@@ -253,6 +256,14 @@ func (fi *Finalizer) tryFinalize() {
 func (fi *Finalizer) onDerivedSafeBlock(l2Safe eth.L2BlockRef, derivedFrom eth.L1BlockRef) {
 	fi.mu.Lock()
 	defer fi.mu.Unlock()
+
+	// Stop registering blocks after interop.
+	// Finality in interop is determined by the superchain backend,
+	// i.e. the op-supervisor RPC identifies which L2 block may be finalized.
+	if fi.cfg.IsInterop(l2Safe.Time) {
+		return
+	}
+
 	// remember the last L2 block that we fully derived from the given finality data
 	if len(fi.finalityData) == 0 || fi.finalityData[len(fi.finalityData)-1].L1Block.Number < derivedFrom.Number {
 		// prune finality data if necessary, before appending any data.
diff --git a/op-node/rollup/finality/finalizer_test.go b/op-node/rollup/finality/finalizer_test.go
index cdaf4006c0e0..e65b21abf623 100644
--- a/op-node/rollup/finality/finalizer_test.go
+++ b/op-node/rollup/finality/finalizer_test.go
@@ -472,4 +472,35 @@ func TestEngineQueue_Finalize(t *testing.T) {
 		fi.OnEvent(TryFinalizeEvent{})
 		emitter.AssertExpectations(t)
 	})
+
+	// The Finalizer does not promote any blocks to finalized status after interop.
+	// Blocks after interop are finalized with the interop deriver and interop backend.
+	t.Run("disable-after-interop", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelInfo)
+		l1F := &testutils.MockL1Source{}
+		defer l1F.AssertExpectations(t)
+		l1F.ExpectL1BlockRefByNumber(refD.Number, refD, nil)
+		l1F.ExpectL1BlockRefByNumber(refD.Number, refD, nil)
+
+		emitter := &testutils.MockEmitter{}
+		fi := NewFinalizer(context.Background(), logger, &rollup.Config{
+			InteropTime: &refC1.Time,
+		}, l1F)
+		fi.AttachEmitter(emitter)
+
+		// now say C0 and C1 were included in D and became the new safe head
+		fi.OnEvent(engine.SafeDerivedEvent{Safe: refC0, DerivedFrom: refD})
+		fi.OnEvent(engine.SafeDerivedEvent{Safe: refC1, DerivedFrom: refD})
+		fi.OnEvent(derive.DeriverIdleEvent{Origin: refD})
+		emitter.AssertExpectations(t)
+
+		emitter.ExpectOnce(TryFinalizeEvent{})
+		fi.OnEvent(FinalizeL1Event{FinalizedL1: refD})
+		emitter.AssertExpectations(t)
+
+		// C1 was Interop, C0 was not yet interop and can be finalized
+		emitter.ExpectOnce(engine.PromoteFinalizedEvent{Ref: refC0})
+		fi.OnEvent(TryFinalizeEvent{})
+		emitter.AssertExpectations(t)
+	})
 }

From db39e52aedcbdd06c5c6429b84c9a428b11bfb26 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Mon, 28 Oct 2024 19:01:29 +0700
Subject: [PATCH 051/451] maint(ct): remove block.json (#12693)

Old file, not used anymore.
---
 .../contracts-bedrock/test/mocks/block.json   | 27 -------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 packages/contracts-bedrock/test/mocks/block.json

diff --git a/packages/contracts-bedrock/test/mocks/block.json b/packages/contracts-bedrock/test/mocks/block.json
deleted file mode 100644
index 7de13ed6135a..000000000000
--- a/packages/contracts-bedrock/test/mocks/block.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "hash": "0xfd3c5e25a80f54a53c58bd3ad8c076dc1c0cdbd44ec2164d2d2b8cc50481cb78",
-  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-  "miner": "0x0000000000000000000000000000000000000000",
-  "stateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-  "receiptsRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "number": "0x0",
-  "gasUsed": "0x0",
-  "gasLimit": "0x1c9c380",
-  "extraData": "0x",
-  "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-  "timestamp": "0x654caabb",
-  "difficulty": "0x0",
-  "totalDifficulty": "0x0",
-  "sealFields": [
-    "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "0x0000000000000000"
-  ],
-  "uncles": [],
-  "transactions": [],
-  "size": "0x202",
-  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "nonce": "0x0000000000000000",
-  "baseFeePerGas": "0x3b9aca00"
-}

From 2013c903e92ba741cff28431fb8128e461d6ab2b Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Mon, 28 Oct 2024 14:17:06 +0100
Subject: [PATCH 052/451] fix abi.encodecall semgrep check for tests (#12664)

* fix abi.encodecall semgrep for tests

* fix safe call test

* rm unneccessary abi.encodeWithSignature, fix fuzz test

* use comment for semgrep...

* use comment for semgrep...

* use pattern-not for expectRevert cases

* fixes

* fixes

* try fix ci

* fix...
---
 .../testdata/scripts/ScriptExample.s.sol      |  19 +-
 .../src/libraries/Encoding.sol                |   2 +
 .../src/libraries/LegacyCrossDomainUtils.sol  |   1 +
 .../test/L1/L1CrossDomainMessenger.t.sol      |  50 ++---
 .../test/L1/L1ERC721Bridge.t.sol              |  12 +-
 .../test/L1/L1StandardBridge.t.sol            | 189 ++++++------------
 .../test/L1/L2OutputOracle.t.sol              |   2 +-
 .../test/L1/OptimismPortal.t.sol              |  88 +++++---
 .../test/L1/OptimismPortal2.t.sol             |  70 ++++---
 .../test/L1/SuperchainConfig.t.sol            |   2 +-
 .../test/L1/SystemConfig.t.sol                |  12 +-
 .../test/L1/SystemConfigInterop.t.sol         |   6 +-
 .../test/L2/CrossDomainOwnable.t.sol          |   2 +-
 .../test/L2/CrossDomainOwnable2.t.sol         |   9 +-
 .../test/L2/CrossDomainOwnable3.t.sol         |   9 +-
 .../test/L2/CrossL2Inbox.t.sol                |  40 ++--
 .../test/L2/GasPriceOracle.t.sol              |   2 +
 .../test/L2/L2CrossDomainMessenger.t.sol      |  24 +--
 .../test/L2/L2ERC721Bridge.t.sol              |  10 +-
 .../contracts-bedrock/test/L2/L2Genesis.t.sol |   4 +-
 .../test/L2/L2StandardBridge.t.sol            | 164 +++++++--------
 .../test/L2/L2StandardBridgeInterop.t.sol     |  26 +--
 .../test/L2/L2ToL2CrossDomainMessenger.t.sol  |  22 +-
 .../test/L2/OptimismSuperchainERC20.t.sol     |   6 +-
 .../test/L2/SuperchainTokenBridge.t.sol       |   8 +-
 .../test/L2/SuperchainWETH.t.sol              |  12 +-
 packages/contracts-bedrock/test/L2/WETH.t.sol |   4 +-
 .../test/dispute/AnchorStateRegistry.t.sol    |  40 ++--
 .../test/dispute/FaultDisputeGame.t.sol       |  13 +-
 .../test/invariants/SafeCall.t.sol            |   5 +-
 .../test/kontrol/proofs/L1ERC721Bridge.k.sol  |   2 +-
 .../kontrol/proofs/L1StandardBridge.k.sol     |   4 +-
 .../test/legacy/ResolvedDelegateProxy.t.sol   |   4 +-
 .../test/libraries/SafeCall.t.sol             |  16 +-
 .../test/periphery/Transactor.t.sol           |   8 +-
 .../test/periphery/drippie/Drippie.t.sol      |  12 +-
 .../test/periphery/op-nft/Optimist.t.sol      |  24 +--
 .../test/safe-tools/SafeTestTools.sol         |  52 ++---
 .../test/safe/DeputyGuardianModule.t.sol      |  16 +-
 .../test/safe/LivenessGuard.t.sol             |   3 +-
 .../test/safe/SafeSigners.t.sol               |   1 +
 .../test/universal/BenchmarkTest.t.sol        |   6 +-
 .../test/universal/CrossDomainMessenger.t.sol |   2 +-
 .../OptimismMintableERC20Factory.t.sol        |   2 +-
 .../test/universal/Proxy.t.sol                |  11 +-
 .../test/universal/ProxyAdmin.t.sol           |   2 +-
 semgrep/sol-rules.yaml                        |  12 +-
 47 files changed, 469 insertions(+), 561 deletions(-)

diff --git a/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol b/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
index f2f20e5ca14e..84b9c0381da4 100644
--- a/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
+++ b/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
@@ -19,9 +19,11 @@ interface Vm {
 library console {
     address constant CONSOLE_ADDRESS = address(0x000000000000000000636F6e736F6c652e6c6f67);
 
-    function _castLogPayloadViewToPure(
-        function(bytes memory) internal view fnIn
-    ) internal pure returns (function(bytes memory) internal pure fnOut) {
+    function _castLogPayloadViewToPure(function(bytes memory) internal view fnIn)
+        internal
+        pure
+        returns (function(bytes memory) internal pure fnOut)
+    {
         assembly {
             fnOut := fnIn
         }
@@ -42,30 +44,29 @@ library console {
     }
 
     function log(string memory p0) internal pure {
-        _sendLogPayload(abi.encodeWithSignature("log(string)", p0));
+        _sendLogPayload(abi.encodeWithSignature("log(string)", p0)); // nosemgrep: sol-style-use-abi-encodecall
     }
 
     function log(string memory p0, bool p1) internal pure {
-        _sendLogPayload(abi.encodeWithSignature("log(string,bool)", p0, p1));
+        _sendLogPayload(abi.encodeWithSignature("log(string,bool)", p0, p1)); // nosemgrep: sol-style-use-abi-encodecall
     }
 
     function log(string memory p0, uint256 p1) internal pure {
-        _sendLogPayload(abi.encodeWithSignature("log(string,uint256)", p0, p1));
+        _sendLogPayload(abi.encodeWithSignature("log(string,uint256)", p0, p1)); // nosemgrep: sol-style-use-abi-encodecall
     }
 
     function log(string memory p0, address p1) internal pure {
-        _sendLogPayload(abi.encodeWithSignature("log(string,address)", p0, p1));
+        _sendLogPayload(abi.encodeWithSignature("log(string,address)", p0, p1)); // nosemgrep: sol-style-use-abi-encodecall
     }
 
     function log(string memory p0, string memory p1, string memory p2) internal pure {
-        _sendLogPayload(abi.encodeWithSignature("log(string,string,string)", p0, p1, p2));
+        _sendLogPayload(abi.encodeWithSignature("log(string,string,string)", p0, p1, p2)); // nosemgrep: sol-style-use-abi-encodecall
     }
 }
 
 /// @title ScriptExample
 /// @notice ScriptExample is an example script. The Go forge script code tests that it can run this.
 contract ScriptExample {
-
     address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
     Vm internal constant vm = Vm(VM_ADDRESS);
 
diff --git a/packages/contracts-bedrock/src/libraries/Encoding.sol b/packages/contracts-bedrock/src/libraries/Encoding.sol
index edcdd4ed75e2..84d5f732f5f6 100644
--- a/packages/contracts-bedrock/src/libraries/Encoding.sol
+++ b/packages/contracts-bedrock/src/libraries/Encoding.sol
@@ -74,6 +74,7 @@ library Encoding {
         pure
         returns (bytes memory)
     {
+        // nosemgrep: sol-style-use-abi-encodecall
         return abi.encodeWithSignature("relayMessage(address,address,bytes,uint256)", _target, _sender, _data, _nonce);
     }
 
@@ -97,6 +98,7 @@ library Encoding {
         pure
         returns (bytes memory)
     {
+        // nosemgrep: sol-style-use-abi-encodecall
         return abi.encodeWithSignature(
             "relayMessage(uint256,address,address,uint256,uint256,bytes)",
             _nonce,
diff --git a/packages/contracts-bedrock/src/libraries/LegacyCrossDomainUtils.sol b/packages/contracts-bedrock/src/libraries/LegacyCrossDomainUtils.sol
index 2a784ca1b6dc..a43bc2cecc4b 100644
--- a/packages/contracts-bedrock/src/libraries/LegacyCrossDomainUtils.sol
+++ b/packages/contracts-bedrock/src/libraries/LegacyCrossDomainUtils.sol
@@ -24,6 +24,7 @@ library LegacyCrossDomainUtils {
         pure
         returns (bytes memory)
     {
+        // nosemgrep: sol-style-use-abi-encodecall
         return abi.encodeWithSignature(
             "relayMessage(address,address,bytes,uint256)", _target, _sender, _message, _messageNonce
         );
diff --git a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
index 2c6b5b66456d..08a976aa0ec2 100644
--- a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
@@ -58,14 +58,16 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
         // deposit transaction on the optimism portal should be called
         vm.expectCall(
             address(optimismPortal),
-            abi.encodeWithSelector(
-                IOptimismPortal.depositTransaction.selector,
-                Predeploys.L2_CROSS_DOMAIN_MESSENGER,
-                0,
-                l1CrossDomainMessenger.baseGas(hex"ff", 100),
-                false,
-                Encoding.encodeCrossDomainMessage(
-                    l1CrossDomainMessenger.messageNonce(), alice, recipient, 0, 100, hex"ff"
+            abi.encodeCall(
+                IOptimismPortal.depositTransaction,
+                (
+                    Predeploys.L2_CROSS_DOMAIN_MESSENGER,
+                    0,
+                    l1CrossDomainMessenger.baseGas(hex"ff", 100),
+                    false,
+                    Encoding.encodeCrossDomainMessage(
+                        l1CrossDomainMessenger.messageNonce(), alice, recipient, 0, 100, hex"ff"
+                    )
                 )
             )
         );
@@ -604,7 +606,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
 
     /// @dev Tests that the superchain config is called by the messengers paused function
     function test_pause_callsSuperchainConfig_succeeds() external {
-        vm.expectCall(address(superchainConfig), abi.encodeWithSelector(ISuperchainConfig.paused.selector));
+        vm.expectCall(address(superchainConfig), abi.encodeCall(ISuperchainConfig.paused, ()));
         l1CrossDomainMessenger.paused();
     }
 
@@ -624,20 +626,22 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
     function test_sendMessage_customGasToken_noValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
         );
 
         // deposit transaction on the optimism portal should be called
         vm.expectCall(
             address(optimismPortal),
-            abi.encodeWithSelector(
-                IOptimismPortal.depositTransaction.selector,
-                Predeploys.L2_CROSS_DOMAIN_MESSENGER,
-                0,
-                l1CrossDomainMessenger.baseGas(hex"ff", 100),
-                false,
-                Encoding.encodeCrossDomainMessage(
-                    l1CrossDomainMessenger.messageNonce(), alice, recipient, 0, 100, hex"ff"
+            abi.encodeCall(
+                IOptimismPortal.depositTransaction,
+                (
+                    Predeploys.L2_CROSS_DOMAIN_MESSENGER,
+                    0,
+                    l1CrossDomainMessenger.baseGas(hex"ff", 100),
+                    false,
+                    Encoding.encodeCrossDomainMessage(
+                        l1CrossDomainMessenger.messageNonce(), alice, recipient, 0, 100, hex"ff"
+                    )
                 )
             )
         );
@@ -670,7 +674,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
     function test_sendMessage_customGasToken_withValue_reverts() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
 
         vm.expectRevert("CrossDomainMessenger: cannot send value with custom gas token");
@@ -681,7 +685,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
     function test_relayMessage_customGasToken_noValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
 
         address target = address(0xabcd);
@@ -721,7 +725,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
     function test_relayMessage_customGasToken_withValue_reverts() external virtual {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
         vm.expectRevert("CrossDomainMessenger: value must be zero unless message is from a system address");
 
@@ -743,7 +747,7 @@ contract L1CrossDomainMessenger_ReinitReentryTest is Bridge_Initializer {
 
     // Common values used across functions
     uint256 constant messageValue = 50;
-    bytes constant selector = abi.encodeWithSelector(this.reinitAndReenter.selector);
+    bytes selector = abi.encodeCall(this.reinitAndReenter, ());
     address sender;
     bytes32 hash;
     address target;
@@ -760,7 +764,7 @@ contract L1CrossDomainMessenger_ReinitReentryTest is Bridge_Initializer {
 
     /// @dev This method will be called by the relayed message, and will attempt to reenter the relayMessage function
     ///      exactly once.
-    function reinitAndReenter() public payable {
+    function reinitAndReenter() external payable {
         // only attempt the attack once
         if (!attacked) {
             attacked = true;
diff --git a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
index 44feddc5031d..055ba45d0e1b 100644
--- a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
@@ -250,7 +250,7 @@ contract L1ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(l1CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l1CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(Predeploys.L2_ERC721_BRIDGE)
         );
         vm.prank(address(l1CrossDomainMessenger));
@@ -276,7 +276,7 @@ contract L1ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(l1CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l1CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(alice)
         );
         vm.prank(address(l1CrossDomainMessenger));
@@ -290,7 +290,7 @@ contract L1ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(l1CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l1CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(Predeploys.L2_ERC721_BRIDGE)
         );
         vm.prank(address(l1CrossDomainMessenger));
@@ -306,7 +306,7 @@ contract L1ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(l1CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l1CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(Predeploys.L2_ERC721_BRIDGE)
         );
         vm.prank(address(l1CrossDomainMessenger));
@@ -325,7 +325,7 @@ contract L1ERC721Bridge_Pause_Test is Bridge_Initializer {
     /// @dev Ensures that the `paused` function of the bridge contract actually calls the `paused` function of the
     ///      `superchainConfig`.
     function test_pause_callsSuperchainConfig_succeeds() external {
-        vm.expectCall(address(superchainConfig), abi.encodeWithSelector(ISuperchainConfig.paused.selector));
+        vm.expectCall(address(superchainConfig), abi.encodeCall(ISuperchainConfig.paused, ()));
         l1ERC721Bridge.paused();
     }
 
@@ -354,7 +354,7 @@ contract L1ERC721Bridge_Pause_TestFail is Bridge_Initializer {
 
         vm.mockCall(
             address(l1ERC721Bridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1ERC721Bridge.otherBridge()))
         );
     }
diff --git a/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol b/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
index f01572733bc4..760f602df21e 100644
--- a/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
@@ -68,7 +68,7 @@ contract L1StandardBridge_Pause_Test is Bridge_Initializer {
     /// @dev Ensures that the `paused` function of the bridge contract actually calls the `paused` function of the
     ///      `superchainConfig`.
     function test_pause_callsSuperchainConfig_succeeds() external {
-        vm.expectCall(address(superchainConfig), abi.encodeWithSelector(ISuperchainConfig.paused.selector));
+        vm.expectCall(address(superchainConfig), abi.encodeCall(ISuperchainConfig.paused, ()));
         l1StandardBridge.paused();
     }
 
@@ -99,7 +99,7 @@ contract L1StandardBridge_Pause_TestFail is Bridge_Initializer {
 
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.otherBridge()))
         );
     }
@@ -173,11 +173,13 @@ contract L1StandardBridge_Receive_Test is Bridge_Initializer {
 
         vm.expectCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector,
-                address(l2StandardBridge),
-                abi.encodeWithSelector(StandardBridge.finalizeBridgeETH.selector, alice, alice, 100, hex""),
-                200_000
+            abi.encodeCall(
+                ICrossDomainMessenger.sendMessage,
+                (
+                    address(l2StandardBridge),
+                    abi.encodeCall(StandardBridge.finalizeBridgeETH, (alice, alice, 100, hex"")),
+                    200_000
+                )
             )
         );
 
@@ -193,7 +195,7 @@ contract L1StandardBridge_Receive_TestFail is Bridge_Initializer {
     function testFuzz_receive_customGasToken_reverts(uint256 _value) external {
         vm.prank(alice, alice);
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
         );
         vm.deal(alice, _value);
         (bool success, bytes memory data) = address(l1StandardBridge).call{ value: _value }(hex"");
@@ -214,51 +216,35 @@ contract PreBridgeETH is Bridge_Initializer {
         uint256 version = 0; // Internal constant in the OptimismPortal: DEPOSIT_VERSION
         address l1MessengerAliased = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
 
-        bytes memory message =
-            abi.encodeWithSelector(StandardBridge.finalizeBridgeETH.selector, alice, alice, value, hex"dead");
+        bytes memory message = abi.encodeCall(StandardBridge.finalizeBridgeETH, (alice, alice, value, hex"dead"));
 
         if (isLegacy) {
             vm.expectCall(
-                address(l1StandardBridge),
-                value,
-                abi.encodeWithSelector(l1StandardBridge.depositETH.selector, 50000, hex"dead")
+                address(l1StandardBridge), value, abi.encodeCall(l1StandardBridge.depositETH, (50000, hex"dead"))
             );
         } else {
             vm.expectCall(
-                address(l1StandardBridge),
-                value,
-                abi.encodeWithSelector(l1StandardBridge.bridgeETH.selector, 50000, hex"dead")
+                address(l1StandardBridge), value, abi.encodeCall(l1StandardBridge.bridgeETH, (50000, hex"dead"))
             );
         }
         vm.expectCall(
             address(l1CrossDomainMessenger),
             value,
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector, address(l2StandardBridge), message, 50000
-            )
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l2StandardBridge), message, 50000))
         );
 
-        bytes memory innerMessage = abi.encodeWithSelector(
-            ICrossDomainMessenger.relayMessage.selector,
-            nonce,
-            address(l1StandardBridge),
-            address(l2StandardBridge),
-            value,
-            50000,
-            message
+        bytes memory innerMessage = abi.encodeCall(
+            ICrossDomainMessenger.relayMessage,
+            (nonce, address(l1StandardBridge), address(l2StandardBridge), value, 50000, message)
         );
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(message, 50000);
         vm.expectCall(
             address(optimismPortal),
             value,
-            abi.encodeWithSelector(
-                IOptimismPortal.depositTransaction.selector,
-                address(l2CrossDomainMessenger),
-                value,
-                baseGas,
-                false,
-                innerMessage
+            abi.encodeCall(
+                IOptimismPortal.depositTransaction,
+                (address(l2CrossDomainMessenger), value, baseGas, false, innerMessage)
             )
         );
 
@@ -311,7 +297,7 @@ contract L1StandardBridge_DepositETH_TestFail is Bridge_Initializer {
     /// @dev Tests that depositing reverts with custom gas token.
     function test_depositETH_customGasToken_reverts() external {
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
         vm.prank(alice, alice);
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
@@ -337,7 +323,7 @@ contract L1StandardBridge_BridgeETH_TestFail is PreBridgeETH {
     function test_bridgeETH_customGasToken_reverts() external {
         vm.prank(alice, alice);
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
 
@@ -356,50 +342,34 @@ contract PreBridgeETHTo is Bridge_Initializer {
 
         if (isLegacy) {
             vm.expectCall(
-                address(l1StandardBridge),
-                value,
-                abi.encodeWithSelector(l1StandardBridge.depositETHTo.selector, bob, 60000, hex"dead")
+                address(l1StandardBridge), value, abi.encodeCall(l1StandardBridge.depositETHTo, (bob, 60000, hex"dead"))
             );
         } else {
             vm.expectCall(
-                address(l1StandardBridge),
-                value,
-                abi.encodeWithSelector(l1StandardBridge.bridgeETHTo.selector, bob, 60000, hex"dead")
+                address(l1StandardBridge), value, abi.encodeCall(l1StandardBridge.bridgeETHTo, (bob, 60000, hex"dead"))
             );
         }
 
-        bytes memory message =
-            abi.encodeWithSelector(StandardBridge.finalizeBridgeETH.selector, alice, bob, value, hex"dead");
+        bytes memory message = abi.encodeCall(StandardBridge.finalizeBridgeETH, (alice, bob, value, hex"dead"));
 
         // the L1 bridge should call
         // L1CrossDomainMessenger.sendMessage
         vm.expectCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector, address(l2StandardBridge), message, 60000
-            )
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l2StandardBridge), message, 60000))
         );
 
-        bytes memory innerMessage = abi.encodeWithSelector(
-            ICrossDomainMessenger.relayMessage.selector,
-            nonce,
-            address(l1StandardBridge),
-            address(l2StandardBridge),
-            value,
-            60000,
-            message
+        bytes memory innerMessage = abi.encodeCall(
+            ICrossDomainMessenger.relayMessage,
+            (nonce, address(l1StandardBridge), address(l2StandardBridge), value, 60000, message)
         );
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(message, 60000);
         vm.expectCall(
             address(optimismPortal),
-            abi.encodeWithSelector(
-                IOptimismPortal.depositTransaction.selector,
-                address(l2CrossDomainMessenger),
-                value,
-                baseGas,
-                false,
-                innerMessage
+            abi.encodeCall(
+                IOptimismPortal.depositTransaction,
+                (address(l2CrossDomainMessenger), value, baseGas, false, innerMessage)
             )
         );
 
@@ -452,7 +422,7 @@ contract L1StandardBridge_DepositETHTo_TestFail is Bridge_Initializer {
         external
     {
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
         vm.deal(address(this), _value);
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
@@ -484,7 +454,7 @@ contract L1StandardBridge_BridgeETHTo_TestFail is PreBridgeETHTo {
         external
     {
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
         vm.deal(address(this), _value);
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
@@ -518,42 +488,28 @@ contract L1StandardBridge_DepositERC20_Test is Bridge_Initializer {
         L1Token.approve(address(l1StandardBridge), type(uint256).max);
 
         // The l1StandardBridge should transfer alice's tokens to itself
-        vm.expectCall(
-            address(L1Token), abi.encodeWithSelector(ERC20.transferFrom.selector, alice, address(l1StandardBridge), 100)
-        );
+        vm.expectCall(address(L1Token), abi.encodeCall(ERC20.transferFrom, (alice, address(l1StandardBridge), 100)));
 
-        bytes memory message = abi.encodeWithSelector(
-            StandardBridge.finalizeBridgeERC20.selector, address(L2Token), address(L1Token), alice, alice, 100, hex""
+        bytes memory message = abi.encodeCall(
+            StandardBridge.finalizeBridgeERC20, (address(L2Token), address(L1Token), alice, alice, 100, hex"")
         );
 
         // the L1 bridge should call L1CrossDomainMessenger.sendMessage
         vm.expectCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector, address(l2StandardBridge), message, 10000
-            )
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l2StandardBridge), message, 10000))
         );
 
-        bytes memory innerMessage = abi.encodeWithSelector(
-            ICrossDomainMessenger.relayMessage.selector,
-            nonce,
-            address(l1StandardBridge),
-            address(l2StandardBridge),
-            0,
-            10000,
-            message
+        bytes memory innerMessage = abi.encodeCall(
+            ICrossDomainMessenger.relayMessage,
+            (nonce, address(l1StandardBridge), address(l2StandardBridge), 0, 10000, message)
         );
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(message, 10000);
         vm.expectCall(
             address(optimismPortal),
-            abi.encodeWithSelector(
-                IOptimismPortal.depositTransaction.selector,
-                address(l2CrossDomainMessenger),
-                0,
-                baseGas,
-                false,
-                innerMessage
+            abi.encodeCall(
+                IOptimismPortal.depositTransaction, (address(l2CrossDomainMessenger), 0, baseGas, false, innerMessage)
             )
         );
 
@@ -609,18 +565,13 @@ contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
         uint256 version = 0; // Internal constant in the OptimismPortal: DEPOSIT_VERSION
         address l1MessengerAliased = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
 
-        bytes memory message = abi.encodeWithSelector(
-            StandardBridge.finalizeBridgeERC20.selector, address(L2Token), address(L1Token), alice, bob, 1000, hex""
+        bytes memory message = abi.encodeCall(
+            StandardBridge.finalizeBridgeERC20, (address(L2Token), address(L1Token), alice, bob, 1000, hex"")
         );
 
-        bytes memory innerMessage = abi.encodeWithSelector(
-            ICrossDomainMessenger.relayMessage.selector,
-            nonce,
-            address(l1StandardBridge),
-            address(l2StandardBridge),
-            0,
-            10000,
-            message
+        bytes memory innerMessage = abi.encodeCall(
+            ICrossDomainMessenger.relayMessage,
+            (nonce, address(l1StandardBridge), address(l2StandardBridge), 0, 10000, message)
         );
 
         uint64 baseGas = l1CrossDomainMessenger.baseGas(message, 10000);
@@ -653,26 +604,16 @@ contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
         // the L1 bridge should call L1CrossDomainMessenger.sendMessage
         vm.expectCall(
             address(l1CrossDomainMessenger),
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector, address(l2StandardBridge), message, 10000
-            )
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l2StandardBridge), message, 10000))
         );
         // The L1 XDM should call OptimismPortal.depositTransaction
         vm.expectCall(
             address(optimismPortal),
-            abi.encodeWithSelector(
-                IOptimismPortal.depositTransaction.selector,
-                address(l2CrossDomainMessenger),
-                0,
-                baseGas,
-                false,
-                innerMessage
+            abi.encodeCall(
+                IOptimismPortal.depositTransaction, (address(l2CrossDomainMessenger), 0, baseGas, false, innerMessage)
             )
         );
-        vm.expectCall(
-            address(L1Token),
-            abi.encodeWithSelector(ERC20.transferFrom.selector, alice, address(l1StandardBridge), 1000)
-        );
+        vm.expectCall(address(L1Token), abi.encodeCall(ERC20.transferFrom, (alice, address(l1StandardBridge), 1000)));
 
         vm.prank(alice);
         l1StandardBridge.depositERC20To(address(L1Token), address(L2Token), bob, 1000, 10000, hex"");
@@ -700,7 +641,7 @@ contract L1StandardBridge_FinalizeETHWithdrawal_Test is Bridge_Initializer {
 
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         // ensure that the messenger has ETH to call with
@@ -722,11 +663,11 @@ contract L1StandardBridge_FinalizeETHWithdrawal_TestFail is Bridge_Initializer {
         external
     {
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(address(l1StandardBridge.messenger()), _value);
@@ -761,11 +702,11 @@ contract L1StandardBridge_FinalizeERC20Withdrawal_Test is Bridge_Initializer {
         vm.expectEmit(address(l1StandardBridge));
         emit ERC20BridgeFinalized(address(L1Token), address(L2Token), alice, alice, 100, hex"");
 
-        vm.expectCall(address(L1Token), abi.encodeWithSelector(ERC20.transfer.selector, alice, 100));
+        vm.expectCall(address(L1Token), abi.encodeCall(ERC20.transfer, (alice, 100)));
 
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.prank(address(l1StandardBridge.messenger()));
@@ -781,7 +722,7 @@ contract L1StandardBridge_FinalizeERC20Withdrawal_TestFail is Bridge_Initializer
     function test_finalizeERC20Withdrawal_notMessenger_reverts() external {
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.prank(address(28));
@@ -793,7 +734,7 @@ contract L1StandardBridge_FinalizeERC20Withdrawal_TestFail is Bridge_Initializer
     function test_finalizeERC20Withdrawal_notOtherBridge_reverts() external {
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(address(0)))
         );
         vm.prank(address(l1StandardBridge.messenger()));
@@ -808,7 +749,7 @@ contract L1StandardBridge_FinalizeBridgeETH_Test is Bridge_Initializer {
         address messenger = address(l1StandardBridge.messenger());
         vm.mockCall(
             messenger,
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(messenger, 100);
@@ -826,13 +767,13 @@ contract L1StandardBridge_FinalizeBridgeETH_TestFail is Bridge_Initializer {
     function testFuzz_finalizeBridgeETH_customGasToken_reverts(uint256 _value, bytes calldata _extraData) external {
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(address(l1CrossDomainMessenger), _value);
         vm.prank(address(l1CrossDomainMessenger));
         vm.mockCall(
-            address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2))
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
         );
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
 
@@ -844,7 +785,7 @@ contract L1StandardBridge_FinalizeBridgeETH_TestFail is Bridge_Initializer {
         address messenger = address(l1StandardBridge.messenger());
         vm.mockCall(
             messenger,
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(messenger, 100);
@@ -858,7 +799,7 @@ contract L1StandardBridge_FinalizeBridgeETH_TestFail is Bridge_Initializer {
         address messenger = address(l1StandardBridge.messenger());
         vm.mockCall(
             messenger,
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(messenger, 100);
@@ -872,7 +813,7 @@ contract L1StandardBridge_FinalizeBridgeETH_TestFail is Bridge_Initializer {
         address messenger = address(l1StandardBridge.messenger());
         vm.mockCall(
             messenger,
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(messenger, 100);
diff --git a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
index 12e4ae4bf401..9b18479d5255 100644
--- a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
+++ b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
@@ -422,7 +422,7 @@ contract L2OutputOracleUpgradeable_Test is L2OutputOracle_TestBase {
         vm.startPrank(EIP1967Helper.getAdmin(address(proxy)));
         // Reviewer note: the NextImpl() still uses reinitializer. If we want to remove that, we'll need to use a
         //   two step upgrade with the Storage lib.
-        proxy.upgradeToAndCall(address(nextImpl), abi.encodeWithSelector(NextImpl.initialize.selector, 2));
+        proxy.upgradeToAndCall(address(nextImpl), abi.encodeCall(NextImpl.initialize, (2)));
         assertEq(proxy.implementation(), address(nextImpl));
 
         // Verify that the NextImpl contract initialized its values according as expected
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index 5ada092ad6b6..028fc7587043 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -201,6 +201,7 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds when msg.sender == tx.origin and non-custom gas is used.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_senderIsOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -226,6 +227,7 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds when msg.sender != tx.origin and non-custom gas is used.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_senderNotOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -308,6 +310,7 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for an EOA.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_eoa_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -352,6 +355,7 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for a contract.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_contract_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -403,7 +407,7 @@ contract OptimismPortal_Test is CommonTest {
         uint256 ts = block.timestamp;
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSelector(IL2OutputOracle.getL2Output.selector),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
             abi.encode(Types.OutputProposal(bytes32(uint256(1)), uint128(ts), uint128(startingBlockNumber)))
         );
 
@@ -535,7 +539,7 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     function test_depositERC20Transaction_balanceOverflow_reverts() external {
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(42), 18));
+        vm.mockCall(address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(42), 18));
 
         // The balance slot
         vm.store(address(optimismPortal), bytes32(uint256(61)), bytes32(type(uint256).max));
@@ -788,7 +792,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
     function test_finalizeWithdrawalTransaction_provenWithdrawalHash_nonEther_targetToken_reverts() external {
         vm.mockCall(
             address(systemConfig),
-            abi.encodeWithSignature("gasPayingToken()"),
+            abi.encodeCall(systemConfig.gasPayingToken, ()),
             abi.encode(address(_defaultTx.target), 18)
         );
 
@@ -832,7 +836,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         // this case we just use bytes32(uint256(1)).
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSelector(IL2OutputOracle.getL2Output.selector),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
             abi.encode(bytes32(uint256(1)), _proposedBlockNumber)
         );
 
@@ -858,7 +862,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         // Mock a startingTimestamp change on the L2 Oracle
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSignature("startingTimestamp()"),
+            abi.encodeCall(IL2OutputOracle.startingTimestamp, ()),
             abi.encode(block.timestamp + 1)
         );
 
@@ -887,7 +891,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         // to finalize the withdrawal.
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSelector(IL2OutputOracle.getL2Output.selector),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
             abi.encode(
                 Types.OutputProposal(bytes32(uint256(0)), uint128(block.timestamp), uint128(_proposedBlockNumber))
             )
@@ -918,7 +922,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         // finalization period.
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSelector(IL2OutputOracle.getL2Output.selector),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
             abi.encode(Types.OutputProposal(_outputRoot, uint128(block.timestamp + 1), uint128(_proposedBlockNumber)))
         );
 
@@ -954,7 +958,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         uint256 recentTimestamp = block.timestamp - 1;
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSelector(IL2OutputOracle.getL2Output.selector),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
             abi.encode(Types.OutputProposal(_outputRoot, uint128(recentTimestamp), uint128(_proposedBlockNumber)))
         );
 
@@ -1006,7 +1010,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
 
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSelector(IL2OutputOracle.getL2Output.selector),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
             abi.encode(
                 Types.OutputProposal(
                     Hashing.hashOutputRootProof(outputRootProof),
@@ -1034,7 +1038,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         // this contract's callPortalAndExpectRevert() function above.
         Types.WithdrawalTransaction memory _testTx = _defaultTx;
         _testTx.target = address(this);
-        _testTx.data = abi.encodeWithSelector(this.callPortalAndExpectRevert.selector);
+        _testTx.data = abi.encodeCall(this.callPortalAndExpectRevert, ());
 
         // Get modified proof inputs.
         (
@@ -1055,7 +1059,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         uint256 finalizedTimestamp = block.timestamp - l2OutputOracle.FINALIZATION_PERIOD_SECONDS() - 1;
         vm.mockCall(
             address(optimismPortal.l2Oracle()),
-            abi.encodeWithSelector(IL2OutputOracle.getL2Output.selector),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
             abi.encode(Types.OutputProposal(outputRoot, uint128(finalizedTimestamp), uint128(_proposedBlockNumber)))
         );
 
@@ -1074,6 +1078,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testDiff_finalizeWithdrawalTransaction_succeeds(
         address _sender,
         address _target,
@@ -1129,7 +1134,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         // Setup the Oracle to return the outputRoot
         vm.mockCall(
             address(l2OutputOracle),
-            abi.encodeWithSelector(l2OutputOracle.getL2Output.selector),
+            abi.encodePacked(l2OutputOracle.getL2Output.selector),
             abi.encode(outputRoot, block.timestamp, 100)
         );
 
@@ -1176,7 +1181,7 @@ contract OptimismPortalUpgradeable_Test is CommonTest {
         // The value passed to the initialize must be larger than the last value
         // that initialize was called with.
         IProxy(payable(address(optimismPortal))).upgradeToAndCall(
-            address(nextImpl), abi.encodeWithSelector(NextImpl.initialize.selector, 2)
+            address(nextImpl), abi.encodeCall(NextImpl.initialize, (2))
         );
         assertEq(IProxy(payable(address(optimismPortal))).implementation(), address(nextImpl));
 
@@ -1196,6 +1201,7 @@ contract OptimismPortalResourceFuzz_Test is CommonTest {
     uint256 constant MAX_GAS_LIMIT = 30_000_000;
 
     /// @dev Test that various values of the resource metering config will not break deposits.
+    /// forge-config: ciheavy.fuzz.runs = 10000
     function testFuzz_systemConfigDeposit_succeeds(
         uint32 _maxResourceLimit,
         uint8 _elasticityMultiplier,
@@ -1249,9 +1255,7 @@ contract OptimismPortalResourceFuzz_Test is CommonTest {
             systemTxMaxGas: _systemTxMaxGas,
             maximumBaseFee: _maximumBaseFee
         });
-        vm.mockCall(
-            address(systemConfig), abi.encodeWithSelector(systemConfig.resourceConfig.selector), abi.encode(rcfg)
-        );
+        vm.mockCall(address(systemConfig), abi.encodeCall(systemConfig.resourceConfig, ()), abi.encode(rcfg));
 
         // Set the resource params
         uint256 _prevBlockNum = block.number - _blockDiff;
@@ -1309,7 +1313,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         token.approve(address(optimismPortal), _mint);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         bytes memory opaqueData = abi.encodePacked(_mint, _value, _gasLimit, _isCreation, _data);
 
@@ -1330,6 +1336,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender == tx.origin.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderIsOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1355,6 +1362,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender != tx.origin.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderNotOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1382,7 +1390,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     /// @dev Tests that `depositERC20Transaction` reverts when not enough of the token is approved.
     function test_depositERC20Transaction_notEnoughAmount_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
         vm.expectRevert(stdError.arithmeticError);
         // Deposit the token into the portal
         optimismPortal.depositERC20Transaction(address(0), 1, 0, 0, false, "");
@@ -1395,13 +1405,13 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         token.approve(address(optimismPortal), 100);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
-
-        // Mock the token balance
         vm.mockCall(
-            address(token), abi.encodeWithSelector(token.balanceOf.selector, address(optimismPortal)), abi.encode(0)
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
         );
 
+        // Mock the token balance
+        vm.mockCall(address(token), abi.encodeCall(token.balanceOf, (address(optimismPortal))), abi.encode(0));
+
         // Call minimumGasLimit(0) before vm.expectRevert to ensure vm.expectRevert is for depositERC20Transaction
         uint64 gasLimit = optimismPortal.minimumGasLimit(0);
 
@@ -1414,7 +1424,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     /// @dev Tests that `depositERC20Transaction` reverts when creating a contract with a non-zero target.
     function test_depositERC20Transaction_isCreationNotZeroTarget_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         // Call minimumGasLimit(0) before vm.expectRevert to ensure vm.expectRevert is for depositERC20Transaction
         uint64 gasLimit = optimismPortal.minimumGasLimit(0);
@@ -1427,7 +1439,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     /// @dev Tests that `depositERC20Transaction` reverts when the gas limit is too low.
     function test_depositERC20Transaction_gasLimitTooLow_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         vm.expectRevert(SmallGasLimit.selector);
         // Deposit the token into the portal
@@ -1440,7 +1454,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         data[120_000] = 0x01;
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         uint64 gasLimit = optimismPortal.minimumGasLimit(120_001);
         vm.expectRevert(LargeCalldata.selector);
@@ -1455,7 +1471,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         token.approve(address(optimismPortal), _amount);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         // Deposit the token into the portal
         optimismPortal.depositERC20Transaction(address(0), _amount, 0, optimismPortal.minimumGasLimit(0), false, "");
@@ -1471,7 +1489,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         token.approve(address(optimismPortal), _defaultTx.value);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         // Deposit the token into the portal
         optimismPortal.depositERC20Transaction(
@@ -1490,9 +1510,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
 
         vm.expectCall(_defaultTx.target, 0, _defaultTx.data);
 
-        vm.expectCall(
-            address(token), 0, abi.encodeWithSelector(token.transfer.selector, _defaultTx.target, _defaultTx.value)
-        );
+        vm.expectCall(address(token), 0, abi.encodeCall(token.transfer, (_defaultTx.target, _defaultTx.value)));
 
         optimismPortal.finalizeWithdrawalTransaction(_defaultTx);
 
@@ -1520,7 +1538,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
             uint64(bound(_gasLimit, optimismPortal.minimumGasLimit(uint64(_data.length)), rcfg.maxResourceLimit));
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         bytes memory opaqueData = abi.encodePacked(uint256(0), _value, _gasLimit, _isCreation, _data);
 
@@ -1541,6 +1561,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasToken_noValue_senderIsOrigin_succeeds(
         address _to,
         uint256 _value,
@@ -1564,6 +1585,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasToken_noValue_senderNotOrigin_succeeds(
         address _to,
         uint256 _value,
@@ -1589,7 +1611,9 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     /// @dev Tests that `depositTransaction` fails when a custom gas token is used and msg.value is non-zero.
     function test_depositTransaction_customGasToken_withValue_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         vm.expectRevert(NoValue.selector);
 
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index dd37b61e9bef..8cc56937bd33 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -211,6 +211,7 @@ contract OptimismPortal2_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for an EOA.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_eoa_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -255,6 +256,7 @@ contract OptimismPortal2_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for a contract.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_contract_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -388,7 +390,7 @@ contract OptimismPortal2_Test is CommonTest {
     }
 
     function test_depositERC20Transaction_balanceOverflow_reverts() external {
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(42), 18));
+        vm.mockCall(address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(42), 18));
 
         // The balance slot
         vm.store(address(optimismPortal2), bytes32(uint256(61)), bytes32(type(uint256).max));
@@ -892,7 +894,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
     function test_finalizeWithdrawalTransaction_provenWithdrawalHash_nonEther_targetToken_reverts() external {
         vm.mockCall(
             address(systemConfig),
-            abi.encodeWithSignature("gasPayingToken()"),
+            abi.encodeCall(systemConfig.gasPayingToken, ()),
             abi.encode(address(_defaultTx.target), 18)
         );
 
@@ -974,7 +976,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
         vm.warp(block.timestamp + optimismPortal2.proofMaturityDelaySeconds() + 1);
 
         // Mock a createdAt change in the dispute game.
-        vm.mockCall(address(game), abi.encodeWithSignature("createdAt()"), abi.encode(block.timestamp + 1));
+        vm.mockCall(address(game), abi.encodeCall(game.createdAt, ()), abi.encode(block.timestamp + 1));
 
         // Attempt to finalize the withdrawal
         vm.expectRevert("OptimismPortal: withdrawal timestamp less than dispute game creation timestamp");
@@ -1120,7 +1122,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
         // this contract's callPortalAndExpectRevert() function above.
         Types.WithdrawalTransaction memory _testTx = _defaultTx;
         _testTx.target = address(this);
-        _testTx.data = abi.encodeWithSelector(this.callPortalAndExpectRevert.selector);
+        _testTx.data = abi.encodeCall(this.callPortalAndExpectRevert, ());
 
         // Get modified proof inputs.
         (
@@ -1161,6 +1163,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testDiff_finalizeWithdrawalTransaction_succeeds(
         address _sender,
         address _target,
@@ -1420,7 +1423,7 @@ contract OptimismPortal2_Upgradeable_Test is CommonTest {
         // The value passed to the initialize must be larger than the last value
         // that initialize was called with.
         IProxy(payable(address(optimismPortal2))).upgradeToAndCall(
-            address(nextImpl), abi.encodeWithSelector(NextImpl.initialize.selector, 2)
+            address(nextImpl), abi.encodeCall(NextImpl.initialize, (2))
         );
         assertEq(IProxy(payable(address(optimismPortal2))).implementation(), address(nextImpl));
 
@@ -1444,6 +1447,7 @@ contract OptimismPortal2_ResourceFuzz_Test is CommonTest {
     }
 
     /// @dev Test that various values of the resource metering config will not break deposits.
+    /// forge-config: ciheavy.fuzz.runs = 10000
     function testFuzz_systemConfigDeposit_succeeds(
         uint32 _maxResourceLimit,
         uint8 _elasticityMultiplier,
@@ -1498,9 +1502,7 @@ contract OptimismPortal2_ResourceFuzz_Test is CommonTest {
             systemTxMaxGas: _systemTxMaxGas,
             maximumBaseFee: _maximumBaseFee
         });
-        vm.mockCall(
-            address(systemConfig), abi.encodeWithSelector(systemConfig.resourceConfig.selector), abi.encode(rcfg)
-        );
+        vm.mockCall(address(systemConfig), abi.encodeCall(systemConfig.resourceConfig, ()), abi.encode(rcfg));
 
         // Set the resource params
         uint256 _prevBlockNum = block.number - _blockDiff;
@@ -1558,7 +1560,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         token.approve(address(optimismPortal2), _mint);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         bytes memory opaqueData = abi.encodePacked(_mint, _value, _gasLimit, _isCreation, _data);
 
@@ -1579,6 +1583,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender == tx.origin.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderIsOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1604,6 +1609,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender != tx.origin.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderNotOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1631,7 +1637,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     /// @dev Tests that `depositERC20Transaction` reverts when not enough of the token is approved.
     function test_depositERC20Transaction_notEnoughAmount_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
         vm.expectRevert(stdError.arithmeticError);
         // Deposit the token into the portal
         optimismPortal2.depositERC20Transaction(address(0), 1, 0, 0, false, "");
@@ -1644,13 +1652,13 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         token.approve(address(optimismPortal2), 100);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
-
-        // Mock the token balance
         vm.mockCall(
-            address(token), abi.encodeWithSelector(token.balanceOf.selector, address(optimismPortal)), abi.encode(0)
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
         );
 
+        // Mock the token balance
+        vm.mockCall(address(token), abi.encodeCall(token.balanceOf, (address(optimismPortal))), abi.encode(0));
+
         // Call minimumGasLimit(0) before vm.expectRevert to ensure vm.expectRevert is for depositERC20Transaction
         uint64 gasLimit = optimismPortal2.minimumGasLimit(0);
 
@@ -1663,7 +1671,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     /// @dev Tests that `depositERC20Transaction` reverts when creating a contract with a non-zero target.
     function test_depositERC20Transaction_isCreationNotZeroTarget_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         // Call minimumGasLimit(0) before vm.expectRevert to ensure vm.expectRevert is for depositERC20Transaction
         uint64 gasLimit = optimismPortal2.minimumGasLimit(0);
@@ -1676,7 +1686,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     /// @dev Tests that `depositERC20Transaction` reverts when the gas limit is too low.
     function test_depositERC20Transaction_gasLimitTooLow_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         vm.expectRevert(SmallGasLimit.selector);
         // Deposit the token into the portal
@@ -1689,7 +1701,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         data[120_000] = 0x01;
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         uint64 gasLimit = optimismPortal2.minimumGasLimit(120_001);
         vm.expectRevert(LargeCalldata.selector);
@@ -1704,7 +1718,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         token.approve(address(optimismPortal2), _amount);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         // Deposit the token into the portal
         optimismPortal2.depositERC20Transaction(address(0), _amount, 0, optimismPortal.minimumGasLimit(0), false, "");
@@ -1720,7 +1736,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         token.approve(address(optimismPortal2), _defaultTx.value);
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         // Deposit the token into the portal
         optimismPortal2.depositERC20Transaction(
@@ -1748,9 +1766,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
 
         vm.expectCall(_defaultTx.target, 0, _defaultTx.data);
 
-        vm.expectCall(
-            address(token), 0, abi.encodeWithSelector(token.transfer.selector, _defaultTx.target, _defaultTx.value)
-        );
+        vm.expectCall(address(token), 0, abi.encodeCall(token.transfer, (_defaultTx.target, _defaultTx.value)));
 
         optimismPortal2.finalizeWithdrawalTransaction(_defaultTx);
 
@@ -1778,7 +1794,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
             uint64(bound(_gasLimit, optimismPortal2.minimumGasLimit(uint64(_data.length)), rcfg.maxResourceLimit));
 
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         bytes memory opaqueData = abi.encodePacked(uint256(0), _value, _gasLimit, _isCreation, _data);
 
@@ -1799,6 +1817,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasToken_noValue_senderIsOrigin_succeeds(
         address _to,
         uint256 _value,
@@ -1822,6 +1841,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasToken_noValue_senderNotOrigin_succeeds(
         address _to,
         uint256 _value,
@@ -1847,7 +1867,9 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     /// @dev Tests that `depositTransaction` fails when a custom gas token is used and msg.value is non-zero.
     function test_depositTransaction_customGasToken_withValue_reverts() external {
         // Mock the gas paying token to be the ERC20 token
-        vm.mockCall(address(systemConfig), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(token), 18));
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
+        );
 
         vm.expectRevert(NoValue.selector);
 
diff --git a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
index 48206cd13ef9..2772ec0c2a3c 100644
--- a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
@@ -36,7 +36,7 @@ contract SuperchainConfig_Init_Test is CommonTest {
         vm.startPrank(alice);
         newProxy.upgradeToAndCall(
             address(newImpl),
-            abi.encodeWithSelector(ISuperchainConfig.initialize.selector, deploy.cfg().superchainConfigGuardian(), true)
+            abi.encodeCall(ISuperchainConfig.initialize, (deploy.cfg().superchainConfigGuardian(), true))
         );
 
         assertTrue(ISuperchainConfig(address(newProxy)).paused());
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index 5bf2193c2319..dff0852fb40d 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -375,9 +375,9 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
         vm.assume(bytes(_name).length <= 32);
         vm.assume(bytes(_symbol).length <= 32);
 
-        vm.mockCall(_token, abi.encodeWithSelector(token.decimals.selector), abi.encode(18));
-        vm.mockCall(_token, abi.encodeWithSelector(token.name.selector), abi.encode(_name));
-        vm.mockCall(_token, abi.encodeWithSelector(token.symbol.selector), abi.encode(_symbol));
+        vm.mockCall(_token, abi.encodeCall(token.decimals, ()), abi.encode(18));
+        vm.mockCall(_token, abi.encodeCall(token.name, ()), abi.encode(_name));
+        vm.mockCall(_token, abi.encodeCall(token.symbol, ()), abi.encode(_symbol));
 
         cleanStorageAndInit(_token);
 
@@ -421,7 +421,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
 
     /// @dev Tests that initialization fails if decimals are not 18.
     function test_initialize_customGasToken_wrongDecimals_fails() external {
-        vm.mockCall(address(token), abi.encodeWithSelector(token.decimals.selector), abi.encode(8));
+        vm.mockCall(address(token), abi.encodeCall(token.decimals, ()), abi.encode(8));
         vm.expectRevert("SystemConfig: bad decimals of gas paying token");
 
         cleanStorageAndInit(address(token));
@@ -432,7 +432,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
         string memory name = new string(32);
         name = string.concat(name, "a");
 
-        vm.mockCall(address(token), abi.encodeWithSelector(token.name.selector), abi.encode(name));
+        vm.mockCall(address(token), abi.encodeCall(token.name, ()), abi.encode(name));
         vm.expectRevert("GasPayingToken: string cannot be greater than 32 bytes");
 
         cleanStorageAndInit(address(token));
@@ -443,7 +443,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
         string memory symbol = new string(33);
         symbol = string.concat(symbol, "a");
 
-        vm.mockCall(address(token), abi.encodeWithSelector(token.symbol.selector), abi.encode(symbol));
+        vm.mockCall(address(token), abi.encodeCall(token.symbol, ()), abi.encode(symbol));
         vm.expectRevert("GasPayingToken: string cannot be greater than 32 bytes");
 
         cleanStorageAndInit(address(token));
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index 50e1ac91c977..426dba30c72a 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -41,9 +41,9 @@ contract SystemConfigInterop_Test is CommonTest {
         vm.assume(bytes(_name).length <= 32);
         vm.assume(bytes(_symbol).length <= 32);
 
-        vm.mockCall(_token, abi.encodeWithSelector(ERC20.decimals.selector), abi.encode(18));
-        vm.mockCall(_token, abi.encodeWithSelector(ERC20.name.selector), abi.encode(_name));
-        vm.mockCall(_token, abi.encodeWithSelector(ERC20.symbol.selector), abi.encode(_symbol));
+        vm.mockCall(_token, abi.encodeCall(ERC20.decimals, ()), abi.encode(18));
+        vm.mockCall(_token, abi.encodeCall(ERC20.name, ()), abi.encode(_name));
+        vm.mockCall(_token, abi.encodeCall(ERC20.symbol, ()), abi.encode(_symbol));
 
         vm.expectCall(
             address(optimismPortal),
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable.t.sol
index 1e7c10556a53..c66bd1f94ab3 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable.t.sol
@@ -68,7 +68,7 @@ contract CrossDomainOwnableThroughPortal_Test is CommonTest {
             _value: 0,
             _gasLimit: 30_000,
             _isCreation: false,
-            _data: abi.encodeWithSelector(XDomainSetter.set.selector, 1)
+            _data: abi.encodeCall(XDomainSetter.set, (1))
         });
 
         // Simulate the operation of the `op-node` by parsing data
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
index fa1244a0b0e1..a80f633fede2 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
@@ -58,7 +58,7 @@ contract CrossDomainOwnable2_Test is Bridge_Initializer {
         address target = address(setter);
         uint256 value = 0;
         uint256 minGasLimit = 0;
-        bytes memory message = abi.encodeWithSelector(XDomainSetter2.set.selector, 1);
+        bytes memory message = abi.encodeCall(XDomainSetter2.set, (1));
 
         bytes32 hash = Hashing.hashCrossDomainMessage(
             Encoding.encodeVersionedNonce(nonce, 1), sender, target, value, minGasLimit, message
@@ -85,12 +85,7 @@ contract CrossDomainOwnable2_Test is Bridge_Initializer {
         // the L1CrossDomainMessenger
         vm.prank(AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger)));
         l2CrossDomainMessenger.relayMessage(
-            Encoding.encodeVersionedNonce(1, 1),
-            owner,
-            address(setter),
-            0,
-            0,
-            abi.encodeWithSelector(XDomainSetter2.set.selector, 2)
+            Encoding.encodeVersionedNonce(1, 1), owner, address(setter), 0, 0, abi.encodeCall(XDomainSetter2.set, (2))
         );
 
         assertEq(setter.value(), 2);
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
index 432007ecd6d7..968910478198 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
@@ -101,7 +101,7 @@ contract CrossDomainOwnable3_Test is Bridge_Initializer {
         address target = address(setter);
         uint256 value = 0;
         uint256 minGasLimit = 0;
-        bytes memory message = abi.encodeWithSelector(XDomainSetter3.set.selector, 1);
+        bytes memory message = abi.encodeCall(XDomainSetter3.set, (1));
 
         bytes32 hash = Hashing.hashCrossDomainMessage(
             Encoding.encodeVersionedNonce(nonce, 1), sender, target, value, minGasLimit, message
@@ -216,12 +216,7 @@ contract CrossDomainOwnable3_Test is Bridge_Initializer {
         // the L1CrossDomainMessenger
         vm.prank(AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger)));
         l2CrossDomainMessenger.relayMessage(
-            Encoding.encodeVersionedNonce(1, 1),
-            bob,
-            address(setter),
-            0,
-            0,
-            abi.encodeWithSelector(XDomainSetter3.set.selector, 2)
+            Encoding.encodeVersionedNonce(1, 1), bob, address(setter), 0, 0, abi.encodeCall(XDomainSetter3.set, (2))
         );
 
         assertEq(setter.value(), 2);
diff --git a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
index 643b684e07d9..9e79906efeec 100644
--- a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
@@ -160,7 +160,7 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
@@ -170,7 +170,7 @@ contract CrossL2InboxTest is Test {
         // Ensure that the chain ID is in the dependency set
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(L1BlockIsInDependencySetSelector, _id.chainId),
+            data: abi.encodeCall(IL1BlockInterop.isInDependencySet, (_id.chainId)),
             returnData: abi.encode(true)
         });
 
@@ -222,27 +222,27 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
         // Ensure that id1's chain ID is in the dependency set
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(L1BlockIsInDependencySetSelector, _id1.chainId),
+            data: abi.encodeCall(IL1BlockInterop.isInDependencySet, (_id1.chainId)),
             returnData: abi.encode(true)
         });
 
         // Ensure that id2's chain ID is in the dependency set
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(L1BlockIsInDependencySetSelector, _id2.chainId),
+            data: abi.encodeCall(IL1BlockInterop.isInDependencySet, (_id2.chainId)),
             returnData: abi.encode(true)
         });
 
         // Set the target and message for the reentrant call
         address target = address(this);
-        bytes memory message = abi.encodeWithSelector(this.mockReentrant.selector, _id2);
+        bytes memory message = abi.encodeCall(this.mockReentrant, (_id2));
 
         // Ensure that the contract has enough balance to send with value
         vm.deal(address(this), _value);
@@ -282,7 +282,7 @@ contract CrossL2InboxTest is Test {
         // Ensure it is a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(true)
         });
 
@@ -312,7 +312,7 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
@@ -346,7 +346,7 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
@@ -375,14 +375,14 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
         // Ensure that the chain ID is NOT in the dependency set
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(L1BlockIsInDependencySetSelector, _id.chainId),
+            data: abi.encodeCall(IL1BlockInterop.isInDependencySet, (_id.chainId)),
             returnData: abi.encode(false)
         });
 
@@ -419,14 +419,14 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
         // Ensure that the chain ID is in the dependency set
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(L1BlockIsInDependencySetSelector, _id.chainId),
+            data: abi.encodeCall(IL1BlockInterop.isInDependencySet, (_id.chainId)),
             returnData: abi.encode(true)
         });
 
@@ -451,14 +451,14 @@ contract CrossL2InboxTest is Test {
         // Ensure that the chain ID is in the dependency set
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(L1BlockIsInDependencySetSelector, _id.chainId),
+            data: abi.encodeCall(IL1BlockInterop.isInDependencySet, (_id.chainId)),
             returnData: abi.encode(true)
         });
 
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
@@ -474,7 +474,7 @@ contract CrossL2InboxTest is Test {
         // Ensure it is a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(true)
         });
 
@@ -497,7 +497,7 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
@@ -526,7 +526,7 @@ contract CrossL2InboxTest is Test {
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
@@ -553,14 +553,14 @@ contract CrossL2InboxTest is Test {
         // Ensure that the chain ID is NOT in the dependency set.
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(L1BlockIsInDependencySetSelector, _id.chainId),
+            data: abi.encodeCall(IL1BlockInterop.isInDependencySet, (_id.chainId)),
             returnData: abi.encode(false)
         });
 
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
-            data: abi.encodeWithSelector(IL1BlockInterop.isDeposit.selector),
+            data: abi.encodeCall(IL1BlockInterop.isDeposit, ()),
             returnData: abi.encode(false)
         });
 
diff --git a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
index ed4d598f4392..0a1d97c9351e 100644
--- a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
+++ b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
@@ -93,6 +93,7 @@ contract GasPriceOracleBedrock_Test is GasPriceOracle_Test {
 
     /// @dev Tests that `setGasPrice` reverts since it was removed in bedrock.
     function test_setGasPrice_doesNotExist_reverts() external {
+        // nosemgrep: sol-style-use-abi-encodecall
         (bool success, bytes memory returndata) =
             address(gasPriceOracle).call(abi.encodeWithSignature("setGasPrice(uint256)", 1));
 
@@ -102,6 +103,7 @@ contract GasPriceOracleBedrock_Test is GasPriceOracle_Test {
 
     /// @dev Tests that `setL1BaseFee` reverts since it was removed in bedrock.
     function test_setL1BaseFee_doesNotExist_reverts() external {
+        // nosemgrep: sol-style-use-abi-encodecall
         (bool success, bytes memory returndata) =
             address(gasPriceOracle).call(abi.encodeWithSignature("setL1BaseFee(uint256)", 1));
 
diff --git a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
index 26fc9f2d039d..1dc5749d6d54 100644
--- a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
@@ -48,11 +48,9 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
             Encoding.encodeCrossDomainMessage(l2CrossDomainMessenger.messageNonce(), alice, recipient, 0, 100, hex"ff");
         vm.expectCall(
             address(l2ToL1MessagePasser),
-            abi.encodeWithSelector(
-                IL2ToL1MessagePasser.initiateWithdrawal.selector,
-                address(l1CrossDomainMessenger),
-                l2CrossDomainMessenger.baseGas(hex"ff", 100),
-                xDomainCallData
+            abi.encodeCall(
+                IL2ToL1MessagePasser.initiateWithdrawal,
+                (address(l1CrossDomainMessenger), l2CrossDomainMessenger.baseGas(hex"ff", 100), xDomainCallData)
             )
         );
 
@@ -230,17 +228,15 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     /// @dev Tests that sendMessage succeeds with a custom gas token when the call value is zero.
     function test_sendMessage_customGasToken_noValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
 
         bytes memory xDomainCallData =
             Encoding.encodeCrossDomainMessage(l2CrossDomainMessenger.messageNonce(), alice, recipient, 0, 100, hex"ff");
         vm.expectCall(
             address(l2ToL1MessagePasser),
-            abi.encodeWithSelector(
-                IL2ToL1MessagePasser.initiateWithdrawal.selector,
-                address(l1CrossDomainMessenger),
-                l2CrossDomainMessenger.baseGas(hex"ff", 100),
-                xDomainCallData
+            abi.encodeCall(
+                IL2ToL1MessagePasser.initiateWithdrawal,
+                (address(l1CrossDomainMessenger), l2CrossDomainMessenger.baseGas(hex"ff", 100), xDomainCallData)
             )
         );
 
@@ -272,7 +268,7 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     /// @dev Tests that the sendMessage reverts when call value is non-zero with custom gas token.
     function test_sendMessage_customGasToken_withValue_reverts() external {
         // Mock the gasPayingToken function to return a custom gas token
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
 
         vm.expectRevert("CrossDomainMessenger: cannot send value with custom gas token");
         l2CrossDomainMessenger.sendMessage{ value: 1 }(recipient, hex"ff", uint32(100));
@@ -281,7 +277,7 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     /// @dev Tests that the relayMessage succeeds with a custom gas token when the call value is zero.
     function test_relayMessage_customGasToken_noValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
 
         address target = address(0xabcd);
         address sender = address(l1CrossDomainMessenger);
@@ -317,7 +313,7 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     ///       The L1CrossDomainMessenger `sendMessage` function cannot send value with a custom gas token.
     function test_relayMessage_customGasToken_withValue_reverts() external virtual {
         // Mock the gasPayingToken function to return a custom gas token
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
         vm.expectRevert("CrossDomainMessenger: value must be zero unless message is from a system address");
 
         l2CrossDomainMessenger.relayMessage{ value: 1 }(
diff --git a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
index 6ee1312d94d7..58179cb93207 100644
--- a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
@@ -240,7 +240,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(l2CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l2CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(l1ERC721Bridge)
         );
         vm.prank(address(l2CrossDomainMessenger));
@@ -264,7 +264,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
         // to be compliant with the `IOptimismMintableERC721` interface.
         vm.mockCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(l2CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l2CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(l1ERC721Bridge)
         );
         vm.prank(address(l2CrossDomainMessenger));
@@ -287,7 +287,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(l2CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l2CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(alice)
         );
         vm.prank(address(l2CrossDomainMessenger));
@@ -301,7 +301,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(l2CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l2CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1ERC721Bridge))
         );
         vm.prank(address(l2CrossDomainMessenger));
@@ -316,7 +316,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
         // Finalize a withdrawal.
         vm.mockCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(l2CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(l2CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1ERC721Bridge))
         );
         vm.prank(address(l2CrossDomainMessenger));
diff --git a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
index 0f5ad085a822..57b22e628eba 100644
--- a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
@@ -139,9 +139,7 @@ contract L2GenesisTest is Test {
     /// @notice Tests the genesis predeploys setup.
     function _test_genesis_predeploys(string memory _path, bool _useInterop) internal {
         // Set the useInterop value
-        vm.mockCall(
-            address(genesis.cfg()), abi.encodeWithSelector(genesis.cfg().useInterop.selector), abi.encode(_useInterop)
-        );
+        vm.mockCall(address(genesis.cfg()), abi.encodeCall(genesis.cfg().useInterop, ()), abi.encode(_useInterop));
 
         // Set the predeploy proxies into state
         genesis.setPredeployProxies();
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
index 3a173e9743b4..d703ec95f64e 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
@@ -56,17 +56,11 @@ contract L2StandardBridge_Test is Bridge_Initializer {
         assertEq(address(l2ToL1MessagePasser).balance, 0);
         uint256 nonce = l2CrossDomainMessenger.messageNonce();
 
-        bytes memory message =
-            abi.encodeWithSelector(IStandardBridge.finalizeBridgeETH.selector, alice, alice, 100, hex"");
+        bytes memory message = abi.encodeCall(IStandardBridge.finalizeBridgeETH, (alice, alice, 100, hex""));
         uint64 baseGas = l2CrossDomainMessenger.baseGas(message, 200_000);
-        bytes memory withdrawalData = abi.encodeWithSelector(
-            ICrossDomainMessenger.relayMessage.selector,
-            nonce,
-            address(l2StandardBridge),
-            address(l1StandardBridge),
-            100,
-            200_000,
-            message
+        bytes memory withdrawalData = abi.encodeCall(
+            ICrossDomainMessenger.relayMessage,
+            (nonce, address(l2StandardBridge), address(l1StandardBridge), 100, 200_000, message)
         );
         bytes32 withdrawalHash = Hashing.hashWithdrawal(
             Types.WithdrawalTransaction({
@@ -107,21 +101,16 @@ contract L2StandardBridge_Test is Bridge_Initializer {
 
         vm.expectCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector,
-                address(l1StandardBridge),
-                message,
-                200_000 // StandardBridge's RECEIVE_DEFAULT_GAS_LIMIT
+            abi.encodeCall(
+                ICrossDomainMessenger.sendMessage,
+                (address(l1StandardBridge), message, 200_000) // StandardBridge's RECEIVE_DEFAULT_GAS_LIMIT
             )
         );
 
         vm.expectCall(
             Predeploys.L2_TO_L1_MESSAGE_PASSER,
-            abi.encodeWithSelector(
-                IL2ToL1MessagePasser.initiateWithdrawal.selector,
-                address(l1CrossDomainMessenger),
-                baseGas,
-                withdrawalData
+            abi.encodeCall(
+                IL2ToL1MessagePasser.initiateWithdrawal, (address(l1CrossDomainMessenger), baseGas, withdrawalData)
             )
         );
 
@@ -134,7 +123,7 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     /// @dev Tests that the receive function reverts with custom gas token.
     function testFuzz_receive_customGasToken_reverts(uint256 _value) external {
         vm.prank(alice, alice);
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
         vm.deal(alice, _value);
         (bool success, bytes memory data) = address(l2StandardBridge).call{ value: _value }(hex"");
         assertFalse(success);
@@ -173,7 +162,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
 
     /// @dev Tests that `withdraw` reverts with custom gas token.
     function test_withdraw_customGasToken_reverts() external {
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdraw(address(Predeploys.LEGACY_ERC20_ETH), 1, 1, hex"");
@@ -181,7 +172,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
 
     /// @dev Tests that `withdraw` reverts with custom gas token.
     function test_withdrawERC20_customGasToken_reverts() external {
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdraw(address(L1Token), 1, 1, hex"");
@@ -190,7 +183,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     /// @dev Tests that `withdraw` reverts with custom gas token.
     function test_withdrawERC20WithValue_customGasToken_reverts() external {
         vm.deal(alice, 1 ether);
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdraw{ value: 1 ether }(address(L1Token), 1, 1, hex"");
@@ -199,7 +194,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     /// @dev Tests that `withdraw` with value reverts with custom gas token.
     function test_withdraw_customGasTokenWithValue_reverts() external {
         vm.deal(alice, 1 ether);
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdraw{ value: 1 ether }(address(Predeploys.LEGACY_ERC20_ETH), 1, 1, hex"");
@@ -207,7 +204,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
 
     /// @dev Tests that `withdrawTo` reverts with custom gas token.
     function test_withdrawTo_customGasToken_reverts() external {
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdrawTo(address(Predeploys.LEGACY_ERC20_ETH), bob, 1, 1, hex"");
@@ -215,7 +214,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
 
     /// @dev Tests that `withdrawTo` reverts with custom gas token.
     function test_withdrawToERC20_customGasToken_reverts() external {
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdrawTo(address(L2Token), bob, 1, 1, hex"");
@@ -224,7 +225,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     /// @dev Tests that `withdrawTo` reverts with custom gas token.
     function test_withdrawToERC20WithValue_customGasToken_reverts() external {
         vm.deal(alice, 1 ether);
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdrawTo{ value: 1 ether }(address(L2Token), bob, 1, 1, hex"");
@@ -233,7 +236,9 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     /// @dev Tests that `withdrawTo` with value reverts with custom gas token.
     function test_withdrawTo_customGasTokenWithValue_reverts() external {
         vm.deal(alice, 1 ether);
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(18)));
+        vm.mockCall(
+            address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
+        );
         vm.expectRevert("L2StandardBridge: not supported with custom gas token");
         vm.prank(alice, alice);
         l2StandardBridge.withdrawTo{ value: 1 ether }(address(Predeploys.LEGACY_ERC20_ETH), bob, 1, 1, hex"");
@@ -277,18 +282,12 @@ contract PreBridgeERC20 is Bridge_Initializer {
         deal(_l2Token, alice, 100, true);
         assertEq(ERC20(_l2Token).balanceOf(alice), 100);
         uint256 nonce = l2CrossDomainMessenger.messageNonce();
-        bytes memory message = abi.encodeWithSelector(
-            IStandardBridge.finalizeBridgeERC20.selector, address(L1Token), _l2Token, alice, alice, 100, hex""
-        );
+        bytes memory message =
+            abi.encodeCall(IStandardBridge.finalizeBridgeERC20, (address(L1Token), _l2Token, alice, alice, 100, hex""));
         uint64 baseGas = l2CrossDomainMessenger.baseGas(message, 1000);
-        bytes memory withdrawalData = abi.encodeWithSelector(
-            ICrossDomainMessenger.relayMessage.selector,
-            nonce,
-            address(l2StandardBridge),
-            address(l1StandardBridge),
-            0,
-            1000,
-            message
+        bytes memory withdrawalData = abi.encodeCall(
+            ICrossDomainMessenger.relayMessage,
+            (nonce, address(l2StandardBridge), address(l1StandardBridge), 0, 1000, message)
         );
         bytes32 withdrawalHash = Hashing.hashWithdrawal(
             Types.WithdrawalTransaction({
@@ -303,35 +302,29 @@ contract PreBridgeERC20 is Bridge_Initializer {
 
         if (_isLegacy) {
             vm.expectCall(
-                address(l2StandardBridge),
-                abi.encodeWithSelector(l2StandardBridge.withdraw.selector, _l2Token, 100, 1000, hex"")
+                address(l2StandardBridge), abi.encodeCall(l2StandardBridge.withdraw, (_l2Token, 100, 1000, hex""))
             );
         } else {
             vm.expectCall(
                 address(l2StandardBridge),
-                abi.encodeWithSelector(
-                    l2StandardBridge.bridgeERC20.selector, _l2Token, address(L1Token), 100, 1000, hex""
-                )
+                abi.encodeCall(l2StandardBridge.bridgeERC20, (_l2Token, address(L1Token), 100, 1000, hex""))
             );
         }
 
         vm.expectCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(ICrossDomainMessenger.sendMessage.selector, address(l1StandardBridge), message, 1000)
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l1StandardBridge), message, 1000))
         );
 
         vm.expectCall(
             Predeploys.L2_TO_L1_MESSAGE_PASSER,
-            abi.encodeWithSelector(
-                IL2ToL1MessagePasser.initiateWithdrawal.selector,
-                address(l1CrossDomainMessenger),
-                baseGas,
-                withdrawalData
+            abi.encodeCall(
+                IL2ToL1MessagePasser.initiateWithdrawal, (address(l1CrossDomainMessenger), baseGas, withdrawalData)
             )
         );
 
         // The l2StandardBridge should burn the tokens
-        vm.expectCall(_l2Token, abi.encodeWithSelector(OptimismMintableERC20.burn.selector, alice, 100));
+        vm.expectCall(_l2Token, abi.encodeCall(OptimismMintableERC20.burn, (alice, 100)));
 
         vm.expectEmit(true, true, true, true);
         emit WithdrawalInitiated(address(L1Token), _l2Token, alice, alice, 100, hex"");
@@ -415,18 +408,12 @@ contract PreBridgeERC20To is Bridge_Initializer {
         deal(_l2Token, alice, 100, true);
         assertEq(ERC20(L2Token).balanceOf(alice), 100);
         uint256 nonce = l2CrossDomainMessenger.messageNonce();
-        bytes memory message = abi.encodeWithSelector(
-            IStandardBridge.finalizeBridgeERC20.selector, address(L1Token), _l2Token, alice, bob, 100, hex""
-        );
+        bytes memory message =
+            abi.encodeCall(IStandardBridge.finalizeBridgeERC20, (address(L1Token), _l2Token, alice, bob, 100, hex""));
         uint64 baseGas = l2CrossDomainMessenger.baseGas(message, 1000);
-        bytes memory withdrawalData = abi.encodeWithSelector(
-            ICrossDomainMessenger.relayMessage.selector,
-            nonce,
-            address(l2StandardBridge),
-            address(l1StandardBridge),
-            0,
-            1000,
-            message
+        bytes memory withdrawalData = abi.encodeCall(
+            ICrossDomainMessenger.relayMessage,
+            (nonce, address(l2StandardBridge), address(l1StandardBridge), 0, 1000, message)
         );
         bytes32 withdrawalHash = Hashing.hashWithdrawal(
             Types.WithdrawalTransaction({
@@ -467,34 +454,29 @@ contract PreBridgeERC20To is Bridge_Initializer {
         if (_isLegacy) {
             vm.expectCall(
                 address(l2StandardBridge),
-                abi.encodeWithSelector(l2StandardBridge.withdrawTo.selector, _l2Token, bob, 100, 1000, hex"")
+                abi.encodeCall(l2StandardBridge.withdrawTo, (_l2Token, bob, 100, 1000, hex""))
             );
         } else {
             vm.expectCall(
                 address(l2StandardBridge),
-                abi.encodeWithSelector(
-                    l2StandardBridge.bridgeERC20To.selector, _l2Token, address(L1Token), bob, 100, 1000, hex""
-                )
+                abi.encodeCall(l2StandardBridge.bridgeERC20To, (_l2Token, address(L1Token), bob, 100, 1000, hex""))
             );
         }
 
         vm.expectCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(ICrossDomainMessenger.sendMessage.selector, address(l1StandardBridge), message, 1000)
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l1StandardBridge), message, 1000))
         );
 
         vm.expectCall(
             Predeploys.L2_TO_L1_MESSAGE_PASSER,
-            abi.encodeWithSelector(
-                IL2ToL1MessagePasser.initiateWithdrawal.selector,
-                address(l1CrossDomainMessenger),
-                baseGas,
-                withdrawalData
+            abi.encodeCall(
+                IL2ToL1MessagePasser.initiateWithdrawal, (address(l1CrossDomainMessenger), baseGas, withdrawalData)
             )
         );
 
         // The l2StandardBridge should burn the tokens
-        vm.expectCall(address(L2Token), abi.encodeWithSelector(OptimismMintableERC20.burn.selector, alice, 100));
+        vm.expectCall(address(L2Token), abi.encodeCall(OptimismMintableERC20.burn, (alice, 100)));
 
         vm.prank(alice, alice);
     }
@@ -524,7 +506,7 @@ contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
     function test_finalizeBridgeETH_sendToSelf_reverts() external {
         vm.mockCall(
             address(l2StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l2StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(address(l2CrossDomainMessenger), 100);
@@ -537,7 +519,7 @@ contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
     function test_finalizeBridgeETH_sendToMessenger_reverts() external {
         vm.mockCall(
             address(l2StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l2StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(address(l2CrossDomainMessenger), 100);
@@ -550,21 +532,16 @@ contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
     function testFuzz_bridgeETH_succeeds(uint256 _value, uint32 _minGasLimit, bytes calldata _extraData) external {
         uint256 nonce = l2CrossDomainMessenger.messageNonce();
 
-        bytes memory message =
-            abi.encodeWithSelector(IStandardBridge.finalizeBridgeETH.selector, alice, alice, _value, _extraData);
+        bytes memory message = abi.encodeCall(IStandardBridge.finalizeBridgeETH, (alice, alice, _value, _extraData));
 
         vm.expectCall(
-            address(l2StandardBridge),
-            _value,
-            abi.encodeWithSelector(l2StandardBridge.bridgeETH.selector, _minGasLimit, _extraData)
+            address(l2StandardBridge), _value, abi.encodeCall(l2StandardBridge.bridgeETH, (_minGasLimit, _extraData))
         );
 
         vm.expectCall(
             address(l2CrossDomainMessenger),
             _value,
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector, address(l1StandardBridge), message, _minGasLimit
-            )
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l1StandardBridge), message, _minGasLimit))
         );
 
         vm.expectEmit(address(l2StandardBridge));
@@ -587,7 +564,7 @@ contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
     /// @dev Tests that bridging reverts with custom gas token.
     function test_bridgeETH_customGasToken_reverts() external {
         vm.prank(alice, alice);
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
 
         l2StandardBridge.bridgeETH(50000, hex"dead");
@@ -600,19 +577,16 @@ contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
         vm.expectCall(
             address(l2StandardBridge),
             _value,
-            abi.encodeWithSelector(l1StandardBridge.bridgeETHTo.selector, bob, _minGasLimit, _extraData)
+            abi.encodeCall(l1StandardBridge.bridgeETHTo, (bob, _minGasLimit, _extraData))
         );
 
-        bytes memory message =
-            abi.encodeWithSelector(IStandardBridge.finalizeBridgeETH.selector, alice, bob, _value, _extraData);
+        bytes memory message = abi.encodeCall(IStandardBridge.finalizeBridgeETH, (alice, bob, _value, _extraData));
 
         // the L2 bridge should call
         // L2CrossDomainMessenger.sendMessage
         vm.expectCall(
             address(l2CrossDomainMessenger),
-            abi.encodeWithSelector(
-                ICrossDomainMessenger.sendMessage.selector, address(l1StandardBridge), message, _minGasLimit
-            )
+            abi.encodeCall(ICrossDomainMessenger.sendMessage, (address(l1StandardBridge), message, _minGasLimit))
         );
 
         vm.expectEmit(address(l2StandardBridge));
@@ -641,7 +615,7 @@ contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
     )
         external
     {
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
         vm.deal(address(this), _value);
         l2StandardBridge.bridgeETHTo{ value: _value }(bob, _minGasLimit, _extraData);
@@ -654,7 +628,7 @@ contract L2StandardBridge_FinalizeBridgeETH_Test is Bridge_Initializer {
         address messenger = address(l2StandardBridge.messenger());
         vm.mockCall(
             messenger,
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l2StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(messenger, 100);
@@ -674,12 +648,12 @@ contract L2StandardBridge_FinalizeBridgeETH_Test is Bridge_Initializer {
         address messenger = address(l2StandardBridge.messenger());
         vm.mockCall(
             messenger,
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l2StandardBridge.OTHER_BRIDGE()))
         );
         vm.deal(address(l2CrossDomainMessenger), 1);
         vm.prank(address(l2CrossDomainMessenger));
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingToken()"), abi.encode(address(1), uint8(2)));
+        vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
         vm.expectRevert("StandardBridge: cannot bridge ETH with custom gas token");
 
         l2StandardBridge.finalizeBridgeETH(alice, alice, 1, hex"");
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
index e57bc8977659..fdfd1b0ec6d3 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
@@ -31,21 +31,17 @@ contract L2StandardBridgeInterop_Test is Bridge_Initializer {
 
     /// @notice Mock ERC20 decimals
     function _mockDecimals(address _token, uint8 _decimals) internal {
-        _mockAndExpect(_token, abi.encodeWithSelector(IERC20Metadata.decimals.selector), abi.encode(_decimals));
+        _mockAndExpect(_token, abi.encodeCall(IERC20Metadata.decimals, ()), abi.encode(_decimals));
     }
 
     /// @notice Mock ERC165 interface
     function _mockInterface(address _token, bytes4 _interfaceId, bool _supported) internal {
-        _mockAndExpect(
-            _token, abi.encodeWithSelector(IERC165.supportsInterface.selector, _interfaceId), abi.encode(_supported)
-        );
+        _mockAndExpect(_token, abi.encodeCall(IERC165.supportsInterface, (_interfaceId)), abi.encode(_supported));
     }
 
     /// @notice Mock factory deployment
     function _mockDeployments(address _factory, address _token, address _deployed) internal {
-        _mockAndExpect(
-            _factory, abi.encodeWithSelector(IOptimismERC20Factory.deployments.selector, _token), abi.encode(_deployed)
-        );
+        _mockAndExpect(_factory, abi.encodeCall(IOptimismERC20Factory.deployments, (_token)), abi.encode(_deployed));
     }
 
     /// @notice Assume a valid address for fuzzing
@@ -198,12 +194,8 @@ contract L2StandardBridgeInterop_LegacyToSuper_Test is L2StandardBridgeInterop_T
         emit Converted(_from, _to, _caller, _amount);
 
         // Mock and expect the `burn` and `mint` functions
-        _mockAndExpect(
-            _from, abi.encodeWithSelector(IMintableAndBurnableERC20.burn.selector, _caller, _amount), abi.encode()
-        );
-        _mockAndExpect(
-            _to, abi.encodeWithSelector(IMintableAndBurnableERC20.mint.selector, _caller, _amount), abi.encode()
-        );
+        _mockAndExpect(_from, abi.encodeCall(IMintableAndBurnableERC20.burn, (_caller, _amount)), abi.encode());
+        _mockAndExpect(_to, abi.encodeCall(IMintableAndBurnableERC20.mint, (_caller, _amount)), abi.encode());
 
         // Act
         vm.prank(_caller);
@@ -356,12 +348,8 @@ contract L2StandardBridgeInterop_SuperToLegacy_Test is L2StandardBridgeInterop_T
         emit Converted(_from, _to, _caller, _amount);
 
         // Mock and expect the `burn` and `mint` functions
-        _mockAndExpect(
-            _from, abi.encodeWithSelector(IMintableAndBurnableERC20.burn.selector, _caller, _amount), abi.encode()
-        );
-        _mockAndExpect(
-            _to, abi.encodeWithSelector(IMintableAndBurnableERC20.mint.selector, _caller, _amount), abi.encode()
-        );
+        _mockAndExpect(_from, abi.encodeCall(IMintableAndBurnableERC20.burn, (_caller, _amount)), abi.encode());
+        _mockAndExpect(_to, abi.encodeCall(IMintableAndBurnableERC20.mint, (_caller, _amount)), abi.encode());
 
         // Act
         vm.prank(_caller);
diff --git a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
index 2c413bcfbe89..1e5e04edc25b 100644
--- a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
@@ -227,7 +227,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -271,7 +271,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -312,7 +312,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
 
         // Set the target and message for the reentrant call
         address target = address(this);
-        bytes memory message = abi.encodeWithSelector(this.mockTarget.selector, _source, _sender);
+        bytes memory message = abi.encodeCall(this.mockTarget, (_source, _sender));
 
         bytes32 msgHash = keccak256(abi.encode(block.chainid, _source, _nonce, _sender, target, message));
 
@@ -334,7 +334,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -399,7 +399,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
 
         // Set the target and message for the reentrant call
         address target = address(this);
-        bytes memory message = abi.encodeWithSelector(this.mockTargetReentrant.selector, _source2, _nonce, _sender2);
+        bytes memory message = abi.encodeCall(this.mockTargetReentrant, (_source2, _nonce, _sender2));
 
         // Ensure the target contract is called with the correct parameters
         vm.expectCall({ callee: target, msgValue: _value, data: message });
@@ -415,7 +415,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -497,7 +497,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -536,7 +536,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -578,7 +578,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -628,7 +628,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -678,7 +678,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeWithSelector(CrossL2Inbox.validateMessage.selector, id, sentMessage),
+            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
index 77ce7936b0fd..8b83b2821796 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
@@ -63,11 +63,7 @@ contract OptimismSuperchainERC20Test is Test {
         EIP1967Helper.setImplementation(_addr, _impl);
 
         // Mock implementation address
-        vm.mockCall(
-            _impl,
-            abi.encodeWithSelector(IBeacon.implementation.selector),
-            abi.encode(address(optimismSuperchainERC20Impl))
-        );
+        vm.mockCall(_impl, abi.encodeCall(IBeacon.implementation, ()), abi.encode(address(optimismSuperchainERC20Impl)));
     }
 
     /// @notice Helper function to deploy a proxy of the OptimismSuperchainERC20 contract.
diff --git a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
index e40904324d0c..2ff6cecfd12b 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
@@ -96,8 +96,8 @@ contract SuperchainTokenBridgeTest is Bridge_Initializer {
             abi.encodeCall(superchainTokenBridge.relayERC20, (address(superchainERC20), _sender, _to, _amount));
         _mockAndExpect(
             Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER,
-            abi.encodeWithSelector(
-                IL2ToL2CrossDomainMessenger.sendMessage.selector, _chainId, address(superchainTokenBridge), _message
+            abi.encodeCall(
+                IL2ToL2CrossDomainMessenger.sendMessage, (_chainId, address(superchainTokenBridge), _message)
             ),
             abi.encode(_msgHash)
         );
@@ -150,7 +150,7 @@ contract SuperchainTokenBridgeTest is Bridge_Initializer {
         // Mock the call over the `crossDomainMessageContext` function setting a wrong sender
         vm.mockCall(
             Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER,
-            abi.encodeWithSelector(IL2ToL2CrossDomainMessenger.crossDomainMessageContext.selector),
+            abi.encodeCall(IL2ToL2CrossDomainMessenger.crossDomainMessageContext, ()),
             abi.encode(_crossDomainMessageSender, _source)
         );
 
@@ -169,7 +169,7 @@ contract SuperchainTokenBridgeTest is Bridge_Initializer {
         // Mock the call over the `crossDomainMessageContext` function setting the same address as value
         _mockAndExpect(
             Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER,
-            abi.encodeWithSelector(IL2ToL2CrossDomainMessenger.crossDomainMessageContext.selector),
+            abi.encodeCall(IL2ToL2CrossDomainMessenger.crossDomainMessageContext, ()),
             abi.encode(address(superchainTokenBridge), _source)
         );
 
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index b428dc4cd191..9a65544dc7ee 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -322,7 +322,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the internal mint function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_internal_mint_function_reverts(address _caller, address _to, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("_mint(address,uint256)", _to, _amount);
+        bytes memory _calldata = abi.encodeWithSignature("_mint(address,uint256)", _to, _amount); // nosemgrep:
+            // sol-style-use-abi-encodecall
         vm.expectRevert(bytes(""));
 
         // Act
@@ -336,7 +337,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the mint function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_mint_function_reverts(address _caller, address _to, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("mint(address,uint256)", _to, _amount);
+        bytes memory _calldata = abi.encodeWithSignature("mint(address,uint256)", _to, _amount); // nosemgrep:
+            // sol-style-use-abi-encodecall
         vm.expectRevert(bytes(""));
 
         // Act
@@ -350,7 +352,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the internal burn function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_internal_burn_function_reverts(address _caller, address _from, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("_burn(address,uint256)", _from, _amount);
+        bytes memory _calldata = abi.encodeWithSignature("_burn(address,uint256)", _from, _amount); // nosemgrep:
+            // sol-style-use-abi-encodecall
         vm.expectRevert(bytes(""));
 
         // Act
@@ -364,7 +367,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the burn function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_burn_function_reverts(address _caller, address _from, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("burn(address,uint256)", _from, _amount);
+        bytes memory _calldata = abi.encodeWithSignature("burn(address,uint256)", _from, _amount); // nosemgrep:
+            // sol-style-use-abi-encodecall
         vm.expectRevert(bytes(""));
 
         // Act
diff --git a/packages/contracts-bedrock/test/L2/WETH.t.sol b/packages/contracts-bedrock/test/L2/WETH.t.sol
index fa16be1f53cc..84bb138d74fb 100644
--- a/packages/contracts-bedrock/test/L2/WETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/WETH.t.sol
@@ -10,7 +10,7 @@ import { WETH } from "src/L2/WETH.sol";
 contract WETH_Test is CommonTest {
     /// @dev Tests that the name function returns the correct value.
     function testFuzz_name_succeeds(string memory _gasPayingTokenName) external {
-        vm.mockCall(address(l1Block), abi.encodeWithSignature("gasPayingTokenName()"), abi.encode(_gasPayingTokenName));
+        vm.mockCall(address(l1Block), abi.encodeCall(l1Block.gasPayingTokenName, ()), abi.encode(_gasPayingTokenName));
 
         assertEq(string.concat("Wrapped ", _gasPayingTokenName), weth.name());
     }
@@ -18,7 +18,7 @@ contract WETH_Test is CommonTest {
     /// @dev Tests that the symbol function returns the correct value.
     function testFuzz_symbol_succeeds(string memory _gasPayingTokenSymbol) external {
         vm.mockCall(
-            address(l1Block), abi.encodeWithSignature("gasPayingTokenSymbol()"), abi.encode(_gasPayingTokenSymbol)
+            address(l1Block), abi.encodeCall(l1Block.gasPayingTokenSymbol, ()), abi.encode(_gasPayingTokenSymbol)
         );
 
         assertEq(string.concat("W", _gasPayingTokenSymbol), weth.symbol());
diff --git a/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol b/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol
index c3cdf2c58d44..524423292058 100644
--- a/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol
+++ b/packages/contracts-bedrock/test/dispute/AnchorStateRegistry.t.sol
@@ -49,9 +49,7 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
         assert(l2BlockNumber < gameProxy.l2BlockNumber());
 
         // Mock the state that we want.
-        vm.mockCall(
-            address(gameProxy), abi.encodeWithSelector(gameProxy.status.selector), abi.encode(GameStatus.DEFENDER_WINS)
-        );
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.status, ()), abi.encode(GameStatus.DEFENDER_WINS));
 
         // Try to update the anchor state.
         vm.prank(address(gameProxy));
@@ -66,15 +64,13 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
     /// @dev Tests that updating the anchor state fails when the game state is valid but older.
     function test_tryUpdateAnchorState_validOlderState_fails() public {
         // Confirm that the anchor state is newer than the game state.
-        vm.mockCall(address(gameProxy), abi.encodeWithSelector(gameProxy.l2BlockNumber.selector), abi.encode(0));
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.l2BlockNumber, ()), abi.encode(0));
         (Hash root, uint256 l2BlockNumber) = anchorStateRegistry.anchors(gameProxy.gameType());
         assert(l2BlockNumber >= gameProxy.l2BlockNumber());
 
         // Mock the state that we want.
-        vm.mockCall(address(gameProxy), abi.encodeWithSelector(gameProxy.l2BlockNumber.selector), abi.encode(0));
-        vm.mockCall(
-            address(gameProxy), abi.encodeWithSelector(gameProxy.status.selector), abi.encode(GameStatus.DEFENDER_WINS)
-        );
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.l2BlockNumber, ()), abi.encode(0));
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.status, ()), abi.encode(GameStatus.DEFENDER_WINS));
 
         // Try to update the anchor state.
         vm.prank(address(gameProxy));
@@ -93,11 +89,7 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
         assert(l2BlockNumber < gameProxy.l2BlockNumber());
 
         // Mock the state that we want.
-        vm.mockCall(
-            address(gameProxy),
-            abi.encodeWithSelector(gameProxy.status.selector),
-            abi.encode(GameStatus.CHALLENGER_WINS)
-        );
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.status, ()), abi.encode(GameStatus.CHALLENGER_WINS));
 
         // Try to update the anchor state.
         vm.prank(address(gameProxy));
@@ -118,8 +110,8 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
         // Mock the state that we want.
         vm.mockCall(
             address(disputeGameFactory),
-            abi.encodeWithSelector(
-                disputeGameFactory.games.selector, gameProxy.gameType(), gameProxy.rootClaim(), gameProxy.extraData()
+            abi.encodeCall(
+                disputeGameFactory.games, (gameProxy.gameType(), gameProxy.rootClaim(), gameProxy.extraData())
             ),
             abi.encode(address(0), 0)
         );
@@ -146,8 +138,8 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
         // Mock the state that we want.
         vm.mockCall(
             address(disputeGameFactory),
-            abi.encodeWithSelector(
-                disputeGameFactory.games.selector, gameProxy.gameType(), gameProxy.rootClaim(), gameProxy.extraData()
+            abi.encodeCall(
+                disputeGameFactory.games, (gameProxy.gameType(), gameProxy.rootClaim(), gameProxy.extraData())
             ),
             abi.encode(address(0), 0)
         );
@@ -168,11 +160,7 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
         (Hash root, uint256 l2BlockNumber) = anchorStateRegistry.anchors(gameProxy.gameType());
 
         // Mock the state that we want.
-        vm.mockCall(
-            address(gameProxy),
-            abi.encodeWithSelector(gameProxy.status.selector),
-            abi.encode(GameStatus.CHALLENGER_WINS)
-        );
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.status, ()), abi.encode(GameStatus.CHALLENGER_WINS));
 
         // Set the anchor state.
         vm.prank(superchainConfig.guardian());
@@ -190,9 +178,7 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
         (Hash root, uint256 l2BlockNumber) = anchorStateRegistry.anchors(gameProxy.gameType());
 
         // Mock the state that we want.
-        vm.mockCall(
-            address(gameProxy), abi.encodeWithSelector(gameProxy.status.selector), abi.encode(GameStatus.IN_PROGRESS)
-        );
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.status, ()), abi.encode(GameStatus.IN_PROGRESS));
 
         // Set the anchor state.
         vm.prank(superchainConfig.guardian());
@@ -208,9 +194,7 @@ contract AnchorStateRegistry_TryUpdateAnchorState_Test is AnchorStateRegistry_In
     /// @dev Tests that setting the anchor state succeeds.
     function test_setAnchorState_succeeds() public {
         // Mock the state that we want.
-        vm.mockCall(
-            address(gameProxy), abi.encodeWithSelector(gameProxy.status.selector), abi.encode(GameStatus.DEFENDER_WINS)
-        );
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.status, ()), abi.encode(GameStatus.DEFENDER_WINS));
 
         // Set the anchor state.
         vm.prank(superchainConfig.guardian());
diff --git a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
index 00f3a8b19f9c..88e361a80b45 100644
--- a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
@@ -6,6 +6,7 @@ import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 import { DisputeGameFactory_Init } from "test/dispute/DisputeGameFactory.t.sol";
 import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
+import { stdError } from "forge-std/StdError.sol";
 
 // Scripts
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
@@ -186,9 +187,7 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
         // PreimageOracle constructor will revert if the challenge period is too large, so we need
         // to mock the call to pretend this is a bugged implementation where the challenge period
         // is allowed to be too large.
-        vm.mockCall(
-            address(oracle), abi.encodeWithSelector(oracle.challengePeriod.selector), abi.encode(_challengePeriod)
-        );
+        vm.mockCall(address(oracle), abi.encodeCall(IPreimageOracle.challengePeriod, ()), abi.encode(_challengePeriod));
 
         vm.expectRevert(InvalidChallengePeriod.selector);
         DeployUtils.create1({
@@ -536,11 +535,11 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
         Claim claim = _dummyClaim();
 
         // Expect an out of bounds revert for an attack
-        vm.expectRevert(abi.encodeWithSignature("Panic(uint256)", 0x32));
+        vm.expectRevert(stdError.indexOOBError);
         gameProxy.attack(_dummyClaim(), 1, claim);
 
         // Expect an out of bounds revert for a defense
-        vm.expectRevert(abi.encodeWithSignature("Panic(uint256)", 0x32));
+        vm.expectRevert(stdError.indexOOBError);
         gameProxy.defend(_dummyClaim(), 1, claim);
     }
 
@@ -1704,14 +1703,14 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
     /// resolves in favor of the defender but the game state is not newer than the anchor state.
     function test_resolve_validOlderStateSameAnchor_succeeds() public {
         // Mock the game block to be older than the game state.
-        vm.mockCall(address(gameProxy), abi.encodeWithSelector(gameProxy.l2BlockNumber.selector), abi.encode(0));
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.l2BlockNumber, ()), abi.encode(0));
 
         // Confirm that the anchor state is newer than the game state.
         (Hash root, uint256 l2BlockNumber) = anchorStateRegistry.anchors(gameProxy.gameType());
         assert(l2BlockNumber >= gameProxy.l2BlockNumber());
 
         // Resolve the game.
-        vm.mockCall(address(gameProxy), abi.encodeWithSelector(gameProxy.l2BlockNumber.selector), abi.encode(0));
+        vm.mockCall(address(gameProxy), abi.encodeCall(gameProxy.l2BlockNumber, ()), abi.encode(0));
         vm.warp(block.timestamp + 3 days + 12 hours);
         gameProxy.resolveClaim(0, 0);
         assertEq(uint8(gameProxy.resolve()), uint8(GameStatus.DEFENDER_WINS));
diff --git a/packages/contracts-bedrock/test/invariants/SafeCall.t.sol b/packages/contracts-bedrock/test/invariants/SafeCall.t.sol
index 0a70c3ddd906..2de6183bd130 100644
--- a/packages/contracts-bedrock/test/invariants/SafeCall.t.sol
+++ b/packages/contracts-bedrock/test/invariants/SafeCall.t.sol
@@ -103,10 +103,7 @@ contract SafeCaller_Actor is StdUtils {
 
         vm.expectCallMinGas(to, value, minGas, hex"");
         bool success = SafeCall.call(
-            msg.sender,
-            gas,
-            value,
-            abi.encodeWithSelector(SafeCall_Succeeds_Invariants.performSafeCallMinGas.selector, to, minGas)
+            msg.sender, gas, value, abi.encodeCall(SafeCall_Succeeds_Invariants.performSafeCallMinGas, (to, minGas))
         );
 
         if (success && FAILS) numCalls++;
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol b/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol
index 015ee020e7d1..5e45e3e3a9fd 100644
--- a/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol
@@ -34,7 +34,7 @@ contract L1ERC721BridgeKontrol is DeploymentSummaryFaultProofs, KontrolUtils {
 
         vm.mockCall(
             address(l1ERC721Bridge.messenger()),
-            abi.encodeWithSelector(CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1ERC721Bridge.otherBridge()))
         );
 
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol b/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol
index 6e65f852719b..b5f8793426e6 100644
--- a/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol
@@ -34,7 +34,7 @@ contract L1StandardBridgeKontrol is DeploymentSummaryFaultProofs, KontrolUtils {
 
         vm.mockCall(
             address(l1standardBridge.messenger()),
-            abi.encodeWithSelector(CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1standardBridge.otherBridge()))
         );
 
@@ -59,7 +59,7 @@ contract L1StandardBridgeKontrol is DeploymentSummaryFaultProofs, KontrolUtils {
 
         vm.mockCall(
             address(l1standardBridge.messenger()),
-            abi.encodeWithSelector(CrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(CrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1standardBridge.otherBridge()))
         );
 
diff --git a/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol b/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
index 84c743c97aa3..5b1f40d55bd8 100644
--- a/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
+++ b/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
@@ -43,14 +43,14 @@ contract ResolvedDelegateProxy_Test is Test {
 
     /// @dev Tests that the proxy properly bubbles up returndata when the delegatecall succeeds.
     function testFuzz_fallback_delegateCallFoo_succeeds(uint256 x) public {
-        vm.expectCall(address(impl), abi.encodeWithSelector(impl.foo.selector, x));
+        vm.expectCall(address(impl), abi.encodeCall(impl.foo, (x)));
         assertEq(proxy.foo(x), x);
     }
 
     /// @dev Tests that the proxy properly bubbles up returndata when the delegatecall reverts.
     function test_fallback_delegateCallBar_reverts() public {
         vm.expectRevert("SimpleImplementation: revert");
-        vm.expectCall(address(impl), abi.encodeWithSelector(impl.bar.selector));
+        vm.expectCall(address(impl), abi.encodeCall(impl.bar, ()));
         proxy.bar();
     }
 
diff --git a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
index fcb9d3832a12..ffdf07b09b83 100644
--- a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
+++ b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
@@ -122,12 +122,12 @@ contract SafeCall_Test is Test {
         for (uint64 i = 40_000; i < 100_000; i++) {
             uint256 snapshot = vm.snapshot();
 
-            // 65_907 is the exact amount of gas required to make the safe call
+            // 65_922 is the exact amount of gas required to make the safe call
             // successfully.
-            if (i < 65_907) {
+            if (i < 65_922) {
                 assertFalse(caller.makeSafeCall(i, 25_000));
             } else {
-                vm.expectCallMinGas(address(caller), 0, 25_000, abi.encodeWithSelector(caller.setA.selector, 1));
+                vm.expectCallMinGas(address(caller), 0, 25_000, abi.encodeCall(caller.setA, (1)));
                 assertTrue(caller.makeSafeCall(i, 25_000));
             }
 
@@ -142,12 +142,12 @@ contract SafeCall_Test is Test {
         for (uint64 i = 15_200_000; i < 15_300_000; i++) {
             uint256 snapshot = vm.snapshot();
 
-            // 15_278_606 is the exact amount of gas required to make the safe call
+            // 15_278_621 is the exact amount of gas required to make the safe call
             // successfully.
-            if (i < 15_278_606) {
+            if (i < 15_278_621) {
                 assertFalse(caller.makeSafeCall(i, 15_000_000));
             } else {
-                vm.expectCallMinGas(address(caller), 0, 15_000_000, abi.encodeWithSelector(caller.setA.selector, 1));
+                vm.expectCallMinGas(address(caller), 0, 15_000_000, abi.encodeCall(caller.setA, (1)));
                 assertTrue(caller.makeSafeCall(i, 15_000_000));
             }
 
@@ -160,11 +160,11 @@ contract SimpleSafeCaller {
     uint256 public a;
 
     function makeSafeCall(uint64 gas, uint64 minGas) external returns (bool) {
-        return SafeCall.call(address(this), gas, 0, abi.encodeWithSelector(this.makeSafeCallMinGas.selector, minGas));
+        return SafeCall.call(address(this), gas, 0, abi.encodeCall(this.makeSafeCallMinGas, (minGas)));
     }
 
     function makeSafeCallMinGas(uint64 minGas) external returns (bool) {
-        return SafeCall.callWithMinGas(address(this), minGas, 0, abi.encodeWithSelector(this.setA.selector, 1));
+        return SafeCall.callWithMinGas(address(this), minGas, 0, abi.encodeCall(this.setA, (1)));
     }
 
     function setA(uint256 _a) external {
diff --git a/packages/contracts-bedrock/test/periphery/Transactor.t.sol b/packages/contracts-bedrock/test/periphery/Transactor.t.sol
index bfee0ddc3adf..8d183c8d20b7 100644
--- a/packages/contracts-bedrock/test/periphery/Transactor.t.sol
+++ b/packages/contracts-bedrock/test/periphery/Transactor.t.sol
@@ -41,7 +41,7 @@ contract TransactorTest is Transactor_Initializer {
     /// @notice Tests CALL, should do a call to target
     function test_call_succeeds() external {
         // Initialize call data
-        bytes memory data = abi.encodeWithSelector(callRecorded.record.selector);
+        bytes memory data = abi.encodeCall(CallRecorder.record, ());
         // Run CALL
         vm.prank(alice);
         vm.expectCall(address(callRecorded), 200_000 wei, data);
@@ -51,7 +51,7 @@ contract TransactorTest is Transactor_Initializer {
     /// @notice It should revert if called by non-owner
     function test_call_unauthorized_reverts() external {
         // Initialize call data
-        bytes memory data = abi.encodeWithSelector(callRecorded.record.selector);
+        bytes memory data = abi.encodeCall(CallRecorder.record, ());
         // Run CALL
         vm.prank(bob);
         vm.expectRevert("UNAUTHORIZED");
@@ -61,7 +61,7 @@ contract TransactorTest is Transactor_Initializer {
     /// @notice Deletate call succeeds.
     function test_delegateCall_succeeds() external {
         // Initialize call data
-        bytes memory data = abi.encodeWithSelector(reverter.doRevert.selector);
+        bytes memory data = abi.encodeCall(Reverter.doRevert, ());
         // Run CALL
         vm.prank(alice);
         vm.expectCall(address(reverter), data);
@@ -71,7 +71,7 @@ contract TransactorTest is Transactor_Initializer {
     /// @notice It should revert if called by non-owner
     function test_delegateCall_unauthorized_reverts() external {
         // Initialize call data
-        bytes memory data = abi.encodeWithSelector(reverter.doRevert.selector);
+        bytes memory data = abi.encodeCall(Reverter.doRevert, ());
         // Run CALL
         vm.prank(bob);
         vm.expectRevert("UNAUTHORIZED");
diff --git a/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol b/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol
index 66c2a8d69b19..0e6755b0e63c 100644
--- a/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol
+++ b/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol
@@ -353,7 +353,7 @@ contract Drippie_Test is Test {
         // Add in an action
         cfg.actions[0] = Drippie.DripAction({
             target: payable(address(simpleStorage)),
-            data: abi.encodeWithSelector(SimpleStorage.set.selector, key, value),
+            data: abi.encodeCall(SimpleStorage.set, (key, value)),
             value: 0
         });
 
@@ -365,7 +365,7 @@ contract Drippie_Test is Test {
         vm.prank(drippie.owner());
         drippie.status(dripName, Drippie.DripStatus.ACTIVE);
 
-        vm.expectCall(address(simpleStorage), 0, abi.encodeWithSelector(SimpleStorage.set.selector, key, value));
+        vm.expectCall(address(simpleStorage), 0, abi.encodeCall(SimpleStorage.set, (key, value)));
 
         vm.expectEmit(address(drippie));
         emit DripExecuted(dripName, dripName, address(this), block.timestamp);
@@ -383,7 +383,7 @@ contract Drippie_Test is Test {
         bytes32 valueOne = bytes32(uint256(3));
         actions[0] = Drippie.DripAction({
             target: payable(address(simpleStorage)),
-            data: abi.encodeWithSelector(simpleStorage.set.selector, keyOne, valueOne),
+            data: abi.encodeCall(SimpleStorage.set, (keyOne, valueOne)),
             value: 0
         });
 
@@ -391,7 +391,7 @@ contract Drippie_Test is Test {
         bytes32 valueTwo = bytes32(uint256(5));
         actions[1] = Drippie.DripAction({
             target: payable(address(simpleStorage)),
-            data: abi.encodeWithSelector(simpleStorage.set.selector, keyTwo, valueTwo),
+            data: abi.encodeCall(SimpleStorage.set, (keyTwo, valueTwo)),
             value: 0
         });
 
@@ -407,9 +407,9 @@ contract Drippie_Test is Test {
 
         vm.expectCall(drippie.dripConfigCheckAddress(dripName), drippie.dripConfigCheckParams(dripName));
 
-        vm.expectCall(address(simpleStorage), 0, abi.encodeWithSelector(SimpleStorage.set.selector, keyOne, valueOne));
+        vm.expectCall(address(simpleStorage), 0, abi.encodeCall(SimpleStorage.set, (keyOne, valueOne)));
 
-        vm.expectCall(address(simpleStorage), 0, abi.encodeWithSelector(SimpleStorage.set.selector, keyTwo, valueTwo));
+        vm.expectCall(address(simpleStorage), 0, abi.encodeCall(SimpleStorage.set, (keyTwo, valueTwo)));
 
         vm.expectEmit(address(drippie));
         emit DripExecuted(dripName, dripName, address(this), block.timestamp);
diff --git a/packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol b/packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol
index 912b04ab33f6..2eb2f07e860f 100644
--- a/packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol
+++ b/packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol
@@ -130,9 +130,7 @@ contract Optimist_Initializer is Test {
     /// @notice Mocks the allowlistAttestor to always return true for a given address.
     function _mockAllowlistTrueFor(address _claimer) internal {
         vm.mockCall(
-            address(optimistAllowlist),
-            abi.encodeWithSelector(OptimistAllowlist.isAllowedToMint.selector, _claimer),
-            abi.encode(true)
+            address(optimistAllowlist), abi.encodeCall(OptimistAllowlist.isAllowedToMint, (_claimer)), abi.encode(true)
         );
 
         assertTrue(optimist.isOnAllowList(_claimer));
@@ -210,7 +208,7 @@ contract OptimistTest is Optimist_Initializer {
         assertTrue(optimistAllowlist.isAllowedToMint(bob));
 
         // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeWithSelector(optimistAllowlist.isAllowedToMint.selector, bob);
+        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
         vm.expectCall(address(optimistAllowlist), data);
 
         // mint an NFT and expect mint transfer event to be emitted
@@ -236,7 +234,7 @@ contract OptimistTest is Optimist_Initializer {
         assertTrue(optimistAllowlist.isAllowedToMint(bob));
 
         // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeWithSelector(optimistAllowlist.isAllowedToMint.selector, bob);
+        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
         vm.expectCall(address(optimistAllowlist), data);
 
         // mint an NFT and expect mint transfer event to be emitted
@@ -262,7 +260,7 @@ contract OptimistTest is Optimist_Initializer {
         assertTrue(optimistAllowlist.isAllowedToMint(bob));
 
         // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeWithSelector(optimistAllowlist.isAllowedToMint.selector, bob);
+        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
         vm.expectCall(address(optimistAllowlist), data);
 
         // mint an NFT and expect mint transfer event to be emitted
@@ -293,7 +291,7 @@ contract OptimistTest is Optimist_Initializer {
         assertTrue(optimistAllowlist.isAllowedToMint(bob));
 
         // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeWithSelector(optimistAllowlist.isAllowedToMint.selector, bob);
+        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
         vm.expectCall(address(optimistAllowlist), data);
 
         // mint an NFT and expect mint transfer event to be emitted
@@ -350,11 +348,9 @@ contract OptimistTest is Optimist_Initializer {
     function test_baseURI_returnsCorrectBaseURI_succeeds() external {
         _attestBaseURI(base_uri);
 
-        bytes memory data = abi.encodeWithSelector(
-            attestationStation.attestations.selector,
-            carol_baseURIAttestor,
-            address(optimist),
-            optimist.BASE_URI_ATTESTATION_KEY()
+        bytes memory data = abi.encodeCall(
+            attestationStation.attestations,
+            (carol_baseURIAttestor, address(optimist), optimist.BASE_URI_ATTESTATION_KEY())
         );
         vm.expectCall(address(attestationStation), data);
         vm.prank(carol_baseURIAttestor);
@@ -527,14 +523,14 @@ contract OptimistTest is Optimist_Initializer {
         // First call is to claim the invite, receiving the attestation
         calls[0] = IMulticall3.Call3({
             target: address(optimistInviter),
-            callData: abi.encodeWithSelector(optimistInviter.claimInvite.selector, bob, claimableInvite, signature),
+            callData: abi.encodeCall(OptimistInviter.claimInvite, (bob, claimableInvite, signature)),
             allowFailure: false
         });
 
         // Second call is to mint the Optimist NFT
         calls[1] = IMulticall3.Call3({
             target: address(optimist),
-            callData: abi.encodeWithSelector(optimist.mint.selector, bob),
+            callData: abi.encodeCall(Optimist.mint, (bob)),
             allowFailure: false
         });
 
diff --git a/packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol b/packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol
index 34386f5e3923..976cae553691 100644
--- a/packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol
+++ b/packages/contracts-bedrock/test/safe-tools/SafeTestTools.sol
@@ -260,7 +260,7 @@ library SafeTestLib {
             instance,
             address(instance.safe),
             0,
-            abi.encodeWithSelector(ModuleManager.enableModule.selector, module),
+            abi.encodeCall(ModuleManager.enableModule, (module)),
             Enum.Operation.Call,
             0,
             0,
@@ -289,7 +289,7 @@ library SafeTestLib {
             instance,
             address(instance.safe),
             0,
-            abi.encodeWithSelector(ModuleManager.disableModule.selector, prevModule, module),
+            abi.encodeCall(ModuleManager.disableModule, (prevModule, module)),
             Enum.Operation.Call,
             0,
             0,
@@ -308,7 +308,7 @@ library SafeTestLib {
             instance,
             address(instance.safe),
             0,
-            abi.encodeWithSelector(GuardManager.setGuard.selector, guard),
+            abi.encodeCall(GuardManager.setGuard, (guard)),
             Enum.Operation.Call,
             0,
             0,
@@ -326,7 +326,7 @@ library SafeTestLib {
             instance: instance,
             to: signMessageLib,
             value: 0,
-            data: abi.encodeWithSelector(SignMessageLib.signMessage.selector, data),
+            data: abi.encodeCall(SignMessageLib.signMessage, (data)),
             operation: Enum.Operation.DelegateCall,
             safeTxGas: 0,
             baseGas: 0,
@@ -350,21 +350,13 @@ library SafeTestLib {
 
     /// @dev Adds a new owner to the safe
     function changeThreshold(SafeInstance memory instance, uint256 threshold) internal {
-        execTransaction(
-            instance,
-            address(instance.safe),
-            0,
-            abi.encodeWithSelector(OwnerManager.changeThreshold.selector, threshold)
-        );
+        execTransaction(instance, address(instance.safe), 0, abi.encodeCall(OwnerManager.changeThreshold, (threshold)));
     }
 
     /// @dev Adds a new owner to the safe
     function addOwnerWithThreshold(SafeInstance memory instance, address owner, uint256 threshold) internal {
         execTransaction(
-            instance,
-            address(instance.safe),
-            0,
-            abi.encodeWithSelector(OwnerManager.addOwnerWithThreshold.selector, owner, threshold)
+            instance, address(instance.safe), 0, abi.encodeCall(OwnerManager.addOwnerWithThreshold, (owner, threshold))
         );
     }
 
@@ -373,10 +365,7 @@ library SafeTestLib {
     function removeOwner(SafeInstance memory instance, address prevOwner, address owner, uint256 threshold) internal {
         prevOwner = prevOwner > address(0) ? prevOwner : SafeTestLib.getPrevOwner(instance, owner);
         execTransaction(
-            instance,
-            address(instance.safe),
-            0,
-            abi.encodeWithSelector(OwnerManager.removeOwner.selector, prevOwner, owner, threshold)
+            instance, address(instance.safe), 0, abi.encodeCall(OwnerManager.removeOwner, (prevOwner, owner, threshold))
         );
     }
 
@@ -385,10 +374,7 @@ library SafeTestLib {
     function swapOwner(SafeInstance memory instance, address prevOwner, address oldOwner, address newOwner) internal {
         prevOwner = prevOwner > address(0) ? prevOwner : SafeTestLib.getPrevOwner(instance, oldOwner);
         execTransaction(
-            instance,
-            address(instance.safe),
-            0,
-            abi.encodeWithSelector(OwnerManager.swapOwner.selector, prevOwner, oldOwner, newOwner)
+            instance, address(instance.safe), 0, abi.encodeCall(OwnerManager.swapOwner, (prevOwner, oldOwner, newOwner))
         );
     }
 
@@ -537,16 +523,18 @@ contract SafeTestTools {
 
         bytes memory initData = advancedParams.initData.length > 0
             ? advancedParams.initData
-            : abi.encodeWithSelector(
-                GnosisSafe.setup.selector,
-                owners,
-                threshold,
-                advancedParams.setupModulesCall_to,
-                advancedParams.setupModulesCall_data,
-                advancedParams.includeFallbackHandler ? address(handler) : address(0),
-                advancedParams.refundToken,
-                advancedParams.refundAmount,
-                advancedParams.refundReceiver
+            : abi.encodeCall(
+                GnosisSafe.setup,
+                (
+                    owners,
+                    threshold,
+                    advancedParams.setupModulesCall_to,
+                    advancedParams.setupModulesCall_data,
+                    advancedParams.includeFallbackHandler ? address(handler) : address(0),
+                    advancedParams.refundToken,
+                    advancedParams.refundAmount,
+                    advancedParams.refundReceiver
+                )
             );
 
         DeployedSafe safe0 = DeployedSafe(
diff --git a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
index 2fec587211f7..8dd1ba970abd 100644
--- a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
+++ b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
@@ -100,7 +100,7 @@ contract DeputyGuardianModule_Pause_TestFail is DeputyGuardianModule_TestInit {
     function test_pause_targetReverts_reverts() external {
         vm.mockCallRevert(
             address(superchainConfig),
-            abi.encodeWithSelector(superchainConfig.pause.selector),
+            abi.encodePacked(superchainConfig.pause.selector),
             "SuperchainConfig: pause() reverted"
         );
 
@@ -150,7 +150,7 @@ contract DeputyGuardianModule_Unpause_TestFail is DeputyGuardianModule_Unpause_T
     function test_unpause_targetReverts_reverts() external {
         vm.mockCallRevert(
             address(superchainConfig),
-            abi.encodeWithSelector(superchainConfig.unpause.selector),
+            abi.encodePacked(superchainConfig.unpause.selector),
             "SuperchainConfig: unpause reverted"
         );
 
@@ -170,9 +170,7 @@ contract DeputyGuardianModule_SetAnchorState_TestFail is DeputyGuardianModule_Te
     function test_setAnchorState_targetReverts_reverts() external {
         IAnchorStateRegistry asr = IAnchorStateRegistry(makeAddr("asr"));
         vm.mockCallRevert(
-            address(asr),
-            abi.encodeWithSelector(asr.setAnchorState.selector),
-            "AnchorStateRegistry: setAnchorState reverted"
+            address(asr), abi.encodePacked(asr.setAnchorState.selector), "AnchorStateRegistry: setAnchorState reverted"
         );
         vm.prank(address(deputyGuardian));
         vm.expectRevert(
@@ -186,9 +184,7 @@ contract DeputyGuardianModule_SetAnchorState_Test is DeputyGuardianModule_TestIn
     function test_setAnchorState_succeeds() external {
         IAnchorStateRegistry asr = IAnchorStateRegistry(makeAddr("asr"));
         vm.mockCall(
-            address(asr),
-            abi.encodeWithSelector(IAnchorStateRegistry.setAnchorState.selector, IFaultDisputeGame(address(0))),
-            ""
+            address(asr), abi.encodeCall(IAnchorStateRegistry.setAnchorState, (IFaultDisputeGame(address(0)))), ""
         );
         vm.expectEmit(address(safeInstance.safe));
         emit ExecutionFromModuleSuccess(address(deputyGuardianModule));
@@ -228,7 +224,7 @@ contract DeputyGuardianModule_BlacklistDisputeGame_TestFail is DeputyGuardianMod
     function test_blacklistDisputeGame_targetReverts_reverts() external {
         vm.mockCallRevert(
             address(optimismPortal2),
-            abi.encodeWithSelector(optimismPortal2.blacklistDisputeGame.selector),
+            abi.encodePacked(optimismPortal2.blacklistDisputeGame.selector),
             "OptimismPortal2: blacklistDisputeGame reverted"
         );
 
@@ -271,7 +267,7 @@ contract DeputyGuardianModule_setRespectedGameType_TestFail is DeputyGuardianMod
     function test_setRespectedGameType_targetReverts_reverts() external {
         vm.mockCallRevert(
             address(optimismPortal2),
-            abi.encodeWithSelector(optimismPortal2.setRespectedGameType.selector),
+            abi.encodePacked(optimismPortal2.setRespectedGameType.selector),
             "OptimismPortal2: setRespectedGameType reverted"
         );
 
diff --git a/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol b/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
index f1386a6608a2..68ddddec5b37 100644
--- a/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
+++ b/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
@@ -110,7 +110,7 @@ contract LivenessGuard_CheckTx_Test is LivenessGuard_TestInit {
             vm.expectEmit(address(livenessGuard));
             emit OwnerRecorded(signers[i]);
         }
-        vm.expectCall(address(safeInstance.safe), abi.encodeWithSignature("nonce()"));
+        vm.expectCall(address(safeInstance.safe), abi.encodeCall(safeInstance.safe.nonce, ()));
         vm.expectCall(address(safeInstance.safe), abi.encodeCall(OwnerManager.getThreshold, ()));
         safeInstance.execTransaction({ to: address(1111), value: 0, data: hex"abba" });
         for (uint256 i; i < safeInstance.threshold; i++) {
@@ -228,6 +228,7 @@ contract LivenessGuard_FuzzOwnerManagement_Test is StdCheats, StdUtils, Liveness
     mapping(address => uint256) privateKeys;
 
     /// @dev Tests that the guard correctly manages the lastLive mapping when owners are added, removed, or swapped
+    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_OwnerManagement_works(
         uint256 initialOwners,
         uint256 threshold,
diff --git a/packages/contracts-bedrock/test/safe/SafeSigners.t.sol b/packages/contracts-bedrock/test/safe/SafeSigners.t.sol
index 9cfa91869899..cb9737a3e975 100644
--- a/packages/contracts-bedrock/test/safe/SafeSigners.t.sol
+++ b/packages/contracts-bedrock/test/safe/SafeSigners.t.sol
@@ -75,6 +75,7 @@ contract SafeSigners_Test is Test, SafeTestTools {
                 contractSigs++;
                 address addr = SafeTestLib.decodeSmartContractWalletAsAddress(pks[i]);
                 r = bytes32(uint256(uint160(addr)));
+                // nosemgrep: sol-style-use-abi-encodecall
                 vm.mockCall(
                     addr, abi.encodeWithSignature("isValidSignature(bytes,bytes)"), abi.encode(EIP1271_MAGIC_VALUE)
                 );
diff --git a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
index 454158566f6c..a68cccf6862f 100644
--- a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
+++ b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
@@ -187,7 +187,7 @@ contract GasBenchMark_L1StandardBridge_Finalize is Bridge_Initializer {
         deal(address(L1Token), address(l1StandardBridge), 100, true);
         vm.mockCall(
             address(l1StandardBridge.messenger()),
-            abi.encodeWithSelector(ICrossDomainMessenger.xDomainMessageSender.selector),
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
             abi.encode(address(l1StandardBridge.OTHER_BRIDGE()))
         );
         vm.startPrank(address(l1StandardBridge.messenger()));
@@ -302,7 +302,7 @@ contract GasBenchMark_L1BlockInterop_DepositsComplete is GasBenchMark_L1BlockInt
     function test_depositsComplete_benchmark() external {
         SafeCall.call({
             _target: address(l1BlockInterop),
-            _calldata: abi.encodeWithSelector(l1BlockInterop.depositsComplete.selector)
+            _calldata: abi.encodeCall(IL1BlockInterop.depositsComplete, ())
         });
     }
 }
@@ -317,7 +317,7 @@ contract GasBenchMark_L1BlockInterop_DepositsComplete_Warm is GasBenchMark_L1Blo
     function test_depositsComplete_benchmark() external {
         SafeCall.call({
             _target: address(l1BlockInterop),
-            _calldata: abi.encodeWithSelector(l1BlockInterop.depositsComplete.selector)
+            _calldata: abi.encodeCall(l1BlockInterop.depositsComplete, ())
         });
     }
 }
diff --git a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
index dddb09d41239..065c3e1bc3fc 100644
--- a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
@@ -99,7 +99,7 @@ contract ExternalRelay is Test {
 
     /// @notice Helper function to get the callData for an `externalCallWithMinGas
     function getCallData() public pure returns (bytes memory) {
-        return abi.encodeWithSelector(ExternalRelay.externalCallWithMinGas.selector);
+        return abi.encodeCall(ExternalRelay.externalCallWithMinGas, ());
     }
 
     /// @notice Helper function to set the fuzzed sender
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
index cba5fc829086..d146b050f387 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
@@ -42,7 +42,7 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
         vm.startPrank(EIP1967Helper.getAdmin(address(proxy)));
         // Reviewer note: the NextImpl() still uses reinitializer. If we want to remove that, we'll need to use a
         //   two step upgrade with the Storage lib.
-        proxy.upgradeToAndCall(address(nextImpl), abi.encodeWithSelector(NextImpl.initialize.selector, 2));
+        proxy.upgradeToAndCall(address(nextImpl), abi.encodeCall(NextImpl.initialize, (2)));
         assertEq(proxy.implementation(), address(nextImpl));
 
         // Verify that the NextImpl contract initialized its values according as expected
diff --git a/packages/contracts-bedrock/test/universal/Proxy.t.sol b/packages/contracts-bedrock/test/universal/Proxy.t.sol
index 9df4e1799aa0..8c6aa7ae5137 100644
--- a/packages/contracts-bedrock/test/universal/Proxy.t.sol
+++ b/packages/contracts-bedrock/test/universal/Proxy.t.sol
@@ -160,7 +160,7 @@ contract Proxy_Test is Test {
         vm.expectEmit(true, true, true, true);
         emit Upgraded(address(simpleStorage));
         vm.prank(alice);
-        proxy.upgradeToAndCall(address(simpleStorage), abi.encodeWithSelector(simpleStorage.set.selector, 1, 1));
+        proxy.upgradeToAndCall(address(simpleStorage), abi.encodeCall(SimpleStorage.set, (1, 1)));
 
         // The call should have impacted the state
         uint256 result = SimpleStorage(address(proxy)).get(1);
@@ -193,7 +193,7 @@ contract Proxy_Test is Test {
         // The attempt to `upgradeToAndCall`
         // should revert when it is not called by the owner.
         vm.expectRevert(bytes(""));
-        proxy.upgradeToAndCall(address(simpleStorage), abi.encodeWithSelector(simpleStorage.set.selector, 1, 1));
+        proxy.upgradeToAndCall(address(simpleStorage), abi.encodeCall(simpleStorage.set, (1, 1)));
     }
 
     function test_upgradeToAndCall_isPayable_succeeds() external {
@@ -202,9 +202,7 @@ contract Proxy_Test is Test {
         // Set the implementation and call and send
         // value.
         vm.prank(alice);
-        proxy.upgradeToAndCall{ value: 1 ether }(
-            address(simpleStorage), abi.encodeWithSelector(simpleStorage.set.selector, 1, 1)
-        );
+        proxy.upgradeToAndCall{ value: 1 ether }(address(simpleStorage), abi.encodeCall(simpleStorage.set, (1, 1)));
 
         // The implementation address should be correct
         vm.prank(alice);
@@ -265,7 +263,8 @@ contract Proxy_Test is Test {
         (bool success, bytes memory returndata) = address(proxy).call(hex"");
         assertEq(success, false);
 
-        bytes memory err = abi.encodeWithSignature("Error(string)", "Proxy: implementation not initialized");
+        bytes memory err = abi.encodeWithSignature("Error(string)", "Proxy: implementation not initialized"); // nosemgrep:
+            // sol-style-use-abi-encodecall
 
         assertEq(returndata, err);
     }
diff --git a/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol b/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
index e6d6ced1f971..04e416cbd3a9 100644
--- a/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
+++ b/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
@@ -248,7 +248,7 @@ contract ProxyAdmin_Test is Test {
 
     function upgradeAndCall(address payable _proxy) internal {
         vm.prank(alice);
-        admin.upgradeAndCall(_proxy, address(implementation), abi.encodeWithSelector(SimpleStorage.set.selector, 1, 1));
+        admin.upgradeAndCall(_proxy, address(implementation), abi.encodeCall(SimpleStorage.set, (1, 1)));
 
         address impl = admin.getProxyImplementation(_proxy);
         assertEq(impl, address(implementation));
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 71df6566d4c5..bd9a80d57804 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -54,7 +54,8 @@ rules:
               version\(\) public pure virtual returns \(string memory\)
               \{\s+return
               "(?P<VERSION2>[0-9]+\.[0-9]+\.[0-9]+(?:-[a-zA-Z0-9.]+)?)";
-          - pattern-regex: /// @custom:semver (?P<VERSION1>[a-zA-Z0-9.+-]+)\s+function
+          - pattern-regex:
+              /// @custom:semver (?P<VERSION1>[a-zA-Z0-9.+-]+)\s+function
               version\(\) public pure override returns \(string memory\)
               \{\s+return string\.concat\(super\.version\(\),
               "(?P<VERSION2>[a-zA-Z0-9.+-]+)"\);
@@ -152,11 +153,14 @@ rules:
     severity: ERROR
     message: Use abi.encodeCall instead of abi.encodeWithSelector
     patterns:
-      - pattern: |
-          abi.encodeWithSelector(...);
+      - pattern-either:
+          - pattern: |
+              abi.encodeWithSelector(...);
+          - pattern: |
+              abi.encodeWithSignature(...);
+      - pattern-not: vm.expectRevert(abi.encodeWithSelector(...));
     paths:
       exclude:
-        - packages/contracts-bedrock/test
         - packages/contracts-bedrock/src/L1/OPContractsManager.sol
         - packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
         - packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol

From 654c76251c4f212e27a23073f020e6a65fb7bcd7 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Mon, 28 Oct 2024 15:11:57 +0100
Subject: [PATCH 053/451] rm changelog (#12697)

---
 packages/contracts-bedrock/CHANGELOG.md | 491 ------------------------
 1 file changed, 491 deletions(-)
 delete mode 100644 packages/contracts-bedrock/CHANGELOG.md

diff --git a/packages/contracts-bedrock/CHANGELOG.md b/packages/contracts-bedrock/CHANGELOG.md
deleted file mode 100644
index e4d02f372ade..000000000000
--- a/packages/contracts-bedrock/CHANGELOG.md
+++ /dev/null
@@ -1,491 +0,0 @@
-# @eth-optimism/contracts-bedrock
-
-## 0.17.3
-
-### Patch Changes
-
-- [#10621](https://github.com/ethereum-optimism/optimism/pull/10621) [`eb454ac72b26211eb8037e7e777315c8f30d994d`](https://github.com/ethereum-optimism/optimism/commit/eb454ac72b26211eb8037e7e777315c8f30d994d) Thanks [@tarunkhasnavis](https://github.com/tarunkhasnavis)! - Add data field to faucet contract drip parameters
-
-## 0.17.2
-
-### Patch Changes
-
-- [#9964](https://github.com/ethereum-optimism/optimism/pull/9964) [`8241220898128e1f61064f22dcb6fdd0a5f043c3`](https://github.com/ethereum-optimism/optimism/commit/8241220898128e1f61064f22dcb6fdd0a5f043c3) Thanks [@roninjin10](https://github.com/roninjin10)! - Removed only-allow command from package.json
-
-## 0.17.1
-
-### Patch Changes
-
-- [#9415](https://github.com/ethereum-optimism/optimism/pull/9415) [`79effc52e8b82d15b5eda43acf540ac6c5f8d5d7`](https://github.com/ethereum-optimism/optimism/commit/79effc52e8b82d15b5eda43acf540ac6c5f8d5d7) Thanks [@nitaliano](https://github.com/nitaliano)! - Bumps version so fpac contracts exist for SDK to consume
-
-## 0.16.2
-
-### Patch Changes
-
-- [#7450](https://github.com/ethereum-optimism/optimism/pull/7450) [`ac90e16a7`](https://github.com/ethereum-optimism/optimism/commit/ac90e16a7f85c4f73661ae6023135c3d00421c1e) Thanks [@roninjin10](https://github.com/roninjin10)! - Updated dev dependencies related to testing that is causing audit tooling to report failures
-
-## 0.16.1
-
-### Patch Changes
-
-- [#7244](https://github.com/ethereum-optimism/optimism/pull/7244) [`2440f5e7a`](https://github.com/ethereum-optimism/optimism/commit/2440f5e7ab6577f2d2e9c8b0c78c014290dde8e7) Thanks [@nitaliano](https://github.com/nitaliano)! - bumps sdk version to have access to sepolia deployments
-
-## 0.16.0
-
-### Minor Changes
-
-- [#6206](https://github.com/ethereum-optimism/optimism/pull/6206) [`72d184854`](https://github.com/ethereum-optimism/optimism/commit/72d184854ebad8b2025641f126ed76573b1f0ac3) Thanks [@tynes](https://github.com/tynes)! - Migrate contracts periphery into bedrock
-
-### Patch Changes
-
-- [#6164](https://github.com/ethereum-optimism/optimism/pull/6164) [`c11039060`](https://github.com/ethereum-optimism/optimism/commit/c11039060bc037a88916c2cba602687b6d69ad1a) Thanks [@pengin7384](https://github.com/pengin7384)! - fix typo
-
-- [#6198](https://github.com/ethereum-optimism/optimism/pull/6198) [`77da6edc6`](https://github.com/ethereum-optimism/optimism/commit/77da6edc643e0b5e39f7b6bb41c3c7ead418a876) Thanks [@tremarkley](https://github.com/tremarkley)! - Delete dead typescript https://github.com/ethereum-optimism/optimism/pull/6148.
-
-## 0.15.0
-
-### Minor Changes
-
-- af292562f: Fix issue with deposits running out of gas
-
-### Patch Changes
-
-- Updated dependencies [8d7dcc70c]
-- Updated dependencies [d6388be4a]
-  - @eth-optimism/core-utils@0.12.1
-
-## 0.14.0
-
-### Minor Changes
-
-- 197884eae: Bump XDM semver after #5444
-- 6eb05430d: Increase precision in `SafeCall.hasMinGas`
-- 5063a69fb: Update sdk contract addresses for bedrock
-
-### Patch Changes
-
-- f1e867177: contracts-bedrock was exporting hardhat when it didn't need to be
-
-## 0.13.2
-
-### Patch Changes
-
-- b16067a9f: Reduce the time that the system dictator deploy scripts wait before checking the chain state.
-- 9a02079eb: Makes the Proxy contract inheritable by making functions (public virtual).
-- 98fbe9d22: Added a contsructor to the System Dictator
-
-## 0.13.1
-
-### Patch Changes
-
-- 22c3885f5: Optionally print cast commands during migration
-- f52c07529: Print tenderly simulation links during deployment
-
-## 0.13.0
-
-### Minor Changes
-
-- cb19e2f9c: Moves `FINALIZATION_PERIOD_SECONDS` from the `OptimismPortal` to the `L2OutputOracle` & ensures the `CHALLENGER` key cannot delete finalized outputs.
-
-## 0.12.1
-
-### Patch Changes
-
-- 80f2271f5: Update foundry
-
-## 0.12.0
-
-### Minor Changes
-
-- efc98d261: Change the `relayMessage` reentrancy guard in the XDMs to be per-message.
-
-### Patch Changes
-
-- 7c0a2cc37: add is IERC165 to IOptimismMintableERC20
-- 2865dd9b4: Minor comment updates and cleanup to the SystemConfig contract.
-- 388f2c25a: Trigger a release including CrossDomainOwnable3
-
-## 0.11.4
-
-### Patch Changes
-
-- 3c22333b8: Loosens the requirements for re-proving a withdrawal transaction in the `OptimismPortal`
-
-## 0.11.3
-
-### Patch Changes
-
-- 4964be480: Added a test for large deposit gaps
-
-## 0.11.2
-
-### Patch Changes
-
-- 8784bc0bc: Add invariant test for the L1 XDM's `relayMessage` minimum gas limits.
-
-## 0.11.1
-
-### Patch Changes
-
-- fe80a9488: Add echidna tests for portal
-- 827fc7b04: Adds a go package to generate fuzz inputs for the Bedrock contract tests.
-- a2166dcad: Add echidna tests for metering
-- ff09ec22d: Add echidna tests for hashing
-- 85dfa9fe2: Add echidna tests for encoding
-- 0f8fc58ad: Add echidna tests for Burn
-- 89f70c591: Add tests for the `Bytes` library
-- 03940c3cb: Make lint check and fix scripts match
-
-## 0.11.0
-
-### Minor Changes
-
-- 4d13f0afe: Refactors the MerkleTrie get function to throw explicitly instead of returning an existence boolean
-
-### Patch Changes
-
-- 43f33f39f: Add echidna test commands
-- 237a351f1: Add tests to the SystemConfig contract
-- 1d3c749a2: Bumps the version of ts-node used
-- 1594678e0: Add echidna test for AliasHelper
-- 1d3c749a2: Updates the version of TypeScript
-- 136ea1785: Refactors the L2OutputOracle to key the l2Outputs mapping by index instead of by L2 block number.
-- 7300a7ca7: Document test function naming convention and create a script for checking.
-- Updated dependencies [c975c9620]
-- Updated dependencies [136ea1785]
-  - @eth-optimism/core-utils@0.12.0
-
-## 0.10.0
-
-### Minor Changes
-
-- 59adcaa09: Deleted Unused Variables fundAccount , impersonatedTx
-- 1bfe79f20: Adds an implementation of the Two Step Withdrawals V2 proposal
-
-### Patch Changes
-
-- c025a1153: Fixes a severe vulnerability found in ToB's November 2022 audit of the Bedrock contracts
-- f8697a607: Removes historicalTotalBlocks from the L2OutputOracle
-- c71500a7e: Updates L2OutputOracle to easily delete multiple outputs at once
-- f49b71d50: Updated forge-std version
-- ccaf5bc83: Allows owner and proposer addresses to be the same in L2OutputOracle
-
-## 0.9.1
-
-### Patch Changes
-
-- 52079cc12: Has ProxyAdmin use Ownable instead of Owned
-- 13bfafb21: Tweaks variable ordering in OptimismPortal
-- eeae96941: Removes the unused DeployConfig contract
-- 427831d86: Add comments to SystemConfig.sol
-
-## 0.9.0
-
-### Minor Changes
-
-- 87702c741: Use SCREAMING_SNAKE_CASE for immutables
-
-### Patch Changes
-
-- c02831144: Introduces layout lock and more storage layout verification
-- d58b0a397: Cleans up remaining lint warnings
-- ff860ecf3: Introduces the MigrationSystemDictator for the Bedrock migration
-- cc5adbc61: Updates function ordering in ProxyAdmin to match original contract
-- 31c91ea74: Adds another assertion in the CrossDomainMessenger to explicitly identify an invariant which was previously implicit.
-- Updated dependencies [1e76cdb86]
-  - @eth-optimism/core-utils@0.11.0
-
-## 0.8.3
-
-### Patch Changes
-
-- db84317b: Various RLP updates
-- 9b90c732: Added codecov badge to readme
-
-## 0.8.2
-
-### Patch Changes
-
-- 7d7d9ba8: Moves initializers underneath constructors always
-
-## 0.8.1
-
-### Patch Changes
-
-- 35a7bb5e: Use uint64 for arithmetic in XDM's baseGas
-- a5e715c3: Rename the event emitted in the L2ToL1MessagePasser
-- d18b8aa3: Removes an unnecessary initializer parameter in the L200
-
-## 0.8.0
-
-### Minor Changes
-
-- 3d4e8529: No refunds!
-
-### Patch Changes
-
-- 6ed68fa3: Fixes a small bug in the constructor of the L2OutputOracle contract
-- caf5dd3e: Updates README to include versioning rules.
-- a6cbfee2: Fuzz L2ToL1MessagePasser
-- 394a26ec: Modifies the StandardBridge to move a value check deeper down the call stack to be more defensive.
-
-## 0.7.0
-
-### Minor Changes
-
-- e2faaa8b: Moves the L2ToL1MessagePasser to a new address and puts a LegacyMessagePasser at the old address.
-
-### Patch Changes
-
-- cb5fed67: Clarify intent with mintable token interfaces
-- c427f0c0: Fixes to natspec docs
-- d28ad592: Tweaks storage spacers to standardize names and use original types
-- 76c8ee2d: Fix event names orderings for `OptimismMintableERC20Created`
-
-## 0.6.3
-
-### Patch Changes
-
-- 88dde7c8: Uses assert rather than a require statements to check for conditions we believe are unreachable.This is more semantically explicit, and should enable us to more effectively use some advanced analysis methods in our testing.
-- 7215f4ce: Bump ethers to 5.7.0 globally
-- 249a8ed6: Fixed a backwards compatibility issue in which incorrect events were emitted during a failed deposit finalization on the L2 bridge.
-- 7d7c4fdf: Makes spacers private and updates names to reflect slot, offset, and length.
-- e164e22e: Makes finalizeWithdrawalTransaction not payable because it doesn't need to be and it was causing confusion throughout the codebase.
-- 0bc1be45: Make the use of storage gaps consistent across contracts
-- af3e56b1: Fix to Ensure the Oracle's owner and proposer accounts are unique
-- 206f6033: Fix outdated references to 'withdrawal contract'
-- 88dde7c8: Use assert statements for unreachable conditions.
-- 8790156c: Simplifies the initialization function of the CrossDomainMessenger in Bedrock
-- 515685f4: Update comments on GovernanceToken to match Seaport style.
-- Updated dependencies [7215f4ce]
-- Updated dependencies [206f6033]
-  - @eth-optimism/core-utils@0.10.1
-
-## 0.6.2
-
-### Patch Changes
-
-- 651a2883: Make spacer variables private in the Bridge and Messenger contracts so that they cannot be accessed in child contracts.
-
-## 0.6.1
-
-### Patch Changes
-
-- 85232179: Add CrossDomainOwnable contracts
-- 593f1cfb: Removes the blockedSystemMessages mapping in favor of a simpler approach to preventing messages from being sent to internal system addresses.
-- f78eb056: Prevents v0 (legacy) messages from being relayed in the bedrock XDM.
-
-## 0.6.0
-
-### Minor Changes
-
-- 7fdc490c: Removes initializer from StandardBridge in favor of immutables
-- 3d228a0e: Updates the storage layout for the CrossDomainMessenger base contract to reduce diff with the existing system.
-
-### Patch Changes
-
-- 63ef1949: Delete hardhat genesis tasks
-- Updated dependencies [dbfea116]
-  - @eth-optimism/core-utils@0.10.0
-
-## 0.5.4
-
-### Patch Changes
-
-- a095d544: Include latest devnet deployment artifacts
-- cdf2163e: Bump oz packages to latest release
-- 791f30bc: Migrate deploy config to json from ts
-- 193befed: Fix nonce issue for parallel deployments
-- 02420db0: Add missing predeploy to Predeploys.sol
-- 94a8f287: Moves forge-std and ds-test to devDependencies to avoid breaking npm
-- 7d03c5c0: Update the L2 genesis hardhat task to use the ProxyAdmin's deployed address as the admin of each predeploy
-- fec22bfe: Fix legibility in the L2CrossDomainMessengerInitializer
-- 9272253e: Make a library call internal
-- c025f418: Add additional deployments of address manager and proxy admin
-- 329d21b6: Use safecall that doesn't copy calldata
-- 35eafed0: Deletes the L2 genesis creation hardhat task as its now replaced by go code
-- 3cde9205: Update @foundry-rs/hardhat-forge to 0.1.17
-
-## 0.5.3
-
-### Patch Changes
-
-- 056cb982: Fix slither script
-- a32e68ac: Update genesis-l2 task to set immutables in the bytecode
-- c648d55c: Fix build for smaller package
-- d544f804: Use the same initializable across codebase
-- ccbfe545: Update @foundry-rs/hardhat-forge@0.1.16
-- c97ad241: Fix build on latest foundry
-- 45541553: Emit an extra event when withdrawals are initiated to make chainops easier
-- 3dd296e8: Fix portal deployment to have L2OutputOracle proxy address
-- fe94b864: Add watch task
-- 28649d64: Add harhdat forge contract verification support
-- 898c7ac5: Update hardhat-forge dep, remove dead deps
-- 51a1595b: bedrock-goerli-96f44f79 deployment
-- 8ae39154: Update deposit transaction type
-- af96563a: Fix typechain exports
-- dac4a9f0: Updates the SDK to be compatible with Bedrock (via the "bedrock: true" constructor param). Updates the build pipeline for contracts-bedrock to export a properly formatted dist folder that matches our other packages.
-- Updated dependencies [0df744f6]
-- Updated dependencies [8ae39154]
-- Updated dependencies [dac4a9f0]
-  - @eth-optimism/core-utils@0.9.3
-
-## 0.5.2
-
-### Patch Changes
-
-- 1a22e822: Standardizes revert strings globally
-- 5e113137: Fixes a bug in the L2 Bedrock genesis script
-- 177a9ea8: Cleans linting errors in MerkleTrie.sol
-- 7d68f82f: Adds a new event SentMessageExtension1 to the CrossDomainMessenger contract. Includes additional data that's being attached to messages sent after the Bedrock upgrade.
-- 90630336: Properly generates and exports ABI and artifact files that can be imported by client libraries
-- 8bd7abde: Moves various legacy contracts into the legacy folder
-- 7e6eb9b2: The output oracle's getL2Output function now reverts when no output is returned
-- f243dacf: Bump to use solidity 0.8.15
-- 8d26459b: Remove subversion byte from deposit tx
-- fa9823f3: Naming improvements for functions and variables in the L2OutputOracle
-- 0bf3b9b4: Update forge-std
-- e764cbb7: Shortens library names
-- 3a0271f8: Introduces Types.sol
-- 5de373ea: Semver contract updated to include a getter for the full version string
-- Updated dependencies [0bf3b9b4]
-- Updated dependencies [8d26459b]
-- Updated dependencies [4477fe9f]
-  - @eth-optimism/core-utils@0.9.2
-
-## 0.5.1
-
-### Patch Changes
-
-- e4693481: Clean up BytesUtils
-- b7b77d6c: Updates CrossDomainMessenger.baseGas to more accurately reflect gas costs
-- 9d435aec: Cleans up natspec in MerkleTrie and SecureMerkleTrie contracts
-- 87f745b5: Cleans up various compiler warnings
-- 8a3074ab: Minor cleanups to initialization and semver for L1 contracts
-- e1501bc0: Clears most contract linting warnings
-
-## 0.5.0
-
-### Minor Changes
-
-- 42a4cc30: Remove Lib* and OVM* prefixes from all contracts
-
-### Patch Changes
-
-- 0cb3929e: Move encoding and hashing into Encoding and Hashing libraries
-- 28bd76ae: Cleans up hashing and encoding library natspec and function names
-- 4279647f: Port RLPWriter tests
-- ce6cb121: Use external version of ExcessivelySafeCall
-- 8986f165: Fix solc warnings in ProxyAdmin
-- 69ee689f: Remove unnecessary DefaultValues library
-- 2e89f634: Fixes a bug that caused L2 timestamps to be computed incorrectly
-- 49d33b08: Standardizes comments, errors, and events for contracts in the /universal package
-- 821907e2: Bump typechain to 8.1.0
-- 91b31168: Clean up comments and errors for legacy contracts
-- 3c5726d4: Cleaned up enums, should be CapitalCase enums and UPPER_CASE values
-- eb11a5bb: Add comments to RLP libraries
-- 092b0901: Update to new L2 tx hash style for deposits
-- 4ea33e13: Standardizes initialization logic for L1 contracts
-- 297af083: Move contracts written by external parties into a vendor folder
-- 71800503: Reduce the number of compiler warnings
-- 611d93a1: Remove storage slot buffer in xdomain messengers
-- 75089d0a: Cleans up initialization logic everywhere
-- b9a90f32: Rename OptimismMintableTokenFactory to OptimismMintableERC20Factory
-- 50e20ea1: Fix initialization logic
-- 6f74ca9f: Clean up the PredeployAddresses library
-- c031ec95: Tests for RLPReader
-- 9c8b1f00: Bump forge-std to 62caef29b0f87a2c6aaaf634b2ca4c09b6867c92
-- 89d01f2e: Add semver to L2 contracts
-- 7d9820b6: Resolve compiler warnings in Proxy.sol
-- f9fee446: Move the `DepositTx` type to `core-utils`. This way it can be more easily used across projects
-- 5050e0fb: Remove "not implemented" errors in virtual functions
-- 78d7c2ec: Update typechain pipeline
-- 89d01f2e: Update dev deps
-- Updated dependencies [f9fee446]
-  - @eth-optimism/core-utils@0.9.1
-
-## 0.4.1
-
-### Patch Changes
-
-- 5c3b4bfa: Enable hardhat style buildinfo
-- ef29d8a5: Make the Portal upgradeable
-- 5bb6f2c7: Add `OptimismPortal.isOutputFinalized`
-- 79f31007: correct l33t sp34k in toCodeAddrr
-- 5a12c635: Add deployer docker image
-- 8460865f: Optimize buildinfo support, only build through hardhat interface
-
-## 0.4.0
-
-### Minor Changes
-
-- a828da9f: Add separate sequencer role to Oracle
-
-### Patch Changes
-
-- a828da9f: Separate the owner and sequencer roles in the OutputOracle
-- 347fd37c: Fix bug in bedrock deploy scripts
-- 700dcbb0: Add genesis script
-- 931e517b: Fix order of args to L2OO constructor
-- 93e2f750: Fix for incorrect constructor args in deploy config
-- ddf515cb: Make the output oracle upgradeable.
-- Updated dependencies [700dcbb0]
-  - @eth-optimism/core-utils@0.9.0
-
-## 0.3.0
-
-### Minor Changes
-
-- 35757456: Replaces L2 timestamps with block numbers as the key in mapping(uint => OutputProposal).
-
-### Patch Changes
-
-- f23bae0b: bedrock: ProxyAdmin rename OpenZeppelin proxy to ERC1967
-- fadb1a93: OZ Audit fixes with a Low or informational severity:
-
-  - Hardcode constant values
-  - Require that msg.value == \_amount on ETH withdrawals
-  - use \_from in place of msg.sender when applicable in internal functions
-
-- f23bae0b: bedrock: Simplify ProxyAdmin static calls
-- 650ca6d4: Fixes to medium severity OZ findings
-
-  - Disallow reentrant withdrawals
-  - remove donateEth
-  - Correct ordering of \_from and \_to arguments on refunds of failed deposits
-
-- 9aa8049c: Have contracts-bedrock properly include contract sources in npm package
-
-## 0.2.0
-
-### Minor Changes
-
-- 04884132: Corrects the ordering of token addresses when a finalizeBridgeERC20 call fails
-
-### Patch Changes
-
-- 0a5ca8bf: Deployment for bedrock contracts on goerli
-- 2f3fae0e: Fix hh artifact schema
-- a96cbe7c: Fix style for L2 contracts to match L1 contracts
-- 29ff7462: Revert es target back to 2017
-- 14dd80f3: Add proxy contract
-- Updated dependencies [29ff7462]
-  - @eth-optimism/core-utils@0.8.7
-
-## 0.1.3
-
-### Patch Changes
-
-- c258acd4: Update comments and style for L1 contracts
-
-## 0.1.2
-
-### Patch Changes
-
-- 07a84aed: Move core-utils to deps instead of devdeps
-
-## 0.1.1
-
-### Patch Changes
-
-- 1aca58c4: Initial release

From 4c015e3a36f8910e2cf8b447d62ab4c44b944cca Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Mon, 28 Oct 2024 15:12:10 +0100
Subject: [PATCH 054/451] put deploy scripts in deploy folder (#12694)

---
 .../scripts/{utils => deploy}/BaseDeployIO.sol              | 0
 packages/contracts-bedrock/scripts/deploy/Deploy.s.sol      | 4 ++--
 .../scripts/{ => deploy}/DeployAuthSystem.s.sol             | 0
 .../scripts/{ => deploy}/DeployImplementations.s.sol        | 2 +-
 .../scripts/{ => deploy}/DeployOPChain.s.sol                | 2 +-
 .../scripts/{ => deploy}/DeploySuperchain.s.sol             | 2 +-
 packages/contracts-bedrock/test/L1/OPContractsManager.t.sol | 2 +-
 packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol | 2 +-
 .../contracts-bedrock/test/opcm/DeployImplementations.t.sol | 2 +-
 packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol    | 6 +++---
 packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/contracts-bedrock/scripts/{utils => deploy}/BaseDeployIO.sol (100%)
 rename packages/contracts-bedrock/scripts/{ => deploy}/DeployAuthSystem.s.sol (100%)
 rename packages/contracts-bedrock/scripts/{ => deploy}/DeployImplementations.s.sol (99%)
 rename packages/contracts-bedrock/scripts/{ => deploy}/DeployOPChain.s.sol (99%)
 rename packages/contracts-bedrock/scripts/{ => deploy}/DeploySuperchain.s.sol (99%)

diff --git a/packages/contracts-bedrock/scripts/utils/BaseDeployIO.sol b/packages/contracts-bedrock/scripts/deploy/BaseDeployIO.sol
similarity index 100%
rename from packages/contracts-bedrock/scripts/utils/BaseDeployIO.sol
rename to packages/contracts-bedrock/scripts/deploy/BaseDeployIO.sol
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index e68938392ee3..2931ebba1a38 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -16,13 +16,13 @@ import { LibStateDiff } from "scripts/libraries/LibStateDiff.sol";
 import { Process } from "scripts/libraries/Process.sol";
 import { ChainAssertions } from "scripts/deploy/ChainAssertions.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
-import { DeploySuperchainInput, DeploySuperchain, DeploySuperchainOutput } from "scripts/DeploySuperchain.s.sol";
+import { DeploySuperchainInput, DeploySuperchain, DeploySuperchainOutput } from "scripts/deploy/DeploySuperchain.s.sol";
 import {
     DeployImplementationsInput,
     DeployImplementations,
     DeployImplementationsInterop,
     DeployImplementationsOutput
-} from "scripts/DeployImplementations.s.sol";
+} from "scripts/deploy/DeployImplementations.s.sol";
 
 // Contracts
 import { StorageSetter } from "src/universal/StorageSetter.sol";
diff --git a/packages/contracts-bedrock/scripts/DeployAuthSystem.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployAuthSystem.s.sol
similarity index 100%
rename from packages/contracts-bedrock/scripts/DeployAuthSystem.s.sol
rename to packages/contracts-bedrock/scripts/deploy/DeployAuthSystem.s.sol
diff --git a/packages/contracts-bedrock/scripts/DeployImplementations.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
similarity index 99%
rename from packages/contracts-bedrock/scripts/DeployImplementations.s.sol
rename to packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
index af5f75e6125c..c9048a07dfa3 100644
--- a/packages/contracts-bedrock/scripts/DeployImplementations.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
@@ -39,7 +39,7 @@ import { Blueprint } from "src/libraries/Blueprint.sol";
 
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
-import { BaseDeployIO } from "scripts/utils/BaseDeployIO.sol";
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 
 // See DeploySuperchain.s.sol for detailed comments on the script architecture used here.
 contract DeployImplementationsInput is BaseDeployIO {
diff --git a/packages/contracts-bedrock/scripts/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
similarity index 99%
rename from packages/contracts-bedrock/scripts/DeployOPChain.s.sol
rename to packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
index a48d46348f7e..bc83402045d0 100644
--- a/packages/contracts-bedrock/scripts/DeployOPChain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
@@ -7,7 +7,7 @@ import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
-import { BaseDeployIO } from "scripts/utils/BaseDeployIO.sol";
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
diff --git a/packages/contracts-bedrock/scripts/DeploySuperchain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
similarity index 99%
rename from packages/contracts-bedrock/scripts/DeploySuperchain.s.sol
rename to packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
index 38c87f623443..74492556e1b1 100644
--- a/packages/contracts-bedrock/scripts/DeploySuperchain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
@@ -11,7 +11,7 @@ import { IProxy } from "src/universal/interfaces/IProxy.sol";
 
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
-import { BaseDeployIO } from "scripts/utils/BaseDeployIO.sol";
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 
 // This comment block defines the requirements and rationale for the architecture used in this forge
 // script, along with other scripts that are being written as new Superchain-first deploy scripts to
diff --git a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
index fb008d4aa8d0..5b2260fce992 100644
--- a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
+++ b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { Test, stdStorage, StdStorage } from "forge-std/Test.sol";
 
-import { DeployOPChainInput } from "scripts/DeployOPChain.s.sol";
+import { DeployOPChainInput } from "scripts/deploy/DeployOPChain.s.sol";
 import { DeployOPChain_TestBase } from "test/opcm/DeployOPChain.t.sol";
 
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
diff --git a/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol b/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
index 19985ef490b9..58912409a09c 100644
--- a/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
@@ -5,7 +5,7 @@ import { Test, stdStorage, StdStorage } from "forge-std/Test.sol";
 import { stdToml } from "forge-std/StdToml.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
 
-import { DeployAuthSystemInput, DeployAuthSystem, DeployAuthSystemOutput } from "scripts/DeployAuthSystem.s.sol";
+import { DeployAuthSystemInput, DeployAuthSystem, DeployAuthSystemOutput } from "scripts/deploy/DeployAuthSystem.s.sol";
 
 contract DeployAuthSystemInput_Test is Test {
     DeployAuthSystemInput dasi;
diff --git a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
index 490d764698ca..d01ef6a387b2 100644
--- a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
@@ -26,7 +26,7 @@ import {
     DeployImplementations,
     DeployImplementationsInterop,
     DeployImplementationsOutput
-} from "scripts/DeployImplementations.s.sol";
+} from "scripts/deploy/DeployImplementations.s.sol";
 
 contract DeployImplementationsInput_Test is Test {
     DeployImplementationsInput dii;
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
index b218010fa37e..edfe4574bc7c 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
@@ -3,14 +3,14 @@ pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 
-import { DeploySuperchainInput, DeploySuperchain, DeploySuperchainOutput } from "scripts/DeploySuperchain.s.sol";
+import { DeploySuperchainInput, DeploySuperchain, DeploySuperchainOutput } from "scripts/deploy/DeploySuperchain.s.sol";
 import {
     DeployImplementationsInput,
     DeployImplementations,
     DeployImplementationsInterop,
     DeployImplementationsOutput
-} from "scripts/DeployImplementations.s.sol";
-import { DeployOPChainInput, DeployOPChain, DeployOPChainOutput } from "scripts/DeployOPChain.s.sol";
+} from "scripts/deploy/DeployImplementations.s.sol";
+import { DeployOPChainInput, DeployOPChain, DeployOPChainOutput } from "scripts/deploy/DeployOPChain.s.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
diff --git a/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol b/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
index 8641772a74d9..15e24f470f1c 100644
--- a/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
@@ -8,7 +8,7 @@ import { ProxyAdmin } from "src/universal/ProxyAdmin.sol";
 import { Proxy } from "src/universal/Proxy.sol";
 import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
 import { IProtocolVersions, ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
-import { DeploySuperchainInput, DeploySuperchain, DeploySuperchainOutput } from "scripts/DeploySuperchain.s.sol";
+import { DeploySuperchainInput, DeploySuperchain, DeploySuperchainOutput } from "scripts/deploy/DeploySuperchain.s.sol";
 
 contract DeploySuperchainInput_Test is Test {
     DeploySuperchainInput dsi;

From 03bb1bccc03d35ab5d879381ba93293ed21a00bb Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Mon, 28 Oct 2024 15:12:52 +0100
Subject: [PATCH 055/451] rename LibStateDiff to StateDiff (#12696)

---
 packages/contracts-bedrock/scripts/deploy/Deploy.s.sol        | 4 ++--
 .../scripts/libraries/{LibStateDiff.sol => StateDiff.sol}     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/contracts-bedrock/scripts/libraries/{LibStateDiff.sol => StateDiff.sol} (99%)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 2931ebba1a38..d40c03987d53 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -12,7 +12,7 @@ import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 import { Deployer } from "scripts/deploy/Deployer.sol";
 import { Chains } from "scripts/libraries/Chains.sol";
 import { Config } from "scripts/libraries/Config.sol";
-import { LibStateDiff } from "scripts/libraries/LibStateDiff.sol";
+import { StateDiff } from "scripts/libraries/StateDiff.sol";
 import { Process } from "scripts/libraries/Process.sol";
 import { ChainAssertions } from "scripts/deploy/ChainAssertions.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
@@ -128,7 +128,7 @@ contract Deploy is Deployer {
             accesses.length,
             vm.toString(block.chainid)
         );
-        string memory json = LibStateDiff.encodeAccountAccesses(accesses);
+        string memory json = StateDiff.encodeAccountAccesses(accesses);
         string memory statediffPath =
             string.concat(vm.projectRoot(), "/snapshots/state-diff/", vm.toString(block.chainid), ".json");
         vm.writeJson({ json: json, path: statediffPath });
diff --git a/packages/contracts-bedrock/scripts/libraries/LibStateDiff.sol b/packages/contracts-bedrock/scripts/libraries/StateDiff.sol
similarity index 99%
rename from packages/contracts-bedrock/scripts/libraries/LibStateDiff.sol
rename to packages/contracts-bedrock/scripts/libraries/StateDiff.sol
index 2b6f38a9afa7..4b4cacab42f2 100644
--- a/packages/contracts-bedrock/scripts/libraries/LibStateDiff.sol
+++ b/packages/contracts-bedrock/scripts/libraries/StateDiff.sol
@@ -4,10 +4,10 @@ pragma solidity 0.8.15;
 import { stdJson } from "forge-std/StdJson.sol";
 import { VmSafe } from "forge-std/Vm.sol";
 
-/// @title LibStateDiff
+/// @title StateDiff
 /// @author refcell
 /// @notice Library to write StateDiff output to json.
-library LibStateDiff {
+library StateDiff {
     /// @notice Accepts an array of AccountAccess structs from the Vm and encodes them as a json string.
     /// @param _accountAccesses Array of AccountAccess structs.
     /// @return serialized_ string

From 5f1851c15cb87fc467986ac6fdd8f323f96e88c0 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 28 Oct 2024 09:56:53 -0600
Subject: [PATCH 056/451] chore: Remove obsolete build files (#12700)

* chore: Remove obsolete cloudbuild file

* Remove coderabbit

* remove snyk
---
 .coderabbit.yml | 24 ------------------------
 .snyk           |  3 ---
 cloudbuild.yaml | 12 ------------
 3 files changed, 39 deletions(-)
 delete mode 100644 .coderabbit.yml
 delete mode 100644 .snyk
 delete mode 100644 cloudbuild.yaml

diff --git a/.coderabbit.yml b/.coderabbit.yml
deleted file mode 100644
index f54403cf1571..000000000000
--- a/.coderabbit.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-language: "en"
-early_access: false
-reviews:
-  high_level_summary: false
-  poem: false
-  review_status: false
-  collapse_walkthrough: true
-  path_filters:
-    - "!**/*.json"
-  path_instructions:
-    - path: "**.sol"
-      instructions: "Focus on the following areas:
-        - Security
-        - Identifying test cases which are lacking
-        - Removing unnecessary code
-      "
-  auto_review:
-    enabled: false
-    drafts: false
-    base_branches:
-      - "develop"
-      - "feat/*"
-chat:
-  auto_reply: true
diff --git a/.snyk b/.snyk
deleted file mode 100644
index 1558a7a82432..000000000000
--- a/.snyk
+++ /dev/null
@@ -1,3 +0,0 @@
-exclude:
-  global:
-    - infra/op-replica/**  # snyk does not respect kustomizations, so not useful here
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
deleted file mode 100644
index 2cf6dfb333bb..000000000000
--- a/cloudbuild.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-steps:
-  - name: 'gcr.io/kaniko-project/executor:latest'
-    args:
-      - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/deployer-bedrock:$_TAG
-      - --destination=us-central1-docker.pkg.dev/$PROJECT_ID/images/deployer-bedrock:$COMMIT_SHA
-      - --dockerfile=./ops/docker/Dockerfile.packages
-      - --target=deployer-bedrock
-      - --cache=true
-      - --cache-ttl=48h
-    waitFor: ['-']
-options:
-  machineType: N1_HIGHCPU_32

From 0cb0cd6f44ed4fb5b8cc312c8e4981b03788bb42 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 28 Oct 2024 09:58:00 -0600
Subject: [PATCH 057/451] ci: Remove hosted semgrep (#12701)

We're not getting a lot of value from hosted Semgrep. This PR removes that in favor of just adding rules to the `semgrep/` directory so they can be run locally in CI.
---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0789a504ef6..4db56cb4d3d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1314,7 +1314,6 @@ workflows:
       - contracts-bedrock-validate-spacers:
           requires:
             - contracts-bedrock-build
-      - semgrep-scan
       - semgrep-scan:
           name: semgrep-scan-local
           scan_command: semgrep scan --timeout=100 --config=./semgrep --error .

From 788b2708d2aaee1639c716b636e848377661649f Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 28 Oct 2024 09:36:17 -0700
Subject: [PATCH 058/451] cannon: Detect input/output codec mismatch before
 trace execution (#12676)

* cannon: Check --input and --output file formats in CLI

* cannon: Allow only binary state outputs in run cli

* golang lint
---
 cannon/cmd/run.go | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/cannon/cmd/run.go b/cannon/cmd/run.go
index 19352bad7d59..1a85158854b3 100644
--- a/cannon/cmd/run.go
+++ b/cannon/cmd/run.go
@@ -29,16 +29,16 @@ import (
 var (
 	RunInputFlag = &cli.PathFlag{
 		Name:      "input",
-		Usage:     "path of input JSON state. Stdin if left empty.",
+		Usage:     "path of input binary state. Stdin if left empty.",
 		TakesFile: true,
-		Value:     "state.json",
+		Value:     "state.bin.gz",
 		Required:  true,
 	}
 	RunOutputFlag = &cli.PathFlag{
 		Name:      "output",
-		Usage:     "path of output JSON state. Not written if empty, use - to write to Stdout.",
+		Usage:     "path of output binary state. Not written if empty, use - to write to Stdout.",
 		TakesFile: true,
-		Value:     "out.json",
+		Value:     "out.bin.gz",
 		Required:  false,
 	}
 	patternHelp    = "'never' (default), 'always', '=123' at exactly step 123, '%123' for every 123 steps"
@@ -63,7 +63,7 @@ var (
 	RunSnapshotFmtFlag = &cli.StringFlag{
 		Name:     "snapshot-fmt",
 		Usage:    "format for snapshot output file names.",
-		Value:    "state-%d.json",
+		Value:    "state-%d.bin.gz",
 		Required: false,
 	}
 	RunStopAtFlag = &cli.GenericFlag{
@@ -279,6 +279,9 @@ func Run(ctx *cli.Context) error {
 	if ctx.Bool(RunPProfCPU.Name) {
 		defer profile.Start(profile.NoShutdownHook, profile.ProfilePath("."), profile.CPUProfile).Stop()
 	}
+	if err := checkFlags(ctx); err != nil {
+		return err
+	}
 
 	guestLogger := Logger(os.Stderr, log.LevelInfo)
 	outLog := &mipsevm.LoggingWriter{Log: guestLogger.With("module", "guest", "stream", "stdout")}
@@ -524,3 +527,17 @@ func CreateRunCommand(action cli.ActionFunc) *cli.Command {
 }
 
 var RunCommand = CreateRunCommand(Run)
+
+func checkFlags(ctx *cli.Context) error {
+	if output := ctx.Path(RunOutputFlag.Name); output != "" {
+		if !serialize.IsBinaryFile(output) {
+			return errors.New("invalid --output file format. Only binary file formats (ending in .bin or bin.gz) are supported")
+		}
+	}
+	if snapshotFmt := ctx.String(RunSnapshotFmtFlag.Name); snapshotFmt != "" {
+		if !serialize.IsBinaryFile(fmt.Sprintf(snapshotFmt, 0)) {
+			return errors.New("invalid --snapshot-fmt file format. Only binary file formats (ending in .bin or bin.gz) are supported")
+		}
+	}
+	return nil
+}

From 2cf297da0b87426df95d52e84a62ba7b48363a61 Mon Sep 17 00:00:00 2001
From: Tyler Smith <mail@tcry.pt>
Date: Mon, 28 Oct 2024 23:57:29 +0700
Subject: [PATCH 059/451] op-supervisor: Cross safe updates cycle detection +
 tests (#12530)

* op-supervisor: experimental cross-safety, with hazard detection

* tweak: Add some errors/error returns in backend/cross.

* wip: Chain index <> ID mapping.

* fix: Check parent instead of re-checking hazardBlock.

* Remove Hazard Work

* Write missing DB Bindings OpenBlock, LocallyDerivedFrom, CrossDerivedFrom

* Configurable WorkFn for Workers

* op-supervisor: move chain-index <> chain ID translation into dependency set, fix some interfaces

* op-supervisor: update cross-safety worker routine

* op-supervisor: update more error handling

* op-supervisor: move errors to types package

* op-supervisor: check CanExecuteAt and CanInitiateAt

* op-supervisor: determine cross-safe candidate and L1 scope, and more fixes

* todo L1 scope increment

* op-supervisor: cross-safe L1 scope bump

* op-supervisor: dependency set getter

* op-supervisor: L1 scope increment fix

* op-supervisor: fix cross-safe updates typing

* op-node: signal L1 traversal of derivation to supervisor

* op-supervisor: fromda fixes and tests

* op-supervisor: fix OpenBlock, fix/add missing interface methods, hook up cross-safe worker routines

* OpenBlock to return map[uint32]ExecutingMessage

* Add Frontier Unit Tests

* fix WithParent panic

* op-node: register L1 traversal with op-supervisor

* op-node,op-supervisor: add logging, temp work around for interop local-safe updates

* Add safe_start_test, unsafe_start_test

* Add safe_update_test and unsafe_update_test

* add worker_test

* op-supervisor: fix cross-safe L1 scope bumping

* op-supervisor: fix logs DB test

* Add cycle.go and initial unit tests.

* fix: Use new execMsg log index info to complete graph.

* debug: Add helper to write out Mermaid of our graph.

* tests: Add more cycle tests.

* tests: Organize cycle tests.

* tests: Add NoCycle test.

* fix: Add edges between basic logs.

* tests: More comprehensive NoCycle tests.

* tests: Make tests not use index-0 exec msgs for now.

* fix: Disallow self-referencing messages.

* fix: Safely handle unknown chains.

* tests,fix: Remove unintended self-reference.

* tests,fix: Remove unintended self-reference.

* tests: Add test for the first log being exec.

* refactor: Create ErrFailedToOpenBlock for error.

* tests,refactor: Use table-driven tests to make it easier to iterate test vectors.

* cleanup: Change some comments and make Mermaid debugging easier to disable.

* tests: Add permuations of 2-cycles involving adjacency and first logs.

* fix: When adding edges for execMsgs, remove node from inDegree0.

* refactor: Split graph build from checks; abstract adding edges.

This allows us to more easily test specifics of our cycle checking.

Errors can be in either part, and only being able to test the entirety
makes things a little difficult.

Abstracting edge creation helps eliminate bugs like 118aeb6b8.

* tests: Test execMsg to base log which is right after an execMsg to the first execMsg.

* tests: Cycle across timestamps should not return an error.

* fix: Don't consider cycles that depend on out-of-timestamp nodes.

We do this by first collecting every execMsg from all chains, filtering
out the out-of-timestamp nodes, and putting into a lookup map.

When creating edges, we check to see if the target node is
uninteresting.

* fix: Remove debug mermaid logging.

* cleanup: Remove stray text in comment.

* tweak: Make presence check more idiomatic; remove possible nil map access.

* docs: Improve comments in cycle detection code.

* cleanup: Reorganize cycle detection code.

* cleanup: Move public types to top.

* cleanup: Change some names for consistency.

* cleanup: Better comment in cycle detection.

* docs: Explain graph representation.

* tests: Re-organize HazardCycleChecks tests.

* docs: Better naming and docs in cycle.go.

* tests: Add large graph cycle detection tests.

* tests: Add nil hazard map test.

* refactor: Slightly tweak graph sort code to nest less; add comments.

* tweak: Make self referencial messages fail with an ErrConflict.

* tests: Add tests for both older/younger timestamps, and document that younger init msgs shouldn't occur.

* tests: Add tests for 2-cycle with 3 chains.

* tweak: Check that an exec msg's init msg exists.

* tests: tweak test to use index 0 instead of 1.

* cleanup: Remove unused function.

* op-e2e: fix interop mock backend action test

CI try 2

---------

Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
---
 .../supervisor/backend/cross/cycle.go         | 302 ++++++++++
 .../supervisor/backend/cross/cycle_test.go    | 556 ++++++++++++++++++
 2 files changed, 858 insertions(+)
 create mode 100644 op-supervisor/supervisor/backend/cross/cycle.go
 create mode 100644 op-supervisor/supervisor/backend/cross/cycle_test.go

diff --git a/op-supervisor/supervisor/backend/cross/cycle.go b/op-supervisor/supervisor/backend/cross/cycle.go
new file mode 100644
index 000000000000..a872bc75a860
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/cycle.go
@@ -0,0 +1,302 @@
+package cross
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+var (
+	ErrCycle                  = errors.New("cycle detected")
+	ErrExecMsgHasInvalidIndex = errors.New("executing message has invalid log index")
+	ErrExecMsgUnknownChain    = errors.New("executing message references unknown chain")
+)
+
+// CycleCheckDeps is an interface for checking cyclical dependencies between logs.
+type CycleCheckDeps interface {
+	// OpenBlock returns log data for the requested block, to be used for cycle checking.
+	OpenBlock(chainID types.ChainID, blockNum uint64) (seal types.BlockSeal, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
+}
+
+// node represents a log entry in the dependency graph.
+// It could be an initiating message, executing message, both, or neither.
+// It is uniquely identified by chain index and the log index within its parent block.
+type node struct {
+	chainIndex types.ChainIndex
+	logIndex   uint32
+}
+
+// graph is a directed graph of message dependencies.
+// It is represented as an adjacency list with in-degree counts to be friendly to cycle checking.
+type graph struct {
+	inDegree0     map[node]struct{}
+	inDegreeNon0  map[node]uint32
+	outgoingEdges map[node][]node
+}
+
+// addEdge adds a directed edge from -> to in the graph.
+func (g *graph) addEdge(from, to node) {
+	// Remove the target from inDegree0 if it's there
+	delete(g.inDegree0, to)
+
+	// Add or increment the target's in-degree count
+	g.inDegreeNon0[to] += 1
+
+	// Add the outgoing edge
+	g.outgoingEdges[from] = append(g.outgoingEdges[from], to)
+}
+
+// HazardCycleChecks checks for cyclical dependencies between logs at the given timestamp.
+// Here the timestamp invariant alone does not ensure ordering of messages.
+//
+// We perform this check in 3 steps:
+//   - Gather all logs across all hazard blocks at the given timestamp.
+//   - Build the logs into a directed graph of dependencies between logs.
+//   - Check the graph for cycles.
+//
+// The edges of the graph are determined by:
+//   - For all logs except the first in a block, there is an edge from the previous log.
+//   - For all executing messages, there is an edge from the initiating message.
+//
+// The edges between sequential logs ensure the graph is well-connected and free of any
+// disjoint subgraphs that would make cycle checking more difficult.
+//
+// The cycle check is performed by executing Kahn's topological sort algorithm which
+// succeeds if and only if a graph is acyclic.
+//
+// Returns nil if no cycles are found or ErrCycle if a cycle is detected.
+func HazardCycleChecks(d CycleCheckDeps, inTimestamp uint64, hazards map[types.ChainIndex]types.BlockSeal) error {
+	g, err := buildGraph(d, inTimestamp, hazards)
+	if err != nil {
+		return err
+	}
+
+	return checkGraph(g)
+}
+
+// gatherLogs collects all log counts and executing messages across all hazard blocks.
+// Returns:
+// - map of chain index to its log count
+// - map of chain index to map of log index to executing message (nil if doesn't exist or ignored)
+func gatherLogs(d CycleCheckDeps, inTimestamp uint64, hazards map[types.ChainIndex]types.BlockSeal) (
+	map[types.ChainIndex]uint32,
+	map[types.ChainIndex]map[uint32]*types.ExecutingMessage,
+	error,
+) {
+	logCounts := make(map[types.ChainIndex]uint32)
+	execMsgs := make(map[types.ChainIndex]map[uint32]*types.ExecutingMessage)
+
+	for hazardChainIndex, hazardBlock := range hazards {
+		// TODO(#11105): translate chain index to chain ID
+		hazardChainID := types.ChainIDFromUInt64(uint64(hazardChainIndex))
+		bl, logCount, msgs, err := d.OpenBlock(hazardChainID, hazardBlock.Number)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to open block: %w", err)
+		}
+		if bl != hazardBlock {
+			return nil, nil, fmt.Errorf("tried to open block %s of chain %s, but got different block %s than expected, use a reorg lock for consistency", hazardBlock, hazardChainID, bl)
+		}
+
+		// Validate executing message indices
+		for logIdx := range msgs {
+			if logIdx >= logCount {
+				return nil, nil, fmt.Errorf("%w: log index %d >= log count %d", ErrExecMsgHasInvalidIndex, logIdx, logCount)
+			}
+		}
+
+		// Store log count and in-timestamp executing messages
+		logCounts[hazardChainIndex] = logCount
+
+		if len(msgs) > 0 {
+			if _, exists := execMsgs[hazardChainIndex]; !exists {
+				execMsgs[hazardChainIndex] = make(map[uint32]*types.ExecutingMessage)
+			}
+		}
+		for logIdx, msg := range msgs {
+			if msg.Timestamp == inTimestamp {
+				execMsgs[hazardChainIndex][logIdx] = msg
+			}
+		}
+	}
+
+	return logCounts, execMsgs, nil
+}
+
+// buildGraph constructs a dependency graph from the hazard blocks.
+func buildGraph(d CycleCheckDeps, inTimestamp uint64, hazards map[types.ChainIndex]types.BlockSeal) (*graph, error) {
+	g := &graph{
+		inDegree0:     make(map[node]struct{}),
+		inDegreeNon0:  make(map[node]uint32),
+		outgoingEdges: make(map[node][]node),
+	}
+
+	logCounts, execMsgs, err := gatherLogs(d, inTimestamp, hazards)
+	if err != nil {
+		return nil, err
+	}
+
+	// Add nodes for each log in the block, and add edges between sequential logs
+	for hazardChainIndex, logCount := range logCounts {
+		for i := uint32(0); i < logCount; i++ {
+			k := node{
+				chainIndex: hazardChainIndex,
+				logIndex:   i,
+			}
+
+			if i == 0 {
+				// First log in block has no dependencies
+				g.inDegree0[k] = struct{}{}
+			} else {
+				// Add edge: prev log <> current log
+				prevKey := node{
+					chainIndex: hazardChainIndex,
+					logIndex:   i - 1,
+				}
+				g.addEdge(prevKey, k)
+			}
+		}
+	}
+
+	// Add edges for executing messages to their initiating messages
+	for hazardChainIndex, msgs := range execMsgs {
+		for execLogIdx, m := range msgs {
+			// Error if the chain is unknown
+			if _, ok := hazards[m.Chain]; !ok {
+				return nil, ErrExecMsgUnknownChain
+			}
+
+			// Check if we care about the init message
+			initChainMsgs, ok := execMsgs[m.Chain]
+			if !ok {
+				continue
+			}
+			if _, ok := initChainMsgs[m.LogIdx]; !ok {
+				continue
+			}
+
+			// Check if the init message exists
+			if logCount, ok := logCounts[m.Chain]; !ok || m.LogIdx >= logCount {
+				return nil, fmt.Errorf("%w: initiating message log index out of bounds", types.ErrConflict)
+			}
+
+			initKey := node{
+				chainIndex: m.Chain,
+				logIndex:   m.LogIdx,
+			}
+			execKey := node{
+				chainIndex: hazardChainIndex,
+				logIndex:   execLogIdx,
+			}
+
+			// Disallow self-referencing messages
+			// This should not be possible since the executing message contains the hash of the initiating message.
+			if initKey == execKey {
+				return nil, fmt.Errorf("%w: self referencial message", types.ErrConflict)
+			}
+
+			// Add the edge
+			g.addEdge(initKey, execKey)
+		}
+	}
+
+	return g, nil
+}
+
+// checkGraph uses Kahn's topological sort algorithm to check for cycles in the graph.
+//
+// Returns:
+//   - nil for acyclic graphs.
+//   - ErrCycle for cyclic graphs.
+//
+// Algorithm:
+//  1. for each node with in-degree 0 (i.e. no dependencies), add it to the result, remove it from the work.
+//  2. along with removing, remove the outgoing edges
+//  3. if there is no node left with in-degree 0, then there is a cycle
+func checkGraph(g *graph) error {
+	for {
+		// Process all nodes that have no incoming edges
+		for k := range g.inDegree0 {
+			// Remove all outgoing edges from this node
+			for _, out := range g.outgoingEdges[k] {
+				g.inDegreeNon0[out] -= 1
+				if g.inDegreeNon0[out] == 0 {
+					delete(g.inDegreeNon0, out)
+					g.inDegree0[out] = struct{}{}
+				}
+			}
+			delete(g.outgoingEdges, k)
+			delete(g.inDegree0, k)
+		}
+
+		// If there are new nodes with in-degree 0 then process them
+		if len(g.inDegree0) > 0 {
+			continue
+		}
+
+		// We're done processing so check for remaining nodes
+		if len(g.inDegreeNon0) == 0 {
+			// Done, without cycles!
+			return nil
+		}
+
+		// Some nodes left; there must be a cycle.
+		return ErrCycle
+	}
+}
+
+// GenerateMermaidDiagram creates a Mermaid flowchart diagram from the graph data for debugging.
+func GenerateMermaidDiagram(g *graph) string {
+	var sb strings.Builder
+
+	sb.WriteString("flowchart TD\n")
+
+	// Helper function to get a unique ID for each node
+	getNodeID := func(k node) string {
+		return fmt.Sprintf("N%d_%d", k.chainIndex, k.logIndex)
+	}
+
+	// Helper function to get a label for each node
+	getNodeLabel := func(k node) string {
+		return fmt.Sprintf("C%d:L%d", k.chainIndex, k.logIndex)
+	}
+
+	// Function to add a node to the diagram
+	addNode := func(k node, inDegree uint32) {
+		nodeID := getNodeID(k)
+		nodeLabel := getNodeLabel(k)
+		var shape string
+		if inDegree == 0 {
+			shape = "((%s))"
+		} else {
+			shape = "[%s]"
+		}
+		sb.WriteString(fmt.Sprintf("    %s"+shape+"\n", nodeID, nodeLabel))
+	}
+
+	// Add all nodes
+	for k := range g.inDegree0 {
+		addNode(k, 0)
+	}
+	for k, inDegree := range g.inDegreeNon0 {
+		addNode(k, inDegree)
+	}
+
+	// Add all edges
+	for from, tos := range g.outgoingEdges {
+		fromID := getNodeID(from)
+		for _, to := range tos {
+			toID := getNodeID(to)
+			sb.WriteString(fmt.Sprintf("    %s --> %s\n", fromID, toID))
+		}
+	}
+
+	// Add a legend
+	sb.WriteString("    subgraph Legend\n")
+	sb.WriteString("        L1((In-Degree 0))\n")
+	sb.WriteString("        L2[In-Degree > 0]\n")
+	sb.WriteString("    end\n")
+
+	return sb.String()
+}
diff --git a/op-supervisor/supervisor/backend/cross/cycle_test.go b/op-supervisor/supervisor/backend/cross/cycle_test.go
new file mode 100644
index 000000000000..a90258b88a26
--- /dev/null
+++ b/op-supervisor/supervisor/backend/cross/cycle_test.go
@@ -0,0 +1,556 @@
+package cross
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type mockCycleCheckDeps struct {
+	openBlockFn func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error)
+}
+
+func (m *mockCycleCheckDeps) OpenBlock(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
+	return m.openBlockFn(chainID, blockNum)
+}
+
+type chainBlockDef struct {
+	logCount uint32
+	messages map[uint32]*types.ExecutingMessage
+	error    error
+}
+
+type hazardCycleChecksTestCase struct {
+	name        string
+	chainBlocks map[string]chainBlockDef
+	expectErr   error
+	msg         string
+
+	// Optional overrides
+	hazards     map[types.ChainIndex]types.BlockSeal
+	openBlockFn func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error)
+}
+
+func runHazardCycleChecksTestCaseGroup(t *testing.T, group string, tests []hazardCycleChecksTestCase) {
+	for _, tc := range tests {
+		t.Run(group+"/"+tc.name, func(t *testing.T) {
+			runHazardCycleChecksTestCase(t, tc)
+		})
+	}
+}
+
+func runHazardCycleChecksTestCase(t *testing.T, tc hazardCycleChecksTestCase) {
+	// Create mocked dependencies
+	deps := &mockCycleCheckDeps{
+		openBlockFn: func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
+			// Use override if provided
+			if tc.openBlockFn != nil {
+				return tc.openBlockFn(chainID, blockNum)
+			}
+
+			// Default behavior
+			chainStr := chainID.String()
+			def, ok := tc.chainBlocks[chainStr]
+			if !ok {
+				return types.BlockSeal{}, 0, nil, errors.New("unexpected chain")
+			}
+			if def.error != nil {
+				return types.BlockSeal{}, 0, nil, def.error
+			}
+			return types.BlockSeal{Number: blockNum}, def.logCount, def.messages, nil
+		},
+	}
+
+	// Generate hazards map automatically if not explicitly provided
+	var hazards map[types.ChainIndex]types.BlockSeal
+	if tc.hazards != nil {
+		hazards = tc.hazards
+	} else {
+		hazards = make(map[types.ChainIndex]types.BlockSeal)
+		for chainStr := range tc.chainBlocks {
+			hazards[chainIndex(chainStr)] = types.BlockSeal{Number: 1}
+		}
+	}
+
+	// Run the test
+	err := HazardCycleChecks(deps, 100, hazards)
+
+	// No error expected
+	if tc.expectErr == nil {
+		require.NoError(t, err, tc.msg)
+		return
+	}
+
+	// Error expected, make sure it's the right one
+	require.Error(t, err, tc.msg)
+	if errors.Is(err, tc.expectErr) {
+		require.ErrorIs(t, err, tc.expectErr, tc.msg)
+	} else {
+		require.Contains(t, err.Error(), tc.expectErr.Error(), tc.msg)
+	}
+}
+
+func chainIndex(s string) types.ChainIndex {
+	id, err := strconv.ParseUint(s, 10, 32)
+	if err != nil {
+		panic(fmt.Sprintf("invalid chain index in test: %v", err))
+	}
+	return types.ChainIndex(id)
+}
+
+func execMsg(chain string, logIdx uint32) *types.ExecutingMessage {
+	return execMsgWithTimestamp(chain, logIdx, 100)
+}
+
+func execMsgWithTimestamp(chain string, logIdx uint32, timestamp uint64) *types.ExecutingMessage {
+	return &types.ExecutingMessage{
+		Chain:     chainIndex(chain),
+		LogIdx:    logIdx,
+		Timestamp: timestamp,
+	}
+}
+
+var emptyChainBlocks = map[string]chainBlockDef{
+	"1": {
+		logCount: 0,
+		messages: map[uint32]*types.ExecutingMessage{},
+	},
+}
+
+func TestHazardCycleChecksFailures(t *testing.T) {
+	testOpenBlockErr := errors.New("test OpenBlock error")
+	tests := []hazardCycleChecksTestCase{
+		{
+			name:        "empty hazards",
+			chainBlocks: emptyChainBlocks,
+			hazards:     make(map[types.ChainIndex]types.BlockSeal),
+			expectErr:   nil,
+			msg:         "expected no error when there are no hazards",
+		},
+		{
+			name:        "nil hazards",
+			chainBlocks: emptyChainBlocks,
+			hazards:     nil,
+			expectErr:   nil,
+			msg:         "expected no error when there are nil hazards",
+		},
+		{
+			name:        "nil blocks",
+			chainBlocks: nil,
+			hazards:     nil,
+			expectErr:   nil,
+			msg:         "expected no error when there are nil blocks and hazards",
+		},
+		{
+			name:        "failed to open block error",
+			chainBlocks: emptyChainBlocks,
+			openBlockFn: func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
+				return types.BlockSeal{}, 0, nil, testOpenBlockErr
+			},
+			expectErr: errors.New("failed to open block"),
+			msg:       "expected error when OpenBlock fails",
+		},
+		{
+			name:        "block mismatch error",
+			chainBlocks: emptyChainBlocks,
+			// openBlockFn returns a block number that doesn't match the expected block number.
+			openBlockFn: func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
+				return types.BlockSeal{Number: blockNum + 1}, 0, make(map[uint32]*types.ExecutingMessage), nil
+			},
+			expectErr: errors.New("tried to open block"),
+			msg:       "expected error due to block mismatch",
+		},
+		{
+			name: "invalid log index error",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 3,
+					messages: map[uint32]*types.ExecutingMessage{
+						5: execMsg("1", 0), // Invalid index >= logCount.
+					},
+				},
+			},
+			expectErr: ErrExecMsgHasInvalidIndex,
+			msg:       "expected invalid log index error",
+		},
+		{
+			name: "self reference detected error",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 1,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("1", 0), // Points at itself.
+					},
+				},
+			},
+			expectErr: types.ErrConflict,
+			msg:       "expected self reference detection error",
+		},
+		{
+			name: "unknown chain",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("2", 0), // References chain 2 which isn't in hazards.
+					},
+				},
+			},
+			hazards: map[types.ChainIndex]types.BlockSeal{
+				1: {Number: 1}, // Only include chain 1.
+			},
+			expectErr: ErrExecMsgUnknownChain,
+			msg:       "expected unknown chain error",
+		},
+	}
+	runHazardCycleChecksTestCaseGroup(t, "Failure", tests)
+}
+
+func TestHazardCycleChecksNoCycle(t *testing.T) {
+	tests := []hazardCycleChecksTestCase{
+		{
+			name:        "no logs",
+			chainBlocks: emptyChainBlocks,
+			expectErr:   nil,
+			msg:         "expected no cycle found for block with no logs",
+		},
+		{
+			name: "one basic log",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 1,
+					messages: map[uint32]*types.ExecutingMessage{},
+				},
+			},
+			msg: "expected no cycle found for single basic log",
+		},
+		{
+			name: "one exec log",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 0),
+					},
+				},
+			},
+			msg: "expected no cycle found for single exec log",
+		},
+		{
+			name: "two basic logs",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{},
+				},
+			},
+			msg: "expected no cycle found for two basic logs",
+		},
+		{
+			name: "two exec logs to same target",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 3,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 0),
+						2: execMsg("1", 0),
+					},
+				},
+			},
+			msg: "expected no cycle found for two exec logs pointing at the same log",
+		},
+		{
+			name: "two exec logs to different targets",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 3,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 0),
+						2: execMsg("1", 1),
+					},
+				},
+			},
+			msg: "expected no cycle found for two exec logs pointing at the different logs",
+		},
+		{
+			name: "one basic log one exec log",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 0),
+					},
+				},
+			},
+			msg: "expected no cycle found for one basic and one exec log",
+		},
+		{
+			name: "first log is exec",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 1,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("2", 0),
+					},
+				},
+				"2": {
+					logCount: 1,
+					messages: nil,
+				},
+			},
+			msg: "expected no cycle found first log is exec",
+		},
+		{
+			name: "cycle through older timestamp",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("2", 0),
+						1: execMsgWithTimestamp("2", 1, 101),
+					},
+				},
+				"2": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("1", 1),
+					},
+				},
+			},
+			msg: "expected no cycle detection error for cycle through messages with different timestamps",
+		},
+		// This should be caught by earlier validations, but included for completeness.
+		{
+			name: "cycle through younger timestamp",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("2", 0),
+						1: execMsgWithTimestamp("2", 1, 99),
+					},
+				},
+				"2": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("1", 1),
+					},
+				},
+			},
+			msg: "expected no cycle detection error for cycle through messages with different timestamps",
+		},
+	}
+	runHazardCycleChecksTestCaseGroup(t, "NoCycle", tests)
+}
+
+func TestHazardCycleChecksCycle(t *testing.T) {
+	tests := []hazardCycleChecksTestCase{
+		{
+			name: "2-cycle in single chain with first log",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 3,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("1", 2),
+						2: execMsg("1", 0),
+					},
+				},
+			},
+			expectErr: ErrCycle,
+			msg:       "expected cycle detection error",
+		},
+		{
+			name: "2-cycle in single chain with first log, adjacent",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("1", 1),
+						1: execMsg("1", 0),
+					},
+				},
+			},
+			expectErr: ErrCycle,
+			msg:       "expected cycle detection error",
+		},
+		{
+			name: "2-cycle in single chain, not first, adjacent",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 3,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 2),
+						2: execMsg("1", 1),
+					},
+				},
+			},
+			expectErr: ErrCycle,
+			msg:       "expected cycle detection error",
+		},
+		{
+			name: "2-cycle in single chain, not first, not adjacent",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 4,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 3),
+						3: execMsg("1", 1),
+					},
+				},
+			},
+			expectErr: ErrCycle,
+			msg:       "expected cycle detection error",
+		},
+		{
+			name: "2-cycle across chains",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("2", 0),
+					},
+				},
+				"2": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						0: execMsg("1", 1),
+					},
+				},
+			},
+			expectErr: ErrCycle,
+			msg:       "expected cycle detection error for cycle through executing messages",
+		},
+		{
+			name: "3-cycle in single chain",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 4,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 2), // Points to log 2
+						2: execMsg("1", 3), // Points to log 3
+						3: execMsg("1", 1), // Points back to log 1
+					},
+				},
+			},
+			expectErr: ErrCycle,
+			msg:       "expected cycle detection error for 3-node cycle",
+		},
+		{
+			name: "cycle through adjacency dependency",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 10,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 5), // Points to log 5
+						5: execMsg("1", 2), // Points back to log 2 which is adjacent to log 1
+					},
+				},
+			},
+			expectErr: ErrCycle,
+			msg:       "expected cycle detection error for when cycle goes through adjacency dependency",
+		},
+		{
+			name: "2-cycle across chains with 3 hazard chains",
+			chainBlocks: map[string]chainBlockDef{
+				"1": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("2", 1),
+					},
+				},
+				"2": {
+					logCount: 2,
+					messages: map[uint32]*types.ExecutingMessage{
+						1: execMsg("1", 1),
+					},
+				},
+				"3": {},
+			},
+			expectErr: ErrCycle,
+			hazards: map[types.ChainIndex]types.BlockSeal{
+				1: {Number: 1},
+				2: {Number: 1},
+				3: {Number: 1},
+			},
+			msg: "expected cycle detection error for cycle through executing messages",
+		},
+	}
+	runHazardCycleChecksTestCaseGroup(t, "Cycle", tests)
+}
+
+const (
+	largeGraphChains       = 10
+	largeGraphLogsPerChain = 10000
+)
+
+func TestHazardCycleChecksLargeGraphNoCycle(t *testing.T) {
+	// Create a large but acyclic graph
+	chainBlocks := make(map[string]chainBlockDef)
+	for i := 1; i <= largeGraphChains; i++ {
+		msgs := make(map[uint32]*types.ExecutingMessage)
+		// Create a chain of dependencies across chains
+		if i > 1 {
+			for j := uint32(0); j < largeGraphLogsPerChain; j++ {
+				// Point to previous chain, same log index
+				msgs[j] = execMsg(strconv.Itoa(i-1), j)
+			}
+		}
+		chainBlocks[strconv.Itoa(i)] = chainBlockDef{
+			logCount: largeGraphLogsPerChain,
+			messages: msgs,
+		}
+	}
+
+	tc := hazardCycleChecksTestCase{
+		name:        "Large graph without cycles",
+		chainBlocks: chainBlocks,
+		expectErr:   nil,
+		msg:         "expected no cycle in large acyclic graph",
+	}
+	runHazardCycleChecksTestCase(t, tc)
+}
+
+func TestHazardCycleChecksLargeGraphCycle(t *testing.T) {
+	// Create a large graph with a cycle hidden in it
+	const cycleChain = 3
+	const cycleLogIndex = 5678
+
+	chainBlocks := make(map[string]chainBlockDef)
+	for i := 1; i <= largeGraphChains; i++ {
+		msgs := make(map[uint32]*types.ExecutingMessage)
+
+		// Create a chain of dependencies across chains
+		if i > 1 {
+			for j := uint32(0); j < largeGraphLogsPerChain; j++ {
+				if i == cycleChain && j == cycleLogIndex {
+					// Create a cycle by pointing back to chain 1
+					msgs[j] = execMsg("1", cycleLogIndex+1)
+				} else {
+					// Normal case: point to previous chain, same log index
+					msgs[j] = execMsg(strconv.Itoa(i-1), j)
+				}
+			}
+		} else {
+			// In chain 1, create the other side of the cycle
+			msgs[cycleLogIndex+1] = execMsg(strconv.Itoa(cycleChain), cycleLogIndex)
+		}
+
+		chainBlocks[strconv.Itoa(i)] = chainBlockDef{
+			logCount: largeGraphLogsPerChain,
+			messages: msgs,
+		}
+	}
+
+	tc := hazardCycleChecksTestCase{
+		name:        "Large graph with cycle",
+		chainBlocks: chainBlocks,
+		expectErr:   ErrCycle,
+		msg:         "expected to detect cycle in large cyclic graph",
+	}
+	runHazardCycleChecksTestCase(t, tc)
+}

From 73094cb34624bc3fc72e568b5b66dd0c89d47542 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 28 Oct 2024 09:59:33 -0700
Subject: [PATCH 060/451] cannon: Implement bltzal (#12594)

---
 cannon/mipsevm/README.md                                 | 1 +
 cannon/mipsevm/exec/mips_instructions.go                 | 5 +++++
 cannon/mipsevm/tests/evm_common_test.go                  | 9 +++++++++
 packages/contracts-bedrock/semver-lock.json              | 8 ++++----
 packages/contracts-bedrock/src/cannon/MIPS.sol           | 4 ++--
 packages/contracts-bedrock/src/cannon/MIPS2.sol          | 4 ++--
 .../src/cannon/libraries/MIPSInstructions.sol            | 5 +++++
 7 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/cannon/mipsevm/README.md b/cannon/mipsevm/README.md
index 03afec250a4a..f01aa61510e5 100644
--- a/cannon/mipsevm/README.md
+++ b/cannon/mipsevm/README.md
@@ -15,6 +15,7 @@ Supported 63 instructions:
 | `Conditional Branch` | `bgezal`      | Branch and link on greater than or equal to zero.     |
 | `Conditional Branch` | `blez`        | Branch on less than or equal to zero.        |
 | `Conditional Branch` | `bltz`        | Branch on less than zero.                    |
+| `Conditional Branch` | `bltzal`      | Branch and link on less than zero.           |
 | `Conditional Branch` | `bne`         | Branch on not equal.                         |
 | `Logical`            | `clo`         | Count leading ones.                          |
 | `Logical`            | `clz`         | Count leading zeros.                         |
diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index 9cc94e98e50c..39d40dd59dc0 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -486,6 +486,11 @@ func HandleBranch(cpu *mipsevm.CpuScalars, registers *[32]Word, opcode uint32, i
 		if rtv == 0 { // bltz
 			shouldBranch = arch.SignedInteger(rs) < 0
 		}
+		if rtv == 0x10 { // bltzal
+			shouldBranch = arch.SignedInteger(rs) < 0
+			registers[31] = cpu.PC + 8 // always set regardless of branch taken
+			linked = true
+		}
 		if rtv == 1 { // bgez
 			shouldBranch = arch.SignedInteger(rs) >= 0
 		}
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index 6f5063ec12bd..932662fd6979 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -1032,6 +1032,15 @@ func TestEVMSingleStepBranch(t *testing.T) {
 		{name: "bltz sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x80_00, expectNextPC: 0xFF_FE_00_14},
 		{name: "bltz large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x0, rs: -1, offset: 0x7F_FF, expectNextPC: 0x2_00_10},
 
+		// bltzal t0, $x
+		{name: "bltzal", pc: 0, opcode: 0x1, regimm: 0x10, rs: 0x5, offset: 0x100, expectNextPC: 0x8, expectLink: true},
+		{name: "bltzal large rs", pc: 0x10, opcode: 0x1, regimm: 0x10, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x18, expectLink: true},
+		{name: "bltzal zero rs", pc: 0x10, opcode: 0x1, regimm: 0x10, rs: 0x0, offset: 0x100, expectNextPC: 0x18, expectLink: true},
+		{name: "bltzal sign rs", pc: 0x10, opcode: 0x1, regimm: 0x10, rs: -1, offset: 0x100, expectNextPC: 0x414, expectLink: true},
+		{name: "bltzal rs only sign bit set", pc: 0x10, opcode: 0x1, regimm: 0x10, rs: testutil.ToSignedInteger(0x80_00_00_00), offset: 0x100, expectNextPC: 0x414, expectLink: true},
+		{name: "bltzal sign-extended offset", pc: 0x10, opcode: 0x1, regimm: 0x10, rs: -1, offset: 0x80_00, expectNextPC: 0xFF_FE_00_14, expectLink: true},
+		{name: "bltzal large offset no-sign", pc: 0x10, opcode: 0x1, regimm: 0x10, rs: -1, offset: 0x7F_FF, expectNextPC: 0x2_00_10, expectLink: true},
+
 		// bgez t0, $x
 		{name: "bgez", pc: 0, opcode: 0x1, regimm: 0x1, rs: 0x5, offset: 0x100, expectNextPC: 0x404},
 		{name: "bgez large rs", pc: 0x10, opcode: 0x1, regimm: 0x1, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x414},
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 57567ec570c7..4210b233a66b 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -140,12 +140,12 @@
     "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0x94f2e8f7818a990c009cccb501216a7f6df29b05d8f178cfff10a40288bf588e",
-    "sourceCodeHash": "0x786d4947488a771a426cc38de307ae99b2c2af1efca38b7655c60be7c019371f"
+    "initCodeHash": "0xa3cbf121bad13c00227ea4fef128853d9a86b7ec9158de894f99b58d38d7630a",
+    "sourceCodeHash": "0xd8467700c80b3e62fa37193dc6513bac35282094b686b50e162e157f704dde00"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0x3744036fa240c7d57f39307c0bf27cb7027d05d6b4f52142d5122b6e538ee0b2",
-    "sourceCodeHash": "0x5f79a0f99a288d570df243ea9560e67a319d1685b3209ae457fc714a76ff2908"
+    "initCodeHash": "0x478fdad3eccd158822ce2025971a9242c37c976024f419fba417fe54158269b7",
+    "sourceCodeHash": "0x81dc3329c1644afa30ecd2684f44f8b96b5a17612dcfa6476432eed697209e63"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS.sol b/packages/contracts-bedrock/src/cannon/MIPS.sol
index 7e16d48a3dbb..5efab0ce98f1 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS.sol
@@ -44,8 +44,8 @@ contract MIPS is ISemver {
     }
 
     /// @notice The semantic version of the MIPS contract.
-    /// @custom:semver 1.2.1-beta.6
-    string public constant version = "1.2.1-beta.6";
+    /// @custom:semver 1.2.1-beta.7
+    string public constant version = "1.2.1-beta.7";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index b01b5a78d3de..34851f61a27f 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -60,8 +60,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.19
-    string public constant version = "1.0.0-beta.19";
+    /// @custom:semver 1.0.0-beta.20
+    string public constant version = "1.0.0-beta.20";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
index 32ec9007fd7e..fa4d1451b54b 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
@@ -495,6 +495,11 @@ library MIPSInstructions {
                 if (rtv == 0) {
                     shouldBranch = int32(_rs) < 0;
                 }
+                // bltzal
+                if (rtv == 0x10) {
+                    shouldBranch = int32(_rs) < 0;
+                    _registers[31] = _cpu.pc + 8; // always set regardless of branch taken
+                }
                 if (rtv == 1) {
                     shouldBranch = int32(_rs) >= 0;
                 }

From 882d261b49b427777d8cedab4a826e4f8388cd18 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Tue, 29 Oct 2024 00:11:45 +0700
Subject: [PATCH 061/451] op-supervisor: make frontend/backend/client
 interfaces consistent (#12699)

---
 op-e2e/actions/interop/interop_test.go        | 12 ++++----
 op-node/rollup/interop/interop.go             | 16 ++++++++---
 op-node/rollup/interop/interop_test.go        |  4 +--
 op-service/eth/id.go                          |  9 ++++++
 op-service/sources/supervisor_client.go       |  8 +++---
 op-service/testutils/fake_interop_backend.go  |  8 +++---
 op-service/testutils/mock_interop_backend.go  |  8 +++---
 op-supervisor/supervisor/backend/backend.go   | 12 ++++----
 .../supervisor/backend/backend_test.go        |  2 +-
 op-supervisor/supervisor/backend/db/query.go  | 14 ++++++++--
 op-supervisor/supervisor/backend/mock.go      | 10 +++----
 op-supervisor/supervisor/frontend/frontend.go | 28 +++++++++++--------
 12 files changed, 81 insertions(+), 50 deletions(-)

diff --git a/op-e2e/actions/interop/interop_test.go b/op-e2e/actions/interop/interop_test.go
index b005baf5f0fa..a69a09a9bd94 100644
--- a/op-e2e/actions/interop/interop_test.go
+++ b/op-e2e/actions/interop/interop_test.go
@@ -41,12 +41,12 @@ func TestInteropVerifier(gt *testing.T) {
 		helpers.WithInteropBackend(verMockBackend))
 
 	// Genesis block will be registered as local-safe when we first trigger the derivation pipeline
-	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
 		require.Equal(t, sd.RollupCfg.Genesis.L1, derivedFrom.ID())
 		require.Equal(t, sd.RollupCfg.Genesis.L2, lastDerived.ID())
 		return nil
 	}
-	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
 		require.Equal(t, sd.RollupCfg.Genesis.L1, derivedFrom.ID())
 		require.Equal(t, sd.RollupCfg.Genesis.L2, lastDerived.ID())
 		return nil
@@ -56,7 +56,7 @@ func TestInteropVerifier(gt *testing.T) {
 	ver.ActL2PipelineFull(t)
 
 	l2ChainID := types.ChainIDFromBig(sd.RollupCfg.L2ChainID)
-	seqMockBackend.UpdateLocalUnsafeFn = func(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error {
+	seqMockBackend.UpdateLocalUnsafeFn = func(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
 		require.Equal(t, chainID, l2ChainID)
 		require.Equal(t, uint64(1), head.Number)
 		return nil
@@ -105,7 +105,7 @@ func TestInteropVerifier(gt *testing.T) {
 	// Sync the L1 block, to verify the L2 block as local-safe.
 	seqMockBackend.UpdateLocalUnsafeFn = nil
 	nextL2 := uint64(0)
-	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
 		require.Equal(t, nextL2, lastDerived.Number)
 		nextL2 += 1
 		return nil
@@ -153,12 +153,12 @@ func TestInteropVerifier(gt *testing.T) {
 	require.Equal(t, uint64(1), status.SafeL2.Number, "cross-safe reached")
 	require.Equal(t, uint64(0), status.FinalizedL2.Number)
 
-	verMockBackend.UpdateLocalUnsafeFn = func(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error {
+	verMockBackend.UpdateLocalUnsafeFn = func(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
 		require.Equal(t, uint64(1), head.Number)
 		return nil
 	}
 	nextL2 = 0
-	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
 		require.Equal(t, nextL2, lastDerived.Number)
 		nextL2 += 1
 		require.Equal(t, l1Head.ID(), derivedFrom.ID())
diff --git a/op-node/rollup/interop/interop.go b/op-node/rollup/interop/interop.go
index 293402fee389..c929c8f0d01d 100644
--- a/op-node/rollup/interop/interop.go
+++ b/op-node/rollup/interop/interop.go
@@ -15,6 +15,8 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup/event"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/finality"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -27,11 +29,17 @@ type InteropBackend interface {
 
 	DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error)
 
-	UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error
-	UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error
+	UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error
+	UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error
 	UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.L1BlockRef) error
 }
 
+// For testing usage, the backend of the supervisor implements the interface, no need for RPC.
+var _ InteropBackend = (*backend.SupervisorBackend)(nil)
+
+// For RPC usage, the supervisor client implements the interop backend.
+var _ InteropBackend = (*sources.SupervisorClient)(nil)
+
 type L2Source interface {
 	L2BlockRefByNumber(context.Context, uint64) (eth.L2BlockRef, error)
 	L2BlockRefByHash(ctx context.Context, l2Hash common.Hash) (eth.L2BlockRef, error)
@@ -117,7 +125,7 @@ func (d *InteropDeriver) onLocalUnsafeUpdate(x engine.UnsafeUpdateEvent) {
 	d.log.Debug("Signaling unsafe L2 head update to interop backend", "head", x.Ref)
 	ctx, cancel := context.WithTimeout(d.driverCtx, rpcTimeout)
 	defer cancel()
-	if err := d.backend.UpdateLocalUnsafe(ctx, d.chainID, x.Ref); err != nil {
+	if err := d.backend.UpdateLocalUnsafe(ctx, d.chainID, x.Ref.BlockRef()); err != nil {
 		d.log.Warn("Failed to signal unsafe L2 head to interop backend", "head", x.Ref, "err", err)
 		// still continue to try and do a cross-unsafe update
 	}
@@ -129,7 +137,7 @@ func (d *InteropDeriver) onInteropPendingSafeChangedEvent(x engine.InteropPendin
 	d.log.Debug("Signaling derived-from update to interop backend", "derivedFrom", x.DerivedFrom, "block", x.Ref)
 	ctx, cancel := context.WithTimeout(d.driverCtx, rpcTimeout)
 	defer cancel()
-	if err := d.backend.UpdateLocalSafe(ctx, d.chainID, x.DerivedFrom, x.Ref); err != nil {
+	if err := d.backend.UpdateLocalSafe(ctx, d.chainID, x.DerivedFrom, x.Ref.BlockRef()); err != nil {
 		d.log.Debug("Failed to signal derived-from update to interop backend", "derivedFrom", x.DerivedFrom, "block", x.Ref)
 		// still continue to try and do a cross-safe update
 	}
diff --git a/op-node/rollup/interop/interop_test.go b/op-node/rollup/interop/interop_test.go
index fc6bf59cacea..d4fb87f0dd92 100644
--- a/op-node/rollup/interop/interop_test.go
+++ b/op-node/rollup/interop/interop_test.go
@@ -36,7 +36,7 @@ func TestInteropDeriver(t *testing.T) {
 	t.Run("local-unsafe blocks push to supervisor and trigger cross-unsafe attempts", func(t *testing.T) {
 		emitter.ExpectOnce(engine.RequestCrossUnsafeEvent{})
 		unsafeHead := testutils.RandomL2BlockRef(rng)
-		interopBackend.ExpectUpdateLocalUnsafe(chainID, unsafeHead, nil)
+		interopBackend.ExpectUpdateLocalUnsafe(chainID, unsafeHead.BlockRef(), nil)
 		interopDeriver.OnEvent(engine.UnsafeUpdateEvent{Ref: unsafeHead})
 		emitter.AssertExpectations(t)
 		interopBackend.AssertExpectations(t)
@@ -93,7 +93,7 @@ func TestInteropDeriver(t *testing.T) {
 		emitter.ExpectOnce(engine.RequestCrossSafeEvent{})
 		derivedFrom := testutils.RandomBlockRef(rng)
 		localSafe := testutils.RandomL2BlockRef(rng)
-		interopBackend.ExpectUpdateLocalSafe(chainID, derivedFrom, localSafe, nil)
+		interopBackend.ExpectUpdateLocalSafe(chainID, derivedFrom, localSafe.BlockRef(), nil)
 		interopDeriver.OnEvent(engine.InteropPendingSafeChangedEvent{
 			Ref:         localSafe,
 			DerivedFrom: derivedFrom,
diff --git a/op-service/eth/id.go b/op-service/eth/id.go
index c323d1e69b9a..3eecdbc3bac1 100644
--- a/op-service/eth/id.go
+++ b/op-service/eth/id.go
@@ -49,6 +49,15 @@ func (id L2BlockRef) TerminalString() string {
 	return fmt.Sprintf("%s:%d", id.Hash.TerminalString(), id.Number)
 }
 
+func (id L2BlockRef) BlockRef() BlockRef {
+	return BlockRef{
+		Hash:       id.Hash,
+		Number:     id.Number,
+		ParentHash: id.ParentHash,
+		Time:       id.Time,
+	}
+}
+
 type L1BlockRef struct {
 	Hash       common.Hash `json:"hash"`
 	Number     uint64      `json:"number"`
diff --git a/op-service/sources/supervisor_client.go b/op-service/sources/supervisor_client.go
index fc4c85b10a45..d85fc4901f31 100644
--- a/op-service/sources/supervisor_client.go
+++ b/op-service/sources/supervisor_client.go
@@ -97,17 +97,17 @@ func (cl *SupervisorClient) Finalized(ctx context.Context, chainID types.ChainID
 	return result, err
 }
 
-func (cl *SupervisorClient) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
-	var result eth.L1BlockRef
+func (cl *SupervisorClient) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.BlockRef, error) {
+	var result eth.BlockRef
 	err := cl.client.CallContext(ctx, &result, "supervisor_derivedFrom", chainID, derived)
 	return result, err
 }
 
-func (cl *SupervisorClient) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error {
+func (cl *SupervisorClient) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
 	return cl.client.CallContext(ctx, nil, "supervisor_updateLocalUnsafe", chainID, head)
 }
 
-func (cl *SupervisorClient) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+func (cl *SupervisorClient) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
 	return cl.client.CallContext(ctx, nil, "supervisor_updateLocalSafe", chainID, derivedFrom, lastDerived)
 }
 
diff --git a/op-service/testutils/fake_interop_backend.go b/op-service/testutils/fake_interop_backend.go
index b73b4ac07225..4ef439a9a3bc 100644
--- a/op-service/testutils/fake_interop_backend.go
+++ b/op-service/testutils/fake_interop_backend.go
@@ -12,8 +12,8 @@ type FakeInteropBackend struct {
 	SafeViewFn          func(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error)
 	FinalizedFn         func(ctx context.Context, chainID types.ChainID) (eth.BlockID, error)
 	DerivedFromFn       func(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error)
-	UpdateLocalUnsafeFn func(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error
-	UpdateLocalSafeFn   func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error
+	UpdateLocalUnsafeFn func(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error
+	UpdateLocalSafeFn   func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error
 	UpdateFinalizedL1Fn func(ctx context.Context, chainID types.ChainID, finalized eth.L1BlockRef) error
 }
 
@@ -33,11 +33,11 @@ func (m *FakeInteropBackend) DerivedFrom(ctx context.Context, chainID types.Chai
 	return m.DerivedFromFn(ctx, chainID, derived)
 }
 
-func (m *FakeInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error {
+func (m *FakeInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
 	return m.UpdateLocalUnsafeFn(ctx, chainID, head)
 }
 
-func (m *FakeInteropBackend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+func (m *FakeInteropBackend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
 	return m.UpdateLocalSafeFn(ctx, chainID, derivedFrom, lastDerived)
 }
 
diff --git a/op-service/testutils/mock_interop_backend.go b/op-service/testutils/mock_interop_backend.go
index 087b2f9c28cf..6724acedd43f 100644
--- a/op-service/testutils/mock_interop_backend.go
+++ b/op-service/testutils/mock_interop_backend.go
@@ -67,12 +67,12 @@ func (m *MockInteropBackend) ExpectDerivedFrom(chainID types.ChainID, derived et
 	m.Mock.On("DerivedFrom", chainID, derived).Once().Return(result, &err)
 }
 
-func (m *MockInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.L2BlockRef) error {
+func (m *MockInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
 	result := m.Mock.MethodCalled("UpdateLocalUnsafe", chainID, head)
 	return *result.Get(0).(*error)
 }
 
-func (m *MockInteropBackend) ExpectUpdateLocalUnsafe(chainID types.ChainID, head eth.L2BlockRef, err error) {
+func (m *MockInteropBackend) ExpectUpdateLocalUnsafe(chainID types.ChainID, head eth.BlockRef, err error) {
 	m.Mock.On("UpdateLocalUnsafe", chainID, head).Once().Return(&err)
 }
 
@@ -80,12 +80,12 @@ func (m *MockInteropBackend) ExpectAnyUpdateLocalUnsafe(chainID types.ChainID, e
 	m.Mock.On("UpdateLocalUnsafe", chainID, mock.Anything).Once().Return(&err)
 }
 
-func (m *MockInteropBackend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef) error {
+func (m *MockInteropBackend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
 	result := m.Mock.MethodCalled("UpdateLocalSafe", chainID, derivedFrom, lastDerived)
 	return *result.Get(0).(*error)
 }
 
-func (m *MockInteropBackend) ExpectUpdateLocalSafe(chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.L2BlockRef, err error) {
+func (m *MockInteropBackend) ExpectUpdateLocalSafe(chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef, err error) {
 	m.Mock.On("UpdateLocalSafe", chainID, derivedFrom, lastDerived).Once().Return(&err)
 }
 
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 898157558931..5768e16e3ca0 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -402,21 +402,21 @@ func (su *SupervisorBackend) Finalized(ctx context.Context, chainID types.ChainI
 	return v.ID(), nil
 }
 
-func (su *SupervisorBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockID, err error) {
+func (su *SupervisorBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
 	v, err := su.chainDBs.DerivedFrom(chainID, derived)
 	if err != nil {
-		return eth.BlockID{}, err
+		return eth.BlockRef{}, err
 	}
-	return v.ID(), nil
+	return v, nil
 }
 
 // Update methods
 // ----------------------------
 
-func (su *SupervisorBackend) UpdateLocalUnsafe(chainID types.ChainID, head eth.BlockRef) error {
+func (su *SupervisorBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 	ch, ok := su.chainProcessors[chainID]
@@ -426,14 +426,14 @@ func (su *SupervisorBackend) UpdateLocalUnsafe(chainID types.ChainID, head eth.B
 	return ch.OnNewHead(head)
 }
 
-func (su *SupervisorBackend) UpdateLocalSafe(chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
+func (su *SupervisorBackend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
 	return su.chainDBs.UpdateLocalSafe(chainID, derivedFrom, lastDerived)
 }
 
-func (su *SupervisorBackend) UpdateFinalizedL1(chainID types.ChainID, finalized eth.BlockRef) error {
+func (su *SupervisorBackend) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error {
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
diff --git a/op-supervisor/supervisor/backend/backend_test.go b/op-supervisor/supervisor/backend/backend_test.go
index 3d2b5ad123a5..6ddfcac662b2 100644
--- a/op-supervisor/supervisor/backend/backend_test.go
+++ b/op-supervisor/supervisor/backend/backend_test.go
@@ -113,7 +113,7 @@ func TestBackendLifetime(t *testing.T) {
 
 	src.ExpectL1BlockRefByNumber(2, eth.L1BlockRef{}, ethereum.NotFound)
 
-	err = b.UpdateLocalUnsafe(chainA, blockY)
+	err = b.UpdateLocalUnsafe(context.Background(), chainA, blockY)
 	require.NoError(t, err)
 	// Make the processing happen, so we can rely on the new chain information,
 	// and not run into errors for future data that isn't mocked at this time.
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index 5db821396c8a..7dc2e72d3e72 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -167,15 +167,23 @@ func (db *ChainsDB) LastDerivedFrom(chainID types.ChainID, derivedFrom eth.Block
 	return crossDB.LastDerivedAt(derivedFrom)
 }
 
-func (db *ChainsDB) DerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
+func (db *ChainsDB) DerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	db.mu.RLock()
 	defer db.mu.RUnlock()
 
 	localDB, ok := db.localDBs[chainID]
 	if !ok {
-		return types.BlockSeal{}, types.ErrUnknownChain
+		return eth.BlockRef{}, types.ErrUnknownChain
+	}
+	res, err := localDB.DerivedFrom(derived)
+	if err != nil {
+		return eth.BlockRef{}, err
+	}
+	parent, err := localDB.PreviousDerivedFrom(res.ID())
+	if err != nil {
+		return eth.BlockRef{}, err
 	}
-	return localDB.DerivedFrom(derived)
+	return res.WithParent(parent.ID()), nil
 }
 
 // Check calls the underlying logDB to determine if the given log entry exists at the given location.
diff --git a/op-supervisor/supervisor/backend/mock.go b/op-supervisor/supervisor/backend/mock.go
index 0cee49463197..c07e74a40013 100644
--- a/op-supervisor/supervisor/backend/mock.go
+++ b/op-supervisor/supervisor/backend/mock.go
@@ -62,19 +62,19 @@ func (m *MockBackend) Finalized(ctx context.Context, chainID types.ChainID) (eth
 	return eth.BlockID{}, nil
 }
 
-func (m *MockBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockID, err error) {
-	return eth.BlockID{}, nil
+func (m *MockBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
+	return eth.BlockRef{}, nil
 }
 
-func (m *MockBackend) UpdateLocalUnsafe(chainID types.ChainID, head eth.BlockRef) error {
+func (m *MockBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
 	return nil
 }
 
-func (m *MockBackend) UpdateLocalSafe(chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
+func (m *MockBackend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
 	return nil
 }
 
-func (m *MockBackend) UpdateFinalizedL1(chainID types.ChainID, finalized eth.BlockRef) error {
+func (m *MockBackend) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error {
 	return nil
 }
 
diff --git a/op-supervisor/supervisor/frontend/frontend.go b/op-supervisor/supervisor/frontend/frontend.go
index 6b87b219e075..26e751200a5a 100644
--- a/op-supervisor/supervisor/frontend/frontend.go
+++ b/op-supervisor/supervisor/frontend/frontend.go
@@ -17,16 +17,16 @@ type AdminBackend interface {
 type QueryBackend interface {
 	CheckMessage(identifier types.Identifier, payloadHash common.Hash) (types.SafetyLevel, error)
 	CheckMessages(messages []types.Message, minSafety types.SafetyLevel) error
-	DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockID, err error)
+	DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error)
 	UnsafeView(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error)
 	SafeView(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error)
 	Finalized(ctx context.Context, chainID types.ChainID) (eth.BlockID, error)
 }
 
 type UpdatesBackend interface {
-	UpdateLocalUnsafe(chainID types.ChainID, head eth.BlockRef) error
-	UpdateLocalSafe(chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error
-	UpdateFinalizedL1(chainID types.ChainID, finalized eth.BlockRef) error
+	UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error
+	UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error
+	UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error
 }
 
 type Backend interface {
@@ -39,6 +39,8 @@ type QueryFrontend struct {
 	Supervisor QueryBackend
 }
 
+var _ QueryBackend = (*QueryFrontend)(nil)
+
 // CheckMessage checks the safety-level of an individual message.
 // The payloadHash references the hash of the message-payload of the message.
 func (q *QueryFrontend) CheckMessage(identifier types.Identifier, payloadHash common.Hash) (types.SafetyLevel, error) {
@@ -65,7 +67,7 @@ func (q *QueryFrontend) Finalized(ctx context.Context, chainID types.ChainID) (e
 	return q.Supervisor.Finalized(ctx, chainID)
 }
 
-func (q *QueryFrontend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockID, err error) {
+func (q *QueryFrontend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	return q.Supervisor.DerivedFrom(ctx, chainID, derived)
 }
 
@@ -73,6 +75,8 @@ type AdminFrontend struct {
 	Supervisor Backend
 }
 
+var _ AdminBackend = (*AdminFrontend)(nil)
+
 // Start starts the service, if it was previously stopped.
 func (a *AdminFrontend) Start(ctx context.Context) error {
 	return a.Supervisor.Start(ctx)
@@ -92,14 +96,16 @@ type UpdatesFrontend struct {
 	Supervisor UpdatesBackend
 }
 
-func (u *UpdatesFrontend) UpdateLocalUnsafe(chainID types.ChainID, head eth.BlockRef) error {
-	return u.Supervisor.UpdateLocalUnsafe(chainID, head)
+var _ UpdatesBackend = (*UpdatesFrontend)(nil)
+
+func (u *UpdatesFrontend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
+	return u.Supervisor.UpdateLocalUnsafe(ctx, chainID, head)
 }
 
-func (u *UpdatesFrontend) UpdateLocalSafe(chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
-	return u.Supervisor.UpdateLocalSafe(chainID, derivedFrom, lastDerived)
+func (u *UpdatesFrontend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
+	return u.Supervisor.UpdateLocalSafe(ctx, chainID, derivedFrom, lastDerived)
 }
 
-func (u *UpdatesFrontend) UpdateFinalizedL1(chainID types.ChainID, finalized eth.BlockRef) error {
-	return u.Supervisor.UpdateFinalizedL1(chainID, finalized)
+func (u *UpdatesFrontend) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error {
+	return u.Supervisor.UpdateFinalizedL1(ctx, chainID, finalized)
 }

From 005116d9b4e39c7ba0586ce95ceba4067123efd5 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 28 Oct 2024 11:27:42 -0700
Subject: [PATCH 062/451] cannon: Noop SYS_STAT for the mt stf (#12687)

---
 cannon/mipsevm/arch/arch32.go                               | 1 +
 cannon/mipsevm/arch/arch64.go                               | 1 +
 cannon/mipsevm/multithreaded/mips.go                        | 1 +
 cannon/mipsevm/tests/evm_multithreaded_test.go              | 1 +
 packages/contracts-bedrock/semver-lock.json                 | 4 ++--
 packages/contracts-bedrock/src/cannon/MIPS2.sol             | 6 ++++--
 .../contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol | 1 +
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cannon/mipsevm/arch/arch32.go b/cannon/mipsevm/arch/arch32.go
index dbe9ee193d7a..4f9329ef9ce3 100644
--- a/cannon/mipsevm/arch/arch32.go
+++ b/cannon/mipsevm/arch/arch32.go
@@ -61,6 +61,7 @@ const (
 	SysPrlimit64     = 4338
 	SysClose         = 4006
 	SysPread64       = 4200
+	SysStat          = 4106
 	SysFstat         = 4108
 	SysFstat64       = 4215
 	SysOpenAt        = 4288
diff --git a/cannon/mipsevm/arch/arch64.go b/cannon/mipsevm/arch/arch64.go
index b260ebb1bbb3..b6a23f5fde9e 100644
--- a/cannon/mipsevm/arch/arch64.go
+++ b/cannon/mipsevm/arch/arch64.go
@@ -69,6 +69,7 @@ const (
 	SysPrlimit64     = 5297
 	SysClose         = 5003
 	SysPread64       = 5016
+	SysStat          = 5004
 	SysFstat         = 5005
 	SysFstat64       = UndefinedSysNr
 	SysOpenAt        = 5247
diff --git a/cannon/mipsevm/multithreaded/mips.go b/cannon/mipsevm/multithreaded/mips.go
index f371da2c4053..65c911d9c9eb 100644
--- a/cannon/mipsevm/multithreaded/mips.go
+++ b/cannon/mipsevm/multithreaded/mips.go
@@ -187,6 +187,7 @@ func (m *InstrumentedState) handleSyscall() error {
 	case arch.SysPrlimit64:
 	case arch.SysClose:
 	case arch.SysPread64:
+	case arch.SysStat:
 	case arch.SysFstat:
 	case arch.SysOpenAt:
 	case arch.SysReadlink:
diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index 3d873730306a..4b663f3b7f11 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -1103,6 +1103,7 @@ var NoopSyscalls = map[string]uint32{
 	"SysPrlimit64":     4338,
 	"SysClose":         4006,
 	"SysPread64":       4200,
+	"SysStat":          4106,
 	"SysFstat":         4108,
 	"SysFstat64":       4215,
 	"SysOpenAt":        4288,
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 4210b233a66b..9f7240772437 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -144,8 +144,8 @@
     "sourceCodeHash": "0xd8467700c80b3e62fa37193dc6513bac35282094b686b50e162e157f704dde00"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0x478fdad3eccd158822ce2025971a9242c37c976024f419fba417fe54158269b7",
-    "sourceCodeHash": "0x81dc3329c1644afa30ecd2684f44f8b96b5a17612dcfa6476432eed697209e63"
+    "initCodeHash": "0xaedf0d0b0e94a0c5e7d987331d2fdba84230f5704a6ca33677e70cde7051b17e",
+    "sourceCodeHash": "0x9fa2d1297ad1e93b4d3c5c0fed08bedcd8f746807589f0fd3369e79347c6a027"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index 34851f61a27f..220c66ddde54 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -60,8 +60,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.20
-    string public constant version = "1.0.0-beta.20";
+    /// @custom:semver 1.0.0-beta.21
+    string public constant version = "1.0.0-beta.21";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -555,6 +555,8 @@ contract MIPS2 is ISemver {
                 // ignored
             } else if (syscall_no == sys.SYS_PREAD64) {
                 // ignored
+            } else if (syscall_no == sys.SYS_STAT) {
+                // ignored
             } else if (syscall_no == sys.SYS_FSTAT) {
                 // ignored
             } else if (syscall_no == sys.SYS_OPENAT) {
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
index 4354163a9d3f..ec0cfdded894 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -53,6 +53,7 @@ library MIPSSyscalls {
     uint32 internal constant SYS_PRLIMIT64 = 4338;
     uint32 internal constant SYS_CLOSE = 4006;
     uint32 internal constant SYS_PREAD64 = 4200;
+    uint32 internal constant SYS_STAT = 4106;
     uint32 internal constant SYS_FSTAT = 4108;
     uint32 internal constant SYS_FSTAT64 = 4215;
     uint32 internal constant SYS_OPENAT = 4288;

From da681773eb109f19041ebdaaf24c264ec74e5cef Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Mon, 28 Oct 2024 15:30:05 -0400
Subject: [PATCH 063/451] cannon: Update program loading for 64-bit programs
 (#12657)

* cannon: Add some unit tests for LoadELF

* cannon: Fix off-by-one boundary check

* cannon: Adapt LoadELF addr check for 64-bit

* cannon: Handle zero-length segments

* cannon: Restrict virtual address space to 48-bits for MIPS64
---
 cannon/mipsevm/program/load.go           |  27 +++--
 cannon/mipsevm/program/load_test.go      |  83 +++++++++++++++
 cannon/mipsevm/program/testutil/mocks.go | 130 +++++++++++++++++++++++
 3 files changed, 234 insertions(+), 6 deletions(-)
 create mode 100644 cannon/mipsevm/program/load_test.go
 create mode 100644 cannon/mipsevm/program/testutil/mocks.go

diff --git a/cannon/mipsevm/program/load.go b/cannon/mipsevm/program/load.go
index 3cbba07d2bcd..23a1c67b1547 100644
--- a/cannon/mipsevm/program/load.go
+++ b/cannon/mipsevm/program/load.go
@@ -25,7 +25,7 @@ func LoadELF[T mipsevm.FPVMState](f *elf.File, initState CreateInitialFPVMState[
 	s := initState(Word(f.Entry), HEAP_START)
 
 	for i, prog := range f.Progs {
-		if prog.Type == 0x70000003 { // MIPS_ABIFLAGS
+		if prog.Type == elf.PT_MIPS_ABIFLAGS {
 			continue
 		}
 
@@ -42,12 +42,27 @@ func LoadELF[T mipsevm.FPVMState](f *elf.File, initState CreateInitialFPVMState[
 			}
 		}
 
-		// TODO(#12205)
-		if prog.Vaddr+prog.Memsz >= uint64(1<<32) {
-			return empty, fmt.Errorf("program %d out of 32-bit mem range: %x - %x (size: %x)", i, prog.Vaddr, prog.Vaddr+prog.Memsz, prog.Memsz)
+		if prog.Memsz == 0 {
+			// Nothing to do
+			continue
+		}
+
+		// Calculate the architecture-specific last valid memory address
+		var lastMemoryAddr uint64
+		if arch.IsMips32 {
+			// 32-bit virtual address space
+			lastMemoryAddr = (1 << 32) - 1
+		} else {
+			// 48-bit virtual address space
+			lastMemoryAddr = (1 << 48) - 1
+		}
+
+		lastByteToWrite := prog.Vaddr + prog.Memsz - 1
+		if lastByteToWrite > lastMemoryAddr || lastByteToWrite < prog.Vaddr {
+			return empty, fmt.Errorf("program %d out of memory range: %x - %x (size: %x)", i, prog.Vaddr, lastByteToWrite, prog.Memsz)
 		}
-		if prog.Vaddr+prog.Memsz >= HEAP_START {
-			return empty, fmt.Errorf("program %d overlaps with heap: %x - %x (size: %x). The heap start offset must be reconfigured", i, prog.Vaddr, prog.Vaddr+prog.Memsz, prog.Memsz)
+		if lastByteToWrite >= HEAP_START {
+			return empty, fmt.Errorf("program %d overlaps with heap: %x - %x (size: %x). The heap start offset must be reconfigured", i, prog.Vaddr, lastByteToWrite, prog.Memsz)
 		}
 		if err := s.GetMemory().SetMemoryRange(Word(prog.Vaddr), r); err != nil {
 			return empty, fmt.Errorf("failed to read program segment %d: %w", i, err)
diff --git a/cannon/mipsevm/program/load_test.go b/cannon/mipsevm/program/load_test.go
new file mode 100644
index 000000000000..32660a7f655c
--- /dev/null
+++ b/cannon/mipsevm/program/load_test.go
@@ -0,0 +1,83 @@
+package program
+
+import (
+	"debug/elf"
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program/testutil"
+)
+
+func TestLoadELF(t *testing.T) {
+	data := []byte{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88}
+	dataSize := uint64(len(data))
+	lastValidAddr := uint64(HEAP_START - 1)
+	lastAddr := uint64(^uint32(0))
+	if !arch.IsMips32 {
+		lastAddr = (1 << 48) - 1
+	}
+
+	tests := []struct {
+		name         string
+		progType     elf.ProgType
+		memSize      uint64
+		fileSize     uint64
+		vAddr        uint64
+		expectedErr  string
+		shouldIgnore bool
+	}{
+		{name: "Zero length segment", progType: elf.PT_LOAD, fileSize: 0, memSize: 0, vAddr: 0},
+		{name: "Zero length segment, non-zero fileSize", progType: elf.PT_LOAD, fileSize: 2, memSize: 0, vAddr: 0, expectedErr: "file size (2) > mem size (0)"},
+		{name: "Loadable segment, fileSize > memSize", progType: elf.PT_LOAD, fileSize: dataSize * 2, memSize: dataSize, vAddr: 0x4000, expectedErr: "file size (16) > mem size (8)"},
+		{name: "Loadable segment, fileSize < memSize", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize * 2, vAddr: 0x4000},
+		{name: "Loadable segment, fileSize == memSize", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize, vAddr: 0x4000},
+		{name: "Loadable segment, segment out-of-range", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize, vAddr: lastAddr - 1, expectedErr: "out of memory range"},
+		{name: "Loadable segment, segment just out-of-range", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize, vAddr: lastAddr - dataSize + 2, expectedErr: "out of memory range"},
+		{name: "Loadable segment, segment just in-range", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize, vAddr: lastAddr - dataSize + 1, expectedErr: "overlaps with heap"},
+		{name: "Loadable segment, segment overlaps heap", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize, vAddr: lastValidAddr - 1, expectedErr: "overlaps with heap"},
+		{name: "Loadable segment, segment just overlaps heap", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize, vAddr: lastValidAddr - dataSize + 2, expectedErr: "overlaps with heap"},
+		{name: "Loadable segment, segment ends just before heap", progType: elf.PT_LOAD, fileSize: dataSize, memSize: dataSize, vAddr: lastValidAddr - dataSize + 1},
+		{name: "MIPS Flags segment, invalid file size", progType: elf.PT_MIPS_ABIFLAGS, fileSize: dataSize * 2, memSize: dataSize, vAddr: 0x4000, shouldIgnore: true},
+		{name: "MIPS Flags segment, out-of-range", progType: elf.PT_MIPS_ABIFLAGS, fileSize: dataSize, memSize: dataSize, vAddr: lastAddr, shouldIgnore: true},
+		{name: "MIPS Flags segment, overlaps heap", progType: elf.PT_MIPS_ABIFLAGS, fileSize: dataSize, memSize: dataSize, vAddr: lastValidAddr, shouldIgnore: true},
+		{name: "Other segment, fileSize > memSize", progType: elf.PT_DYNAMIC, fileSize: dataSize * 2, memSize: dataSize, vAddr: 0x4000, expectedErr: "filling for non PT_LOAD segments is not supported"},
+		{name: "Other segment, memSize > fileSize", progType: elf.PT_DYNAMIC, fileSize: dataSize, memSize: dataSize * 2, vAddr: 0x4000, expectedErr: "filling for non PT_LOAD segments is not supported"},
+		{name: "Other segment, out-of-range", progType: elf.PT_DYNAMIC, fileSize: dataSize, memSize: dataSize, vAddr: lastAddr, expectedErr: "out of memory range"},
+		{name: "Other segment, overlaps heap", progType: elf.PT_DYNAMIC, fileSize: dataSize, memSize: dataSize, vAddr: lastValidAddr, expectedErr: "overlaps with heap"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			prog, reader := testutil.MockProgWithReader(tt.progType, tt.fileSize, tt.memSize, tt.vAddr, data)
+			progs := []*elf.Prog{prog}
+			mockFile := testutil.MockELFFile(progs)
+			state, err := LoadELF(mockFile, testutil.MockCreateInitState)
+
+			if tt.expectedErr != "" {
+				require.Error(t, err)
+				require.Contains(t, err.Error(), tt.expectedErr)
+			} else {
+				require.NoError(t, err)
+
+				if tt.shouldIgnore {
+					// No data should be read
+					require.Equal(t, reader.BytesRead, 0)
+				} else {
+					// Set up memory validation data
+					expectedData := make([]byte, tt.memSize)
+					copy(expectedData, data[:])
+					memReader := state.GetMemory().ReadMemoryRange(arch.Word(tt.vAddr), arch.Word(tt.memSize))
+					actualData, err := io.ReadAll(memReader)
+					require.NoError(t, err)
+
+					// Validate data was read into memory
+					require.Equal(t, reader.BytesRead, int(tt.fileSize))
+					require.Equal(t, actualData, expectedData)
+				}
+			}
+		})
+	}
+}
diff --git a/cannon/mipsevm/program/testutil/mocks.go b/cannon/mipsevm/program/testutil/mocks.go
new file mode 100644
index 000000000000..484527710aa5
--- /dev/null
+++ b/cannon/mipsevm/program/testutil/mocks.go
@@ -0,0 +1,130 @@
+package testutil
+
+import (
+	"debug/elf"
+	"io"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
+)
+
+// MockELFFile create a mock ELF file with custom program segments
+func MockELFFile(progs []*elf.Prog) *elf.File {
+	return &elf.File{Progs: progs}
+}
+
+// MockProg sets up a elf.Prog structure for testing
+func MockProg(progType elf.ProgType, filesz, memsz, vaddr uint64) *elf.Prog {
+	return &elf.Prog{
+		ProgHeader: elf.ProgHeader{
+			Type:   progType,
+			Filesz: filesz,
+			Memsz:  memsz,
+			Vaddr:  vaddr,
+		},
+	}
+}
+
+// MockProgWithReader creates an elf.Prog with a TrackableReaderAt to track reads
+func MockProgWithReader(progType elf.ProgType, filesz, memsz, vaddr uint64, data []byte) (*elf.Prog, *TrackableReaderAt) {
+	reader := &TrackableReaderAt{data: data}
+	prog := MockProg(progType, filesz, memsz, vaddr)
+	prog.ReaderAt = io.NewSectionReader(reader, 0, int64(filesz))
+	return prog, reader
+}
+
+// TrackableReaderAt tracks the number of bytes read
+type TrackableReaderAt struct {
+	data      []byte
+	BytesRead int
+}
+
+func (r *TrackableReaderAt) ReadAt(p []byte, offset int64) (int, error) {
+	if offset >= int64(len(r.data)) {
+		return 0, io.EOF
+	}
+	numBytesRead := copy(p, r.data[offset:])
+	r.BytesRead += numBytesRead
+	if numBytesRead < len(p) {
+		return numBytesRead, io.EOF
+	}
+	return numBytesRead, nil
+}
+
+// MockCreateInitState returns a mock FPVMState for testing
+func MockCreateInitState(pc, heapStart arch.Word) *MockFPVMState {
+	return newMockFPVMState()
+}
+
+type MockFPVMState struct {
+	memory *memory.Memory
+}
+
+var _ mipsevm.FPVMState = (*MockFPVMState)(nil)
+
+func newMockFPVMState() *MockFPVMState {
+	mem := memory.NewMemory()
+	state := MockFPVMState{mem}
+	return &state
+}
+
+func (m MockFPVMState) Serialize(out io.Writer) error {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetMemory() *memory.Memory {
+	return m.memory
+}
+
+func (m MockFPVMState) GetHeap() arch.Word {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetPreimageKey() common.Hash {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetPreimageOffset() arch.Word {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetPC() arch.Word {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetCpu() mipsevm.CpuScalars {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetRegistersRef() *[32]arch.Word {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetStep() uint64 {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetExited() bool {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetExitCode() uint8 {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) GetLastHint() hexutil.Bytes {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) EncodeWitness() (witness []byte, hash common.Hash) {
+	panic("not implemented")
+}
+
+func (m MockFPVMState) CreateVM(logger log.Logger, po mipsevm.PreimageOracle, stdOut, stdErr io.Writer, meta mipsevm.Metadata) mipsevm.FPVM {
+	panic("not implemented")
+}

From dbaedac2c74090b7d0aec4a97d6d09a04987dc51 Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Mon, 28 Oct 2024 21:51:24 +0100
Subject: [PATCH 064/451] op-node/rollup/derive: Implement pipeline stage
 multiplexing (#12506)

* op-node/rollup/derive: Implement pipeline stage multiplexing

* fix BatchStage empty batch generation

* fix fork configuration in LargeL1Gaps test
---
 op-chain-ops/genesis/config.go                |  76 ++++++++++-
 op-chain-ops/genesis/config_test.go           |  59 +++++++-
 op-e2e/actions/derivation/blocktime_test.go   |   9 +-
 op-e2e/actions/helpers/env.go                 |  83 +++++++++++
 op-e2e/actions/helpers/l1_miner.go            |   9 +-
 op-e2e/actions/helpers/l2_sequencer.go        |  37 +++--
 op-e2e/actions/proofs/helpers/matrix.go       |   7 +-
 .../proofs/sequence_window_expiry_test.go     |   9 +-
 op-e2e/actions/upgrades/helpers/config.go     |  20 ++-
 op-e2e/actions/upgrades/holocene_fork_test.go | 129 ++++++++++++++++++
 op-node/rollup/chain_spec.go                  |  56 ++++++--
 op-node/rollup/derive/attributes_queue.go     |  10 +-
 op-node/rollup/derive/batch_mux.go            |  76 +++++++++++
 op-node/rollup/derive/batch_mux_test.go       |  68 +++++++++
 op-node/rollup/derive/batch_queue.go          |  11 +-
 op-node/rollup/derive/batch_stage.go          |   5 +-
 op-node/rollup/derive/channel_assembler.go    |  10 +-
 .../rollup/derive/channel_assembler_test.go   |  14 +-
 op-node/rollup/derive/channel_bank.go         |  10 +-
 op-node/rollup/derive/channel_bank_test.go    |  80 ++++++-----
 op-node/rollup/derive/channel_in_reader.go    |  12 +-
 op-node/rollup/derive/channel_mux.go          |  74 ++++++++++
 op-node/rollup/derive/channel_mux_test.go     |  69 ++++++++++
 op-node/rollup/derive/frame_queue.go          |  24 +++-
 op-node/rollup/derive/pipeline.go             |  24 +++-
 op-node/rollup/types.go                       |  11 ++
 op-node/rollup/types_test.go                  |  16 +++
 27 files changed, 879 insertions(+), 129 deletions(-)
 create mode 100644 op-e2e/actions/helpers/env.go
 create mode 100644 op-e2e/actions/upgrades/holocene_fork_test.go
 create mode 100644 op-node/rollup/derive/batch_mux.go
 create mode 100644 op-node/rollup/derive/batch_mux_test.go
 create mode 100644 op-node/rollup/derive/channel_mux.go
 create mode 100644 op-node/rollup/derive/channel_mux_test.go

diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
index a150a8a7dafe..d89c124e6d31 100644
--- a/op-chain-ops/genesis/config.go
+++ b/op-chain-ops/genesis/config.go
@@ -369,6 +369,81 @@ func offsetToUpgradeTime(offset *hexutil.Uint64, genesisTime uint64) *uint64 {
 	return &v
 }
 
+func (d *UpgradeScheduleDeployConfig) ForkTimeOffset(fork rollup.ForkName) *uint64 {
+	switch fork {
+	case rollup.Regolith:
+		return (*uint64)(d.L2GenesisRegolithTimeOffset)
+	case rollup.Canyon:
+		return (*uint64)(d.L2GenesisCanyonTimeOffset)
+	case rollup.Delta:
+		return (*uint64)(d.L2GenesisDeltaTimeOffset)
+	case rollup.Ecotone:
+		return (*uint64)(d.L2GenesisEcotoneTimeOffset)
+	case rollup.Fjord:
+		return (*uint64)(d.L2GenesisFjordTimeOffset)
+	case rollup.Granite:
+		return (*uint64)(d.L2GenesisGraniteTimeOffset)
+	case rollup.Holocene:
+		return (*uint64)(d.L2GenesisHoloceneTimeOffset)
+	case rollup.Interop:
+		return (*uint64)(d.L2GenesisInteropTimeOffset)
+	default:
+		panic(fmt.Sprintf("unknown fork: %s", fork))
+	}
+}
+
+func (d *UpgradeScheduleDeployConfig) SetForkTimeOffset(fork rollup.ForkName, offset *uint64) {
+	switch fork {
+	case rollup.Regolith:
+		d.L2GenesisRegolithTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Canyon:
+		d.L2GenesisCanyonTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Delta:
+		d.L2GenesisDeltaTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Ecotone:
+		d.L2GenesisEcotoneTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Fjord:
+		d.L2GenesisFjordTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Granite:
+		d.L2GenesisGraniteTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Holocene:
+		d.L2GenesisHoloceneTimeOffset = (*hexutil.Uint64)(offset)
+	case rollup.Interop:
+		d.L2GenesisInteropTimeOffset = (*hexutil.Uint64)(offset)
+	default:
+		panic(fmt.Sprintf("unknown fork: %s", fork))
+	}
+}
+
+var scheduleableForks = rollup.ForksFrom(rollup.Regolith)
+
+// ActivateForkAtOffset activates the given fork at the given offset. Previous forks are activated
+// at genesis and later forks are deactivated.
+// If multiple forks should be activated at a later time than genesis, first call
+// ActivateForkAtOffset with the earliest fork and then SetForkTimeOffset to individually set later
+// forks.
+func (d *UpgradeScheduleDeployConfig) ActivateForkAtOffset(fork rollup.ForkName, offset uint64) {
+	if !rollup.IsValidFork(fork) || fork == rollup.Bedrock {
+		panic(fmt.Sprintf("invalid fork: %s", fork))
+	}
+	ts := new(uint64)
+	for i, f := range scheduleableForks {
+		if f == fork {
+			d.SetForkTimeOffset(fork, &offset)
+			ts = nil
+		} else {
+			d.SetForkTimeOffset(scheduleableForks[i], ts)
+		}
+	}
+}
+
+// ActivateForkAtGenesis activates the given fork, and all previous forks, at genesis.
+// Later forks are deactivated.
+// See also [ActivateForkAtOffset].
+func (d *UpgradeScheduleDeployConfig) ActivateForkAtGenesis(fork rollup.ForkName) {
+	d.ActivateForkAtOffset(fork, 0)
+}
+
 func (d *UpgradeScheduleDeployConfig) RegolithTime(genesisTime uint64) *uint64 {
 	return offsetToUpgradeTime(d.L2GenesisRegolithTimeOffset, genesisTime)
 }
@@ -402,7 +477,6 @@ func (d *UpgradeScheduleDeployConfig) InteropTime(genesisTime uint64) *uint64 {
 }
 
 func (d *UpgradeScheduleDeployConfig) AllocMode(genesisTime uint64) L2AllocsMode {
-
 	forks := d.forks()
 	for i := len(forks) - 1; i >= 0; i-- {
 		if forkTime := offsetToUpgradeTime(forks[i].L2GenesisTimeOffset, genesisTime); forkTime != nil && *forkTime == 0 {
diff --git a/op-chain-ops/genesis/config_test.go b/op-chain-ops/genesis/config_test.go
index d272d7afd2e5..47ffc4650822 100644
--- a/op-chain-ops/genesis/config_test.go
+++ b/op-chain-ops/genesis/config_test.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 )
 
@@ -45,7 +46,10 @@ func TestRegolithTimeZero(t *testing.T) {
 	config := &DeployConfig{
 		L2InitializationConfig: L2InitializationConfig{
 			UpgradeScheduleDeployConfig: UpgradeScheduleDeployConfig{
-				L2GenesisRegolithTimeOffset: &regolithOffset}}}
+				L2GenesisRegolithTimeOffset: &regolithOffset,
+			},
+		},
+	}
 	require.Equal(t, uint64(0), *config.RegolithTime(1234))
 }
 
@@ -54,7 +58,10 @@ func TestRegolithTimeAsOffset(t *testing.T) {
 	config := &DeployConfig{
 		L2InitializationConfig: L2InitializationConfig{
 			UpgradeScheduleDeployConfig: UpgradeScheduleDeployConfig{
-				L2GenesisRegolithTimeOffset: &regolithOffset}}}
+				L2GenesisRegolithTimeOffset: &regolithOffset,
+			},
+		},
+	}
 	require.Equal(t, uint64(1500+5000), *config.RegolithTime(5000))
 }
 
@@ -63,7 +70,10 @@ func TestCanyonTimeZero(t *testing.T) {
 	config := &DeployConfig{
 		L2InitializationConfig: L2InitializationConfig{
 			UpgradeScheduleDeployConfig: UpgradeScheduleDeployConfig{
-				L2GenesisCanyonTimeOffset: &canyonOffset}}}
+				L2GenesisCanyonTimeOffset: &canyonOffset,
+			},
+		},
+	}
 	require.Equal(t, uint64(0), *config.CanyonTime(1234))
 }
 
@@ -72,7 +82,10 @@ func TestCanyonTimeOffset(t *testing.T) {
 	config := &DeployConfig{
 		L2InitializationConfig: L2InitializationConfig{
 			UpgradeScheduleDeployConfig: UpgradeScheduleDeployConfig{
-				L2GenesisCanyonTimeOffset: &canyonOffset}}}
+				L2GenesisCanyonTimeOffset: &canyonOffset,
+			},
+		},
+	}
 	require.Equal(t, uint64(1234+1500), *config.CanyonTime(1234))
 }
 
@@ -124,3 +137,41 @@ func TestL1Deployments(t *testing.T) {
 	// One that doesn't exist returns empty string
 	require.Equal(t, "", deployments.GetName(common.Address{19: 0xff}))
 }
+
+// This test guarantees that getters and setters for all forks are present.
+func TestUpgradeScheduleDeployConfig_ForkGettersAndSetters(t *testing.T) {
+	var d UpgradeScheduleDeployConfig
+	for i, fork := range rollup.ForksFrom(rollup.Regolith) {
+		require.Nil(t, d.ForkTimeOffset(fork))
+		offset := uint64(i * 42)
+		d.SetForkTimeOffset(fork, &offset)
+		require.Equal(t, offset, *d.ForkTimeOffset(fork))
+	}
+}
+
+func TestUpgradeScheduleDeployConfig_ActivateForkAtOffset(t *testing.T) {
+	var d UpgradeScheduleDeployConfig
+	ts := uint64(42)
+	t.Run("invalid", func(t *testing.T) {
+		require.Panics(t, func() { d.ActivateForkAtOffset(rollup.Bedrock, ts) })
+	})
+
+	t.Run("regolith", func(t *testing.T) {
+		d.ActivateForkAtOffset(rollup.Regolith, ts)
+		require.EqualValues(t, &ts, d.L2GenesisRegolithTimeOffset)
+		for _, fork := range scheduleableForks[1:] {
+			require.Nil(t, d.ForkTimeOffset(fork))
+		}
+	})
+
+	t.Run("ecotone", func(t *testing.T) {
+		d.ActivateForkAtOffset(rollup.Ecotone, ts)
+		require.EqualValues(t, &ts, d.L2GenesisEcotoneTimeOffset)
+		for _, fork := range scheduleableForks[:3] {
+			require.Zero(t, *d.ForkTimeOffset(fork))
+		}
+		for _, fork := range scheduleableForks[4:] {
+			require.Nil(t, d.ForkTimeOffset(fork))
+		}
+	})
+}
diff --git a/op-e2e/actions/derivation/blocktime_test.go b/op-e2e/actions/derivation/blocktime_test.go
index 1855013aad6d..bd5594864af5 100644
--- a/op-e2e/actions/derivation/blocktime_test.go
+++ b/op-e2e/actions/derivation/blocktime_test.go
@@ -7,6 +7,7 @@ import (
 	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
 	upgradesHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/upgrades/helpers"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -163,11 +164,13 @@ func LargeL1Gaps(gt *testing.T, deltaTimeOffset *hexutil.Uint64) {
 	dp.DeployConfig.L2BlockTime = 2
 	dp.DeployConfig.SequencerWindowSize = 4
 	dp.DeployConfig.MaxSequencerDrift = 32
-	dp.DeployConfig.L2GenesisEcotoneTimeOffset = nil
-	dp.DeployConfig.L2GenesisFjordTimeOffset = nil
+	if deltaTimeOffset != nil {
+		dp.DeployConfig.ActivateForkAtOffset(rollup.Delta, uint64(*deltaTimeOffset))
+	} else {
+		dp.DeployConfig.ActivateForkAtGenesis(rollup.Canyon)
+	}
 	// TODO(client-pod#831): The Ecotone (and Fjord) activation blocks don't include user txs,
 	// so disabling these forks for now.
-	upgradesHelpers.ApplyDeltaTimeOffset(dp, deltaTimeOffset)
 	sd := e2eutils.Setup(t, dp, actionsHelpers.DefaultAlloc)
 	log := testlog.Logger(t, log.LevelDebug)
 
diff --git a/op-e2e/actions/helpers/env.go b/op-e2e/actions/helpers/env.go
new file mode 100644
index 000000000000..1bc270f4843f
--- /dev/null
+++ b/op-e2e/actions/helpers/env.go
@@ -0,0 +1,83 @@
+package helpers
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+)
+
+type Env struct {
+	Log  log.Logger
+	Logs *testlog.CapturingHandler
+
+	SetupData *e2eutils.SetupData
+
+	Miner       *L1Miner
+	Seq         *L2Sequencer
+	SeqEngine   *L2Engine
+	Verifier    *L2Verifier
+	VerifEngine *L2Engine
+	Batcher     *L2Batcher
+}
+
+type EnvOpt struct {
+	DeployConfigMod func(*genesis.DeployConfig)
+}
+
+func WithActiveFork(fork rollup.ForkName, offset uint64) EnvOpt {
+	return EnvOpt{
+		DeployConfigMod: func(d *genesis.DeployConfig) {
+			d.ActivateForkAtOffset(fork, offset)
+		},
+	}
+}
+
+func WithActiveGenesisFork(fork rollup.ForkName) EnvOpt {
+	return WithActiveFork(fork, 0)
+}
+
+// DefaultFork specifies the default fork to use when setting up the action test environment.
+// Currently manually set to Holocene.
+// Replace with `var DefaultFork = func() rollup.ForkName { return rollup.AllForks[len(rollup.AllForks)-1] }()` after Interop launch.
+const DefaultFork = rollup.Holocene
+
+// SetupEnv sets up a default action test environment. If no fork is specified, the default fork as
+// specified by the package variable [defaultFork] is used.
+func SetupEnv(t StatefulTesting, opts ...EnvOpt) (env Env) {
+	dp := e2eutils.MakeDeployParams(t, DefaultRollupTestParams())
+
+	log, logs := testlog.CaptureLogger(t, log.LevelDebug)
+	env.Log, env.Logs = log, logs
+
+	dp.DeployConfig.ActivateForkAtGenesis(DefaultFork)
+	for _, opt := range opts {
+		if dcMod := opt.DeployConfigMod; dcMod != nil {
+			dcMod(dp.DeployConfig)
+		}
+	}
+
+	sd := e2eutils.Setup(t, dp, DefaultAlloc)
+	env.SetupData = sd
+	env.Miner, env.SeqEngine, env.Seq = SetupSequencerTest(t, sd, log)
+	env.Miner.ActL1SetFeeRecipient(common.Address{'A'})
+	env.VerifEngine, env.Verifier = SetupVerifier(t, sd, log, env.Miner.L1Client(t, sd.RollupCfg), env.Miner.BlobStore(), &sync.Config{})
+	rollupSeqCl := env.Seq.RollupClient()
+	env.Batcher = NewL2Batcher(log, sd.RollupCfg, DefaultBatcherCfg(dp),
+		rollupSeqCl, env.Miner.EthClient(), env.SeqEngine.EthClient(), env.SeqEngine.EngineClient(t, sd.RollupCfg))
+
+	return
+}
+
+func (env Env) ActBatchSubmitAllAndMine(t Testing) (l1InclusionBlock *types.Block) {
+	env.Batcher.ActSubmitAll(t)
+	batchTx := env.Batcher.LastSubmitted
+	env.Miner.ActL1StartBlock(12)(t)
+	env.Miner.ActL1IncludeTxByHash(batchTx.Hash())(t)
+	return env.Miner.ActL1EndBlock(t)
+}
diff --git a/op-e2e/actions/helpers/l1_miner.go b/op-e2e/actions/helpers/l1_miner.go
index bf1bb415fe4f..108c11d3e166 100644
--- a/op-e2e/actions/helpers/l1_miner.go
+++ b/op-e2e/actions/helpers/l1_miner.go
@@ -203,10 +203,10 @@ func (s *L1Miner) ActL1SetFeeRecipient(coinbase common.Address) {
 }
 
 // ActL1EndBlock finishes the new L1 block, and applies it to the chain as unsafe block
-func (s *L1Miner) ActL1EndBlock(t Testing) {
+func (s *L1Miner) ActL1EndBlock(t Testing) *types.Block {
 	if !s.l1Building {
 		t.InvalidAction("cannot end L1 block when not building block")
-		return
+		return nil
 	}
 
 	s.l1Building = false
@@ -253,11 +253,12 @@ func (s *L1Miner) ActL1EndBlock(t Testing) {
 	if err != nil {
 		t.Fatalf("failed to insert block into l1 chain")
 	}
+	return block
 }
 
-func (s *L1Miner) ActEmptyBlock(t Testing) {
+func (s *L1Miner) ActEmptyBlock(t Testing) *types.Block {
 	s.ActL1StartBlock(12)(t)
-	s.ActL1EndBlock(t)
+	return s.ActL1EndBlock(t)
 }
 
 func (s *L1Miner) Close() error {
diff --git a/op-e2e/actions/helpers/l2_sequencer.go b/op-e2e/actions/helpers/l2_sequencer.go
index 8afed4fd32ce..23fe7b0686f8 100644
--- a/op-e2e/actions/helpers/l2_sequencer.go
+++ b/op-e2e/actions/helpers/l2_sequencer.go
@@ -52,7 +52,8 @@ type L2Sequencer struct {
 
 func NewL2Sequencer(t Testing, log log.Logger, l1 derive.L1Fetcher, blobSrc derive.L1BlobsFetcher,
 	altDASrc driver.AltDAIface, eng L2API, cfg *rollup.Config, seqConfDepth uint64,
-	interopBackend interop.InteropBackend) *L2Sequencer {
+	interopBackend interop.InteropBackend,
+) *L2Sequencer {
 	ver := NewL2Verifier(t, log, l1, blobSrc, altDASrc, eng, cfg, &sync.Config{}, safedb.Disabled, interopBackend)
 	attrBuilder := derive.NewFetchingAttributesBuilder(cfg, l1, eng)
 	seqConfDepthL1 := confdepth.NewConfDepth(seqConfDepth, ver.syncStatus.L1Head, l1)
@@ -130,6 +131,11 @@ func (s *L2Sequencer) ActL2EndBlock(t Testing) {
 		"sync status must be accurate after block building")
 }
 
+func (s *L2Sequencer) ActL2EmptyBlock(t Testing) {
+	s.ActL2StartBlock(t)
+	s.ActL2EndBlock(t)
+}
+
 // ActL2KeepL1Origin makes the sequencer use the current L1 origin, even if the next origin is available.
 func (s *L2Sequencer) ActL2KeepL1Origin(t Testing) {
 	parent := s.engine.UnsafeL2Head()
@@ -143,8 +149,7 @@ func (s *L2Sequencer) ActL2KeepL1Origin(t Testing) {
 func (s *L2Sequencer) ActBuildToL1Head(t Testing) {
 	for s.engine.UnsafeL2Head().L1Origin.Number < s.syncStatus.L1Head().Number {
 		s.ActL2PipelineFull(t)
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
 
@@ -152,8 +157,7 @@ func (s *L2Sequencer) ActBuildToL1Head(t Testing) {
 func (s *L2Sequencer) ActBuildToL1HeadUnsafe(t Testing) {
 	for s.engine.UnsafeL2Head().L1Origin.Number < s.syncStatus.L1Head().Number {
 		// Note: the derivation pipeline does not run, we are just sequencing a block on top of the existing L2 chain.
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
 
@@ -166,8 +170,7 @@ func (s *L2Sequencer) ActBuildToL1HeadExcl(t Testing) {
 		if nextOrigin.Number >= s.syncStatus.L1Head().Number {
 			break
 		}
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
 
@@ -180,44 +183,40 @@ func (s *L2Sequencer) ActBuildToL1HeadExclUnsafe(t Testing) {
 		if nextOrigin.Number >= s.syncStatus.L1Head().Number {
 			break
 		}
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
 
 func (s *L2Sequencer) ActBuildL2ToTime(t Testing, target uint64) {
 	for s.L2Unsafe().Time < target {
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
 
 func (s *L2Sequencer) ActBuildL2ToEcotone(t Testing) {
 	require.NotNil(t, s.RollupCfg.EcotoneTime, "cannot activate Ecotone when it is not scheduled")
 	for s.L2Unsafe().Time < *s.RollupCfg.EcotoneTime {
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
+
 func (s *L2Sequencer) ActBuildL2ToFjord(t Testing) {
 	require.NotNil(t, s.RollupCfg.FjordTime, "cannot activate FjordTime when it is not scheduled")
 	for s.L2Unsafe().Time < *s.RollupCfg.FjordTime {
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
+
 func (s *L2Sequencer) ActBuildL2ToGranite(t Testing) {
 	require.NotNil(t, s.RollupCfg.GraniteTime, "cannot activate GraniteTime when it is not scheduled")
 	for s.L2Unsafe().Time < *s.RollupCfg.GraniteTime {
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
 
 func (s *L2Sequencer) ActBuildL2ToHolocene(t Testing) {
 	require.NotNil(t, s.RollupCfg.HoloceneTime, "cannot activate HoloceneTime when it is not scheduled")
 	for s.L2Unsafe().Time < *s.RollupCfg.HoloceneTime {
-		s.ActL2StartBlock(t)
-		s.ActL2EndBlock(t)
+		s.ActL2EmptyBlock(t)
 	}
 }
diff --git a/op-e2e/actions/proofs/helpers/matrix.go b/op-e2e/actions/proofs/helpers/matrix.go
index 2b4ed5a0ded2..ff6bf2ad77b6 100644
--- a/op-e2e/actions/proofs/helpers/matrix.go
+++ b/op-e2e/actions/proofs/helpers/matrix.go
@@ -89,9 +89,12 @@ var (
 	Granite  = &Hardfork{Name: "Granite", Precedence: 6}
 	Holocene = &Hardfork{Name: "Holocene", Precedence: 7}
 )
-var Hardforks = ForkMatrix{Regolith, Canyon, Delta, Ecotone, Fjord, Granite, Holocene}
 
-var LatestForkOnly = ForkMatrix{Hardforks[len(Hardforks)-1]}
+var (
+	Hardforks      = ForkMatrix{Regolith, Canyon, Delta, Ecotone, Fjord, Granite, Holocene}
+	LatestFork     = Hardforks[len(Hardforks)-1]
+	LatestForkOnly = ForkMatrix{LatestFork}
+)
 
 func NewForkMatrix(forks ...*Hardfork) ForkMatrix {
 	return append(ForkMatrix{}, forks...)
diff --git a/op-e2e/actions/proofs/sequence_window_expiry_test.go b/op-e2e/actions/proofs/sequence_window_expiry_test.go
index 3f5ca9562d4b..cb702fe8eb6a 100644
--- a/op-e2e/actions/proofs/sequence_window_expiry_test.go
+++ b/op-e2e/actions/proofs/sequence_window_expiry_test.go
@@ -132,17 +132,18 @@ func Test_ProgramAction_SequenceWindowExpired(gt *testing.T) {
 	matrix := helpers.NewMatrix[any]()
 	defer matrix.Run(gt)
 
+	forks := helpers.ForkMatrix{helpers.Granite, helpers.LatestFork}
 	matrix.AddTestCase(
 		"HonestClaim",
 		nil,
-		helpers.LatestForkOnly,
+		forks,
 		runSequenceWindowExpireTest,
 		helpers.ExpectNoError(),
 	)
 	matrix.AddTestCase(
 		"JunkClaim",
 		nil,
-		helpers.LatestForkOnly,
+		forks,
 		runSequenceWindowExpireTest,
 		helpers.ExpectError(claim.ErrClaimNotValid),
 		helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
@@ -150,14 +151,14 @@ func Test_ProgramAction_SequenceWindowExpired(gt *testing.T) {
 	matrix.AddTestCase(
 		"ChannelCloseAfterWindowExpiry-HonestClaim",
 		nil,
-		helpers.LatestForkOnly,
+		forks,
 		runSequenceWindowExpire_ChannelCloseAfterWindowExpiry_Test,
 		helpers.ExpectNoError(),
 	)
 	matrix.AddTestCase(
 		"ChannelCloseAfterWindowExpiry-JunkClaim",
 		nil,
-		helpers.LatestForkOnly,
+		forks,
 		runSequenceWindowExpire_ChannelCloseAfterWindowExpiry_Test,
 		helpers.ExpectError(claim.ErrClaimNotValid),
 		helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
diff --git a/op-e2e/actions/upgrades/helpers/config.go b/op-e2e/actions/upgrades/helpers/config.go
index 1c844afd3265..c09d0be48b6c 100644
--- a/op-e2e/actions/upgrades/helpers/config.go
+++ b/op-e2e/actions/upgrades/helpers/config.go
@@ -8,7 +8,6 @@ import (
 // ApplyDeltaTimeOffset adjusts fork configuration to not conflict with the delta overrides
 func ApplyDeltaTimeOffset(dp *e2eutils.DeployParams, deltaTimeOffset *hexutil.Uint64) {
 	dp.DeployConfig.L2GenesisDeltaTimeOffset = deltaTimeOffset
-	dp.DeployConfig.L2GenesisGraniteTimeOffset = nil
 	// configure Ecotone to not be before Delta accidentally
 	if dp.DeployConfig.L2GenesisEcotoneTimeOffset != nil {
 		if deltaTimeOffset == nil {
@@ -17,6 +16,7 @@ func ApplyDeltaTimeOffset(dp *e2eutils.DeployParams, deltaTimeOffset *hexutil.Ui
 			dp.DeployConfig.L2GenesisEcotoneTimeOffset = deltaTimeOffset
 		}
 	}
+
 	// configure Fjord to not be before Delta accidentally
 	if dp.DeployConfig.L2GenesisFjordTimeOffset != nil {
 		if deltaTimeOffset == nil {
@@ -25,4 +25,22 @@ func ApplyDeltaTimeOffset(dp *e2eutils.DeployParams, deltaTimeOffset *hexutil.Ui
 			dp.DeployConfig.L2GenesisFjordTimeOffset = deltaTimeOffset
 		}
 	}
+
+	// configure Granite to not be before Delta accidentally
+	if dp.DeployConfig.L2GenesisGraniteTimeOffset != nil {
+		if deltaTimeOffset == nil {
+			dp.DeployConfig.L2GenesisGraniteTimeOffset = nil
+		} else if *dp.DeployConfig.L2GenesisGraniteTimeOffset < *deltaTimeOffset {
+			dp.DeployConfig.L2GenesisGraniteTimeOffset = deltaTimeOffset
+		}
+	}
+
+	// configure Holocene to not be before Delta accidentally
+	if dp.DeployConfig.L2GenesisHoloceneTimeOffset != nil {
+		if deltaTimeOffset == nil {
+			dp.DeployConfig.L2GenesisHoloceneTimeOffset = nil
+		} else if *dp.DeployConfig.L2GenesisHoloceneTimeOffset < *deltaTimeOffset {
+			dp.DeployConfig.L2GenesisHoloceneTimeOffset = deltaTimeOffset
+		}
+	}
 }
diff --git a/op-e2e/actions/upgrades/holocene_fork_test.go b/op-e2e/actions/upgrades/holocene_fork_test.go
new file mode 100644
index 000000000000..d9145b3d50ff
--- /dev/null
+++ b/op-e2e/actions/upgrades/holocene_fork_test.go
@@ -0,0 +1,129 @@
+package upgrades
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/stretchr/testify/require"
+)
+
+func TestHoloceneActivationAtGenesis(gt *testing.T) {
+	t := helpers.NewDefaultTesting(gt)
+	env := helpers.SetupEnv(t, helpers.WithActiveGenesisFork(rollup.Holocene))
+
+	// Start op-nodes
+	env.Seq.ActL2PipelineFull(t)
+	env.Verifier.ActL2PipelineFull(t)
+
+	// Verify Holocene is active at genesis
+	l2Head := env.Seq.L2Unsafe()
+	require.NotZero(t, l2Head.Hash)
+	require.True(t, env.SetupData.RollupCfg.IsHolocene(l2Head.Time), "Holocene should be active at genesis")
+
+	// build empty L1 block
+	env.Miner.ActEmptyBlock(t)
+
+	// Build L2 chain and advance safe head
+	env.Seq.ActL1HeadSignal(t)
+	env.Seq.ActBuildToL1Head(t)
+
+	// verify in logs that correct stage got activated
+	recs := env.Logs.FindLogs(testlog.NewMessageContainsFilter("activating Holocene stage during reset"), testlog.NewAttributesFilter("role", e2esys.RoleSeq))
+	require.Len(t, recs, 2)
+	recs = env.Logs.FindLogs(testlog.NewMessageContainsFilter("activating Holocene stage during reset"), testlog.NewAttributesFilter("role", e2esys.RoleVerif))
+	require.Len(t, recs, 2)
+
+	env.ActBatchSubmitAllAndMine(t)
+
+	// verifier picks up the L2 chain that was submitted
+	env.Verifier.ActL1HeadSignal(t)
+	env.Verifier.ActL2PipelineFull(t)
+	require.Equal(t, env.Verifier.L2Safe(), env.Seq.L2Unsafe(), "verifier syncs from sequencer via L1")
+	require.NotEqual(t, env.Seq.L2Safe(), env.Seq.L2Unsafe(), "sequencer has not processed L1 yet")
+}
+
+func TestHoloceneLateActivationAndReset(gt *testing.T) {
+	t := helpers.NewDefaultTesting(gt)
+	holoceneOffset := uint64(24)
+	env := helpers.SetupEnv(t, helpers.WithActiveFork(rollup.Holocene, holoceneOffset))
+
+	requireHoloceneTransformationLogs := func(role string, expNumLogs int) {
+		recs := env.Logs.FindLogs(testlog.NewMessageContainsFilter("transforming to Holocene"), testlog.NewAttributesFilter("role", role))
+		require.Len(t, recs, expNumLogs)
+		if expNumLogs > 0 {
+			fqRecs := env.Logs.FindLogs(testlog.NewMessageFilter("FrameQueue: resetting with Holocene activation"), testlog.NewAttributesFilter("role", role))
+			require.Len(t, fqRecs, 1)
+		}
+	}
+
+	requirePreHoloceneActivationLogs := func(role string, expNumLogs int) {
+		recs := env.Logs.FindLogs(testlog.NewMessageContainsFilter("activating pre-Holocene stage during reset"), testlog.NewAttributesFilter("role", role))
+		require.Len(t, recs, expNumLogs)
+	}
+
+	// Start op-nodes
+	env.Seq.ActL2PipelineFull(t)
+	env.Verifier.ActL2PipelineFull(t)
+
+	// Verify Holocene is not active at genesis yet
+	l2Head := env.Seq.L2Unsafe()
+	require.NotZero(t, l2Head.Hash)
+	require.True(t, env.SetupData.RollupCfg.IsGranite(l2Head.Time), "Granite should be active at genesis")
+	require.False(t, env.SetupData.RollupCfg.IsHolocene(l2Head.Time), "Holocene should not be active at genesis")
+
+	requirePreHoloceneActivationLogs(e2esys.RoleSeq, 2)
+	requirePreHoloceneActivationLogs(e2esys.RoleVerif, 2)
+	// Verify no stage transformations took place yet
+	requireHoloceneTransformationLogs(e2esys.RoleSeq, 0)
+	requireHoloceneTransformationLogs(e2esys.RoleVerif, 0)
+
+	env.Seq.ActL2EmptyBlock(t)
+	l1PreHolocene := env.ActBatchSubmitAllAndMine(t)
+	require.False(t, env.SetupData.RollupCfg.IsHolocene(l1PreHolocene.Time()),
+		"Holocene should not be active at the first L1 inclusion block")
+
+	// Build a few L2 blocks. We only need the L1 inclusion to advance past Holocene and Holocene
+	// shouldn't activate with L2 time.
+	env.Seq.ActBuildL2ToHolocene(t)
+
+	// verify in logs that stage transformations hasn't happened yet, activates by L1 inclusion block
+	requireHoloceneTransformationLogs(e2esys.RoleSeq, 0)
+	requireHoloceneTransformationLogs(e2esys.RoleVerif, 0)
+
+	// Submit L2
+	l1Head := env.ActBatchSubmitAllAndMine(t)
+	require.True(t, env.SetupData.RollupCfg.IsHolocene(l1Head.Time()))
+
+	// verifier picks up the L2 chain that was submitted
+	env.Verifier.ActL1HeadSignal(t)
+	env.Verifier.ActL2PipelineFull(t)
+	l2Safe := env.Verifier.L2Safe()
+	require.Equal(t, l2Safe, env.Seq.L2Unsafe(), "verifier syncs from sequencer via L1")
+	require.NotEqual(t, env.Seq.L2Safe(), env.Seq.L2Unsafe(), "sequencer has not processed L1 yet")
+	require.True(t, env.SetupData.RollupCfg.IsHolocene(l2Safe.Time), "Holocene should now be active")
+	requireHoloceneTransformationLogs(e2esys.RoleSeq, 0)
+	requireHoloceneTransformationLogs(e2esys.RoleVerif, 2)
+
+	// sequencer also picks up L2 safe chain
+	env.Seq.ActL1HeadSignal(t)
+	env.Seq.ActL2PipelineFull(t)
+	requireHoloceneTransformationLogs(e2esys.RoleSeq, 2)
+	require.Equal(t, env.Seq.L2Safe(), env.Seq.L2Unsafe(), "sequencer has processed L1")
+
+	// reorg L1 without batch submission
+	env.Miner.ActL1RewindToParent(t)
+	env.Miner.ActEmptyBlock(t)
+	env.Miner.ActEmptyBlock(t)
+
+	env.Seq.ActL1HeadSignal(t)
+	env.Verifier.ActL1HeadSignal(t)
+	env.Seq.ActL2PipelineFull(t)
+	env.Verifier.ActL2PipelineFull(t)
+
+	// duplicate activation logs
+	requirePreHoloceneActivationLogs(e2esys.RoleSeq, 4)
+	requirePreHoloceneActivationLogs(e2esys.RoleVerif, 4)
+}
diff --git a/op-node/rollup/chain_spec.go b/op-node/rollup/chain_spec.go
index 66d2e526d0d1..1ddcb3190290 100644
--- a/op-node/rollup/chain_spec.go
+++ b/op-node/rollup/chain_spec.go
@@ -1,6 +1,7 @@
 package rollup
 
 import (
+	"fmt"
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-node/params"
@@ -41,19 +42,47 @@ const (
 	Granite  ForkName = "granite"
 	Holocene ForkName = "holocene"
 	Interop  ForkName = "interop"
-	None     ForkName = "none"
+	// ADD NEW FORKS TO AllForks BELOW!
+	None ForkName = "none"
 )
 
-var nextFork = map[ForkName]ForkName{
-	Bedrock:  Regolith,
-	Regolith: Canyon,
-	Canyon:   Delta,
-	Delta:    Ecotone,
-	Ecotone:  Fjord,
-	Fjord:    Granite,
-	Granite:  Holocene,
-	Holocene: Interop,
-	Interop:  None,
+var AllForks = []ForkName{
+	Bedrock,
+	Regolith,
+	Canyon,
+	Delta,
+	Ecotone,
+	Fjord,
+	Granite,
+	Holocene,
+	Interop,
+	// ADD NEW FORKS HERE!
+}
+
+func ForksFrom(fork ForkName) []ForkName {
+	for i, f := range AllForks {
+		if f == fork {
+			return AllForks[i:]
+		}
+	}
+	panic(fmt.Sprintf("invalid fork: %s", fork))
+}
+
+var nextFork = func() map[ForkName]ForkName {
+	m := make(map[ForkName]ForkName, len(AllForks))
+	for i, f := range AllForks {
+		if i == len(AllForks)-1 {
+			m[f] = None
+			break
+		}
+		m[f] = AllForks[i+1]
+	}
+	return m
+}()
+
+func IsValidFork(fork ForkName) bool {
+	_, ok := nextFork[fork]
+	return ok
 }
 
 type ChainSpec struct {
@@ -80,6 +109,11 @@ func (s *ChainSpec) IsCanyon(t uint64) bool {
 	return s.config.IsCanyon(t)
 }
 
+// IsHolocene returns true if t >= holocene_time
+func (s *ChainSpec) IsHolocene(t uint64) bool {
+	return s.config.IsHolocene(t)
+}
+
 // MaxChannelBankSize returns the maximum number of bytes the can allocated inside the channel bank
 // before pruning occurs at the given timestamp.
 func (s *ChainSpec) MaxChannelBankSize(t uint64) uint64 {
diff --git a/op-node/rollup/derive/attributes_queue.go b/op-node/rollup/derive/attributes_queue.go
index c15079c6bfa9..0111ba29c8e5 100644
--- a/op-node/rollup/derive/attributes_queue.go
+++ b/op-node/rollup/derive/attributes_queue.go
@@ -39,12 +39,18 @@ type AttributesQueue struct {
 	log          log.Logger
 	config       *rollup.Config
 	builder      AttributesBuilder
-	prev         *BatchQueue
+	prev         SingularBatchProvider
 	batch        *SingularBatch
 	isLastInSpan bool
 }
 
-func NewAttributesQueue(log log.Logger, cfg *rollup.Config, builder AttributesBuilder, prev *BatchQueue) *AttributesQueue {
+type SingularBatchProvider interface {
+	ResettableStage
+	Origin() eth.L1BlockRef
+	NextBatch(context.Context, eth.L2BlockRef) (*SingularBatch, bool, error)
+}
+
+func NewAttributesQueue(log log.Logger, cfg *rollup.Config, builder AttributesBuilder, prev SingularBatchProvider) *AttributesQueue {
 	return &AttributesQueue{
 		log:     log,
 		config:  cfg,
diff --git a/op-node/rollup/derive/batch_mux.go b/op-node/rollup/derive/batch_mux.go
new file mode 100644
index 000000000000..ea8336a59b1e
--- /dev/null
+++ b/op-node/rollup/derive/batch_mux.go
@@ -0,0 +1,76 @@
+package derive
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/log"
+	"golang.org/x/exp/slices"
+)
+
+// BatchMux multiplexes between different batch stages.
+// Stages are swapped on demand during Reset calls, or explicitly with Transform.
+// It currently chooses the BatchQueue pre-Holocene and the BatchStage post-Holocene.
+type BatchMux struct {
+	log  log.Logger
+	cfg  *rollup.Config
+	prev NextBatchProvider
+	l2   SafeBlockFetcher
+
+	// embedded active stage
+	SingularBatchProvider
+}
+
+var _ SingularBatchProvider = (*BatchMux)(nil)
+
+// NewBatchMux returns an uninitialized BatchMux. Reset has to be called before
+// calling other methods, to activate the right stage for a given L1 origin.
+func NewBatchMux(lgr log.Logger, cfg *rollup.Config, prev NextBatchProvider, l2 SafeBlockFetcher) *BatchMux {
+	return &BatchMux{log: lgr, cfg: cfg, prev: prev, l2: l2}
+}
+
+func (b *BatchMux) Reset(ctx context.Context, base eth.L1BlockRef, sysCfg eth.SystemConfig) error {
+	// TODO(12490): change to a switch over b.cfg.ActiveFork(base.Time)
+	switch {
+	default:
+		if _, ok := b.SingularBatchProvider.(*BatchQueue); !ok {
+			b.log.Info("BatchMux: activating pre-Holocene stage during reset", "origin", base)
+			b.SingularBatchProvider = NewBatchQueue(b.log, b.cfg, b.prev, b.l2)
+		}
+	case b.cfg.IsHolocene(base.Time):
+		if _, ok := b.SingularBatchProvider.(*BatchStage); !ok {
+			b.log.Info("BatchMux: activating Holocene stage during reset", "origin", base)
+			b.SingularBatchProvider = NewBatchStage(b.log, b.cfg, b.prev, b.l2)
+		}
+	}
+	return b.SingularBatchProvider.Reset(ctx, base, sysCfg)
+}
+
+func (b *BatchMux) Transform(f rollup.ForkName) {
+	switch f {
+	case rollup.Holocene:
+		b.TransformHolocene()
+	}
+}
+
+func (b *BatchMux) TransformHolocene() {
+	switch bp := b.SingularBatchProvider.(type) {
+	case *BatchQueue:
+		b.log.Info("BatchMux: transforming to Holocene stage")
+		bs := NewBatchStage(b.log, b.cfg, b.prev, b.l2)
+		// Even though any ongoing span batch or queued batches are dropped at Holocene activation, the
+		// post-Holocene batch stage still needs access to the collected l1Blocks pre-Holocene because
+		// the first Holocene channel will contain pre-Holocene batches.
+		bs.l1Blocks = slices.Clone(bp.l1Blocks)
+		bs.origin = bp.origin
+		b.SingularBatchProvider = bs
+	case *BatchStage:
+		// Even if the pipeline is Reset to the activation block, the previous origin will be the
+		// same, so transfromStages isn't called.
+		panic(fmt.Sprintf("Holocene BatchStage already active, old origin: %v", bp.Origin()))
+	default:
+		panic(fmt.Sprintf("unknown batch stage type: %T", bp))
+	}
+}
diff --git a/op-node/rollup/derive/batch_mux_test.go b/op-node/rollup/derive/batch_mux_test.go
new file mode 100644
index 000000000000..2afc25a69dc2
--- /dev/null
+++ b/op-node/rollup/derive/batch_mux_test.go
@@ -0,0 +1,68 @@
+package derive
+
+import (
+	"context"
+	"io"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+)
+
+func TestBatchMux_LaterHolocene(t *testing.T) {
+	log := testlog.Logger(t, log.LevelTrace)
+	ctx := context.Background()
+	l1A := eth.L1BlockRef{Time: 0, Hash: common.Hash{0xaa}}
+	l1B := eth.L1BlockRef{Time: 12, Hash: common.Hash{0xbb}}
+	cfg := &rollup.Config{
+		HoloceneTime: &l1B.Time,
+	}
+	b := NewBatchMux(log, cfg, nil, nil)
+
+	require.Nil(t, b.SingularBatchProvider)
+
+	err := b.Reset(ctx, l1A, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(BatchQueue), b.SingularBatchProvider)
+	require.Equal(t, l1A, b.SingularBatchProvider.(*BatchQueue).origin)
+
+	b.Transform(rollup.Holocene)
+	require.IsType(t, new(BatchStage), b.SingularBatchProvider)
+	require.Equal(t, l1A, b.SingularBatchProvider.(*BatchStage).origin)
+
+	err = b.Reset(ctx, l1B, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(BatchStage), b.SingularBatchProvider)
+	require.Equal(t, l1B, b.SingularBatchProvider.(*BatchStage).origin)
+
+	err = b.Reset(ctx, l1A, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(BatchQueue), b.SingularBatchProvider)
+	require.Equal(t, l1A, b.SingularBatchProvider.(*BatchQueue).origin)
+}
+
+func TestBatchMux_ActiveHolocene(t *testing.T) {
+	log := testlog.Logger(t, log.LevelTrace)
+	ctx := context.Background()
+	l1A := eth.L1BlockRef{Time: 42, Hash: common.Hash{0xaa}}
+	cfg := &rollup.Config{
+		HoloceneTime: &l1A.Time,
+	}
+	// without the fake input, the panic check later would panic because of the Origin() call
+	prev := &fakeBatchQueueInput{origin: l1A}
+	b := NewBatchMux(log, cfg, prev, nil)
+
+	require.Nil(t, b.SingularBatchProvider)
+
+	err := b.Reset(ctx, l1A, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(BatchStage), b.SingularBatchProvider)
+	require.Equal(t, l1A, b.SingularBatchProvider.(*BatchStage).origin)
+
+	require.Panics(t, func() { b.Transform(rollup.Holocene) })
+}
diff --git a/op-node/rollup/derive/batch_queue.go b/op-node/rollup/derive/batch_queue.go
index b2f27ea27f3a..25199297144e 100644
--- a/op-node/rollup/derive/batch_queue.go
+++ b/op-node/rollup/derive/batch_queue.go
@@ -49,6 +49,8 @@ type baseBatchStage struct {
 	log    log.Logger
 	config *rollup.Config
 	prev   NextBatchProvider
+	l2     SafeBlockFetcher
+
 	origin eth.L1BlockRef
 
 	// l1Blocks contains consecutive eth.L1BlockRef sorted by time.
@@ -61,8 +63,6 @@ type baseBatchStage struct {
 
 	// nextSpan is cached SingularBatches derived from SpanBatch
 	nextSpan []*SingularBatch
-
-	l2 SafeBlockFetcher
 }
 
 func newBaseBatchStage(log log.Logger, cfg *rollup.Config, prev NextBatchProvider, l2 SafeBlockFetcher) baseBatchStage {
@@ -86,11 +86,6 @@ func (bs *baseBatchStage) Log() log.Logger {
 	}
 }
 
-type SingularBatchProvider interface {
-	ResettableStage
-	NextBatch(context.Context, eth.L2BlockRef) (*SingularBatch, bool, error)
-}
-
 // BatchQueue contains a set of batches for every L1 block.
 // L1 blocks are contiguous and this does not support reorgs.
 type BatchQueue struct {
@@ -262,10 +257,10 @@ func (bs *baseBatchStage) reset(base eth.L1BlockRef) {
 	// Copy over the Origin from the next stage
 	// It is set in the engine queue (two stages away) such that the L2 Safe Head origin is the progress
 	bs.origin = base
+	bs.l1Blocks = bs.l1Blocks[:0]
 	// Include the new origin as an origin to build on
 	// Note: This is only for the initialization case. During normal resets we will later
 	// throw out this block.
-	bs.l1Blocks = bs.l1Blocks[:0]
 	bs.l1Blocks = append(bs.l1Blocks, base)
 	bs.nextSpan = bs.nextSpan[:0]
 }
diff --git a/op-node/rollup/derive/batch_stage.go b/op-node/rollup/derive/batch_stage.go
index 22fdbc157158..4e4b171b4c9e 100644
--- a/op-node/rollup/derive/batch_stage.go
+++ b/op-node/rollup/derive/batch_stage.go
@@ -15,6 +15,8 @@ type BatchStage struct {
 	baseBatchStage
 }
 
+var _ SingularBatchProvider = (*BatchStage)(nil)
+
 func NewBatchStage(log log.Logger, cfg *rollup.Config, prev NextBatchProvider, l2 SafeBlockFetcher) *BatchStage {
 	return &BatchStage{baseBatchStage: newBaseBatchStage(log, cfg, prev, l2)}
 }
@@ -68,7 +70,8 @@ func (bs *BatchStage) NextBatch(ctx context.Context, parent eth.L2BlockRef) (*Si
 		// We only consider empty batch generation after we've drained all batches from the local
 		// span batch queue and the previous stage.
 		empty, err := bs.deriveNextEmptyBatch(ctx, true, parent)
-		return empty, false, err
+		// An empty batch always advances the safe head.
+		return empty, true, err
 	} else if err != nil {
 		return nil, false, err
 	}
diff --git a/op-node/rollup/derive/channel_assembler.go b/op-node/rollup/derive/channel_assembler.go
index 6d1424f46a32..6252bd217b71 100644
--- a/op-node/rollup/derive/channel_assembler.go
+++ b/op-node/rollup/derive/channel_assembler.go
@@ -20,16 +20,16 @@ type ChannelAssembler struct {
 	prev NextFrameProvider
 }
 
-var _ ResettableStage = (*ChannelAssembler)(nil)
+var _ RawChannelProvider = (*ChannelAssembler)(nil)
 
 type ChannelStageSpec interface {
 	ChannelTimeout(t uint64) uint64
 	MaxRLPBytesPerChannel(t uint64) uint64
 }
 
-// NewChannelStage creates a Holocene ChannelStage.
-// It must only be used for derivation from Holocene activation.
-func NewChannelStage(log log.Logger, spec ChannelStageSpec, prev NextFrameProvider, m Metrics) *ChannelAssembler {
+// NewChannelAssembler creates the Holocene channel stage.
+// It must only be used for derivation from Holocene origins.
+func NewChannelAssembler(log log.Logger, spec ChannelStageSpec, prev NextFrameProvider, m Metrics) *ChannelAssembler {
 	return &ChannelAssembler{
 		log:     log,
 		spec:    spec,
@@ -60,7 +60,7 @@ func (ca *ChannelAssembler) channelTimedOut() bool {
 	return ca.channel.OpenBlockNumber()+ca.spec.ChannelTimeout(ca.Origin().Time) < ca.Origin().Number
 }
 
-func (ca *ChannelAssembler) NextData(ctx context.Context) ([]byte, error) {
+func (ca *ChannelAssembler) NextRawChannel(ctx context.Context) ([]byte, error) {
 	if ca.channel != nil && ca.channelTimedOut() {
 		ca.metrics.RecordChannelTimedOut()
 		ca.resetChannel()
diff --git a/op-node/rollup/derive/channel_assembler_test.go b/op-node/rollup/derive/channel_assembler_test.go
index 77dc1d87f7e3..75429e5bae58 100644
--- a/op-node/rollup/derive/channel_assembler_test.go
+++ b/op-node/rollup/derive/channel_assembler_test.go
@@ -110,11 +110,11 @@ func TestChannelStage_NextData(t *testing.T) {
 
 				MaxRLPBytesPerChannelOverride: tc.rlpOverride,
 			}
-			cs := NewChannelStage(lgr, spec, fq, metrics.NoopMetrics)
+			cs := NewChannelAssembler(lgr, spec, fq, metrics.NoopMetrics)
 
 			for i, fs := range tc.frames {
 				fq.AddFrames(fs...)
-				data, err := cs.NextData(context.Background())
+				data, err := cs.NextRawChannel(context.Background())
 				require.Equal(t, tc.expData[i], string(data))
 				require.ErrorIs(t, tc.expErr[i], err)
 				// invariant: never holds a ready channel
@@ -129,7 +129,7 @@ func TestChannelStage_NextData(t *testing.T) {
 			}
 
 			// final call should always be io.EOF after exhausting frame queue
-			data, err := cs.NextData(context.Background())
+			data, err := cs.NextRawChannel(context.Background())
 			require.Nil(t, data)
 			require.Equal(t, io.EOF, err)
 		})
@@ -141,10 +141,10 @@ func TestChannelStage_NextData_Timeout(t *testing.T) {
 	fq := &fakeChannelBankInput{}
 	lgr := testlog.Logger(t, slog.LevelWarn)
 	spec := rollup.NewChainSpec(&rollup.Config{GraniteTime: ptr(uint64(0))}) // const channel timeout
-	cs := NewChannelStage(lgr, spec, fq, metrics.NoopMetrics)
+	cs := NewChannelAssembler(lgr, spec, fq, metrics.NoopMetrics)
 
 	fq.AddFrames("a:0:foo")
-	data, err := cs.NextData(context.Background())
+	data, err := cs.NextRawChannel(context.Background())
 	require.Nil(data)
 	require.Equal(io.EOF, err)
 	require.NotNil(cs.channel)
@@ -153,7 +153,7 @@ func TestChannelStage_NextData_Timeout(t *testing.T) {
 	// move close to timeout
 	fq.origin.Number = spec.ChannelTimeout(0)
 	fq.AddFrames("a:1:bar")
-	data, err = cs.NextData(context.Background())
+	data, err = cs.NextRawChannel(context.Background())
 	require.Nil(data)
 	require.Equal(io.EOF, err)
 	require.NotNil(cs.channel)
@@ -162,7 +162,7 @@ func TestChannelStage_NextData_Timeout(t *testing.T) {
 	// timeout channel by moving origin past timeout
 	fq.origin.Number = spec.ChannelTimeout(0) + 1
 	fq.AddFrames("a:2:baz!")
-	data, err = cs.NextData(context.Background())
+	data, err = cs.NextRawChannel(context.Background())
 	require.Nil(data)
 	require.Equal(io.EOF, err)
 	require.Nil(cs.channel)
diff --git a/op-node/rollup/derive/channel_bank.go b/op-node/rollup/derive/channel_bank.go
index 39582d2712fa..f26cb34b7fcf 100644
--- a/op-node/rollup/derive/channel_bank.go
+++ b/op-node/rollup/derive/channel_bank.go
@@ -40,13 +40,13 @@ type ChannelBank struct {
 	prev NextFrameProvider
 }
 
-var _ ResettableStage = (*ChannelBank)(nil)
+var _ RawChannelProvider = (*ChannelBank)(nil)
 
 // NewChannelBank creates a ChannelBank, which should be Reset(origin) before use.
-func NewChannelBank(log log.Logger, cfg *rollup.Config, prev NextFrameProvider, m Metrics) *ChannelBank {
+func NewChannelBank(log log.Logger, spec *rollup.ChainSpec, prev NextFrameProvider, m Metrics) *ChannelBank {
 	return &ChannelBank{
 		log:          log,
-		spec:         rollup.NewChainSpec(cfg),
+		spec:         spec,
 		metrics:      m,
 		channels:     make(map[ChannelID]*Channel),
 		channelQueue: make([]ChannelID, 0, 10),
@@ -170,12 +170,12 @@ func (cb *ChannelBank) tryReadChannelAtIndex(i int) (data []byte, err error) {
 	return data, nil
 }
 
-// NextData pulls the next piece of data from the channel bank.
+// NextRawChannel pulls the next piece of data from the channel bank.
 // Note that it attempts to pull data out of the channel bank prior to
 // loading data in (unlike most other stages). This is to ensure maintain
 // consistency around channel bank pruning which depends upon the order
 // of operations.
-func (cb *ChannelBank) NextData(ctx context.Context) ([]byte, error) {
+func (cb *ChannelBank) NextRawChannel(ctx context.Context) ([]byte, error) {
 	// Do the read from the channel bank first
 	data, err := cb.Read()
 	if err == io.EOF {
diff --git a/op-node/rollup/derive/channel_bank_test.go b/op-node/rollup/derive/channel_bank_test.go
index 75b7503400b1..7b0baddf2373 100644
--- a/op-node/rollup/derive/channel_bank_test.go
+++ b/op-node/rollup/derive/channel_bank_test.go
@@ -106,32 +106,31 @@ func TestChannelBankSimple(t *testing.T) {
 	input.AddFrames("a:0:first", "a:2:third!")
 	input.AddFrames("a:1:second")
 
-	cfg := &rollup.Config{ChannelTimeoutBedrock: 10}
-
-	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), cfg, input, metrics.NoopMetrics)
+	spec := rollup.NewChainSpec(&rollup.Config{ChannelTimeoutBedrock: 10})
+	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), spec, input, metrics.NoopMetrics)
 
 	// Load the first frame
-	out, err := cb.NextData(context.Background())
+	out, err := cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load the third frame
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load the second frame
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Pull out the channel data
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, err)
 	require.Equal(t, "firstsecondthird", string(out))
 
 	// No more data
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, out)
 	require.Equal(t, io.EOF, err)
 }
@@ -149,52 +148,51 @@ func TestChannelBankInterleavedPreCanyon(t *testing.T) {
 	input.AddFrames("b:0:premiere")
 	input.AddFrames("a:1:second")
 
-	cfg := &rollup.Config{ChannelTimeoutBedrock: 10, CanyonTime: nil}
-
-	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), cfg, input, metrics.NoopMetrics)
+	spec := rollup.NewChainSpec(&rollup.Config{ChannelTimeoutBedrock: 10})
+	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), spec, input, metrics.NoopMetrics)
 
 	// Load a:0
-	out, err := cb.NextData(context.Background())
+	out, err := cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load b:2
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load b:1
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load a:2
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load b:0 & Channel b is complete, but channel a was opened first
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load a:1
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Pull out the channel a
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, err)
 	require.Equal(t, "firstsecondthird", string(out))
 
 	// Pull out the channel b
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, err)
 	require.Equal(t, "premieredeuxtrois", string(out))
 
 	// No more data
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, out)
 	require.Equal(t, io.EOF, err)
 }
@@ -213,52 +211,51 @@ func TestChannelBankInterleaved(t *testing.T) {
 	input.AddFrames("a:1:second")
 
 	ct := uint64(0)
-	cfg := &rollup.Config{ChannelTimeoutBedrock: 10, CanyonTime: &ct}
-
-	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), cfg, input, metrics.NoopMetrics)
+	spec := rollup.NewChainSpec(&rollup.Config{ChannelTimeoutBedrock: 10, CanyonTime: &ct})
+	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), spec, input, metrics.NoopMetrics)
 
 	// Load a:0
-	out, err := cb.NextData(context.Background())
+	out, err := cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load b:2
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load b:1
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load a:2
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load b:0 & Channel b is complete. Channel a was opened first but isn't ready
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Pull out the channel b because it's ready first.
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, err)
 	require.Equal(t, "premieredeuxtrois", string(out))
 
 	// Load a:1
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Pull out the channel a
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, err)
 	require.Equal(t, "firstsecondthird", string(out))
 
 	// No more data
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, out)
 	require.Equal(t, io.EOF, err)
 }
@@ -272,40 +269,39 @@ func TestChannelBankDuplicates(t *testing.T) {
 	input.AddFrames("a:0:altfirst", "a:2:altthird!")
 	input.AddFrames("a:1:second")
 
-	cfg := &rollup.Config{ChannelTimeoutBedrock: 10}
-
-	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), cfg, input, metrics.NoopMetrics)
+	spec := rollup.NewChainSpec(&rollup.Config{ChannelTimeoutBedrock: 10})
+	cb := NewChannelBank(testlog.Logger(t, log.LevelCrit), spec, input, metrics.NoopMetrics)
 
 	// Load the first frame
-	out, err := cb.NextData(context.Background())
+	out, err := cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load the third frame
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load the duplicate frames
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Load the second frame
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.ErrorIs(t, err, NotEnoughData)
 	require.Equal(t, []byte(nil), out)
 
 	// Pull out the channel data. Expect to see the original set & not the duplicates
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, err)
 	require.Equal(t, "firstsecondthird", string(out))
 
 	// No more data
-	out, err = cb.NextData(context.Background())
+	out, err = cb.NextRawChannel(context.Background())
 	require.Nil(t, out)
 	require.Equal(t, io.EOF, err)
 }
diff --git a/op-node/rollup/derive/channel_in_reader.go b/op-node/rollup/derive/channel_in_reader.go
index 2aabf6bc9fdd..6310fba600c9 100644
--- a/op-node/rollup/derive/channel_in_reader.go
+++ b/op-node/rollup/derive/channel_in_reader.go
@@ -21,7 +21,7 @@ type ChannelInReader struct {
 	spec        *rollup.ChainSpec
 	cfg         *rollup.Config
 	nextBatchFn func() (*BatchData, error)
-	prev        *ChannelBank
+	prev        RawChannelProvider
 	metrics     Metrics
 }
 
@@ -30,8 +30,14 @@ var (
 	_ ChannelFlusher  = (*ChannelInReader)(nil)
 )
 
+type RawChannelProvider interface {
+	ResettableStage
+	Origin() eth.L1BlockRef
+	NextRawChannel(ctx context.Context) ([]byte, error)
+}
+
 // NewChannelInReader creates a ChannelInReader, which should be Reset(origin) before use.
-func NewChannelInReader(cfg *rollup.Config, log log.Logger, prev *ChannelBank, metrics Metrics) *ChannelInReader {
+func NewChannelInReader(cfg *rollup.Config, log log.Logger, prev RawChannelProvider, metrics Metrics) *ChannelInReader {
 	return &ChannelInReader{
 		spec:    rollup.NewChainSpec(cfg),
 		cfg:     cfg,
@@ -68,7 +74,7 @@ func (cr *ChannelInReader) NextChannel() {
 // It will return a temporary error if it needs to be called again to advance some internal state.
 func (cr *ChannelInReader) NextBatch(ctx context.Context) (Batch, error) {
 	if cr.nextBatchFn == nil {
-		if data, err := cr.prev.NextData(ctx); err == io.EOF {
+		if data, err := cr.prev.NextRawChannel(ctx); err == io.EOF {
 			return nil, io.EOF
 		} else if err != nil {
 			return nil, err
diff --git a/op-node/rollup/derive/channel_mux.go b/op-node/rollup/derive/channel_mux.go
new file mode 100644
index 000000000000..cb5ce66baffe
--- /dev/null
+++ b/op-node/rollup/derive/channel_mux.go
@@ -0,0 +1,74 @@
+package derive
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+// ChannelMux multiplexes between different channel stages.
+// Stages are swapped on demand during Reset calls, or explicitly with Transform.
+// It currently chooses the ChannelBank pre-Holocene and the ChannelAssembler post-Holocene.
+type ChannelMux struct {
+	log  log.Logger
+	spec *rollup.ChainSpec
+	prev NextFrameProvider
+	m    Metrics
+
+	// embedded active stage
+	RawChannelProvider
+}
+
+var _ RawChannelProvider = (*ChannelMux)(nil)
+
+// NewChannelMux returns a ChannelMux with the ChannelBank as activated stage. Reset has to be called before
+// calling other methods, to activate the right stage for a given L1 origin.
+func NewChannelMux(log log.Logger, spec *rollup.ChainSpec, prev NextFrameProvider, m Metrics) *ChannelMux {
+	return &ChannelMux{
+		log:  log,
+		spec: spec,
+		prev: prev,
+		m:    m,
+	}
+}
+
+func (c *ChannelMux) Reset(ctx context.Context, base eth.L1BlockRef, sysCfg eth.SystemConfig) error {
+	// TODO(12490): change to a switch over c.cfg.ActiveFork(base.Time)
+	switch {
+	default:
+		if _, ok := c.RawChannelProvider.(*ChannelBank); !ok {
+			c.log.Info("ChannelMux: activating pre-Holocene stage during reset", "origin", base)
+			c.RawChannelProvider = NewChannelBank(c.log, c.spec, c.prev, c.m)
+		}
+	case c.spec.IsHolocene(base.Time):
+		if _, ok := c.RawChannelProvider.(*ChannelAssembler); !ok {
+			c.log.Info("ChannelMux: activating Holocene stage during reset", "origin", base)
+			c.RawChannelProvider = NewChannelAssembler(c.log, c.spec, c.prev, c.m)
+		}
+	}
+	return c.RawChannelProvider.Reset(ctx, base, sysCfg)
+}
+
+func (c *ChannelMux) Transform(f rollup.ForkName) {
+	switch f {
+	case rollup.Holocene:
+		c.TransformHolocene()
+	}
+}
+
+func (c *ChannelMux) TransformHolocene() {
+	switch cp := c.RawChannelProvider.(type) {
+	case *ChannelBank:
+		c.log.Info("ChannelMux: transforming to Holocene stage")
+		c.RawChannelProvider = NewChannelAssembler(c.log, c.spec, c.prev, c.m)
+	case *ChannelAssembler:
+		// Even if the pipeline is Reset to the activation block, the previous origin will be the
+		// same, so transfromStages isn't called.
+		panic(fmt.Sprintf("Holocene ChannelAssembler already active, old origin: %v", cp.Origin()))
+	default:
+		panic(fmt.Sprintf("unknown channel stage type: %T", cp))
+	}
+}
diff --git a/op-node/rollup/derive/channel_mux_test.go b/op-node/rollup/derive/channel_mux_test.go
new file mode 100644
index 000000000000..59fd669922ae
--- /dev/null
+++ b/op-node/rollup/derive/channel_mux_test.go
@@ -0,0 +1,69 @@
+package derive
+
+import (
+	"context"
+	"io"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-node/metrics"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+)
+
+func TestChannelMux_LaterHolocene(t *testing.T) {
+	log := testlog.Logger(t, log.LevelTrace)
+	ctx := context.Background()
+	l1A := eth.L1BlockRef{Time: 0, Hash: common.Hash{0xaa}}
+	l1B := eth.L1BlockRef{Time: 12, Hash: common.Hash{0xbb}}
+	cfg := &rollup.Config{
+		HoloceneTime: &l1B.Time,
+	}
+	spec := rollup.NewChainSpec(cfg)
+	m := metrics.NoopMetrics
+	c := NewChannelMux(log, spec, nil, m)
+
+	require.Nil(t, c.RawChannelProvider)
+
+	err := c.Reset(ctx, l1A, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(ChannelBank), c.RawChannelProvider)
+
+	c.Transform(rollup.Holocene)
+	require.IsType(t, new(ChannelAssembler), c.RawChannelProvider)
+
+	err = c.Reset(ctx, l1B, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(ChannelAssembler), c.RawChannelProvider)
+
+	err = c.Reset(ctx, l1A, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(ChannelBank), c.RawChannelProvider)
+}
+
+func TestChannelMux_ActiveHolocene(t *testing.T) {
+	log := testlog.Logger(t, log.LevelTrace)
+	ctx := context.Background()
+	l1A := eth.L1BlockRef{Time: 42, Hash: common.Hash{0xaa}}
+	cfg := &rollup.Config{
+		HoloceneTime: &l1A.Time,
+	}
+	spec := rollup.NewChainSpec(cfg)
+	// without the fake input, the panic check later would panic because of the Origin() call
+	prev := &fakeChannelBankInput{}
+	m := metrics.NoopMetrics
+	c := NewChannelMux(log, spec, prev, m)
+
+	require.Nil(t, c.RawChannelProvider)
+
+	err := c.Reset(ctx, l1A, eth.SystemConfig{})
+	require.Equal(t, io.EOF, err)
+	require.IsType(t, new(ChannelAssembler), c.RawChannelProvider)
+
+	require.Panics(t, func() { c.Transform(rollup.Holocene) })
+}
diff --git a/op-node/rollup/derive/frame_queue.go b/op-node/rollup/derive/frame_queue.go
index 77a2703290ce..361f1cfda886 100644
--- a/op-node/rollup/derive/frame_queue.go
+++ b/op-node/rollup/derive/frame_queue.go
@@ -10,7 +10,10 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
-var _ NextFrameProvider = &FrameQueue{}
+var (
+	_ NextFrameProvider = (*FrameQueue)(nil)
+	_ ForkTransformer   = (*FrameQueue)(nil)
+)
 
 //go:generate mockery --name NextDataProvider --case snake
 type NextDataProvider interface {
@@ -33,13 +36,20 @@ func NewFrameQueue(log log.Logger, cfg *rollup.Config, prev NextDataProvider) *F
 	}
 }
 
+func (fq *FrameQueue) Transform(f rollup.ForkName) {
+	switch f {
+	case rollup.Holocene:
+		fq.log.Info("FrameQueue: resetting with Holocene activation")
+		// With Holocene activation, the frame queue is simply reset
+		fq.reset()
+	}
+}
+
 func (fq *FrameQueue) Origin() eth.L1BlockRef {
 	return fq.prev.Origin()
 }
 
 func (fq *FrameQueue) NextFrame(ctx context.Context) (Frame, error) {
-	// TODO(12157): reset frame queue once at Holocene L1 origin block
-
 	// Only load more frames if necessary
 	if len(fq.frames) == 0 {
 		if err := fq.loadNextFrames(ctx); err != nil {
@@ -129,7 +139,11 @@ func pruneFrameQueue(frames []Frame) []Frame {
 	return frames
 }
 
-func (fq *FrameQueue) Reset(_ context.Context, _ eth.L1BlockRef, _ eth.SystemConfig) error {
-	fq.frames = fq.frames[:0]
+func (fq *FrameQueue) Reset(context.Context, eth.L1BlockRef, eth.SystemConfig) error {
+	fq.reset()
 	return io.EOF
 }
+
+func (fq *FrameQueue) reset() {
+	fq.frames = fq.frames[:0]
+}
diff --git a/op-node/rollup/derive/pipeline.go b/op-node/rollup/derive/pipeline.go
index f114e2a4b0d3..95189b35e100 100644
--- a/op-node/rollup/derive/pipeline.go
+++ b/op-node/rollup/derive/pipeline.go
@@ -38,6 +38,10 @@ type ResettableStage interface {
 	Reset(ctx context.Context, base eth.L1BlockRef, baseCfg eth.SystemConfig) error
 }
 
+type ForkTransformer interface {
+	Transform(rollup.ForkName)
+}
+
 type L2Source interface {
 	PayloadByHash(context.Context, common.Hash) (*eth.ExecutionPayloadEnvelope, error)
 	PayloadByNumber(context.Context, uint64) (*eth.ExecutionPayloadEnvelope, error)
@@ -79,14 +83,15 @@ type DerivationPipeline struct {
 func NewDerivationPipeline(log log.Logger, rollupCfg *rollup.Config, l1Fetcher L1Fetcher, l1Blobs L1BlobsFetcher,
 	altDA AltDAInputFetcher, l2Source L2Source, metrics Metrics,
 ) *DerivationPipeline {
+	spec := rollup.NewChainSpec(rollupCfg)
 	// Pull stages
 	l1Traversal := NewL1Traversal(log, rollupCfg, l1Fetcher)
 	dataSrc := NewDataSourceFactory(log, rollupCfg, l1Fetcher, l1Blobs, altDA) // auxiliary stage for L1Retrieval
 	l1Src := NewL1Retrieval(log, dataSrc, l1Traversal)
 	frameQueue := NewFrameQueue(log, rollupCfg, l1Src)
-	bank := NewChannelBank(log, rollupCfg, frameQueue, metrics)
+	bank := NewChannelMux(log, spec, frameQueue, metrics)
 	chInReader := NewChannelInReader(rollupCfg, log, bank, metrics)
-	batchQueue := NewBatchQueue(log, rollupCfg, chInReader, l2Source)
+	batchQueue := NewBatchMux(log, rollupCfg, chInReader, l2Source)
 	attrBuilder := NewFetchingAttributesBuilder(rollupCfg, l1Fetcher, l2Source)
 	attributesQueue := NewAttributesQueue(log, rollupCfg, attrBuilder, batchQueue)
 
@@ -177,6 +182,7 @@ func (dp *DerivationPipeline) Step(ctx context.Context, pendingSafeHead eth.L2Bl
 		if err := VerifyNewL1Origin(ctx, prevOrigin, dp.l1Fetcher, newOrigin); err != nil {
 			return nil, fmt.Errorf("failed to verify L1 origin transition: %w", err)
 		}
+		dp.transformStages(prevOrigin, newOrigin)
 		dp.origin = newOrigin
 	}
 
@@ -238,6 +244,20 @@ func (dp *DerivationPipeline) initialReset(ctx context.Context, resetL2Safe eth.
 	return nil
 }
 
+func (db *DerivationPipeline) transformStages(oldOrigin, newOrigin eth.L1BlockRef) {
+	fork := db.rollupCfg.IsActivationBlock(oldOrigin.Time, newOrigin.Time)
+	if fork == "" {
+		return
+	}
+
+	db.log.Info("Transforming stages", "fork", fork)
+	for _, stage := range db.stages {
+		if tf, ok := stage.(ForkTransformer); ok {
+			tf.Transform(fork)
+		}
+	}
+}
+
 func (dp *DerivationPipeline) ConfirmEngineReset() {
 	dp.engineIsReset = true
 }
diff --git a/op-node/rollup/types.go b/op-node/rollup/types.go
index 42036ba372e9..e5e541a6f7a5 100644
--- a/op-node/rollup/types.go
+++ b/op-node/rollup/types.go
@@ -465,6 +465,17 @@ func (c *Config) IsInteropActivationBlock(l2BlockTime uint64) bool {
 		!c.IsInterop(l2BlockTime-c.BlockTime)
 }
 
+// IsActivationBlock returns the fork which activates at the block with time newTime if the previous
+// block's time is oldTime. It return an empty ForkName if no fork activation takes place between
+// those timestamps. It can be used for both, L1 and L2 blocks.
+// TODO(12490): Currently only supports Holocene. Will be modularized in a follow-up.
+func (c *Config) IsActivationBlock(oldTime, newTime uint64) ForkName {
+	if c.IsHolocene(newTime) && !c.IsHolocene(oldTime) {
+		return Holocene
+	}
+	return ""
+}
+
 func (c *Config) ActivateAtGenesis(hardfork ForkName) {
 	// IMPORTANT! ordered from newest to oldest
 	switch hardfork {
diff --git a/op-node/rollup/types_test.go b/op-node/rollup/types_test.go
index 4b2575afa391..11c4db505c96 100644
--- a/op-node/rollup/types_test.go
+++ b/op-node/rollup/types_test.go
@@ -701,3 +701,19 @@ func TestGetPayloadVersion(t *testing.T) {
 		})
 	}
 }
+
+func TestConfig_IsActivationBlock(t *testing.T) {
+	ts := uint64(42)
+	// TODO(12490): Currently only supports Holocene. Will be modularized in a follow-up.
+	for _, fork := range []ForkName{Holocene} {
+		cfg := &Config{
+			HoloceneTime: &ts,
+		}
+		require.Equal(t, fork, cfg.IsActivationBlock(0, ts))
+		require.Equal(t, fork, cfg.IsActivationBlock(0, ts+64))
+		require.Equal(t, fork, cfg.IsActivationBlock(ts-1, ts))
+		require.Equal(t, fork, cfg.IsActivationBlock(ts-1, ts+1))
+		require.Zero(t, cfg.IsActivationBlock(0, ts-1))
+		require.Zero(t, cfg.IsActivationBlock(ts, ts+1))
+	}
+}

From eeb5c5a008aadcbf879d37988f7a435ee65faa91 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 28 Oct 2024 17:28:29 -0700
Subject: [PATCH 065/451] cannon: Update stf verify image (#12706)

---
 cannon/Dockerfile.diff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cannon/Dockerfile.diff b/cannon/Dockerfile.diff
index dcdd3587e681..20664a25139b 100644
--- a/cannon/Dockerfile.diff
+++ b/cannon/Dockerfile.diff
@@ -23,7 +23,7 @@ ARG GIT_DATE
 
 ARG TARGETOS TARGETARCH
 
-FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.1.0-alpha.1 AS cannon-v2
+FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.1.0-alpha.2 AS cannon-v2
 
 FROM --platform=$BUILDPLATFORM builder as cannon-verify
 COPY --from=cannon-v2 /usr/local/bin/cannon /usr/local/bin/cannon-v2

From 0797d147bb7408cec54e4c9a505210f6fdd8b713 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 28 Oct 2024 18:43:57 -0700
Subject: [PATCH 066/451] proofs-tools: Update challenger (#12707)

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 50feeba66d45..66a36b294bec 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -206,7 +206,7 @@ target "proofs-tools" {
   dockerfile = "./ops/docker/proofs-tools/Dockerfile"
   context = "."
   args = {
-    CHALLENGER_VERSION="22d8365199b3141fcfbccc7cb9e107a71e151b0a"
+    CHALLENGER_VERSION="005116d9b4e39c7ba0586ce95ceba4067123efd5"
     KONA_VERSION="kona-client-v0.1.0-alpha.5"
   }
   target="proofs-tools"

From cc42cc55749cc108ff396fe8086c09c2b464c1e0 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Tue, 29 Oct 2024 14:10:52 +1000
Subject: [PATCH 067/451] signer: Restore default of enabling TLS. (#12713)

Can be disabled with --signer.tls.enabled=false. Avoids breaking existing deployments that default to TLS enabled.
---
 op-challenger/cmd/main_test.go | 12 ++++++++++++
 op-service/tls/cli.go          | 26 +++++++++++++++++---------
 op-service/tls/cli_test.go     |  7 +++++++
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/op-challenger/cmd/main_test.go b/op-challenger/cmd/main_test.go
index d471f45dc594..d960fa607059 100644
--- a/op-challenger/cmd/main_test.go
+++ b/op-challenger/cmd/main_test.go
@@ -937,6 +937,18 @@ func TestAdditionalBondClaimants(t *testing.T) {
 	})
 }
 
+func TestSignerTLS(t *testing.T) {
+	t.Run("EnabledByDefault", func(t *testing.T) {
+		cfg := configForArgs(t, addRequiredArgs(types.TraceTypeAlphabet))
+		require.True(t, cfg.TxMgrConfig.SignerCLIConfig.TLSConfig.Enabled)
+	})
+
+	t.Run("Disabled", func(t *testing.T) {
+		cfg := configForArgs(t, addRequiredArgs(types.TraceTypeAlphabet, "--signer.tls.enabled=false"))
+		require.False(t, cfg.TxMgrConfig.SignerCLIConfig.TLSConfig.Enabled)
+	})
+}
+
 func verifyArgsInvalid(t *testing.T, messageContains string, cliArgs []string) {
 	_, _, err := dryRunWithArgs(cliArgs)
 	require.ErrorContains(t, err, messageContains)
diff --git a/op-service/tls/cli.go b/op-service/tls/cli.go
index b00b084cd339..e2e086e922c3 100644
--- a/op-service/tls/cli.go
+++ b/op-service/tls/cli.go
@@ -12,9 +12,10 @@ import (
 )
 
 const (
-	TLSCaCertFlagName = "tls.ca"
-	TLSCertFlagName   = "tls.cert"
-	TLSKeyFlagName    = "tls.key"
+	TLSCaCertFlagName  = "tls.ca"
+	TLSCertFlagName    = "tls.cert"
+	TLSKeyFlagName     = "tls.key"
+	TLSEnabledFlagName = "tls.enabled"
 )
 
 // CLIFlags returns flags with env var envPrefix
@@ -24,9 +25,10 @@ func CLIFlags(envPrefix string) []cli.Flag {
 }
 
 var (
-	defaultTLSCaCert = "tls/ca.crt"
-	defaultTLSCert   = "tls/tls.crt"
-	defaultTLSKey    = "tls/tls.key"
+	defaultTLSCaCert  = "tls/ca.crt"
+	defaultTLSCert    = "tls/tls.crt"
+	defaultTLSKey     = "tls/tls.key"
+	defaultTLSEnabled = true
 )
 
 // CLIFlagsWithFlagPrefix returns flags with env var and cli flag prefixes
@@ -39,6 +41,12 @@ func CLIFlagsWithFlagPrefix(envPrefix string, flagPrefix string) []cli.Flag {
 		return opservice.PrefixEnvVar(envPrefix, name)
 	}
 	return []cli.Flag{
+		&cli.BoolFlag{
+			Name:    prefixFunc(TLSEnabledFlagName),
+			Usage:   "Enable or disable TLS client authentication for the signer",
+			Value:   defaultTLSEnabled,
+			EnvVars: prefixEnvVars("TLS_ENABLED"),
+		},
 		&cli.StringFlag{
 			Name:    prefixFunc(TLSCaCertFlagName),
 			Usage:   "tls ca cert path",
@@ -72,7 +80,7 @@ func NewCLIConfig() CLIConfig {
 		TLSCaCert: defaultTLSCaCert,
 		TLSCert:   defaultTLSCert,
 		TLSKey:    defaultTLSKey,
-		Enabled:   false,
+		Enabled:   true,
 	}
 }
 
@@ -95,7 +103,7 @@ func ReadCLIConfig(ctx *cli.Context) CLIConfig {
 		TLSCaCert: ctx.String(TLSCaCertFlagName),
 		TLSCert:   ctx.String(TLSCertFlagName),
 		TLSKey:    ctx.String(TLSKeyFlagName),
-		Enabled:   ctx.IsSet(TLSCaCertFlagName) || ctx.IsSet(TLSCertFlagName) || ctx.IsSet(TLSKeyFlagName),
+		Enabled:   ctx.Bool(TLSEnabledFlagName),
 	}
 }
 
@@ -109,6 +117,6 @@ func ReadCLIConfigWithPrefix(ctx *cli.Context, flagPrefix string) CLIConfig {
 		TLSCaCert: ctx.String(prefixFunc(TLSCaCertFlagName)),
 		TLSCert:   ctx.String(prefixFunc(TLSCertFlagName)),
 		TLSKey:    ctx.String(prefixFunc(TLSKeyFlagName)),
-		Enabled:   ctx.IsSet(TLSCaCertFlagName) || ctx.IsSet(TLSCertFlagName) || ctx.IsSet(TLSKeyFlagName),
+		Enabled:   ctx.Bool(prefixFunc(TLSEnabledFlagName)),
 	}
 }
diff --git a/op-service/tls/cli_test.go b/op-service/tls/cli_test.go
index f926a19fabdd..bd4ea4bf17c9 100644
--- a/op-service/tls/cli_test.go
+++ b/op-service/tls/cli_test.go
@@ -1,6 +1,7 @@
 package tls
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -41,6 +42,12 @@ func TestInvalidConfig(t *testing.T) {
 			err := cfg.Check()
 			require.ErrorContains(t, err, "all tls flags must be set if at least one is set")
 		})
+		t.Run(fmt.Sprintf("%sAllowedWhenDisabled", test.name), func(t *testing.T) {
+			cfg := NewCLIConfig()
+			cfg.Enabled = false
+			test.configChange(&cfg)
+			require.NoError(t, cfg.Check())
+		})
 	}
 }
 

From 0d923d3951efc245f0e1f80a959ba9bdc8b0308b Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Tue, 29 Oct 2024 14:14:23 +1000
Subject: [PATCH 068/451] ci: Fix proofs-team reference (#12716)

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4db56cb4d3d1..22edd29aa5ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1031,7 +1031,7 @@ jobs:
           paths:
             - "/root/.cache/go-build"
       - notify-failures-on-develop:
-          mentions: "@proofs-squad"
+          mentions: "@proofs-team"
 
   semgrep-scan:
     parameters:

From b46bffed42db3442d7484f089278d59f51503049 Mon Sep 17 00:00:00 2001
From: Ashutosh Varma <ashutoshvarma11@live.com>
Date: Tue, 29 Oct 2024 09:44:45 +0530
Subject: [PATCH 069/451] op-deployer: use dev keys for vaults in new intent
 (#12679)

* fix: use devkeys for vaults in intent

* feat: parametrized keys on l2 chain id
---
 op-deployer/pkg/deployer/init.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/op-deployer/pkg/deployer/init.go b/op-deployer/pkg/deployer/init.go
index a81ef6f48a24..e8044f75a8c0 100644
--- a/op-deployer/pkg/deployer/init.go
+++ b/op-deployer/pkg/deployer/init.go
@@ -118,9 +118,9 @@ func Init(cfg InitConfig) error {
 		l2ChainIDBig := l2ChainID.Big()
 		intent.Chains = append(intent.Chains, &state.ChainIntent{
 			ID:                         l2ChainID,
-			BaseFeeVaultRecipient:      common.Address{},
-			L1FeeVaultRecipient:        common.Address{},
-			SequencerFeeVaultRecipient: common.Address{},
+			BaseFeeVaultRecipient:      addrFor(devkeys.BaseFeeVaultRecipientRole.Key(l2ChainIDBig)),
+			L1FeeVaultRecipient:        addrFor(devkeys.L1FeeVaultRecipientRole.Key(l2ChainIDBig)),
+			SequencerFeeVaultRecipient: addrFor(devkeys.SequencerFeeVaultRecipientRole.Key(l2ChainIDBig)),
 			Eip1559Denominator:         50,
 			Eip1559Elasticity:          6,
 			Roles: state.ChainRoles{

From 1ca85526e8d6a2e48df6589e6f8454d7fd725e4a Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Mon, 28 Oct 2024 23:48:16 -0500
Subject: [PATCH 070/451] Interop: Expanded E2E Tests (#12659)

* Expand Interop E2E Testing

* fix test ; address comment
---
 op-e2e/interop/interop_test.go                | 223 +++++++++++++-----
 op-e2e/interop/supersystem.go                 |  10 +-
 op-service/sources/supervisor_client.go       |  68 ++++--
 op-supervisor/supervisor/backend/backend.go   |   4 +-
 op-supervisor/supervisor/backend/db/query.go  |   2 +-
 .../backend/processors/contracts/l2inbox.go   |  17 +-
 .../processors/contracts/l2inbox_test.go      |   2 +-
 .../backend/processors/log_processor.go       |  14 +-
 op-supervisor/supervisor/types/types.go       |  13 +
 9 files changed, 242 insertions(+), 111 deletions(-)

diff --git a/op-e2e/interop/interop_test.go b/op-e2e/interop/interop_test.go
index 20428e31e388..6724f468be51 100644
--- a/op-e2e/interop/interop_test.go
+++ b/op-e2e/interop/interop_test.go
@@ -3,22 +3,24 @@ package interop
 import (
 	"context"
 	"math/big"
+	"sync"
 	"testing"
 	"time"
 
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/interopgen"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/helpers"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	gethTypes "github.com/ethereum/go-ethereum/core/types"
 )
 
-// TestInteropTrivial tests a simple interop scenario
-// Chains A and B exist, but no messages are sent between them
-// and in fact no event-logs are emitted by either chain at all.
-// A transaction is sent from Alice to Bob on Chain A.
-// The balance of Bob on Chain A is checked before and after the tx.
-// The balance of Bob on Chain B is checked after the tx.
-func TestInteropTrivial(t *testing.T) {
+// setupAndRun is a helper function that sets up a SuperSystem
+// which contains two L2 Chains, and two users on each chain.
+func setupAndRun(t *testing.T, fn func(*testing.T, SuperSystem)) {
 	recipe := interopgen.InteropDevRecipe{
 		L1ChainID:        900100,
 		L2ChainIDs:       []uint64{900200, 900201},
@@ -32,66 +34,163 @@ func TestInteropTrivial(t *testing.T) {
 	// create a super system from the recipe
 	// and get the L2 IDs for use in the test
 	s2 := NewSuperSystem(t, &recipe, worldResources)
-	ids := s2.L2IDs()
-
-	// chainA is the first L2 chain
-	chainA := ids[0]
-	// chainB is the second L2 chain
-	chainB := ids[1]
 
 	// create two users on all L2 chains
 	s2.AddUser("Alice")
 	s2.AddUser("Bob")
 
-	bobAddr := s2.Address(chainA, "Bob")
-
-	// check the balance of Bob
-	clientA := s2.L2GethClient(chainA)
-	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
-	defer cancel()
-	bobBalance, err := clientA.BalanceAt(ctx, bobAddr, nil)
-	require.NoError(t, err)
-	expectedBalance, _ := big.NewInt(0).SetString("10000000000000000000000000", 10)
-	require.Equal(t, expectedBalance, bobBalance)
-
-	// send a tx from Alice to Bob
-	s2.SendL2Tx(
-		chainA,
-		"Alice",
-		func(l2Opts *helpers.TxOpts) {
-			l2Opts.ToAddr = &bobAddr
-			l2Opts.Value = big.NewInt(1000000)
-			l2Opts.GasFeeCap = big.NewInt(1_000_000_000)
-			l2Opts.GasTipCap = big.NewInt(1_000_000_000)
-		},
-	)
-
-	// check the balance of Bob after the tx
-	ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
-	defer cancel()
-	bobBalance, err = clientA.BalanceAt(ctx, bobAddr, nil)
-	require.NoError(t, err)
-	expectedBalance, _ = big.NewInt(0).SetString("10000000000000000001000000", 10)
-	require.Equal(t, expectedBalance, bobBalance)
-
-	// check that the balance of Bob on ChainB hasn't changed
-	bobAddrB := s2.Address(chainB, "Bob")
-	clientB := s2.L2GethClient(chainB)
-	ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
-	defer cancel()
-	bobBalance, err = clientB.BalanceAt(ctx, bobAddrB, nil)
-	require.NoError(t, err)
-	expectedBalance, _ = big.NewInt(0).SetString("10000000000000000000000000", 10)
-	require.Equal(t, expectedBalance, bobBalance)
-
-	s2.DeployEmitterContract(chainA, "Alice")
-	s2.DeployEmitterContract(chainB, "Alice")
-	for i := 0; i < 1; i++ {
-		s2.EmitData(chainA, "Alice", "0x1234567890abcdef")
-
-		s2.EmitData(chainB, "Alice", "0x1234567890abcdef")
-	}
+	// run the test
+	fn(t, s2)
+}
 
-	time.Sleep(60 * time.Second)
+// TestInterop_IsolatedChains tests a simple interop scenario
+// Chains A and B exist, but no messages are sent between them
+// a transaction is sent from Alice to Bob on Chain A,
+// and only Chain A is affected.
+func TestInterop_IsolatedChains(t *testing.T) {
+	test := func(t *testing.T, s2 SuperSystem) {
+		ids := s2.L2IDs()
+		chainA := ids[0]
+		chainB := ids[1]
+
+		// check the balance of Bob
+		bobAddr := s2.Address(chainA, "Bob")
+		clientA := s2.L2GethClient(chainA)
+		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+		bobBalance, err := clientA.BalanceAt(ctx, bobAddr, nil)
+		require.NoError(t, err)
+		expectedBalance, _ := big.NewInt(0).SetString("10000000000000000000000000", 10)
+		require.Equal(t, expectedBalance, bobBalance)
+
+		// send a tx from Alice to Bob
+		s2.SendL2Tx(
+			chainA,
+			"Alice",
+			func(l2Opts *helpers.TxOpts) {
+				l2Opts.ToAddr = &bobAddr
+				l2Opts.Value = big.NewInt(1000000)
+				l2Opts.GasFeeCap = big.NewInt(1_000_000_000)
+				l2Opts.GasTipCap = big.NewInt(1_000_000_000)
+			},
+		)
+
+		// check the balance of Bob after the tx
+		ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+		bobBalance, err = clientA.BalanceAt(ctx, bobAddr, nil)
+		require.NoError(t, err)
+		expectedBalance, _ = big.NewInt(0).SetString("10000000000000000001000000", 10)
+		require.Equal(t, expectedBalance, bobBalance)
+
+		// check that the balance of Bob on ChainB hasn't changed
+		bobAddrB := s2.Address(chainB, "Bob")
+		clientB := s2.L2GethClient(chainB)
+		ctx, cancel = context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+		bobBalance, err = clientB.BalanceAt(ctx, bobAddrB, nil)
+		require.NoError(t, err)
+		expectedBalance, _ = big.NewInt(0).SetString("10000000000000000000000000", 10)
+		require.Equal(t, expectedBalance, bobBalance)
+	}
+	setupAndRun(t, test)
+}
 
+// TestInteropTrivial_EmitLogs tests a simple interop scenario
+// Chains A and B exist, but no messages are sent between them.
+// A contract is deployed on each chain, and logs are emitted repeatedly.
+func TestInteropTrivial_EmitLogs(t *testing.T) {
+	test := func(t *testing.T, s2 SuperSystem) {
+		ids := s2.L2IDs()
+		chainA := ids[0]
+		chainB := ids[1]
+		EmitterA := s2.DeployEmitterContract(chainA, "Alice")
+		EmitterB := s2.DeployEmitterContract(chainB, "Alice")
+		payload1 := "SUPER JACKPOT!"
+		numEmits := 10
+		// emit logs on both chains in parallel
+		var emitParallel sync.WaitGroup
+		emitOn := func(chainID string) {
+			for i := 0; i < numEmits; i++ {
+				s2.EmitData(chainID, "Alice", payload1)
+			}
+			emitParallel.Done()
+		}
+		emitParallel.Add(2)
+		go emitOn(chainA)
+		go emitOn(chainB)
+		emitParallel.Wait()
+
+		clientA := s2.L2GethClient(chainA)
+		clientB := s2.L2GethClient(chainB)
+		// check that the logs are emitted on chain A
+		qA := ethereum.FilterQuery{
+			Addresses: []common.Address{EmitterA},
+		}
+		logsA, err := clientA.FilterLogs(context.Background(), qA)
+		require.NoError(t, err)
+		require.Len(t, logsA, numEmits)
+
+		// check that the logs are emitted on chain B
+		qB := ethereum.FilterQuery{
+			Addresses: []common.Address{EmitterB},
+		}
+		logsB, err := clientB.FilterLogs(context.Background(), qB)
+		require.NoError(t, err)
+		require.Len(t, logsB, numEmits)
+
+		// wait for cross-safety to settle
+		// I've tried 30s but not all logs are cross-safe by then
+		time.Sleep(60 * time.Second)
+
+		supervisor := s2.SupervisorClient()
+
+		// requireMessage checks the safety level of a log against the supervisor
+		// it also checks that the error is as expected
+		requireMessage := func(chainID string, log gethTypes.Log, expectedSafety types.SafetyLevel, expectedError error) {
+			client := s2.L2GethClient(chainID)
+			// construct the expected hash of the log's payload
+			// (topics concatenated with data)
+			msgPayload := make([]byte, 0)
+			for _, topic := range log.Topics {
+				msgPayload = append(msgPayload, topic.Bytes()...)
+			}
+			msgPayload = append(msgPayload, log.Data...)
+			expectedHash := common.BytesToHash(crypto.Keccak256(msgPayload))
+			// convert payload hash to log hash
+			logHash := types.PayloadHashToLogHash(expectedHash, log.Address)
+
+			// get block for the log (for timestamp)
+			ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+			defer cancel()
+			block, err := client.BlockByHash(ctx, log.BlockHash)
+			require.NoError(t, err)
+
+			// make an identifier out of the sample log
+			identifier := types.Identifier{
+				Origin:      log.Address,
+				BlockNumber: log.BlockNumber,
+				LogIndex:    uint64(log.Index),
+				Timestamp:   block.Time(),
+				ChainID:     types.ChainIDFromBig(s2.ChainID(chainID)),
+			}
+
+			safety, error := supervisor.CheckMessage(context.Background(),
+				identifier,
+				logHash,
+			)
+			require.ErrorIs(t, error, expectedError)
+			// the supervisor could progress the safety level more quickly than we expect,
+			// which is why we check for a minimum safety level
+			require.True(t, safety.AtLeastAsSafe(expectedSafety), "log: %v should be at least %s, but is %s", log, expectedSafety.String(), safety.String())
+		}
+		// all logs should be cross-safe
+		for _, log := range logsA {
+			requireMessage(chainA, log, types.CrossSafe, nil)
+		}
+		for _, log := range logsB {
+			requireMessage(chainB, log, types.CrossSafe, nil)
+		}
+	}
+	setupAndRun(t, test)
 }
diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index 7e9e20519567..2d063174bdae 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"sort"
 	"testing"
 	"time"
 
@@ -79,8 +80,10 @@ type SuperSystem interface {
 	L2GethClient(network string) *ethclient.Client
 	// get the secret for a network and role
 	L2OperatorKey(network string, role devkeys.ChainOperatorRole) ecdsa.PrivateKey
-	// get the list of network IDs
+	// get the list of network IDs as key-strings
 	L2IDs() []string
+	// get the chain ID for a network
+	ChainID(network string) *big.Int
 	// register a username to an account on all L2s
 	AddUser(username string)
 	// get the user key for a user on an L2
@@ -415,6 +418,10 @@ func (s *interopE2ESystem) newL2(id string, l2Out *interopgen.L2Output) l2Set {
 	}
 }
 
+func (s *interopE2ESystem) ChainID(network string) *big.Int {
+	return s.l2s[network].chainID
+}
+
 // prepareSupervisor creates a new supervisor for the system
 func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 	// Be verbose with op-supervisor, it's in early test phase
@@ -604,6 +611,7 @@ func (s *interopE2ESystem) L2IDs() []string {
 	for id := range s.l2s {
 		ids = append(ids, id)
 	}
+	sort.Strings(ids)
 	return ids
 }
 
diff --git a/op-service/sources/supervisor_client.go b/op-service/sources/supervisor_client.go
index d85fc4901f31..ba8663c335ce 100644
--- a/op-service/sources/supervisor_client.go
+++ b/op-service/sources/supervisor_client.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/client"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 type SupervisorClient struct {
@@ -19,9 +20,7 @@ func NewSupervisorClient(client client.RPC) *SupervisorClient {
 	}
 }
 
-func (cl *SupervisorClient) Stop(
-	ctx context.Context,
-) error {
+func (cl *SupervisorClient) Stop(ctx context.Context) error {
 	var result error
 	err := cl.client.CallContext(
 		ctx,
@@ -33,9 +32,7 @@ func (cl *SupervisorClient) Stop(
 	return result
 }
 
-func (cl *SupervisorClient) Start(
-	ctx context.Context,
-) error {
+func (cl *SupervisorClient) Start(ctx context.Context) error {
 	var result error
 	err := cl.client.CallContext(
 		ctx,
@@ -47,10 +44,7 @@ func (cl *SupervisorClient) Start(
 	return result
 }
 
-func (cl *SupervisorClient) AddL2RPC(
-	ctx context.Context,
-	rpc string,
-) error {
+func (cl *SupervisorClient) AddL2RPC(ctx context.Context, rpc string) error {
 	var result error
 	err := cl.client.CallContext(
 		ctx,
@@ -63,6 +57,25 @@ func (cl *SupervisorClient) AddL2RPC(
 	return result
 }
 
+func (cl *SupervisorClient) CheckMessage(ctx context.Context, identifier types.Identifier, logHash common.Hash) (types.SafetyLevel, error) {
+	var result types.SafetyLevel
+	err := cl.client.CallContext(
+		ctx,
+		&result,
+		"supervisor_checkMessage",
+		identifier,
+		logHash)
+	if err != nil {
+		return types.Invalid, fmt.Errorf("failed to check message (chain %s), (block %v), (index %v), (logHash %s): %w",
+			identifier.ChainID,
+			identifier.BlockNumber,
+			identifier.LogIndex,
+			logHash,
+			err)
+	}
+	return result, nil
+}
+
 func (cl *SupervisorClient) UnsafeView(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error) {
 	var result types.ReferenceView
 	err := cl.client.CallContext(
@@ -93,26 +106,51 @@ func (cl *SupervisorClient) SafeView(ctx context.Context, chainID types.ChainID,
 
 func (cl *SupervisorClient) Finalized(ctx context.Context, chainID types.ChainID) (eth.BlockID, error) {
 	var result eth.BlockID
-	err := cl.client.CallContext(ctx, &result, "supervisor_finalized", chainID)
+	err := cl.client.CallContext(
+		ctx,
+		&result,
+		"supervisor_finalized",
+		chainID)
 	return result, err
 }
 
 func (cl *SupervisorClient) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.BlockRef, error) {
 	var result eth.BlockRef
-	err := cl.client.CallContext(ctx, &result, "supervisor_derivedFrom", chainID, derived)
+	err := cl.client.CallContext(
+		ctx,
+		&result,
+		"supervisor_derivedFrom",
+		chainID,
+		derived)
 	return result, err
 }
 
 func (cl *SupervisorClient) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
-	return cl.client.CallContext(ctx, nil, "supervisor_updateLocalUnsafe", chainID, head)
+	return cl.client.CallContext(
+		ctx,
+		nil,
+		"supervisor_updateLocalUnsafe",
+		chainID,
+		head)
 }
 
 func (cl *SupervisorClient) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
-	return cl.client.CallContext(ctx, nil, "supervisor_updateLocalSafe", chainID, derivedFrom, lastDerived)
+	return cl.client.CallContext(
+		ctx,
+		nil,
+		"supervisor_updateLocalSafe",
+		chainID,
+		derivedFrom,
+		lastDerived)
 }
 
 func (cl *SupervisorClient) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalizedL1 eth.L1BlockRef) error {
-	return cl.client.CallContext(ctx, nil, "supervisor_updateFinalizedL1", chainID, finalizedL1)
+	return cl.client.CallContext(
+		ctx,
+		nil,
+		"supervisor_updateFinalizedL1",
+		chainID,
+		finalizedL1)
 }
 
 func (cl *SupervisorClient) Close() {
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 5768e16e3ca0..a9322b84c057 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -308,14 +308,14 @@ func (su *SupervisorBackend) DependencySet() depset.DependencySet {
 // Query methods
 // ----------------------------
 
-func (su *SupervisorBackend) CheckMessage(identifier types.Identifier, payloadHash common.Hash) (types.SafetyLevel, error) {
+func (su *SupervisorBackend) CheckMessage(identifier types.Identifier, logHash common.Hash) (types.SafetyLevel, error) {
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
 	chainID := identifier.ChainID
 	blockNum := identifier.BlockNumber
 	logIdx := identifier.LogIndex
-	_, err := su.chainDBs.Check(chainID, blockNum, uint32(logIdx), payloadHash)
+	_, err := su.chainDBs.Check(chainID, blockNum, uint32(logIdx), logHash)
 	if errors.Is(err, types.ErrFuture) {
 		return types.LocalUnsafe, nil
 	}
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index 7dc2e72d3e72..01e5ef0171c6 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -358,7 +358,7 @@ func (db *ChainsDB) NextDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID
 
 // Safest returns the strongest safety level that can be guaranteed for the given log entry.
 // it assumes the log entry has already been checked and is valid, this function only checks safety levels.
-// Cross-safety levels are all considered to be more safe than any form of local-safety.
+// Safety levels are assumed to graduate from LocalUnsafe to LocalSafe to CrossUnsafe to CrossSafe, with Finalized as the strongest.
 func (db *ChainsDB) Safest(chainID types.ChainID, blockNum uint64, index uint32) (safest types.SafetyLevel, err error) {
 	db.mu.RLock()
 	defer db.mu.RUnlock()
diff --git a/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go b/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
index 07c05ac6dc67..3d0eb1a6b3b0 100644
--- a/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
+++ b/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
@@ -14,7 +14,6 @@ import (
 	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/snapshots"
 	"github.com/ethereum/go-ethereum/common"
 	ethTypes "github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
 )
 
 const (
@@ -74,7 +73,7 @@ func (i *CrossL2Inbox) DecodeExecutingMessageLog(l *ethTypes.Log) (types.Executi
 	if err != nil {
 		return types.ExecutingMessage{}, fmt.Errorf("failed to convert chain ID %v to uint32: %w", identifier.ChainId, err)
 	}
-	hash := payloadHashToLogHash(msgHash, identifier.Origin)
+	hash := types.PayloadHashToLogHash(msgHash, identifier.Origin)
 	return types.ExecutingMessage{
 		Chain:     types.ChainIndex(chainID), // TODO(#11105): translate chain ID to chain index
 		Hash:      hash,
@@ -117,17 +116,3 @@ func identifierFromBytes(identifierBytes io.Reader) (contractIdentifier, error)
 		ChainId:     chainID,
 	}, nil
 }
-
-// payloadHashToLogHash converts the payload hash to the log hash
-// it is the concatenation of the log's address and the hash of the log's payload,
-// which is then hashed again. This is the hash that is stored in the log storage.
-// The logHash can then be used to traverse from the executing message
-// to the log the referenced initiating message.
-// TODO(#12424): this function is duplicated between contracts and backend/source/log_processor.go
-// to avoid a circular dependency. It should be reorganized to avoid this duplication.
-func payloadHashToLogHash(payloadHash common.Hash, addr common.Address) common.Hash {
-	msg := make([]byte, 0, 2*common.HashLength)
-	msg = append(msg, addr.Bytes()...)
-	msg = append(msg, payloadHash.Bytes()...)
-	return crypto.Keccak256Hash(msg)
-}
diff --git a/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go b/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
index de5fe0eb2706..b3973c61e30b 100644
--- a/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
+++ b/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
@@ -32,7 +32,7 @@ func TestDecodeExecutingMessageEvent(t *testing.T) {
 		Timestamp:   new(big.Int).SetUint64(expected.Timestamp),
 		LogIndex:    new(big.Int).SetUint64(uint64(expected.LogIdx)),
 	}
-	expected.Hash = payloadHashToLogHash(payloadHash, contractIdent.Origin)
+	expected.Hash = types.PayloadHashToLogHash(payloadHash, contractIdent.Origin)
 	abi := snapshots.LoadCrossL2InboxABI()
 	validData, err := abi.Events[eventExecutingMessage].Inputs.Pack(payloadHash, contractIdent)
 	require.NoError(t, err)
diff --git a/op-supervisor/supervisor/backend/processors/log_processor.go b/op-supervisor/supervisor/backend/processors/log_processor.go
index 01846f32795c..1434d2a60395 100644
--- a/op-supervisor/supervisor/backend/processors/log_processor.go
+++ b/op-supervisor/supervisor/backend/processors/log_processor.go
@@ -78,7 +78,7 @@ func (p *logProcessor) ProcessLogs(_ context.Context, block eth.BlockRef, rcpts
 // and because they represent paired data.
 func logToLogHash(l *ethTypes.Log) common.Hash {
 	payloadHash := crypto.Keccak256(logToMessagePayload(l))
-	return payloadHashToLogHash(common.Hash(payloadHash), l.Address)
+	return types.PayloadHashToLogHash(common.Hash(payloadHash), l.Address)
 }
 
 // logToMessagePayload is the data that is hashed to get the logHash
@@ -92,15 +92,3 @@ func logToMessagePayload(l *ethTypes.Log) []byte {
 	msg = append(msg, l.Data...)
 	return msg
 }
-
-// payloadHashToLogHash converts the payload hash to the log hash
-// it is the concatenation of the log's address and the hash of the log's payload,
-// which is then hashed. This is the hash that is stored in the log storage.
-// The logHash can then be used to traverse from the executing message
-// to the log the referenced initiating message.
-func payloadHashToLogHash(payloadHash common.Hash, addr common.Address) common.Hash {
-	msg := make([]byte, 0, 2*common.HashLength)
-	msg = append(msg, addr.Bytes()...)
-	msg = append(msg, payloadHash.Bytes()...)
-	return crypto.Keccak256Hash(msg)
-}
diff --git a/op-supervisor/supervisor/types/types.go b/op-supervisor/supervisor/types/types.go
index 1c97a9119ce6..b1aab4d081e8 100644
--- a/op-supervisor/supervisor/types/types.go
+++ b/op-supervisor/supervisor/types/types.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
@@ -251,3 +252,15 @@ func BlockSealFromRef(ref eth.BlockRef) BlockSeal {
 		Timestamp: ref.Time,
 	}
 }
+
+// PayloadHashToLogHash converts the payload hash to the log hash
+// it is the concatenation of the log's address and the hash of the log's payload,
+// which is then hashed again. This is the hash that is stored in the log storage.
+// The logHash can then be used to traverse from the executing message
+// to the log the referenced initiating message.
+func PayloadHashToLogHash(payloadHash common.Hash, addr common.Address) common.Hash {
+	msg := make([]byte, 0, 2*common.HashLength)
+	msg = append(msg, addr.Bytes()...)
+	msg = append(msg, payloadHash.Bytes()...)
+	return crypto.Keccak256Hash(msg)
+}

From a56bfc1158cbe93a22f581952473f8c945d7c3bb Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 28 Oct 2024 21:55:33 -0700
Subject: [PATCH 071/451] proofs-tools: Update challenger version (#12719)

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 66a36b294bec..0da2b48aa0df 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -206,7 +206,7 @@ target "proofs-tools" {
   dockerfile = "./ops/docker/proofs-tools/Dockerfile"
   context = "."
   args = {
-    CHALLENGER_VERSION="005116d9b4e39c7ba0586ce95ceba4067123efd5"
+    CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
     KONA_VERSION="kona-client-v0.1.0-alpha.5"
   }
   target="proofs-tools"

From 36b41baea45f07e8644ff778a1ffd81fb0ad9e77 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Tue, 29 Oct 2024 16:11:22 +1000
Subject: [PATCH 072/451] cannon: Update reference for stf-verify (#12718)

The prestate generation was optimised for singlethreaded-2 so update the expected baseline.
---
 cannon/Dockerfile.diff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cannon/Dockerfile.diff b/cannon/Dockerfile.diff
index 20664a25139b..6ed17520b702 100644
--- a/cannon/Dockerfile.diff
+++ b/cannon/Dockerfile.diff
@@ -23,7 +23,7 @@ ARG GIT_DATE
 
 ARG TARGETOS TARGETARCH
 
-FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.1.0-alpha.2 AS cannon-v2
+FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.1.0-alpha.3 AS cannon-v2
 
 FROM --platform=$BUILDPLATFORM builder as cannon-verify
 COPY --from=cannon-v2 /usr/local/bin/cannon /usr/local/bin/cannon-v2

From bfb1ad93d674abfd9d02d715ae2701dcde867a4f Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Tue, 29 Oct 2024 22:11:00 +0700
Subject: [PATCH 073/451] op-supervisor,op-e2e: op-supervisor action test
 (#12691)

---
 op-e2e/actions/altda/altda_test.go            |   4 +-
 op-e2e/actions/derivation/reorg_test.go       |   6 +-
 op-e2e/actions/helpers/l2_engine.go           |  17 +-
 op-e2e/actions/helpers/l2_engine_test.go      |   6 +-
 op-e2e/actions/helpers/setups.go              |   4 +-
 op-e2e/actions/interop/interop.go             | 236 +++++++++++++++
 op-e2e/actions/interop/interop_test.go        | 270 ++++++------------
 op-e2e/actions/proofs/helpers/env.go          |   2 +-
 op-e2e/actions/upgrades/dencun_fork_test.go   |   2 +-
 op-supervisor/supervisor/backend/backend.go   |  34 +++
 .../backend/processors/chain_processor.go     |   2 +-
 11 files changed, 373 insertions(+), 210 deletions(-)
 create mode 100644 op-e2e/actions/interop/interop.go

diff --git a/op-e2e/actions/altda/altda_test.go b/op-e2e/actions/altda/altda_test.go
index 21dcbf6b9038..3c7e06a380fc 100644
--- a/op-e2e/actions/altda/altda_test.go
+++ b/op-e2e/actions/altda/altda_test.go
@@ -72,7 +72,7 @@ func NewL2AltDA(t helpers.Testing, params ...AltDAParam) *L2AltDA {
 	l1Client := miner.EthClient()
 
 	jwtPath := e2eutils.WriteDefaultJWT(t)
-	engine := helpers.NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath)
+	engine := helpers.NewL2Engine(t, log, sd.L2Cfg, jwtPath)
 	engCl := engine.EngineClient(t, sd.RollupCfg)
 
 	storage := &altda.DAErrFaker{Client: altda.NewMockDAClient(log)}
@@ -136,7 +136,7 @@ func (a *L2AltDA) StorageClient() *altda.DAErrFaker {
 
 func (a *L2AltDA) NewVerifier(t helpers.Testing) *helpers.L2Verifier {
 	jwtPath := e2eutils.WriteDefaultJWT(t)
-	engine := helpers.NewL2Engine(t, a.log, a.sd.L2Cfg, a.sd.RollupCfg.Genesis.L1, jwtPath)
+	engine := helpers.NewL2Engine(t, a.log, a.sd.L2Cfg, jwtPath)
 	engCl := engine.EngineClient(t, a.sd.RollupCfg)
 	l1F, err := sources.NewL1Client(a.miner.RPCClient(), a.log, nil, sources.L1ClientDefaultConfig(a.sd.RollupCfg, false, sources.RPCKindBasic))
 	require.NoError(t, err)
diff --git a/op-e2e/actions/derivation/reorg_test.go b/op-e2e/actions/derivation/reorg_test.go
index 10155a471a6f..09135151d3b2 100644
--- a/op-e2e/actions/derivation/reorg_test.go
+++ b/op-e2e/actions/derivation/reorg_test.go
@@ -592,7 +592,7 @@ func RestartOpGeth(gt *testing.T, deltaTimeOffset *hexutil.Uint64) {
 	l1F, err := sources.NewL1Client(miner.RPCClient(), log, nil, sources.L1ClientDefaultConfig(sd.RollupCfg, false, sources.RPCKindStandard))
 	require.NoError(t, err)
 	// Sequencer
-	seqEng := actionsHelpers.NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath, dbOption)
+	seqEng := actionsHelpers.NewL2Engine(t, log, sd.L2Cfg, jwtPath, dbOption)
 	engRpc := &rpcWrapper{seqEng.RPCClient()}
 	l2Cl, err := sources.NewEngineClient(engRpc, log, nil, sources.EngineClientDefaultConfig(sd.RollupCfg))
 	require.NoError(t, err)
@@ -647,7 +647,7 @@ func RestartOpGeth(gt *testing.T, deltaTimeOffset *hexutil.Uint64) {
 	// close the sequencer engine
 	require.NoError(t, seqEng.Close())
 	// and start a new one with same db path
-	seqEngNew := actionsHelpers.NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath, dbOption)
+	seqEngNew := actionsHelpers.NewL2Engine(t, log, sd.L2Cfg, jwtPath, dbOption)
 	// swap in the new rpc. This is as close as we can get to reconnecting to a new in-memory rpc connection
 	engRpc.RPC = seqEngNew.RPCClient()
 
@@ -679,7 +679,7 @@ func ConflictingL2Blocks(gt *testing.T, deltaTimeOffset *hexutil.Uint64) {
 
 	// Extra setup: a full alternative sequencer, sequencer engine, and batcher
 	jwtPath := e2eutils.WriteDefaultJWT(t)
-	altSeqEng := actionsHelpers.NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath)
+	altSeqEng := actionsHelpers.NewL2Engine(t, log, sd.L2Cfg, jwtPath)
 	altSeqEngCl, err := sources.NewEngineClient(altSeqEng.RPCClient(), log, nil, sources.EngineClientDefaultConfig(sd.RollupCfg))
 	require.NoError(t, err)
 	l1F, err := sources.NewL1Client(miner.RPCClient(), log, nil, sources.L1ClientDefaultConfig(sd.RollupCfg, false, sources.RPCKindStandard))
diff --git a/op-e2e/actions/helpers/l2_engine.go b/op-e2e/actions/helpers/l2_engine.go
index 5839a20798d3..963a18769e6c 100644
--- a/op-e2e/actions/helpers/l2_engine.go
+++ b/op-e2e/actions/helpers/l2_engine.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/client"
-	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/testutils"
 )
@@ -37,8 +36,6 @@ type L2Engine struct {
 	node *node.Node
 	Eth  *geth.Ethereum
 
-	rollupGenesis *rollup.Genesis
-
 	// L2 evm / chain
 	l2Chain  *core.BlockChain
 	l2Signer types.Signer
@@ -50,20 +47,14 @@ type L2Engine struct {
 
 type EngineOption func(ethCfg *ethconfig.Config, nodeCfg *node.Config) error
 
-func NewL2Engine(t Testing, log log.Logger, genesis *core.Genesis, rollupGenesisL1 eth.BlockID, jwtPath string, options ...EngineOption) *L2Engine {
+func NewL2Engine(t Testing, log log.Logger, genesis *core.Genesis, jwtPath string, options ...EngineOption) *L2Engine {
 	n, ethBackend, apiBackend := newBackend(t, genesis, jwtPath, options)
 	engineApi := engineapi.NewL2EngineAPI(log, apiBackend, ethBackend.Downloader())
 	chain := ethBackend.BlockChain()
-	genesisBlock := chain.Genesis()
 	eng := &L2Engine{
-		log:  log,
-		node: n,
-		Eth:  ethBackend,
-		rollupGenesis: &rollup.Genesis{
-			L1:     rollupGenesisL1,
-			L2:     eth.BlockID{Hash: genesisBlock.Hash(), Number: genesisBlock.NumberU64()},
-			L2Time: genesis.Timestamp,
-		},
+		log:       log,
+		node:      n,
+		Eth:       ethBackend,
 		l2Chain:   chain,
 		l2Signer:  types.LatestSigner(genesis.Config),
 		EngineApi: engineApi,
diff --git a/op-e2e/actions/helpers/l2_engine_test.go b/op-e2e/actions/helpers/l2_engine_test.go
index b859b393b621..115921bea94b 100644
--- a/op-e2e/actions/helpers/l2_engine_test.go
+++ b/op-e2e/actions/helpers/l2_engine_test.go
@@ -40,7 +40,7 @@ func TestL2EngineAPI(gt *testing.T) {
 	tdb := triedb.NewDatabase(db, &triedb.Config{HashDB: hashdb.Defaults})
 	sd.L2Cfg.MustCommit(db, tdb)
 
-	engine := NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath)
+	engine := NewL2Engine(t, log, sd.L2Cfg, jwtPath)
 
 	l2Cl, err := sources.NewEngineClient(engine.RPCClient(), log, nil, sources.EngineClientDefaultConfig(sd.RollupCfg))
 	require.NoError(t, err)
@@ -115,7 +115,7 @@ func TestL2EngineAPIBlockBuilding(gt *testing.T) {
 	tdb := triedb.NewDatabase(db, &triedb.Config{HashDB: hashdb.Defaults})
 	sd.L2Cfg.MustCommit(db, tdb)
 
-	engine := NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath)
+	engine := NewL2Engine(t, log, sd.L2Cfg, jwtPath)
 	t.Cleanup(func() {
 		_ = engine.Close()
 	})
@@ -211,7 +211,7 @@ func TestL2EngineAPIFail(gt *testing.T) {
 	dp := e2eutils.MakeDeployParams(t, DefaultRollupTestParams())
 	sd := e2eutils.Setup(t, dp, DefaultAlloc)
 	log := testlog.Logger(t, log.LevelDebug)
-	engine := NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath)
+	engine := NewL2Engine(t, log, sd.L2Cfg, jwtPath)
 	// mock an RPC failure
 	mockErr := errors.New("mock L2 RPC error")
 	engine.ActL2RPCFail(t, mockErr)
diff --git a/op-e2e/actions/helpers/setups.go b/op-e2e/actions/helpers/setups.go
index 26e19eae82a0..3322dea4223e 100644
--- a/op-e2e/actions/helpers/setups.go
+++ b/op-e2e/actions/helpers/setups.go
@@ -25,7 +25,7 @@ func SetupSequencerTest(t Testing, sd *e2eutils.SetupData, log log.Logger, opts
 
 	l1F, err := sources.NewL1Client(miner.RPCClient(), log, nil, sources.L1ClientDefaultConfig(sd.RollupCfg, false, sources.RPCKindStandard))
 	require.NoError(t, err)
-	engine := NewL2Engine(t, log.New("role", "sequencer-engine"), sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath, EngineWithP2P())
+	engine := NewL2Engine(t, log.New("role", "sequencer-engine"), sd.L2Cfg, jwtPath, EngineWithP2P())
 	l2Cl, err := sources.NewEngineClient(engine.RPCClient(), log, nil, sources.EngineClientDefaultConfig(sd.RollupCfg))
 	require.NoError(t, err)
 
@@ -40,7 +40,7 @@ func SetupVerifier(t Testing, sd *e2eutils.SetupData, log log.Logger,
 		opt(cfg)
 	}
 	jwtPath := e2eutils.WriteDefaultJWT(t)
-	engine := NewL2Engine(t, log.New("role", "verifier-engine"), sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath, EngineWithP2P())
+	engine := NewL2Engine(t, log.New("role", "verifier-engine"), sd.L2Cfg, jwtPath, EngineWithP2P())
 	engCl := engine.EngineClient(t, sd.RollupCfg)
 	verifier := NewL2Verifier(t, log.New("role", "verifier"), l1F, blobSrc, altda.Disabled, engCl, sd.RollupCfg, syncCfg, cfg.SafeHeadListener, cfg.InteropBackend)
 	return engine, verifier
diff --git a/op-e2e/actions/interop/interop.go b/op-e2e/actions/interop/interop.go
new file mode 100644
index 000000000000..4ac2b0cb80ff
--- /dev/null
+++ b/op-e2e/actions/interop/interop.go
@@ -0,0 +1,236 @@
+package interop
+
+import (
+	"context"
+	"os"
+	"time"
+
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/params"
+
+	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	batcherFlags "github.com/ethereum-optimism/optimism/op-batcher/flags"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/interopgen"
+	"github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/interop"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum-optimism/optimism/op-supervisor/config"
+	"github.com/ethereum-optimism/optimism/op-supervisor/metrics"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/frontend"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+const (
+	foundryArtifactsDir = "../../../packages/contracts-bedrock/forge-artifacts"
+	sourceMapDir        = "../../../packages/contracts-bedrock"
+)
+
+// Chain holds the most common per-chain action-test data and actors
+type Chain struct {
+	ChainID types.ChainID
+
+	RollupCfg   *rollup.Config
+	ChainCfg    *params.ChainConfig
+	BatcherAddr common.Address
+
+	Sequencer       *helpers.L2Sequencer
+	SequencerEngine *helpers.L2Engine
+	Batcher         *helpers.L2Batcher
+}
+
+// InteropSetup holds the chain deployment and config contents, before instantiating any services.
+type InteropSetup struct {
+	Log        log.Logger
+	Deployment *interopgen.WorldDeployment
+	Out        *interopgen.WorldOutput
+	DepSet     *depset.StaticConfigDependencySet
+	Keys       devkeys.Keys
+	T          helpers.Testing
+}
+
+// InteropActors holds a bundle of global actors and actors of 2 chains.
+type InteropActors struct {
+	L1Miner    *helpers.L1Miner
+	Supervisor *SupervisorActor
+	ChainA     *Chain
+	ChainB     *Chain
+}
+
+// SetupInterop creates an InteropSetup to instantiate actors on, with 2 L2 chains.
+func SetupInterop(t helpers.Testing) *InteropSetup {
+	logger := testlog.Logger(t, log.LevelDebug)
+
+	recipe := interopgen.InteropDevRecipe{
+		L1ChainID:        900100,
+		L2ChainIDs:       []uint64{900200, 900201},
+		GenesisTimestamp: uint64(time.Now().Unix() + 3),
+	}
+	hdWallet, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
+	require.NoError(t, err)
+	worldCfg, err := recipe.Build(hdWallet)
+	require.NoError(t, err)
+
+	// create the foundry artifacts and source map
+	foundryArtifacts := foundry.OpenArtifactsDir(foundryArtifactsDir)
+	sourceMap := foundry.NewSourceMapFS(os.DirFS(sourceMapDir))
+
+	// deploy the world, using the logger, foundry artifacts, source map, and world configuration
+	worldDeployment, worldOutput, err := interopgen.Deploy(logger, foundryArtifacts, sourceMap, worldCfg)
+	require.NoError(t, err)
+
+	return &InteropSetup{
+		Log:        logger,
+		Deployment: worldDeployment,
+		Out:        worldOutput,
+		DepSet:     worldToDepSet(t, worldOutput),
+		Keys:       hdWallet,
+		T:          t,
+	}
+}
+
+func (is *InteropSetup) CreateActors() *InteropActors {
+	l1Miner := helpers.NewL1Miner(is.T, is.Log.New("role", "l1Miner"), is.Out.L1.Genesis)
+	supervisorAPI := NewSupervisor(is.T, is.Log, is.DepSet)
+	require.NoError(is.T, supervisorAPI.Start(is.T.Ctx()))
+	is.T.Cleanup(func() {
+		require.NoError(is.T, supervisorAPI.Stop(context.Background()))
+	})
+	chainA := createL2Services(is.T, is.Log, l1Miner, is.Keys, is.Out.L2s["900200"], supervisorAPI)
+	chainB := createL2Services(is.T, is.Log, l1Miner, is.Keys, is.Out.L2s["900201"], supervisorAPI)
+	// Hook up L2 RPCs to supervisor, to fetch event data from
+	require.NoError(is.T, supervisorAPI.AddL2RPC(is.T.Ctx(), chainA.SequencerEngine.HTTPEndpoint()))
+	require.NoError(is.T, supervisorAPI.AddL2RPC(is.T.Ctx(), chainB.SequencerEngine.HTTPEndpoint()))
+	return &InteropActors{
+		L1Miner:    l1Miner,
+		Supervisor: supervisorAPI,
+		ChainA:     chainA,
+		ChainB:     chainB,
+	}
+}
+
+// SupervisorActor represents a supervisor, instrumented to run synchronously for action-test purposes.
+type SupervisorActor struct {
+	backend *backend.SupervisorBackend
+	frontend.QueryFrontend
+	frontend.AdminFrontend
+	frontend.UpdatesFrontend
+}
+
+func (sa *SupervisorActor) SyncEvents(t helpers.Testing, chainID types.ChainID) {
+	require.NoError(t, sa.backend.SyncEvents(chainID))
+}
+
+func (sa *SupervisorActor) SyncCrossUnsafe(t helpers.Testing, chainID types.ChainID) {
+	require.NoError(t, sa.backend.SyncCrossUnsafe(chainID))
+}
+
+func (sa *SupervisorActor) SyncCrossSafe(t helpers.Testing, chainID types.ChainID) {
+	require.NoError(t, sa.backend.SyncCrossSafe(chainID))
+}
+
+// worldToDepSet converts a set of chain configs into a dependency-set for the supervisor.
+func worldToDepSet(t helpers.Testing, worldOutput *interopgen.WorldOutput) *depset.StaticConfigDependencySet {
+	depSetCfg := make(map[types.ChainID]*depset.StaticConfigDependency)
+	for _, out := range worldOutput.L2s {
+		depSetCfg[types.ChainIDFromBig(out.Genesis.Config.ChainID)] = &depset.StaticConfigDependency{
+			ChainIndex:     types.ChainIndex(out.Genesis.Config.ChainID.Uint64()),
+			ActivationTime: 0,
+			HistoryMinTime: 0,
+		}
+	}
+	depSet, err := depset.NewStaticConfigDependencySet(depSetCfg)
+	require.NoError(t, err)
+	return depSet
+}
+
+// NewSupervisor creates a new SupervisorActor, to action-test the supervisor with.
+func NewSupervisor(t helpers.Testing, logger log.Logger, depSet depset.DependencySetSource) *SupervisorActor {
+	logger = logger.New("role", "supervisor")
+	supervisorDataDir := t.TempDir()
+	logger.Info("supervisor data dir", "dir", supervisorDataDir)
+	svCfg := &config.Config{
+		DependencySetSource:   depSet,
+		SynchronousProcessors: true,
+		Datadir:               supervisorDataDir,
+	}
+	b, err := backend.NewSupervisorBackend(t.Ctx(),
+		logger.New("role", "supervisor"), metrics.NoopMetrics, svCfg)
+	require.NoError(t, err)
+	return &SupervisorActor{
+		backend: b,
+		QueryFrontend: frontend.QueryFrontend{
+			Supervisor: b,
+		},
+		AdminFrontend: frontend.AdminFrontend{
+			Supervisor: b,
+		},
+		UpdatesFrontend: frontend.UpdatesFrontend{
+			Supervisor: b,
+		},
+	}
+}
+
+// createL2Services creates a Chain bundle, with the given configs, and attached to the given L1 miner.
+func createL2Services(
+	t helpers.Testing,
+	logger log.Logger,
+	l1Miner *helpers.L1Miner,
+	keys devkeys.Keys,
+	output *interopgen.L2Output,
+	interopBackend interop.InteropBackend,
+) *Chain {
+	logger = logger.New("chain", output.Genesis.Config.ChainID)
+
+	jwtPath := e2eutils.WriteDefaultJWT(t)
+
+	eng := helpers.NewL2Engine(t, logger.New("role", "engine"), output.Genesis, jwtPath)
+
+	seqCl, err := sources.NewEngineClient(eng.RPCClient(), logger, nil, sources.EngineClientDefaultConfig(output.RollupCfg))
+	require.NoError(t, err)
+
+	l1F, err := sources.NewL1Client(l1Miner.RPCClient(), logger, nil,
+		sources.L1ClientDefaultConfig(output.RollupCfg, false, sources.RPCKindStandard))
+	require.NoError(t, err)
+
+	seq := helpers.NewL2Sequencer(t, logger.New("role", "sequencer"), l1F,
+		l1Miner.BlobStore(), altda.Disabled, seqCl, output.RollupCfg,
+		0, interopBackend)
+
+	batcherKey, err := keys.Secret(devkeys.ChainOperatorKey{
+		ChainID: output.Genesis.Config.ChainID,
+		Role:    devkeys.BatcherRole,
+	})
+	require.NoError(t, err)
+
+	batcherCfg := &helpers.BatcherCfg{
+		MinL1TxSize:          0,
+		MaxL1TxSize:          128_000,
+		BatcherKey:           batcherKey,
+		DataAvailabilityType: batcherFlags.CalldataType,
+	}
+
+	batcher := helpers.NewL2Batcher(logger.New("role", "batcher"), output.RollupCfg, batcherCfg,
+		seq.RollupClient(), l1Miner.EthClient(),
+		eng.EthClient(), eng.EngineClient(t, output.RollupCfg))
+
+	return &Chain{
+		ChainID:         types.ChainIDFromBig(output.Genesis.Config.ChainID),
+		RollupCfg:       output.RollupCfg,
+		ChainCfg:        output.Genesis.Config,
+		BatcherAddr:     crypto.PubkeyToAddress(batcherKey.PublicKey),
+		Sequencer:       seq,
+		SequencerEngine: eng,
+		Batcher:         batcher,
+	}
+}
diff --git a/op-e2e/actions/interop/interop_test.go b/op-e2e/actions/interop/interop_test.go
index a69a09a9bd94..a39da702db8c 100644
--- a/op-e2e/actions/interop/interop_test.go
+++ b/op-e2e/actions/interop/interop_test.go
@@ -1,207 +1,109 @@
 package interop
 
 import (
-	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/ethereum/go-ethereum/log"
-
 	"github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
-	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
-	"github.com/ethereum-optimism/optimism/op-node/rollup/interop"
-	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
-	"github.com/ethereum-optimism/optimism/op-service/eth"
-	"github.com/ethereum-optimism/optimism/op-service/testlog"
-	"github.com/ethereum-optimism/optimism/op-service/testutils"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
-var _ interop.InteropBackend = (*testutils.FakeInteropBackend)(nil)
-
-func TestInteropVerifier(gt *testing.T) {
+func TestFullInterop(gt *testing.T) {
 	t := helpers.NewDefaultTesting(gt)
-	dp := e2eutils.MakeDeployParams(t, helpers.DefaultRollupTestParams())
-	sd := e2eutils.Setup(t, dp, helpers.DefaultAlloc)
-	// Temporary work-around: interop needs to be active, for cross-safety to not be instant.
-	// The state genesis in this test is pre-interop however.
-	sd.RollupCfg.InteropTime = new(uint64)
-	logger := testlog.Logger(t, log.LevelDebug)
-	seqMockBackend := &testutils.FakeInteropBackend{}
-	l1Miner, seqEng, seq := helpers.SetupSequencerTest(t, sd, logger,
-		helpers.WithVerifierOpts(helpers.WithInteropBackend(seqMockBackend)))
-
-	batcher := helpers.NewL2Batcher(logger, sd.RollupCfg, helpers.DefaultBatcherCfg(dp),
-		seq.RollupClient(), l1Miner.EthClient(), seqEng.EthClient(), seqEng.EngineClient(t, sd.RollupCfg))
-
-	verMockBackend := &testutils.FakeInteropBackend{}
-	_, ver := helpers.SetupVerifier(t, sd, logger,
-		l1Miner.L1Client(t, sd.RollupCfg), l1Miner.BlobStore(), &sync.Config{},
-		helpers.WithInteropBackend(verMockBackend))
 
-	// Genesis block will be registered as local-safe when we first trigger the derivation pipeline
-	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
-		require.Equal(t, sd.RollupCfg.Genesis.L1, derivedFrom.ID())
-		require.Equal(t, sd.RollupCfg.Genesis.L2, lastDerived.ID())
-		return nil
-	}
-	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
-		require.Equal(t, sd.RollupCfg.Genesis.L1, derivedFrom.ID())
-		require.Equal(t, sd.RollupCfg.Genesis.L2, lastDerived.ID())
-		return nil
-	}
-
-	seq.ActL2PipelineFull(t)
-	ver.ActL2PipelineFull(t)
-
-	l2ChainID := types.ChainIDFromBig(sd.RollupCfg.L2ChainID)
-	seqMockBackend.UpdateLocalUnsafeFn = func(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
-		require.Equal(t, chainID, l2ChainID)
-		require.Equal(t, uint64(1), head.Number)
-		return nil
-	}
-	seqMockBackend.UnsafeViewFn = func(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error) {
-		require.Equal(t, chainID, l2ChainID)
-		require.Equal(t, uint64(1), unsafe.Local.Number)
-		require.Equal(t, uint64(0), unsafe.Cross.Number)
-		return unsafe, nil
-	}
-	// create an unsafe L2 block
-	seq.ActL2StartBlock(t)
-	seq.ActL2EndBlock(t)
-	seq.ActL2PipelineFull(t)
-	status := seq.SyncStatus()
-	require.Equal(t, uint64(1), status.UnsafeL2.Number)
+	is := SetupInterop(t)
+	actors := is.CreateActors()
+
+	// get both sequencers set up
+	actors.ChainA.Sequencer.ActL2PipelineFull(t)
+	actors.ChainB.Sequencer.ActL2PipelineFull(t)
+
+	// No blocks yet
+	status := actors.ChainA.Sequencer.SyncStatus()
+	require.Equal(t, uint64(0), status.UnsafeL2.Number)
+
+	// sync chain A
+	actors.Supervisor.SyncEvents(t, actors.ChainA.ChainID)
+	actors.Supervisor.SyncCrossUnsafe(t, actors.ChainA.ChainID)
+	actors.Supervisor.SyncCrossSafe(t, actors.ChainA.ChainID)
+
+	// sync chain B
+	actors.Supervisor.SyncEvents(t, actors.ChainB.ChainID)
+	actors.Supervisor.SyncCrossUnsafe(t, actors.ChainB.ChainID)
+	actors.Supervisor.SyncCrossSafe(t, actors.ChainB.ChainID)
+
+	// Build L2 block on chain A
+	actors.ChainA.Sequencer.ActL2StartBlock(t)
+	actors.ChainA.Sequencer.ActL2EndBlock(t)
+	status = actors.ChainA.Sequencer.SyncStatus()
+	head := status.UnsafeL2.ID()
+	require.Equal(t, uint64(1), head.Number)
 	require.Equal(t, uint64(0), status.CrossUnsafeL2.Number)
 	require.Equal(t, uint64(0), status.LocalSafeL2.Number)
 	require.Equal(t, uint64(0), status.SafeL2.Number)
+	require.Equal(t, uint64(0), status.FinalizedL2.Number)
 
-	// promote it to cross-unsafe in the backend
-	// and see if the node picks up on it
-	seqMockBackend.UnsafeViewFn = func(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error) {
-		require.Equal(t, chainID, l2ChainID)
-		require.Equal(t, uint64(1), unsafe.Local.Number)
-		require.Equal(t, uint64(0), unsafe.Cross.Number)
-		out := unsafe
-		out.Cross = unsafe.Local
-		return out, nil
-	}
-	seq.ActInteropBackendCheck(t)
-	seq.ActL2PipelineFull(t)
-	status = seq.SyncStatus()
-	require.Equal(t, uint64(1), status.UnsafeL2.Number)
-	require.Equal(t, uint64(1), status.CrossUnsafeL2.Number, "cross unsafe now")
+	// Verify as cross-unsafe with supervisor
+	actors.Supervisor.SyncEvents(t, actors.ChainA.ChainID)
+	actors.Supervisor.SyncCrossUnsafe(t, actors.ChainA.ChainID)
+	actors.ChainA.Sequencer.ActL2PipelineFull(t)
+	status = actors.ChainA.Sequencer.SyncStatus()
+	require.Equal(t, head, status.UnsafeL2.ID())
+	require.Equal(t, head, status.CrossUnsafeL2.ID())
 	require.Equal(t, uint64(0), status.LocalSafeL2.Number)
 	require.Equal(t, uint64(0), status.SafeL2.Number)
+	require.Equal(t, uint64(0), status.FinalizedL2.Number)
 
-	// submit all new L2 blocks
-	batcher.ActSubmitAll(t)
-	// new L1 block with L2 batch
-	l1Miner.ActL1StartBlock(12)(t)
-	l1Miner.ActL1IncludeTx(sd.RollupCfg.Genesis.SystemConfig.BatcherAddr)(t)
-	l1Miner.ActL1EndBlock(t)
-
-	// Sync the L1 block, to verify the L2 block as local-safe.
-	seqMockBackend.UpdateLocalUnsafeFn = nil
-	nextL2 := uint64(0)
-	seqMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
-		require.Equal(t, nextL2, lastDerived.Number)
-		nextL2 += 1
-		return nil
-	}
-	seqMockBackend.SafeViewFn = func(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error) {
-		require.Equal(t, chainID, l2ChainID)
-		require.Equal(t, uint64(1), safe.Local.Number)
-		require.Equal(t, uint64(0), safe.Cross.Number)
-		return safe, nil
-	}
-	seq.ActL1HeadSignal(t)
-	l1Head := seq.SyncStatus().HeadL1
-	seq.ActL2PipelineFull(t)
-	require.Equal(t, uint64(2), nextL2)
-
-	status = seq.SyncStatus()
-	require.Equal(t, uint64(1), status.UnsafeL2.Number)
-	require.Equal(t, uint64(1), status.CrossUnsafeL2.Number)
-	require.Equal(t, uint64(1), status.LocalSafeL2.Number, "local safe changed")
+	// Submit the L2 block, sync the local-safe data
+	actors.ChainA.Batcher.ActSubmitAll(t)
+	actors.L1Miner.ActL1StartBlock(12)(t)
+	actors.L1Miner.ActL1IncludeTx(actors.ChainA.BatcherAddr)(t)
+	actors.L1Miner.ActL1EndBlock(t)
+	actors.ChainA.Sequencer.ActL1HeadSignal(t)
+	actors.ChainA.Sequencer.ActL2PipelineFull(t)
+	status = actors.ChainA.Sequencer.SyncStatus()
+	require.Equal(t, head, status.UnsafeL2.ID())
+	require.Equal(t, head, status.CrossUnsafeL2.ID())
+	require.Equal(t, head, status.LocalSafeL2.ID())
 	require.Equal(t, uint64(0), status.SafeL2.Number)
-
-	// Now mark it as cross-safe
-	seqMockBackend.SafeViewFn = func(ctx context.Context, chainID types.ChainID, request types.ReferenceView) (types.ReferenceView, error) {
-		require.Equal(t, chainID, l2ChainID)
-		require.Equal(t, uint64(1), request.Local.Number)
-		require.Equal(t, uint64(0), request.Cross.Number)
-		out := request
-		out.Cross = request.Local
-		return out, nil
-	}
-	seqMockBackend.DerivedFromFn = func(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
-		require.Equal(t, uint64(1), derived.Number)
-		return l1Head, nil
-	}
-	seqMockBackend.FinalizedFn = func(ctx context.Context, chainID types.ChainID) (eth.BlockID, error) {
-		return seq.RollupCfg.Genesis.L1, nil
-	}
-	seq.ActInteropBackendCheck(t)
-	seq.ActL2PipelineFull(t)
-
-	status = seq.SyncStatus()
-	require.Equal(t, uint64(1), status.UnsafeL2.Number)
-	require.Equal(t, uint64(1), status.CrossUnsafeL2.Number)
-	require.Equal(t, uint64(1), status.LocalSafeL2.Number)
-	require.Equal(t, uint64(1), status.SafeL2.Number, "cross-safe reached")
 	require.Equal(t, uint64(0), status.FinalizedL2.Number)
-
-	verMockBackend.UpdateLocalUnsafeFn = func(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
-		require.Equal(t, uint64(1), head.Number)
-		return nil
-	}
-	nextL2 = 0
-	verMockBackend.UpdateLocalSafeFn = func(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error {
-		require.Equal(t, nextL2, lastDerived.Number)
-		nextL2 += 1
-		require.Equal(t, l1Head.ID(), derivedFrom.ID())
-		return nil
-	}
-	// The verifier might not see the L2 block that was just derived from L1 as cross-verified yet.
-	verMockBackend.UnsafeViewFn = func(ctx context.Context, chainID types.ChainID, request types.ReferenceView) (types.ReferenceView, error) {
-		require.Equal(t, uint64(1), request.Local.Number)
-		require.Equal(t, uint64(0), request.Cross.Number)
-		// Don't promote the Cross value yet
-		return request, nil
-	}
-	verMockBackend.SafeViewFn = func(ctx context.Context, chainID types.ChainID, request types.ReferenceView) (types.ReferenceView, error) {
-		require.Equal(t, uint64(1), request.Local.Number)
-		require.Equal(t, uint64(0), request.Cross.Number)
-		// Don't promote the Cross value yet
-		return request, nil
-	}
-	ver.ActL1HeadSignal(t)
-	ver.ActL2PipelineFull(t)
-	require.Equal(t, uint64(2), nextL2)
-	status = ver.SyncStatus()
-	require.Equal(t, uint64(1), status.UnsafeL2.Number, "synced the block")
-	require.Equal(t, uint64(0), status.CrossUnsafeL2.Number, "not cross-verified yet")
-	require.Equal(t, uint64(1), status.LocalSafeL2.Number, "derived from L1, thus local-safe")
-	require.Equal(t, uint64(0), status.SafeL2.Number, "not yet cross-safe")
+	// Local-safe does not count as "safe" in RPC
+	n := actors.ChainA.SequencerEngine.L2Chain().CurrentSafeBlock().Number.Uint64()
+	require.Equal(t, uint64(0), n)
+
+	// Cross-safe verify it
+	actors.Supervisor.SyncCrossSafe(t, actors.ChainA.ChainID)
+	actors.ChainA.Sequencer.ActInteropBackendCheck(t)
+	actors.ChainA.Sequencer.ActL2PipelineFull(t)
+	status = actors.ChainA.Sequencer.SyncStatus()
+	require.Equal(t, head, status.UnsafeL2.ID())
+	require.Equal(t, head, status.CrossUnsafeL2.ID())
+	require.Equal(t, head, status.LocalSafeL2.ID())
+	require.Equal(t, head, status.SafeL2.ID())
 	require.Equal(t, uint64(0), status.FinalizedL2.Number)
-
-	seqMockBackend.UpdateFinalizedL1Fn = func(ctx context.Context, chainID types.ChainID, finalized eth.L1BlockRef) error {
-		require.Equal(t, l1Head, finalized)
-		return nil
-	}
-	// Allow the supervisor to promote the cross-safe L2 block to finalized.
-	seqMockBackend.FinalizedFn = func(ctx context.Context, chainID types.ChainID) (eth.BlockID, error) {
-		return seq.SyncStatus().SafeL2.ID(), nil
-	}
-	// signal that L1 finalized; the cross-safe block we have should get finalized too
-	l1Miner.ActL1SafeNext(t)
-	l1Miner.ActL1FinalizeNext(t)
-	seq.ActL1SafeSignal(t)
-	seq.ActL1FinalizedSignal(t)
-	seq.ActL2PipelineFull(t)
-
-	status = seq.SyncStatus()
-	require.Equal(t, uint64(1), status.FinalizedL2.Number, "finalized the block")
+	h := actors.ChainA.SequencerEngine.L2Chain().CurrentSafeBlock().Hash()
+	require.Equal(t, head.Hash, h)
+
+	// Finalize L1, and see how the op-node forwards it to the supervisor.
+	// The supervisor then determines finality, which the op-node can use.
+	actors.L1Miner.ActL1SafeNext(t)
+	actors.L1Miner.ActL1FinalizeNext(t)
+	actors.ChainA.Sequencer.ActL1SafeSignal(t)
+	actors.ChainA.Sequencer.ActL1FinalizedSignal(t)
+	actors.ChainA.Sequencer.ActL2PipelineFull(t)
+	finalizedL2BlockID, err := actors.Supervisor.Finalized(t.Ctx(), actors.ChainA.ChainID)
+	require.NoError(t, err)
+	require.Equal(t, head, finalizedL2BlockID)
+
+	// The op-node needs a poke to look at the updated supervisor finality state
+	actors.ChainA.Sequencer.ActInteropBackendCheck(t)
+	actors.ChainA.Sequencer.ActL2PipelineFull(t)
+	h = actors.ChainA.SequencerEngine.L2Chain().CurrentFinalBlock().Hash()
+	require.Equal(t, head.Hash, h)
+	status = actors.ChainA.Sequencer.SyncStatus()
+	require.Equal(t, head, status.UnsafeL2.ID())
+	require.Equal(t, head, status.CrossUnsafeL2.ID())
+	require.Equal(t, head, status.LocalSafeL2.ID())
+	require.Equal(t, head, status.SafeL2.ID())
+	require.Equal(t, head, status.FinalizedL2.ID())
 }
diff --git a/op-e2e/actions/proofs/helpers/env.go b/op-e2e/actions/proofs/helpers/env.go
index 75b7f2554f4c..45e8b4d7e346 100644
--- a/op-e2e/actions/proofs/helpers/env.go
+++ b/op-e2e/actions/proofs/helpers/env.go
@@ -74,7 +74,7 @@ func NewL2FaultProofEnv[c any](t helpers.Testing, testCfg *TestCfg[c], tp *e2eut
 
 	l1Cl, err := sources.NewL1Client(miner.RPCClient(), log, nil, sources.L1ClientDefaultConfig(sd.RollupCfg, false, sources.RPCKindStandard))
 	require.NoError(t, err)
-	engine := helpers.NewL2Engine(t, log.New("role", "sequencer-engine"), sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath, helpers.EngineWithP2P())
+	engine := helpers.NewL2Engine(t, log.New("role", "sequencer-engine"), sd.L2Cfg, jwtPath, helpers.EngineWithP2P())
 	l2EngineCl, err := sources.NewEngineClient(engine.RPCClient(), log, nil, sources.EngineClientDefaultConfig(sd.RollupCfg))
 	require.NoError(t, err)
 
diff --git a/op-e2e/actions/upgrades/dencun_fork_test.go b/op-e2e/actions/upgrades/dencun_fork_test.go
index adc995c0636d..60f59abedcc6 100644
--- a/op-e2e/actions/upgrades/dencun_fork_test.go
+++ b/op-e2e/actions/upgrades/dencun_fork_test.go
@@ -190,7 +190,7 @@ func aliceSimpleBlobTx(t helpers.Testing, dp *e2eutils.DeployParams) *types.Tran
 
 func newEngine(t helpers.Testing, sd *e2eutils.SetupData, log log.Logger) *helpers.L2Engine {
 	jwtPath := e2eutils.WriteDefaultJWT(t)
-	return helpers.NewL2Engine(t, log, sd.L2Cfg, sd.RollupCfg.Genesis.L1, jwtPath)
+	return helpers.NewL2Engine(t, log, sd.L2Cfg, jwtPath)
 }
 
 // TestDencunBlobTxRPC tries to send a Blob tx to the L2 engine via RPC, it should not be accepted.
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index a9322b84c057..ff5d5575cd31 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -439,3 +439,37 @@ func (su *SupervisorBackend) UpdateFinalizedL1(ctx context.Context, chainID type
 
 	return su.chainDBs.UpdateFinalizedL1(finalized)
 }
+
+// Access to synchronous processing for tests
+// ----------------------------
+
+func (su *SupervisorBackend) SyncEvents(chainID types.ChainID) error {
+	su.mu.RLock()
+	defer su.mu.RUnlock()
+	ch, ok := su.chainProcessors[chainID]
+	if !ok {
+		return types.ErrUnknownChain
+	}
+	ch.ProcessToHead()
+	return nil
+}
+
+func (su *SupervisorBackend) SyncCrossUnsafe(chainID types.ChainID) error {
+	su.mu.RLock()
+	defer su.mu.RUnlock()
+	ch, ok := su.crossUnsafeProcessors[chainID]
+	if !ok {
+		return types.ErrUnknownChain
+	}
+	return ch.ProcessWork()
+}
+
+func (su *SupervisorBackend) SyncCrossSafe(chainID types.ChainID) error {
+	su.mu.RLock()
+	defer su.mu.RUnlock()
+	ch, ok := su.crossSafeProcessors[chainID]
+	if !ok {
+		return types.ErrUnknownChain
+	}
+	return ch.ProcessWork()
+}
diff --git a/op-supervisor/supervisor/backend/processors/chain_processor.go b/op-supervisor/supervisor/backend/processors/chain_processor.go
index db57e977aae0..7f4687086030 100644
--- a/op-supervisor/supervisor/backend/processors/chain_processor.go
+++ b/op-supervisor/supervisor/backend/processors/chain_processor.go
@@ -134,7 +134,7 @@ func (s *ChainProcessor) work() {
 		target := s.nextNum()
 		if err := s.update(target); err != nil {
 			if errors.Is(err, ethereum.NotFound) {
-				s.log.Info("Cannot find next block yet", "target", target)
+				s.log.Info("Cannot find next block yet", "target", target, "err", err)
 			} else if errors.Is(err, types.ErrNoRPCSource) {
 				s.log.Warn("No RPC source configured, cannot process new blocks")
 			} else {

From 13d1fc17a568fb43ac4fce1024e2c6d4896a3583 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Wed, 30 Oct 2024 01:27:07 +1000
Subject: [PATCH 074/451] proofs-tools: Update kona to 0.1.0-alpha.6 (#12717)

Co-authored-by: clabby <ben@clab.by>
---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 0da2b48aa0df..4f72678a8cab 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -207,7 +207,7 @@ target "proofs-tools" {
   context = "."
   args = {
     CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="kona-client-v0.1.0-alpha.5"
+    KONA_VERSION="kona-client-v0.1.0-alpha.6"
   }
   target="proofs-tools"
   platforms = split(",", PLATFORMS)

From 4b1c12ad4312fe6fe28d8297a26cccf053356704 Mon Sep 17 00:00:00 2001
From: Tyler Smith <mail@tcry.pt>
Date: Tue, 29 Oct 2024 23:20:17 +0700
Subject: [PATCH 075/451] Cross safe updates use cycle checks (#12726)

* tweak: Make cycle checks work with an OpenBlock that returns BlockRef.

* tests,fix: Make tests generate correct hazard maps.

* tests: Add assertion on returned blockRef.

* tests,fix: Fix TestCrossUnsafeUpdate to use correct mock log count.

* tweak: Call HazardCycleChecks from scopedCrossSafeUpdate and CrossUnsafeUpdate.

* tests,cleanup: Fix test assertion comment.

* tests,fix: Fix TestCrossSafeUpdate.
---
 .../supervisor/backend/cross/cycle.go         | 10 ++++-
 .../supervisor/backend/cross/cycle_test.go    | 23 +++++-----
 .../supervisor/backend/cross/safe_update.go   |  6 +--
 .../backend/cross/safe_update_test.go         | 45 ++++++++++++++++++-
 .../supervisor/backend/cross/unsafe_update.go |  6 +--
 .../backend/cross/unsafe_update_test.go       | 31 ++++++++++++-
 6 files changed, 100 insertions(+), 21 deletions(-)

diff --git a/op-supervisor/supervisor/backend/cross/cycle.go b/op-supervisor/supervisor/backend/cross/cycle.go
index a872bc75a860..9884856a34a5 100644
--- a/op-supervisor/supervisor/backend/cross/cycle.go
+++ b/op-supervisor/supervisor/backend/cross/cycle.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -17,7 +18,7 @@ var (
 // CycleCheckDeps is an interface for checking cyclical dependencies between logs.
 type CycleCheckDeps interface {
 	// OpenBlock returns log data for the requested block, to be used for cycle checking.
-	OpenBlock(chainID types.ChainID, blockNum uint64) (seal types.BlockSeal, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
+	OpenBlock(chainID types.ChainID, blockNum uint64) (block eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
 }
 
 // node represents a log entry in the dependency graph.
@@ -95,7 +96,8 @@ func gatherLogs(d CycleCheckDeps, inTimestamp uint64, hazards map[types.ChainInd
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to open block: %w", err)
 		}
-		if bl != hazardBlock {
+
+		if !blockSealMatchesRef(hazardBlock, bl) {
 			return nil, nil, fmt.Errorf("tried to open block %s of chain %s, but got different block %s than expected, use a reorg lock for consistency", hazardBlock, hazardChainID, bl)
 		}
 
@@ -246,6 +248,10 @@ func checkGraph(g *graph) error {
 	}
 }
 
+func blockSealMatchesRef(seal types.BlockSeal, ref eth.BlockRef) bool {
+	return seal.Number == ref.Number && seal.Hash == ref.Hash
+}
+
 // GenerateMermaidDiagram creates a Mermaid flowchart diagram from the graph data for debugging.
 func GenerateMermaidDiagram(g *graph) string {
 	var sb strings.Builder
diff --git a/op-supervisor/supervisor/backend/cross/cycle_test.go b/op-supervisor/supervisor/backend/cross/cycle_test.go
index a90258b88a26..e160023caf81 100644
--- a/op-supervisor/supervisor/backend/cross/cycle_test.go
+++ b/op-supervisor/supervisor/backend/cross/cycle_test.go
@@ -8,14 +8,15 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
 type mockCycleCheckDeps struct {
-	openBlockFn func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error)
+	openBlockFn func(chainID types.ChainID, blockNum uint64) (eth.BlockRef, uint32, map[uint32]*types.ExecutingMessage, error)
 }
 
-func (m *mockCycleCheckDeps) OpenBlock(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
+func (m *mockCycleCheckDeps) OpenBlock(chainID types.ChainID, blockNum uint64) (eth.BlockRef, uint32, map[uint32]*types.ExecutingMessage, error) {
 	return m.openBlockFn(chainID, blockNum)
 }
 
@@ -33,7 +34,7 @@ type hazardCycleChecksTestCase struct {
 
 	// Optional overrides
 	hazards     map[types.ChainIndex]types.BlockSeal
-	openBlockFn func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error)
+	openBlockFn func(chainID types.ChainID, blockNum uint64) (eth.BlockRef, uint32, map[uint32]*types.ExecutingMessage, error)
 }
 
 func runHazardCycleChecksTestCaseGroup(t *testing.T, group string, tests []hazardCycleChecksTestCase) {
@@ -47,7 +48,7 @@ func runHazardCycleChecksTestCaseGroup(t *testing.T, group string, tests []hazar
 func runHazardCycleChecksTestCase(t *testing.T, tc hazardCycleChecksTestCase) {
 	// Create mocked dependencies
 	deps := &mockCycleCheckDeps{
-		openBlockFn: func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
+		openBlockFn: func(chainID types.ChainID, blockNum uint64) (eth.BlockRef, uint32, map[uint32]*types.ExecutingMessage, error) {
 			// Use override if provided
 			if tc.openBlockFn != nil {
 				return tc.openBlockFn(chainID, blockNum)
@@ -57,12 +58,12 @@ func runHazardCycleChecksTestCase(t *testing.T, tc hazardCycleChecksTestCase) {
 			chainStr := chainID.String()
 			def, ok := tc.chainBlocks[chainStr]
 			if !ok {
-				return types.BlockSeal{}, 0, nil, errors.New("unexpected chain")
+				return eth.BlockRef{}, 0, nil, errors.New("unexpected chain")
 			}
 			if def.error != nil {
-				return types.BlockSeal{}, 0, nil, def.error
+				return eth.BlockRef{}, 0, nil, def.error
 			}
-			return types.BlockSeal{Number: blockNum}, def.logCount, def.messages, nil
+			return eth.BlockRef{Number: blockNum}, def.logCount, def.messages, nil
 		},
 	}
 
@@ -149,8 +150,8 @@ func TestHazardCycleChecksFailures(t *testing.T) {
 		{
 			name:        "failed to open block error",
 			chainBlocks: emptyChainBlocks,
-			openBlockFn: func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
-				return types.BlockSeal{}, 0, nil, testOpenBlockErr
+			openBlockFn: func(chainID types.ChainID, blockNum uint64) (eth.BlockRef, uint32, map[uint32]*types.ExecutingMessage, error) {
+				return eth.BlockRef{}, 0, nil, testOpenBlockErr
 			},
 			expectErr: errors.New("failed to open block"),
 			msg:       "expected error when OpenBlock fails",
@@ -159,8 +160,8 @@ func TestHazardCycleChecksFailures(t *testing.T) {
 			name:        "block mismatch error",
 			chainBlocks: emptyChainBlocks,
 			// openBlockFn returns a block number that doesn't match the expected block number.
-			openBlockFn: func(chainID types.ChainID, blockNum uint64) (types.BlockSeal, uint32, map[uint32]*types.ExecutingMessage, error) {
-				return types.BlockSeal{Number: blockNum + 1}, 0, make(map[uint32]*types.ExecutingMessage), nil
+			openBlockFn: func(chainID types.ChainID, blockNum uint64) (eth.BlockRef, uint32, map[uint32]*types.ExecutingMessage, error) {
+				return eth.BlockRef{Number: blockNum + 1}, 0, make(map[uint32]*types.ExecutingMessage), nil
 			},
 			expectErr: errors.New("tried to open block"),
 			msg:       "expected error due to block mismatch",
diff --git a/op-supervisor/supervisor/backend/cross/safe_update.go b/op-supervisor/supervisor/backend/cross/safe_update.go
index 172277db52de..6d74ca8ad2ba 100644
--- a/op-supervisor/supervisor/backend/cross/safe_update.go
+++ b/op-supervisor/supervisor/backend/cross/safe_update.go
@@ -89,9 +89,9 @@ func scopedCrossSafeUpdate(logger log.Logger, chainID types.ChainID, d CrossSafe
 	if err := HazardSafeFrontierChecks(d, candidateScope.ID(), hazards); err != nil {
 		return candidateScope, fmt.Errorf("failed to verify block %s in cross-safe frontier: %w", candidate, err)
 	}
-	//if err := HazardCycleChecks(d, candidate.Timestamp, hazards); err != nil {
-	// TODO
-	//}
+	if err := HazardCycleChecks(d, candidate.Time, hazards); err != nil {
+		return candidateScope, fmt.Errorf("failed to verify block %s in cross-safe check for cycle hazards: %w", candidate, err)
+	}
 
 	// promote the candidate block to cross-safe
 	if err := d.UpdateCrossSafe(chainID, candidateScope, candidate); err != nil {
diff --git a/op-supervisor/supervisor/backend/cross/safe_update_test.go b/op-supervisor/supervisor/backend/cross/safe_update_test.go
index fec5f69b8ca4..b3361c711bd0 100644
--- a/op-supervisor/supervisor/backend/cross/safe_update_test.go
+++ b/op-supervisor/supervisor/backend/cross/safe_update_test.go
@@ -30,6 +30,9 @@ func TestCrossSafeUpdate(t *testing.T) {
 		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
 			return opened, 10, execs, nil
 		}
+		csd.checkFn = func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 1, Timestamp: 1}, nil
+		}
 		csd.deps = mockDependencySet{}
 		// when scopedCrossSafeUpdate returns no error,
 		// no error is returned
@@ -256,6 +259,9 @@ func TestScopedCrossSafeUpdate(t *testing.T) {
 		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
 			return opened, 10, execs, nil
 		}
+		csd.checkFn = func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 1, Timestamp: 1}, nil
+		}
 		count := 0
 		csd.deps = mockDependencySet{}
 		// cause CrossSafeHazards to return an error by making ChainIDFromIndex return an error
@@ -274,6 +280,32 @@ func TestScopedCrossSafeUpdate(t *testing.T) {
 		require.ErrorContains(t, err, "frontier")
 		require.Equal(t, eth.BlockRef{}, blockRef)
 	})
+	t.Run("HazardCycleChecks returns error", func(t *testing.T) {
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		csd := &mockCrossSafeDeps{}
+		candidate := eth.BlockRef{Number: 1, Time: 1}
+		candidateScope := eth.BlockRef{Number: 2}
+		csd.candidateCrossSafeFn = func() (derivedFromScope, crossSafe eth.BlockRef, err error) {
+			return candidateScope, candidate, nil
+		}
+		opened := eth.BlockRef{Number: 1, Time: 1}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1, LogIdx: 2}
+		em2 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1, LogIdx: 1}
+		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return opened, 3, map[uint32]*types.ExecutingMessage{1: em1, 2: em2}, nil
+		}
+		csd.checkFn = func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 1, Timestamp: 1}, nil
+		}
+		csd.deps = mockDependencySet{}
+
+		// HazardCycleChecks returns an error with appropriate wrapping
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		require.ErrorContains(t, err, "cycle detected")
+		require.ErrorContains(t, err, "failed to verify block")
+		require.Equal(t, eth.BlockRef{Number: 2}, blockRef)
+	})
 	t.Run("UpdateCrossSafe returns error", func(t *testing.T) {
 		logger := testlog.Logger(t, log.LevelDebug)
 		chainID := types.ChainIDFromUInt64(0)
@@ -288,15 +320,19 @@ func TestScopedCrossSafeUpdate(t *testing.T) {
 		csd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
 			return opened, 10, execs, nil
 		}
+		csd.checkFn = func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 1, Timestamp: 1}, nil
+		}
 		csd.deps = mockDependencySet{}
 		csd.updateCrossSafeFn = func(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error {
 			return errors.New("some error")
 		}
 		// when UpdateCrossSafe returns an error,
 		// the error is returned
-		_, err := scopedCrossSafeUpdate(logger, chainID, csd)
+		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
 		require.ErrorContains(t, err, "some error")
 		require.ErrorContains(t, err, "failed to update")
+		require.Equal(t, eth.BlockRef{Number: 2}, blockRef)
 	})
 	t.Run("successful update", func(t *testing.T) {
 		logger := testlog.Logger(t, log.LevelDebug)
@@ -325,6 +361,9 @@ func TestScopedCrossSafeUpdate(t *testing.T) {
 		// when no errors occur, the update is carried out
 		// the used candidate and scope are from CandidateCrossSafe
 		// the candidateScope is returned
+		csd.checkFn = func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 1, Timestamp: 1}, nil
+		}
 		blockRef, err := scopedCrossSafeUpdate(logger, chainID, csd)
 		require.Equal(t, chainID, updatingChain)
 		require.Equal(t, candidateScope, updatingCandidateScope)
@@ -342,6 +381,7 @@ type mockCrossSafeDeps struct {
 	updateCrossSafeFn    func(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error
 	nextDerivedFromFn    func(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error)
 	previousDerivedFn    func(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error)
+	checkFn              func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error)
 }
 
 func (m *mockCrossSafeDeps) CrossSafe(chainID types.ChainID) (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
@@ -367,6 +407,9 @@ func (m *mockCrossSafeDeps) CrossDerivedFrom(chainID types.ChainID, derived eth.
 }
 
 func (m *mockCrossSafeDeps) Check(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+	if m.checkFn != nil {
+		return m.checkFn(chainID, blockNum, logIdx, logHash)
+	}
 	return types.BlockSeal{}, nil
 }
 
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_update.go b/op-supervisor/supervisor/backend/cross/unsafe_update.go
index bc13146d38ff..56d396127158 100644
--- a/op-supervisor/supervisor/backend/cross/unsafe_update.go
+++ b/op-supervisor/supervisor/backend/cross/unsafe_update.go
@@ -60,9 +60,9 @@ func CrossUnsafeUpdate(ctx context.Context, logger log.Logger, chainID types.Cha
 	if err := HazardUnsafeFrontierChecks(d, hazards); err != nil {
 		return fmt.Errorf("failed to verify block %s in cross-unsafe frontier: %w", candidate, err)
 	}
-	//if err := HazardCycleChecks(d, candidate.Timestamp, hazards); err != nil {
-	//// TODO
-	//}
+	if err := HazardCycleChecks(d, candidate.Timestamp, hazards); err != nil {
+		return fmt.Errorf("failed to verify block %s in cross-unsafe check for cycle hazards: %w", candidate, err)
+	}
 
 	// promote the candidate block to cross-unsafe
 	if err := d.UpdateCrossUnsafe(chainID, candidate); err != nil {
diff --git a/op-supervisor/supervisor/backend/cross/unsafe_update_test.go b/op-supervisor/supervisor/backend/cross/unsafe_update_test.go
index c0e264c97206..ada7d0756cf4 100644
--- a/op-supervisor/supervisor/backend/cross/unsafe_update_test.go
+++ b/op-supervisor/supervisor/backend/cross/unsafe_update_test.go
@@ -131,6 +131,31 @@ func TestCrossUnsafeUpdate(t *testing.T) {
 		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
 		require.ErrorContains(t, err, "some error")
 	})
+	t.Run("HazardCycleChecks returns error", func(t *testing.T) {
+		ctx := context.Background()
+		logger := testlog.Logger(t, log.LevelDebug)
+		chainID := types.ChainIDFromUInt64(0)
+		usd := &mockCrossUnsafeDeps{}
+		crossUnsafe := types.BlockSeal{Hash: common.Hash{0x01}}
+		usd.crossUnsafeFn = func(chainID types.ChainID) (types.BlockSeal, error) {
+			return crossUnsafe, nil
+		}
+		bl := eth.BlockRef{ParentHash: common.Hash{0x01}, Number: 1, Time: 1}
+		em1 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1, LogIdx: 2}
+		em2 := &types.ExecutingMessage{Chain: types.ChainIndex(0), Timestamp: 1, LogIdx: 1}
+		usd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
+			return bl, 3, map[uint32]*types.ExecutingMessage{1: em1, 2: em2}, nil
+		}
+		usd.checkFn = func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 1, Timestamp: 1}, nil
+		}
+		usd.deps = mockDependencySet{}
+
+		// HazardCycleChecks returns an error with appropriate wrapping
+		err := CrossUnsafeUpdate(ctx, logger, chainID, usd)
+		require.ErrorContains(t, err, "cycle detected")
+		require.ErrorContains(t, err, "failed to verify block")
+	})
 	t.Run("successful update", func(t *testing.T) {
 		ctx := context.Background()
 		logger := testlog.Logger(t, log.LevelDebug)
@@ -144,7 +169,7 @@ func TestCrossUnsafeUpdate(t *testing.T) {
 		em1 := &types.ExecutingMessage{Timestamp: 1}
 		usd.openBlockFn = func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
 			// include one executing message to ensure one hazard is returned
-			return bl, 0, map[uint32]*types.ExecutingMessage{1: em1}, nil
+			return bl, 2, map[uint32]*types.ExecutingMessage{1: em1}, nil
 		}
 		usd.deps = mockDependencySet{}
 		var updatingChainID types.ChainID
@@ -168,6 +193,7 @@ type mockCrossUnsafeDeps struct {
 	crossUnsafeFn       func(chainID types.ChainID) (types.BlockSeal, error)
 	openBlockFn         func(chainID types.ChainID, blockNum uint64) (ref eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error)
 	updateCrossUnsafeFn func(chain types.ChainID, crossUnsafe types.BlockSeal) error
+	checkFn             func(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error)
 }
 
 func (m *mockCrossUnsafeDeps) CrossUnsafe(chainID types.ChainID) (derived types.BlockSeal, err error) {
@@ -182,6 +208,9 @@ func (m *mockCrossUnsafeDeps) DependencySet() depset.DependencySet {
 }
 
 func (m *mockCrossUnsafeDeps) Check(chainID types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (types.BlockSeal, error) {
+	if m.checkFn != nil {
+		return m.checkFn(chainID, blockNum, logIdx, logHash)
+	}
 	return types.BlockSeal{}, nil
 }
 

From 2780ad1f16e5ff70ea8bdb66f492c11ae62b9b49 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Tue, 29 Oct 2024 13:54:50 -0700
Subject: [PATCH 076/451] cannon: Implement MIPS64Memory.sol (#12653)

* cannon: Implement MIPS64Memory.sol

* add non-zero revert data; cleanup go-ffi script
---
 packages/contracts-bedrock/.gitignore         |   1 +
 packages/contracts-bedrock/justfile           |   8 +-
 .../scripts/go-ffi/differential-testing.go    |  87 ++++----
 .../src/cannon/libraries/MIPS64Memory.sol     | 176 +++++++++++++++
 .../test/cannon/MIPS64Memory.t.sol            | 211 ++++++++++++++++++
 .../test/setup/FFIInterface.sol               |  84 +++++++
 6 files changed, 524 insertions(+), 43 deletions(-)
 create mode 100644 packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
 create mode 100644 packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol

diff --git a/packages/contracts-bedrock/.gitignore b/packages/contracts-bedrock/.gitignore
index 6ca35454b291..ae6569a94ebe 100644
--- a/packages/contracts-bedrock/.gitignore
+++ b/packages/contracts-bedrock/.gitignore
@@ -16,6 +16,7 @@ kontrol_prove_report.xml
 
 # Scripts
 scripts/go-ffi/go-ffi
+scripts/go-ffi/go-ffi-cannon64
 
 # Environment Variables
 .envrc
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 23f91c5779c3..d77e93822462 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -27,9 +27,15 @@ forge-build:
 build: prebuild lint-fix-no-fail forge-build interfaces-check-no-build
 
 # Builds the go-ffi tool for contract tests.
-build-go-ffi:
+build-go-ffi-default:
   cd ./scripts/go-ffi && go build
 
+# Builds the go-ffi tool for MIPS64 contract tests.
+build-go-ffi-cannon64:
+  cd ./scripts/go-ffi && go build -tags=cannon64 -o ./go-ffi-cannon64
+
+build-go-ffi: build-go-ffi-default build-go-ffi-cannon64
+
 # Cleans build artifacts and deployments.
 clean:
   rm -rf ./artifacts ./forge-artifacts ./cache ./scripts/go-ffi/go-ffi ./deployments/hardhat/*
diff --git a/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go b/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go
index b81bbeb2b153..e35d2a82c303 100644
--- a/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go
+++ b/packages/contracts-bedrock/scripts/go-ffi/differential-testing.go
@@ -360,68 +360,71 @@ func DiffTestUtils() {
 		// Print the output
 		fmt.Print(hexutil.Encode(packed[32:]))
 	case "cannonMemoryProof":
-		// <pc, insn, [memAddr, memValue], [memAddr2, memValue2]>
-		// Generates a memory proof of `memAddr` for a trie containing memValue and memValue2
+		// <memAddr0, memValue0, [memAddr1, memValue1], [memAddr2, memValue2]>
+		// Generates memory proofs of `memAddr0` for a trie containing memValue0 and `memAddr1` for a trie containing memValue1 and memValue2
+		// For the cannon stf, this is equivalent to the prestate proofs of the program counter and memory access for instruction execution
 		mem := memory.NewMemory()
 		if len(args) != 3 && len(args) != 5 && len(args) != 7 {
 			panic("Error: cannonMemoryProofWithProof requires 2, 4, or 6 arguments")
 		}
-		pc, err := strconv.ParseUint(args[1], 10, 32)
+		memAddr0, err := strconv.ParseUint(args[1], 10, arch.WordSize)
 		checkErr(err, "Error decoding addr")
-		insn, err := strconv.ParseUint(args[2], 10, 32)
-		checkErr(err, "Error decoding insn")
-		mem.SetWord(arch.Word(pc), arch.Word(insn))
+		memValue0, err := strconv.ParseUint(args[2], 10, arch.WordSize)
+		checkErr(err, "Error decoding memValue0")
+		mem.SetWord(arch.Word(memAddr0), arch.Word(memValue0))
 
-		var insnProof, memProof [896]byte
+		var proof1 []byte
 		if len(args) >= 5 {
-			memAddr, err := strconv.ParseUint(args[3], 10, 32)
+			memAddr, err := strconv.ParseUint(args[3], 10, arch.WordSize)
 			checkErr(err, "Error decoding memAddr")
-			memValue, err := strconv.ParseUint(args[4], 10, 32)
+			memValue, err := strconv.ParseUint(args[4], 10, arch.WordSize)
 			checkErr(err, "Error decoding memValue")
 			mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
-			memProof = mem.MerkleProof(arch.Word(memAddr))
+			proof := mem.MerkleProof(arch.Word(memAddr))
+			proof1 = proof[:]
 		}
 		if len(args) == 7 {
-			memAddr, err := strconv.ParseUint(args[5], 10, 32)
+			memAddr, err := strconv.ParseUint(args[5], 10, arch.WordSize)
 			checkErr(err, "Error decoding memAddr")
-			memValue, err := strconv.ParseUint(args[6], 10, 32)
+			memValue, err := strconv.ParseUint(args[6], 10, arch.WordSize)
 			checkErr(err, "Error decoding memValue")
 			mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
-			memProof = mem.MerkleProof(arch.Word(memAddr))
+			proof := mem.MerkleProof(arch.Word(memAddr))
+			proof1 = proof[:]
 		}
-		insnProof = mem.MerkleProof(arch.Word(pc))
+		proof0 := mem.MerkleProof(arch.Word(memAddr0))
 
 		output := struct {
 			MemRoot common.Hash
 			Proof   []byte
 		}{
 			MemRoot: mem.MerkleRoot(),
-			Proof:   append(insnProof[:], memProof[:]...),
+			Proof:   append(proof0[:], proof1...),
 		}
 		packed, err := cannonMemoryProofArgs.Pack(&output)
 		checkErr(err, "Error encoding output")
 		fmt.Print(hexutil.Encode(packed[32:]))
 	case "cannonMemoryProof2":
-		// <pc, insn, [memAddr, memValue], memAddr2>
-		// Generates a memory proof of memAddr2 for a trie containing memValue
+		// <memAddr0, memValue0, [memAddr1, memValue1], memAddr2>
+		// Generates memory proof of `memAddr2` for a trie containing `memValue0` and `memValue1`
 		mem := memory.NewMemory()
 		if len(args) != 6 {
 			panic("Error: cannonMemoryProofWithProof2 requires 5 arguments")
 		}
-		pc, err := strconv.ParseUint(args[1], 10, 32)
+		memAddr0, err := strconv.ParseUint(args[1], 10, arch.WordSize)
 		checkErr(err, "Error decoding addr")
-		insn, err := strconv.ParseUint(args[2], 10, 32)
-		checkErr(err, "Error decoding insn")
-		mem.SetWord(arch.Word(pc), arch.Word(insn))
+		memValue0, err := strconv.ParseUint(args[2], 10, arch.WordSize)
+		checkErr(err, "Error decoding memValue0")
+		mem.SetWord(arch.Word(memAddr0), arch.Word(memValue0))
 
-		var memProof [896]byte
-		memAddr, err := strconv.ParseUint(args[3], 10, 32)
+		var memProof [memory.MemProofSize]byte
+		memAddr, err := strconv.ParseUint(args[3], 10, arch.WordSize)
 		checkErr(err, "Error decoding memAddr")
-		memValue, err := strconv.ParseUint(args[4], 10, 32)
-		checkErr(err, "Error decoding memValue")
-		mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
+		memValue1, err := strconv.ParseUint(args[4], 10, arch.WordSize)
+		checkErr(err, "Error decoding memValue1")
+		mem.SetWord(arch.Word(memAddr), arch.Word(memValue1))
 
-		memAddr2, err := strconv.ParseUint(args[5], 10, 32)
+		memAddr2, err := strconv.ParseUint(args[5], 10, arch.WordSize)
 		checkErr(err, "Error decoding memAddr")
 		memProof = mem.MerkleProof(arch.Word(memAddr2))
 
@@ -436,27 +439,27 @@ func DiffTestUtils() {
 		checkErr(err, "Error encoding output")
 		fmt.Print(hexutil.Encode(packed[32:]))
 	case "cannonMemoryProofWrongLeaf":
-		// <pc, insn, memAddr, memValue>
+		// <memAddr0, memValue0, memAddr1, memValue1>
 		mem := memory.NewMemory()
 		if len(args) != 5 {
 			panic("Error: cannonMemoryProofWrongLeaf requires 4 arguments")
 		}
-		pc, err := strconv.ParseUint(args[1], 10, 32)
-		checkErr(err, "Error decoding addr")
-		insn, err := strconv.ParseUint(args[2], 10, 32)
-		checkErr(err, "Error decoding insn")
-		mem.SetWord(arch.Word(pc), arch.Word(insn))
-
-		var insnProof, memProof [896]byte
-		memAddr, err := strconv.ParseUint(args[3], 10, 32)
-		checkErr(err, "Error decoding memAddr")
-		memValue, err := strconv.ParseUint(args[4], 10, 32)
-		checkErr(err, "Error decoding memValue")
-		mem.SetWord(arch.Word(memAddr), arch.Word(memValue))
+		memAddr0, err := strconv.ParseUint(args[1], 10, arch.WordSize)
+		checkErr(err, "Error decoding memAddr0")
+		memValue0, err := strconv.ParseUint(args[2], 10, arch.WordSize)
+		checkErr(err, "Error decoding memValue0")
+		mem.SetWord(arch.Word(memAddr0), arch.Word(memValue0))
+
+		var insnProof, memProof [memory.MemProofSize]byte
+		memAddr1, err := strconv.ParseUint(args[3], 10, arch.WordSize)
+		checkErr(err, "Error decoding memAddr1")
+		memValue1, err := strconv.ParseUint(args[4], 10, arch.WordSize)
+		checkErr(err, "Error decoding memValue1")
+		mem.SetWord(arch.Word(memAddr1), arch.Word(memValue1))
 
 		// Compute a valid proof for the root, but for the wrong leaves.
-		memProof = mem.MerkleProof(arch.Word(memAddr + 32))
-		insnProof = mem.MerkleProof(arch.Word(pc + 32))
+		memProof = mem.MerkleProof(arch.Word(memAddr1 + arch.WordSize))
+		insnProof = mem.MerkleProof(arch.Word(memAddr0 + arch.WordSize))
 
 		output := struct {
 			MemRoot common.Hash
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
new file mode 100644
index 000000000000..23a6639bc9c4
--- /dev/null
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import "src/cannon/libraries/CannonErrors.sol";
+
+library MIPS64Memory {
+    uint64 internal constant EXT_MASK = 0x7;
+    uint64 internal constant MEM_PROOF_LEAF_COUNT = 60;
+    uint256 internal constant U64_MASK = 0xFFFFFFFFFFFFFFFF;
+
+    /// @notice Reads a 64-bit word from memory.
+    /// @param _memRoot The current memory root
+    /// @param _addr The address to read from.
+    /// @param _proofOffset The offset of the memory proof in calldata.
+    /// @return out_ The hashed MIPS state.
+    function readMem(bytes32 _memRoot, uint64 _addr, uint256 _proofOffset) internal pure returns (uint64 out_) {
+        bool valid;
+        (out_, valid) = readMemUnchecked(_memRoot, _addr, _proofOffset);
+        if (!valid) {
+            revert InvalidMemoryProof();
+        }
+    }
+
+    /// @notice Reads a 64-bit word from memory.
+    /// @param _memRoot The current memory root
+    /// @param _addr The address to read from.
+    /// @param _proofOffset The offset of the memory proof in calldata.
+    /// @return out_ The hashed MIPS state.
+    ///         valid_ Whether the proof is valid.
+    function readMemUnchecked(
+        bytes32 _memRoot,
+        uint64 _addr,
+        uint256 _proofOffset
+    )
+        internal
+        pure
+        returns (uint64 out_, bool valid_)
+    {
+        unchecked {
+            validateMemoryProofAvailability(_proofOffset);
+            assembly {
+                // Validate the address alignment.
+                if and(_addr, EXT_MASK) {
+                    // revert InvalidAddress();
+                    let ptr := mload(0x40)
+                    mstore(ptr, shl(224, 0xe6c4247b))
+                    revert(ptr, 0x4)
+                }
+
+                // Load the leaf value.
+                let leaf := calldataload(_proofOffset)
+                _proofOffset := add(_proofOffset, 32)
+
+                // Convenience function to hash two nodes together in scratch space.
+                function hashPair(a, b) -> h {
+                    mstore(0, a)
+                    mstore(32, b)
+                    h := keccak256(0, 64)
+                }
+
+                // Start with the leaf node.
+                // Work back up by combining with siblings, to reconstruct the root.
+                let path := shr(5, _addr)
+                let node := leaf
+                let end := sub(MEM_PROOF_LEAF_COUNT, 1)
+                for { let i := 0 } lt(i, end) { i := add(i, 1) } {
+                    let sibling := calldataload(_proofOffset)
+                    _proofOffset := add(_proofOffset, 32)
+                    switch and(shr(i, path), 1)
+                    case 0 { node := hashPair(node, sibling) }
+                    case 1 { node := hashPair(sibling, node) }
+                }
+
+                // Verify the root matches.
+                valid_ := eq(node, _memRoot)
+                if valid_ {
+                    // Bits to shift = (32 - 8 - (addr % 32)) * 8
+                    let shamt := shl(3, sub(sub(32, 8), and(_addr, 31)))
+                    out_ := and(shr(shamt, leaf), U64_MASK)
+                }
+            }
+        }
+    }
+
+    /// @notice Writes a 64-bit word to memory.
+    ///         This function first overwrites the part of the leaf.
+    ///         Then it recomputes the memory merkle root.
+    /// @param _addr The address to write to.
+    /// @param _proofOffset The offset of the memory proof in calldata.
+    /// @param _val The value to write.
+    /// @return newMemRoot_ The new memory root after modification
+    function writeMem(uint64 _addr, uint256 _proofOffset, uint64 _val) internal pure returns (bytes32 newMemRoot_) {
+        unchecked {
+            validateMemoryProofAvailability(_proofOffset);
+            assembly {
+                // Validate the address alignment.
+                if and(_addr, EXT_MASK) {
+                    // revert InvalidAddress();
+                    let ptr := mload(0x40)
+                    mstore(ptr, shl(224, 0xe6c4247b))
+                    revert(ptr, 0x4)
+                }
+
+                // Load the leaf value.
+                let leaf := calldataload(_proofOffset)
+                let shamt := shl(3, sub(sub(32, 8), and(_addr, 31)))
+
+                // Mask out 8 bytes, and OR in the value
+                leaf := or(and(leaf, not(shl(shamt, U64_MASK))), shl(shamt, _val))
+                _proofOffset := add(_proofOffset, 32)
+
+                // Convenience function to hash two nodes together in scratch space.
+                function hashPair(a, b) -> h {
+                    mstore(0, a)
+                    mstore(32, b)
+                    h := keccak256(0, 64)
+                }
+
+                // Start with the leaf node.
+                // Work back up by combining with siblings, to reconstruct the root.
+                let path := shr(5, _addr)
+                let node := leaf
+                let end := sub(MEM_PROOF_LEAF_COUNT, 1)
+                for { let i := 0 } lt(i, end) { i := add(i, 1) } {
+                    let sibling := calldataload(_proofOffset)
+                    _proofOffset := add(_proofOffset, 32)
+                    switch and(shr(i, path), 1)
+                    case 0 { node := hashPair(node, sibling) }
+                    case 1 { node := hashPair(sibling, node) }
+                }
+
+                newMemRoot_ := node
+            }
+            return newMemRoot_;
+        }
+    }
+
+    /// @notice Verifies a memory proof.
+    /// @param _memRoot The expected memory root
+    /// @param _addr The _addr proven.
+    /// @param _proofOffset The offset of the memory proof in calldata.
+    /// @return valid_ True iff it is a valid proof.
+    function isValidProof(bytes32 _memRoot, uint64 _addr, uint256 _proofOffset) internal pure returns (bool valid_) {
+        (, valid_) = readMemUnchecked(_memRoot, _addr, _proofOffset);
+    }
+
+    /// @notice Computes the offset of a memory proof in the calldata.
+    /// @param _proofDataOffset The offset of the set of all memory proof data within calldata (proof.offset)
+    ///     Equal to the offset of the first memory proof (at _proofIndex 0).
+    /// @param _proofIndex The index of the proof in the calldata.
+    /// @return offset_ The offset of the memory proof at the given _proofIndex in the calldata.
+    function memoryProofOffset(uint256 _proofDataOffset, uint8 _proofIndex) internal pure returns (uint256 offset_) {
+        unchecked {
+            // A proof of 64-bit memory, with 32-byte leaf values, is (64-5)=59 bytes32 entries.
+            // And the leaf value itself needs to be encoded as well: (59 + 1) = 60 bytes32 entries.
+            offset_ = _proofDataOffset + (uint256(_proofIndex) * (MEM_PROOF_LEAF_COUNT * 32));
+            return offset_;
+        }
+    }
+
+    /// @notice Validates that enough calldata is available to hold a full memory proof at the given offset
+    /// @param _proofStartOffset The index of the first byte of the target memory proof in calldata
+    function validateMemoryProofAvailability(uint256 _proofStartOffset) internal pure {
+        unchecked {
+            uint256 s = 0;
+            assembly {
+                s := calldatasize()
+            }
+            // A memory proof consists of MEM_PROOF_LEAF_COUNT bytes32 values - verify we have enough calldata
+            require(
+                s >= (_proofStartOffset + MEM_PROOF_LEAF_COUNT * 32),
+                "MIPS64Memory: check that there is enough calldata"
+            );
+        }
+    }
+}
diff --git a/packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol b/packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol
new file mode 100644
index 000000000000..a3a1160c7d48
--- /dev/null
+++ b/packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { CommonTest } from "test/setup/CommonTest.sol";
+import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
+import { InvalidMemoryProof } from "src/cannon/libraries/CannonErrors.sol";
+
+contract MIPS64Memory_Test is CommonTest {
+    MIPS64MemoryWithCalldata mem;
+
+    error InvalidAddress();
+
+    function setUp() public virtual override {
+        super.setUp();
+        mem = new MIPS64MemoryWithCalldata();
+    }
+
+    /// @dev Static unit test for basic memory access
+    function test_readMem_succeeds() external {
+        uint64 addr = 0x100;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        bytes32 root;
+        bytes memory proof;
+        (root, proof) = ffi.getCannonMemory64Proof(addr, word);
+        uint64 readWord = mem.readMem(root, addr, 0, proof);
+        assertEq(readWord, word);
+    }
+
+    /// @dev Static unit test asserting that reading from the zero address succeeds
+    function test_readMemAtZero_succeeds() external {
+        uint64 addr = 0x0;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        bytes32 root;
+        bytes memory proof;
+        (root, proof) = ffi.getCannonMemory64Proof(addr, word);
+        uint64 readWord = mem.readMem(root, addr, 0, proof);
+        assertEq(readWord, word);
+    }
+
+    /// @dev Static unit test asserting that reading from high memory area succeeds
+    function test_readMemHighMem_succeeds() external {
+        uint64 addr = 0xFF_FF_FF_FF_00_00_00_88;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        bytes32 root;
+        bytes memory proof;
+        (root, proof) = ffi.getCannonMemory64Proof(addr, word);
+        uint64 readWord = mem.readMem(root, addr, 0, proof);
+        assertEq(readWord, word);
+    }
+
+    /// @dev Static unit test asserting that reads revert when a misaligned memory address is provided
+    function test_readInvalidAddress_reverts() external {
+        uint64 addr = 0x100;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        bytes32 root;
+        bytes memory proof;
+        (root, proof) = ffi.getCannonMemory64Proof(addr, word);
+        vm.expectRevert(InvalidAddress.selector);
+        mem.readMem(root, addr + 4, 0, proof);
+    }
+
+    /// @dev Static unit test asserting that reads revert when an invalid proof is provided
+    function test_readInvalidProof_reverts() external {
+        uint64 addr = 0x100;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        bytes32 root;
+        bytes memory proof;
+        (root, proof) = ffi.getCannonMemory64Proof(addr, word);
+        vm.assertTrue(proof[64] != 0x0); // make sure the proof is tampered
+        proof[64] = 0x00;
+        vm.expectRevert(InvalidMemoryProof.selector);
+        mem.readMem(root, addr, 0, proof);
+    }
+
+    /// @dev Static unit test asserting that reads from a non-zero proof index succeeds
+    function test_readMemNonZeroProofIndex_succeeds() external {
+        uint64 addr = 0x100;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        uint64 addr2 = 0xFF_FF_FF_FF_00_00_00_88;
+        uint64 word2 = 0xF1_F2_F3_F4_F5_F6_F7_F8;
+        bytes32 root;
+        bytes memory proof;
+        (root, proof) = ffi.getCannonMemory64Proof(addr, word, addr2, word2);
+
+        uint64 readWord = mem.readMem(root, addr, 0, proof);
+        assertEq(readWord, word);
+
+        readWord = mem.readMem(root, addr2, 1, proof);
+        assertEq(readWord, word2);
+    }
+
+    /// @dev Static unit test asserting basic memory write functionality
+    function test_writeMem_succeeds() external {
+        uint64 addr = 0x100;
+        bytes memory zeroProof;
+        (, zeroProof) = ffi.getCannonMemory64Proof(addr, 0);
+
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        (bytes32 expectedRoot,) = ffi.getCannonMemory64Proof(addr, word);
+
+        bytes32 newRoot = mem.writeMem(addr, word, 0, zeroProof);
+        assertEq(newRoot, expectedRoot);
+    }
+
+    // @dev Static unit test asserting that writes to high memory succeeds
+    function test_writeMemHighMem_succeeds() external {
+        uint64 addr = 0xFF_FF_FF_FF_00_00_00_88;
+        bytes memory zeroProof;
+        (, zeroProof) = ffi.getCannonMemory64Proof(addr, 0);
+
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        (bytes32 expectedRoot,) = ffi.getCannonMemory64Proof(addr, word);
+
+        bytes32 newRoot = mem.writeMem(addr, word, 0, zeroProof);
+        assertEq(newRoot, expectedRoot);
+    }
+
+    /// @dev Static unit test asserting that non-zero memory word is overwritten
+    function test_writeMemNonZeroProofOffset_succeeds() external {
+        uint64 addr = 0x100;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        uint64 addr2 = 0x108;
+        uint64 word2 = 0x55_55_55_55_77_77_77_77;
+        bytes memory initProof;
+        (, initProof) = ffi.getCannonMemory64Proof(addr, word, addr2, word2);
+
+        uint64 word3 = 0x44_44_44_44_44_44_44_44;
+        (bytes32 expectedRoot,) = ffi.getCannonMemory64Proof(addr, word, addr2, word2, addr2, word3);
+
+        bytes32 newRoot = mem.writeMem(addr2, word3, 1, initProof);
+        assertEq(newRoot, expectedRoot);
+    }
+
+    /// @dev Static unit test asserting that a zerod memory word is set for a non-zero memory proof
+    function test_writeMemUniqueAccess_succeeds() external {
+        uint64 addr = 0x100;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        uint64 addr2 = 0x108;
+        uint64 word2 = 0x55_55_55_55_77_77_77_77;
+        bytes memory initProof;
+        (, initProof) = ffi.getCannonMemory64Proof(addr, word, addr2, word2);
+
+        uint64 addr3 = 0xAA_AA_AA_AA_00;
+        uint64 word3 = 0x44_44_44_44_44_44_44_44;
+        (, bytes memory addr3Proof) = ffi.getCannonMemory64Proof2(addr, word, addr2, word2, addr3);
+        (bytes32 expectedRoot,) = ffi.getCannonMemory64Proof(addr, word, addr2, word2, addr3, word3);
+
+        bytes32 newRoot = mem.writeMem(addr3, word3, 0, addr3Proof);
+        assertEq(newRoot, expectedRoot);
+
+        newRoot = mem.writeMem(addr3 + 8, word3, 0, addr3Proof);
+        assertNotEq(newRoot, expectedRoot);
+
+        newRoot = mem.writeMem(addr3, word3 + 1, 0, addr3Proof);
+        assertNotEq(newRoot, expectedRoot);
+    }
+
+    /// @dev Static unit test asserting that writes succeeds in overwriting a non-zero memory word
+    function test_writeMemNonZeroMem_succeeds() external {
+        uint64 addr = 0x100;
+        uint64 word = 0x11_22_33_44_55_66_77_88;
+        bytes memory initProof;
+        (, initProof) = ffi.getCannonMemory64Proof(addr, word);
+
+        uint64 word2 = 0x55_55_55_55_77_77_77_77;
+        (bytes32 expectedRoot,) = ffi.getCannonMemory64Proof(addr, word, addr + 8, word2);
+
+        bytes32 newRoot = mem.writeMem(addr + 8, word2, 0, initProof);
+        assertEq(newRoot, expectedRoot);
+    }
+
+    /// @dev Static unit test asserting that writes revert when a misaligned memory address is provided
+    function test_writeMemInvalidAddress_reverts() external {
+        bytes memory zeroProof;
+        (, zeroProof) = ffi.getCannonMemory64Proof(0x100, 0);
+        vm.expectRevert(InvalidAddress.selector);
+        mem.writeMem(0x104, 0x0, 0, zeroProof);
+    }
+}
+
+contract MIPS64MemoryWithCalldata {
+    function readMem(
+        bytes32 _root,
+        uint64 _addr,
+        uint8 _proofIndex,
+        bytes calldata /* _proof */
+    )
+        external
+        pure
+        returns (uint64 out_)
+    {
+        uint256 proofDataOffset = 4 + 32 + 32 + 32 + 32 + 32;
+        uint256 proofOffset = MIPS64Memory.memoryProofOffset(proofDataOffset, _proofIndex);
+        return MIPS64Memory.readMem(_root, _addr, proofOffset);
+    }
+
+    function writeMem(
+        uint64 _addr,
+        uint64 _value,
+        uint8 _proofIndex,
+        bytes calldata /* _proof */
+    )
+        external
+        pure
+        returns (bytes32 root_)
+    {
+        uint256 proofDataOffset = 4 + 32 + 32 + 32 + 32 + 32;
+        uint256 proofOffset = MIPS64Memory.memoryProofOffset(proofDataOffset, _proofIndex);
+        return MIPS64Memory.writeMem(_addr, proofOffset, _value);
+    }
+}
diff --git a/packages/contracts-bedrock/test/setup/FFIInterface.sol b/packages/contracts-bedrock/test/setup/FFIInterface.sol
index 727402a37c2c..c1e1612da8e6 100644
--- a/packages/contracts-bedrock/test/setup/FFIInterface.sol
+++ b/packages/contracts-bedrock/test/setup/FFIInterface.sol
@@ -317,6 +317,90 @@ contract FFIInterface {
         return (memRoot, proof);
     }
 
+    function getCannonMemory64Proof(uint64 addr, uint64 value) external returns (bytes32, bytes memory) {
+        string[] memory cmds = new string[](5);
+        cmds[0] = "scripts/go-ffi/go-ffi-cannon64";
+        cmds[1] = "diff";
+        cmds[2] = "cannonMemoryProof";
+        cmds[3] = vm.toString(addr);
+        cmds[4] = vm.toString(value);
+        bytes memory result = Process.run(cmds);
+        (bytes32 memRoot, bytes memory proof) = abi.decode(result, (bytes32, bytes));
+        return (memRoot, proof);
+    }
+
+    function getCannonMemory64Proof(
+        uint64 addr0,
+        uint64 value0,
+        uint64 addr1,
+        uint64 value1
+    )
+        external
+        returns (bytes32, bytes memory)
+    {
+        string[] memory cmds = new string[](7);
+        cmds[0] = "scripts/go-ffi/go-ffi-cannon64";
+        cmds[1] = "diff";
+        cmds[2] = "cannonMemoryProof";
+        cmds[3] = vm.toString(addr0);
+        cmds[4] = vm.toString(value0);
+        cmds[5] = vm.toString(addr1);
+        cmds[6] = vm.toString(value1);
+        bytes memory result = Process.run(cmds);
+        (bytes32 memRoot, bytes memory proof) = abi.decode(result, (bytes32, bytes));
+        return (memRoot, proof);
+    }
+
+    function getCannonMemory64Proof(
+        uint64 addr0,
+        uint64 value0,
+        uint64 addr1,
+        uint64 value1,
+        uint64 memAddr2,
+        uint64 memVal2
+    )
+        external
+        returns (bytes32, bytes memory)
+    {
+        string[] memory cmds = new string[](9);
+        cmds[0] = "scripts/go-ffi/go-ffi-cannon64";
+        cmds[1] = "diff";
+        cmds[2] = "cannonMemoryProof";
+        cmds[3] = vm.toString(addr0);
+        cmds[4] = vm.toString(value0);
+        cmds[5] = vm.toString(addr1);
+        cmds[6] = vm.toString(value1);
+        cmds[7] = vm.toString(memAddr2);
+        cmds[8] = vm.toString(memVal2);
+        bytes memory result = Process.run(cmds);
+        (bytes32 memRoot, bytes memory proof) = abi.decode(result, (bytes32, bytes));
+        return (memRoot, proof);
+    }
+
+    function getCannonMemory64Proof2(
+        uint64 addr0,
+        uint64 value0,
+        uint64 addr1,
+        uint64 value1,
+        uint64 memAddrForProof
+    )
+        external
+        returns (bytes32, bytes memory)
+    {
+        string[] memory cmds = new string[](8);
+        cmds[0] = "scripts/go-ffi/go-ffi-cannon64";
+        cmds[1] = "diff";
+        cmds[2] = "cannonMemoryProof2";
+        cmds[3] = vm.toString(addr0);
+        cmds[4] = vm.toString(value0);
+        cmds[5] = vm.toString(addr1);
+        cmds[6] = vm.toString(value1);
+        cmds[7] = vm.toString(memAddrForProof);
+        bytes memory result = Process.run(cmds);
+        (bytes32 memRoot, bytes memory proof) = abi.decode(result, (bytes32, bytes));
+        return (memRoot, proof);
+    }
+
     function encodeScalarEcotone(uint32 _basefeeScalar, uint32 _blobbasefeeScalar) external returns (bytes32) {
         string[] memory cmds = new string[](5);
         cmds[0] = "scripts/go-ffi/go-ffi";

From 79ec18335edcde01653a4136515d744dc1f19f6a Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Tue, 29 Oct 2024 14:09:29 -0700
Subject: [PATCH 077/451] cannon: Update opcode sanitizer for 64-bits (#12733)

---
 cannon/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cannon/Makefile b/cannon/Makefile
index 7f553ad60abf..f8cb38eeda64 100644
--- a/cannon/Makefile
+++ b/cannon/Makefile
@@ -15,6 +15,9 @@ endif
 
 .DEFAULT_GOAL := cannon
 
+# The MIPS64 r1 opcodes not supported by cannon. This list does not include coprocess-specific opcodes.
+UNSUPPORTED_OPCODES := (dclo|dclz)
+
 cannon32-impl:
 	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build --tags=cannon32 -v $(LDFLAGS) -o ./bin/cannon32-impl .
 
@@ -43,7 +46,7 @@ elf:
 	make -C ./testdata/example elf
 
 sanitize-program:
-	@if ! { mips-linux-gnu-objdump -d -j .text $$GUEST_PROGRAM | awk '{print $3}' | grep -Ew -m1 '(bltzal)'; }; then \
+	@if ! { mips-linux-gnu-objdump -d -j .text $$GUEST_PROGRAM | awk '{print $3}' | grep -Ew -m1 "$(UNSUPPORTED_OPCODES)"; }; then \
 		echo "guest program is sanitized for unsupported instructions"; \
 	else \
 		echo "found unsupported instructions in the guest program"; \

From d6bda0339005d98c992c749c137938d515755029 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 30 Oct 2024 07:37:51 -0700
Subject: [PATCH 078/451] cannon: Remove memory.GetUint32 (#12730)

* cannon: Remove memory.GetUint32

* review comments
---
 cannon/cmd/run.go                        |  7 +++++--
 cannon/mipsevm/exec/memory.go            |  4 ++++
 cannon/mipsevm/exec/mips_instructions.go |  6 +++++-
 cannon/mipsevm/memory/memory.go          | 14 --------------
 cannon/mipsevm/memory/memory64_test.go   | 22 +---------------------
 cannon/mipsevm/memory/memory_test.go     | 12 ------------
 cannon/mipsevm/tests/evm_common_test.go  |  8 ++++----
 cannon/mipsevm/testutil/memory.go        | 11 +++++++----
 8 files changed, 26 insertions(+), 58 deletions(-)

diff --git a/cannon/cmd/run.go b/cannon/cmd/run.go
index 1a85158854b3..615e913f1e47 100644
--- a/cannon/cmd/run.go
+++ b/cannon/cmd/run.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
+	mipsexec "github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/versions"
 	preimage "github.com/ethereum-optimism/optimism/op-preimage"
@@ -410,14 +411,16 @@ func Run(ctx *cli.Context) error {
 
 		if infoAt(state) {
 			delta := time.Since(start)
+			pc := state.GetPC()
+			insn := mipsexec.LoadSubWord(state.GetMemory(), pc, 4, false, new(mipsexec.NoopMemoryTracker))
 			l.Info("processing",
 				"step", step,
 				"pc", mipsevm.HexU32(state.GetPC()),
-				"insn", mipsevm.HexU32(state.GetMemory().GetUint32(state.GetPC())),
+				"insn", mipsevm.HexU32(insn),
 				"ips", float64(step-startStep)/(float64(delta)/float64(time.Second)),
 				"pages", state.GetMemory().PageCount(),
 				"mem", state.GetMemory().Usage(),
-				"name", meta.LookupSymbol(state.GetPC()),
+				"name", meta.LookupSymbol(pc),
 			)
 		}
 
diff --git a/cannon/mipsevm/exec/memory.go b/cannon/mipsevm/exec/memory.go
index 1601ad305228..8eec1ac84fa7 100644
--- a/cannon/mipsevm/exec/memory.go
+++ b/cannon/mipsevm/exec/memory.go
@@ -56,3 +56,7 @@ func (m *MemoryTrackerImpl) MemProof() [memory.MemProofSize]byte {
 func (m *MemoryTrackerImpl) MemProof2() [memory.MemProofSize]byte {
 	return m.memProof2
 }
+
+type NoopMemoryTracker struct{}
+
+func (n *NoopMemoryTracker) TrackMemAccess(Word) {}
diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index 39d40dd59dc0..d0d2addb3e67 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -22,7 +22,11 @@ const (
 )
 
 func GetInstructionDetails(pc Word, memory *memory.Memory) (insn, opcode, fun uint32) {
-	insn = memory.GetUint32(pc)
+	if pc&0x3 != 0 {
+		panic(fmt.Errorf("invalid pc: %x", pc))
+	}
+	word := memory.GetWord(pc & arch.AddressMask)
+	insn = uint32(SelectSubWord(pc, word, 4, false))
 	opcode = insn >> 26 // First 6-bits
 	fun = insn & 0x3f   // Last 6-bits
 
diff --git a/cannon/mipsevm/memory/memory.go b/cannon/mipsevm/memory/memory.go
index 805267ee7fc4..e95b40ca5346 100644
--- a/cannon/mipsevm/memory/memory.go
+++ b/cannon/mipsevm/memory/memory.go
@@ -212,20 +212,6 @@ func (m *Memory) SetWord(addr Word, v Word) {
 	arch.ByteOrderWord.PutWord(p.Data[pageAddr:pageAddr+arch.WordSizeBytes], v)
 }
 
-// GetUint32 returns the first 32 bits located at the specified location.
-func (m *Memory) GetUint32(addr Word) uint32 {
-	// addr must be aligned to 4 bytes
-	if addr&3 != 0 {
-		panic(fmt.Errorf("unaligned memory access: %x", addr))
-	}
-	p, ok := m.pageLookup(addr >> PageAddrSize)
-	if !ok {
-		return 0
-	}
-	pageAddr := addr & PageAddrMask
-	return binary.BigEndian.Uint32(p.Data[pageAddr : pageAddr+4])
-}
-
 // GetWord reads the maximum sized value, [arch.Word], located at the specified address.
 // Note: Also referred to by the MIPS64 specification as a "double-word" memory access.
 func (m *Memory) GetWord(addr Word) Word {
diff --git a/cannon/mipsevm/memory/memory64_test.go b/cannon/mipsevm/memory/memory64_test.go
index 3bc3c3467721..38cbfd597ffc 100644
--- a/cannon/mipsevm/memory/memory64_test.go
+++ b/cannon/mipsevm/memory/memory64_test.go
@@ -144,41 +144,24 @@ func TestMemory64ReadWrite(t *testing.T) {
 		m := NewMemory()
 		m.SetWord(16, 0xAABBCCDD_EEFF1122)
 		require.Equal(t, Word(0xAABBCCDD_EEFF1122), m.GetWord(16))
-		require.Equal(t, uint32(0xAABBCCDD), m.GetUint32(16))
-		require.Equal(t, uint32(0xEEFF1122), m.GetUint32(20))
 		m.SetWord(16, 0xAABB1CDD_EEFF1122)
 		require.Equal(t, Word(0xAABB1CDD_EEFF1122), m.GetWord(16))
-		require.Equal(t, uint32(0xAABB1CDD), m.GetUint32(16))
-		require.Equal(t, uint32(0xEEFF1122), m.GetUint32(20))
 		m.SetWord(16, 0xAABB1CDD_EEFF1123)
 		require.Equal(t, Word(0xAABB1CDD_EEFF1123), m.GetWord(16))
-		require.Equal(t, uint32(0xAABB1CDD), m.GetUint32(16))
-		require.Equal(t, uint32(0xEEFF1123), m.GetUint32(20))
 	})
 
 	t.Run("unaligned read", func(t *testing.T) {
 		m := NewMemory()
-		m.SetWord(16, 0xAABBCCDD_EEFF1122)
+		m.SetWord(16, Word(0xAABBCCDD_EEFF1122))
 		m.SetWord(24, 0x11223344_55667788)
 		for i := Word(17); i < 24; i++ {
 			require.Panics(t, func() {
 				m.GetWord(i)
 			})
-			if i != 20 {
-				require.Panics(t, func() {
-					m.GetUint32(i)
-				})
-			}
 		}
 		require.Equal(t, Word(0x11223344_55667788), m.GetWord(24))
-		require.Equal(t, uint32(0x11223344), m.GetUint32(24))
 		require.Equal(t, Word(0), m.GetWord(32))
-		require.Equal(t, uint32(0), m.GetUint32(32))
 		require.Equal(t, Word(0xAABBCCDD_EEFF1122), m.GetWord(16))
-		require.Equal(t, uint32(0xAABBCCDD), m.GetUint32(16))
-
-		require.Equal(t, uint32(0xEEFF1122), m.GetUint32(20))
-		require.Equal(t, uint32(0x55667788), m.GetUint32(28))
 	})
 
 	t.Run("unaligned write", func(t *testing.T) {
@@ -206,7 +189,6 @@ func TestMemory64ReadWrite(t *testing.T) {
 			m.SetWord(23, 0x11223344)
 		})
 		require.Equal(t, Word(0xAABBCCDD_EEFF1122), m.GetWord(16))
-		require.Equal(t, uint32(0xAABBCCDD), m.GetUint32(16))
 	})
 }
 
@@ -218,7 +200,6 @@ func TestMemory64JSON(t *testing.T) {
 	var res Memory
 	require.NoError(t, json.Unmarshal(dat, &res))
 	require.Equal(t, Word(0xAABBCCDD_EEFF1122), res.GetWord(8))
-	require.Equal(t, uint32(0xAABBCCDD), res.GetUint32(8))
 }
 
 func TestMemory64Copy(t *testing.T) {
@@ -226,6 +207,5 @@ func TestMemory64Copy(t *testing.T) {
 	m.SetWord(0xAABBCCDD_8000, 0x000000_AABB)
 	mcpy := m.Copy()
 	require.Equal(t, Word(0xAABB), mcpy.GetWord(0xAABBCCDD_8000))
-	require.Equal(t, uint32(0), mcpy.GetUint32(0xAABBCCDD_8000))
 	require.Equal(t, m.MerkleRoot(), mcpy.MerkleRoot())
 }
diff --git a/cannon/mipsevm/memory/memory_test.go b/cannon/mipsevm/memory/memory_test.go
index 48e6b1d01104..3a8bdd364d80 100644
--- a/cannon/mipsevm/memory/memory_test.go
+++ b/cannon/mipsevm/memory/memory_test.go
@@ -125,7 +125,6 @@ func TestMemoryReadWrite(t *testing.T) {
 			v := m.GetWord(i)
 			expected := binary.BigEndian.Uint32(data[i : i+4])
 			require.Equalf(t, expected, v, "read at %d", i)
-			require.Equalf(t, expected, m.GetUint32(i), "read at %d", i)
 		}
 	})
 
@@ -144,10 +143,8 @@ func TestMemoryReadWrite(t *testing.T) {
 		m := NewMemory()
 		m.SetWord(12, 0xAABBCCDD)
 		require.Equal(t, uint32(0xAABBCCDD), m.GetWord(12))
-		require.Equal(t, uint32(0xAABBCCDD), m.GetUint32(12))
 		m.SetWord(12, 0xAABB1CDD)
 		require.Equal(t, uint32(0xAABB1CDD), m.GetWord(12))
-		require.Equal(t, uint32(0xAABB1CDD), m.GetUint32(12))
 	})
 
 	t.Run("unaligned read", func(t *testing.T) {
@@ -156,22 +153,16 @@ func TestMemoryReadWrite(t *testing.T) {
 		m.SetWord(16, 0x11223344)
 		require.Panics(t, func() {
 			m.GetWord(13)
-			m.GetUint32(13)
 		})
 		require.Panics(t, func() {
 			m.GetWord(14)
-			m.GetUint32(14)
 		})
 		require.Panics(t, func() {
 			m.GetWord(15)
-			m.GetUint32(15)
 		})
 		require.Equal(t, uint32(0x11223344), m.GetWord(16))
-		require.Equal(t, uint32(0x11223344), m.GetUint32(16))
 		require.Equal(t, uint32(0), m.GetWord(20))
-		require.Equal(t, uint32(0), m.GetUint32(20))
 		require.Equal(t, uint32(0xAABBCCDD), m.GetWord(12))
-		require.Equal(t, uint32(0xAABBCCDD), m.GetUint32(12))
 	})
 
 	t.Run("unaligned write", func(t *testing.T) {
@@ -187,7 +178,6 @@ func TestMemoryReadWrite(t *testing.T) {
 			m.SetWord(15, 0x11223344)
 		})
 		require.Equal(t, uint32(0xAABBCCDD), m.GetWord(12))
-		require.Equal(t, uint32(0xAABBCCDD), m.GetUint32(12))
 	})
 }
 
@@ -199,7 +189,6 @@ func TestMemoryJSON(t *testing.T) {
 	var res Memory
 	require.NoError(t, json.Unmarshal(dat, &res))
 	require.Equal(t, uint32(0xAABBCCDD), res.GetWord(8))
-	require.Equal(t, uint32(0xAABBCCDD), res.GetUint32(8))
 }
 
 func TestMemoryCopy(t *testing.T) {
@@ -207,6 +196,5 @@ func TestMemoryCopy(t *testing.T) {
 	m.SetWord(0x8000, 123)
 	mcpy := m.Copy()
 	require.Equal(t, Word(123), mcpy.GetWord(0x8000))
-	require.Equal(t, Word(123), mcpy.GetUint32(0x8000))
 	require.Equal(t, m.MerkleRoot(), mcpy.MerkleRoot())
 }
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index 932662fd6979..97cab6544ff6 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -86,7 +86,7 @@ func TestEVM(t *testing.T) {
 					if exitGroup && goVm.GetState().GetExited() {
 						break
 					}
-					insn := state.GetMemory().GetUint32(state.GetPC())
+					insn := testutil.GetInstruction(state.GetMemory(), state.GetPC())
 					t.Logf("step: %4d pc: 0x%08x insn: 0x%08x", state.GetStep(), state.GetPC(), insn)
 
 					stepWitness, err := goVm.Step(true)
@@ -868,7 +868,7 @@ func TestHelloEVM(t *testing.T) {
 				if goVm.GetState().GetExited() {
 					break
 				}
-				insn := state.GetMemory().GetUint32(state.GetPC())
+				insn := testutil.GetInstruction(state.GetMemory(), state.GetPC())
 				if i%1000 == 0 { // avoid spamming test logs, we are executing many steps
 					t.Logf("step: %4d pc: 0x%08x insn: 0x%08x", state.GetStep(), state.GetPC(), insn)
 				}
@@ -921,7 +921,7 @@ func TestClaimEVM(t *testing.T) {
 					break
 				}
 
-				insn := state.GetMemory().GetUint32(state.GetPC())
+				insn := testutil.GetInstruction(state.GetMemory(), state.GetPC())
 				if i%1000 == 0 { // avoid spamming test logs, we are executing many steps
 					t.Logf("step: %4d pc: 0x%08x insn: 0x%08x", state.GetStep(), state.GetPC(), insn)
 				}
@@ -969,7 +969,7 @@ func TestEntryEVM(t *testing.T) {
 				if goVm.GetState().GetExited() {
 					break
 				}
-				insn := state.GetMemory().GetUint32(state.GetPC())
+				insn := testutil.GetInstruction(state.GetMemory(), state.GetPC())
 				if i%10_000 == 0 { // avoid spamming test logs, we are executing many steps
 					t.Logf("step: %4d pc: 0x%08x insn: 0x%08x", state.GetStep(), state.GetPC(), insn)
 				}
diff --git a/cannon/mipsevm/testutil/memory.go b/cannon/mipsevm/testutil/memory.go
index 0c6fddf8f140..f3ee9cb60ad9 100644
--- a/cannon/mipsevm/testutil/memory.go
+++ b/cannon/mipsevm/testutil/memory.go
@@ -27,9 +27,12 @@ func StoreInstruction(mem *memory.Memory, pc Word, insn uint32) {
 	if pc&0x3 != 0 {
 		panic(fmt.Errorf("unaligned memory access: %x", pc))
 	}
-	exec.StoreSubWord(mem, pc, 4, Word(insn), new(noopMemTracker))
+	exec.StoreSubWord(mem, pc, 4, Word(insn), new(exec.NoopMemoryTracker))
 }
 
-type noopMemTracker struct{}
-
-func (n *noopMemTracker) TrackMemAccess(Word) {}
+func GetInstruction(mem *memory.Memory, pc Word) uint32 {
+	if pc&0x3 != 0 {
+		panic(fmt.Errorf("unaligned memory access: %x", pc))
+	}
+	return exec.LoadSubWord(mem, pc, 4, false, new(exec.NoopMemoryTracker))
+}

From 96ef7bb43f304976c5974932ed2bec72b1a9a5fe Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 30 Oct 2024 10:21:23 -0700
Subject: [PATCH 079/451] cannon: Implement 64-bit Solidity VM (#12665)

* cannon: Implement MIPS64Memory.sol

* cannon: Implement 64-bit Solidity VM

- Implements 64-bit Cannon (with multithreading) in MIPS64.sol
- Re-enable differential testing for 64-bit VMs

* review comments

* check pc for 4-byte alignment

* gofmt

* update snapshot

* address nits; add more add/sub/mult overflow tests

* diff test misaligned instruction

* fix mul[t] MIPS64.sol emulation

* diff fuzz mul operations

* fix addiu test case

* fix GetInstruction return value type
---
 cannon/Makefile                               |   9 +-
 cannon/mipsevm/exec/memory.go                 |   3 +-
 cannon/mipsevm/exec/mips_instructions.go      |   6 +-
 cannon/mipsevm/tests/evm_common64_test.go     |  36 +-
 cannon/mipsevm/tests/evm_common_test.go       | 158 +--
 .../mipsevm/tests/evm_multithreaded64_test.go |  17 +-
 .../mipsevm/tests/evm_multithreaded_test.go   |  84 +-
 .../mipsevm/tests/evm_singlethreaded_test.go  |  15 +-
 .../mipsevm/tests/fuzz_evm_common64_test.go   | 140 +++
 cannon/mipsevm/tests/fuzz_evm_common_test.go  |  16 +-
 .../tests/fuzz_evm_multithreaded_test.go      |   2 +-
 cannon/mipsevm/testutil/evm.go                |  13 +-
 cannon/mipsevm/testutil/memory.go             |   2 +-
 cannon/mipsevm/testutil/mips.go               |  77 +-
 op-chain-ops/srcmap/solutil.go                |  14 +-
 packages/contracts-bedrock/semver-lock.json   |   4 +
 .../snapshots/abi/MIPS64.json                 |  93 ++
 .../snapshots/storageLayout/MIPS64.json       |   1 +
 .../contracts-bedrock/src/cannon/MIPS64.sol   | 951 ++++++++++++++++++
 .../src/cannon/libraries/MIPS64Arch.sol       |   9 +
 .../cannon/libraries/MIPS64Instructions.sol   | 920 +++++++++++++++++
 .../src/cannon/libraries/MIPS64State.sol      |  19 +
 .../src/cannon/libraries/MIPS64Syscalls.sol   | 437 ++++++++
 23 files changed, 2825 insertions(+), 201 deletions(-)
 create mode 100644 cannon/mipsevm/tests/fuzz_evm_common64_test.go
 create mode 100644 packages/contracts-bedrock/snapshots/abi/MIPS64.json
 create mode 100644 packages/contracts-bedrock/snapshots/storageLayout/MIPS64.json
 create mode 100644 packages/contracts-bedrock/src/cannon/MIPS64.sol
 create mode 100644 packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol
 create mode 100644 packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
 create mode 100644 packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
 create mode 100644 packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol

diff --git a/cannon/Makefile b/cannon/Makefile
index f8cb38eeda64..141e7d5be85b 100644
--- a/cannon/Makefile
+++ b/cannon/Makefile
@@ -56,9 +56,12 @@ sanitize-program:
 contract:
 	cd ../packages/contracts-bedrock && forge build
 
-test: elf contract
+test: elf contract test64
 	go test -v ./...
 
+test64: elf contract
+	go test -tags=cannon64 -run '(TestEVM.*64|TestHelloEVM|TestClaimEVM)' ./mipsevm/tests
+
 diff-%-cannon: cannon elf
 	$$OTHER_CANNON load-elf --type $* --path ./testdata/example/bin/hello.elf --out ./bin/prestate-other.bin.gz --meta ""
 	./bin/cannon   load-elf --type $* --path ./testdata/example/bin/hello.elf --out ./bin/prestate.bin.gz --meta ""
@@ -96,6 +99,10 @@ fuzz:
 	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests
 	# Multi-threaded tests
 	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests
+	# 64-bit tests - increased fuzztime for a larger input space
+	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMulOp ./mipsevm/tests
+	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultOp ./mipsevm/tests
+	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultuOp ./mipsevm/tests
 
 .PHONY: \
 	cannon32-impl \
diff --git a/cannon/mipsevm/exec/memory.go b/cannon/mipsevm/exec/memory.go
index 8eec1ac84fa7..77c373198ddf 100644
--- a/cannon/mipsevm/exec/memory.go
+++ b/cannon/mipsevm/exec/memory.go
@@ -3,6 +3,7 @@ package exec
 import (
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
 )
 
@@ -37,7 +38,7 @@ func (m *MemoryTrackerImpl) TrackMemAccess(effAddr Word) {
 // TrackMemAccess2 creates a proof for a memory access following a call to TrackMemAccess
 // This is used to generate proofs for contiguous memory accesses within the same step
 func (m *MemoryTrackerImpl) TrackMemAccess2(effAddr Word) {
-	if m.memProofEnabled && m.lastMemAccess+4 != effAddr {
+	if m.memProofEnabled && m.lastMemAccess+arch.WordSizeBytes != effAddr {
 		panic(fmt.Errorf("unexpected disjointed mem access at %08x, last memory access is at %08x buffered", effAddr, m.lastMemAccess))
 	}
 	m.lastMemAccess = effAddr
diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index d0d2addb3e67..b72c5113e607 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -378,7 +378,7 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 				w := uint32(SelectSubWord(rs, mem, 4, false))
 				val := w >> (24 - (rs&3)*8)
 				mask := uint32(0xFFFFFFFF) >> (24 - (rs&3)*8)
-				lwrResult := ((uint32(rt) & ^mask) | val) & 0xFFFFFFFF
+				lwrResult := (uint32(rt) & ^mask) | val
 				if rs&3 == 3 { // loaded bit 31
 					return SignExtend(Word(lwrResult), 32)
 				} else {
@@ -539,13 +539,13 @@ func HandleHiLo(cpu *mipsevm.CpuScalars, registers *[32]Word, fun uint32, rs Wor
 		cpu.HI = SignExtend(Word(acc>>32), 32)
 		cpu.LO = SignExtend(Word(uint32(acc)), 32)
 	case 0x1a: // div
-		if rt == 0 {
+		if uint32(rt) == 0 {
 			panic("instruction divide by zero")
 		}
 		cpu.HI = SignExtend(Word(int32(rs)%int32(rt)), 32)
 		cpu.LO = SignExtend(Word(int32(rs)/int32(rt)), 32)
 	case 0x1b: // divu
-		if rt == 0 {
+		if uint32(rt) == 0 {
 			panic("instruction divide by zero")
 		}
 		cpu.HI = SignExtend(Word(uint32(rs)%uint32(rt)), 32)
diff --git a/cannon/mipsevm/tests/evm_common64_test.go b/cannon/mipsevm/tests/evm_common64_test.go
index cf51ad09038c..d83ac4fa63d1 100644
--- a/cannon/mipsevm/tests/evm_common64_test.go
+++ b/cannon/mipsevm/tests/evm_common64_test.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
-	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/stretchr/testify/require"
 )
 
@@ -134,12 +133,12 @@ func TestEVMSingleStep_Operators64(t *testing.T) {
 
 			// Check expectations
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 		})
 	}
 }
 
-func TestEVMSingleStep_Shift(t *testing.T) {
+func TestEVMSingleStep_Shift64(t *testing.T) {
 	cases := []struct {
 		name      string
 		rd        Word
@@ -190,7 +189,8 @@ func TestEVMSingleStep_Shift(t *testing.T) {
 	for i, tt := range cases {
 		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
 		t.Run(testName, func(t *testing.T) {
-			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
+			pc := Word(0x0)
+			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(pc))
 			state := goVm.GetState()
 			var insn uint32
 			var rtReg uint32
@@ -200,7 +200,7 @@ func TestEVMSingleStep_Shift(t *testing.T) {
 			insn = rtReg<<16 | rdReg<<11 | tt.sa<<6 | tt.funct
 			state.GetRegistersRef()[rdReg] = tt.rd
 			state.GetRegistersRef()[rtReg] = tt.rt
-			testutil.StoreInstruction(state.GetMemory(), 0, insn)
+			testutil.StoreInstruction(state.GetMemory(), pc, insn)
 			step := state.GetStep()
 
 			// Setup expectations
@@ -213,7 +213,7 @@ func TestEVMSingleStep_Shift(t *testing.T) {
 
 			// Check expectations
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 		})
 	}
 }
@@ -455,12 +455,12 @@ func TestEVMSingleStep_LoadStore64(t *testing.T) {
 
 			// Check expectations
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 		})
 	}
 }
 
-func TestEVMSingleStep_DivMult(t *testing.T) {
+func TestEVMSingleStep_DivMult64(t *testing.T) {
 	cases := []struct {
 		name        string
 		rs          Word
@@ -470,6 +470,14 @@ func TestEVMSingleStep_DivMult(t *testing.T) {
 		expectHi    Word
 		expectPanic string
 	}{
+		// TODO(#12598): Fix 32-bit tests and remove these
+		{name: "mult", funct: uint32(0x18), rs: Word(0x0F_FF_00_00), rt: Word(100), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},
+		{name: "mult", funct: uint32(0x18), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), expectHi: Word(0x0), expectLo: Word(0x1)},
+		{name: "mult", funct: uint32(0x18), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD), expectHi: Word(0xE), expectLo: Word(0xFF_FF_FF_FF_FC_FC_FD_27)},
+		{name: "multu", funct: uint32(0x19), rs: Word(0x0F_FF_00_00), rt: Word(100), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},
+		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), expectHi: Word(0xFF_FF_FF_FF_FF_FF_FF_FE), expectLo: Word(0x1)},
+		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_BE), expectHi: Word(0xFF_FF_FF_FF_AA_BB_CC_9F), expectLo: Word(0xFF_FF_FF_FF_FC_FD_02_9A)},
+
 		// dmult s1, s2
 		// expected hi,lo were verified using qemu-mips
 		{name: "dmult 0", funct: 0x1c, rs: 0, rt: 0, expectLo: 0, expectHi: 0},
@@ -530,6 +538,10 @@ func TestEVMSingleStep_DivMult(t *testing.T) {
 		{name: "ddivu", funct: 0x1f, rs: ^Word(0), rt: ^Word(0), expectLo: 1, expectHi: 0},
 		{name: "ddivu", funct: 0x1f, rs: ^Word(0), rt: 2, expectLo: 0x7F_FF_FF_FF_FF_FF_FF_FF, expectHi: 1},
 		{name: "ddivu", funct: 0x1f, rs: 0x7F_FF_FF_FF_00_00_00_00, rt: ^Word(0), expectLo: 0, expectHi: 0x7F_FF_FF_FF_00_00_00_00},
+
+		// a couple div/divu 64-bit edge cases
+		{name: "div lower word zero", funct: 0x1a, rs: 1, rt: 0xFF_FF_FF_FF_00_00_00_00, expectPanic: "instruction divide by zero"},
+		{name: "divu lower word zero", funct: 0x1b, rs: 1, rt: 0xFF_FF_FF_FF_00_00_00_00, expectPanic: "instruction divide by zero"},
 	}
 
 	v := GetMultiThreadedTestCase(t)
@@ -560,15 +572,13 @@ func TestEVMSingleStep_DivMult(t *testing.T) {
 				stepWitness, err := goVm.Step(true)
 				require.NoError(t, err)
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			}
 		})
 	}
 }
 
-func TestEVMSingleStepBranch64(t *testing.T) {
-	var tracer *tracing.Hooks
-
+func TestEVMSingleStep_Branch64(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name         string
@@ -651,7 +661,7 @@ func TestEVMSingleStepBranch64(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index 97cab6544ff6..be316749cd61 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -25,8 +25,6 @@ func TestEVM(t *testing.T) {
 	testFiles, err := os.ReadDir("open_mips_tests/test/bin")
 	require.NoError(t, err)
 
-	var tracer *tracing.Hooks // no-tracer by default, but test_util.MarkdownTracer
-
 	cases := GetMipsVersionTestCases(t)
 	skippedTests := map[string][]string{
 		"multi-threaded":  {"clone.bin"},
@@ -51,7 +49,6 @@ func TestEVM(t *testing.T) {
 				expectPanic := strings.HasSuffix(f.Name(), "panic.bin")
 
 				evm := testutil.NewMIPSEVM(c.Contracts)
-				evm.SetTracer(tracer)
 				evm.SetLocalOracle(oracle)
 				testutil.LogStepFailureAtCleanup(t, evm)
 
@@ -117,8 +114,6 @@ func TestEVM(t *testing.T) {
 }
 
 func TestEVMSingleStep_Jump(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name         string
@@ -157,15 +152,13 @@ func TestEVMSingleStep_Jump(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
 }
 
 func TestEVMSingleStep_Operators(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name      string
@@ -177,22 +170,45 @@ func TestEVMSingleStep_Operators(t *testing.T) {
 		opcode    uint32
 		expectRes Word
 	}{
-		{name: "add", funct: 0x20, isImm: false, rs: Word(12), rt: Word(20), expectRes: Word(32)},                        // add t0, s1, s2
-		{name: "addu", funct: 0x21, isImm: false, rs: Word(12), rt: Word(20), expectRes: Word(32)},                       // addu t0, s1, s2
-		{name: "addi", opcode: 0x8, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},         // addi t0, s1, 40
-		{name: "addi sign", opcode: 0x8, isImm: true, rs: Word(2), rt: Word(1), imm: uint16(0xfffe), expectRes: Word(0)}, // addi t0, s1, -2
-		{name: "addiu", opcode: 0x9, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},        // addiu t0, s1, 40
-		{name: "sub", funct: 0x22, isImm: false, rs: Word(20), rt: Word(12), expectRes: Word(8)},                         // sub t0, s1, s2
-		{name: "subu", funct: 0x23, isImm: false, rs: Word(20), rt: Word(12), expectRes: Word(8)},                        // subu t0, s1, s2
-		{name: "and", funct: 0x24, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(160)},                    // and t0, s1, s2
-		{name: "andi", opcode: 0xc, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(0)},          // andi t0, s1, 40
-		{name: "or", funct: 0x25, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(1530)},                    // or t0, s1, s2
-		{name: "ori", opcode: 0xd, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},          // ori t0, s1, 40
-		{name: "xor", funct: 0x26, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(1370)},                   // xor t0, s1, s2
-		{name: "xori", opcode: 0xe, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},         // xori t0, s1, 40
-		{name: "nor", funct: 0x27, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(4294965765)},             // nor t0, s1, s2
-		{name: "slt", funct: 0x2a, isImm: false, rs: 0xFF_FF_FF_FE, rt: Word(5), expectRes: Word(1)},                     // slt t0, s1, s2
-		{name: "sltu", funct: 0x2b, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(0)},                     // sltu t0, s1, s2
+		{name: "add", funct: 0x20, isImm: false, rs: Word(12), rt: Word(20), expectRes: Word(32)},                                  // add t0, s1, s2
+		{name: "add", funct: 0x20, isImm: false, rs: ^Word(0), rt: ^Word(0), expectRes: Word(0xFF_FF_FF_FE)},                       // add t0, s1, s2
+		{name: "add", funct: 0x20, isImm: false, rs: Word(0x7F_FF_FF_FF), rt: Word(0x7F_FF_FF_FF), expectRes: Word(0xFF_FF_FF_FE)}, // add t0, s1, s2
+		{name: "add", funct: 0x20, isImm: false, rs: ^Word(0), rt: Word(2), expectRes: Word(1)},                                    // add t0, s1, s2
+		{name: "add", funct: 0x20, isImm: false, rs: Word(2), rt: ^Word(0), expectRes: Word(1)},                                    // add t0, s1, s2
+		{name: "add", funct: 0x20, isImm: false, rs: Word(0x7F_FF_FF_FF), rt: Word(1), expectRes: Word(0x80_00_00_00)},             // add t0, s1, s2
+
+		{name: "addu", funct: 0x21, isImm: false, rs: Word(12), rt: Word(20), expectRes: Word(32)},                                  // addu t0, s1, s2
+		{name: "addu", funct: 0x21, isImm: false, rs: ^Word(0), rt: ^Word(0), expectRes: Word(0xFF_FF_FF_FE)},                       // addu t0, s1, s2
+		{name: "addu", funct: 0x21, isImm: false, rs: Word(0x7F_FF_FF_FF), rt: Word(0x7F_FF_FF_FF), expectRes: Word(0xFF_FF_FF_FE)}, // addu t0, s1, s2
+		{name: "addu", funct: 0x21, isImm: false, rs: ^Word(0), rt: Word(2), expectRes: Word(1)},                                    // addu t0, s1, s2
+		{name: "addu", funct: 0x21, isImm: false, rs: Word(0x7F_FF_FF_FF), rt: Word(1), expectRes: Word(0x80_00_00_00)},             // addu t0, s1, s2
+
+		{name: "addi", opcode: 0x8, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},                              // addi t0, s1, 40
+		{name: "addi", opcode: 0x8, isImm: true, rs: ^Word(0), rt: Word(0xAA_BB_CC_DD), imm: uint16(1), expectRes: Word(0)},                   // addi t0, s1, 40
+		{name: "addi", opcode: 0x8, isImm: true, rs: ^Word(0), rt: Word(0xAA_BB_CC_DD), imm: uint16(0xFF_FF), expectRes: Word(0xFF_FF_FF_FE)}, // addi t0, s1, 40
+		{name: "addi sign", opcode: 0x8, isImm: true, rs: Word(2), rt: Word(1), imm: uint16(0xfffe), expectRes: Word(0)},                      // addi t0, s1, -2
+
+		{name: "addiu", opcode: 0x9, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},                              // addiu t0, s1, 40
+		{name: "addiu", opcode: 0x9, isImm: true, rs: ^Word(0), rt: Word(0xAA_BB_CC_DD), imm: uint16(1), expectRes: Word(0)},                   // addiu t0, s1, 40
+		{name: "addiu", opcode: 0x9, isImm: true, rs: ^Word(0), rt: Word(0xAA_BB_CC_DD), imm: uint16(0xFF_FF), expectRes: Word(0xFF_FF_FF_FE)}, // addiu t0, s1, 40
+
+		{name: "sub", funct: 0x22, isImm: false, rs: Word(20), rt: Word(12), expectRes: Word(8)},            // sub t0, s1, s2
+		{name: "sub", funct: 0x22, isImm: false, rs: ^Word(0), rt: Word(1), expectRes: Word(0xFF_FF_FF_FE)}, // sub t0, s1, s2
+		{name: "sub", funct: 0x22, isImm: false, rs: Word(1), rt: ^Word(0), expectRes: Word(0x2)},           // sub t0, s1, s2
+
+		{name: "subu", funct: 0x23, isImm: false, rs: Word(20), rt: Word(12), expectRes: Word(8)},            // subu t0, s1, s2
+		{name: "subu", funct: 0x23, isImm: false, rs: ^Word(0), rt: Word(1), expectRes: Word(0xFF_FF_FF_FE)}, // subu t0, s1, s2
+		{name: "subu", funct: 0x23, isImm: false, rs: Word(1), rt: ^Word(0), expectRes: Word(0x2)},           // subu t0, s1, s2
+
+		{name: "and", funct: 0x24, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(160)},            // and t0, s1, s2
+		{name: "andi", opcode: 0xc, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(0)},  // andi t0, s1, 40
+		{name: "or", funct: 0x25, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(1530)},            // or t0, s1, s2
+		{name: "ori", opcode: 0xd, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},  // ori t0, s1, 40
+		{name: "xor", funct: 0x26, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(1370)},           // xor t0, s1, s2
+		{name: "xori", opcode: 0xe, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)}, // xori t0, s1, 40
+		{name: "nor", funct: 0x27, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(4294965765)},     // nor t0, s1, s2
+		{name: "slt", funct: 0x2a, isImm: false, rs: 0xFF_FF_FF_FE, rt: Word(5), expectRes: Word(1)},             // slt t0, s1, s2
+		{name: "sltu", funct: 0x2b, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(0)},             // sltu t0, s1, s2
 	}
 
 	for _, v := range versions {
@@ -236,15 +252,13 @@ func TestEVMSingleStep_Operators(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
 }
 
 func TestEVMSingleStep_LoadStore(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	loadMemVal := Word(0x11_22_33_44)
 	loadMemValNeg := Word(0xF1_F2_F3_F4)
 	rtVal := Word(0xaa_bb_cc_dd)
@@ -330,14 +344,13 @@ func TestEVMSingleStep_LoadStore(t *testing.T) {
 
 				// Validate
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
 }
 
 func TestEVMSingleStep_MovzMovn(t *testing.T) {
-	var tracer *tracing.Hooks
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name  string
@@ -376,7 +389,7 @@ func TestEVMSingleStep_MovzMovn(t *testing.T) {
 				require.NoError(t, err)
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 
 				if tt.funct == 0xa {
 					t2 = 0x1
@@ -392,7 +405,7 @@ func TestEVMSingleStep_MovzMovn(t *testing.T) {
 				require.NoError(t, err)
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
@@ -400,7 +413,6 @@ func TestEVMSingleStep_MovzMovn(t *testing.T) {
 }
 
 func TestEVMSingleStep_MfhiMflo(t *testing.T) {
-	var tracer *tracing.Hooks
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name  string
@@ -430,7 +442,7 @@ func TestEVMSingleStep_MfhiMflo(t *testing.T) {
 				require.NoError(t, err)
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
@@ -453,9 +465,21 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 		expectRevert string
 		errMsg       string
 	}{
-		{name: "mul", funct: uint32(0x2), rs: Word(5), rt: Word(2), opcode: uint32(28), rdReg: uint32(0x8), expectRes: Word(10)},                                                                   // mul t0, t1, t2
-		{name: "mult", funct: uint32(0x18), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},                     // mult t1, t2
-		{name: "multu", funct: uint32(0x19), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},                    // multu t1, t2
+		{name: "mul", funct: uint32(0x2), opcode: uint32(28), rs: Word(5), rt: Word(2), rdReg: uint32(0x8), expectRes: Word(10)},                                    // mul t0, t1, t2
+		{name: "mul", funct: uint32(0x2), opcode: uint32(28), rs: Word(0x1), rt: ^Word(0), rdReg: uint32(0x8), expectRes: ^Word(0)},                                 // mul t1, t2
+		{name: "mul", funct: uint32(0x2), opcode: uint32(28), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x8), expectRes: Word(0x1)},           // mul t1, t2
+		{name: "mul", funct: uint32(0x2), opcode: uint32(28), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD), rdReg: uint32(0x8), expectRes: Word(0xFC_FC_FD_27)}, // mul t1, t2
+
+		{name: "mult", funct: uint32(0x18), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},           // mult t1, t2
+		{name: "mult", funct: uint32(0x18), rs: Word(0x1), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0xFF_FF_FF_FF), expectLo: Word(0xFF_FF_FF_FF)}, // mult t1, t2
+		{name: "mult", funct: uint32(0x18), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0), expectLo: Word(0x1)},             // mult t1, t2
+		{name: "mult", funct: uint32(0x18), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0xE), expectLo: Word(0xFC_FC_FD_27)}, // mult t1, t2
+
+		{name: "multu", funct: uint32(0x19), rs: Word(0x0F_FF_00_00), rt: Word(100), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},                     // multu t1, t2
+		{name: "multu", funct: uint32(0x19), rs: Word(0x1), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x0), expectLo: Word(0xFF_FF_FF_FF)},                     // multu t1, t2
+		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0xFF_FF_FF_FE), expectLo: Word(0x1)},           // multu t1, t2
+		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0xAA_BB_CC_BE), expectLo: Word(0xFC_FC_FD_27)}, // multu t1, t2
+
 		{name: "div", funct: uint32(0x1a), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                                  // div t1, t2
 		{name: "div by zero", funct: uint32(0x1a), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), expectRevert: "instruction divide by zero", errMsg: "MIPS: division by zero"},  // div t1, t2
 		{name: "divu", funct: uint32(0x1b), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                                 // divu t1, t2
@@ -483,7 +507,7 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 						_, _ = goVm.Step(
 							false)
 					})
-					testutil.AssertEVMReverts(t, state, v.Contracts, tracer, proofData, tt.errMsg)
+					testutil.AssertEVMReverts(t, state, v.Contracts, tracer, proofData, testutil.CreateErrorStringMatcher(tt.errMsg))
 					return
 				}
 
@@ -503,14 +527,13 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
 }
 
 func TestEVMSingleStep_MthiMtlo(t *testing.T) {
-	var tracer *tracing.Hooks
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name  string
@@ -544,15 +567,13 @@ func TestEVMSingleStep_MthiMtlo(t *testing.T) {
 				require.NoError(t, err)
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_MMap(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name         string
@@ -609,15 +630,13 @@ func TestEVM_MMap(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
 }
 
 func TestEVMSysWriteHint(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name             string
@@ -804,7 +823,7 @@ func TestEVMSysWriteHint(t *testing.T) {
 
 				expected.Validate(t, state)
 				require.Equal(t, tt.expectedHints, oracle.Hints())
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
@@ -814,23 +833,38 @@ func TestEVMFault(t *testing.T) {
 	var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
 
 	versions := GetMipsVersionTestCases(t)
+
+	misAlignedInstructionErr := func() testutil.ErrMatcher {
+		if arch.IsMips32 {
+			// matches revert(0,0)
+			return testutil.CreateNoopErrorMatcher()
+		} else {
+			return testutil.CreateCustomErrorMatcher("InvalidPC()")
+		}
+	}
+
 	cases := []struct {
 		name                 string
+		pc                   arch.Word
 		nextPC               arch.Word
 		insn                 uint32
-		errMsg               string
+		errMsg               testutil.ErrMatcher
 		memoryProofAddresses []Word
 	}{
-		{"illegal instruction", 0, 0xFF_FF_FF_FF, "invalid instruction", []Word{0xa7ef00cc}},
-		{"branch in delay-slot", 8, 0x11_02_00_03, "branch in delay slot", []Word{}},
-		{"jump in delay-slot", 8, 0x0c_00_00_0c, "jump in delay slot", []Word{}},
+		{name: "illegal instruction", nextPC: 0, insn: 0xFF_FF_FF_FF, errMsg: testutil.CreateErrorStringMatcher("invalid instruction"), memoryProofAddresses: []Word{0xa7ef00cc}},
+		{name: "branch in delay-slot", nextPC: 8, insn: 0x11_02_00_03, errMsg: testutil.CreateErrorStringMatcher("branch in delay slot")},
+		{name: "jump in delay-slot", nextPC: 8, insn: 0x0c_00_00_0c, errMsg: testutil.CreateErrorStringMatcher("jump in delay slot")},
+		{name: "misaligned instruction", pc: 1, nextPC: 4, insn: 0b110111_00001_00001 << 16, errMsg: misAlignedInstructionErr()},
+		{name: "misaligned instruction", pc: 2, nextPC: 4, insn: 0b110111_00001_00001 << 16, errMsg: misAlignedInstructionErr()},
+		{name: "misaligned instruction", pc: 3, nextPC: 4, insn: 0b110111_00001_00001 << 16, errMsg: misAlignedInstructionErr()},
+		{name: "misaligned instruction", pc: 5, nextPC: 4, insn: 0b110111_00001_00001 << 16, errMsg: misAlignedInstructionErr()},
 	}
 
 	for _, v := range versions {
 		for _, tt := range cases {
 			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
 			t.Run(testName, func(t *testing.T) {
-				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithNextPC(tt.nextPC))
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithPC(tt.pc), testutil.WithNextPC(tt.nextPC))
 				state := goVm.GetState()
 				testutil.StoreInstruction(state.GetMemory(), 0, tt.insn)
 				// set the return address ($ra) to jump into when test completes
@@ -846,7 +880,6 @@ func TestEVMFault(t *testing.T) {
 
 func TestHelloEVM(t *testing.T) {
 	t.Parallel()
-	var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
 	versions := GetMipsVersionTestCases(t)
 
 	for _, v := range versions {
@@ -854,22 +887,21 @@ func TestHelloEVM(t *testing.T) {
 		t.Run(v.Name, func(t *testing.T) {
 			t.Parallel()
 			evm := testutil.NewMIPSEVM(v.Contracts)
-			evm.SetTracer(tracer)
 			testutil.LogStepFailureAtCleanup(t, evm)
 
 			var stdOutBuf, stdErrBuf bytes.Buffer
-			elfFile := "../../testdata/example/bin/hello.elf"
+			elfFile := testutil.ProgramPath("hello")
 			goVm := v.ElfVMFactory(t, elfFile, nil, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger())
 			state := goVm.GetState()
 
 			start := time.Now()
-			for i := 0; i < 400_000; i++ {
+			for i := 0; i < 430_000; i++ {
 				step := goVm.GetState().GetStep()
 				if goVm.GetState().GetExited() {
 					break
 				}
 				insn := testutil.GetInstruction(state.GetMemory(), state.GetPC())
-				if i%1000 == 0 { // avoid spamming test logs, we are executing many steps
+				if i%10_000 == 0 { // avoid spamming test logs, we are executing many steps
 					t.Logf("step: %4d pc: 0x%08x insn: 0x%08x", state.GetStep(), state.GetPC(), insn)
 				}
 
@@ -897,7 +929,6 @@ func TestHelloEVM(t *testing.T) {
 
 func TestClaimEVM(t *testing.T) {
 	t.Parallel()
-	var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
 	versions := GetMipsVersionTestCases(t)
 
 	for _, v := range versions {
@@ -905,13 +936,12 @@ func TestClaimEVM(t *testing.T) {
 		t.Run(v.Name, func(t *testing.T) {
 			t.Parallel()
 			evm := testutil.NewMIPSEVM(v.Contracts)
-			evm.SetTracer(tracer)
 			testutil.LogStepFailureAtCleanup(t, evm)
 
 			oracle, expectedStdOut, expectedStdErr := testutil.ClaimTestOracle(t)
 
 			var stdOutBuf, stdErrBuf bytes.Buffer
-			elfFile := "../../testdata/example/bin/claim.elf"
+			elfFile := testutil.ProgramPath("claim")
 			goVm := v.ElfVMFactory(t, elfFile, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger())
 			state := goVm.GetState()
 
@@ -922,7 +952,7 @@ func TestClaimEVM(t *testing.T) {
 				}
 
 				insn := testutil.GetInstruction(state.GetMemory(), state.GetPC())
-				if i%1000 == 0 { // avoid spamming test logs, we are executing many steps
+				if i%10_000 == 0 { // avoid spamming test logs, we are executing many steps
 					t.Logf("step: %4d pc: 0x%08x insn: 0x%08x", state.GetStep(), state.GetPC(), insn)
 				}
 
@@ -947,7 +977,6 @@ func TestClaimEVM(t *testing.T) {
 
 func TestEntryEVM(t *testing.T) {
 	t.Parallel()
-	var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
 	versions := GetMipsVersionTestCases(t)
 
 	for _, v := range versions {
@@ -955,11 +984,10 @@ func TestEntryEVM(t *testing.T) {
 		t.Run(v.Name, func(t *testing.T) {
 			t.Parallel()
 			evm := testutil.NewMIPSEVM(v.Contracts)
-			evm.SetTracer(tracer)
 			testutil.LogStepFailureAtCleanup(t, evm)
 
 			var stdOutBuf, stdErrBuf bytes.Buffer
-			elfFile := "../../testdata/example/bin/entry.elf"
+			elfFile := testutil.ProgramPath("entry")
 			goVm := v.ElfVMFactory(t, elfFile, nil, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger())
 			state := goVm.GetState()
 
@@ -993,8 +1021,6 @@ func TestEntryEVM(t *testing.T) {
 }
 
 func TestEVMSingleStepBranch(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name         string
@@ -1086,7 +1112,7 @@ func TestEVMSingleStepBranch(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	}
diff --git a/cannon/mipsevm/tests/evm_multithreaded64_test.go b/cannon/mipsevm/tests/evm_multithreaded64_test.go
index 9af5f212a221..5c5963a0e027 100644
--- a/cannon/mipsevm/tests/evm_multithreaded64_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded64_test.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
@@ -18,8 +17,6 @@ import (
 )
 
 func TestEVM_MT64_LL(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	memVal := Word(0x11223344_55667788)
 	memValNeg := Word(0xF1223344_F5667788)
 	cases := []struct {
@@ -84,15 +81,13 @@ func TestEVM_MT64_LL(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_MT64_SC(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	llVariations := []struct {
 		name                string
 		llReservationStatus multithreaded.LLReservationStatus
@@ -187,15 +182,13 @@ func TestEVM_MT64_SC(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_MT64_LLD(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	memVal := Word(0x11223344_55667788)
 	memValNeg := Word(0xF1223344_F5667788)
 	cases := []struct {
@@ -260,15 +253,13 @@ func TestEVM_MT64_LLD(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_MT64_SCD(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	value := Word(0x11223344_55667788)
 	llVariations := []struct {
 		name                string
@@ -364,7 +355,7 @@ func TestEVM_MT64_SCD(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index 4b663f3b7f11..1e1704558abd 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -26,8 +26,6 @@ import (
 type Word = arch.Word
 
 func TestEVM_MT_LL(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	// Set up some test values that will be reused
 	posValue := uint64(0xAAAA_BBBB_1122_3344)
 	posValueRet := uint64(0x1122_3344)
@@ -90,15 +88,13 @@ func TestEVM_MT_LL(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_MT_SC(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	// Set up some test values that will be reused
 	memValue := uint64(0x1122_3344_5566_7788)
 
@@ -189,15 +185,13 @@ func TestEVM_MT_SC(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_MT_SysRead_Preimage(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	preimageValue := make([]byte, 0, 8)
 	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x12_34_56_78)
 	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x98_76_54_32)
@@ -290,14 +284,14 @@ func TestEVM_MT_SysRead_Preimage(t *testing.T) {
 
 				if c.shouldPanic {
 					require.Panics(t, func() { _, _ = goVm.Step(true) })
-					testutil.AssertPreimageOracleReverts(t, preimageKey, preimageValue, c.preimageOffset, contracts, tracer)
+					testutil.AssertPreimageOracleReverts(t, preimageKey, preimageValue, c.preimageOffset, contracts)
 				} else {
 					stepWitness, err := goVm.Step(true)
 					require.NoError(t, err)
 
 					// Check expectations
 					expected.Validate(t, state)
-					testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+					testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 				}
 			})
 		}
@@ -305,8 +299,6 @@ func TestEVM_MT_SysRead_Preimage(t *testing.T) {
 }
 
 func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	llVariations := []struct {
 		name                   string
 		llReservationStatus    multithreaded.LLReservationStatus
@@ -382,7 +374,7 @@ func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
@@ -390,7 +382,6 @@ func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
 
 func TestEVM_SysClone_FlagHandling(t *testing.T) {
 	contracts := testutil.TestContractsSetup(t, testutil.MipsMultithreaded)
-	var tracer *tracing.Hooks
 
 	cases := []struct {
 		name  string
@@ -437,7 +428,6 @@ func TestEVM_SysClone_FlagHandling(t *testing.T) {
 			}
 
 			evm := testutil.NewMIPSEVM(contracts)
-			evm.SetTracer(tracer)
 			testutil.LogStepFailureAtCleanup(t, evm)
 
 			evmPost := evm.Step(t, stepWitness, curStep, multithreaded.GetStateHashFn())
@@ -449,7 +439,6 @@ func TestEVM_SysClone_FlagHandling(t *testing.T) {
 }
 
 func TestEVM_SysClone_Successful(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name          string
 		traverseRight bool
@@ -506,13 +495,12 @@ func TestEVM_SysClone_Successful(t *testing.T) {
 			activeStack, inactiveStack := mttestutil.GetThreadStacks(state)
 			require.Equal(t, 2, len(activeStack))
 			require.Equal(t, 0, len(inactiveStack))
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_SysGetTID(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name     string
 		threadId Word
@@ -545,13 +533,12 @@ func TestEVM_SysGetTID(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_SysExit(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name               string
 		threadCount        int
@@ -594,13 +581,12 @@ func TestEVM_SysExit(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_PopExitedThread(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name                         string
 		traverseRight                bool
@@ -646,13 +632,12 @@ func TestEVM_PopExitedThread(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name             string
 		addressParam     Word
@@ -713,13 +698,12 @@ func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_SysFutex_WakePrivate(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name                string
 		addressParam        Word
@@ -776,14 +760,12 @@ func TestEVM_SysFutex_WakePrivate(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_SysFutex_UnsupportedOp(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	// From: https://github.com/torvalds/linux/blob/5be63fc19fcaa4c236b307420483578a56986a37/include/uapi/linux/futex.h
 	const FUTEX_PRIVATE_FLAG = 128
 	const FUTEX_WAIT = 0
@@ -855,7 +837,7 @@ func TestEVM_SysFutex_UnsupportedOp(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
@@ -869,7 +851,6 @@ func TestEVM_SysNanosleep(t *testing.T) {
 }
 
 func runPreemptSyscall(t *testing.T, syscallName string, syscallNum uint32) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name            string
 		traverseRight   bool
@@ -908,15 +889,13 @@ func runPreemptSyscall(t *testing.T, syscallName string, syscallNum uint32) {
 
 				// Validate post-state
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_SysOpen(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	goVm, state, contracts := setup(t, 5512, nil)
 
 	testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
@@ -937,11 +916,10 @@ func TestEVM_SysOpen(t *testing.T) {
 
 	// Validate post-state
 	expected.Validate(t, state)
-	testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+	testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 }
 
 func TestEVM_SysGetPID(t *testing.T) {
-	var tracer *tracing.Hooks
 	goVm, state, contracts := setup(t, 1929, nil)
 
 	testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
@@ -962,7 +940,7 @@ func TestEVM_SysGetPID(t *testing.T) {
 
 	// Validate post-state
 	expected.Validate(t, state)
-	testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+	testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 }
 
 func TestEVM_SysClockGettimeMonotonic(t *testing.T) {
@@ -974,8 +952,6 @@ func TestEVM_SysClockGettimeRealtime(t *testing.T) {
 }
 
 func testEVM_SysClockGettime(t *testing.T, clkid Word) {
-	var tracer *tracing.Hooks
-
 	llVariations := []struct {
 		name                   string
 		llReservationStatus    multithreaded.LLReservationStatus
@@ -1062,14 +1038,13 @@ func testEVM_SysClockGettime(t *testing.T, clkid Word) {
 
 				// Validate post-state
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 		}
 	}
 }
 
 func TestEVM_SysClockGettimeNonMonotonic(t *testing.T) {
-	var tracer *tracing.Hooks
 	goVm, state, contracts := setup(t, 2101, nil)
 
 	timespecAddr := Word(0x1000)
@@ -1091,7 +1066,7 @@ func TestEVM_SysClockGettimeNonMonotonic(t *testing.T) {
 
 	// Validate post-state
 	expected.Validate(t, state)
-	testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+	testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 }
 
 var NoopSyscalls = map[string]uint32{
@@ -1132,7 +1107,6 @@ var NoopSyscalls = map[string]uint32{
 }
 
 func TestEVM_NoopSyscall(t *testing.T) {
-	var tracer *tracing.Hooks
 	for noopName, noopVal := range NoopSyscalls {
 		t.Run(noopName, func(t *testing.T) {
 			goVm, state, contracts := setup(t, int(noopVal), nil)
@@ -1155,7 +1129,7 @@ func TestEVM_NoopSyscall(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 
 	}
@@ -1191,7 +1165,7 @@ func TestEVM_UnsupportedSyscall(t *testing.T) {
 			require.Panics(t, func() { _, _ = goVm.Step(true) })
 
 			errorMessage := "MIPS2: unimplemented syscall"
-			testutil.AssertEVMReverts(t, state, contracts, tracer, proofData, errorMessage)
+			testutil.AssertEVMReverts(t, state, contracts, tracer, proofData, testutil.CreateErrorStringMatcher(errorMessage))
 		})
 	}
 }
@@ -1223,14 +1197,13 @@ func TestEVM_EmptyThreadStacks(t *testing.T) {
 				require.PanicsWithValue(t, "Active thread stack is empty", func() { _, _ = goVm.Step(false) })
 
 				errorMessage := "MIPS2: active thread stack is empty"
-				testutil.AssertEVMReverts(t, state, contracts, tracer, proofCase.Proof, errorMessage)
+				testutil.AssertEVMReverts(t, state, contracts, tracer, proofCase.Proof, testutil.CreateErrorStringMatcher(errorMessage))
 			})
 		}
 	}
 }
 
 func TestEVM_NormalTraversalStep_HandleWaitingThread(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name            string
 		step            uint64
@@ -1307,7 +1280,7 @@ func TestEVM_NormalTraversalStep_HandleWaitingThread(t *testing.T) {
 
 				// Validate post-state
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, c.step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, c.step, goVm, multithreaded.GetStateHashFn(), contracts)
 			})
 
 		}
@@ -1315,7 +1288,6 @@ func TestEVM_NormalTraversalStep_HandleWaitingThread(t *testing.T) {
 }
 
 func TestEVM_NormalTraversal_Full(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name        string
 		threadCount int
@@ -1357,7 +1329,7 @@ func TestEVM_NormalTraversal_Full(t *testing.T) {
 
 					// Validate post-state
 					expected.Validate(t, state)
-					testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+					testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 				}
 
 				// We should be back to the original state with only a few modifications
@@ -1372,7 +1344,6 @@ func TestEVM_NormalTraversal_Full(t *testing.T) {
 func TestEVM_WakeupTraversalStep(t *testing.T) {
 	addr := Word(0x1234)
 	wakeupVal := Word(0x999)
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name              string
 		wakeupAddr        Word
@@ -1440,13 +1411,12 @@ func TestEVM_WakeupTraversalStep(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_WakeupTraversal_Full(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name        string
 		threadCount int
@@ -1486,7 +1456,7 @@ func TestEVM_WakeupTraversal_Full(t *testing.T) {
 
 				// Validate post-state
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 			}
 
 			// We should be back to the original state with only a few modifications
@@ -1499,7 +1469,6 @@ func TestEVM_WakeupTraversal_Full(t *testing.T) {
 }
 
 func TestEVM_WakeupTraversal_WithExitedThreads(t *testing.T) {
-	var tracer *tracing.Hooks
 	addr := Word(0x1234)
 	wakeupVal := Word(0x999)
 	cases := []struct {
@@ -1567,13 +1536,12 @@ func TestEVM_WakeupTraversal_WithExitedThreads(t *testing.T) {
 			stepWitness, err = goVm.Step(true)
 			require.NoError(t, err)
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
 
 func TestEVM_SchedQuantumThreshold(t *testing.T) {
-	var tracer *tracing.Hooks
 	cases := []struct {
 		name                        string
 		stepsSinceLastContextSwitch uint64
@@ -1613,7 +1581,7 @@ func TestEVM_SchedQuantumThreshold(t *testing.T) {
 
 			// Validate post-state
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
diff --git a/cannon/mipsevm/tests/evm_singlethreaded_test.go b/cannon/mipsevm/tests/evm_singlethreaded_test.go
index 159bc2bf4dbd..f13ac5a68fa8 100644
--- a/cannon/mipsevm/tests/evm_singlethreaded_test.go
+++ b/cannon/mipsevm/tests/evm_singlethreaded_test.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
 
@@ -17,8 +16,6 @@ import (
 )
 
 func TestEVM_LL(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	cases := []struct {
 		name    string
 		base    Word
@@ -61,14 +58,12 @@ func TestEVM_LL(t *testing.T) {
 
 			// Check expectations
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 		})
 	}
 }
 
 func TestEVM_SC(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	cases := []struct {
 		name    string
 		base    Word
@@ -115,14 +110,12 @@ func TestEVM_SC(t *testing.T) {
 
 			// Check expectations
 			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 		})
 	}
 }
 
 func TestEVM_SysRead_Preimage(t *testing.T) {
-	var tracer *tracing.Hooks
-
 	preimageValue := make([]byte, 0, 8)
 	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x12_34_56_78)
 	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x98_76_54_32)
@@ -183,14 +176,14 @@ func TestEVM_SysRead_Preimage(t *testing.T) {
 
 			if c.shouldPanic {
 				require.Panics(t, func() { _, _ = goVm.Step(true) })
-				testutil.AssertPreimageOracleReverts(t, preimageKey, preimageValue, c.preimageOffset, v.Contracts, tracer)
+				testutil.AssertPreimageOracleReverts(t, preimageKey, preimageValue, c.preimageOffset, v.Contracts)
 			} else {
 				stepWitness, err := goVm.Step(true)
 				require.NoError(t, err)
 
 				// Check expectations
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, tracer)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			}
 		})
 	}
diff --git a/cannon/mipsevm/tests/fuzz_evm_common64_test.go b/cannon/mipsevm/tests/fuzz_evm_common64_test.go
new file mode 100644
index 000000000000..89aceb41a4e6
--- /dev/null
+++ b/cannon/mipsevm/tests/fuzz_evm_common64_test.go
@@ -0,0 +1,140 @@
+//go:build cannon64
+// +build cannon64
+
+package tests
+
+import (
+	"os"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
+	"github.com/stretchr/testify/require"
+)
+
+func FuzzStateConsistencyMulOp(f *testing.F) {
+	f.Add(int64(0x80_00_00_00), int64(0x80_00_00_00), int64(1))
+	f.Add(
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_11_22_33_44)),
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_11_22_33_44)),
+		int64(1),
+	)
+	f.Add(
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_80_00_00_00)),
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_80_00_00_00)),
+		int64(1),
+	)
+	f.Add(
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_FF_FF_FF_FF)),
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_FF_FF_FF_FF)),
+		int64(1),
+	)
+
+	const opcode uint32 = 28
+	const mulFunct uint32 = 0x2
+	versions := GetMipsVersionTestCases(f)
+	f.Fuzz(func(t *testing.T, rs int64, rt int64, seed int64) {
+		for _, v := range versions {
+			t.Run(v.Name, func(t *testing.T) {
+				mulOpConsistencyCheck(t, versions, opcode, true, mulFunct, Word(rs), Word(rt), seed)
+			})
+		}
+	})
+}
+
+func FuzzStateConsistencyMultOp(f *testing.F) {
+	f.Add(int64(0x80_00_00_00), int64(0x80_00_00_00), int64(1))
+	f.Add(
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_11_22_33_44)),
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_11_22_33_44)),
+		int64(1),
+	)
+	f.Add(
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_80_00_00_00)),
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_80_00_00_00)),
+		int64(1),
+	)
+	f.Add(
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_FF_FF_FF_FF)),
+		testutil.ToSignedInteger(uint64(0xFF_FF_FF_FF_FF_FF_FF_FF)),
+		int64(1),
+	)
+
+	const multFunct uint32 = 0x18
+	versions := GetMipsVersionTestCases(f)
+	f.Fuzz(func(t *testing.T, rs int64, rt int64, seed int64) {
+		mulOpConsistencyCheck(t, versions, 0, false, multFunct, Word(rs), Word(rt), seed)
+	})
+}
+
+func FuzzStateConsistencyMultuOp(f *testing.F) {
+	f.Add(uint64(0x80_00_00_00), uint64(0x80_00_00_00), int64(1))
+	f.Add(
+		uint64(0xFF_FF_FF_FF_11_22_33_44),
+		uint64(0xFF_FF_FF_FF_11_22_33_44),
+		int64(1),
+	)
+	f.Add(
+		uint64(0xFF_FF_FF_FF_80_00_00_00),
+		uint64(0xFF_FF_FF_FF_80_00_00_00),
+		int64(1),
+	)
+	f.Add(
+		uint64(0xFF_FF_FF_FF_FF_FF_FF_FF),
+		uint64(0xFF_FF_FF_FF_FF_FF_FF_FF),
+		int64(1),
+	)
+
+	const multuFunct uint32 = 0x19
+	versions := GetMipsVersionTestCases(f)
+	f.Fuzz(func(t *testing.T, rs uint64, rt uint64, seed int64) {
+		mulOpConsistencyCheck(t, versions, 0, false, multuFunct, rs, rt, seed)
+	})
+}
+
+type insn struct {
+	opcode      uint32
+	expectRdReg bool
+	funct       uint32
+}
+
+func mulOpConsistencyCheck(
+	t *testing.T, versions []VersionedVMTestCase,
+	opcode uint32, expectRdReg bool, funct uint32,
+	rs Word, rt Word, seed int64) {
+	for _, v := range versions {
+		t.Run(v.Name, func(t *testing.T) {
+			rsReg := uint32(17)
+			rtReg := uint32(18)
+			rdReg := uint32(0)
+			if expectRdReg {
+				rdReg = 19
+			}
+
+			insn := opcode<<26 | rsReg<<21 | rtReg<<16 | rdReg<<11 | funct
+			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(seed), testutil.WithPCAndNextPC(0))
+			state := goVm.GetState()
+			state.GetRegistersRef()[rsReg] = rs
+			state.GetRegistersRef()[rtReg] = rt
+			testutil.StoreInstruction(state.GetMemory(), 0, insn)
+			step := state.GetStep()
+
+			// mere sanity checks
+			expected := testutil.NewExpectedState(state)
+			expected.ExpectStep()
+
+			stepWitness, err := goVm.Step(true)
+			require.NoError(t, err)
+
+			// use the post-state rdReg or LO and HI just so we can run sanity checks
+			if expectRdReg {
+				expected.Registers[rdReg] = state.GetRegistersRef()[rdReg]
+			} else {
+				expected.LO = state.GetCpu().LO
+				expected.HI = state.GetCpu().HI
+			}
+			expected.Validate(t, state)
+
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+		})
+	}
+}
diff --git a/cannon/mipsevm/tests/fuzz_evm_common_test.go b/cannon/mipsevm/tests/fuzz_evm_common_test.go
index 2c992b5b7a3f..d1d10fbeb3cb 100644
--- a/cannon/mipsevm/tests/fuzz_evm_common_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_common_test.go
@@ -42,7 +42,7 @@ func FuzzStateSyscallBrk(f *testing.F) {
 				require.False(t, stepWitness.HasPreimage())
 
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
@@ -97,7 +97,7 @@ func FuzzStateSyscallMmap(f *testing.F) {
 				require.False(t, stepWitness.HasPreimage())
 
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
@@ -126,7 +126,7 @@ func FuzzStateSyscallExitGroup(f *testing.F) {
 				require.False(t, stepWitness.HasPreimage())
 
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
@@ -182,7 +182,7 @@ func FuzzStateSyscallFcntl(f *testing.F) {
 				require.False(t, stepWitness.HasPreimage())
 
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
@@ -219,7 +219,7 @@ func FuzzStateHintRead(f *testing.F) {
 				require.False(t, stepWitness.HasPreimage())
 
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
@@ -282,7 +282,7 @@ func FuzzStatePreimageRead(f *testing.F) {
 				require.True(t, stepWitness.HasPreimage())
 
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
@@ -364,7 +364,7 @@ func FuzzStateHintWrite(f *testing.F) {
 				// Validate
 				require.Equal(t, expectedHints, oracle.Hints())
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
@@ -424,7 +424,7 @@ func FuzzStatePreimageWrite(f *testing.F) {
 				require.False(t, stepWitness.HasPreimage())
 
 				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts, nil)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 			})
 		}
 	})
diff --git a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
index 09ad014189fe..49f45a4a5f2c 100644
--- a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
@@ -62,6 +62,6 @@ func FuzzStateSyscallCloneMT(f *testing.F) {
 		require.False(t, stepWitness.HasPreimage())
 
 		expected.Validate(t, state)
-		testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), v.Contracts, nil)
+		testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), v.Contracts)
 	})
 }
diff --git a/cannon/mipsevm/testutil/evm.go b/cannon/mipsevm/testutil/evm.go
index 6d424ae62493..6a4832c2953d 100644
--- a/cannon/mipsevm/testutil/evm.go
+++ b/cannon/mipsevm/testutil/evm.go
@@ -7,6 +7,7 @@ import (
 	"math/big"
 	"os"
 
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/srcmap"
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
@@ -66,7 +67,11 @@ func loadArtifacts(version MipsVersion) (*Artifacts, error) {
 	case MipsSingleThreaded:
 		mips, err = artifactFS.ReadArtifact("MIPS.sol", "MIPS")
 	case MipsMultithreaded:
-		mips, err = artifactFS.ReadArtifact("MIPS2.sol", "MIPS2")
+		if arch.IsMips32 {
+			mips, err = artifactFS.ReadArtifact("MIPS2.sol", "MIPS2")
+		} else {
+			mips, err = artifactFS.ReadArtifact("MIPS64.sol", "MIPS64")
+		}
 	default:
 		return nil, fmt.Errorf("Unknown MipsVersion supplied: %v", version)
 	}
@@ -167,7 +172,11 @@ func SourceMapTracer(t require.TestingT, version MipsVersion, mips *foundry.Arti
 	case MipsSingleThreaded:
 		mipsSrcMap, err = srcFS.SourceMap(mips, "MIPS")
 	case MipsMultithreaded:
-		mipsSrcMap, err = srcFS.SourceMap(mips, "MIPS2")
+		if arch.IsMips32 {
+			mipsSrcMap, err = srcFS.SourceMap(mips, "MIPS2")
+		} else {
+			mipsSrcMap, err = srcFS.SourceMap(mips, "MIPS64")
+		}
 	default:
 		require.Fail(t, "invalid mips version")
 	}
diff --git a/cannon/mipsevm/testutil/memory.go b/cannon/mipsevm/testutil/memory.go
index f3ee9cb60ad9..ca41453aaf62 100644
--- a/cannon/mipsevm/testutil/memory.go
+++ b/cannon/mipsevm/testutil/memory.go
@@ -34,5 +34,5 @@ func GetInstruction(mem *memory.Memory, pc Word) uint32 {
 	if pc&0x3 != 0 {
 		panic(fmt.Errorf("unaligned memory access: %x", pc))
 	}
-	return exec.LoadSubWord(mem, pc, 4, false, new(exec.NoopMemoryTracker))
+	return uint32(exec.LoadSubWord(mem, pc, 4, false, new(exec.NoopMemoryTracker)))
 }
diff --git a/cannon/mipsevm/testutil/mips.go b/cannon/mipsevm/testutil/mips.go
index 3ce38809c9aa..9ba37cb30e2a 100644
--- a/cannon/mipsevm/testutil/mips.go
+++ b/cannon/mipsevm/testutil/mips.go
@@ -14,6 +14,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
@@ -22,6 +23,9 @@ import (
 	preimage "github.com/ethereum-optimism/optimism/op-preimage"
 )
 
+// maxStepGas should be less than the L1 gas limit
+const maxStepGas = 20_000_000
+
 type MIPSEVM struct {
 	sender      vm.AccountRef
 	startingGas uint64
@@ -36,11 +40,29 @@ type MIPSEVM struct {
 	lastPreimageOracleInput []byte
 }
 
-func NewMIPSEVM(contracts *ContractMetadata) *MIPSEVM {
+func NewMIPSEVM(contracts *ContractMetadata, opts ...evmOption) *MIPSEVM {
 	env, evmState := NewEVMEnv(contracts)
 	sender := vm.AccountRef{0x13, 0x37}
-	startingGas := uint64(30_000_000)
-	return &MIPSEVM{sender, startingGas, env, evmState, contracts.Addresses, nil, contracts.Artifacts, math.MaxUint64, nil, nil}
+	startingGas := uint64(maxStepGas)
+	evm := &MIPSEVM{sender, startingGas, env, evmState, contracts.Addresses, nil, contracts.Artifacts, math.MaxUint64, nil, nil}
+	for _, opt := range opts {
+		opt(evm)
+	}
+	return evm
+}
+
+type evmOption func(c *MIPSEVM)
+
+func WithSourceMapTracer(t *testing.T, ver MipsVersion) evmOption {
+	return func(evm *MIPSEVM) {
+		evm.SetSourceMapTracer(t, ver)
+	}
+}
+
+func WithTracingHooks(tracer *tracing.Hooks) evmOption {
+	return func(evm *MIPSEVM) {
+		evm.SetTracer(tracer)
+	}
 }
 
 func (m *MIPSEVM) SetTracer(tracer *tracing.Hooks) {
@@ -171,15 +193,8 @@ func LogStepFailureAtCleanup(t *testing.T, mipsEvm *MIPSEVM) {
 }
 
 // ValidateEVM runs a single evm step and validates against an FPVM poststate
-func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, goVm mipsevm.FPVM, hashFn mipsevm.HashFn, contracts *ContractMetadata, tracer *tracing.Hooks) {
-	if !arch.IsMips32 {
-		// TODO(#12250) Re-enable EVM validation once 64-bit MIPS contracts are completed
-		t.Logf("WARNING: Skipping EVM validation for 64-bit MIPS")
-		return
-	}
-
-	evm := NewMIPSEVM(contracts)
-	evm.SetTracer(tracer)
+func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, goVm mipsevm.FPVM, hashFn mipsevm.HashFn, contracts *ContractMetadata, opts ...evmOption) {
+	evm := NewMIPSEVM(contracts, opts...)
 	LogStepFailureAtCleanup(t, evm)
 
 	evmPost := evm.Step(t, stepWitness, step, hashFn)
@@ -188,15 +203,39 @@ func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, go
 		"mipsevm produced different state than EVM")
 }
 
+type ErrMatcher func(*testing.T, []byte)
+
+func CreateNoopErrorMatcher() ErrMatcher {
+	return func(t *testing.T, ret []byte) {}
+}
+
+// CreateErrorStringMatcher matches an Error(string)
+func CreateErrorStringMatcher(expect string) ErrMatcher {
+	return func(t *testing.T, ret []byte) {
+		require.Greaterf(t, len(ret), 4, "Return data length should be greater than 4 bytes: %x", ret)
+		unpacked, decodeErr := abi.UnpackRevert(ret)
+		require.NoError(t, decodeErr, "Failed to unpack revert reason")
+		require.Contains(t, unpacked, expect, "Revert reason mismatch")
+	}
+}
+
+// CreateCustomErrorMatcher matches a custom error given the error signature
+func CreateCustomErrorMatcher(sig string) ErrMatcher {
+	return func(t *testing.T, ret []byte) {
+		expect := crypto.Keccak256([]byte(sig))[:4]
+		require.EqualValuesf(t, expect, ret, "return value is %x", ret)
+	}
+}
+
 // AssertEVMReverts runs a single evm step from an FPVM prestate and asserts that the VM panics
-func AssertEVMReverts(t *testing.T, state mipsevm.FPVMState, contracts *ContractMetadata, tracer *tracing.Hooks, ProofData []byte, expectedReason string) {
+func AssertEVMReverts(t *testing.T, state mipsevm.FPVMState, contracts *ContractMetadata, tracer *tracing.Hooks, ProofData []byte, matcher ErrMatcher) {
 	encodedWitness, _ := state.EncodeWitness()
 	stepWitness := &mipsevm.StepWitness{
 		State:     encodedWitness,
 		ProofData: ProofData,
 	}
 	input := EncodeStepInput(t, stepWitness, mipsevm.LocalContext{}, contracts.Artifacts.MIPS)
-	startingGas := uint64(30_000_000)
+	startingGas := uint64(maxStepGas)
 
 	env, evmState := NewEVMEnv(contracts)
 	env.Config.Tracer = tracer
@@ -204,18 +243,14 @@ func AssertEVMReverts(t *testing.T, state mipsevm.FPVMState, contracts *Contract
 	ret, _, err := env.Call(vm.AccountRef(sender), contracts.Addresses.MIPS, input, startingGas, common.U2560)
 
 	require.EqualValues(t, err, vm.ErrExecutionReverted)
-	require.Greater(t, len(ret), 4, "Return data length should be greater than 4 bytes")
-	unpacked, decodeErr := abi.UnpackRevert(ret)
-	require.NoError(t, decodeErr, "Failed to unpack revert reason")
-	require.Equal(t, expectedReason, unpacked, "Revert reason mismatch")
+	matcher(t, ret)
 
 	logs := evmState.Logs()
 	require.Equal(t, 0, len(logs))
 }
 
-func AssertPreimageOracleReverts(t *testing.T, preimageKey [32]byte, preimageValue []byte, preimageOffset arch.Word, contracts *ContractMetadata, tracer *tracing.Hooks) {
-	evm := NewMIPSEVM(contracts)
-	evm.SetTracer(tracer)
+func AssertPreimageOracleReverts(t *testing.T, preimageKey [32]byte, preimageValue []byte, preimageOffset arch.Word, contracts *ContractMetadata, opts ...evmOption) {
+	evm := NewMIPSEVM(contracts, opts...)
 	LogStepFailureAtCleanup(t, evm)
 
 	evm.assertPreimageOracleReverts(t, preimageKey, preimageValue, preimageOffset)
diff --git a/op-chain-ops/srcmap/solutil.go b/op-chain-ops/srcmap/solutil.go
index 6d1aa4c64a3e..929632cbfd5f 100644
--- a/op-chain-ops/srcmap/solutil.go
+++ b/op-chain-ops/srcmap/solutil.go
@@ -238,6 +238,16 @@ func (s *SourceMapTracer) info(codeAddr common.Address, pc uint64) string {
 
 func (s *SourceMapTracer) OnOpCode(pc uint64, opcode byte, gas, cost uint64, scope tracing.OpContext, rData []byte, depth int, err error) {
 	op := vm.OpCode(opcode)
+	var top []string
+	stk := scope.StackData()
+	for i := len(stk) - 1; i >= 0; i-- {
+		top = append(top, stk[i].Hex())
+		if len(top) == 4 {
+			break
+		}
+	}
+	stkInfo := fmt.Sprintf("[%s]", strings.Join(top, ", "))
+
 	if op.IsPush() {
 		var val []byte
 		sc, ok := scope.(*vm.ScopeContext)
@@ -248,10 +258,10 @@ func (s *SourceMapTracer) OnOpCode(pc uint64, opcode byte, gas, cost uint64, sco
 		} else {
 			val = []byte("N/A")
 		}
-		fmt.Fprintf(s.out, "%-40s : pc %x opcode %s (%x)\n", s.info(scope.Address(), pc), pc, op.String(), val)
+		fmt.Fprintf(s.out, "%-40s : pc %x opcode %s (%x) \t| stk[:%d] %s\n", s.info(scope.Address(), pc), pc, op.String(), val, len(top), stkInfo)
 		return
 	}
-	fmt.Fprintf(s.out, "%-40s : pc %x opcode %s\n", s.info(scope.Address(), pc), pc, op.String())
+	fmt.Fprintf(s.out, "%-40s : pc %x opcode %s \t\t| stk[:%d] %s\n", s.info(scope.Address(), pc), pc, op.String(), len(top), stkInfo)
 }
 
 func (s *SourceMapTracer) OnFault(pc uint64, opcode byte, gas, cost uint64, scope tracing.OpContext, depth int, err error) {
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 9f7240772437..502b9d0ba6f9 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -147,6 +147,10 @@
     "initCodeHash": "0xaedf0d0b0e94a0c5e7d987331d2fdba84230f5704a6ca33677e70cde7051b17e",
     "sourceCodeHash": "0x9fa2d1297ad1e93b4d3c5c0fed08bedcd8f746807589f0fd3369e79347c6a027"
   },
+  "src/cannon/MIPS64.sol": {
+    "initCodeHash": "0x47c2bdd1e6fbb4941caa20a2ba5c2a66de198a8c7b540a9d4a0d84dbe8d3bfea",
+    "sourceCodeHash": "0xdb7f8a92ed552a2720f5fe3c0a32e4069026f0b23933145493ead88403206814"
+  },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
     "sourceCodeHash": "0x979d8595d925c70a123e72c062fa58c9ef94777c2e93b6bc3231d6679e2e9055"
diff --git a/packages/contracts-bedrock/snapshots/abi/MIPS64.json b/packages/contracts-bedrock/snapshots/abi/MIPS64.json
new file mode 100644
index 000000000000..fe6007b60a89
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/abi/MIPS64.json
@@ -0,0 +1,93 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "contract IPreimageOracle",
+        "name": "_oracle",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [],
+    "name": "oracle",
+    "outputs": [
+      {
+        "internalType": "contract IPreimageOracle",
+        "name": "oracle_",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "_stateData",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_proof",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "_localContext",
+        "type": "bytes32"
+      }
+    ],
+    "name": "step",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "version",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidExitedValue",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidMemoryProof",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidPC",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidRMWInstruction",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidSecondMemoryProof",
+    "type": "error"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/MIPS64.json b/packages/contracts-bedrock/snapshots/storageLayout/MIPS64.json
new file mode 100644
index 000000000000..0637a088a01e
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/storageLayout/MIPS64.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/cannon/MIPS64.sol b/packages/contracts-bedrock/src/cannon/MIPS64.sol
new file mode 100644
index 000000000000..dcc2a6ec2190
--- /dev/null
+++ b/packages/contracts-bedrock/src/cannon/MIPS64.sol
@@ -0,0 +1,951 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IPreimageOracle } from "./interfaces/IPreimageOracle.sol";
+import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
+import { MIPS64Syscalls as sys } from "src/cannon/libraries/MIPS64Syscalls.sol";
+import { MIPS64State as st } from "src/cannon/libraries/MIPS64State.sol";
+import { MIPS64Instructions as ins } from "src/cannon/libraries/MIPS64Instructions.sol";
+import { MIPS64Arch as arch } from "src/cannon/libraries/MIPS64Arch.sol";
+import { VMStatuses } from "src/dispute/lib/Types.sol";
+import {
+    InvalidMemoryProof, InvalidRMWInstruction, InvalidSecondMemoryProof
+} from "src/cannon/libraries/CannonErrors.sol";
+
+/// @title MIPS64
+/// @notice The MIPS64 contract emulates a single MIPS instruction.
+///         It differs from MIPS.sol in that it supports MIPS64 instructions and multi-tasking.
+contract MIPS64 is ISemver {
+    /// @notice The thread context.
+    ///         Total state size: 8 + 1 + 1 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 32 * 8 = 322 bytes
+    struct ThreadState {
+        // metadata
+        uint64 threadID;
+        uint8 exitCode;
+        bool exited;
+        // state
+        uint64 futexAddr;
+        uint64 futexVal;
+        uint64 futexTimeoutStep;
+        uint64 pc;
+        uint64 nextPC;
+        uint64 lo;
+        uint64 hi;
+        uint64[32] registers;
+    }
+
+    uint32 internal constant PACKED_THREAD_STATE_SIZE = 322;
+
+    uint8 internal constant LL_STATUS_NONE = 0;
+    uint8 internal constant LL_STATUS_ACTIVE_32_BIT = 0x1;
+    uint8 internal constant LL_STATUS_ACTIVE_64_BIT = 0x2;
+
+    /// @notice Stores the VM state.
+    ///         Total state size: 32 + 32 + 8 + 8 + 1 + 8 + 8 + 1 + 1 + 8 + 8 + 8 + 1 + 32 + 32 + 8 = 196 bytes
+    ///         If nextPC != pc + 4, then the VM is executing a branch/jump delay slot.
+    struct State {
+        bytes32 memRoot;
+        bytes32 preimageKey;
+        uint64 preimageOffset;
+        uint64 heap;
+        uint8 llReservationStatus;
+        uint64 llAddress;
+        uint64 llOwnerThread;
+        uint8 exitCode;
+        bool exited;
+        uint64 step;
+        uint64 stepsSinceLastContextSwitch;
+        uint64 wakeup;
+        bool traverseRight;
+        bytes32 leftThreadStack;
+        bytes32 rightThreadStack;
+        uint64 nextThreadID;
+    }
+
+    /// @notice The semantic version of the MIPS64 contract.
+    /// @custom:semver 1.0.0-beta.1
+    string public constant version = "1.0.0-beta.1";
+
+    /// @notice The preimage oracle contract.
+    IPreimageOracle internal immutable ORACLE;
+
+    // The offset of the start of proof calldata (_threadWitness.offset) in the step() function
+    uint256 internal constant THREAD_PROOF_OFFSET = 388;
+
+    // The offset of the start of proof calldata (_memProof.offset) in the step() function
+    uint256 internal constant MEM_PROOF_OFFSET = THREAD_PROOF_OFFSET + PACKED_THREAD_STATE_SIZE + 32;
+
+    // The empty thread root - keccak256(bytes32(0) ++ bytes32(0))
+    bytes32 internal constant EMPTY_THREAD_ROOT = hex"ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5";
+
+    // State memory offset allocated during step
+    uint256 internal constant STATE_MEM_OFFSET = 0x80;
+
+    // ThreadState memory offset allocated during step
+    uint256 internal constant TC_MEM_OFFSET = 0x280;
+
+    /// @param _oracle The address of the preimage oracle contract.
+    constructor(IPreimageOracle _oracle) {
+        ORACLE = _oracle;
+    }
+
+    /// @notice Getter for the pre-image oracle contract.
+    /// @return oracle_ The IPreimageOracle contract.
+    function oracle() external view returns (IPreimageOracle oracle_) {
+        oracle_ = ORACLE;
+    }
+
+    /// @notice Executes a single step of the multi-threaded vm.
+    ///         Will revert if any required input state is missing.
+    /// @param _stateData The encoded state witness data.
+    /// @param _proof The encoded proof data: <<thread_context, inner_root>, <memory proof>.
+    ///               Contains the thread context witness and the memory proof data for leaves within the MIPS VM's
+    /// memory.
+    ///               The thread context witness is a packed tuple of the thread context and the immediate inner root of
+    /// the current thread stack.
+    /// @param _localContext The local key context for the preimage oracle. Optional, can be set as a constant
+    ///                      if the caller only requires one set of local keys.
+    function step(bytes calldata _stateData, bytes calldata _proof, bytes32 _localContext) public returns (bytes32) {
+        unchecked {
+            State memory state;
+            ThreadState memory thread;
+            uint32 exited;
+            assembly {
+                if iszero(eq(state, STATE_MEM_OFFSET)) {
+                    // expected state mem offset check
+                    revert(0, 0)
+                }
+                if iszero(eq(thread, TC_MEM_OFFSET)) {
+                    // expected thread mem offset check
+                    revert(0, 0)
+                }
+                if iszero(eq(mload(0x40), shl(5, 63))) {
+                    // 4 + 16 state slots + 43 thread slots = 63 expected memory check
+                    revert(0, 0)
+                }
+                if iszero(eq(_stateData.offset, 132)) {
+                    // 32*4+4=132 expected state data offset
+                    revert(0, 0)
+                }
+                if iszero(eq(_proof.offset, THREAD_PROOF_OFFSET)) {
+                    // _stateData.offset = 132
+                    // stateData.length = 196
+                    // 32-byte align padding = 28
+                    // _proof size prefix = 32
+                    // expected thread proof offset equals the sum of the above is 388
+                    revert(0, 0)
+                }
+
+                function putField(callOffset, memOffset, size) -> callOffsetOut, memOffsetOut {
+                    // calldata is packed, thus starting left-aligned, shift-right to pad and right-align
+                    let w := shr(shl(3, sub(32, size)), calldataload(callOffset))
+                    mstore(memOffset, w)
+                    callOffsetOut := add(callOffset, size)
+                    memOffsetOut := add(memOffset, 32)
+                }
+
+                // Unpack state from calldata into memory
+                let c := _stateData.offset // calldata offset
+                let m := STATE_MEM_OFFSET // mem offset
+                c, m := putField(c, m, 32) // memRoot
+                c, m := putField(c, m, 32) // preimageKey
+                c, m := putField(c, m, 8) // preimageOffset
+                c, m := putField(c, m, 8) // heap
+                c, m := putField(c, m, 1) // llReservationStatus
+                c, m := putField(c, m, 8) // llAddress
+                c, m := putField(c, m, 8) // llOwnerThread
+                c, m := putField(c, m, 1) // exitCode
+                c, m := putField(c, m, 1) // exited
+                exited := mload(sub(m, 32))
+                c, m := putField(c, m, 8) // step
+                c, m := putField(c, m, 8) // stepsSinceLastContextSwitch
+                c, m := putField(c, m, 8) // wakeup
+                c, m := putField(c, m, 1) // traverseRight
+                c, m := putField(c, m, 32) // leftThreadStack
+                c, m := putField(c, m, 32) // rightThreadStack
+                c, m := putField(c, m, 8) // nextThreadID
+            }
+            st.assertExitedIsValid(exited);
+
+            if (state.exited) {
+                // thread state is unchanged
+                return outputState();
+            }
+
+            if (
+                (state.leftThreadStack == EMPTY_THREAD_ROOT && !state.traverseRight)
+                    || (state.rightThreadStack == EMPTY_THREAD_ROOT && state.traverseRight)
+            ) {
+                revert("MIPS64: active thread stack is empty");
+            }
+
+            state.step += 1;
+
+            setThreadStateFromCalldata(thread);
+            validateCalldataThreadWitness(state, thread);
+
+            // Search for the first thread blocked by the wakeup call, if wakeup is set
+            // Don't allow regular execution until we resolved if we have woken up any thread.
+            if (state.wakeup != sys.FUTEX_EMPTY_ADDR) {
+                if (state.wakeup == thread.futexAddr) {
+                    // completed wake traversal
+                    // resume execution on woken up thread
+                    state.wakeup = sys.FUTEX_EMPTY_ADDR;
+                    return outputState();
+                } else {
+                    bool traversingRight = state.traverseRight;
+                    bool changedDirections = preemptThread(state, thread);
+                    if (traversingRight && changedDirections) {
+                        // then we've completed wake traversal
+                        // resume thread execution
+                        state.wakeup = sys.FUTEX_EMPTY_ADDR;
+                    }
+                    return outputState();
+                }
+            }
+
+            if (thread.exited) {
+                popThread(state);
+                return outputState();
+            }
+
+            // check if thread is blocked on a futex
+            if (thread.futexAddr != sys.FUTEX_EMPTY_ADDR) {
+                // if set, then check futex
+                // check timeout first
+                if (state.step > thread.futexTimeoutStep) {
+                    // timeout! Allow execution
+                    return onWaitComplete(thread, true);
+                } else {
+                    uint64 mem = MIPS64Memory.readMem(
+                        state.memRoot,
+                        thread.futexAddr & arch.ADDRESS_MASK,
+                        MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1)
+                    );
+                    if (thread.futexVal == mem) {
+                        // still got expected value, continue sleeping, try next thread.
+                        preemptThread(state, thread);
+                        return outputState();
+                    } else {
+                        // wake thread up, the value at its address changed!
+                        // Userspace can turn thread back to sleep if it was too sporadic.
+                        return onWaitComplete(thread, false);
+                    }
+                }
+            }
+
+            if (state.stepsSinceLastContextSwitch >= sys.SCHED_QUANTUM) {
+                preemptThread(state, thread);
+                return outputState();
+            }
+            state.stepsSinceLastContextSwitch += 1;
+
+            // instruction fetch
+            uint256 insnProofOffset = MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 0);
+            (uint32 insn, uint32 opcode, uint32 fun) =
+                ins.getInstructionDetails(thread.pc, state.memRoot, insnProofOffset);
+
+            // Handle syscall separately
+            // syscall (can read and write)
+            if (opcode == 0 && fun == 0xC) {
+                return handleSyscall(_localContext);
+            }
+
+            // Handle RMW (read-modify-write) ops
+            if (opcode == ins.OP_LOAD_LINKED || opcode == ins.OP_STORE_CONDITIONAL) {
+                return handleRMWOps(state, thread, insn, opcode);
+            }
+            if (opcode == ins.OP_LOAD_LINKED64 || opcode == ins.OP_STORE_CONDITIONAL64) {
+                return handleRMWOps(state, thread, insn, opcode);
+            }
+
+            // Exec the rest of the step logic
+            st.CpuScalars memory cpu = getCpuScalars(thread);
+            ins.CoreStepLogicParams memory coreStepArgs = ins.CoreStepLogicParams({
+                cpu: cpu,
+                registers: thread.registers,
+                memRoot: state.memRoot,
+                memProofOffset: MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1),
+                insn: insn,
+                opcode: opcode,
+                fun: fun
+            });
+            bool memUpdated;
+            uint64 memAddr;
+            (state.memRoot, memUpdated, memAddr) = ins.execMipsCoreStepLogic(coreStepArgs);
+            setStateCpuScalars(thread, cpu);
+            updateCurrentThreadRoot();
+            if (memUpdated) {
+                handleMemoryUpdate(state, memAddr);
+            }
+
+            return outputState();
+        }
+    }
+
+    function handleMemoryUpdate(State memory _state, uint64 _memAddr) internal pure {
+        if (_memAddr == (arch.ADDRESS_MASK & _state.llAddress)) {
+            // Reserved address was modified, clear the reservation
+            clearLLMemoryReservation(_state);
+        }
+    }
+
+    function clearLLMemoryReservation(State memory _state) internal pure {
+        _state.llReservationStatus = LL_STATUS_NONE;
+        _state.llAddress = 0;
+        _state.llOwnerThread = 0;
+    }
+
+    function handleRMWOps(
+        State memory _state,
+        ThreadState memory _thread,
+        uint32 _insn,
+        uint32 _opcode
+    )
+        internal
+        returns (bytes32)
+    {
+        unchecked {
+            uint64 base = _thread.registers[(_insn >> 21) & 0x1F];
+            uint32 rtReg = (_insn >> 16) & 0x1F;
+            uint64 addr = base + ins.signExtendImmediate(_insn);
+
+            // Determine some opcode-specific parameters
+            uint8 targetStatus = LL_STATUS_ACTIVE_32_BIT;
+            uint64 byteLength = 4;
+            if (_opcode == ins.OP_LOAD_LINKED64 || _opcode == ins.OP_STORE_CONDITIONAL64) {
+                // Use 64-bit params
+                targetStatus = LL_STATUS_ACTIVE_64_BIT;
+                byteLength = 8;
+            }
+
+            uint64 retVal = 0;
+            uint64 threadId = _thread.threadID;
+            if (_opcode == ins.OP_LOAD_LINKED || _opcode == ins.OP_LOAD_LINKED64) {
+                retVal = loadSubWord(_state, addr, byteLength, true);
+
+                _state.llReservationStatus = targetStatus;
+                _state.llAddress = addr;
+                _state.llOwnerThread = threadId;
+            } else if (_opcode == ins.OP_STORE_CONDITIONAL || _opcode == ins.OP_STORE_CONDITIONAL64) {
+                // Check if our memory reservation is still intact
+                if (
+                    _state.llReservationStatus == targetStatus && _state.llOwnerThread == threadId
+                        && _state.llAddress == addr
+                ) {
+                    // Complete atomic update: set memory and return 1 for success
+                    clearLLMemoryReservation(_state);
+
+                    uint64 val = _thread.registers[rtReg];
+                    storeSubWord(_state, addr, byteLength, val);
+
+                    retVal = 1;
+                } else {
+                    // Atomic update failed, return 0 for failure
+                    retVal = 0;
+                }
+            } else {
+                revert InvalidRMWInstruction();
+            }
+
+            st.CpuScalars memory cpu = getCpuScalars(_thread);
+            ins.handleRd(cpu, _thread.registers, rtReg, retVal, true);
+            setStateCpuScalars(_thread, cpu);
+            updateCurrentThreadRoot();
+
+            return outputState();
+        }
+    }
+
+    /// @notice Loads a subword of byteLength size contained from memory based on the low-order bits of vaddr
+    /// @param _vaddr The virtual address of the the subword.
+    /// @param _byteLength The size of the subword.
+    /// @param _signExtend Whether to sign extend the selected subwrod.
+    function loadSubWord(
+        State memory _state,
+        uint64 _vaddr,
+        uint64 _byteLength,
+        bool _signExtend
+    )
+        internal
+        pure
+        returns (uint64 val_)
+    {
+        uint64 effAddr = _vaddr & arch.ADDRESS_MASK;
+        uint256 memProofOffset = MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1);
+        uint64 mem = MIPS64Memory.readMem(_state.memRoot, effAddr, memProofOffset);
+        val_ = ins.selectSubWord(_vaddr, mem, _byteLength, _signExtend);
+    }
+
+    /// @notice Stores a word that has been updated by the specified subword at bit positions determined by the virtual
+    /// address
+    /// @param _vaddr The virtual address of the subword.
+    /// @param _byteLength The size of the subword.
+    /// @param _value The subword that updates _memWord.
+    function storeSubWord(State memory _state, uint64 _vaddr, uint64 _byteLength, uint64 _value) internal pure {
+        uint64 effAddr = _vaddr & arch.ADDRESS_MASK;
+        uint256 memProofOffset = MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1);
+        uint64 mem = MIPS64Memory.readMem(_state.memRoot, effAddr, memProofOffset);
+
+        uint64 newMemVal = ins.updateSubWord(_vaddr, mem, _byteLength, _value);
+        _state.memRoot = MIPS64Memory.writeMem(effAddr, memProofOffset, newMemVal);
+    }
+
+    function handleSyscall(bytes32 _localContext) internal returns (bytes32 out_) {
+        unchecked {
+            // Load state from memory offsets to reduce stack pressure
+            State memory state;
+            ThreadState memory thread;
+            assembly {
+                state := STATE_MEM_OFFSET
+                thread := TC_MEM_OFFSET
+            }
+
+            // Load the syscall numbers and args from the registers
+            (uint64 syscall_no, uint64 a0, uint64 a1, uint64 a2, uint64 a3) = sys.getSyscallArgs(thread.registers);
+            // Syscalls that are unimplemented but known return with v0=0 and v1=0
+            uint64 v0 = 0;
+            uint64 v1 = 0;
+
+            if (syscall_no == sys.SYS_MMAP) {
+                (v0, v1, state.heap) = sys.handleSysMmap(a0, a1, state.heap);
+            } else if (syscall_no == sys.SYS_BRK) {
+                // brk: Returns a fixed address for the program break at 0x40000000
+                v0 = sys.PROGRAM_BREAK;
+            } else if (syscall_no == sys.SYS_CLONE) {
+                if (sys.VALID_SYS_CLONE_FLAGS != a0) {
+                    state.exited = true;
+                    state.exitCode = VMStatuses.PANIC.raw();
+                    return outputState();
+                }
+                v0 = state.nextThreadID;
+                v1 = 0;
+                ThreadState memory newThread;
+                newThread.threadID = state.nextThreadID;
+                newThread.exitCode = 0;
+                newThread.exited = false;
+                newThread.futexAddr = sys.FUTEX_EMPTY_ADDR;
+                newThread.futexVal = 0;
+                newThread.futexTimeoutStep = 0;
+                newThread.pc = thread.nextPC;
+                newThread.nextPC = thread.nextPC + 4;
+                newThread.lo = thread.lo;
+                newThread.hi = thread.hi;
+                for (uint256 i; i < 32; i++) {
+                    newThread.registers[i] = thread.registers[i];
+                }
+                newThread.registers[29] = a1; // set stack pointer
+                // the child will perceive a 0 value as returned value instead, and no error
+                newThread.registers[2] = 0;
+                newThread.registers[7] = 0;
+                state.nextThreadID++;
+
+                // Preempt this thread for the new one. But not before updating PCs
+                st.CpuScalars memory cpu0 = getCpuScalars(thread);
+                sys.handleSyscallUpdates(cpu0, thread.registers, v0, v1);
+                setStateCpuScalars(thread, cpu0);
+                updateCurrentThreadRoot();
+                pushThread(state, newThread);
+                return outputState();
+            } else if (syscall_no == sys.SYS_EXIT_GROUP) {
+                // exit group: Sets the Exited and ExitCode states to true and argument 0.
+                state.exited = true;
+                state.exitCode = uint8(a0);
+                updateCurrentThreadRoot();
+                return outputState();
+            } else if (syscall_no == sys.SYS_READ) {
+                sys.SysReadParams memory args = sys.SysReadParams({
+                    a0: a0,
+                    a1: a1,
+                    a2: a2,
+                    preimageKey: state.preimageKey,
+                    preimageOffset: state.preimageOffset,
+                    localContext: _localContext,
+                    oracle: ORACLE,
+                    proofOffset: MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1),
+                    memRoot: state.memRoot
+                });
+                // Encapsulate execution to avoid stack-too-deep error
+                (v0, v1) = execSysRead(state, args);
+            } else if (syscall_no == sys.SYS_WRITE) {
+                (v0, v1, state.preimageKey, state.preimageOffset) = sys.handleSysWrite({
+                    _a0: a0,
+                    _a1: a1,
+                    _a2: a2,
+                    _preimageKey: state.preimageKey,
+                    _preimageOffset: state.preimageOffset,
+                    _proofOffset: MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1),
+                    _memRoot: state.memRoot
+                });
+            } else if (syscall_no == sys.SYS_FCNTL) {
+                (v0, v1) = sys.handleSysFcntl(a0, a1);
+            } else if (syscall_no == sys.SYS_GETTID) {
+                v0 = thread.threadID;
+                v1 = 0;
+            } else if (syscall_no == sys.SYS_EXIT) {
+                thread.exited = true;
+                thread.exitCode = uint8(a0);
+                if (lastThreadRemaining(state)) {
+                    state.exited = true;
+                    state.exitCode = uint8(a0);
+                }
+                updateCurrentThreadRoot();
+                return outputState();
+            } else if (syscall_no == sys.SYS_FUTEX) {
+                // args: a0 = addr, a1 = op, a2 = val, a3 = timeout
+                uint64 effAddr = a0 & arch.ADDRESS_MASK;
+                if (a1 == sys.FUTEX_WAIT_PRIVATE) {
+                    uint64 mem = MIPS64Memory.readMem(
+                        state.memRoot, effAddr, MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1)
+                    );
+                    if (mem != a2) {
+                        v0 = sys.SYS_ERROR_SIGNAL;
+                        v1 = sys.EAGAIN;
+                    } else {
+                        thread.futexAddr = effAddr;
+                        thread.futexVal = a2;
+                        thread.futexTimeoutStep = a3 == 0 ? sys.FUTEX_NO_TIMEOUT : state.step + sys.FUTEX_TIMEOUT_STEPS;
+                        // Leave cpu scalars as-is. This instruction will be completed by `onWaitComplete`
+                        updateCurrentThreadRoot();
+                        return outputState();
+                    }
+                } else if (a1 == sys.FUTEX_WAKE_PRIVATE) {
+                    // Trigger thread traversal starting from the left stack until we find one waiting on the wakeup
+                    // address
+                    state.wakeup = effAddr;
+                    // Don't indicate to the program that we've woken up a waiting thread, as there are no guarantees.
+                    // The woken up thread should indicate this in userspace.
+                    v0 = 0;
+                    v1 = 0;
+                    st.CpuScalars memory cpu0 = getCpuScalars(thread);
+                    sys.handleSyscallUpdates(cpu0, thread.registers, v0, v1);
+                    setStateCpuScalars(thread, cpu0);
+                    preemptThread(state, thread);
+                    state.traverseRight = state.leftThreadStack == EMPTY_THREAD_ROOT;
+                    return outputState();
+                } else {
+                    v0 = sys.SYS_ERROR_SIGNAL;
+                    v1 = sys.EINVAL;
+                }
+            } else if (syscall_no == sys.SYS_SCHED_YIELD || syscall_no == sys.SYS_NANOSLEEP) {
+                v0 = 0;
+                v1 = 0;
+                st.CpuScalars memory cpu0 = getCpuScalars(thread);
+                sys.handleSyscallUpdates(cpu0, thread.registers, v0, v1);
+                setStateCpuScalars(thread, cpu0);
+                preemptThread(state, thread);
+                return outputState();
+            } else if (syscall_no == sys.SYS_OPEN) {
+                v0 = sys.SYS_ERROR_SIGNAL;
+                v1 = sys.EBADF;
+            } else if (syscall_no == sys.SYS_CLOCKGETTIME) {
+                if (a0 == sys.CLOCK_GETTIME_REALTIME_FLAG || a0 == sys.CLOCK_GETTIME_MONOTONIC_FLAG) {
+                    v0 = 0;
+                    v1 = 0;
+                    uint64 secs = 0;
+                    uint64 nsecs = 0;
+                    if (a0 == sys.CLOCK_GETTIME_MONOTONIC_FLAG) {
+                        secs = uint64(state.step / sys.HZ);
+                        nsecs = uint64((state.step % sys.HZ) * (1_000_000_000 / sys.HZ));
+                    }
+                    uint64 effAddr = a1 & arch.ADDRESS_MASK;
+                    // First verify the effAddr path
+                    if (
+                        !MIPS64Memory.isValidProof(
+                            state.memRoot, effAddr, MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1)
+                        )
+                    ) {
+                        revert InvalidMemoryProof();
+                    }
+                    // Recompute the new root after updating effAddr
+                    state.memRoot =
+                        MIPS64Memory.writeMem(effAddr, MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1), secs);
+                    handleMemoryUpdate(state, effAddr);
+                    // Verify the second memory proof against the newly computed root
+                    if (
+                        !MIPS64Memory.isValidProof(
+                            state.memRoot, effAddr + 8, MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 2)
+                        )
+                    ) {
+                        revert InvalidSecondMemoryProof();
+                    }
+                    state.memRoot =
+                        MIPS64Memory.writeMem(effAddr + 8, MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 2), nsecs);
+                    handleMemoryUpdate(state, effAddr + 8);
+                } else {
+                    v0 = sys.SYS_ERROR_SIGNAL;
+                    v1 = sys.EINVAL;
+                }
+            } else if (syscall_no == sys.SYS_GETPID) {
+                v0 = 0;
+                v1 = 0;
+            } else if (syscall_no == sys.SYS_MUNMAP) {
+                // ignored
+            } else if (syscall_no == sys.SYS_GETAFFINITY) {
+                // ignored
+            } else if (syscall_no == sys.SYS_MADVISE) {
+                // ignored
+            } else if (syscall_no == sys.SYS_RTSIGPROCMASK) {
+                // ignored
+            } else if (syscall_no == sys.SYS_SIGALTSTACK) {
+                // ignored
+            } else if (syscall_no == sys.SYS_RTSIGACTION) {
+                // ignored
+            } else if (syscall_no == sys.SYS_PRLIMIT64) {
+                // ignored
+            } else if (syscall_no == sys.SYS_CLOSE) {
+                // ignored
+            } else if (syscall_no == sys.SYS_PREAD64) {
+                // ignored
+            } else if (syscall_no == sys.SYS_FSTAT) {
+                // ignored
+            } else if (syscall_no == sys.SYS_OPENAT) {
+                // ignored
+            } else if (syscall_no == sys.SYS_READLINK) {
+                // ignored
+            } else if (syscall_no == sys.SYS_READLINKAT) {
+                // ignored
+            } else if (syscall_no == sys.SYS_IOCTL) {
+                // ignored
+            } else if (syscall_no == sys.SYS_EPOLLCREATE1) {
+                // ignored
+            } else if (syscall_no == sys.SYS_PIPE2) {
+                // ignored
+            } else if (syscall_no == sys.SYS_EPOLLCTL) {
+                // ignored
+            } else if (syscall_no == sys.SYS_EPOLLPWAIT) {
+                // ignored
+            } else if (syscall_no == sys.SYS_GETRANDOM) {
+                // ignored
+            } else if (syscall_no == sys.SYS_UNAME) {
+                // ignored
+            } else if (syscall_no == sys.SYS_GETUID) {
+                // ignored
+            } else if (syscall_no == sys.SYS_GETGID) {
+                // ignored
+            } else if (syscall_no == sys.SYS_MINCORE) {
+                // ignored
+            } else if (syscall_no == sys.SYS_TGKILL) {
+                // ignored
+            } else if (syscall_no == sys.SYS_SETITIMER) {
+                // ignored
+            } else if (syscall_no == sys.SYS_TIMERCREATE) {
+                // ignored
+            } else if (syscall_no == sys.SYS_TIMERSETTIME) {
+                // ignored
+            } else if (syscall_no == sys.SYS_TIMERDELETE) {
+                // ignored
+            } else if (syscall_no == sys.SYS_GETRLIMIT) {
+                // ignored
+            } else if (syscall_no == sys.SYS_LSEEK) {
+                // ignored
+            } else {
+                revert("MIPS64: unimplemented syscall");
+            }
+
+            st.CpuScalars memory cpu = getCpuScalars(thread);
+            sys.handleSyscallUpdates(cpu, thread.registers, v0, v1);
+            setStateCpuScalars(thread, cpu);
+
+            updateCurrentThreadRoot();
+            out_ = outputState();
+        }
+    }
+
+    function execSysRead(
+        State memory _state,
+        sys.SysReadParams memory _args
+    )
+        internal
+        view
+        returns (uint64 v0_, uint64 v1_)
+    {
+        bool memUpdated;
+        uint64 memAddr;
+        (v0_, v1_, _state.preimageOffset, _state.memRoot, memUpdated, memAddr) = sys.handleSysRead(_args);
+        if (memUpdated) {
+            handleMemoryUpdate(_state, memAddr);
+        }
+    }
+
+    /// @notice Computes the hash of the MIPS state.
+    /// @return out_ The hashed MIPS state.
+    function outputState() internal returns (bytes32 out_) {
+        uint32 exited;
+        assembly {
+            // copies 'size' bytes, right-aligned in word at 'from', to 'to', incl. trailing data
+            function copyMem(from, to, size) -> fromOut, toOut {
+                mstore(to, mload(add(from, sub(32, size))))
+                fromOut := add(from, 32)
+                toOut := add(to, size)
+            }
+
+            // From points to the MIPS State
+            let from := STATE_MEM_OFFSET
+
+            // Copy to the free memory pointer
+            let start := mload(0x40)
+            let to := start
+
+            // Copy state to free memory
+            from, to := copyMem(from, to, 32) // memRoot
+            from, to := copyMem(from, to, 32) // preimageKey
+            from, to := copyMem(from, to, 8) // preimageOffset
+            from, to := copyMem(from, to, 8) // heap
+            from, to := copyMem(from, to, 1) // llReservationStatus
+            from, to := copyMem(from, to, 8) // llAddress
+            from, to := copyMem(from, to, 8) // llOwnerThread
+            let exitCode := mload(from)
+            from, to := copyMem(from, to, 1) // exitCode
+            exited := mload(from)
+            from, to := copyMem(from, to, 1) // exited
+            from, to := copyMem(from, to, 8) // step
+            from, to := copyMem(from, to, 8) // stepsSinceLastContextSwitch
+            from, to := copyMem(from, to, 8) // wakeup
+            from, to := copyMem(from, to, 1) // traverseRight
+            from, to := copyMem(from, to, 32) // leftThreadStack
+            from, to := copyMem(from, to, 32) // rightThreadStack
+            from, to := copyMem(from, to, 8) // nextThreadID
+
+            // Clean up end of memory
+            mstore(to, 0)
+
+            // Log the resulting MIPS state, for debugging
+            log0(start, sub(to, start))
+
+            // Determine the VM status
+            let status := 0
+            switch exited
+            case 1 {
+                switch exitCode
+                // VMStatusValid
+                case 0 { status := 0 }
+                // VMStatusInvalid
+                case 1 { status := 1 }
+                // VMStatusPanic
+                default { status := 2 }
+            }
+            // VMStatusUnfinished
+            default { status := 3 }
+
+            // Compute the hash of the resulting MIPS state and set the status byte
+            out_ := keccak256(start, sub(to, start))
+            out_ := or(and(not(shl(248, 0xFF)), out_), shl(248, status))
+        }
+
+        st.assertExitedIsValid(exited);
+    }
+
+    /// @notice Updates the current thread stack root via inner thread root in calldata
+    function updateCurrentThreadRoot() internal pure {
+        State memory state;
+        ThreadState memory thread;
+        assembly {
+            state := STATE_MEM_OFFSET
+            thread := TC_MEM_OFFSET
+        }
+        bytes32 updatedRoot = computeThreadRoot(loadCalldataInnerThreadRoot(), thread);
+        if (state.traverseRight) {
+            state.rightThreadStack = updatedRoot;
+        } else {
+            state.leftThreadStack = updatedRoot;
+        }
+    }
+
+    /// @notice Completes the FUTEX_WAIT syscall.
+    function onWaitComplete(ThreadState memory _thread, bool _isTimedOut) internal returns (bytes32 out_) {
+        // Note: no need to reset State.wakeup.  If we're here, the wakeup field has already been reset
+        // Clear the futex state
+        _thread.futexAddr = sys.FUTEX_EMPTY_ADDR;
+        _thread.futexVal = 0;
+        _thread.futexTimeoutStep = 0;
+
+        // Complete the FUTEX_WAIT syscall
+        uint64 v0 = _isTimedOut ? sys.SYS_ERROR_SIGNAL : 0;
+        // set errno
+        uint64 v1 = _isTimedOut ? sys.ETIMEDOUT : 0;
+        st.CpuScalars memory cpu = getCpuScalars(_thread);
+        sys.handleSyscallUpdates(cpu, _thread.registers, v0, v1);
+        setStateCpuScalars(_thread, cpu);
+
+        updateCurrentThreadRoot();
+        out_ = outputState();
+    }
+
+    /// @notice Preempts the current thread for another and updates the VM state.
+    ///         It reads the inner thread root from calldata to update the current thread stack root.
+    function preemptThread(
+        State memory _state,
+        ThreadState memory _thread
+    )
+        internal
+        pure
+        returns (bool changedDirections_)
+    {
+        // pop thread from the current stack and push to the other stack
+        if (_state.traverseRight) {
+            require(_state.rightThreadStack != EMPTY_THREAD_ROOT, "MIPS64: empty right thread stack");
+            _state.rightThreadStack = loadCalldataInnerThreadRoot();
+            _state.leftThreadStack = computeThreadRoot(_state.leftThreadStack, _thread);
+        } else {
+            require(_state.leftThreadStack != EMPTY_THREAD_ROOT, "MIPS64: empty left thread stack");
+            _state.leftThreadStack = loadCalldataInnerThreadRoot();
+            _state.rightThreadStack = computeThreadRoot(_state.rightThreadStack, _thread);
+        }
+        bytes32 current = _state.traverseRight ? _state.rightThreadStack : _state.leftThreadStack;
+        if (current == EMPTY_THREAD_ROOT) {
+            _state.traverseRight = !_state.traverseRight;
+            changedDirections_ = true;
+        }
+        _state.stepsSinceLastContextSwitch = 0;
+    }
+
+    /// @notice Pushes a thread to the current thread stack.
+    function pushThread(State memory _state, ThreadState memory _thread) internal pure {
+        if (_state.traverseRight) {
+            _state.rightThreadStack = computeThreadRoot(_state.rightThreadStack, _thread);
+        } else {
+            _state.leftThreadStack = computeThreadRoot(_state.leftThreadStack, _thread);
+        }
+        _state.stepsSinceLastContextSwitch = 0;
+    }
+
+    /// @notice Removes the current thread from the stack.
+    function popThread(State memory _state) internal pure {
+        if (_state.traverseRight) {
+            _state.rightThreadStack = loadCalldataInnerThreadRoot();
+        } else {
+            _state.leftThreadStack = loadCalldataInnerThreadRoot();
+        }
+        bytes32 current = _state.traverseRight ? _state.rightThreadStack : _state.leftThreadStack;
+        if (current == EMPTY_THREAD_ROOT) {
+            _state.traverseRight = !_state.traverseRight;
+        }
+        _state.stepsSinceLastContextSwitch = 0;
+    }
+
+    /// @notice Returns true if the number of threads is 1
+    function lastThreadRemaining(State memory _state) internal pure returns (bool out_) {
+        bytes32 inactiveStack = _state.traverseRight ? _state.leftThreadStack : _state.rightThreadStack;
+        bool currentStackIsAlmostEmpty = loadCalldataInnerThreadRoot() == EMPTY_THREAD_ROOT;
+        return inactiveStack == EMPTY_THREAD_ROOT && currentStackIsAlmostEmpty;
+    }
+
+    function computeThreadRoot(bytes32 _currentRoot, ThreadState memory _thread) internal pure returns (bytes32 out_) {
+        // w_i = hash(w_0 ++ hash(thread))
+        bytes32 threadRoot = outputThreadState(_thread);
+        out_ = keccak256(abi.encodePacked(_currentRoot, threadRoot));
+    }
+
+    function outputThreadState(ThreadState memory _thread) internal pure returns (bytes32 out_) {
+        assembly {
+            // copies 'size' bytes, right-aligned in word at 'from', to 'to', incl. trailing data
+            function copyMem(from, to, size) -> fromOut, toOut {
+                mstore(to, mload(add(from, sub(32, size))))
+                fromOut := add(from, 32)
+                toOut := add(to, size)
+            }
+
+            // From points to the ThreadState
+            let from := _thread
+
+            // Copy to the free memory pointer
+            let start := mload(0x40)
+            let to := start
+
+            // Copy state to free memory
+            from, to := copyMem(from, to, 8) // threadID
+            from, to := copyMem(from, to, 1) // exitCode
+            from, to := copyMem(from, to, 1) // exited
+            from, to := copyMem(from, to, 8) // futexAddr
+            from, to := copyMem(from, to, 8) // futexVal
+            from, to := copyMem(from, to, 8) // futexTimeoutStep
+            from, to := copyMem(from, to, 8) // pc
+            from, to := copyMem(from, to, 8) // nextPC
+            from, to := copyMem(from, to, 8) // lo
+            from, to := copyMem(from, to, 8) // hi
+            from := mload(from) // offset to registers
+            // Copy registers
+            for { let i := 0 } lt(i, 32) { i := add(i, 1) } { from, to := copyMem(from, to, 8) }
+
+            // Clean up end of memory
+            mstore(to, 0)
+
+            // Compute the hash of the resulting ThreadState
+            out_ := keccak256(start, sub(to, start))
+        }
+    }
+
+    function getCpuScalars(ThreadState memory _tc) internal pure returns (st.CpuScalars memory cpu_) {
+        cpu_ = st.CpuScalars({ pc: _tc.pc, nextPC: _tc.nextPC, lo: _tc.lo, hi: _tc.hi });
+    }
+
+    function setStateCpuScalars(ThreadState memory _tc, st.CpuScalars memory _cpu) internal pure {
+        _tc.pc = _cpu.pc;
+        _tc.nextPC = _cpu.nextPC;
+        _tc.lo = _cpu.lo;
+        _tc.hi = _cpu.hi;
+    }
+
+    /// @notice Validates the thread witness in calldata against the current thread.
+    function validateCalldataThreadWitness(State memory _state, ThreadState memory _thread) internal pure {
+        bytes32 witnessRoot = computeThreadRoot(loadCalldataInnerThreadRoot(), _thread);
+        bytes32 expectedRoot = _state.traverseRight ? _state.rightThreadStack : _state.leftThreadStack;
+        require(expectedRoot == witnessRoot, "MIPS64: invalid thread witness");
+    }
+
+    /// @notice Sets the thread context from calldata.
+    function setThreadStateFromCalldata(ThreadState memory _thread) internal pure {
+        uint256 s = 0;
+        assembly {
+            s := calldatasize()
+        }
+        // verify we have enough calldata
+        require(
+            s >= (THREAD_PROOF_OFFSET + PACKED_THREAD_STATE_SIZE), "MIPS64: insufficient calldata for thread witness"
+        );
+
+        unchecked {
+            assembly {
+                function putField(callOffset, memOffset, size) -> callOffsetOut, memOffsetOut {
+                    // calldata is packed, thus starting left-aligned, shift-right to pad and right-align
+                    let w := shr(shl(3, sub(32, size)), calldataload(callOffset))
+                    mstore(memOffset, w)
+                    callOffsetOut := add(callOffset, size)
+                    memOffsetOut := add(memOffset, 32)
+                }
+
+                let c := THREAD_PROOF_OFFSET
+                let m := _thread
+                c, m := putField(c, m, 8) // threadID
+                c, m := putField(c, m, 1) // exitCode
+                c, m := putField(c, m, 1) // exited
+                c, m := putField(c, m, 8) // futexAddr
+                c, m := putField(c, m, 8) // futexVal
+                c, m := putField(c, m, 8) // futexTimeoutStep
+                c, m := putField(c, m, 8) // pc
+                c, m := putField(c, m, 8) // nextPC
+                c, m := putField(c, m, 8) // lo
+                c, m := putField(c, m, 8) // hi
+                m := mload(m) // offset to registers
+                // Unpack register calldata into memory
+                for { let i := 0 } lt(i, 32) { i := add(i, 1) } { c, m := putField(c, m, 8) }
+            }
+        }
+    }
+
+    /// @notice Loads the inner root for the current thread hash onion from calldata.
+    function loadCalldataInnerThreadRoot() internal pure returns (bytes32 innerThreadRoot_) {
+        uint256 s = 0;
+        assembly {
+            s := calldatasize()
+            innerThreadRoot_ := calldataload(add(THREAD_PROOF_OFFSET, PACKED_THREAD_STATE_SIZE))
+        }
+        // verify we have enough calldata
+        require(
+            s >= (THREAD_PROOF_OFFSET + (PACKED_THREAD_STATE_SIZE + 32)),
+            "MIPS64: insufficient calldata for thread witness"
+        );
+    }
+}
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol
new file mode 100644
index 000000000000..34a8d39f5d42
--- /dev/null
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+library MIPS64Arch {
+    uint64 internal constant WORD_SIZE = 64;
+    uint64 internal constant WORD_SIZE_BYTES = 8;
+    uint64 internal constant EXT_MASK = 0x7;
+    uint64 internal constant ADDRESS_MASK = 0xFFFFFFFFFFFFFFF8;
+}
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
new file mode 100644
index 000000000000..98bf87ec6239
--- /dev/null
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
@@ -0,0 +1,920 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
+import { MIPS64State as st } from "src/cannon/libraries/MIPS64State.sol";
+import { MIPS64Arch as arch } from "src/cannon/libraries/MIPS64Arch.sol";
+
+library MIPS64Instructions {
+    uint32 internal constant OP_LOAD_LINKED = 0x30;
+    uint32 internal constant OP_STORE_CONDITIONAL = 0x38;
+    uint32 internal constant OP_LOAD_LINKED64 = 0x34;
+    uint32 internal constant OP_STORE_CONDITIONAL64 = 0x3C;
+    uint32 internal constant OP_LOAD_DOUBLE_LEFT = 0x1A;
+    uint32 internal constant OP_LOAD_DOUBLE_RIGHT = 0x1B;
+    uint32 internal constant REG_RA = 31;
+    uint64 internal constant U64_MASK = 0xFFFFFFFFFFFFFFFF;
+    uint32 internal constant U32_MASK = 0xFFffFFff;
+
+    error InvalidPC();
+
+    struct CoreStepLogicParams {
+        /// @param opcode The opcode value parsed from insn_.
+        st.CpuScalars cpu;
+        /// @param registers The CPU registers.
+        uint64[32] registers;
+        /// @param memRoot The current merkle root of the memory.
+        bytes32 memRoot;
+        /// @param memProofOffset The offset in calldata specify where the memory merkle proof is located.
+        uint256 memProofOffset;
+        /// @param insn The current 32-bit instruction at the pc.
+        uint32 insn;
+        /// @param cpu The CPU scalar fields.
+        uint32 opcode;
+        /// @param fun The function value parsed from insn_.
+        uint32 fun;
+    }
+
+    /// @param _pc The program counter.
+    /// @param _memRoot The current memory root.
+    /// @param _insnProofOffset The calldata offset of the memory proof for the current instruction.
+    /// @return insn_ The current 32-bit instruction at the pc.
+    /// @return opcode_ The opcode value parsed from insn_.
+    /// @return fun_ The function value parsed from insn_.
+    function getInstructionDetails(
+        uint64 _pc,
+        bytes32 _memRoot,
+        uint256 _insnProofOffset
+    )
+        internal
+        pure
+        returns (uint32 insn_, uint32 opcode_, uint32 fun_)
+    {
+        unchecked {
+            if (_pc & 0x3 != 0) {
+                revert InvalidPC();
+            }
+            uint64 word = MIPS64Memory.readMem(_memRoot, _pc & arch.ADDRESS_MASK, _insnProofOffset);
+            insn_ = uint32(selectSubWord(_pc, word, 4, false));
+            opcode_ = insn_ >> 26; // First 6-bits
+            fun_ = insn_ & 0x3f; // Last 6-bits
+
+            return (insn_, opcode_, fun_);
+        }
+    }
+
+    /// @notice Execute core MIPS step logic.
+    /// @return newMemRoot_ The updated merkle root of memory after any modifications, may be unchanged.
+    /// @return memUpdated_ True if memory was modified.
+    /// @return memAddr_ Holds the memory address that was updated if memUpdated_ is true.
+    function execMipsCoreStepLogic(CoreStepLogicParams memory _args)
+        internal
+        pure
+        returns (bytes32 newMemRoot_, bool memUpdated_, uint64 memAddr_)
+    {
+        unchecked {
+            newMemRoot_ = _args.memRoot;
+            memUpdated_ = false;
+            memAddr_ = 0;
+
+            // j-type j/jal
+            if (_args.opcode == 2 || _args.opcode == 3) {
+                // Take top 4 bits of the next PC (its 256 MB region), and concatenate with the 26-bit offset
+                uint64 target = (_args.cpu.nextPC & signExtend(0xF0000000, 32)) | uint64((_args.insn & 0x03FFFFFF) << 2);
+                handleJump(_args.cpu, _args.registers, _args.opcode == 2 ? 0 : REG_RA, target);
+                return (newMemRoot_, memUpdated_, memAddr_);
+            }
+
+            // register fetch
+            uint64 rs = 0; // source register 1 value
+            uint64 rt = 0; // source register 2 / temp value
+            uint64 rtReg = uint64((_args.insn >> 16) & 0x1F);
+
+            // R-type or I-type (stores rt)
+            rs = _args.registers[(_args.insn >> 21) & 0x1F];
+            uint64 rdReg = rtReg;
+
+            // 64-bit opcodes lwu, ldl, ldr
+            if (_args.opcode == 0x27 || _args.opcode == 0x1A || _args.opcode == 0x1B) {
+                rt = _args.registers[rtReg];
+                rdReg = rtReg;
+            } else if (_args.opcode == 0 || _args.opcode == 0x1c) {
+                // R-type (stores rd)
+                rt = _args.registers[rtReg];
+                rdReg = uint64((_args.insn >> 11) & 0x1F);
+            } else if (_args.opcode < 0x20) {
+                // rt is SignExtImm
+                // don't sign extend for andi, ori, xori
+                if (_args.opcode == 0xC || _args.opcode == 0xD || _args.opcode == 0xe) {
+                    // ZeroExtImm
+                    rt = uint64(_args.insn & 0xFFFF);
+                } else {
+                    // SignExtImm
+                    rt = signExtendImmediate(_args.insn);
+                }
+            } else if (_args.opcode >= 0x28 || _args.opcode == 0x22 || _args.opcode == 0x26) {
+                // store rt value with store
+                rt = _args.registers[rtReg];
+
+                // store actual rt with lwl and lwr
+                rdReg = rtReg;
+            }
+
+            if ((_args.opcode >= 4 && _args.opcode < 8) || _args.opcode == 1) {
+                handleBranch({
+                    _cpu: _args.cpu,
+                    _registers: _args.registers,
+                    _opcode: _args.opcode,
+                    _insn: _args.insn,
+                    _rtReg: rtReg,
+                    _rs: rs
+                });
+                return (newMemRoot_, memUpdated_, memAddr_);
+            }
+
+            uint64 storeAddr = U64_MASK;
+            // memory fetch (all I-type)
+            // we do the load for stores also
+            uint64 mem = 0;
+            if (_args.opcode >= 0x20 || _args.opcode == OP_LOAD_DOUBLE_LEFT || _args.opcode == OP_LOAD_DOUBLE_RIGHT) {
+                // M[R[rs]+SignExtImm]
+                rs += signExtendImmediate(_args.insn);
+                uint64 addr = rs & arch.ADDRESS_MASK;
+                mem = MIPS64Memory.readMem(_args.memRoot, addr, _args.memProofOffset);
+                if (_args.opcode >= 0x28) {
+                    // store for 32-bit
+                    // for 64-bit: ld (0x37) is the only non-store opcode >= 0x28
+                    if (_args.opcode != 0x37) {
+                        // store
+                        storeAddr = addr;
+                        // store opcodes don't write back to a register
+                        rdReg = 0;
+                    }
+                }
+            }
+
+            // ALU
+            // Note: swr outputs more than 8 bytes without the u64_mask
+            uint64 val = executeMipsInstruction(_args.insn, _args.opcode, _args.fun, rs, rt, mem) & U64_MASK;
+
+            uint64 funSel = 0x20;
+            if (_args.opcode == 0 && _args.fun >= 8 && _args.fun < funSel) {
+                if (_args.fun == 8 || _args.fun == 9) {
+                    // jr/jalr
+                    handleJump(_args.cpu, _args.registers, _args.fun == 8 ? 0 : rdReg, rs);
+                    return (newMemRoot_, memUpdated_, memAddr_);
+                }
+
+                if (_args.fun == 0xa) {
+                    // movz
+                    handleRd(_args.cpu, _args.registers, rdReg, rs, rt == 0);
+                    return (newMemRoot_, memUpdated_, memAddr_);
+                }
+                if (_args.fun == 0xb) {
+                    // movn
+                    handleRd(_args.cpu, _args.registers, rdReg, rs, rt != 0);
+                    return (newMemRoot_, memUpdated_, memAddr_);
+                }
+
+                // lo and hi registers
+                // can write back
+                if (_args.fun >= 0x10 && _args.fun < funSel) {
+                    handleHiLo({
+                        _cpu: _args.cpu,
+                        _registers: _args.registers,
+                        _fun: _args.fun,
+                        _rs: rs,
+                        _rt: rt,
+                        _storeReg: rdReg
+                    });
+                    return (newMemRoot_, memUpdated_, memAddr_);
+                }
+            }
+
+            // write memory
+            if (storeAddr != U64_MASK) {
+                newMemRoot_ = MIPS64Memory.writeMem(storeAddr, _args.memProofOffset, val);
+                memUpdated_ = true;
+                memAddr_ = storeAddr;
+            }
+
+            // write back the value to destination register
+            handleRd(_args.cpu, _args.registers, rdReg, val, true);
+
+            return (newMemRoot_, memUpdated_, memAddr_);
+        }
+    }
+
+    function signExtendImmediate(uint32 _insn) internal pure returns (uint64 offset_) {
+        unchecked {
+            return signExtend(_insn & 0xFFFF, 16);
+        }
+    }
+
+    /// @notice Execute an instruction.
+    function executeMipsInstruction(
+        uint32 _insn,
+        uint32 _opcode,
+        uint32 _fun,
+        uint64 _rs,
+        uint64 _rt,
+        uint64 _mem
+    )
+        internal
+        pure
+        returns (uint64 out_)
+    {
+        unchecked {
+            if (_opcode == 0 || (_opcode >= 8 && _opcode < 0xF) || _opcode == 0x18 || _opcode == 0x19) {
+                assembly {
+                    // transform ArithLogI to SPECIAL
+                    switch _opcode
+                    // addi
+                    case 0x8 { _fun := 0x20 }
+                    // addiu
+                    case 0x9 { _fun := 0x21 }
+                    // stli
+                    case 0xA { _fun := 0x2A }
+                    // sltiu
+                    case 0xB { _fun := 0x2B }
+                    // andi
+                    case 0xC { _fun := 0x24 }
+                    // ori
+                    case 0xD { _fun := 0x25 }
+                    // xori
+                    case 0xE { _fun := 0x26 }
+                    // daddi
+                    case 0x18 { _fun := 0x2C }
+                    // daddiu
+                    case 0x19 { _fun := 0x2D }
+                }
+
+                // sll
+                if (_fun == 0x00) {
+                    return signExtend((_rt & U32_MASK) << ((_insn >> 6) & 0x1F), 32);
+                }
+                // srl
+                else if (_fun == 0x02) {
+                    return signExtend((_rt & U32_MASK) >> ((_insn >> 6) & 0x1F), 32);
+                }
+                // sra
+                else if (_fun == 0x03) {
+                    uint32 shamt = (_insn >> 6) & 0x1F;
+                    return signExtend((_rt & U32_MASK) >> shamt, 32 - shamt);
+                }
+                // sllv
+                else if (_fun == 0x04) {
+                    return signExtend((_rt & U32_MASK) << (_rs & 0x1F), 32);
+                }
+                // srlv
+                else if (_fun == 0x6) {
+                    return signExtend((_rt & U32_MASK) >> (_rs & 0x1F), 32);
+                }
+                // srav
+                else if (_fun == 0x07) {
+                    // shamt here is different than the typical shamt which comes from the
+                    // instruction itself, here it comes from the rs register
+                    uint64 shamt = _rs & 0x1F;
+                    return signExtend((_rt & U32_MASK) >> shamt, 32 - shamt);
+                }
+                // functs in range [0x8, 0x1b] are handled specially by other functions
+                // Explicitly enumerate each funct in range to reduce code diff against Go Vm
+                // jr
+                else if (_fun == 0x08) {
+                    return _rs;
+                }
+                // jalr
+                else if (_fun == 0x09) {
+                    return _rs;
+                }
+                // movz
+                else if (_fun == 0x0a) {
+                    return _rs;
+                }
+                // movn
+                else if (_fun == 0x0b) {
+                    return _rs;
+                }
+                // syscall
+                else if (_fun == 0x0c) {
+                    return _rs;
+                }
+                // 0x0d - break not supported
+                // sync
+                else if (_fun == 0x0f) {
+                    return _rs;
+                }
+                // mfhi
+                else if (_fun == 0x10) {
+                    return _rs;
+                }
+                // mthi
+                else if (_fun == 0x11) {
+                    return _rs;
+                }
+                // mflo
+                else if (_fun == 0x12) {
+                    return _rs;
+                }
+                // mtlo
+                else if (_fun == 0x13) {
+                    return _rs;
+                }
+                // dsllv
+                else if (_fun == 0x14) {
+                    return _rt;
+                }
+                // dsrlv
+                else if (_fun == 0x16) {
+                    return _rt;
+                }
+                // dsrav
+                else if (_fun == 0x17) {
+                    return _rt;
+                }
+                // mult
+                else if (_fun == 0x18) {
+                    return _rs;
+                }
+                // multu
+                else if (_fun == 0x19) {
+                    return _rs;
+                }
+                // div
+                else if (_fun == 0x1a) {
+                    return _rs;
+                }
+                // divu
+                else if (_fun == 0x1b) {
+                    return _rs;
+                }
+                // dmult
+                else if (_fun == 0x1c) {
+                    return _rs;
+                }
+                // dmultu
+                else if (_fun == 0x1d) {
+                    return _rs;
+                }
+                // ddiv
+                else if (_fun == 0x1e) {
+                    return _rs;
+                }
+                // ddivu
+                else if (_fun == 0x1f) {
+                    return _rs;
+                }
+                // The rest includes transformed R-type arith imm instructions
+                // add
+                else if (_fun == 0x20) {
+                    return signExtend(uint64(uint32(_rs) + uint32(_rt)), 32);
+                }
+                // addu
+                else if (_fun == 0x21) {
+                    return signExtend(uint64(uint32(_rs) + uint32(_rt)), 32);
+                }
+                // sub
+                else if (_fun == 0x22) {
+                    return signExtend(uint64(uint32(_rs) - uint32(_rt)), 32);
+                }
+                // subu
+                else if (_fun == 0x23) {
+                    return signExtend(uint64(uint32(_rs) - uint32(_rt)), 32);
+                }
+                // and
+                else if (_fun == 0x24) {
+                    return (_rs & _rt);
+                }
+                // or
+                else if (_fun == 0x25) {
+                    return (_rs | _rt);
+                }
+                // xor
+                else if (_fun == 0x26) {
+                    return (_rs ^ _rt);
+                }
+                // nor
+                else if (_fun == 0x27) {
+                    return ~(_rs | _rt);
+                }
+                // slti
+                else if (_fun == 0x2a) {
+                    return int64(_rs) < int64(_rt) ? 1 : 0;
+                }
+                // sltiu
+                else if (_fun == 0x2b) {
+                    return _rs < _rt ? 1 : 0;
+                }
+                // dadd
+                else if (_fun == 0x2c) {
+                    return (_rs + _rt);
+                }
+                // daddu
+                else if (_fun == 0x2d) {
+                    return (_rs + _rt);
+                }
+                // dsub
+                else if (_fun == 0x2e) {
+                    return (_rs - _rt);
+                }
+                // dsubu
+                else if (_fun == 0x2f) {
+                    return (_rs - _rt);
+                }
+                // dsll
+                else if (_fun == 0x38) {
+                    return _rt << ((_insn >> 6) & 0x1f);
+                }
+                // dsrl
+                else if (_fun == 0x3A) {
+                    return _rt >> ((_insn >> 6) & 0x1f);
+                }
+                // dsra
+                else if (_fun == 0x3B) {
+                    return uint64(int64(_rt) >> ((_insn >> 6) & 0x1f));
+                }
+                // dsll32
+                else if (_fun == 0x3c) {
+                    return _rt << (((_insn >> 6) & 0x1f) + 32);
+                }
+                // dsrl32
+                else if (_fun == 0x3e) {
+                    return _rt >> (((_insn >> 6) & 0x1f) + 32);
+                }
+                // dsra32
+                else if (_fun == 0x3f) {
+                    return uint64(int64(_rt) >> (((_insn >> 6) & 0x1f) + 32));
+                } else {
+                    revert("MIPS64: invalid instruction");
+                }
+            } else {
+                // SPECIAL2
+                if (_opcode == 0x1C) {
+                    // mul
+                    if (_fun == 0x2) {
+                        return signExtend(uint32(int32(uint32(_rs)) * int32(uint32(_rt))), 32);
+                    }
+                    // clz, clo
+                    else if (_fun == 0x20 || _fun == 0x21) {
+                        if (_fun == 0x20) {
+                            _rs = ~_rs;
+                        }
+                        uint32 i = 0;
+                        while (_rs & 0x80000000 != 0) {
+                            i++;
+                            _rs <<= 1;
+                        }
+                        return i;
+                    }
+                }
+                // lui
+                else if (_opcode == 0x0F) {
+                    return signExtend(_rt << 16, 32);
+                }
+                // lb
+                else if (_opcode == 0x20) {
+                    return selectSubWord(_rs, _mem, 1, true);
+                }
+                // lh
+                else if (_opcode == 0x21) {
+                    return selectSubWord(_rs, _mem, 2, true);
+                }
+                // lwl
+                else if (_opcode == 0x22) {
+                    uint32 w = uint32(selectSubWord(_rs, _mem, 4, false));
+                    uint32 val = w << uint32((_rs & 3) * 8);
+                    uint64 mask = uint64(U32_MASK << uint32((_rs & 3) * 8));
+                    return signExtend(((_rt & ~mask) | uint64(val)) & U32_MASK, 32);
+                }
+                // lw
+                else if (_opcode == 0x23) {
+                    return selectSubWord(_rs, _mem, 4, true);
+                }
+                // lbu
+                else if (_opcode == 0x24) {
+                    return selectSubWord(_rs, _mem, 1, false);
+                }
+                //  lhu
+                else if (_opcode == 0x25) {
+                    return selectSubWord(_rs, _mem, 2, false);
+                }
+                //  lwr
+                else if (_opcode == 0x26) {
+                    uint32 w = uint32(selectSubWord(_rs, _mem, 4, false));
+                    uint32 val = w >> (24 - (_rs & 3) * 8);
+                    uint32 mask = U32_MASK >> (24 - (_rs & 3) * 8);
+                    uint64 lwrResult = (uint32(_rt) & ~mask) | val;
+                    if (_rs & 3 == 3) {
+                        // loaded bit 31
+                        return signExtend(uint64(lwrResult), 32);
+                    } else {
+                        // NOTE: cannon64 implementation specific: We leave the upper word untouched
+                        uint64 rtMask = 0xFF_FF_FF_FF_00_00_00_00;
+                        return ((_rt & rtMask) | uint64(lwrResult));
+                    }
+                }
+                //  sb
+                else if (_opcode == 0x28) {
+                    return updateSubWord(_rs, _mem, 1, _rt);
+                }
+                //  sh
+                else if (_opcode == 0x29) {
+                    return updateSubWord(_rs, _mem, 2, _rt);
+                }
+                //  swl
+                else if (_opcode == 0x2a) {
+                    uint64 sr = (_rs & 3) << 3;
+                    uint64 val = ((_rt & U32_MASK) >> sr) << (32 - ((_rs & 0x4) << 3));
+                    uint64 mask = (uint64(U32_MASK) >> sr) << (32 - ((_rs & 0x4) << 3));
+                    return (_mem & ~mask) | val;
+                }
+                //  sw
+                else if (_opcode == 0x2b) {
+                    return updateSubWord(_rs, _mem, 4, _rt);
+                }
+                //  swr
+                else if (_opcode == 0x2e) {
+                    uint32 w = uint32(selectSubWord(_rs, _mem, 4, false));
+                    uint64 val = _rt << (24 - (_rs & 3) * 8);
+                    uint64 mask = U32_MASK << uint32(24 - (_rs & 3) * 8);
+                    uint64 swrResult = (w & ~mask) | uint32(val);
+                    return updateSubWord(_rs, _mem, 4, swrResult);
+                }
+                // MIPS64
+                //  ldl
+                else if (_opcode == 0x1a) {
+                    uint64 sl = (_rs & 0x7) << 3;
+                    uint64 val = _mem << sl;
+                    uint64 mask = U64_MASK << sl;
+                    return (val | (_rt & ~mask));
+                }
+                //  ldr
+                else if (_opcode == 0x1b) {
+                    uint64 sr = 56 - ((_rs & 0x7) << 3);
+                    uint64 val = _mem >> sr;
+                    uint64 mask = U64_MASK << (64 - sr);
+                    return (val | (_rt & mask));
+                }
+                //  lwu
+                else if (_opcode == 0x27) {
+                    return ((_mem >> (32 - ((_rs & 0x4) << 3))) & U32_MASK);
+                }
+                //  sdl
+                else if (_opcode == 0x2c) {
+                    uint64 sr = (_rs & 0x7) << 3;
+                    uint64 val = _rt >> sr;
+                    uint64 mask = U64_MASK >> sr;
+                    return (val | (_mem & ~mask));
+                }
+                //  sdr
+                else if (_opcode == 0x2d) {
+                    uint64 sl = 56 - ((_rs & 0x7) << 3);
+                    uint64 val = _rt << sl;
+                    uint64 mask = U64_MASK << sl;
+                    return (val | (_mem & ~mask));
+                }
+                //  ld
+                else if (_opcode == 0x37) {
+                    return _mem;
+                }
+                //  sd
+                else if (_opcode == 0x3F) {
+                    return _rt;
+                } else {
+                    revert("MIPS64: invalid instruction");
+                }
+            }
+            revert("MIPS64: invalid instruction");
+        }
+    }
+
+    /// @notice Extends the value leftwards with its most significant bit (sign extension).
+    function signExtend(uint64 _dat, uint64 _idx) internal pure returns (uint64 out_) {
+        unchecked {
+            bool isSigned = (_dat >> (_idx - 1)) != 0;
+            uint256 signed = ((1 << (arch.WORD_SIZE - _idx)) - 1) << _idx;
+            uint256 mask = (1 << _idx) - 1;
+            return uint64(_dat & mask | (isSigned ? signed : 0));
+        }
+    }
+
+    /// @notice Handles a branch instruction, updating the MIPS state PC where needed.
+    /// @param _cpu Holds the state of cpu scalars pc, nextPC, hi, lo.
+    /// @param _registers Holds the current state of the cpu registers.
+    /// @param _opcode The opcode of the branch instruction.
+    /// @param _insn The instruction to be executed.
+    /// @param _rtReg The register to be used for the branch.
+    /// @param _rs The register to be compared with the branch register.
+    function handleBranch(
+        st.CpuScalars memory _cpu,
+        uint64[32] memory _registers,
+        uint32 _opcode,
+        uint32 _insn,
+        uint64 _rtReg,
+        uint64 _rs
+    )
+        internal
+        pure
+    {
+        unchecked {
+            bool shouldBranch = false;
+
+            if (_cpu.nextPC != _cpu.pc + 4) {
+                revert("MIPS64: branch in delay slot");
+            }
+
+            // beq/bne: Branch on equal / not equal
+            if (_opcode == 4 || _opcode == 5) {
+                uint64 rt = _registers[_rtReg];
+                shouldBranch = (_rs == rt && _opcode == 4) || (_rs != rt && _opcode == 5);
+            }
+            // blez: Branches if instruction is less than or equal to zero
+            else if (_opcode == 6) {
+                shouldBranch = int64(_rs) <= 0;
+            }
+            // bgtz: Branches if instruction is greater than zero
+            else if (_opcode == 7) {
+                shouldBranch = int64(_rs) > 0;
+            }
+            // bltz/bgez: Branch on less than zero / greater than or equal to zero
+            else if (_opcode == 1) {
+                // regimm
+                uint32 rtv = ((_insn >> 16) & 0x1F);
+                if (rtv == 0) {
+                    shouldBranch = int64(_rs) < 0;
+                }
+                if (rtv == 1) {
+                    shouldBranch = int64(_rs) >= 0;
+                }
+                // bgezal (i.e. bal mnemonic)
+                if (rtv == 0x11) {
+                    shouldBranch = int64(_rs) >= 0;
+                    _registers[REG_RA] = _cpu.pc + 8; // always set regardless of branch taken
+                }
+            }
+
+            // Update the state's previous PC
+            uint64 prevPC = _cpu.pc;
+
+            // Execute the delay slot first
+            _cpu.pc = _cpu.nextPC;
+
+            // If we should branch, update the PC to the branch target
+            // Otherwise, proceed to the next instruction
+            if (shouldBranch) {
+                _cpu.nextPC = prevPC + 4 + (signExtend(_insn & 0xFFFF, 16) << 2);
+            } else {
+                _cpu.nextPC = _cpu.nextPC + 4;
+            }
+        }
+    }
+
+    /// @notice Handles HI and LO register instructions. It also additionally handles doubleword variable shift
+    /// operations
+    /// @param _cpu Holds the state of cpu scalars pc, nextPC, hi, lo.
+    /// @param _registers Holds the current state of the cpu registers.
+    /// @param _fun The function code of the instruction.
+    /// @param _rs The value of the RS register.
+    /// @param _rt The value of the RT register.
+    /// @param _storeReg The register to store the result in.
+    function handleHiLo(
+        st.CpuScalars memory _cpu,
+        uint64[32] memory _registers,
+        uint32 _fun,
+        uint64 _rs,
+        uint64 _rt,
+        uint64 _storeReg
+    )
+        internal
+        pure
+    {
+        unchecked {
+            uint64 val = 0;
+
+            // mfhi: Move the contents of the HI register into the destination
+            if (_fun == 0x10) {
+                val = _cpu.hi;
+            }
+            // mthi: Move the contents of the source into the HI register
+            else if (_fun == 0x11) {
+                _cpu.hi = _rs;
+            }
+            // mflo: Move the contents of the LO register into the destination
+            else if (_fun == 0x12) {
+                val = _cpu.lo;
+            }
+            // mtlo: Move the contents of the source into the LO register
+            else if (_fun == 0x13) {
+                _cpu.lo = _rs;
+            }
+            // mult: Multiplies `rs` by `rt` and stores the result in HI and LO registers
+            else if (_fun == 0x18) {
+                uint64 acc = uint64(int64(int32(uint32(_rs))) * int64(int32(uint32(_rt))));
+                _cpu.hi = signExtend(uint64(acc >> 32), 32);
+                _cpu.lo = signExtend(uint64(uint32(acc)), 32);
+            }
+            // multu: Unsigned multiplies `rs` by `rt` and stores the result in HI and LO registers
+            else if (_fun == 0x19) {
+                uint64 acc = uint64(uint32(_rs)) * uint64(uint32(_rt));
+                _cpu.hi = signExtend(uint64(acc >> 32), 32);
+                _cpu.lo = signExtend(uint64(uint32(acc)), 32);
+            }
+            // div: Divides `rs` by `rt`.
+            // Stores the quotient in LO
+            // And the remainder in HI
+            else if (_fun == 0x1a) {
+                if (uint32(_rt) == 0) {
+                    revert("MIPS64: division by zero");
+                }
+                _cpu.hi = signExtend(uint32(int32(uint32(_rs)) % int32(uint32(_rt))), 32);
+                _cpu.lo = signExtend(uint32(int32(uint32(_rs)) / int32(uint32(_rt))), 32);
+            }
+            // divu: Unsigned divides `rs` by `rt`.
+            // Stores the quotient in LO
+            // And the remainder in HI
+            else if (_fun == 0x1b) {
+                if (uint32(_rt) == 0) {
+                    revert("MIPS64: division by zero");
+                }
+                _cpu.hi = signExtend(uint64(uint32(_rs) % uint32(_rt)), 32);
+                _cpu.lo = signExtend(uint64(uint32(_rs) / uint32(_rt)), 32);
+            }
+            // dsllv
+            else if (_fun == 0x14) {
+                val = _rt << (_rs & 0x3F);
+            }
+            // dsrlv
+            else if (_fun == 0x16) {
+                val = _rt >> (_rs & 0x3F);
+            }
+            // dsrav
+            else if (_fun == 0x17) {
+                val = uint64(int64(_rt) >> (_rs & 0x3F));
+            }
+            // dmult
+            else if (_fun == 0x1c) {
+                int128 res = int128(int64(_rs)) * int128(int64(_rt));
+                _cpu.hi = uint64(int64(res >> 64));
+                _cpu.lo = uint64(uint128(res) & U64_MASK);
+            }
+            // dmultu
+            else if (_fun == 0x1d) {
+                uint128 res = uint128(_rs) * uint128(_rt);
+                _cpu.hi = uint64(res >> 64);
+                _cpu.lo = uint64(res);
+            }
+            // ddiv
+            else if (_fun == 0x1e) {
+                if (_rt == 0) {
+                    revert("MIPS64: division by zero");
+                }
+                _cpu.hi = uint64(int64(_rs) % int64(_rt));
+                _cpu.lo = uint64(int64(_rs) / int64(_rt));
+            }
+            // ddivu
+            else if (_fun == 0x1f) {
+                if (_rt == 0) {
+                    revert("MIPS64: division by zero");
+                }
+                _cpu.hi = _rs % _rt;
+                _cpu.lo = _rs / _rt;
+            }
+
+            // Store the result in the destination register, if applicable
+            if (_storeReg != 0) {
+                _registers[_storeReg] = val;
+            }
+
+            // Update the PC
+            _cpu.pc = _cpu.nextPC;
+            _cpu.nextPC = _cpu.nextPC + 4;
+        }
+    }
+
+    /// @notice Handles a jump instruction, updating the MIPS state PC where needed.
+    /// @param _cpu Holds the state of cpu scalars pc, nextPC, hi, lo.
+    /// @param _registers Holds the current state of the cpu registers.
+    /// @param _linkReg The register to store the link to the instruction after the delay slot instruction.
+    /// @param _dest The destination to jump to.
+    function handleJump(
+        st.CpuScalars memory _cpu,
+        uint64[32] memory _registers,
+        uint64 _linkReg,
+        uint64 _dest
+    )
+        internal
+        pure
+    {
+        unchecked {
+            if (_cpu.nextPC != _cpu.pc + 4) {
+                revert("MIPS64: jump in delay slot");
+            }
+
+            // Update the next PC to the jump destination.
+            uint64 prevPC = _cpu.pc;
+            _cpu.pc = _cpu.nextPC;
+            _cpu.nextPC = _dest;
+
+            // Update the link-register to the instruction after the delay slot instruction.
+            if (_linkReg != 0) {
+                _registers[_linkReg] = prevPC + 8;
+            }
+        }
+    }
+
+    /// @notice Handles a storing a value into a register.
+    /// @param _cpu Holds the state of cpu scalars pc, nextPC, hi, lo.
+    /// @param _registers Holds the current state of the cpu registers.
+    /// @param _storeReg The register to store the value into.
+    /// @param _val The value to store.
+    /// @param _conditional Whether or not the store is conditional.
+    function handleRd(
+        st.CpuScalars memory _cpu,
+        uint64[32] memory _registers,
+        uint64 _storeReg,
+        uint64 _val,
+        bool _conditional
+    )
+        internal
+        pure
+    {
+        unchecked {
+            // The destination register must be valid.
+            require(_storeReg < 32, "MIPS64: valid register");
+
+            // Never write to reg 0, and it can be conditional (movz, movn).
+            if (_storeReg != 0 && _conditional) {
+                _registers[_storeReg] = _val;
+            }
+
+            // Update the PC.
+            _cpu.pc = _cpu.nextPC;
+            _cpu.nextPC = _cpu.nextPC + 4;
+        }
+    }
+
+    /// @notice Selects a subword of byteLength size contained in memWord based on the low-order bits of vaddr
+    /// @param _vaddr The virtual address of the the subword.
+    /// @param _memWord The full word to select a subword from.
+    /// @param _byteLength The size of the subword.
+    /// @param _signExtend Whether to sign extend the selected subwrod.
+    function selectSubWord(
+        uint64 _vaddr,
+        uint64 _memWord,
+        uint64 _byteLength,
+        bool _signExtend
+    )
+        internal
+        pure
+        returns (uint64 retval_)
+    {
+        (uint64 dataMask, uint64 bitOffset, uint64 bitLength) = calculateSubWordMaskAndOffset(_vaddr, _byteLength);
+        retval_ = (_memWord >> bitOffset) & dataMask;
+        if (_signExtend) {
+            retval_ = signExtend(retval_, bitLength);
+        }
+        return retval_;
+    }
+
+    /// @notice Returns a word that has been updated by the specified subword at bit positions determined by the virtual
+    /// address
+    /// @param _vaddr The virtual address of the subword.
+    /// @param _memWord The full word to update.
+    /// @param _byteLength The size of the subword.
+    /// @param _value The subword that updates _memWord.
+    function updateSubWord(
+        uint64 _vaddr,
+        uint64 _memWord,
+        uint64 _byteLength,
+        uint64 _value
+    )
+        internal
+        pure
+        returns (uint64 word_)
+    {
+        (uint64 dataMask, uint64 bitOffset,) = calculateSubWordMaskAndOffset(_vaddr, _byteLength);
+        uint64 subWordValue = dataMask & _value;
+        uint64 memUpdateMask = dataMask << bitOffset;
+        return subWordValue << bitOffset | (~memUpdateMask) & _memWord;
+    }
+
+    function calculateSubWordMaskAndOffset(
+        uint64 _vaddr,
+        uint64 _byteLength
+    )
+        internal
+        pure
+        returns (uint64 dataMask_, uint64 bitOffset_, uint64 bitLength_)
+    {
+        uint64 bitLength = _byteLength << 3;
+        uint64 dataMask = ~uint64(0) >> (arch.WORD_SIZE - bitLength);
+
+        // Figure out sub-word index based on the low-order bits in vaddr
+        uint64 byteIndexMask = _vaddr & arch.EXT_MASK & ~(_byteLength - 1);
+        uint64 maxByteShift = arch.WORD_SIZE_BYTES - _byteLength;
+        uint64 byteIndex = _vaddr & byteIndexMask;
+        uint64 bitOffset = (maxByteShift - byteIndex) << 3;
+
+        return (dataMask, bitOffset, bitLength);
+    }
+}
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
new file mode 100644
index 000000000000..09678148f3e6
--- /dev/null
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { InvalidExitedValue } from "src/cannon/libraries/CannonErrors.sol";
+
+library MIPS64State {
+    struct CpuScalars {
+        uint64 pc;
+        uint64 nextPC;
+        uint64 lo;
+        uint64 hi;
+    }
+
+    function assertExitedIsValid(uint32 _exited) internal pure {
+        if (_exited > 1) {
+            revert InvalidExitedValue();
+        }
+    }
+}
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
new file mode 100644
index 000000000000..d03f04f08620
--- /dev/null
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
+import { MIPS64State as st } from "src/cannon/libraries/MIPS64State.sol";
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { PreimageKeyLib } from "src/cannon/PreimageKeyLib.sol";
+import { MIPS64Arch as arch } from "src/cannon/libraries/MIPS64Arch.sol";
+
+library MIPS64Syscalls {
+    struct SysReadParams {
+        /// @param _a0 The file descriptor.
+        uint64 a0;
+        /// @param _a1 The memory location where data should be read to.
+        uint64 a1;
+        /// @param _a2 The number of bytes to read from the file
+        uint64 a2;
+        /// @param _preimageKey The key of the preimage to read.
+        bytes32 preimageKey;
+        /// @param _preimageOffset The offset of the preimage to read.
+        uint64 preimageOffset;
+        /// @param _localContext The local context for the preimage key.
+        bytes32 localContext;
+        /// @param _oracle The address of the preimage oracle.
+        IPreimageOracle oracle;
+        /// @param _proofOffset The offset of the memory proof in calldata.
+        uint256 proofOffset;
+        /// @param _memRoot The current memory root.
+        bytes32 memRoot;
+    }
+
+    uint64 internal constant U64_MASK = 0xFFffFFffFFffFFff;
+    uint64 internal constant PAGE_ADDR_MASK = 4095;
+    uint64 internal constant PAGE_SIZE = 4096;
+
+    uint32 internal constant SYS_MMAP = 5009;
+    uint32 internal constant SYS_BRK = 5012;
+    uint32 internal constant SYS_CLONE = 5055;
+    uint32 internal constant SYS_EXIT_GROUP = 5205;
+    uint32 internal constant SYS_READ = 5000;
+    uint32 internal constant SYS_WRITE = 5001;
+    uint32 internal constant SYS_FCNTL = 5070;
+    uint32 internal constant SYS_EXIT = 5058;
+    uint32 internal constant SYS_SCHED_YIELD = 5023;
+    uint32 internal constant SYS_GETTID = 5178;
+    uint32 internal constant SYS_FUTEX = 5194;
+    uint32 internal constant SYS_OPEN = 5002;
+    uint32 internal constant SYS_NANOSLEEP = 5034;
+    uint32 internal constant SYS_CLOCKGETTIME = 5222;
+    uint32 internal constant SYS_GETPID = 5038;
+    // no-op syscalls
+    uint32 internal constant SYS_MUNMAP = 5011;
+    uint32 internal constant SYS_GETAFFINITY = 5196;
+    uint32 internal constant SYS_MADVISE = 5027;
+    uint32 internal constant SYS_RTSIGPROCMASK = 5014;
+    uint32 internal constant SYS_SIGALTSTACK = 5129;
+    uint32 internal constant SYS_RTSIGACTION = 5013;
+    uint32 internal constant SYS_PRLIMIT64 = 5297;
+    uint32 internal constant SYS_CLOSE = 5003;
+    uint32 internal constant SYS_PREAD64 = 5016;
+    uint32 internal constant SYS_FSTAT = 5005;
+    //uint32 internal constant SYS_FSTAT64 = 0xFFFFFFFF;  // UndefinedSysNr - not supported by MIPS64
+    uint32 internal constant SYS_OPENAT = 5247;
+    uint32 internal constant SYS_READLINK = 5087;
+    uint32 internal constant SYS_READLINKAT = 5257;
+    uint32 internal constant SYS_IOCTL = 5015;
+    uint32 internal constant SYS_EPOLLCREATE1 = 5285;
+    uint32 internal constant SYS_PIPE2 = 5287;
+    uint32 internal constant SYS_EPOLLCTL = 5208;
+    uint32 internal constant SYS_EPOLLPWAIT = 5272;
+    uint32 internal constant SYS_GETRANDOM = 5313;
+    uint32 internal constant SYS_UNAME = 5061;
+    //uint32 internal constant SYS_STAT64 = 0xFFFFFFFF;  // UndefinedSysNr - not supported by MIPS64
+    uint32 internal constant SYS_GETUID = 5100;
+    uint32 internal constant SYS_GETGID = 5102;
+    //uint32 internal constant SYS_LLSEEK = 0xFFFFFFFF;  // UndefinedSysNr - not supported by MIPS64
+    uint32 internal constant SYS_MINCORE = 5026;
+    uint32 internal constant SYS_TGKILL = 5225;
+    uint32 internal constant SYS_GETRLIMIT = 5095;
+    uint32 internal constant SYS_LSEEK = 5008;
+    // profiling-related syscalls - ignored
+    uint32 internal constant SYS_SETITIMER = 5036;
+    uint32 internal constant SYS_TIMERCREATE = 5216;
+    uint32 internal constant SYS_TIMERSETTIME = 5217;
+    uint32 internal constant SYS_TIMERDELETE = 5220;
+
+    uint32 internal constant FD_STDIN = 0;
+    uint32 internal constant FD_STDOUT = 1;
+    uint32 internal constant FD_STDERR = 2;
+    uint32 internal constant FD_HINT_READ = 3;
+    uint32 internal constant FD_HINT_WRITE = 4;
+    uint32 internal constant FD_PREIMAGE_READ = 5;
+    uint32 internal constant FD_PREIMAGE_WRITE = 6;
+
+    uint64 internal constant SYS_ERROR_SIGNAL = U64_MASK;
+    uint64 internal constant EBADF = 0x9;
+    uint64 internal constant EINVAL = 0x16;
+    uint64 internal constant EAGAIN = 0xb;
+    uint64 internal constant ETIMEDOUT = 0x91;
+
+    uint64 internal constant FUTEX_WAIT_PRIVATE = 128;
+    uint64 internal constant FUTEX_WAKE_PRIVATE = 129;
+    uint64 internal constant FUTEX_TIMEOUT_STEPS = 10000;
+    uint64 internal constant FUTEX_NO_TIMEOUT = type(uint64).max;
+    uint64 internal constant FUTEX_EMPTY_ADDR = U64_MASK;
+
+    uint64 internal constant SCHED_QUANTUM = 100_000;
+    uint64 internal constant HZ = 10_000_000;
+    uint64 internal constant CLOCK_GETTIME_REALTIME_FLAG = 0;
+    uint64 internal constant CLOCK_GETTIME_MONOTONIC_FLAG = 1;
+    /// @notice Start of the data segment.
+    uint64 internal constant PROGRAM_BREAK = 0x00_00_40_00_00_00_00_00;
+    uint64 internal constant HEAP_END = 0x00_00_60_00_00_00_00_00;
+
+    // SYS_CLONE flags
+    uint64 internal constant CLONE_VM = 0x100;
+    uint64 internal constant CLONE_FS = 0x200;
+    uint64 internal constant CLONE_FILES = 0x400;
+    uint64 internal constant CLONE_SIGHAND = 0x800;
+    uint64 internal constant CLONE_PTRACE = 0x2000;
+    uint64 internal constant CLONE_VFORK = 0x4000;
+    uint64 internal constant CLONE_PARENT = 0x8000;
+    uint64 internal constant CLONE_THREAD = 0x10000;
+    uint64 internal constant CLONE_NEWNS = 0x20000;
+    uint64 internal constant CLONE_SYSVSEM = 0x40000;
+    uint64 internal constant CLONE_SETTLS = 0x80000;
+    uint64 internal constant CLONE_PARENTSETTID = 0x100000;
+    uint64 internal constant CLONE_CHILDCLEARTID = 0x200000;
+    uint64 internal constant CLONE_UNTRACED = 0x800000;
+    uint64 internal constant CLONE_CHILDSETTID = 0x1000000;
+    uint64 internal constant CLONE_STOPPED = 0x2000000;
+    uint64 internal constant CLONE_NEWUTS = 0x4000000;
+    uint64 internal constant CLONE_NEWIPC = 0x8000000;
+    uint64 internal constant VALID_SYS_CLONE_FLAGS =
+        CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM | CLONE_THREAD;
+
+    // FYI: https://en.wikibooks.org/wiki/MIPS_Assembly/Register_File
+    //      https://refspecs.linuxfoundation.org/elf/mipsabi.pdf
+    uint32 internal constant REG_V0 = 2;
+    uint32 internal constant REG_A0 = 4;
+    uint32 internal constant REG_A1 = 5;
+    uint32 internal constant REG_A2 = 6;
+    uint32 internal constant REG_A3 = 7;
+
+    // FYI: https://web.archive.org/web/20231223163047/https://www.linux-mips.org/wiki/Syscall
+    uint32 internal constant REG_SYSCALL_NUM = REG_V0;
+    uint32 internal constant REG_SYSCALL_ERRNO = REG_A3;
+    uint32 internal constant REG_SYSCALL_RET1 = REG_V0;
+    uint32 internal constant REG_SYSCALL_PARAM1 = REG_A0;
+    uint32 internal constant REG_SYSCALL_PARAM2 = REG_A1;
+    uint32 internal constant REG_SYSCALL_PARAM3 = REG_A2;
+    uint32 internal constant REG_SYSCALL_PARAM4 = REG_A3;
+
+    // Constants copied from MIPS64Arch for use in Yul
+    uint64 internal constant WORD_SIZE_BYTES = 8;
+    uint64 internal constant EXT_MASK = 0x7;
+
+    /// @notice Extract syscall num and arguments from registers.
+    /// @param _registers The cpu registers.
+    /// @return sysCallNum_ The syscall number.
+    /// @return a0_ The first argument available to the syscall operation.
+    /// @return a1_ The second argument available to the syscall operation.
+    /// @return a2_ The third argument available to the syscall operation.
+    /// @return a3_ The fourth argument available to the syscall operation.
+    function getSyscallArgs(uint64[32] memory _registers)
+        internal
+        pure
+        returns (uint64 sysCallNum_, uint64 a0_, uint64 a1_, uint64 a2_, uint64 a3_)
+    {
+        unchecked {
+            sysCallNum_ = _registers[REG_SYSCALL_NUM];
+
+            a0_ = _registers[REG_SYSCALL_PARAM1];
+            a1_ = _registers[REG_SYSCALL_PARAM2];
+            a2_ = _registers[REG_SYSCALL_PARAM3];
+            a3_ = _registers[REG_SYSCALL_PARAM4];
+
+            return (sysCallNum_, a0_, a1_, a2_, a3_);
+        }
+    }
+
+    /// @notice Like a Linux mmap syscall. Allocates a page from the heap.
+    /// @param _a0 The address for the new mapping
+    /// @param _a1 The size of the new mapping
+    /// @param _heap The current value of the heap pointer
+    /// @return v0_ The address of the new mapping
+    /// @return v1_ Unused error code (0)
+    /// @return newHeap_ The new value for the heap, may be unchanged
+    function handleSysMmap(
+        uint64 _a0,
+        uint64 _a1,
+        uint64 _heap
+    )
+        internal
+        pure
+        returns (uint64 v0_, uint64 v1_, uint64 newHeap_)
+    {
+        unchecked {
+            v1_ = uint64(0);
+            newHeap_ = _heap;
+
+            uint64 sz = _a1;
+            if (sz & PAGE_ADDR_MASK != 0) {
+                // adjust size to align with page size
+                sz += PAGE_SIZE - (sz & PAGE_ADDR_MASK);
+            }
+            if (_a0 == 0) {
+                v0_ = _heap;
+                newHeap_ += sz;
+                // Fail if new heap exceeds memory limit, newHeap overflows to low memory, or sz overflows
+                if (newHeap_ > HEAP_END || newHeap_ < _heap || sz < _a1) {
+                    v0_ = SYS_ERROR_SIGNAL;
+                    v1_ = EINVAL;
+                    return (v0_, v1_, _heap);
+                }
+            } else {
+                v0_ = _a0;
+            }
+
+            return (v0_, v1_, newHeap_);
+        }
+    }
+
+    /// @notice Like a Linux read syscall. Splits unaligned reads into aligned reads.
+    ///         Args are provided as a struct to reduce stack pressure.
+    /// @return v0_ The number of bytes read, -1 on error.
+    /// @return v1_ The error code, 0 if there is no error.
+    /// @return newPreimageOffset_ The new value for the preimage offset.
+    /// @return newMemRoot_ The new memory root.
+    function handleSysRead(SysReadParams memory _args)
+        internal
+        view
+        returns (
+            uint64 v0_,
+            uint64 v1_,
+            uint64 newPreimageOffset_,
+            bytes32 newMemRoot_,
+            bool memUpdated_,
+            uint64 memAddr_
+        )
+    {
+        unchecked {
+            v0_ = uint64(0);
+            v1_ = uint64(0);
+            newMemRoot_ = _args.memRoot;
+            newPreimageOffset_ = _args.preimageOffset;
+            memUpdated_ = false;
+            memAddr_ = 0;
+
+            // args: _a0 = fd, _a1 = addr, _a2 = count
+            // returns: v0_ = read, v1_ = err code
+            if (_args.a0 == FD_STDIN) {
+                // Leave v0_ and v1_ zero: read nothing, no error
+            }
+            // pre-image oracle read
+            else if (_args.a0 == FD_PREIMAGE_READ) {
+                uint64 effAddr = _args.a1 & arch.ADDRESS_MASK;
+                // verify proof is correct, and get the existing memory.
+                // mask the addr to align it to 4 bytes
+                uint64 mem = MIPS64Memory.readMem(_args.memRoot, effAddr, _args.proofOffset);
+                // If the preimage key is a local key, localize it in the context of the caller.
+                if (uint8(_args.preimageKey[0]) == 1) {
+                    _args.preimageKey = PreimageKeyLib.localize(_args.preimageKey, _args.localContext);
+                }
+                (bytes32 dat, uint256 datLen) = _args.oracle.readPreimage(_args.preimageKey, _args.preimageOffset);
+
+                // Transform data for writing to memory
+                // We use assembly for more precise ops, and no var count limit
+                uint64 a1 = _args.a1;
+                uint64 a2 = _args.a2;
+                assembly {
+                    let alignment := and(a1, EXT_MASK) // the read might not start at an aligned address
+                    let space := sub(WORD_SIZE_BYTES, alignment) // remaining space in memory word
+                    if lt(space, datLen) { datLen := space } // if less space than data, shorten data
+                    if lt(a2, datLen) { datLen := a2 } // if requested to read less, read less
+                    dat := shr(sub(256, mul(datLen, 8)), dat) // right-align data
+                    // position data to insert into memory word
+                    dat := shl(mul(sub(sub(WORD_SIZE_BYTES, datLen), alignment), 8), dat)
+                    // mask all bytes after start
+                    let mask := sub(shl(mul(sub(WORD_SIZE_BYTES, alignment), 8), 1), 1)
+                    // mask of all bytes
+                    let suffixMask := sub(shl(mul(sub(sub(WORD_SIZE_BYTES, alignment), datLen), 8), 1), 1)
+                    // starting from end, maybe none
+                    mask := and(mask, not(suffixMask)) // reduce mask to just cover the data we insert
+                    mem := or(and(mem, not(mask)), dat) // clear masked part of original memory, and insert data
+                }
+
+                // Write memory back
+                newMemRoot_ = MIPS64Memory.writeMem(effAddr, _args.proofOffset, mem);
+                memUpdated_ = true;
+                memAddr_ = effAddr;
+                newPreimageOffset_ += uint64(datLen);
+                v0_ = uint64(datLen);
+            }
+            // hint response
+            else if (_args.a0 == FD_HINT_READ) {
+                // Don't read into memory, just say we read it all
+                // The result is ignored anyway
+                v0_ = _args.a2;
+            } else {
+                v0_ = U64_MASK;
+                v1_ = EBADF;
+            }
+
+            return (v0_, v1_, newPreimageOffset_, newMemRoot_, memUpdated_, memAddr_);
+        }
+    }
+
+    /// @notice Like a Linux write syscall. Splits unaligned writes into aligned writes.
+    /// @param _a0 The file descriptor.
+    /// @param _a1 The memory address to read from.
+    /// @param _a2 The number of bytes to read.
+    /// @param _preimageKey The current preimaageKey.
+    /// @param _preimageOffset The current preimageOffset.
+    /// @param _proofOffset The offset of the memory proof in calldata.
+    /// @param _memRoot The current memory root.
+    /// @return v0_ The number of bytes written, or -1 on error.
+    /// @return v1_ The error code, or 0 if empty.
+    /// @return newPreimageKey_ The new preimageKey.
+    /// @return newPreimageOffset_ The new preimageOffset.
+    function handleSysWrite(
+        uint64 _a0,
+        uint64 _a1,
+        uint64 _a2,
+        bytes32 _preimageKey,
+        uint64 _preimageOffset,
+        uint256 _proofOffset,
+        bytes32 _memRoot
+    )
+        internal
+        pure
+        returns (uint64 v0_, uint64 v1_, bytes32 newPreimageKey_, uint64 newPreimageOffset_)
+    {
+        unchecked {
+            // args: _a0 = fd, _a1 = addr, _a2 = count
+            // returns: v0_ = written, v1_ = err code
+            v0_ = uint64(0);
+            v1_ = uint64(0);
+            newPreimageKey_ = _preimageKey;
+            newPreimageOffset_ = _preimageOffset;
+
+            if (_a0 == FD_STDOUT || _a0 == FD_STDERR || _a0 == FD_HINT_WRITE) {
+                v0_ = _a2; // tell program we have written everything
+            }
+            // pre-image oracle
+            else if (_a0 == FD_PREIMAGE_WRITE) {
+                // mask the addr to align it to 4 bytes
+                uint64 mem = MIPS64Memory.readMem(_memRoot, _a1 & arch.ADDRESS_MASK, _proofOffset);
+                bytes32 key = _preimageKey;
+
+                // Construct pre-image key from memory
+                // We use assembly for more precise ops, and no var count limit
+                assembly {
+                    let alignment := and(_a1, EXT_MASK) // the read might not start at an aligned address
+                    let space := sub(WORD_SIZE_BYTES, alignment) // remaining space in memory word
+                    if lt(space, _a2) { _a2 := space } // if less space than data, shorten data
+                    key := shl(mul(_a2, 8), key) // shift key, make space for new info
+                    let mask := sub(shl(mul(_a2, 8), 1), 1) // mask for extracting value from memory
+                    mem := and(shr(mul(sub(space, _a2), 8), mem), mask) // align value to right, mask it
+                    key := or(key, mem) // insert into key
+                }
+
+                // Write pre-image key to oracle
+                newPreimageKey_ = key;
+                newPreimageOffset_ = 0; // reset offset, to read new pre-image data from the start
+                v0_ = _a2;
+            } else {
+                v0_ = U64_MASK;
+                v1_ = EBADF;
+            }
+
+            return (v0_, v1_, newPreimageKey_, newPreimageOffset_);
+        }
+    }
+
+    /// @notice Like Linux fcntl (file control) syscall, but only supports minimal file-descriptor control commands, to
+    /// retrieve the file-descriptor R/W flags.
+    /// @param _a0 The file descriptor.
+    /// @param _a1 The control command.
+    /// @param v0_ The file status flag (only supported commands are F_GETFD and F_GETFL), or -1 on error.
+    /// @param v1_ An error number, or 0 if there is no error.
+    function handleSysFcntl(uint64 _a0, uint64 _a1) internal pure returns (uint64 v0_, uint64 v1_) {
+        unchecked {
+            v0_ = uint64(0);
+            v1_ = uint64(0);
+
+            // args: _a0 = fd, _a1 = cmd
+            if (_a1 == 1) {
+                // F_GETFD: get file descriptor flags
+                if (
+                    _a0 == FD_STDIN || _a0 == FD_STDOUT || _a0 == FD_STDERR || _a0 == FD_PREIMAGE_READ
+                        || _a0 == FD_HINT_READ || _a0 == FD_PREIMAGE_WRITE || _a0 == FD_HINT_WRITE
+                ) {
+                    v0_ = 0; // No flags set
+                } else {
+                    v0_ = U64_MASK;
+                    v1_ = EBADF;
+                }
+            } else if (_a1 == 3) {
+                // F_GETFL: get file status flags
+                if (_a0 == FD_STDIN || _a0 == FD_PREIMAGE_READ || _a0 == FD_HINT_READ) {
+                    v0_ = 0; // O_RDONLY
+                } else if (_a0 == FD_STDOUT || _a0 == FD_STDERR || _a0 == FD_PREIMAGE_WRITE || _a0 == FD_HINT_WRITE) {
+                    v0_ = 1; // O_WRONLY
+                } else {
+                    v0_ = U64_MASK;
+                    v1_ = EBADF;
+                }
+            } else {
+                v0_ = U64_MASK;
+                v1_ = EINVAL; // cmd not recognized by this kernel
+            }
+
+            return (v0_, v1_);
+        }
+    }
+
+    function handleSyscallUpdates(
+        st.CpuScalars memory _cpu,
+        uint64[32] memory _registers,
+        uint64 _v0,
+        uint64 _v1
+    )
+        internal
+        pure
+    {
+        unchecked {
+            // Write the results back to the state registers
+            _registers[REG_SYSCALL_RET1] = _v0;
+            _registers[REG_SYSCALL_ERRNO] = _v1;
+
+            // Update the PC and nextPC
+            _cpu.pc = _cpu.nextPC;
+            _cpu.nextPC = _cpu.nextPC + 4;
+        }
+    }
+}

From a68e3ef430383f90001eb3761db492564e3aa2ca Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 30 Oct 2024 13:58:01 -0600
Subject: [PATCH 080/451] op-deployer: Support overriding proof parameters
 (#12732)

* op-deployer: Support overriding proof parameters

This PR adds support for overiding proofs params using the `GlobalDeployOverrides` and `DeployOverrides` fields. Previously, these values were hardcoded. To prevent a recursive import, I refactored the `standard.go` file into a standalone package.

Closes https://github.com/ethereum-optimism/optimism/issues/12711.

* import cycle

* add tests, ability to disable post-checks

* rename to dangerously

* op-deployer: Add support for deploying interop chains

* code review updates
---
 op-chain-ops/interopgen/deploy.go             |   4 +-
 op-chain-ops/interopgen/recipe.go             |   4 +-
 op-deployer/pkg/deployer/bootstrap/flags.go   |  51 ++++-
 .../bootstrap/{bootstrap.go => opcm.go}       |  53 +++++-
 op-deployer/pkg/deployer/init.go              |   1 +
 .../deployer/integration_test/apply_test.go   | 178 +++++++++++++++++-
 .../pkg/deployer/opcm/artifacts_locator.go    |  12 +-
 op-deployer/pkg/deployer/opcm/opchain.go      |  13 +-
 op-deployer/pkg/deployer/opcm/standard.go     | 144 --------------
 .../pkg/deployer/pipeline/downloader.go       |   4 +-
 .../pkg/deployer/pipeline/implementations.go  |  43 ++++-
 op-deployer/pkg/deployer/pipeline/init.go     |   9 +-
 op-deployer/pkg/deployer/pipeline/opchain.go  |  80 +++++---
 .../standard-versions-mainnet.toml            |   0
 .../standard-versions-sepolia.toml            |   0
 op-deployer/pkg/deployer/standard/standard.go | 159 ++++++++++++++++
 .../pkg/deployer/state/deploy_config.go       |  41 +---
 op-deployer/pkg/deployer/state/intent.go      |   8 +-
 op-service/jsonutil/merge.go                  |  37 ++++
 .../jsonutil/merge_test.go                    |   4 +-
 .../scripts/deploy/DeployOPChain.s.sol        |  15 ++
 .../test/opcm/DeployOPChain.t.sol             |  38 ++++
 22 files changed, 654 insertions(+), 244 deletions(-)
 rename op-deployer/pkg/deployer/bootstrap/{bootstrap.go => opcm.go} (74%)
 delete mode 100644 op-deployer/pkg/deployer/opcm/standard.go
 rename op-deployer/pkg/deployer/{opcm => standard}/standard-versions-mainnet.toml (100%)
 rename op-deployer/pkg/deployer/{opcm => standard}/standard-versions-sepolia.toml (100%)
 create mode 100644 op-deployer/pkg/deployer/standard/standard.go
 create mode 100644 op-service/jsonutil/merge.go
 rename op-deployer/pkg/deployer/state/deploy_config_test.go => op-service/jsonutil/merge_test.go (91%)

diff --git a/op-chain-ops/interopgen/deploy.go b/op-chain-ops/interopgen/deploy.go
index 83c241fdc013..fb1e71537d55 100644
--- a/op-chain-ops/interopgen/deploy.go
+++ b/op-chain-ops/interopgen/deploy.go
@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -173,7 +175,7 @@ func DeploySuperchainToL1(l1Host *script.Host, superCfg *SuperchainConfig) (*Sup
 		ProtocolVersionsProxy:           superDeployment.ProtocolVersionsProxy,
 		OpcmProxyOwner:                  superDeployment.SuperchainProxyAdmin,
 		UseInterop:                      superCfg.Implementations.UseInterop,
-		StandardVersionsToml:            opcm.StandardVersionsMainnetData,
+		StandardVersionsToml:            standard.VersionsMainnetData,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy Implementations contracts: %w", err)
diff --git a/op-chain-ops/interopgen/recipe.go b/op-chain-ops/interopgen/recipe.go
index fb76709be663..85f429eb793a 100644
--- a/op-chain-ops/interopgen/recipe.go
+++ b/op-chain-ops/interopgen/recipe.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -79,7 +79,7 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
 				MipsVersion:                     big.NewInt(1),
 			},
 			UseInterop:           true,
-			StandardVersionsToml: opcm.StandardVersionsMainnetData,
+			StandardVersionsToml: standard.VersionsMainnetData,
 		},
 		SuperchainL1DeployConfig: genesis.SuperchainL1DeployConfig{
 			RequiredProtocolVersion:    params.OPStackSupport,
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index b76b798b5b0f..d0c9eb5e2ce2 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -2,12 +2,19 @@ package bootstrap
 
 import (
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
 	"github.com/urfave/cli/v2"
 )
 
 const (
-	ArtifactsLocatorFlagName = "artifacts-locator"
+	ArtifactsLocatorFlagName                = "artifacts-locator"
+	WithdrawalDelaySecondsFlagName          = "withdrawal-delay-seconds"
+	MinProposalSizeBytesFlagName            = "min-proposal-size-bytes"
+	ChallengePeriodSecondsFlagName          = "challenge-period-seconds"
+	ProofMaturityDelaySecondsFlagName       = "proof-maturity-delay-seconds"
+	DisputeGameFinalityDelaySecondsFlagName = "dispute-game-finality-delay-seconds"
+	MIPSVersionFlagName                     = "mips-version"
 )
 
 var (
@@ -16,12 +23,54 @@ var (
 		Usage:   "Locator for artifacts.",
 		EnvVars: deployer.PrefixEnvVar("ARTIFACTS_LOCATOR"),
 	}
+	WithdrawalDelaySecondsFlag = &cli.Uint64Flag{
+		Name:    WithdrawalDelaySecondsFlagName,
+		Usage:   "Withdrawal delay in seconds.",
+		EnvVars: deployer.PrefixEnvVar("WITHDRAWAL_DELAY_SECONDS"),
+		Value:   standard.WithdrawalDelaySeconds,
+	}
+	MinProposalSizeBytesFlag = &cli.Uint64Flag{
+		Name:    MinProposalSizeBytesFlagName,
+		Usage:   "Minimum proposal size in bytes.",
+		EnvVars: deployer.PrefixEnvVar("MIN_PROPOSAL_SIZE_BYTES"),
+		Value:   standard.MinProposalSizeBytes,
+	}
+	ChallengePeriodSecondsFlag = &cli.Uint64Flag{
+		Name:    ChallengePeriodSecondsFlagName,
+		Usage:   "Challenge period in seconds.",
+		EnvVars: deployer.PrefixEnvVar("CHALLENGE_PERIOD_SECONDS"),
+		Value:   standard.ChallengePeriodSeconds,
+	}
+	ProofMaturityDelaySecondsFlag = &cli.Uint64Flag{
+		Name:    ProofMaturityDelaySecondsFlagName,
+		Usage:   "Proof maturity delay in seconds.",
+		EnvVars: deployer.PrefixEnvVar("PROOF_MATURITY_DELAY_SECONDS"),
+		Value:   standard.ProofMaturityDelaySeconds,
+	}
+	DisputeGameFinalityDelaySecondsFlag = &cli.Uint64Flag{
+		Name:    DisputeGameFinalityDelaySecondsFlagName,
+		Usage:   "Dispute game finality delay in seconds.",
+		EnvVars: deployer.PrefixEnvVar("DISPUTE_GAME_FINALITY_DELAY_SECONDS"),
+		Value:   standard.DisputeGameFinalityDelaySeconds,
+	}
+	MIPSVersionFlag = &cli.Uint64Flag{
+		Name:    MIPSVersionFlagName,
+		Usage:   "MIPS version.",
+		EnvVars: deployer.PrefixEnvVar("MIPS_VERSION"),
+		Value:   standard.MIPSVersion,
+	}
 )
 
 var OPCMFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
 	ArtifactsLocatorFlag,
+	WithdrawalDelaySecondsFlag,
+	MinProposalSizeBytesFlag,
+	ChallengePeriodSecondsFlag,
+	ProofMaturityDelaySecondsFlag,
+	DisputeGameFinalityDelaySecondsFlag,
+	MIPSVersionFlag,
 }
 
 var Commands = []*cli.Command{
diff --git a/op-deployer/pkg/deployer/bootstrap/bootstrap.go b/op-deployer/pkg/deployer/bootstrap/opcm.go
similarity index 74%
rename from op-deployer/pkg/deployer/bootstrap/bootstrap.go
rename to op-deployer/pkg/deployer/bootstrap/opcm.go
index 8bc61698e2a7..4b792ef92160 100644
--- a/op-deployer/pkg/deployer/bootstrap/bootstrap.go
+++ b/op-deployer/pkg/deployer/bootstrap/opcm.go
@@ -8,6 +8,8 @@ import (
 	"math/big"
 	"strings"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
@@ -28,6 +30,8 @@ import (
 )
 
 type OPCMConfig struct {
+	pipeline.SuperchainProofParams
+
 	L1RPCUrl         string
 	PrivateKey       string
 	Logger           log.Logger
@@ -59,6 +63,30 @@ func (c *OPCMConfig) Check() error {
 		return fmt.Errorf("artifacts locator must be specified")
 	}
 
+	if c.WithdrawalDelaySeconds == 0 {
+		c.WithdrawalDelaySeconds = standard.WithdrawalDelaySeconds
+	}
+
+	if c.MinProposalSizeBytes == 0 {
+		c.MinProposalSizeBytes = standard.MinProposalSizeBytes
+	}
+
+	if c.ChallengePeriodSeconds == 0 {
+		c.ChallengePeriodSeconds = standard.ChallengePeriodSeconds
+	}
+
+	if c.ProofMaturityDelaySeconds == 0 {
+		c.ProofMaturityDelaySeconds = standard.ProofMaturityDelaySeconds
+	}
+
+	if c.DisputeGameFinalityDelaySeconds == 0 {
+		c.DisputeGameFinalityDelaySeconds = standard.DisputeGameFinalityDelaySeconds
+	}
+
+	if c.MIPSVersion == 0 {
+		c.MIPSVersion = standard.MIPSVersion
+	}
+
 	return nil
 }
 
@@ -82,6 +110,14 @@ func OPCMCLI(cliCtx *cli.Context) error {
 		PrivateKey:       privateKey,
 		Logger:           l,
 		ArtifactsLocator: artifactsLocator,
+		SuperchainProofParams: pipeline.SuperchainProofParams{
+			WithdrawalDelaySeconds:          cliCtx.Uint64(WithdrawalDelaySecondsFlagName),
+			MinProposalSizeBytes:            cliCtx.Uint64(MinProposalSizeBytesFlagName),
+			ChallengePeriodSeconds:          cliCtx.Uint64(ChallengePeriodSecondsFlagName),
+			ProofMaturityDelaySeconds:       cliCtx.Uint64(ProofMaturityDelaySecondsFlagName),
+			DisputeGameFinalityDelaySeconds: cliCtx.Uint64(DisputeGameFinalityDelaySecondsFlagName),
+			MIPSVersion:                     cliCtx.Uint64(MIPSVersionFlagName),
+		},
 	})
 }
 
@@ -116,15 +152,15 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 	}
 	chainIDU64 := chainID.Uint64()
 
-	superCfg, err := opcm.SuperchainFor(chainIDU64)
+	superCfg, err := standard.SuperchainFor(chainIDU64)
 	if err != nil {
 		return fmt.Errorf("error getting superchain config: %w", err)
 	}
-	standardVersionsTOML, err := opcm.StandardL1VersionsDataFor(chainIDU64)
+	standardVersionsTOML, err := standard.L1VersionsDataFor(chainIDU64)
 	if err != nil {
 		return fmt.Errorf("error getting standard versions TOML: %w", err)
 	}
-	opcmProxyOwnerAddr, err := opcm.ManagerOwnerAddrFor(chainIDU64)
+	opcmProxyOwnerAddr, err := standard.ManagerOwnerAddrFor(chainIDU64)
 	if err != nil {
 		return fmt.Errorf("error getting superchain proxy admin: %w", err)
 	}
@@ -192,11 +228,12 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 		host,
 		opcm.DeployImplementationsInput{
 			Salt:                            salt,
-			WithdrawalDelaySeconds:          big.NewInt(604800),
-			MinProposalSizeBytes:            big.NewInt(126000),
-			ChallengePeriodSeconds:          big.NewInt(86400),
-			ProofMaturityDelaySeconds:       big.NewInt(604800),
-			DisputeGameFinalityDelaySeconds: big.NewInt(302400),
+			WithdrawalDelaySeconds:          new(big.Int).SetUint64(cfg.WithdrawalDelaySeconds),
+			MinProposalSizeBytes:            new(big.Int).SetUint64(cfg.MinProposalSizeBytes),
+			ChallengePeriodSeconds:          new(big.Int).SetUint64(cfg.ChallengePeriodSeconds),
+			ProofMaturityDelaySeconds:       new(big.Int).SetUint64(cfg.ProofMaturityDelaySeconds),
+			DisputeGameFinalityDelaySeconds: new(big.Int).SetUint64(cfg.DisputeGameFinalityDelaySeconds),
+			MipsVersion:                     new(big.Int).SetUint64(cfg.MIPSVersion),
 			Release:                         release,
 			SuperchainConfigProxy:           superchainConfigAddr,
 			ProtocolVersionsProxy:           protocolVersionsAddr,
diff --git a/op-deployer/pkg/deployer/init.go b/op-deployer/pkg/deployer/init.go
index e8044f75a8c0..6dd26222fb82 100644
--- a/op-deployer/pkg/deployer/init.go
+++ b/op-deployer/pkg/deployer/init.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
 	op_service "github.com/ethereum-optimism/optimism/op-service"
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index e820603dfaf4..cf307c193908 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -14,6 +14,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
@@ -368,10 +370,10 @@ func validateOPChainDeployment(t *testing.T, cg codeGetter, st *state.State, int
 		alloc := chainState.Allocs.Data.Accounts
 
 		chainIntent := intent.Chains[i]
-		checkImmutable(t, alloc, predeploys.BaseFeeVaultAddr, chainIntent.BaseFeeVaultRecipient)
-		checkImmutable(t, alloc, predeploys.L1FeeVaultAddr, chainIntent.L1FeeVaultRecipient)
-		checkImmutable(t, alloc, predeploys.SequencerFeeVaultAddr, chainIntent.SequencerFeeVaultRecipient)
-		checkImmutable(t, alloc, predeploys.OptimismMintableERC721FactoryAddr, common.BigToHash(new(big.Int).SetUint64(intent.L1ChainID)))
+		checkImmutableBehindProxy(t, alloc, predeploys.BaseFeeVaultAddr, chainIntent.BaseFeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.L1FeeVaultAddr, chainIntent.L1FeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.SequencerFeeVaultAddr, chainIntent.SequencerFeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.OptimismMintableERC721FactoryAddr, common.BigToHash(new(big.Int).SetUint64(intent.L1ChainID)))
 
 		// ownership slots
 		var addrAsSlot common.Hash
@@ -399,8 +401,12 @@ type bytesMarshaler interface {
 	Bytes() []byte
 }
 
-func checkImmutable(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) {
+func checkImmutableBehindProxy(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) {
 	implementationAddress := getEIP1967ImplementationAddress(t, allocations, proxyContract)
+	checkImmutable(t, allocations, implementationAddress, thing)
+}
+
+func checkImmutable(t *testing.T, allocations types.GenesisAlloc, implementationAddress common.Address, thing bytesMarshaler) {
 	account, ok := allocations[implementationAddress]
 	require.True(t, ok, "%s not found in allocations", implementationAddress)
 	require.NotEmpty(t, account.Code, "%s should have code", implementationAddress)
@@ -613,6 +619,168 @@ func TestApplyGenesisStrategy(t *testing.T) {
 	}
 }
 
+func TestProofParamOverrides(t *testing.T) {
+	op_e2e.InitParallel(t)
+
+	lgr := testlog.Logger(t, slog.LevelDebug)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	depKey := new(deployerKey)
+	l1ChainID := big.NewInt(77799777)
+	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
+	require.NoError(t, err)
+
+	l2ChainID1 := uint256.NewInt(1)
+
+	deployerAddr, err := dk.Address(depKey)
+	require.NoError(t, err)
+
+	loc := localArtifactsLocator(t)
+
+	env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
+	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
+	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
+	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
+	intent.GlobalDeployOverrides = map[string]any{
+		"withdrawalDelaySeconds":                  standard.WithdrawalDelaySeconds + 1,
+		"minProposalSizeBytes":                    standard.MinProposalSizeBytes + 1,
+		"challengePeriodSeconds":                  standard.ChallengePeriodSeconds + 1,
+		"proofMaturityDelaySeconds":               standard.ProofMaturityDelaySeconds + 1,
+		"disputeGameFinalityDelaySeconds":         standard.DisputeGameFinalityDelaySeconds + 1,
+		"mipsVersion":                             standard.MIPSVersion + 1,
+		"disputeGameType":                         standard.DisputeGameType, // This must be set to the permissioned game
+		"disputeAbsolutePrestate":                 common.Hash{'A', 'B', 'S', 'O', 'L', 'U', 'T', 'E'},
+		"disputeMaxGameDepth":                     standard.DisputeMaxGameDepth + 1,
+		"disputeSplitDepth":                       standard.DisputeSplitDepth + 1,
+		"disputeClockExtension":                   standard.DisputeClockExtension + 1,
+		"disputeMaxClockDuration":                 standard.DisputeMaxClockDuration + 1,
+		"dangerouslyAllowCustomDisputeParameters": true,
+	}
+
+	require.NoError(t, deployer.ApplyPipeline(
+		ctx,
+		env,
+		bundle,
+		intent,
+		st,
+	))
+
+	allocs := st.L1StateDump.Data.Accounts
+	chainState := st.Chains[0]
+
+	uint64Caster := func(t *testing.T, val any) common.Hash {
+		return common.BigToHash(new(big.Int).SetUint64(val.(uint64)))
+	}
+
+	tests := []struct {
+		name    string
+		caster  func(t *testing.T, val any) common.Hash
+		address common.Address
+	}{
+		{
+			"withdrawalDelaySeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.DelayedWETHImplAddress,
+		},
+		{
+			"minProposalSizeBytes",
+			uint64Caster,
+			st.ImplementationsDeployment.PreimageOracleSingletonAddress,
+		},
+		{
+			"challengePeriodSeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.PreimageOracleSingletonAddress,
+		},
+		{
+			"proofMaturityDelaySeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.OptimismPortalImplAddress,
+		},
+		{
+			"disputeGameFinalityDelaySeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.OptimismPortalImplAddress,
+		},
+		{
+			"disputeAbsolutePrestate",
+			func(t *testing.T, val any) common.Hash {
+				return val.(common.Hash)
+			},
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeMaxGameDepth",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeSplitDepth",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeClockExtension",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeMaxClockDuration",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			checkImmutable(t, allocs, tt.address, tt.caster(t, intent.GlobalDeployOverrides[tt.name]))
+		})
+	}
+}
+
+func TestInteropDeployment(t *testing.T) {
+	op_e2e.InitParallel(t)
+
+	lgr := testlog.Logger(t, slog.LevelDebug)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	depKey := new(deployerKey)
+	l1ChainID := big.NewInt(77799777)
+	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
+	require.NoError(t, err)
+
+	l2ChainID1 := uint256.NewInt(1)
+
+	deployerAddr, err := dk.Address(depKey)
+	require.NoError(t, err)
+
+	loc := localArtifactsLocator(t)
+
+	env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
+	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
+	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
+	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
+	intent.UseInterop = true
+
+	require.NoError(t, deployer.ApplyPipeline(
+		ctx,
+		env,
+		bundle,
+		intent,
+		st,
+	))
+
+	chainState := st.Chains[0]
+	depManagerSlot := common.HexToHash("0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c")
+	checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot)
+	proxyAdminOwnerHash := common.BytesToHash(intent.Chains[0].Roles.L1ProxyAdminOwner.Bytes())
+	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, proxyAdminOwnerHash)
+
+}
+
 func TestInvalidL2Genesis(t *testing.T) {
 	op_e2e.InitParallel(t)
 
diff --git a/op-deployer/pkg/deployer/opcm/artifacts_locator.go b/op-deployer/pkg/deployer/opcm/artifacts_locator.go
index 1db025393e62..02a2b60b59fb 100644
--- a/op-deployer/pkg/deployer/opcm/artifacts_locator.go
+++ b/op-deployer/pkg/deployer/opcm/artifacts_locator.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 )
 
 type schemeUnmarshaler func(string) (*ArtifactsLocator, error)
@@ -14,6 +16,14 @@ var schemeUnmarshalerDispatch = map[string]schemeUnmarshaler{
 	"https": unmarshalURL,
 }
 
+var DefaultL1ContractsLocator = &ArtifactsLocator{
+	Tag: standard.DefaultL1ContractsTag,
+}
+
+var DefaultL2ContractsLocator = &ArtifactsLocator{
+	Tag: standard.DefaultL2ContractsTag,
+}
+
 type ArtifactsLocator struct {
 	URL *url.URL
 	Tag string
@@ -61,7 +71,7 @@ func unmarshalTag(tag string) (*ArtifactsLocator, error) {
 		return nil, fmt.Errorf("invalid tag: %s", tag)
 	}
 
-	if _, err := StandardArtifactsURLForTag(tag); err != nil {
+	if _, err := standard.ArtifactsURLForTag(tag); err != nil {
 		return nil, err
 	}
 
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index beefad5f2630..b6bf4fcb6b7c 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -38,12 +38,13 @@ type DeployOPChainInput struct {
 	SaltMixer         string
 	GasLimit          uint64
 
-	DisputeGameType         uint32
-	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     uint64
-	DisputeSplitDepth       uint64
-	DisputeClockExtension   uint64
-	DisputeMaxClockDuration uint64
+	DisputeGameType              uint32
+	DisputeAbsolutePrestate      common.Hash
+	DisputeMaxGameDepth          uint64
+	DisputeSplitDepth            uint64
+	DisputeClockExtension        uint64
+	DisputeMaxClockDuration      uint64
+	AllowCustomDisputeParameters bool
 }
 
 func (input *DeployOPChainInput) InputSet() bool {
diff --git a/op-deployer/pkg/deployer/opcm/standard.go b/op-deployer/pkg/deployer/opcm/standard.go
deleted file mode 100644
index 5d85db942770..000000000000
--- a/op-deployer/pkg/deployer/opcm/standard.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package opcm
-
-import (
-	"embed"
-	"fmt"
-	"net/url"
-
-	"github.com/BurntSushi/toml"
-
-	"github.com/ethereum-optimism/superchain-registry/superchain"
-	"github.com/ethereum/go-ethereum/common"
-)
-
-//go:embed standard-versions-mainnet.toml
-var StandardVersionsMainnetData string
-
-//go:embed standard-versions-sepolia.toml
-var StandardVersionsSepoliaData string
-
-var StandardL1VersionsSepolia StandardL1Versions
-
-var StandardL1VersionsMainnet StandardL1Versions
-
-var DefaultL1ContractsLocator = &ArtifactsLocator{
-	Tag: "op-contracts/v1.6.0",
-}
-
-var DefaultL2ContractsLocator = &ArtifactsLocator{
-	Tag: "op-contracts/v1.7.0-beta.1+l2-contracts",
-}
-
-type StandardL1Versions struct {
-	Releases map[string]StandardL1VersionsReleases `toml:"releases"`
-}
-
-type StandardL1VersionsReleases struct {
-	OptimismPortal               StandardVersionRelease `toml:"optimism_portal"`
-	SystemConfig                 StandardVersionRelease `toml:"system_config"`
-	AnchorStateRegistry          StandardVersionRelease `toml:"anchor_state_registry"`
-	DelayedWETH                  StandardVersionRelease `toml:"delayed_weth"`
-	DisputeGameFactory           StandardVersionRelease `toml:"dispute_game_factory"`
-	FaultDisputeGame             StandardVersionRelease `toml:"fault_dispute_game"`
-	PermissionedDisputeGame      StandardVersionRelease `toml:"permissioned_dispute_game"`
-	MIPS                         StandardVersionRelease `toml:"mips"`
-	PreimageOracle               StandardVersionRelease `toml:"preimage_oracle"`
-	L1CrossDomainMessenger       StandardVersionRelease `toml:"l1_cross_domain_messenger"`
-	L1ERC721Bridge               StandardVersionRelease `toml:"l1_erc721_bridge"`
-	L1StandardBridge             StandardVersionRelease `toml:"l1_standard_bridge"`
-	OptimismMintableERC20Factory StandardVersionRelease `toml:"optimism_mintable_erc20_factory"`
-}
-
-type StandardVersionRelease struct {
-	Version               string         `toml:"version"`
-	ImplementationAddress common.Address `toml:"implementation_address"`
-	Address               common.Address `toml:"address"`
-}
-
-var _ embed.FS
-
-func StandardL1VersionsDataFor(chainID uint64) (string, error) {
-	switch chainID {
-	case 1:
-		return StandardVersionsMainnetData, nil
-	case 11155111:
-		return StandardVersionsSepoliaData, nil
-	default:
-		return "", fmt.Errorf("unsupported chain ID: %d", chainID)
-	}
-}
-
-func StandardL1VersionsFor(chainID uint64) (StandardL1Versions, error) {
-	switch chainID {
-	case 1:
-		return StandardL1VersionsMainnet, nil
-	case 11155111:
-		return StandardL1VersionsSepolia, nil
-	default:
-		return StandardL1Versions{}, fmt.Errorf("unsupported chain ID: %d", chainID)
-	}
-}
-
-func SuperchainFor(chainID uint64) (*superchain.Superchain, error) {
-	switch chainID {
-	case 1:
-		return superchain.Superchains["mainnet"], nil
-	case 11155111:
-		return superchain.Superchains["sepolia"], nil
-	default:
-		return nil, fmt.Errorf("unsupported chain ID: %d", chainID)
-	}
-}
-
-func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
-	switch chainID {
-	case 1:
-		// Generated using the bootstrap command on 10/18/2024.
-		return common.HexToAddress("0x18cec91779995ad14c880e4095456b9147160790"), nil
-	case 11155111:
-		// Generated using the bootstrap command on 10/18/2024.
-		return common.HexToAddress("0xf564eea7960ea244bfebcbbb17858748606147bf"), nil
-	default:
-		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
-	}
-}
-
-func ManagerOwnerAddrFor(chainID uint64) (common.Address, error) {
-	switch chainID {
-	case 1:
-		// Set to superchain proxy admin
-		return common.HexToAddress("0x543bA4AADBAb8f9025686Bd03993043599c6fB04"), nil
-	case 11155111:
-		// Set to development multisig
-		return common.HexToAddress("0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B"), nil
-	default:
-		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
-	}
-}
-
-func StandardArtifactsURLForTag(tag string) (*url.URL, error) {
-	switch tag {
-	case "op-contracts/v1.6.0":
-		return url.Parse(standardArtifactsURL("ee07c78c3d8d4cd8f7a933c050f5afeebaa281b57b226cc6f092b19de2a8d61f"))
-	case "op-contracts/v1.7.0-beta.1+l2-contracts":
-		return url.Parse(standardArtifactsURL("b0fb1f6f674519d637cff39a22187a5993d7f81a6d7b7be6507a0b50a5e38597"))
-	default:
-		return nil, fmt.Errorf("unsupported tag: %s", tag)
-	}
-}
-
-func standardArtifactsURL(checksum string) string {
-	return fmt.Sprintf("https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-%s.tar.gz", checksum)
-}
-
-func init() {
-	StandardL1VersionsMainnet = StandardL1Versions{}
-	if err := toml.Unmarshal([]byte(StandardVersionsMainnetData), &StandardL1VersionsMainnet); err != nil {
-		panic(err)
-	}
-
-	StandardL1VersionsSepolia = StandardL1Versions{}
-	if err := toml.Unmarshal([]byte(StandardVersionsSepoliaData), &StandardL1VersionsSepolia); err != nil {
-		panic(err)
-	}
-}
diff --git a/op-deployer/pkg/deployer/pipeline/downloader.go b/op-deployer/pkg/deployer/pipeline/downloader.go
index 370817e8366a..ffafd6096869 100644
--- a/op-deployer/pkg/deployer/pipeline/downloader.go
+++ b/op-deployer/pkg/deployer/pipeline/downloader.go
@@ -15,6 +15,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
@@ -42,7 +44,7 @@ func DownloadArtifacts(ctx context.Context, loc *opcm.ArtifactsLocator, progress
 	var u *url.URL
 	var err error
 	if loc.IsTag() {
-		u, err = opcm.StandardArtifactsURLForTag(loc.Tag)
+		u, err = standard.ArtifactsURLForTag(loc.Tag)
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to get standard artifacts URL for tag %s: %w", loc.Tag, err)
 		}
diff --git a/op-deployer/pkg/deployer/pipeline/implementations.go b/op-deployer/pkg/deployer/pipeline/implementations.go
index 17628ec605cd..9da1d4a900a5 100644
--- a/op-deployer/pkg/deployer/pipeline/implementations.go
+++ b/op-deployer/pkg/deployer/pipeline/implementations.go
@@ -4,10 +4,22 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 )
 
+type SuperchainProofParams struct {
+	WithdrawalDelaySeconds          uint64 `json:"withdrawalDelaySeconds" toml:"withdrawalDelaySeconds"`
+	MinProposalSizeBytes            uint64 `json:"minProposalSizeBytes" toml:"minProposalSizeBytes"`
+	ChallengePeriodSeconds          uint64 `json:"challengePeriodSeconds" toml:"challengePeriodSeconds"`
+	ProofMaturityDelaySeconds       uint64 `json:"proofMaturityDelaySeconds" toml:"proofMaturityDelaySeconds"`
+	DisputeGameFinalityDelaySeconds uint64 `json:"disputeGameFinalityDelaySeconds" toml:"disputeGameFinalityDelaySeconds"`
+	MIPSVersion                     uint64 `json:"mipsVersion" toml:"mipsVersion"`
+}
+
 func DeployImplementations(env *Env, intent *state.Intent, st *state.State) error {
 	lgr := env.Logger.New("stage", "deploy-implementations")
 
@@ -22,7 +34,7 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 	var contractsRelease string
 	var err error
 	if intent.L1ContractsLocator.IsTag() && intent.DeploymentStrategy == state.DeploymentStrategyLive {
-		standardVersionsTOML, err = opcm.StandardL1VersionsDataFor(intent.L1ChainID)
+		standardVersionsTOML, err = standard.L1VersionsDataFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting standard versions TOML: %w", err)
 		}
@@ -31,24 +43,39 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 		contractsRelease = "dev"
 	}
 
+	proofParams, err := jsonutil.MergeJSON(
+		SuperchainProofParams{
+			WithdrawalDelaySeconds:          standard.WithdrawalDelaySeconds,
+			MinProposalSizeBytes:            standard.MinProposalSizeBytes,
+			ChallengePeriodSeconds:          standard.ChallengePeriodSeconds,
+			ProofMaturityDelaySeconds:       standard.ProofMaturityDelaySeconds,
+			DisputeGameFinalityDelaySeconds: standard.DisputeGameFinalityDelaySeconds,
+			MIPSVersion:                     standard.MIPSVersion,
+		},
+		intent.GlobalDeployOverrides,
+	)
+	if err != nil {
+		return fmt.Errorf("error merging proof params from overrides: %w", err)
+	}
+
 	env.L1ScriptHost.ImportState(st.L1StateDump.Data)
 
 	dio, err := opcm.DeployImplementations(
 		env.L1ScriptHost,
 		opcm.DeployImplementationsInput{
 			Salt:                            st.Create2Salt,
-			WithdrawalDelaySeconds:          big.NewInt(604800),
-			MinProposalSizeBytes:            big.NewInt(126000),
-			ChallengePeriodSeconds:          big.NewInt(86400),
-			ProofMaturityDelaySeconds:       big.NewInt(604800),
-			DisputeGameFinalityDelaySeconds: big.NewInt(302400),
-			MipsVersion:                     big.NewInt(1),
+			WithdrawalDelaySeconds:          new(big.Int).SetUint64(proofParams.WithdrawalDelaySeconds),
+			MinProposalSizeBytes:            new(big.Int).SetUint64(proofParams.MinProposalSizeBytes),
+			ChallengePeriodSeconds:          new(big.Int).SetUint64(proofParams.ChallengePeriodSeconds),
+			ProofMaturityDelaySeconds:       new(big.Int).SetUint64(proofParams.ProofMaturityDelaySeconds),
+			DisputeGameFinalityDelaySeconds: new(big.Int).SetUint64(proofParams.DisputeGameFinalityDelaySeconds),
+			MipsVersion:                     new(big.Int).SetUint64(proofParams.MIPSVersion),
 			Release:                         contractsRelease,
 			SuperchainConfigProxy:           st.SuperchainDeployment.SuperchainConfigProxyAddress,
 			ProtocolVersionsProxy:           st.SuperchainDeployment.ProtocolVersionsProxyAddress,
 			OpcmProxyOwner:                  st.SuperchainDeployment.ProxyAdminAddress,
 			StandardVersionsToml:            standardVersionsTOML,
-			UseInterop:                      false,
+			UseInterop:                      intent.UseInterop,
 		},
 	)
 	if err != nil {
diff --git a/op-deployer/pkg/deployer/pipeline/init.go b/op-deployer/pkg/deployer/pipeline/init.go
index 9d5f2324fa45..f8b12e36a431 100644
--- a/op-deployer/pkg/deployer/pipeline/init.go
+++ b/op-deployer/pkg/deployer/pipeline/init.go
@@ -5,7 +5,8 @@ import (
 	"crypto/rand"
 	"fmt"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -26,12 +27,12 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 	}
 
 	if intent.L1ContractsLocator.IsTag() {
-		superCfg, err := opcm.SuperchainFor(intent.L1ChainID)
+		superCfg, err := standard.SuperchainFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting superchain config: %w", err)
 		}
 
-		proxyAdmin, err := opcm.ManagerOwnerAddrFor(intent.L1ChainID)
+		proxyAdmin, err := standard.ManagerOwnerAddrFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting superchain proxy admin address: %w", err)
 		}
@@ -44,7 +45,7 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 			SuperchainConfigProxyAddress: common.Address(*superCfg.Config.SuperchainConfigAddr),
 		}
 
-		opcmProxy, err := opcm.ManagerImplementationAddrFor(intent.L1ChainID)
+		opcmProxy, err := standard.ManagerImplementationAddrFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting OPCM proxy address: %w", err)
 		}
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index 5152eca3208a..ebc6c1af0bc8 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -6,6 +6,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
@@ -26,7 +29,10 @@ func DeployOPChainLiveStrategy(ctx context.Context, env *Env, bundle ArtifactsBu
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
-	input := makeDCI(thisIntent, chainID, st)
+	input, err := makeDCI(intent, thisIntent, chainID, st)
+	if err != nil {
+		return fmt.Errorf("error making deploy OP chain input: %w", err)
+	}
 
 	var dco opcm.DeployOPChainOutput
 	lgr.Info("deploying OP chain using existing OPCM", "id", chainID.Hex(), "opcmAddress", st.ImplementationsDeployment.OpcmProxyAddress.Hex())
@@ -152,7 +158,10 @@ func DeployOPChainGenesisStrategy(env *Env, intent *state.Intent, st *state.Stat
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
-	input := makeDCI(thisIntent, chainID, st)
+	input, err := makeDCI(intent, thisIntent, chainID, st)
+	if err != nil {
+		return fmt.Errorf("error making deploy OP chain input: %w", err)
+	}
 
 	env.L1ScriptHost.ImportState(st.L1StateDump.Data)
 
@@ -171,27 +180,54 @@ func DeployOPChainGenesisStrategy(env *Env, intent *state.Intent, st *state.Stat
 	return nil
 }
 
-func makeDCI(thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) opcm.DeployOPChainInput {
-	return opcm.DeployOPChainInput{
-		OpChainProxyAdminOwner:  thisIntent.Roles.L1ProxyAdminOwner,
-		SystemConfigOwner:       thisIntent.Roles.SystemConfigOwner,
-		Batcher:                 thisIntent.Roles.Batcher,
-		UnsafeBlockSigner:       thisIntent.Roles.UnsafeBlockSigner,
-		Proposer:                thisIntent.Roles.Proposer,
-		Challenger:              thisIntent.Roles.Challenger,
-		BasefeeScalar:           1368,
-		BlobBaseFeeScalar:       801949,
-		L2ChainId:               chainID.Big(),
-		OpcmProxy:               st.ImplementationsDeployment.OpcmProxyAddress,
-		SaltMixer:               st.Create2Salt.String(), // passing through salt generated at state initialization
-		GasLimit:                60_000_000,
-		DisputeGameType:         1, // PERMISSIONED_CANNON Game Type
-		DisputeAbsolutePrestate: common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c"),
-		DisputeMaxGameDepth:     73,
-		DisputeSplitDepth:       30,
-		DisputeClockExtension:   10800,  // 3 hours (input in seconds)
-		DisputeMaxClockDuration: 302400, // 3.5 days (input in seconds)
+type ChainProofParams struct {
+	DisputeGameType                         uint32      `json:"disputeGameType" toml:"disputeGameType"`
+	DisputeAbsolutePrestate                 common.Hash `json:"disputeAbsolutePrestate" toml:"disputeAbsolutePrestate"`
+	DisputeMaxGameDepth                     uint64      `json:"disputeMaxGameDepth" toml:"disputeMaxGameDepth"`
+	DisputeSplitDepth                       uint64      `json:"disputeSplitDepth" toml:"disputeSplitDepth"`
+	DisputeClockExtension                   uint64      `json:"disputeClockExtension" toml:"disputeClockExtension"`
+	DisputeMaxClockDuration                 uint64      `json:"disputeMaxClockDuration" toml:"disputeMaxClockDuration"`
+	DangerouslyAllowCustomDisputeParameters bool        `json:"dangerouslyAllowCustomDisputeParameters" toml:"dangerouslyAllowCustomDisputeParameters"`
+}
+
+func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInput, error) {
+	proofParams, err := jsonutil.MergeJSON(
+		ChainProofParams{
+			DisputeGameType:         standard.DisputeGameType,
+			DisputeAbsolutePrestate: standard.DisputeAbsolutePrestate,
+			DisputeMaxGameDepth:     standard.DisputeMaxGameDepth,
+			DisputeSplitDepth:       standard.DisputeSplitDepth,
+			DisputeClockExtension:   standard.DisputeClockExtension,
+			DisputeMaxClockDuration: standard.DisputeMaxClockDuration,
+		},
+		intent.GlobalDeployOverrides,
+		thisIntent.DeployOverrides,
+	)
+	if err != nil {
+		return opcm.DeployOPChainInput{}, fmt.Errorf("error merging proof params from overrides: %w", err)
 	}
+
+	return opcm.DeployOPChainInput{
+		OpChainProxyAdminOwner:       thisIntent.Roles.L1ProxyAdminOwner,
+		SystemConfigOwner:            thisIntent.Roles.SystemConfigOwner,
+		Batcher:                      thisIntent.Roles.Batcher,
+		UnsafeBlockSigner:            thisIntent.Roles.UnsafeBlockSigner,
+		Proposer:                     thisIntent.Roles.Proposer,
+		Challenger:                   thisIntent.Roles.Challenger,
+		BasefeeScalar:                standard.BasefeeScalar,
+		BlobBaseFeeScalar:            standard.BlobBaseFeeScalar,
+		L2ChainId:                    chainID.Big(),
+		OpcmProxy:                    st.ImplementationsDeployment.OpcmProxyAddress,
+		SaltMixer:                    st.Create2Salt.String(), // passing through salt generated at state initialization
+		GasLimit:                     standard.GasLimit,
+		DisputeGameType:              proofParams.DisputeGameType,
+		DisputeAbsolutePrestate:      proofParams.DisputeAbsolutePrestate,
+		DisputeMaxGameDepth:          proofParams.DisputeMaxGameDepth,
+		DisputeSplitDepth:            proofParams.DisputeSplitDepth,
+		DisputeClockExtension:        proofParams.DisputeClockExtension,   // 3 hours (input in seconds)
+		DisputeMaxClockDuration:      proofParams.DisputeMaxClockDuration, // 3.5 days (input in seconds)
+		AllowCustomDisputeParameters: proofParams.DangerouslyAllowCustomDisputeParameters,
+	}, nil
 }
 
 func makeChainState(chainID common.Hash, dco opcm.DeployOPChainOutput) *state.ChainState {
diff --git a/op-deployer/pkg/deployer/opcm/standard-versions-mainnet.toml b/op-deployer/pkg/deployer/standard/standard-versions-mainnet.toml
similarity index 100%
rename from op-deployer/pkg/deployer/opcm/standard-versions-mainnet.toml
rename to op-deployer/pkg/deployer/standard/standard-versions-mainnet.toml
diff --git a/op-deployer/pkg/deployer/opcm/standard-versions-sepolia.toml b/op-deployer/pkg/deployer/standard/standard-versions-sepolia.toml
similarity index 100%
rename from op-deployer/pkg/deployer/opcm/standard-versions-sepolia.toml
rename to op-deployer/pkg/deployer/standard/standard-versions-sepolia.toml
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
new file mode 100644
index 000000000000..ba3031bbe99e
--- /dev/null
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -0,0 +1,159 @@
+package standard
+
+import (
+	"embed"
+	"fmt"
+	"net/url"
+
+	"github.com/BurntSushi/toml"
+
+	"github.com/ethereum-optimism/superchain-registry/superchain"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+const (
+	GasLimit                        uint64 = 60_000_000
+	BasefeeScalar                   uint32 = 1368
+	BlobBaseFeeScalar               uint32 = 801949
+	WithdrawalDelaySeconds          uint64 = 604800
+	MinProposalSizeBytes            uint64 = 126000
+	ChallengePeriodSeconds          uint64 = 86400
+	ProofMaturityDelaySeconds       uint64 = 604800
+	DisputeGameFinalityDelaySeconds uint64 = 302400
+	MIPSVersion                     uint64 = 1
+	DisputeGameType                 uint32 = 1 // PERMISSIONED game type
+	DisputeMaxGameDepth             uint64 = 73
+	DisputeSplitDepth               uint64 = 30
+	DisputeClockExtension           uint64 = 10800
+	DisputeMaxClockDuration         uint64 = 302400
+)
+
+var DisputeAbsolutePrestate = common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c")
+
+//go:embed standard-versions-mainnet.toml
+var VersionsMainnetData string
+
+//go:embed standard-versions-sepolia.toml
+var VersionsSepoliaData string
+
+var L1VersionsSepolia L1Versions
+
+var L1VersionsMainnet L1Versions
+
+var DefaultL1ContractsTag = "op-contracts/v1.6.0"
+
+var DefaultL2ContractsTag = "op-contracts/v1.7.0-beta.1+l2-contracts"
+
+type L1Versions struct {
+	Releases map[string]L1VersionsReleases `toml:"releases"`
+}
+
+type L1VersionsReleases struct {
+	OptimismPortal               VersionRelease `toml:"optimism_portal"`
+	SystemConfig                 VersionRelease `toml:"system_config"`
+	AnchorStateRegistry          VersionRelease `toml:"anchor_state_registry"`
+	DelayedWETH                  VersionRelease `toml:"delayed_weth"`
+	DisputeGameFactory           VersionRelease `toml:"dispute_game_factory"`
+	FaultDisputeGame             VersionRelease `toml:"fault_dispute_game"`
+	PermissionedDisputeGame      VersionRelease `toml:"permissioned_dispute_game"`
+	MIPS                         VersionRelease `toml:"mips"`
+	PreimageOracle               VersionRelease `toml:"preimage_oracle"`
+	L1CrossDomainMessenger       VersionRelease `toml:"l1_cross_domain_messenger"`
+	L1ERC721Bridge               VersionRelease `toml:"l1_erc721_bridge"`
+	L1StandardBridge             VersionRelease `toml:"l1_standard_bridge"`
+	OptimismMintableERC20Factory VersionRelease `toml:"optimism_mintable_erc20_factory"`
+}
+
+type VersionRelease struct {
+	Version               string         `toml:"version"`
+	ImplementationAddress common.Address `toml:"implementation_address"`
+	Address               common.Address `toml:"address"`
+}
+
+var _ embed.FS
+
+func L1VersionsDataFor(chainID uint64) (string, error) {
+	switch chainID {
+	case 1:
+		return VersionsMainnetData, nil
+	case 11155111:
+		return VersionsSepoliaData, nil
+	default:
+		return "", fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
+func L1VersionsFor(chainID uint64) (L1Versions, error) {
+	switch chainID {
+	case 1:
+		return L1VersionsMainnet, nil
+	case 11155111:
+		return L1VersionsSepolia, nil
+	default:
+		return L1Versions{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
+func SuperchainFor(chainID uint64) (*superchain.Superchain, error) {
+	switch chainID {
+	case 1:
+		return superchain.Superchains["mainnet"], nil
+	case 11155111:
+		return superchain.Superchains["sepolia"], nil
+	default:
+		return nil, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
+func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
+	switch chainID {
+	case 1:
+		// Generated using the bootstrap command on 10/18/2024.
+		return common.HexToAddress("0x18cec91779995ad14c880e4095456b9147160790"), nil
+	case 11155111:
+		// Generated using the bootstrap command on 10/18/2024.
+		return common.HexToAddress("0xf564eea7960ea244bfebcbbb17858748606147bf"), nil
+	default:
+		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
+func ManagerOwnerAddrFor(chainID uint64) (common.Address, error) {
+	switch chainID {
+	case 1:
+		// Set to superchain proxy admin
+		return common.HexToAddress("0x543bA4AADBAb8f9025686Bd03993043599c6fB04"), nil
+	case 11155111:
+		// Set to development multisig
+		return common.HexToAddress("0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B"), nil
+	default:
+		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
+func ArtifactsURLForTag(tag string) (*url.URL, error) {
+	switch tag {
+	case "op-contracts/v1.6.0":
+		return url.Parse(standardArtifactsURL("ee07c78c3d8d4cd8f7a933c050f5afeebaa281b57b226cc6f092b19de2a8d61f"))
+	case "op-contracts/v1.7.0-beta.1+l2-contracts":
+		return url.Parse(standardArtifactsURL("b0fb1f6f674519d637cff39a22187a5993d7f81a6d7b7be6507a0b50a5e38597"))
+	default:
+		return nil, fmt.Errorf("unsupported tag: %s", tag)
+	}
+}
+
+func standardArtifactsURL(checksum string) string {
+	return fmt.Sprintf("https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-%s.tar.gz", checksum)
+}
+
+func init() {
+	L1VersionsMainnet = L1Versions{}
+	if err := toml.Unmarshal([]byte(VersionsMainnetData), &L1VersionsMainnet); err != nil {
+		panic(err)
+	}
+
+	L1VersionsSepolia = L1Versions{}
+	if err := toml.Unmarshal([]byte(VersionsSepoliaData), &L1VersionsSepolia); err != nil {
+		panic(err)
+	}
+}
diff --git a/op-deployer/pkg/deployer/state/deploy_config.go b/op-deployer/pkg/deployer/state/deploy_config.go
index 2bc8307ab9d8..534b1292d125 100644
--- a/op-deployer/pkg/deployer/state/deploy_config.go
+++ b/op-deployer/pkg/deployer/state/deploy_config.go
@@ -1,10 +1,11 @@
 package state
 
 import (
-	"encoding/json"
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -135,7 +136,7 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 	// Apply overrides after setting the main values.
 	var err error
 	if len(intent.GlobalDeployOverrides) > 0 {
-		cfg, err = mergeJSON(cfg, intent.GlobalDeployOverrides)
+		cfg, err = jsonutil.MergeJSON(cfg, intent.GlobalDeployOverrides)
 		if err != nil {
 			return genesis.DeployConfig{}, fmt.Errorf("error merging global L2 overrides: %w", err)
 
@@ -143,7 +144,7 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 	}
 
 	if len(chainIntent.DeployOverrides) > 0 {
-		cfg, err = mergeJSON(cfg, chainIntent.DeployOverrides)
+		cfg, err = jsonutil.MergeJSON(cfg, chainIntent.DeployOverrides)
 		if err != nil {
 			return genesis.DeployConfig{}, fmt.Errorf("error merging chain L2 overrides: %w", err)
 		}
@@ -156,40 +157,6 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 	return cfg, nil
 }
 
-// mergeJSON merges the provided overrides into the input struct. Fields
-// must be JSON-serializable for this to work. Overrides are applied in
-// order of precedence - i.e., the last overrides will override keys from
-// all preceding overrides.
-func mergeJSON[T any](in T, overrides ...map[string]any) (T, error) {
-	var out T
-	inJSON, err := json.Marshal(in)
-	if err != nil {
-		return out, err
-	}
-
-	var tmpMap map[string]interface{}
-	if err := json.Unmarshal(inJSON, &tmpMap); err != nil {
-		return out, err
-	}
-
-	for _, override := range overrides {
-		for k, v := range override {
-			tmpMap[k] = v
-		}
-	}
-
-	inJSON, err = json.Marshal(tmpMap)
-	if err != nil {
-		return out, err
-	}
-
-	if err := json.Unmarshal(inJSON, &out); err != nil {
-		return out, err
-	}
-
-	return out, nil
-}
-
 func mustHexBigFromHex(hex string) *hexutil.Big {
 	num := hexutil.MustDecodeBig(hex)
 	hexBig := hexutil.Big(*num)
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index f43e9ff26cae..cbabe37fc8ef 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
 
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
@@ -38,6 +40,8 @@ type Intent struct {
 
 	FundDevAccounts bool `json:"fundDevAccounts" toml:"fundDevAccounts"`
 
+	UseInterop bool `json:"useInterop" toml:"useInterop"`
+
 	L1ContractsLocator *opcm.ArtifactsLocator `json:"l1ContractsLocator" toml:"l1ContractsLocator"`
 
 	L2ContractsLocator *opcm.ArtifactsLocator `json:"l2ContractsLocator" toml:"l2ContractsLocator"`
@@ -102,7 +106,7 @@ func (c *Intent) WriteToFile(path string) error {
 }
 
 func (c *Intent) checkL1Prod() error {
-	versions, err := opcm.StandardL1VersionsFor(c.L1ChainID)
+	versions, err := standard.L1VersionsFor(c.L1ChainID)
 	if err != nil {
 		return err
 	}
@@ -131,7 +135,7 @@ func (c *Intent) checkL1Dev() error {
 }
 
 func (c *Intent) checkL2Prod() error {
-	_, err := opcm.StandardArtifactsURLForTag(c.L2ContractsLocator.Tag)
+	_, err := standard.ArtifactsURLForTag(c.L2ContractsLocator.Tag)
 	return err
 }
 
diff --git a/op-service/jsonutil/merge.go b/op-service/jsonutil/merge.go
new file mode 100644
index 000000000000..8819b2ad1993
--- /dev/null
+++ b/op-service/jsonutil/merge.go
@@ -0,0 +1,37 @@
+package jsonutil
+
+import "encoding/json"
+
+// MergeJSON merges the provided overrides into the input struct. Fields
+// must be JSON-serializable for this to work. Overrides are applied in
+// order of precedence - i.e., the last overrides will override keys from
+// all preceding overrides.
+func MergeJSON[T any](in T, overrides ...map[string]any) (T, error) {
+	var out T
+	inJSON, err := json.Marshal(in)
+	if err != nil {
+		return out, err
+	}
+
+	var tmpMap map[string]interface{}
+	if err := json.Unmarshal(inJSON, &tmpMap); err != nil {
+		return out, err
+	}
+
+	for _, override := range overrides {
+		for k, v := range override {
+			tmpMap[k] = v
+		}
+	}
+
+	inJSON, err = json.Marshal(tmpMap)
+	if err != nil {
+		return out, err
+	}
+
+	if err := json.Unmarshal(inJSON, &out); err != nil {
+		return out, err
+	}
+
+	return out, nil
+}
diff --git a/op-deployer/pkg/deployer/state/deploy_config_test.go b/op-service/jsonutil/merge_test.go
similarity index 91%
rename from op-deployer/pkg/deployer/state/deploy_config_test.go
rename to op-service/jsonutil/merge_test.go
index be431b5740ce..da0a400c651c 100644
--- a/op-deployer/pkg/deployer/state/deploy_config_test.go
+++ b/op-service/jsonutil/merge_test.go
@@ -1,4 +1,4 @@
-package state
+package jsonutil
 
 import (
 	"testing"
@@ -13,7 +13,7 @@ func TestMergeJSON(t *testing.T) {
 		C bool   `json:"c"`
 	}
 
-	out, err := mergeJSON(
+	out, err := MergeJSON(
 		testStruct{
 			"hello",
 			42,
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
index bc83402045d0..7a5d1f5cc6b2 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
@@ -58,6 +58,7 @@ contract DeployOPChainInput is BaseDeployIO {
     uint256 internal _disputeSplitDepth;
     Duration internal _disputeClockExtension;
     Duration internal _disputeMaxClockDuration;
+    bool internal _allowCustomDisputeParameters;
 
     function set(bytes4 _sel, address _addr) public {
         require(_addr != address(0), "DeployOPChainInput: cannot set zero address");
@@ -107,6 +108,11 @@ contract DeployOPChainInput is BaseDeployIO {
         else revert("DeployImplementationsInput: unknown selector");
     }
 
+    function set(bytes4 _sel, bool _value) public {
+        if (_sel == this.allowCustomDisputeParameters.selector) _allowCustomDisputeParameters = _value;
+        else revert("DeployOPChainInput: unknown selector");
+    }
+
     function opChainProxyAdminOwner() public view returns (address) {
         require(_opChainProxyAdminOwner != address(0), "DeployOPChainInput: not set");
         return _opChainProxyAdminOwner;
@@ -206,6 +212,10 @@ contract DeployOPChainInput is BaseDeployIO {
     function disputeMaxClockDuration() public view returns (Duration) {
         return _disputeMaxClockDuration;
     }
+
+    function allowCustomDisputeParameters() public view returns (bool) {
+        return _allowCustomDisputeParameters;
+    }
 }
 
 contract DeployOPChainOutput is BaseDeployIO {
@@ -457,6 +467,11 @@ contract DeployOPChain is Script {
         IPermissionedDisputeGame game = _doo.permissionedDisputeGame();
 
         require(GameType.unwrap(game.gameType()) == GameType.unwrap(GameTypes.PERMISSIONED_CANNON), "DPG-10");
+
+        if (_doi.allowCustomDisputeParameters()) {
+            return;
+        }
+
         // This hex string is the absolutePrestate of the latest op-program release, see where the
         // `EXPECTED_PRESTATE_HASH` is defined in `config.yml`.
         require(
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
index edfe4574bc7c..54e0e456def3 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
@@ -59,6 +59,7 @@ contract DeployOPChainInput_Test is Test {
         doi.set(doi.basefeeScalar.selector, basefeeScalar);
         doi.set(doi.blobBaseFeeScalar.selector, blobBaseFeeScalar);
         doi.set(doi.l2ChainId.selector, l2ChainId);
+        doi.set(doi.allowCustomDisputeParameters.selector, true);
 
         (IProxy opcmProxy) = DeployUtils.buildERC1967ProxyWithImpl("opcmProxy");
         doi.set(doi.opcmProxy.selector, address(opcmProxy));
@@ -74,6 +75,7 @@ contract DeployOPChainInput_Test is Test {
         assertEq(blobBaseFeeScalar, doi.blobBaseFeeScalar(), "900");
         assertEq(l2ChainId, doi.l2ChainId(), "1000");
         assertEq(address(opcmProxy), address(doi.opcmProxy()), "1100");
+        assertEq(true, doi.allowCustomDisputeParameters(), "1200");
     }
 
     function test_getters_whenNotSet_revert() public {
@@ -531,6 +533,42 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         assertEq(address(doo.opChainProxyAdmin().addressManager()), address(doo.addressManager()), "3700");
         assertEq(address(doo.opChainProxyAdmin().owner()), opChainProxyAdminOwner, "3800");
     }
+
+    function test_customDisputeGame_customDisabled_reverts() public {
+        setDOI();
+        doi.set(doi.disputeSplitDepth.selector, disputeSplitDepth + 1);
+        vm.expectRevert("DPG-90");
+        deployOPChain.run(doi, doo);
+    }
+
+    function test_customDisputeGame_customEnabled_doesNotRevert() public {
+        setDOI();
+        doi.set(doi.allowCustomDisputeParameters.selector, true);
+        doi.set(doi.disputeSplitDepth.selector, disputeSplitDepth + 1);
+        deployOPChain.run(doi, doo);
+        assertEq(doo.permissionedDisputeGame().splitDepth(), disputeSplitDepth + 1);
+    }
+
+    function setDOI() internal {
+        doi.set(doi.opChainProxyAdminOwner.selector, opChainProxyAdminOwner);
+        doi.set(doi.systemConfigOwner.selector, systemConfigOwner);
+        doi.set(doi.batcher.selector, batcher);
+        doi.set(doi.unsafeBlockSigner.selector, unsafeBlockSigner);
+        doi.set(doi.proposer.selector, proposer);
+        doi.set(doi.challenger.selector, challenger);
+        doi.set(doi.basefeeScalar.selector, basefeeScalar);
+        doi.set(doi.blobBaseFeeScalar.selector, blobBaseFeeScalar);
+        doi.set(doi.l2ChainId.selector, l2ChainId);
+        doi.set(doi.opcmProxy.selector, address(opcm));
+        doi.set(doi.saltMixer.selector, saltMixer);
+        doi.set(doi.gasLimit.selector, gasLimit);
+        doi.set(doi.disputeGameType.selector, disputeGameType);
+        doi.set(doi.disputeAbsolutePrestate.selector, disputeAbsolutePrestate);
+        doi.set(doi.disputeMaxGameDepth.selector, disputeMaxGameDepth);
+        doi.set(doi.disputeSplitDepth.selector, disputeSplitDepth);
+        doi.set(doi.disputeClockExtension.selector, disputeClockExtension);
+        doi.set(doi.disputeMaxClockDuration.selector, disputeMaxClockDuration);
+    }
 }
 
 contract DeployOPChain_Test_Interop is DeployOPChain_Test {

From aeaee21725b34b0aeacebf9300cff064d6228e05 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 30 Oct 2024 13:38:56 -0700
Subject: [PATCH 081/451] cannon: Avoid page allocation for empty reads
 (#12747)

* cannon: Avoid page allocation for empty reads

* fix end of chunk overlap
---
 cannon/mipsevm/memory/memory.go               | 16 ++++---
 cannon/mipsevm/memory/memory64_test.go        | 45 +++++++++++++++++++
 cannon/mipsevm/memory/memory_test.go          | 45 +++++++++++++++++++
 .../mipsevm/tests/fuzz_evm_common64_test.go   |  6 ---
 4 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/cannon/mipsevm/memory/memory.go b/cannon/mipsevm/memory/memory.go
index e95b40ca5346..1234af4dc4b6 100644
--- a/cannon/mipsevm/memory/memory.go
+++ b/cannon/mipsevm/memory/memory.go
@@ -280,18 +280,22 @@ func (m *Memory) SetMemoryRange(addr Word, r io.Reader) error {
 	for {
 		pageIndex := addr >> PageAddrSize
 		pageAddr := addr & PageAddrMask
-		p, ok := m.pageLookup(pageIndex)
-		if !ok {
-			p = m.AllocPage(pageIndex)
-		}
-		p.InvalidateFull()
-		n, err := r.Read(p.Data[pageAddr:])
+		readLen := PageSize - pageAddr
+		chunk := make([]byte, readLen)
+		n, err := r.Read(chunk)
 		if err != nil {
 			if err == io.EOF {
 				return nil
 			}
 			return err
 		}
+
+		p, ok := m.pageLookup(pageIndex)
+		if !ok {
+			p = m.AllocPage(pageIndex)
+		}
+		p.InvalidateFull()
+		copy(p.Data[pageAddr:], chunk[:n])
 		addr += Word(n)
 	}
 }
diff --git a/cannon/mipsevm/memory/memory64_test.go b/cannon/mipsevm/memory/memory64_test.go
index 38cbfd597ffc..203ff5f80d2f 100644
--- a/cannon/mipsevm/memory/memory64_test.go
+++ b/cannon/mipsevm/memory/memory64_test.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/stretchr/testify/require"
 )
 
@@ -140,6 +141,50 @@ func TestMemory64ReadWrite(t *testing.T) {
 		require.Equal(t, make([]byte, 10), res[len(res)-10:], "empty end")
 	})
 
+	t.Run("empty range", func(t *testing.T) {
+		m := NewMemory()
+		addr := Word(0xAABBCC00)
+		r := bytes.NewReader(nil)
+		pre := m.MerkleRoot()
+		preJSON, err := m.MarshalJSON()
+		require.NoError(t, err)
+		var preSerialized bytes.Buffer
+		require.NoError(t, m.Serialize(&preSerialized))
+
+		require.NoError(t, m.SetMemoryRange(addr, r))
+		v := m.GetWord(0)
+		require.Equal(t, Word(0), v)
+		post := m.MerkleRoot()
+		require.Equal(t, pre, post)
+
+		// Assert that there are no extra zero pages in serialization
+		postJSON, err := m.MarshalJSON()
+		require.NoError(t, err)
+		require.Equal(t, preJSON, postJSON)
+
+		var postSerialized bytes.Buffer
+		require.NoError(t, m.Serialize(&postSerialized))
+		require.Equal(t, preSerialized.Bytes(), postSerialized.Bytes())
+	})
+
+	t.Run("range page overlap", func(t *testing.T) {
+		m := NewMemory()
+		data := bytes.Repeat([]byte{0xAA}, PageAddrSize)
+		require.NoError(t, m.SetMemoryRange(0, bytes.NewReader(data)))
+		for i := 0; i < PageAddrSize/arch.WordSizeBytes; i++ {
+			addr := Word(i * arch.WordSizeBytes)
+			require.Equal(t, Word(0xAAAAAAAA_AAAAAAAA), m.GetWord(addr))
+		}
+
+		data = []byte{0x11, 0x22, 0x33, 0x44}
+		require.NoError(t, m.SetMemoryRange(0, bytes.NewReader(data)))
+		require.Equal(t, Word(0x11223344_AAAAAAAA), m.GetWord(0))
+		for i := 1; i < PageAddrSize/arch.WordSizeBytes; i++ {
+			addr := Word(i * arch.WordSizeBytes)
+			require.Equal(t, Word(0xAAAAAAAA_AAAAAAAA), m.GetWord(addr))
+		}
+	})
+
 	t.Run("read-write", func(t *testing.T) {
 		m := NewMemory()
 		m.SetWord(16, 0xAABBCCDD_EEFF1122)
diff --git a/cannon/mipsevm/memory/memory_test.go b/cannon/mipsevm/memory/memory_test.go
index 3a8bdd364d80..5100de5b4159 100644
--- a/cannon/mipsevm/memory/memory_test.go
+++ b/cannon/mipsevm/memory/memory_test.go
@@ -12,6 +12,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/stretchr/testify/require"
 )
 
@@ -139,6 +140,50 @@ func TestMemoryReadWrite(t *testing.T) {
 		require.Equal(t, make([]byte, 10), res[len(res)-10:], "empty end")
 	})
 
+	t.Run("empty range", func(t *testing.T) {
+		m := NewMemory()
+		addr := Word(0xAABBCC00)
+		r := bytes.NewReader(nil)
+		pre := m.MerkleRoot()
+		preJSON, err := m.MarshalJSON()
+		require.NoError(t, err)
+		var preSerialized bytes.Buffer
+		require.NoError(t, m.Serialize(&preSerialized))
+
+		require.NoError(t, m.SetMemoryRange(addr, r))
+		v := m.GetWord(0)
+		require.Equal(t, Word(0), v)
+		post := m.MerkleRoot()
+		require.Equal(t, pre, post)
+
+		// Assert that there are no extra zero pages in serialization
+		postJSON, err := m.MarshalJSON()
+		require.NoError(t, err)
+		require.Equal(t, preJSON, postJSON)
+
+		var postSerialized bytes.Buffer
+		require.NoError(t, m.Serialize(&postSerialized))
+		require.Equal(t, preSerialized.Bytes(), postSerialized.Bytes())
+	})
+
+	t.Run("range page overlap", func(t *testing.T) {
+		m := NewMemory()
+		data := bytes.Repeat([]byte{0xAA}, PageAddrSize)
+		require.NoError(t, m.SetMemoryRange(0, bytes.NewReader(data)))
+		for i := 0; i < PageAddrSize/arch.WordSizeBytes; i++ {
+			addr := Word(i * arch.WordSizeBytes)
+			require.Equal(t, Word(0xAAAAAAAA), m.GetWord(addr))
+		}
+
+		data = []byte{0x11, 0x22}
+		require.NoError(t, m.SetMemoryRange(0, bytes.NewReader(data)))
+		require.Equal(t, Word(0x1122_AAAA), m.GetWord(0))
+		for i := 1; i < PageAddrSize/arch.WordSizeBytes; i++ {
+			addr := Word(i * arch.WordSizeBytes)
+			require.Equal(t, Word(0xAAAAAAAA), m.GetWord(addr))
+		}
+	})
+
 	t.Run("read-write", func(t *testing.T) {
 		m := NewMemory()
 		m.SetWord(12, 0xAABBCCDD)
diff --git a/cannon/mipsevm/tests/fuzz_evm_common64_test.go b/cannon/mipsevm/tests/fuzz_evm_common64_test.go
index 89aceb41a4e6..d972c3a7ff26 100644
--- a/cannon/mipsevm/tests/fuzz_evm_common64_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_common64_test.go
@@ -91,12 +91,6 @@ func FuzzStateConsistencyMultuOp(f *testing.F) {
 	})
 }
 
-type insn struct {
-	opcode      uint32
-	expectRdReg bool
-	funct       uint32
-}
-
 func mulOpConsistencyCheck(
 	t *testing.T, versions []VersionedVMTestCase,
 	opcode uint32, expectRdReg bool, funct uint32,

From 451224fe4a4f142e0d40512b05cfe537cdec91b9 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 30 Oct 2024 14:13:04 -0700
Subject: [PATCH 082/451] cannon: Update reference for stf-verify (#12752)

---
 cannon/Dockerfile.diff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cannon/Dockerfile.diff b/cannon/Dockerfile.diff
index 6ed17520b702..a158ef9df79b 100644
--- a/cannon/Dockerfile.diff
+++ b/cannon/Dockerfile.diff
@@ -23,7 +23,7 @@ ARG GIT_DATE
 
 ARG TARGETOS TARGETARCH
 
-FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.1.0-alpha.3 AS cannon-v2
+FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.1.0-alpha.4 AS cannon-v2
 
 FROM --platform=$BUILDPLATFORM builder as cannon-verify
 COPY --from=cannon-v2 /usr/local/bin/cannon /usr/local/bin/cannon-v2

From 4e13b20fe2f8b974089d73f565eb6ce6cc261c9b Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 30 Oct 2024 15:44:38 -0600
Subject: [PATCH 083/451] op-deployer: Reduce test code duplication, put test
 funcs first (#12751)

---
 .../deployer/integration_test/apply_test.go   | 1092 ++++++++---------
 1 file changed, 506 insertions(+), 586 deletions(-)

diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index cf307c193908..af240aeffa73 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -14,10 +14,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
-
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
@@ -156,336 +155,238 @@ func TestEndToEndApply(t *testing.T) {
 	})
 }
 
-func localArtifactsLocator(t *testing.T) *opcm.ArtifactsLocator {
-	_, testFilename, _, ok := runtime.Caller(0)
-	require.Truef(t, ok, "failed to get test filename")
-	monorepoDir := path.Join(path.Dir(testFilename), "..", "..", "..", "..")
-	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
-	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
-	require.NoError(t, err)
-	loc := &opcm.ArtifactsLocator{
-		URL: artifactsURL,
-	}
-	return loc
-}
+func TestApplyExistingOPCM(t *testing.T) {
+	anvil.Test(t)
 
-func createEnv(
-	t *testing.T,
-	ctx context.Context,
-	lgr log.Logger,
-	l1Client *ethclient.Client,
-	bcaster broadcaster.Broadcaster,
-	deployerAddr common.Address,
-) (*pipeline.Env, pipeline.ArtifactsBundle, *script.Host) {
-	_, testFilename, _, ok := runtime.Caller(0)
-	require.Truef(t, ok, "failed to get test filename")
-	monorepoDir := path.Join(path.Dir(testFilename), "..", "..", "..", "..")
-	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
-	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
-	require.NoError(t, err)
-	artifactsLocator := &opcm.ArtifactsLocator{
-		URL: artifactsURL,
+	forkRPCUrl := os.Getenv("SEPOLIA_RPC_URL")
+	if forkRPCUrl == "" {
+		t.Skip("no fork RPC URL provided")
 	}
 
-	artifactsFS, cleanupArtifacts, err := pipeline.DownloadArtifacts(ctx, artifactsLocator, pipeline.NoopDownloadProgressor)
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, cleanupArtifacts())
-	}()
+	lgr := testlog.Logger(t, slog.LevelDebug)
 
-	host, err := pipeline.DefaultScriptHost(
-		bcaster,
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
+	runner, err := anvil.New(
+		forkRPCUrl,
 		lgr,
-		deployerAddr,
-		artifactsFS,
-		0,
 	)
 	require.NoError(t, err)
 
-	env := &pipeline.Env{
-		StateWriter:  pipeline.NoopStateWriter(),
-		L1ScriptHost: host,
-		L1Client:     l1Client,
-		Broadcaster:  bcaster,
-		Deployer:     deployerAddr,
-		Logger:       lgr,
-	}
+	require.NoError(t, runner.Start(ctx))
+	t.Cleanup(func() {
+		require.NoError(t, runner.Stop())
+	})
 
-	bundle := pipeline.ArtifactsBundle{
-		L1: artifactsFS,
-		L2: artifactsFS,
-	}
+	l1Client, err := ethclient.Dial(runner.RPCUrl())
+	require.NoError(t, err)
 
-	return env, bundle, host
-}
+	l1ChainID := big.NewInt(11155111)
+	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
+	require.NoError(t, err)
+	// index 0 from Anvil's test set
+	priv, err := crypto.HexToECDSA("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
+	require.NoError(t, err)
+	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(priv, l1ChainID))
+	deployerAddr := common.HexToAddress("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266")
 
-func addrFor(t *testing.T, dk *devkeys.MnemonicDevKeys, key devkeys.Key) common.Address {
-	addr, err := dk.Address(key)
+	l2ChainID := uint256.NewInt(1)
+
+	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+		Logger:  lgr,
+		ChainID: l1ChainID,
+		Client:  l1Client,
+		Signer:  signer,
+		From:    deployerAddr,
+	})
 	require.NoError(t, err)
-	return addr
-}
 
-func newIntent(
-	t *testing.T,
-	l1ChainID *big.Int,
-	dk *devkeys.MnemonicDevKeys,
-	l2ChainID *uint256.Int,
-	l1Loc *opcm.ArtifactsLocator,
-	l2Loc *opcm.ArtifactsLocator,
-) (*state.Intent, *state.State) {
-	intent := &state.Intent{
-		DeploymentStrategy: state.DeploymentStrategyLive,
-		L1ChainID:          l1ChainID.Uint64(),
-		SuperchainRoles: &state.SuperchainRoles{
-			ProxyAdminOwner:       addrFor(t, dk, devkeys.L1ProxyAdminOwnerRole.Key(l1ChainID)),
-			ProtocolVersionsOwner: addrFor(t, dk, devkeys.SuperchainDeployerKey.Key(l1ChainID)),
-			Guardian:              addrFor(t, dk, devkeys.SuperchainConfigGuardianKey.Key(l1ChainID)),
-		},
-		FundDevAccounts:    true,
-		L1ContractsLocator: l1Loc,
-		L2ContractsLocator: l2Loc,
-		Chains: []*state.ChainIntent{
-			newChainIntent(t, dk, l1ChainID, l2ChainID),
-		},
-	}
-	st := &state.State{
-		Version: 1,
-	}
-	return intent, st
-}
+	env, bundle, _ := createEnv(t, ctx, lgr, l1Client, bcaster, deployerAddr)
 
-func newChainIntent(t *testing.T, dk *devkeys.MnemonicDevKeys, l1ChainID *big.Int, l2ChainID *uint256.Int) *state.ChainIntent {
-	return &state.ChainIntent{
-		ID:                         l2ChainID.Bytes32(),
-		BaseFeeVaultRecipient:      addrFor(t, dk, devkeys.BaseFeeVaultRecipientRole.Key(l1ChainID)),
-		L1FeeVaultRecipient:        addrFor(t, dk, devkeys.L1FeeVaultRecipientRole.Key(l1ChainID)),
-		SequencerFeeVaultRecipient: addrFor(t, dk, devkeys.SequencerFeeVaultRecipientRole.Key(l1ChainID)),
-		Eip1559Denominator:         50,
-		Eip1559Elasticity:          6,
-		Roles: state.ChainRoles{
-			L1ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
-			L2ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
-			SystemConfigOwner: addrFor(t, dk, devkeys.SystemConfigOwner.Key(l1ChainID)),
-			UnsafeBlockSigner: addrFor(t, dk, devkeys.SequencerP2PRole.Key(l1ChainID)),
-			Batcher:           addrFor(t, dk, devkeys.BatcherRole.Key(l1ChainID)),
-			Proposer:          addrFor(t, dk, devkeys.ProposerRole.Key(l1ChainID)),
-			Challenger:        addrFor(t, dk, devkeys.ChallengerRole.Key(l1ChainID)),
-		},
-	}
-}
+	intent, st := newIntent(
+		t,
+		l1ChainID,
+		dk,
+		l2ChainID,
+		opcm.DefaultL1ContractsLocator,
+		opcm.DefaultL2ContractsLocator,
+	)
 
-type codeGetter func(t *testing.T, addr common.Address) []byte
+	require.NoError(t, deployer.ApplyPipeline(
+		ctx,
+		env,
+		bundle,
+		intent,
+		st,
+	))
 
-func ethClientCodeGetter(ctx context.Context, client *ethclient.Client) codeGetter {
-	return func(t *testing.T, addr common.Address) []byte {
-		code, err := client.CodeAt(ctx, addr, nil)
-		require.NoError(t, err)
-		return code
-	}
+	validateOPChainDeployment(t, ethClientCodeGetter(ctx, l1Client), st, intent)
 }
 
-func stateDumpCodeGetter(st *state.State) codeGetter {
-	return func(t *testing.T, addr common.Address) []byte {
-		acc, ok := st.L1StateDump.Data.Accounts[addr]
-		require.True(t, ok, "no account found for address %s", addr)
-		return acc.Code
+func TestL2BlockTimeOverride(t *testing.T) {
+	op_e2e.InitParallel(t)
+	kurtosisutil.Test(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	env, bundle, intent, st := setupGenesisChain(t)
+	intent.GlobalDeployOverrides = map[string]interface{}{
+		"l2BlockTime": float64(3),
 	}
+
+	require.NoError(t, deployer.ApplyPipeline(
+		ctx,
+		env,
+		bundle,
+		intent,
+		st,
+	))
+
+	cfg, err := state.CombineDeployConfig(intent, intent.Chains[0], st, st.Chains[0])
+	require.NoError(t, err)
+	require.Equal(t, uint64(3), cfg.L2InitializationConfig.L2CoreDeployConfig.L2BlockTime, "L2 block time should be 3 seconds")
 }
 
-func validateSuperchainDeployment(t *testing.T, st *state.State, cg codeGetter) {
-	addrs := []struct {
-		name string
-		addr common.Address
-	}{
-		{"SuperchainProxyAdmin", st.SuperchainDeployment.ProxyAdminAddress},
-		{"SuperchainConfigProxy", st.SuperchainDeployment.SuperchainConfigProxyAddress},
-		{"SuperchainConfigImpl", st.SuperchainDeployment.SuperchainConfigImplAddress},
-		{"ProtocolVersionsProxy", st.SuperchainDeployment.ProtocolVersionsProxyAddress},
-		{"ProtocolVersionsImpl", st.SuperchainDeployment.ProtocolVersionsImplAddress},
-		{"OpcmProxy", st.ImplementationsDeployment.OpcmProxyAddress},
-		{"PreimageOracleSingleton", st.ImplementationsDeployment.PreimageOracleSingletonAddress},
-		{"MipsSingleton", st.ImplementationsDeployment.MipsSingletonAddress},
-	}
-	for _, addr := range addrs {
-		t.Run(addr.name, func(t *testing.T) {
-			code := cg(t, addr.addr)
-			require.NotEmpty(t, code, "contract %s at %s has no code", addr.name, addr.addr)
+func TestApplyGenesisStrategy(t *testing.T) {
+	op_e2e.InitParallel(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	env, bundle, intent, st := setupGenesisChain(t)
+	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
+
+	require.NoError(t, deployer.ApplyPipeline(
+		ctx,
+		env,
+		bundle,
+		intent,
+		st,
+	))
+
+	cg := stateDumpCodeGetter(st)
+	validateSuperchainDeployment(t, st, cg)
+
+	for i := range intent.Chains {
+		t.Run(fmt.Sprintf("chain-%d", i), func(t *testing.T) {
+			validateOPChainDeployment(t, cg, st, intent)
 		})
 	}
 }
 
-func validateOPChainDeployment(t *testing.T, cg codeGetter, st *state.State, intent *state.Intent) {
-	// Validate that the implementation addresses are always set, even in subsequent deployments
-	// that pull from an existing OPCM deployment.
-	implAddrs := []struct {
-		name string
-		addr common.Address
-	}{
-		{"DelayedWETHImplAddress", st.ImplementationsDeployment.DelayedWETHImplAddress},
-		{"OptimismPortalImplAddress", st.ImplementationsDeployment.OptimismPortalImplAddress},
-		{"SystemConfigImplAddress", st.ImplementationsDeployment.SystemConfigImplAddress},
-		{"L1CrossDomainMessengerImplAddress", st.ImplementationsDeployment.L1CrossDomainMessengerImplAddress},
-		{"L1ERC721BridgeImplAddress", st.ImplementationsDeployment.L1ERC721BridgeImplAddress},
-		{"L1StandardBridgeImplAddress", st.ImplementationsDeployment.L1StandardBridgeImplAddress},
-		{"OptimismMintableERC20FactoryImplAddress", st.ImplementationsDeployment.OptimismMintableERC20FactoryImplAddress},
-		{"DisputeGameFactoryImplAddress", st.ImplementationsDeployment.DisputeGameFactoryImplAddress},
-		{"MipsSingletonAddress", st.ImplementationsDeployment.MipsSingletonAddress},
-		{"PreimageOracleSingletonAddress", st.ImplementationsDeployment.PreimageOracleSingletonAddress},
-	}
-	for _, addr := range implAddrs {
-		require.NotEmpty(t, addr.addr, "%s should be set", addr.name)
-		code := cg(t, addr.addr)
-		require.NotEmpty(t, code, "contract %s at %s has no code", addr.name, addr.addr)
-	}
+func TestProofParamOverrides(t *testing.T) {
+	op_e2e.InitParallel(t)
 
-	for i, chainState := range st.Chains {
-		chainAddrs := []struct {
-			name string
-			addr common.Address
-		}{
-			{"ProxyAdminAddress", chainState.ProxyAdminAddress},
-			{"AddressManagerAddress", chainState.AddressManagerAddress},
-			{"L1ERC721BridgeProxyAddress", chainState.L1ERC721BridgeProxyAddress},
-			{"SystemConfigProxyAddress", chainState.SystemConfigProxyAddress},
-			{"OptimismMintableERC20FactoryProxyAddress", chainState.OptimismMintableERC20FactoryProxyAddress},
-			{"L1StandardBridgeProxyAddress", chainState.L1StandardBridgeProxyAddress},
-			{"L1CrossDomainMessengerProxyAddress", chainState.L1CrossDomainMessengerProxyAddress},
-			{"OptimismPortalProxyAddress", chainState.OptimismPortalProxyAddress},
-			{"DisputeGameFactoryProxyAddress", chainState.DisputeGameFactoryProxyAddress},
-			{"AnchorStateRegistryProxyAddress", chainState.AnchorStateRegistryProxyAddress},
-			{"FaultDisputeGameAddress", chainState.FaultDisputeGameAddress},
-			{"PermissionedDisputeGameAddress", chainState.PermissionedDisputeGameAddress},
-			{"DelayedWETHPermissionedGameProxyAddress", chainState.DelayedWETHPermissionedGameProxyAddress},
-			// {"DelayedWETHPermissionlessGameProxyAddress", chainState.DelayedWETHPermissionlessGameProxyAddress},
-		}
-		for _, addr := range chainAddrs {
-			// TODO Delete this `if`` block once FaultDisputeGameAddress is deployed.
-			if addr.name == "FaultDisputeGameAddress" {
-				continue
-			}
-			code := cg(t, addr.addr)
-			require.NotEmpty(t, code, "contract %s at %s for chain %s has no code", addr.name, addr.addr, chainState.ID)
-		}
-
-		alloc := chainState.Allocs.Data.Accounts
-
-		chainIntent := intent.Chains[i]
-		checkImmutableBehindProxy(t, alloc, predeploys.BaseFeeVaultAddr, chainIntent.BaseFeeVaultRecipient)
-		checkImmutableBehindProxy(t, alloc, predeploys.L1FeeVaultAddr, chainIntent.L1FeeVaultRecipient)
-		checkImmutableBehindProxy(t, alloc, predeploys.SequencerFeeVaultAddr, chainIntent.SequencerFeeVaultRecipient)
-		checkImmutableBehindProxy(t, alloc, predeploys.OptimismMintableERC721FactoryAddr, common.BigToHash(new(big.Int).SetUint64(intent.L1ChainID)))
-
-		// ownership slots
-		var addrAsSlot common.Hash
-		addrAsSlot.SetBytes(chainIntent.Roles.L1ProxyAdminOwner.Bytes())
-		// slot 0
-		ownerSlot := common.Hash{}
-		checkStorageSlot(t, alloc, predeploys.ProxyAdminAddr, ownerSlot, addrAsSlot)
-		var defaultGovOwner common.Hash
-		defaultGovOwner.SetBytes(common.HexToAddress("0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAdDEad").Bytes())
-		checkStorageSlot(t, alloc, predeploys.GovernanceTokenAddr, common.Hash{31: 0x0a}, defaultGovOwner)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 
-		require.Equal(t, int(chainIntent.Eip1559Denominator), 50, "EIP1559Denominator should be set")
-		require.Equal(t, int(chainIntent.Eip1559Elasticity), 6, "EIP1559Elasticity should be set")
+	env, bundle, intent, st := setupGenesisChain(t)
+	intent.GlobalDeployOverrides = map[string]any{
+		"withdrawalDelaySeconds":                  standard.WithdrawalDelaySeconds + 1,
+		"minProposalSizeBytes":                    standard.MinProposalSizeBytes + 1,
+		"challengePeriodSeconds":                  standard.ChallengePeriodSeconds + 1,
+		"proofMaturityDelaySeconds":               standard.ProofMaturityDelaySeconds + 1,
+		"disputeGameFinalityDelaySeconds":         standard.DisputeGameFinalityDelaySeconds + 1,
+		"mipsVersion":                             standard.MIPSVersion + 1,
+		"disputeGameType":                         standard.DisputeGameType, // This must be set to the permissioned game
+		"disputeAbsolutePrestate":                 common.Hash{'A', 'B', 'S', 'O', 'L', 'U', 'T', 'E'},
+		"disputeMaxGameDepth":                     standard.DisputeMaxGameDepth + 1,
+		"disputeSplitDepth":                       standard.DisputeSplitDepth + 1,
+		"disputeClockExtension":                   standard.DisputeClockExtension + 1,
+		"disputeMaxClockDuration":                 standard.DisputeMaxClockDuration + 1,
+		"dangerouslyAllowCustomDisputeParameters": true,
 	}
-}
-
-func getEIP1967ImplementationAddress(t *testing.T, allocations types.GenesisAlloc, proxyAddress common.Address) common.Address {
-	storage := allocations[proxyAddress].Storage
-	storageValue := storage[genesis.ImplementationSlot]
-	require.NotEmpty(t, storageValue, "Implementation address for %s should be set", proxyAddress)
-	return common.HexToAddress(storageValue.Hex())
-}
-
-type bytesMarshaler interface {
-	Bytes() []byte
-}
 
-func checkImmutableBehindProxy(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) {
-	implementationAddress := getEIP1967ImplementationAddress(t, allocations, proxyContract)
-	checkImmutable(t, allocations, implementationAddress, thing)
-}
+	require.NoError(t, deployer.ApplyPipeline(
+		ctx,
+		env,
+		bundle,
+		intent,
+		st,
+	))
 
-func checkImmutable(t *testing.T, allocations types.GenesisAlloc, implementationAddress common.Address, thing bytesMarshaler) {
-	account, ok := allocations[implementationAddress]
-	require.True(t, ok, "%s not found in allocations", implementationAddress)
-	require.NotEmpty(t, account.Code, "%s should have code", implementationAddress)
-	require.True(
-		t,
-		bytes.Contains(account.Code, thing.Bytes()),
-		"%s code should contain %s immutable", implementationAddress, hex.EncodeToString(thing.Bytes()),
-	)
-}
+	allocs := st.L1StateDump.Data.Accounts
+	chainState := st.Chains[0]
 
-func checkStorageSlot(t *testing.T, allocs types.GenesisAlloc, address common.Address, slot common.Hash, expected common.Hash) {
-	account, ok := allocs[address]
-	require.True(t, ok, "account not found for address %s", address)
-	value, ok := account.Storage[slot]
-	if expected == (common.Hash{}) {
-		require.False(t, ok, "slot %s for account %s should not be set", slot, address)
-		return
+	uint64Caster := func(t *testing.T, val any) common.Hash {
+		return common.BigToHash(new(big.Int).SetUint64(val.(uint64)))
 	}
-	require.True(t, ok, "slot %s not found for account %s", slot, address)
-	require.Equal(t, expected, value, "slot %s for account %s should be %s", slot, address, expected)
-}
-
-func TestApplyExistingOPCM(t *testing.T) {
-	anvil.Test(t)
 
-	forkRPCUrl := os.Getenv("SEPOLIA_RPC_URL")
-	if forkRPCUrl == "" {
-		t.Skip("no fork RPC URL provided")
+	tests := []struct {
+		name    string
+		caster  func(t *testing.T, val any) common.Hash
+		address common.Address
+	}{
+		{
+			"withdrawalDelaySeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.DelayedWETHImplAddress,
+		},
+		{
+			"minProposalSizeBytes",
+			uint64Caster,
+			st.ImplementationsDeployment.PreimageOracleSingletonAddress,
+		},
+		{
+			"challengePeriodSeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.PreimageOracleSingletonAddress,
+		},
+		{
+			"proofMaturityDelaySeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.OptimismPortalImplAddress,
+		},
+		{
+			"disputeGameFinalityDelaySeconds",
+			uint64Caster,
+			st.ImplementationsDeployment.OptimismPortalImplAddress,
+		},
+		{
+			"disputeAbsolutePrestate",
+			func(t *testing.T, val any) common.Hash {
+				return val.(common.Hash)
+			},
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeMaxGameDepth",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeSplitDepth",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeClockExtension",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+		{
+			"disputeMaxClockDuration",
+			uint64Caster,
+			chainState.PermissionedDisputeGameAddress,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			checkImmutable(t, allocs, tt.address, tt.caster(t, intent.GlobalDeployOverrides[tt.name]))
+		})
 	}
+}
 
-	lgr := testlog.Logger(t, slog.LevelDebug)
+func TestInteropDeployment(t *testing.T) {
+	op_e2e.InitParallel(t)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	runner, err := anvil.New(
-		forkRPCUrl,
-		lgr,
-	)
-	require.NoError(t, err)
-
-	require.NoError(t, runner.Start(ctx))
-	t.Cleanup(func() {
-		require.NoError(t, runner.Stop())
-	})
-
-	l1Client, err := ethclient.Dial(runner.RPCUrl())
-	require.NoError(t, err)
-
-	l1ChainID := big.NewInt(11155111)
-	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
-	require.NoError(t, err)
-	// index 0 from Anvil's test set
-	priv, err := crypto.HexToECDSA("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
-	require.NoError(t, err)
-	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(priv, l1ChainID))
-	deployerAddr := common.HexToAddress("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266")
-
-	l2ChainID := uint256.NewInt(1)
-
-	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
-		Logger:  lgr,
-		ChainID: l1ChainID,
-		Client:  l1Client,
-		Signer:  signer,
-		From:    deployerAddr,
-	})
-	require.NoError(t, err)
-
-	env, bundle, _ := createEnv(t, ctx, lgr, l1Client, bcaster, deployerAddr)
-
-	intent, st := newIntent(
-		t,
-		l1ChainID,
-		dk,
-		l2ChainID,
-		opcm.DefaultL1ContractsLocator,
-		opcm.DefaultL2ContractsLocator,
-	)
+	env, bundle, intent, st := setupGenesisChain(t)
+	intent.UseInterop = true
 
 	require.NoError(t, deployer.ApplyPipeline(
 		ctx,
@@ -495,253 +396,98 @@ func TestApplyExistingOPCM(t *testing.T) {
 		st,
 	))
 
-	validateOPChainDeployment(t, ethClientCodeGetter(ctx, l1Client), st, intent)
+	chainState := st.Chains[0]
+	depManagerSlot := common.HexToHash("0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c")
+	checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot)
+	proxyAdminOwnerHash := common.BytesToHash(intent.Chains[0].Roles.L1ProxyAdminOwner.Bytes())
+	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, proxyAdminOwnerHash)
 }
 
-func TestL2BlockTimeOverride(t *testing.T) {
+func TestInvalidL2Genesis(t *testing.T) {
 	op_e2e.InitParallel(t)
-	kurtosisutil.Test(t)
 
 	lgr := testlog.Logger(t, slog.LevelDebug)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	enclaveCtx := kurtosisutil.StartEnclave(t, ctx, lgr, "github.com/ethpandaops/ethereum-package", TestParams)
-
-	service, err := enclaveCtx.GetServiceContext("el-1-geth-lighthouse")
-	require.NoError(t, err)
-
-	ip := service.GetMaybePublicIPAddress()
-	ports := service.GetPublicPorts()
-	rpcURL := fmt.Sprintf("http://%s:%d", ip, ports["rpc"].GetNumber())
-	l1Client, err := ethclient.Dial(rpcURL)
-	require.NoError(t, err)
-
 	depKey := new(deployerKey)
 	l1ChainID := big.NewInt(77799777)
 	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
 	require.NoError(t, err)
-	pk, err := dk.Secret(depKey)
-	require.NoError(t, err)
-	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(pk, l1ChainID))
 
-	l2ChainID := uint256.NewInt(1)
+	l2ChainID1 := uint256.NewInt(1)
 
 	deployerAddr, err := dk.Address(depKey)
 	require.NoError(t, err)
 
 	loc := localArtifactsLocator(t)
 
-	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
-		Logger:  lgr,
-		ChainID: l1ChainID,
-		Client:  l1Client,
-		Signer:  signer,
-		From:    deployerAddr,
-	})
-	require.NoError(t, err)
-
-	env, bundle, _ := createEnv(t, ctx, lgr, l1Client, bcaster, deployerAddr)
-
-	intent, st := newIntent(
-		t,
-		l1ChainID,
-		dk,
-		l2ChainID,
-		loc,
-		loc,
-	)
-
-	intent.GlobalDeployOverrides = map[string]interface{}{
-		"l2BlockTime": float64(3),
-	}
-
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
-
-	chainIntent, err := intent.Chain(l2ChainID.Bytes32())
-	require.NoError(t, err)
-	chainState, err := st.Chain(l2ChainID.Bytes32())
-	require.NoError(t, err)
-	cfg, err := state.CombineDeployConfig(intent, chainIntent, st, chainState)
-	require.NoError(t, err)
-
-	require.Equal(t, uint64(3), cfg.L2InitializationConfig.L2CoreDeployConfig.L2BlockTime, "L2 block time should be 3 seconds")
-}
-
-func TestApplyGenesisStrategy(t *testing.T) {
-	op_e2e.InitParallel(t)
-
-	lgr := testlog.Logger(t, slog.LevelDebug)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	depKey := new(deployerKey)
-	l1ChainID := big.NewInt(77799777)
-	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
-	require.NoError(t, err)
-
-	l2ChainID1 := uint256.NewInt(1)
-	l2ChainID2 := uint256.NewInt(2)
-
-	deployerAddr, err := dk.Address(depKey)
-	require.NoError(t, err)
-
-	loc := localArtifactsLocator(t)
-
-	env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
-	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
-	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID2))
-	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
-
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
-
-	cg := stateDumpCodeGetter(st)
-	validateSuperchainDeployment(t, st, cg)
-
-	for i := range intent.Chains {
-		t.Run(fmt.Sprintf("chain-%d", i), func(t *testing.T) {
-			validateOPChainDeployment(t, cg, st, intent)
-		})
-	}
-}
-
-func TestProofParamOverrides(t *testing.T) {
-	op_e2e.InitParallel(t)
-
-	lgr := testlog.Logger(t, slog.LevelDebug)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	depKey := new(deployerKey)
-	l1ChainID := big.NewInt(77799777)
-	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
-	require.NoError(t, err)
-
-	l2ChainID1 := uint256.NewInt(1)
-
-	deployerAddr, err := dk.Address(depKey)
-	require.NoError(t, err)
-
-	loc := localArtifactsLocator(t)
-
-	env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
-	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
-	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
-	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
-	intent.GlobalDeployOverrides = map[string]any{
-		"withdrawalDelaySeconds":                  standard.WithdrawalDelaySeconds + 1,
-		"minProposalSizeBytes":                    standard.MinProposalSizeBytes + 1,
-		"challengePeriodSeconds":                  standard.ChallengePeriodSeconds + 1,
-		"proofMaturityDelaySeconds":               standard.ProofMaturityDelaySeconds + 1,
-		"disputeGameFinalityDelaySeconds":         standard.DisputeGameFinalityDelaySeconds + 1,
-		"mipsVersion":                             standard.MIPSVersion + 1,
-		"disputeGameType":                         standard.DisputeGameType, // This must be set to the permissioned game
-		"disputeAbsolutePrestate":                 common.Hash{'A', 'B', 'S', 'O', 'L', 'U', 'T', 'E'},
-		"disputeMaxGameDepth":                     standard.DisputeMaxGameDepth + 1,
-		"disputeSplitDepth":                       standard.DisputeSplitDepth + 1,
-		"disputeClockExtension":                   standard.DisputeClockExtension + 1,
-		"disputeMaxClockDuration":                 standard.DisputeMaxClockDuration + 1,
-		"dangerouslyAllowCustomDisputeParameters": true,
-	}
-
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
-
-	allocs := st.L1StateDump.Data.Accounts
-	chainState := st.Chains[0]
-
-	uint64Caster := func(t *testing.T, val any) common.Hash {
-		return common.BigToHash(new(big.Int).SetUint64(val.(uint64)))
-	}
-
+	// these tests were generated by grepping all usages of the deploy
+	// config in L2Genesis.s.sol.
 	tests := []struct {
-		name    string
-		caster  func(t *testing.T, val any) common.Hash
-		address common.Address
+		name      string
+		overrides map[string]any
 	}{
 		{
-			"withdrawalDelaySeconds",
-			uint64Caster,
-			st.ImplementationsDeployment.DelayedWETHImplAddress,
-		},
-		{
-			"minProposalSizeBytes",
-			uint64Caster,
-			st.ImplementationsDeployment.PreimageOracleSingletonAddress,
-		},
-		{
-			"challengePeriodSeconds",
-			uint64Caster,
-			st.ImplementationsDeployment.PreimageOracleSingletonAddress,
-		},
-		{
-			"proofMaturityDelaySeconds",
-			uint64Caster,
-			st.ImplementationsDeployment.OptimismPortalImplAddress,
-		},
-		{
-			"disputeGameFinalityDelaySeconds",
-			uint64Caster,
-			st.ImplementationsDeployment.OptimismPortalImplAddress,
+			name: "L2 proxy admin owner not set",
+			overrides: map[string]any{
+				"proxyAdminOwner": nil,
+			},
 		},
 		{
-			"disputeAbsolutePrestate",
-			func(t *testing.T, val any) common.Hash {
-				return val.(common.Hash)
+			name: "base fee vault recipient not set",
+			overrides: map[string]any{
+				"baseFeeVaultRecipient": nil,
 			},
-			chainState.PermissionedDisputeGameAddress,
 		},
 		{
-			"disputeMaxGameDepth",
-			uint64Caster,
-			chainState.PermissionedDisputeGameAddress,
+			name: "l1 fee vault recipient not set",
+			overrides: map[string]any{
+				"l1FeeVaultRecipient": nil,
+			},
 		},
 		{
-			"disputeSplitDepth",
-			uint64Caster,
-			chainState.PermissionedDisputeGameAddress,
+			name: "sequencer fee vault recipient not set",
+			overrides: map[string]any{
+				"sequencerFeeVaultRecipient": nil,
+			},
 		},
 		{
-			"disputeClockExtension",
-			uint64Caster,
-			chainState.PermissionedDisputeGameAddress,
+			name: "l1 chain ID not set",
+			overrides: map[string]any{
+				"l1ChainID": nil,
+			},
 		},
 		{
-			"disputeMaxClockDuration",
-			uint64Caster,
-			chainState.PermissionedDisputeGameAddress,
+			name: "l2 chain ID not set",
+			overrides: map[string]any{
+				"l2ChainID": nil,
+			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			checkImmutable(t, allocs, tt.address, tt.caster(t, intent.GlobalDeployOverrides[tt.name]))
+			env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
+			intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
+			intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
+			intent.DeploymentStrategy = state.DeploymentStrategyGenesis
+			intent.GlobalDeployOverrides = tt.overrides
+
+			err := deployer.ApplyPipeline(
+				ctx,
+				env,
+				bundle,
+				intent,
+				st,
+			)
+			require.Error(t, err)
+			require.ErrorContains(t, err, "failed to combine L2 init config")
 		})
 	}
 }
 
-func TestInteropDeployment(t *testing.T) {
-	op_e2e.InitParallel(t)
-
+func setupGenesisChain(t *testing.T) (*pipeline.Env, pipeline.ArtifactsBundle, *state.Intent, *state.State) {
 	lgr := testlog.Logger(t, slog.LevelDebug)
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -763,104 +509,278 @@ func TestInteropDeployment(t *testing.T) {
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
-	intent.UseInterop = true
-
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
-
-	chainState := st.Chains[0]
-	depManagerSlot := common.HexToHash("0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c")
-	checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot)
-	proxyAdminOwnerHash := common.BytesToHash(intent.Chains[0].Roles.L1ProxyAdminOwner.Bytes())
-	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, proxyAdminOwnerHash)
-
+	return env, bundle, intent, st
 }
 
-func TestInvalidL2Genesis(t *testing.T) {
-	op_e2e.InitParallel(t)
-
-	lgr := testlog.Logger(t, slog.LevelDebug)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	depKey := new(deployerKey)
-	l1ChainID := big.NewInt(77799777)
-	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
+func localArtifactsLocator(t *testing.T) *opcm.ArtifactsLocator {
+	_, testFilename, _, ok := runtime.Caller(0)
+	require.Truef(t, ok, "failed to get test filename")
+	monorepoDir := path.Join(path.Dir(testFilename), "..", "..", "..", "..")
+	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
+	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
 	require.NoError(t, err)
-
-	l2ChainID1 := uint256.NewInt(1)
-
-	deployerAddr, err := dk.Address(depKey)
+	loc := &opcm.ArtifactsLocator{
+		URL: artifactsURL,
+	}
+	return loc
+}
+
+func createEnv(
+	t *testing.T,
+	ctx context.Context,
+	lgr log.Logger,
+	l1Client *ethclient.Client,
+	bcaster broadcaster.Broadcaster,
+	deployerAddr common.Address,
+) (*pipeline.Env, pipeline.ArtifactsBundle, *script.Host) {
+	_, testFilename, _, ok := runtime.Caller(0)
+	require.Truef(t, ok, "failed to get test filename")
+	monorepoDir := path.Join(path.Dir(testFilename), "..", "..", "..", "..")
+	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
+	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
 	require.NoError(t, err)
+	artifactsLocator := &opcm.ArtifactsLocator{
+		URL: artifactsURL,
+	}
 
-	loc := localArtifactsLocator(t)
+	artifactsFS, cleanupArtifacts, err := pipeline.DownloadArtifacts(ctx, artifactsLocator, pipeline.NoopDownloadProgressor)
+	require.NoError(t, err)
+	defer func() {
+		require.NoError(t, cleanupArtifacts())
+	}()
 
-	// these tests were generated by grepping all usages of the deploy
-	// config in L2Genesis.s.sol.
-	tests := []struct {
-		name      string
-		overrides map[string]any
-	}{
-		{
-			name: "L2 proxy admin owner not set",
-			overrides: map[string]any{
-				"proxyAdminOwner": nil,
-			},
-		},
-		{
-			name: "base fee vault recipient not set",
-			overrides: map[string]any{
-				"baseFeeVaultRecipient": nil,
-			},
-		},
-		{
-			name: "l1 fee vault recipient not set",
-			overrides: map[string]any{
-				"l1FeeVaultRecipient": nil,
-			},
-		},
-		{
-			name: "sequencer fee vault recipient not set",
-			overrides: map[string]any{
-				"sequencerFeeVaultRecipient": nil,
-			},
+	host, err := pipeline.DefaultScriptHost(
+		bcaster,
+		lgr,
+		deployerAddr,
+		artifactsFS,
+		0,
+	)
+	require.NoError(t, err)
+
+	env := &pipeline.Env{
+		StateWriter:  pipeline.NoopStateWriter(),
+		L1ScriptHost: host,
+		L1Client:     l1Client,
+		Broadcaster:  bcaster,
+		Deployer:     deployerAddr,
+		Logger:       lgr,
+	}
+
+	bundle := pipeline.ArtifactsBundle{
+		L1: artifactsFS,
+		L2: artifactsFS,
+	}
+
+	return env, bundle, host
+}
+
+func addrFor(t *testing.T, dk *devkeys.MnemonicDevKeys, key devkeys.Key) common.Address {
+	addr, err := dk.Address(key)
+	require.NoError(t, err)
+	return addr
+}
+
+func newIntent(
+	t *testing.T,
+	l1ChainID *big.Int,
+	dk *devkeys.MnemonicDevKeys,
+	l2ChainID *uint256.Int,
+	l1Loc *opcm.ArtifactsLocator,
+	l2Loc *opcm.ArtifactsLocator,
+) (*state.Intent, *state.State) {
+	intent := &state.Intent{
+		DeploymentStrategy: state.DeploymentStrategyLive,
+		L1ChainID:          l1ChainID.Uint64(),
+		SuperchainRoles: &state.SuperchainRoles{
+			ProxyAdminOwner:       addrFor(t, dk, devkeys.L1ProxyAdminOwnerRole.Key(l1ChainID)),
+			ProtocolVersionsOwner: addrFor(t, dk, devkeys.SuperchainDeployerKey.Key(l1ChainID)),
+			Guardian:              addrFor(t, dk, devkeys.SuperchainConfigGuardianKey.Key(l1ChainID)),
 		},
-		{
-			name: "l1 chain ID not set",
-			overrides: map[string]any{
-				"l1ChainID": nil,
-			},
+		FundDevAccounts:    true,
+		L1ContractsLocator: l1Loc,
+		L2ContractsLocator: l2Loc,
+		Chains: []*state.ChainIntent{
+			newChainIntent(t, dk, l1ChainID, l2ChainID),
 		},
-		{
-			name: "l2 chain ID not set",
-			overrides: map[string]any{
-				"l2ChainID": nil,
-			},
+	}
+	st := &state.State{
+		Version: 1,
+	}
+	return intent, st
+}
+
+func newChainIntent(t *testing.T, dk *devkeys.MnemonicDevKeys, l1ChainID *big.Int, l2ChainID *uint256.Int) *state.ChainIntent {
+	return &state.ChainIntent{
+		ID:                         l2ChainID.Bytes32(),
+		BaseFeeVaultRecipient:      addrFor(t, dk, devkeys.BaseFeeVaultRecipientRole.Key(l1ChainID)),
+		L1FeeVaultRecipient:        addrFor(t, dk, devkeys.L1FeeVaultRecipientRole.Key(l1ChainID)),
+		SequencerFeeVaultRecipient: addrFor(t, dk, devkeys.SequencerFeeVaultRecipientRole.Key(l1ChainID)),
+		Eip1559Denominator:         50,
+		Eip1559Elasticity:          6,
+		Roles: state.ChainRoles{
+			L1ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
+			L2ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
+			SystemConfigOwner: addrFor(t, dk, devkeys.SystemConfigOwner.Key(l1ChainID)),
+			UnsafeBlockSigner: addrFor(t, dk, devkeys.SequencerP2PRole.Key(l1ChainID)),
+			Batcher:           addrFor(t, dk, devkeys.BatcherRole.Key(l1ChainID)),
+			Proposer:          addrFor(t, dk, devkeys.ProposerRole.Key(l1ChainID)),
+			Challenger:        addrFor(t, dk, devkeys.ChallengerRole.Key(l1ChainID)),
 		},
 	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
-			intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
-			intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
-			intent.DeploymentStrategy = state.DeploymentStrategyGenesis
-			intent.GlobalDeployOverrides = tt.overrides
+}
 
-			err := deployer.ApplyPipeline(
-				ctx,
-				env,
-				bundle,
-				intent,
-				st,
-			)
-			require.Error(t, err)
-			require.ErrorContains(t, err, "failed to combine L2 init config")
+type codeGetter func(t *testing.T, addr common.Address) []byte
+
+func ethClientCodeGetter(ctx context.Context, client *ethclient.Client) codeGetter {
+	return func(t *testing.T, addr common.Address) []byte {
+		code, err := client.CodeAt(ctx, addr, nil)
+		require.NoError(t, err)
+		return code
+	}
+}
+
+func stateDumpCodeGetter(st *state.State) codeGetter {
+	return func(t *testing.T, addr common.Address) []byte {
+		acc, ok := st.L1StateDump.Data.Accounts[addr]
+		require.True(t, ok, "no account found for address %s", addr)
+		return acc.Code
+	}
+}
+
+func validateSuperchainDeployment(t *testing.T, st *state.State, cg codeGetter) {
+	addrs := []struct {
+		name string
+		addr common.Address
+	}{
+		{"SuperchainProxyAdmin", st.SuperchainDeployment.ProxyAdminAddress},
+		{"SuperchainConfigProxy", st.SuperchainDeployment.SuperchainConfigProxyAddress},
+		{"SuperchainConfigImpl", st.SuperchainDeployment.SuperchainConfigImplAddress},
+		{"ProtocolVersionsProxy", st.SuperchainDeployment.ProtocolVersionsProxyAddress},
+		{"ProtocolVersionsImpl", st.SuperchainDeployment.ProtocolVersionsImplAddress},
+		{"OpcmProxy", st.ImplementationsDeployment.OpcmProxyAddress},
+		{"PreimageOracleSingleton", st.ImplementationsDeployment.PreimageOracleSingletonAddress},
+		{"MipsSingleton", st.ImplementationsDeployment.MipsSingletonAddress},
+	}
+	for _, addr := range addrs {
+		t.Run(addr.name, func(t *testing.T) {
+			code := cg(t, addr.addr)
+			require.NotEmpty(t, code, "contract %s at %s has no code", addr.name, addr.addr)
 		})
 	}
 }
+
+func validateOPChainDeployment(t *testing.T, cg codeGetter, st *state.State, intent *state.Intent) {
+	// Validate that the implementation addresses are always set, even in subsequent deployments
+	// that pull from an existing OPCM deployment.
+	implAddrs := []struct {
+		name string
+		addr common.Address
+	}{
+		{"DelayedWETHImplAddress", st.ImplementationsDeployment.DelayedWETHImplAddress},
+		{"OptimismPortalImplAddress", st.ImplementationsDeployment.OptimismPortalImplAddress},
+		{"SystemConfigImplAddress", st.ImplementationsDeployment.SystemConfigImplAddress},
+		{"L1CrossDomainMessengerImplAddress", st.ImplementationsDeployment.L1CrossDomainMessengerImplAddress},
+		{"L1ERC721BridgeImplAddress", st.ImplementationsDeployment.L1ERC721BridgeImplAddress},
+		{"L1StandardBridgeImplAddress", st.ImplementationsDeployment.L1StandardBridgeImplAddress},
+		{"OptimismMintableERC20FactoryImplAddress", st.ImplementationsDeployment.OptimismMintableERC20FactoryImplAddress},
+		{"DisputeGameFactoryImplAddress", st.ImplementationsDeployment.DisputeGameFactoryImplAddress},
+		{"MipsSingletonAddress", st.ImplementationsDeployment.MipsSingletonAddress},
+		{"PreimageOracleSingletonAddress", st.ImplementationsDeployment.PreimageOracleSingletonAddress},
+	}
+	for _, addr := range implAddrs {
+		require.NotEmpty(t, addr.addr, "%s should be set", addr.name)
+		code := cg(t, addr.addr)
+		require.NotEmpty(t, code, "contract %s at %s has no code", addr.name, addr.addr)
+	}
+
+	for i, chainState := range st.Chains {
+		chainAddrs := []struct {
+			name string
+			addr common.Address
+		}{
+			{"ProxyAdminAddress", chainState.ProxyAdminAddress},
+			{"AddressManagerAddress", chainState.AddressManagerAddress},
+			{"L1ERC721BridgeProxyAddress", chainState.L1ERC721BridgeProxyAddress},
+			{"SystemConfigProxyAddress", chainState.SystemConfigProxyAddress},
+			{"OptimismMintableERC20FactoryProxyAddress", chainState.OptimismMintableERC20FactoryProxyAddress},
+			{"L1StandardBridgeProxyAddress", chainState.L1StandardBridgeProxyAddress},
+			{"L1CrossDomainMessengerProxyAddress", chainState.L1CrossDomainMessengerProxyAddress},
+			{"OptimismPortalProxyAddress", chainState.OptimismPortalProxyAddress},
+			{"DisputeGameFactoryProxyAddress", chainState.DisputeGameFactoryProxyAddress},
+			{"AnchorStateRegistryProxyAddress", chainState.AnchorStateRegistryProxyAddress},
+			{"FaultDisputeGameAddress", chainState.FaultDisputeGameAddress},
+			{"PermissionedDisputeGameAddress", chainState.PermissionedDisputeGameAddress},
+			{"DelayedWETHPermissionedGameProxyAddress", chainState.DelayedWETHPermissionedGameProxyAddress},
+			// {"DelayedWETHPermissionlessGameProxyAddress", chainState.DelayedWETHPermissionlessGameProxyAddress},
+		}
+		for _, addr := range chainAddrs {
+			// TODO Delete this `if`` block once FaultDisputeGameAddress is deployed.
+			if addr.name == "FaultDisputeGameAddress" {
+				continue
+			}
+			code := cg(t, addr.addr)
+			require.NotEmpty(t, code, "contract %s at %s for chain %s has no code", addr.name, addr.addr, chainState.ID)
+		}
+
+		alloc := chainState.Allocs.Data.Accounts
+
+		chainIntent := intent.Chains[i]
+		checkImmutableBehindProxy(t, alloc, predeploys.BaseFeeVaultAddr, chainIntent.BaseFeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.L1FeeVaultAddr, chainIntent.L1FeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.SequencerFeeVaultAddr, chainIntent.SequencerFeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.OptimismMintableERC721FactoryAddr, common.BigToHash(new(big.Int).SetUint64(intent.L1ChainID)))
+
+		// ownership slots
+		var addrAsSlot common.Hash
+		addrAsSlot.SetBytes(chainIntent.Roles.L1ProxyAdminOwner.Bytes())
+		// slot 0
+		ownerSlot := common.Hash{}
+		checkStorageSlot(t, alloc, predeploys.ProxyAdminAddr, ownerSlot, addrAsSlot)
+		var defaultGovOwner common.Hash
+		defaultGovOwner.SetBytes(common.HexToAddress("0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAdDEad").Bytes())
+		checkStorageSlot(t, alloc, predeploys.GovernanceTokenAddr, common.Hash{31: 0x0a}, defaultGovOwner)
+
+		require.Equal(t, int(chainIntent.Eip1559Denominator), 50, "EIP1559Denominator should be set")
+		require.Equal(t, int(chainIntent.Eip1559Elasticity), 6, "EIP1559Elasticity should be set")
+	}
+}
+
+func getEIP1967ImplementationAddress(t *testing.T, allocations types.GenesisAlloc, proxyAddress common.Address) common.Address {
+	storage := allocations[proxyAddress].Storage
+	storageValue := storage[genesis.ImplementationSlot]
+	require.NotEmpty(t, storageValue, "Implementation address for %s should be set", proxyAddress)
+	return common.HexToAddress(storageValue.Hex())
+}
+
+type bytesMarshaler interface {
+	Bytes() []byte
+}
+
+func checkImmutableBehindProxy(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) {
+	implementationAddress := getEIP1967ImplementationAddress(t, allocations, proxyContract)
+	checkImmutable(t, allocations, implementationAddress, thing)
+}
+
+func checkImmutable(t *testing.T, allocations types.GenesisAlloc, implementationAddress common.Address, thing bytesMarshaler) {
+	account, ok := allocations[implementationAddress]
+	require.True(t, ok, "%s not found in allocations", implementationAddress)
+	require.NotEmpty(t, account.Code, "%s should have code", implementationAddress)
+	require.True(
+		t,
+		bytes.Contains(account.Code, thing.Bytes()),
+		"%s code should contain %s immutable", implementationAddress, hex.EncodeToString(thing.Bytes()),
+	)
+}
+
+func checkStorageSlot(t *testing.T, allocs types.GenesisAlloc, address common.Address, slot common.Hash, expected common.Hash) {
+	account, ok := allocs[address]
+	require.True(t, ok, "account not found for address %s", address)
+	value, ok := account.Storage[slot]
+	if expected == (common.Hash{}) {
+		require.False(t, ok, "slot %s for account %s should not be set", slot, address)
+		return
+	}
+	require.True(t, ok, "slot %s not found for account %s", slot, address)
+	require.Equal(t, expected, value, "slot %s for account %s should be %s", slot, address, expected)
+}

From 630f8466d276c4a248ac90b4f5b45dd7f86b0b1e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 12:32:02 +0700
Subject: [PATCH 084/451] dependabot(gomod): bump github.com/minio/minio-go/v7
 (#12749)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.79 to 7.0.80.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](https://github.com/minio/minio-go/compare/v7.0.79...v7.0.80)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 758d076028e8..2d0cf6d664d9 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/libp2p/go-libp2p-pubsub v0.12.0
 	github.com/libp2p/go-libp2p-testing v0.12.0
 	github.com/mattn/go-isatty v0.0.20
-	github.com/minio/minio-go/v7 v7.0.79
+	github.com/minio/minio-go/v7 v7.0.80
 	github.com/multiformats/go-base32 v0.1.0
 	github.com/multiformats/go-multiaddr v0.13.0
 	github.com/multiformats/go-multiaddr-dns v0.4.0
diff --git a/go.sum b/go.sum
index a2dc3af16462..fb1bc5479f4d 100644
--- a/go.sum
+++ b/go.sum
@@ -524,8 +524,8 @@ github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod h1:cGKTAVKx4S
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.79 h1:SvJZpj3hT0RN+4KiuX/FxLfPZdsuegy6d/2PiemM/bM=
-github.com/minio/minio-go/v7 v7.0.79/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
+github.com/minio/minio-go/v7 v7.0.80 h1:2mdUHXEykRdY/BigLt3Iuu1otL0JTogT0Nmltg0wujk=
+github.com/minio/minio-go/v7 v7.0.80/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=

From 47da14af2d4fc75fcf9cac9d8dbb38f64d1b8e46 Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Thu, 31 Oct 2024 08:06:26 +0100
Subject: [PATCH 085/451] op-node/rollup: Implement Holocene invalid payload
 attributes handling (#12621)

* op-node/rollup: Implement Holocene invalid payload handling

* op-node: update comment about block-processing errors

---------

Co-authored-by: protolambda <proto@protolambda.com>
---
 op-e2e/actions/helpers/env.go                 | 39 +++++++-
 op-e2e/actions/helpers/l2_batcher.go          |  4 +-
 op-e2e/actions/proofs/bad_tx_in_batch_test.go |  3 +-
 op-e2e/actions/upgrades/holocene_fork_test.go | 89 ++++++++++++++++++-
 op-node/rollup/attributes/attributes.go       |  3 +-
 op-node/rollup/derive/attributes_queue.go     | 55 ++++++++++--
 op-node/rollup/derive/batch_queue.go          | 10 ++-
 op-node/rollup/derive/channel_assembler.go    |  4 +
 op-node/rollup/derive/channel_bank.go         |  6 ++
 op-node/rollup/derive/channel_in_reader.go    |  3 +-
 op-node/rollup/derive/deriver.go              | 29 +++++-
 op-node/rollup/derive/pipeline.go             | 21 +++--
 op-node/rollup/engine/build_invalid.go        | 27 +++---
 op-node/rollup/engine/events.go               | 19 ++--
 op-node/rollup/engine/payload_process.go      | 16 +++-
 op-service/eth/types.go                       | 25 ++++++
 16 files changed, 303 insertions(+), 50 deletions(-)

diff --git a/op-e2e/actions/helpers/env.go b/op-e2e/actions/helpers/env.go
index 1bc270f4843f..77911aa80bf5 100644
--- a/op-e2e/actions/helpers/env.go
+++ b/op-e2e/actions/helpers/env.go
@@ -1,11 +1,14 @@
 package helpers
 
 import (
+	"math/rand"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+	e2ecfg "github.com/ethereum-optimism/optimism/op-e2e/config"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
@@ -16,7 +19,8 @@ type Env struct {
 	Log  log.Logger
 	Logs *testlog.CapturingHandler
 
-	SetupData *e2eutils.SetupData
+	DeployParams *e2eutils.DeployParams
+	SetupData    *e2eutils.SetupData
 
 	Miner       *L1Miner
 	Seq         *L2Sequencer
@@ -24,6 +28,9 @@ type Env struct {
 	Verifier    *L2Verifier
 	VerifEngine *L2Engine
 	Batcher     *L2Batcher
+	Alice       *CrossLayerUser
+
+	AddressCorpora []common.Address
 }
 
 type EnvOpt struct {
@@ -49,8 +56,9 @@ const DefaultFork = rollup.Holocene
 
 // SetupEnv sets up a default action test environment. If no fork is specified, the default fork as
 // specified by the package variable [defaultFork] is used.
-func SetupEnv(t StatefulTesting, opts ...EnvOpt) (env Env) {
+func SetupEnv(t Testing, opts ...EnvOpt) (env Env) {
 	dp := e2eutils.MakeDeployParams(t, DefaultRollupTestParams())
+	env.DeployParams = dp
 
 	log, logs := testlog.CaptureLogger(t, log.LevelDebug)
 	env.Log, env.Logs = log, logs
@@ -64,6 +72,8 @@ func SetupEnv(t StatefulTesting, opts ...EnvOpt) (env Env) {
 
 	sd := e2eutils.Setup(t, dp, DefaultAlloc)
 	env.SetupData = sd
+	env.AddressCorpora = e2eutils.CollectAddresses(sd, dp)
+
 	env.Miner, env.SeqEngine, env.Seq = SetupSequencerTest(t, sd, log)
 	env.Miner.ActL1SetFeeRecipient(common.Address{'A'})
 	env.VerifEngine, env.Verifier = SetupVerifier(t, sd, log, env.Miner.L1Client(t, sd.RollupCfg), env.Miner.BlobStore(), &sync.Config{})
@@ -71,9 +81,34 @@ func SetupEnv(t StatefulTesting, opts ...EnvOpt) (env Env) {
 	env.Batcher = NewL2Batcher(log, sd.RollupCfg, DefaultBatcherCfg(dp),
 		rollupSeqCl, env.Miner.EthClient(), env.SeqEngine.EthClient(), env.SeqEngine.EngineClient(t, sd.RollupCfg))
 
+	alice := NewCrossLayerUser(log, dp.Secrets.Alice, rand.New(rand.NewSource(0xa57b)), e2ecfg.AllocTypeStandard)
+	alice.L1.SetUserEnv(env.L1UserEnv(t))
+	alice.L2.SetUserEnv(env.L2UserEnv(t))
+	env.Alice = alice
+
 	return
 }
 
+func (env Env) L1UserEnv(t Testing) *BasicUserEnv[*L1Bindings] {
+	l1EthCl := env.Miner.EthClient()
+	return &BasicUserEnv[*L1Bindings]{
+		EthCl:          l1EthCl,
+		Signer:         types.LatestSigner(env.SetupData.L1Cfg.Config),
+		AddressCorpora: env.AddressCorpora,
+		Bindings:       NewL1Bindings(t, l1EthCl, e2ecfg.AllocTypeStandard),
+	}
+}
+
+func (env Env) L2UserEnv(t Testing) *BasicUserEnv[*L2Bindings] {
+	l2EthCl := env.SeqEngine.EthClient()
+	return &BasicUserEnv[*L2Bindings]{
+		EthCl:          l2EthCl,
+		Signer:         types.LatestSigner(env.SetupData.L2Cfg.Config),
+		AddressCorpora: env.AddressCorpora,
+		Bindings:       NewL2Bindings(t, l2EthCl, env.SeqEngine.GethClient()),
+	}
+}
+
 func (env Env) ActBatchSubmitAllAndMine(t Testing) (l1InclusionBlock *types.Block) {
 	env.Batcher.ActSubmitAll(t)
 	batchTx := env.Batcher.LastSubmitted
diff --git a/op-e2e/actions/helpers/l2_batcher.go b/op-e2e/actions/helpers/l2_batcher.go
index a106c5687663..a2121f77ca54 100644
--- a/op-e2e/actions/helpers/l2_batcher.go
+++ b/op-e2e/actions/helpers/l2_batcher.go
@@ -146,8 +146,8 @@ func (s *L2Batcher) Reset() {
 
 // ActL2BatchBuffer adds the next L2 block to the batch buffer.
 // If the buffer is being submitted, the buffer is wiped.
-func (s *L2Batcher) ActL2BatchBuffer(t Testing) {
-	require.NoError(t, s.Buffer(t), "failed to add block to channel")
+func (s *L2Batcher) ActL2BatchBuffer(t Testing, opts ...BlockModifier) {
+	require.NoError(t, s.Buffer(t, opts...), "failed to add block to channel")
 }
 
 type BlockModifier = func(block *types.Block)
diff --git a/op-e2e/actions/proofs/bad_tx_in_batch_test.go b/op-e2e/actions/proofs/bad_tx_in_batch_test.go
index 6aed725f2be8..b750e8f9e649 100644
--- a/op-e2e/actions/proofs/bad_tx_in_batch_test.go
+++ b/op-e2e/actions/proofs/bad_tx_in_batch_test.go
@@ -26,14 +26,13 @@ func runBadTxInBatchTest(gt *testing.T, testCfg *helpers.TestCfg[any]) {
 	env.Alice.L2.ActCheckReceiptStatusOfLastTx(true)(t)
 
 	// Instruct the batcher to submit a faulty channel, with an invalid tx.
-	err := env.Batcher.Buffer(t, func(block *types.Block) {
+	env.Batcher.ActL2BatchBuffer(t, func(block *types.Block) {
 		// Replace the tx with one that has a bad signature.
 		txs := block.Transactions()
 		newTx, err := txs[1].WithSignature(env.Alice.L2.Signer(), make([]byte, 65))
 		txs[1] = newTx
 		require.NoError(t, err)
 	})
-	require.NoError(t, err)
 	env.Batcher.ActL2ChannelClose(t)
 	env.Batcher.ActL2BatchSubmit(t)
 
diff --git a/op-e2e/actions/upgrades/holocene_fork_test.go b/op-e2e/actions/upgrades/holocene_fork_test.go
index d9145b3d50ff..a51059701d85 100644
--- a/op-e2e/actions/upgrades/holocene_fork_test.go
+++ b/op-e2e/actions/upgrades/holocene_fork_test.go
@@ -1,13 +1,18 @@
 package upgrades
 
 import (
+	"context"
+	"math/big"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
-	"github.com/stretchr/testify/require"
 )
 
 func TestHoloceneActivationAtGenesis(gt *testing.T) {
@@ -127,3 +132,85 @@ func TestHoloceneLateActivationAndReset(gt *testing.T) {
 	requirePreHoloceneActivationLogs(e2esys.RoleSeq, 4)
 	requirePreHoloceneActivationLogs(e2esys.RoleVerif, 4)
 }
+
+func TestHoloceneInvalidPayload(gt *testing.T) {
+	t := helpers.NewDefaultTesting(gt)
+	env := helpers.SetupEnv(t, helpers.WithActiveGenesisFork(rollup.Holocene))
+	ctx := context.Background()
+
+	requireDepositOnlyLogs := func(role string, expNumLogs int) {
+		t.Helper()
+		recs := env.Logs.FindLogs(testlog.NewMessageContainsFilter("deposits-only attributes"), testlog.NewAttributesFilter("role", role))
+		require.Len(t, recs, expNumLogs)
+	}
+
+	// Start op-nodes
+	env.Seq.ActL2PipelineFull(t)
+
+	// generate and batch buffer two empty blocks
+	env.Seq.ActL2EmptyBlock(t) // 1 - genesis is 0
+	env.Batcher.ActL2BatchBuffer(t)
+	env.Seq.ActL2EmptyBlock(t) // 2
+	env.Batcher.ActL2BatchBuffer(t)
+
+	// send and include a single transaction
+	env.Alice.L2.ActResetTxOpts(t)
+	env.Alice.L2.ActSetTxToAddr(&env.DeployParams.Addresses.Bob)
+	env.Alice.L2.ActMakeTx(t)
+
+	env.Seq.ActL2StartBlock(t)
+	env.SeqEngine.ActL2IncludeTx(env.Alice.Address())(t)
+	env.Seq.ActL2EndBlock(t) // 3
+	env.Alice.L2.ActCheckReceiptStatusOfLastTx(true)(t)
+	l2Unsafe := env.Seq.L2Unsafe()
+	const invalidNum = 3
+	require.EqualValues(t, invalidNum, l2Unsafe.Number)
+	b, err := env.SeqEngine.EthClient().BlockByNumber(ctx, big.NewInt(invalidNum))
+	require.NoError(t, err)
+	require.Len(t, b.Transactions(), 2)
+
+	// buffer into the batcher, invalidating the tx via signature zeroing
+	env.Batcher.ActL2BatchBuffer(t, func(block *types.Block) {
+		// Replace the tx with one that has a bad signature.
+		txs := block.Transactions()
+		newTx, err := txs[1].WithSignature(env.Alice.L2.Signer(), make([]byte, 65))
+		require.NoError(t, err)
+		txs[1] = newTx
+	})
+
+	// generate two more empty blocks
+	env.Seq.ActL2EmptyBlock(t) // 4
+	env.Seq.ActL2EmptyBlock(t) // 5
+	require.EqualValues(t, 5, env.Seq.L2Unsafe().Number)
+
+	// submit it all
+	env.ActBatchSubmitAllAndMine(t)
+
+	// derive chain on sequencer
+	env.Seq.ActL1HeadSignal(t)
+	env.Seq.ActL2PipelineFull(t)
+
+	// TODO(12695): need to properly update safe after completed L1 block derivation
+	l2Safe := env.Seq.L2PendingSafe()
+	require.EqualValues(t, invalidNum, l2Safe.Number)
+	require.NotEqual(t, l2Safe.Hash, l2Unsafe.Hash, // old L2Unsafe above
+		"block-3 should have been replaced by deposit-only version")
+	requireDepositOnlyLogs(e2esys.RoleSeq, 2)
+	require.Equal(t, l2Safe, env.Seq.L2Unsafe(), "unsafe chain should have reorg'd")
+	b, err = env.SeqEngine.EthClient().BlockByNumber(ctx, big.NewInt(invalidNum))
+	require.NoError(t, err)
+	require.Len(t, b.Transactions(), 1)
+
+	// test that building on top of reorg'd chain and deriving further works
+
+	env.Seq.ActL2EmptyBlock(t) // 4
+	env.Seq.ActL2EmptyBlock(t) // 5
+	l2Unsafe = env.Seq.L2Unsafe()
+	require.EqualValues(t, 5, l2Unsafe.Number)
+
+	env.Batcher.Reset() // need to reset batcher to become aware of reorg
+	env.ActBatchSubmitAllAndMine(t)
+	env.Seq.ActL1HeadSignal(t)
+	env.Seq.ActL2PipelineFull(t)
+	require.Equal(t, l2Unsafe, env.Seq.L2Safe())
+}
diff --git a/op-node/rollup/attributes/attributes.go b/op-node/rollup/attributes/attributes.go
index 4ebb27050882..73876c0eaad8 100644
--- a/op-node/rollup/attributes/attributes.go
+++ b/op-node/rollup/attributes/attributes.go
@@ -62,6 +62,7 @@ func (eq *AttributesHandler) OnEvent(ev event.Event) bool {
 		eq.onPendingSafeUpdate(x)
 	case derive.DerivedAttributesEvent:
 		eq.attributes = x.Attributes
+		eq.sentAttributes = false
 		eq.emitter.Emit(derive.ConfirmReceivedAttributesEvent{})
 		// to make sure we have a pre-state signal to process the attributes from
 		eq.emitter.Emit(engine.PendingSafeRequestEvent{})
@@ -71,7 +72,7 @@ func (eq *AttributesHandler) OnEvent(ev event.Event) bool {
 	case rollup.EngineTemporaryErrorEvent:
 		eq.sentAttributes = false
 	case engine.InvalidPayloadAttributesEvent:
-		if x.Attributes.DerivedFrom == (eth.L1BlockRef{}) {
+		if !x.Attributes.IsDerived() {
 			return true // from sequencing
 		}
 		eq.sentAttributes = false
diff --git a/op-node/rollup/derive/attributes_queue.go b/op-node/rollup/derive/attributes_queue.go
index 0111ba29c8e5..6823de4ed67d 100644
--- a/op-node/rollup/derive/attributes_queue.go
+++ b/op-node/rollup/derive/attributes_queue.go
@@ -2,6 +2,7 @@ package derive
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"time"
@@ -35,17 +36,32 @@ type AttributesWithParent struct {
 	DerivedFrom eth.L1BlockRef
 }
 
+// WithDepositsOnly return a shallow clone with all non-Deposit transactions
+// stripped from the transactions of its attributes. The order is preserved.
+func (a *AttributesWithParent) WithDepositsOnly() *AttributesWithParent {
+	clone := *a
+	clone.Attributes = clone.Attributes.WithDepositsOnly()
+	return &clone
+}
+
+func (a *AttributesWithParent) IsDerived() bool {
+	return a.DerivedFrom != (eth.L1BlockRef{})
+}
+
 type AttributesQueue struct {
-	log          log.Logger
-	config       *rollup.Config
-	builder      AttributesBuilder
-	prev         SingularBatchProvider
+	log     log.Logger
+	config  *rollup.Config
+	builder AttributesBuilder
+	prev    SingularBatchProvider
+
 	batch        *SingularBatch
 	isLastInSpan bool
+	lastAttribs  *AttributesWithParent
 }
 
 type SingularBatchProvider interface {
 	ResettableStage
+	ChannelFlusher
 	Origin() eth.L1BlockRef
 	NextBatch(context.Context, eth.L2BlockRef) (*SingularBatch, bool, error)
 }
@@ -85,11 +101,11 @@ func (aq *AttributesQueue) NextAttributes(ctx context.Context, parent eth.L2Bloc
 			IsLastInSpan: aq.isLastInSpan,
 			DerivedFrom:  aq.Origin(),
 		}
+		aq.lastAttribs = &attr
 		aq.batch = nil
 		aq.isLastInSpan = false
 		return &attr, nil
 	}
-
 }
 
 // createNextAttributes transforms a batch into a payload attributes. This sets `NoTxPool` and appends the batched transactions
@@ -120,8 +136,35 @@ func (aq *AttributesQueue) createNextAttributes(ctx context.Context, batch *Sing
 	return attrs, nil
 }
 
-func (aq *AttributesQueue) Reset(ctx context.Context, _ eth.L1BlockRef, _ eth.SystemConfig) error {
+func (aq *AttributesQueue) reset() {
 	aq.batch = nil
 	aq.isLastInSpan = false // overwritten later, but set for consistency
+	aq.lastAttribs = nil
+}
+
+func (aq *AttributesQueue) Reset(ctx context.Context, _ eth.L1BlockRef, _ eth.SystemConfig) error {
+	aq.reset()
 	return io.EOF
 }
+
+func (aq *AttributesQueue) DepositsOnlyAttributes(parent eth.BlockID, derivedFrom eth.L1BlockRef) (*AttributesWithParent, error) {
+	// Sanity checks - these cannot happen with correct deriver implementations.
+	if aq.batch != nil {
+		return nil, fmt.Errorf("unexpected buffered batch, parent hash: %s, epoch: %s", aq.batch.ParentHash, aq.batch.Epoch())
+	} else if aq.lastAttribs == nil {
+		return nil, errors.New("no attributes generated yet")
+	} else if derivedFrom != aq.lastAttribs.DerivedFrom {
+		return nil, fmt.Errorf(
+			"unexpected derivation origin, last_origin: %s, invalid_origin: %s",
+			aq.lastAttribs.DerivedFrom, derivedFrom)
+	} else if parent != aq.lastAttribs.Parent.ID() {
+		return nil, fmt.Errorf(
+			"unexpected parent: last_parent: %s, invalid_parent: %s",
+			aq.lastAttribs.Parent.ID(), parent)
+	}
+
+	aq.prev.FlushChannel() // flush all channel data in previous stages
+	attrs := aq.lastAttribs.WithDepositsOnly()
+	aq.lastAttribs = attrs
+	return attrs, nil
+}
diff --git a/op-node/rollup/derive/batch_queue.go b/op-node/rollup/derive/batch_queue.go
index 25199297144e..3029d1199767 100644
--- a/op-node/rollup/derive/batch_queue.go
+++ b/op-node/rollup/derive/batch_queue.go
@@ -27,10 +27,6 @@ import (
 // It is internally responsible for making sure that batches with L1 inclusions block outside it's
 // working range are not considered or pruned.
 
-type ChannelFlusher interface {
-	FlushChannel()
-}
-
 type NextBatchProvider interface {
 	ChannelFlusher
 	Origin() eth.L1BlockRef
@@ -271,6 +267,12 @@ func (bq *BatchQueue) Reset(_ context.Context, base eth.L1BlockRef, _ eth.System
 	return io.EOF
 }
 
+func (bq *BatchQueue) FlushChannel() {
+	// We need to implement the ChannelFlusher interface with the BatchQueue but it's never called
+	// of which the BatchMux takes care.
+	panic("BatchQueue: invalid FlushChannel call")
+}
+
 func (bq *BatchQueue) AddBatch(ctx context.Context, batch Batch, parent eth.L2BlockRef) {
 	if len(bq.l1Blocks) == 0 {
 		panic(fmt.Errorf("cannot add batch with timestamp %d, no origin was prepared", batch.GetTimestamp()))
diff --git a/op-node/rollup/derive/channel_assembler.go b/op-node/rollup/derive/channel_assembler.go
index 6252bd217b71..be821ca955f4 100644
--- a/op-node/rollup/derive/channel_assembler.go
+++ b/op-node/rollup/derive/channel_assembler.go
@@ -51,6 +51,10 @@ func (ca *ChannelAssembler) Reset(context.Context, eth.L1BlockRef, eth.SystemCon
 	return io.EOF
 }
 
+func (ca *ChannelAssembler) FlushChannel() {
+	ca.resetChannel()
+}
+
 func (ca *ChannelAssembler) resetChannel() {
 	ca.channel = nil
 }
diff --git a/op-node/rollup/derive/channel_bank.go b/op-node/rollup/derive/channel_bank.go
index f26cb34b7fcf..57ab70096507 100644
--- a/op-node/rollup/derive/channel_bank.go
+++ b/op-node/rollup/derive/channel_bank.go
@@ -203,6 +203,12 @@ func (cb *ChannelBank) Reset(ctx context.Context, base eth.L1BlockRef, _ eth.Sys
 	return io.EOF
 }
 
+func (bq *ChannelBank) FlushChannel() {
+	// We need to implement the ChannelFlusher interface with the ChannelBank but it's never called
+	// of which the ChannelMux takes care.
+	panic("ChannelBank: invalid FlushChannel call")
+}
+
 type L1BlockRefByHashFetcher interface {
 	L1BlockRefByHash(context.Context, common.Hash) (eth.L1BlockRef, error)
 }
diff --git a/op-node/rollup/derive/channel_in_reader.go b/op-node/rollup/derive/channel_in_reader.go
index 6310fba600c9..cdb648c3b870 100644
--- a/op-node/rollup/derive/channel_in_reader.go
+++ b/op-node/rollup/derive/channel_in_reader.go
@@ -32,6 +32,7 @@ var (
 
 type RawChannelProvider interface {
 	ResettableStage
+	ChannelFlusher
 	Origin() eth.L1BlockRef
 	NextRawChannel(ctx context.Context) ([]byte, error)
 }
@@ -134,5 +135,5 @@ func (cr *ChannelInReader) Reset(ctx context.Context, _ eth.L1BlockRef, _ eth.Sy
 
 func (cr *ChannelInReader) FlushChannel() {
 	cr.nextBatchFn = nil
-	// TODO(12157): cr.prev.FlushChannel() - when we do wiring with ChannelStage
+	cr.prev.FlushChannel()
 }
diff --git a/op-node/rollup/derive/deriver.go b/op-node/rollup/derive/deriver.go
index 4a897f4ee4ec..d95fdf3017f7 100644
--- a/op-node/rollup/derive/deriver.go
+++ b/op-node/rollup/derive/deriver.go
@@ -3,6 +3,7 @@ package derive
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -64,6 +65,18 @@ func (ev PipelineStepEvent) String() string {
 	return "pipeline-step"
 }
 
+// DepositsOnlyPayloadAttributesRequestEvent requests a deposits-only version of the attributes from
+// the pipeline. It is sent by the engine deriver and received by the PipelineDeriver.
+// This event got introduced with Holocene.
+type DepositsOnlyPayloadAttributesRequestEvent struct {
+	Parent      eth.BlockID
+	DerivedFrom eth.L1BlockRef
+}
+
+func (ev DepositsOnlyPayloadAttributesRequestEvent) String() string {
+	return "deposits-only-payload-attributes-request"
+}
+
 type PipelineDeriver struct {
 	pipeline *DerivationPipeline
 
@@ -122,8 +135,7 @@ func (d *PipelineDeriver) OnEvent(ev event.Event) bool {
 			d.emitter.Emit(rollup.EngineTemporaryErrorEvent{Err: err})
 		} else {
 			if attrib != nil {
-				d.needAttributesConfirmation = true
-				d.emitter.Emit(DerivedAttributesEvent{Attributes: attrib})
+				d.emitDerivedAttributesEvent(attrib)
 			} else {
 				d.emitter.Emit(DeriverMoreEvent{}) // continue with the next step if we can
 			}
@@ -132,8 +144,21 @@ func (d *PipelineDeriver) OnEvent(ev event.Event) bool {
 		d.pipeline.ConfirmEngineReset()
 	case ConfirmReceivedAttributesEvent:
 		d.needAttributesConfirmation = false
+	case DepositsOnlyPayloadAttributesRequestEvent:
+		d.pipeline.log.Warn("Deriving deposits-only attributes", "origin", d.pipeline.Origin())
+		attrib, err := d.pipeline.DepositsOnlyAttributes(x.Parent, x.DerivedFrom)
+		if err != nil {
+			d.emitter.Emit(rollup.CriticalErrorEvent{Err: fmt.Errorf("deriving deposits-only attributes: %w", err)})
+			return true
+		}
+		d.emitDerivedAttributesEvent(attrib)
 	default:
 		return false
 	}
 	return true
 }
+
+func (d *PipelineDeriver) emitDerivedAttributesEvent(attrib *AttributesWithParent) {
+	d.needAttributesConfirmation = true
+	d.emitter.Emit(DerivedAttributesEvent{Attributes: attrib})
+}
diff --git a/op-node/rollup/derive/pipeline.go b/op-node/rollup/derive/pipeline.go
index 95189b35e100..e85366fd0f0e 100644
--- a/op-node/rollup/derive/pipeline.go
+++ b/op-node/rollup/derive/pipeline.go
@@ -38,6 +38,13 @@ type ResettableStage interface {
 	Reset(ctx context.Context, base eth.L1BlockRef, baseCfg eth.SystemConfig) error
 }
 
+// A ChannelFlusher flushes all internal state related to the current channel and then
+// calls FlushChannel on the stage it owns. Note that this is in contrast to Reset, which
+// is called by the owning Pipeline in a loop over all stages.
+type ChannelFlusher interface {
+	FlushChannel()
+}
+
 type ForkTransformer interface {
 	Transform(rollup.ForkName)
 }
@@ -89,16 +96,16 @@ func NewDerivationPipeline(log log.Logger, rollupCfg *rollup.Config, l1Fetcher L
 	dataSrc := NewDataSourceFactory(log, rollupCfg, l1Fetcher, l1Blobs, altDA) // auxiliary stage for L1Retrieval
 	l1Src := NewL1Retrieval(log, dataSrc, l1Traversal)
 	frameQueue := NewFrameQueue(log, rollupCfg, l1Src)
-	bank := NewChannelMux(log, spec, frameQueue, metrics)
-	chInReader := NewChannelInReader(rollupCfg, log, bank, metrics)
-	batchQueue := NewBatchMux(log, rollupCfg, chInReader, l2Source)
+	channelMux := NewChannelMux(log, spec, frameQueue, metrics)
+	chInReader := NewChannelInReader(rollupCfg, log, channelMux, metrics)
+	batchMux := NewBatchMux(log, rollupCfg, chInReader, l2Source)
 	attrBuilder := NewFetchingAttributesBuilder(rollupCfg, l1Fetcher, l2Source)
-	attributesQueue := NewAttributesQueue(log, rollupCfg, attrBuilder, batchQueue)
+	attributesQueue := NewAttributesQueue(log, rollupCfg, attrBuilder, batchMux)
 
 	// Reset from ResetEngine then up from L1 Traversal. The stages do not talk to each other during
 	// the ResetEngine, but after the ResetEngine, this is the order in which the stages could talk to each other.
 	// Note: The ResetEngine is the only reset that can fail.
-	stages := []ResettableStage{l1Traversal, l1Src, altDA, frameQueue, bank, chInReader, batchQueue, attributesQueue}
+	stages := []ResettableStage{l1Traversal, l1Src, altDA, frameQueue, channelMux, chInReader, batchMux, attributesQueue}
 
 	return &DerivationPipeline{
 		log:       log,
@@ -127,6 +134,10 @@ func (dp *DerivationPipeline) Reset() {
 	dp.engineIsReset = false
 }
 
+func (dp *DerivationPipeline) DepositsOnlyAttributes(parent eth.BlockID, derivedFrom eth.L1BlockRef) (*AttributesWithParent, error) {
+	return dp.attrib.DepositsOnlyAttributes(parent, derivedFrom)
+}
+
 // Origin is the L1 block of the inner-most stage of the derivation pipeline,
 // i.e. the L1 chain up to and including this point included and/or produced all the safe L2 blocks.
 func (dp *DerivationPipeline) Origin() eth.L1BlockRef {
diff --git a/op-node/rollup/engine/build_invalid.go b/op-node/rollup/engine/build_invalid.go
index e684f2de2ead..4e58b50b105d 100644
--- a/op-node/rollup/engine/build_invalid.go
+++ b/op-node/rollup/engine/build_invalid.go
@@ -3,10 +3,9 @@ package engine
 import (
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/core/types"
-
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
 // BuildInvalidEvent is an internal engine event, to post-process upon invalid attributes.
@@ -33,20 +32,19 @@ func (ev InvalidPayloadAttributesEvent) String() string {
 func (eq *EngDeriver) onBuildInvalid(ev BuildInvalidEvent) {
 	eq.log.Warn("could not process payload attributes", "err", ev.Err)
 
-	// Count the number of deposits to see if the tx list is deposit only.
-	depositCount := 0
-	for _, tx := range ev.Attributes.Attributes.Transactions {
-		if len(tx) > 0 && tx[0] == types.DepositTxType {
-			depositCount += 1
-		}
-	}
 	// Deposit transaction execution errors are suppressed in the execution engine, but if the
 	// block is somehow invalid, there is nothing we can do to recover & we should exit.
-	if len(ev.Attributes.Attributes.Transactions) == depositCount {
+	if ev.Attributes.Attributes.IsDepositsOnly() {
 		eq.log.Error("deposit only block was invalid", "parent", ev.Attributes.Parent, "err", ev.Err)
 		eq.emitter.Emit(rollup.CriticalErrorEvent{Err: fmt.Errorf("failed to process block with only deposit transactions: %w", ev.Err)})
 		return
 	}
+
+	if ev.Attributes.IsDerived() && eq.cfg.IsHolocene(ev.Attributes.DerivedFrom.Time) {
+		eq.emitDepositsOnlyPayloadAttributesRequest(ev.Attributes.Parent.ID(), ev.Attributes.DerivedFrom)
+		return
+	}
+
 	// Revert the pending safe head to the safe head.
 	eq.ec.SetPendingSafeL2Head(eq.ec.SafeL2Head())
 	// suppress the error b/c we want to retry with the next batch from the batch queue
@@ -61,3 +59,12 @@ func (eq *EngDeriver) onBuildInvalid(ev BuildInvalidEvent) {
 	// Signal that we deemed the attributes as unfit
 	eq.emitter.Emit(InvalidPayloadAttributesEvent(ev))
 }
+
+func (eq *EngDeriver) emitDepositsOnlyPayloadAttributesRequest(parent eth.BlockID, derivedFrom eth.L1BlockRef) {
+	eq.log.Warn("Holocene active, requesting deposits-only attributes", "parent", parent, "derived_from", derivedFrom)
+	// request deposits-only version
+	eq.emitter.Emit(derive.DepositsOnlyPayloadAttributesRequestEvent{
+		Parent:      parent,
+		DerivedFrom: derivedFrom,
+	})
+}
diff --git a/op-node/rollup/engine/events.go b/op-node/rollup/engine/events.go
index 73d0a77abb52..e5de3c86986b 100644
--- a/op-node/rollup/engine/events.go
+++ b/op-node/rollup/engine/events.go
@@ -25,8 +25,7 @@ type Metrics interface {
 // forkchoice-update event, to signal the latest forkchoice to other derivers.
 // This helps decouple derivers from the actual engine state,
 // while also not making the derivers wait for a forkchoice update at random.
-type ForkchoiceRequestEvent struct {
-}
+type ForkchoiceRequestEvent struct{}
 
 func (ev ForkchoiceRequestEvent) String() string {
 	return "forkchoice-request"
@@ -184,8 +183,7 @@ func (ev ProcessAttributesEvent) String() string {
 	return "process-attributes"
 }
 
-type PendingSafeRequestEvent struct {
-}
+type PendingSafeRequestEvent struct{}
 
 func (ev PendingSafeRequestEvent) String() string {
 	return "pending-safe-request"
@@ -199,15 +197,13 @@ func (ev ProcessUnsafePayloadEvent) String() string {
 	return "process-unsafe-payload"
 }
 
-type TryBackupUnsafeReorgEvent struct {
-}
+type TryBackupUnsafeReorgEvent struct{}
 
 func (ev TryBackupUnsafeReorgEvent) String() string {
 	return "try-backup-unsafe-reorg"
 }
 
-type TryUpdateEngineEvent struct {
-}
+type TryUpdateEngineEvent struct{}
 
 func (ev TryUpdateEngineEvent) String() string {
 	return "try-update-engine"
@@ -277,7 +273,8 @@ type EngDeriver struct {
 var _ event.Deriver = (*EngDeriver)(nil)
 
 func NewEngDeriver(log log.Logger, ctx context.Context, cfg *rollup.Config,
-	metrics Metrics, ec *EngineController) *EngDeriver {
+	metrics Metrics, ec *EngineController,
+) *EngDeriver {
 	return &EngDeriver{
 		log:     log,
 		cfg:     cfg,
@@ -471,10 +468,10 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 		d.onBuildStart(x)
 	case BuildStartedEvent:
 		d.onBuildStarted(x)
-	case BuildSealedEvent:
-		d.onBuildSealed(x)
 	case BuildSealEvent:
 		d.onBuildSeal(x)
+	case BuildSealedEvent:
+		d.onBuildSealed(x)
 	case BuildInvalidEvent:
 		d.onBuildInvalid(x)
 	case BuildCancelEvent:
diff --git a/op-node/rollup/engine/payload_process.go b/op-node/rollup/engine/payload_process.go
index 4102287f3d23..68ea1f155d9f 100644
--- a/op-node/rollup/engine/payload_process.go
+++ b/op-node/rollup/engine/payload_process.go
@@ -30,21 +30,31 @@ func (eq *EngDeriver) onPayloadProcess(ev PayloadProcessEvent) {
 		ev.Envelope.ExecutionPayload, ev.Envelope.ParentBeaconBlockRoot)
 	if err != nil {
 		eq.emitter.Emit(rollup.EngineTemporaryErrorEvent{
-			Err: fmt.Errorf("failed to insert execution payload: %w", err)})
+			Err: fmt.Errorf("failed to insert execution payload: %w", err),
+		})
 		return
 	}
 	switch status.Status {
 	case eth.ExecutionInvalid, eth.ExecutionInvalidBlockHash:
+		// Depending on execution engine, not all block-validity checks run immediately on build-start
+		// at the time of the forkchoiceUpdated engine-API call, nor during getPayload.
+		if ev.DerivedFrom != (eth.L1BlockRef{}) && eq.cfg.IsHolocene(ev.DerivedFrom.Time) {
+			eq.emitDepositsOnlyPayloadAttributesRequest(ev.Ref.ParentID(), ev.DerivedFrom)
+			return
+		}
+
 		eq.emitter.Emit(PayloadInvalidEvent{
 			Envelope: ev.Envelope,
-			Err:      eth.NewPayloadErr(ev.Envelope.ExecutionPayload, status)})
+			Err:      eth.NewPayloadErr(ev.Envelope.ExecutionPayload, status),
+		})
 		return
 	case eth.ExecutionValid:
 		eq.emitter.Emit(PayloadSuccessEvent(ev))
 		return
 	default:
 		eq.emitter.Emit(rollup.EngineTemporaryErrorEvent{
-			Err: eth.NewPayloadErr(ev.Envelope.ExecutionPayload, status)})
+			Err: eth.NewPayloadErr(ev.Envelope.ExecutionPayload, status),
+		})
 		return
 	}
 }
diff --git a/op-service/eth/types.go b/op-service/eth/types.go
index e23a903ebca4..60eb7171d651 100644
--- a/op-service/eth/types.go
+++ b/op-service/eth/types.go
@@ -358,6 +358,31 @@ type PayloadAttributes struct {
 	EIP1559Params *Bytes8 `json:"eip1559Params,omitempty"`
 }
 
+// IsDepositsOnly returns whether all transactions of the PayloadAttributes are of Deposit
+// type. Empty transactions are also considered non-Deposit transactions.
+func (a *PayloadAttributes) IsDepositsOnly() bool {
+	for _, tx := range a.Transactions {
+		if len(tx) == 0 || tx[0] != types.DepositTxType {
+			return false
+		}
+	}
+	return true
+}
+
+// WithDepositsOnly return a shallow clone with all non-Deposit transactions stripped from its
+// transactions. The order is preserved.
+func (a *PayloadAttributes) WithDepositsOnly() *PayloadAttributes {
+	clone := *a
+	depositTxs := make([]Data, 0, len(a.Transactions))
+	for _, tx := range a.Transactions {
+		if len(tx) > 0 && tx[0] == types.DepositTxType {
+			depositTxs = append(depositTxs, tx)
+		}
+	}
+	clone.Transactions = depositTxs
+	return &clone
+}
+
 type ExecutePayloadStatus string
 
 const (

From 1d3b29fcb2bc8ffdd368461e5f9d09dc97eb7b4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:36:51 +0700
Subject: [PATCH 086/451] dependabot(gomod): bump
 github.com/kurtosis-tech/kurtosis/api/golang from 1.3.1 to 1.4.0 (#12748)

* dependabot(gomod): bump github.com/kurtosis-tech/kurtosis/api/golang

Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kurtosis-tech/kurtosis/compare/1.3.1...1.4.0)

---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* ci: update kurtosis version

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
---
 .circleci/config.yml | 2 +-
 go.mod               | 2 +-
 go.sum               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 22edd29aa5ce..7a5d9e3a5ebb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -810,7 +810,7 @@ jobs:
           command: |
             echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
             sudo apt update
-            sudo apt install kurtosis-cli=1.3.0
+            sudo apt install kurtosis-cli=1.4.0
             kurtosis engine start
       - checkout
       - when:
diff --git a/go.mod b/go.mod
index 2d0cf6d664d9..3232ef0d42ce 100644
--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/klauspost/compress v1.17.11
-	github.com/kurtosis-tech/kurtosis/api/golang v1.3.1
+	github.com/kurtosis-tech/kurtosis/api/golang v1.4.0
 	github.com/libp2p/go-libp2p v0.36.2
 	github.com/libp2p/go-libp2p-mplex v0.9.0
 	github.com/libp2p/go-libp2p-pubsub v0.12.0
diff --git a/go.sum b/go.sum
index fb1bc5479f4d..b183dc9ae47d 100644
--- a/go.sum
+++ b/go.sum
@@ -440,8 +440,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2 h1:izciXrFyFR+ihJ7nLTOkoIX5GzBPIp8gVKlw94gIc98=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2/go.mod h1:bWSMQK3WHVTGHX9CjxPAb/LtzcmfOxID2wdzakSWQxo=
-github.com/kurtosis-tech/kurtosis/api/golang v1.3.1 h1:EBvFnz/mfiIw9a4q3ivBJiapqUiFHanAQh/Cv/jLzV4=
-github.com/kurtosis-tech/kurtosis/api/golang v1.3.1/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.0 h1:Iczs8diUFpbl4R2JJoofu6R/ZDwBsHe0O6wot45fxgQ=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.0/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b h1:hMoIM99QKcYQqsnK4AF7Lovi9ZD9ac6lZLZ5D/jx2x8=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b/go.mod h1:4pFdrRwDz5R+Fov2ZuTaPhAVgjA2jhGh1Izf832sX7A=
 github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc h1:7IlEpSehmWcNXOFpNP24Cu5HQI3af7GCBQw//m+LnvQ=

From 72c11daa5dbf9ff18c00c138ac5b4082cdc8cffd Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Thu, 31 Oct 2024 16:53:58 +0100
Subject: [PATCH 087/451] op-node/rollup: Promote all attributes to safe
 post-Holocene (#12724)

Also renames fields `IsLastInSpan` to `Safe` because that's semantically
clearer. That a last batch in a span batch is pre-Holocene the indicator
for a safe block promotion is an implementation detail. It's better to
name the effect rather than the reason.
---
 op-e2e/actions/upgrades/holocene_fork_test.go |  3 +-
 op-node/rollup/attributes/attributes.go       |  2 +-
 op-node/rollup/attributes/attributes_test.go  | 27 +++++----
 op-node/rollup/derive/attributes_queue.go     | 28 +++++-----
 op-node/rollup/derive/batch_stage.go          |  5 +-
 op-node/rollup/engine/build_seal.go           | 40 +++++++-------
 op-node/rollup/engine/build_sealed.go         | 12 ++--
 op-node/rollup/engine/build_start.go          |  2 +-
 op-node/rollup/engine/build_started.go        |  6 +-
 op-node/rollup/engine/events.go               |  4 +-
 op-node/rollup/engine/payload_process.go      |  4 +-
 op-node/rollup/engine/payload_success.go      |  8 +--
 op-node/rollup/sequencing/sequencer.go        | 30 +++++-----
 .../rollup/sequencing/sequencer_chaos_test.go | 36 ++++++------
 op-node/rollup/sequencing/sequencer_test.go   | 55 ++++++++++---------
 15 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/op-e2e/actions/upgrades/holocene_fork_test.go b/op-e2e/actions/upgrades/holocene_fork_test.go
index a51059701d85..7fd46296aaa9 100644
--- a/op-e2e/actions/upgrades/holocene_fork_test.go
+++ b/op-e2e/actions/upgrades/holocene_fork_test.go
@@ -190,8 +190,7 @@ func TestHoloceneInvalidPayload(gt *testing.T) {
 	env.Seq.ActL1HeadSignal(t)
 	env.Seq.ActL2PipelineFull(t)
 
-	// TODO(12695): need to properly update safe after completed L1 block derivation
-	l2Safe := env.Seq.L2PendingSafe()
+	l2Safe := env.Seq.L2Safe()
 	require.EqualValues(t, invalidNum, l2Safe.Number)
 	require.NotEqual(t, l2Safe.Hash, l2Unsafe.Hash, // old L2Unsafe above
 		"block-3 should have been replaced by deposit-only version")
diff --git a/op-node/rollup/attributes/attributes.go b/op-node/rollup/attributes/attributes.go
index 73876c0eaad8..819bc50c24ca 100644
--- a/op-node/rollup/attributes/attributes.go
+++ b/op-node/rollup/attributes/attributes.go
@@ -194,7 +194,7 @@ func (eq *AttributesHandler) consolidateNextSafeAttributes(attributes *derive.At
 		}
 		eq.emitter.Emit(engine.PromotePendingSafeEvent{
 			Ref:         ref,
-			Safe:        attributes.IsLastInSpan,
+			Concluding:  attributes.Concluding,
 			DerivedFrom: attributes.DerivedFrom,
 		})
 	}
diff --git a/op-node/rollup/attributes/attributes_test.go b/op-node/rollup/attributes/attributes_test.go
index c3ed171ce92f..05fbd21fe784 100644
--- a/op-node/rollup/attributes/attributes_test.go
+++ b/op-node/rollup/attributes/attributes_test.go
@@ -117,9 +117,9 @@ func TestAttributesHandler(t *testing.T) {
 			NoTxPool:              false,
 			GasLimit:              &payloadA1.ExecutionPayload.GasLimit,
 		},
-		Parent:       refA0,
-		IsLastInSpan: true,
-		DerivedFrom:  refB,
+		Parent:      refA0,
+		Concluding:  true,
+		DerivedFrom: refB,
 	}
 	refA1, err := derive.PayloadToBlockRef(cfg, payloadA1.ExecutionPayload)
 	require.NoError(t, err)
@@ -154,9 +154,9 @@ func TestAttributesHandler(t *testing.T) {
 			NoTxPool:              false,
 			GasLimit:              &payloadA1Alt.ExecutionPayload.GasLimit,
 		},
-		Parent:       refA0,
-		IsLastInSpan: true,
-		DerivedFrom:  refBAlt,
+		Parent:      refA0,
+		Concluding:  true,
+		DerivedFrom: refBAlt,
 	}
 
 	refA1Alt, err := derive.PayloadToBlockRef(cfg, payloadA1Alt.ExecutionPayload)
@@ -272,7 +272,7 @@ func TestAttributesHandler(t *testing.T) {
 			require.Nil(t, ah.attributes, "drop when attributes are successful")
 		})
 		t.Run("consolidation passes", func(t *testing.T) {
-			fn := func(t *testing.T, lastInSpan bool) {
+			fn := func(t *testing.T, concluding bool) {
 				logger := testlog.Logger(t, log.LevelInfo)
 				l2 := &testutils.MockL2Client{}
 				emitter := &testutils.MockEmitter{}
@@ -280,10 +280,10 @@ func TestAttributesHandler(t *testing.T) {
 				ah.AttachEmitter(emitter)
 
 				attr := &derive.AttributesWithParent{
-					Attributes:   attrA1.Attributes, // attributes will match, passing consolidation
-					Parent:       attrA1.Parent,
-					IsLastInSpan: lastInSpan,
-					DerivedFrom:  refB,
+					Attributes:  attrA1.Attributes, // attributes will match, passing consolidation
+					Parent:      attrA1.Parent,
+					Concluding:  concluding,
+					DerivedFrom: refB,
 				}
 				emitter.ExpectOnce(derive.ConfirmReceivedAttributesEvent{})
 				emitter.ExpectOnce(engine.PendingSafeRequestEvent{})
@@ -296,7 +296,7 @@ func TestAttributesHandler(t *testing.T) {
 
 				emitter.ExpectOnce(engine.PromotePendingSafeEvent{
 					Ref:         refA1,
-					Safe:        lastInSpan, // last in span becomes safe instantaneously
+					Concluding:  concluding,
 					DerivedFrom: refB,
 				})
 				ah.OnEvent(engine.PendingSafeUpdateEvent{
@@ -340,7 +340,7 @@ func TestAttributesHandler(t *testing.T) {
 		require.NotNil(t, ah.attributes, "queued up derived attributes")
 
 		// sanity check test setup
-		require.True(t, attrA1Alt.IsLastInSpan, "must be last in span for attributes to become safe")
+		require.True(t, attrA1Alt.Concluding, "must be concluding attributes")
 
 		// attrA1Alt will fit right on top of A0
 		emitter.ExpectOnce(engine.BuildStartEvent{Attributes: attrA1Alt})
@@ -396,5 +396,4 @@ func TestAttributesHandler(t *testing.T) {
 		l2.AssertExpectations(t)
 		emitter.AssertExpectations(t)
 	})
-
 }
diff --git a/op-node/rollup/derive/attributes_queue.go b/op-node/rollup/derive/attributes_queue.go
index 6823de4ed67d..dba39ef742ff 100644
--- a/op-node/rollup/derive/attributes_queue.go
+++ b/op-node/rollup/derive/attributes_queue.go
@@ -29,9 +29,9 @@ type AttributesBuilder interface {
 }
 
 type AttributesWithParent struct {
-	Attributes   *eth.PayloadAttributes
-	Parent       eth.L2BlockRef
-	IsLastInSpan bool
+	Attributes *eth.PayloadAttributes
+	Parent     eth.L2BlockRef
+	Concluding bool // Concluding indicates that the attributes conclude the pending safe phase
 
 	DerivedFrom eth.L1BlockRef
 }
@@ -54,9 +54,9 @@ type AttributesQueue struct {
 	builder AttributesBuilder
 	prev    SingularBatchProvider
 
-	batch        *SingularBatch
-	isLastInSpan bool
-	lastAttribs  *AttributesWithParent
+	batch       *SingularBatch
+	concluding  bool
+	lastAttribs *AttributesWithParent
 }
 
 type SingularBatchProvider interface {
@@ -82,12 +82,12 @@ func (aq *AttributesQueue) Origin() eth.L1BlockRef {
 func (aq *AttributesQueue) NextAttributes(ctx context.Context, parent eth.L2BlockRef) (*AttributesWithParent, error) {
 	// Get a batch if we need it
 	if aq.batch == nil {
-		batch, isLastInSpan, err := aq.prev.NextBatch(ctx, parent)
+		batch, concluding, err := aq.prev.NextBatch(ctx, parent)
 		if err != nil {
 			return nil, err
 		}
 		aq.batch = batch
-		aq.isLastInSpan = isLastInSpan
+		aq.concluding = concluding
 	}
 
 	// Actually generate the next attributes
@@ -96,14 +96,14 @@ func (aq *AttributesQueue) NextAttributes(ctx context.Context, parent eth.L2Bloc
 	} else {
 		// Clear out the local state once we will succeed
 		attr := AttributesWithParent{
-			Attributes:   attrs,
-			Parent:       parent,
-			IsLastInSpan: aq.isLastInSpan,
-			DerivedFrom:  aq.Origin(),
+			Attributes:  attrs,
+			Parent:      parent,
+			Concluding:  aq.concluding,
+			DerivedFrom: aq.Origin(),
 		}
 		aq.lastAttribs = &attr
 		aq.batch = nil
-		aq.isLastInSpan = false
+		aq.concluding = false
 		return &attr, nil
 	}
 }
@@ -138,7 +138,7 @@ func (aq *AttributesQueue) createNextAttributes(ctx context.Context, batch *Sing
 
 func (aq *AttributesQueue) reset() {
 	aq.batch = nil
-	aq.isLastInSpan = false // overwritten later, but set for consistency
+	aq.concluding = false // overwritten later, but set for consistency
 	aq.lastAttribs = nil
 }
 
diff --git a/op-node/rollup/derive/batch_stage.go b/op-node/rollup/derive/batch_stage.go
index 4e4b171b4c9e..d18efed2278e 100644
--- a/op-node/rollup/derive/batch_stage.go
+++ b/op-node/rollup/derive/batch_stage.go
@@ -70,7 +70,7 @@ func (bs *BatchStage) NextBatch(ctx context.Context, parent eth.L2BlockRef) (*Si
 		// We only consider empty batch generation after we've drained all batches from the local
 		// span batch queue and the previous stage.
 		empty, err := bs.deriveNextEmptyBatch(ctx, true, parent)
-		// An empty batch always advances the safe head.
+		// An empty batch always advances the (local) safe head.
 		return empty, true, err
 	} else if err != nil {
 		return nil, false, err
@@ -81,7 +81,8 @@ func (bs *BatchStage) NextBatch(ctx context.Context, parent eth.L2BlockRef) (*Si
 	switch validity {
 	case BatchAccept: // continue
 		batch.LogContext(bs.Log()).Debug("Found next singular batch")
-		return batch, len(bs.nextSpan) == 0, nil
+		// BatchStage is only used with Holocene, where blocks immediately become (local) safe
+		return batch, true, nil
 	case BatchPast:
 		batch.LogContext(bs.Log()).Warn("Dropping past singular batch")
 		// NotEnoughData to read in next batch until we're through all past batches
diff --git a/op-node/rollup/engine/build_seal.go b/op-node/rollup/engine/build_seal.go
index a5c72c74fdb7..8c4e5baeeec7 100644
--- a/op-node/rollup/engine/build_seal.go
+++ b/op-node/rollup/engine/build_seal.go
@@ -14,8 +14,8 @@ type PayloadSealInvalidEvent struct {
 	Info eth.PayloadInfo
 	Err  error
 
-	IsLastInSpan bool
-	DerivedFrom  eth.L1BlockRef
+	Concluding  bool
+	DerivedFrom eth.L1BlockRef
 }
 
 func (ev PayloadSealInvalidEvent) String() string {
@@ -30,8 +30,8 @@ type PayloadSealExpiredErrorEvent struct {
 	Info eth.PayloadInfo
 	Err  error
 
-	IsLastInSpan bool
-	DerivedFrom  eth.L1BlockRef
+	Concluding  bool
+	DerivedFrom eth.L1BlockRef
 }
 
 func (ev PayloadSealExpiredErrorEvent) String() string {
@@ -42,7 +42,7 @@ type BuildSealEvent struct {
 	Info         eth.PayloadInfo
 	BuildStarted time.Time
 	// if payload should be promoted to safe (must also be pending safe, see DerivedFrom)
-	IsLastInSpan bool
+	Concluding bool
 	// payload is promoted to pending-safe if non-zero
 	DerivedFrom eth.L1BlockRef
 }
@@ -69,10 +69,10 @@ func (eq *EngDeriver) onBuildSeal(ev BuildSealEvent) {
 		// same attributes with a new block-building job from here to recover from this error.
 		// We name it "expired", as this generally identifies a timeout, unknown job, or otherwise invalidated work.
 		eq.emitter.Emit(PayloadSealExpiredErrorEvent{
-			Info:         ev.Info,
-			Err:          fmt.Errorf("failed to seal execution payload (ID: %s): %w", ev.Info.ID, err),
-			IsLastInSpan: ev.IsLastInSpan,
-			DerivedFrom:  ev.DerivedFrom,
+			Info:        ev.Info,
+			Err:         fmt.Errorf("failed to seal execution payload (ID: %s): %w", ev.Info.ID, err),
+			Concluding:  ev.Concluding,
+			DerivedFrom: ev.DerivedFrom,
 		})
 		return
 	}
@@ -82,8 +82,8 @@ func (eq *EngDeriver) onBuildSeal(ev BuildSealEvent) {
 			Info: ev.Info,
 			Err: fmt.Errorf("failed sanity-check of execution payload contents (ID: %s, blockhash: %s): %w",
 				ev.Info.ID, envelope.ExecutionPayload.BlockHash, err),
-			IsLastInSpan: ev.IsLastInSpan,
-			DerivedFrom:  ev.DerivedFrom,
+			Concluding:  ev.Concluding,
+			DerivedFrom: ev.DerivedFrom,
 		})
 		return
 	}
@@ -91,10 +91,10 @@ func (eq *EngDeriver) onBuildSeal(ev BuildSealEvent) {
 	ref, err := derive.PayloadToBlockRef(eq.cfg, envelope.ExecutionPayload)
 	if err != nil {
 		eq.emitter.Emit(PayloadSealInvalidEvent{
-			Info:         ev.Info,
-			Err:          fmt.Errorf("failed to decode L2 block ref from payload: %w", err),
-			IsLastInSpan: ev.IsLastInSpan,
-			DerivedFrom:  ev.DerivedFrom,
+			Info:        ev.Info,
+			Err:         fmt.Errorf("failed to decode L2 block ref from payload: %w", err),
+			Concluding:  ev.Concluding,
+			DerivedFrom: ev.DerivedFrom,
 		})
 		return
 	}
@@ -112,10 +112,10 @@ func (eq *EngDeriver) onBuildSeal(ev BuildSealEvent) {
 		"txs", txnCount, "time", ref.Time, "seal_time", sealTime, "build_time", buildTime)
 
 	eq.emitter.Emit(BuildSealedEvent{
-		IsLastInSpan: ev.IsLastInSpan,
-		DerivedFrom:  ev.DerivedFrom,
-		Info:         ev.Info,
-		Envelope:     envelope,
-		Ref:          ref,
+		Concluding:  ev.Concluding,
+		DerivedFrom: ev.DerivedFrom,
+		Info:        ev.Info,
+		Envelope:    envelope,
+		Ref:         ref,
 	})
 }
diff --git a/op-node/rollup/engine/build_sealed.go b/op-node/rollup/engine/build_sealed.go
index d588d77b7f22..eb2680850a75 100644
--- a/op-node/rollup/engine/build_sealed.go
+++ b/op-node/rollup/engine/build_sealed.go
@@ -7,8 +7,8 @@ import (
 // BuildSealedEvent is emitted by the engine when a payload finished building,
 // but is not locally inserted as canonical block yet
 type BuildSealedEvent struct {
-	// if payload should be promoted to safe (must also be pending safe, see DerivedFrom)
-	IsLastInSpan bool
+	// if payload should be promoted to (local) safe (must also be pending safe, see DerivedFrom)
+	Concluding bool
 	// payload is promoted to pending-safe if non-zero
 	DerivedFrom eth.L1BlockRef
 
@@ -25,10 +25,10 @@ func (eq *EngDeriver) onBuildSealed(ev BuildSealedEvent) {
 	// If a (pending) safe block, immediately process the block
 	if ev.DerivedFrom != (eth.L1BlockRef{}) {
 		eq.emitter.Emit(PayloadProcessEvent{
-			IsLastInSpan: ev.IsLastInSpan,
-			DerivedFrom:  ev.DerivedFrom,
-			Envelope:     ev.Envelope,
-			Ref:          ev.Ref,
+			Concluding:  ev.Concluding,
+			DerivedFrom: ev.DerivedFrom,
+			Envelope:    ev.Envelope,
+			Ref:         ev.Ref,
 		})
 	}
 }
diff --git a/op-node/rollup/engine/build_start.go b/op-node/rollup/engine/build_start.go
index 22c178d36cd0..2c36053e1bbc 100644
--- a/op-node/rollup/engine/build_start.go
+++ b/op-node/rollup/engine/build_start.go
@@ -68,7 +68,7 @@ func (eq *EngDeriver) onBuildStart(ev BuildStartEvent) {
 	eq.emitter.Emit(BuildStartedEvent{
 		Info:         eth.PayloadInfo{ID: id, Timestamp: uint64(ev.Attributes.Attributes.Timestamp)},
 		BuildStarted: buildStartTime,
-		IsLastInSpan: ev.Attributes.IsLastInSpan,
+		Concluding:   ev.Attributes.Concluding,
 		DerivedFrom:  ev.Attributes.DerivedFrom,
 		Parent:       ev.Attributes.Parent,
 	})
diff --git a/op-node/rollup/engine/build_started.go b/op-node/rollup/engine/build_started.go
index 78b737d214c7..1193c09fb351 100644
--- a/op-node/rollup/engine/build_started.go
+++ b/op-node/rollup/engine/build_started.go
@@ -13,8 +13,8 @@ type BuildStartedEvent struct {
 
 	Parent eth.L2BlockRef
 
-	// if payload should be promoted to safe (must also be pending safe, see DerivedFrom)
-	IsLastInSpan bool
+	// if payload should be promoted to (local) safe (must also be pending safe, see DerivedFrom)
+	Concluding bool
 	// payload is promoted to pending-safe if non-zero
 	DerivedFrom eth.L1BlockRef
 }
@@ -29,7 +29,7 @@ func (eq *EngDeriver) onBuildStarted(ev BuildStartedEvent) {
 		eq.emitter.Emit(BuildSealEvent{
 			Info:         ev.Info,
 			BuildStarted: ev.BuildStarted,
-			IsLastInSpan: ev.IsLastInSpan,
+			Concluding:   ev.Concluding,
 			DerivedFrom:  ev.DerivedFrom,
 		})
 	}
diff --git a/op-node/rollup/engine/events.go b/op-node/rollup/engine/events.go
index e5de3c86986b..bb1dcb66200d 100644
--- a/op-node/rollup/engine/events.go
+++ b/op-node/rollup/engine/events.go
@@ -109,7 +109,7 @@ func (ev InteropPendingSafeChangedEvent) String() string {
 // PromotePendingSafeEvent signals that a block can be marked as pending-safe, and/or safe.
 type PromotePendingSafeEvent struct {
 	Ref         eth.L2BlockRef
-	Safe        bool
+	Concluding  bool // Concludes the pending phase, so can be promoted to (local) safe
 	DerivedFrom eth.L1BlockRef
 }
 
@@ -407,7 +407,7 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 				Unsafe:      d.ec.UnsafeL2Head(),
 			})
 		}
-		if x.Safe && x.Ref.Number > d.ec.LocalSafeL2Head().Number {
+		if x.Concluding && x.Ref.Number > d.ec.LocalSafeL2Head().Number {
 			d.emitter.Emit(PromoteLocalSafeEvent{
 				Ref:         x.Ref,
 				DerivedFrom: x.DerivedFrom,
diff --git a/op-node/rollup/engine/payload_process.go b/op-node/rollup/engine/payload_process.go
index 68ea1f155d9f..62d7ded47f0d 100644
--- a/op-node/rollup/engine/payload_process.go
+++ b/op-node/rollup/engine/payload_process.go
@@ -9,8 +9,8 @@ import (
 )
 
 type PayloadProcessEvent struct {
-	// if payload should be promoted to safe (must also be pending safe, see DerivedFrom)
-	IsLastInSpan bool
+	// if payload should be promoted to (local) safe (must also be pending safe, see DerivedFrom)
+	Concluding bool
 	// payload is promoted to pending-safe if non-zero
 	DerivedFrom eth.L1BlockRef
 
diff --git a/op-node/rollup/engine/payload_success.go b/op-node/rollup/engine/payload_success.go
index 7bb4a38307e1..c00d8e81ea77 100644
--- a/op-node/rollup/engine/payload_success.go
+++ b/op-node/rollup/engine/payload_success.go
@@ -5,8 +5,8 @@ import (
 )
 
 type PayloadSuccessEvent struct {
-	// if payload should be promoted to safe (must also be pending safe, see DerivedFrom)
-	IsLastInSpan bool
+	// if payload should be promoted to (local) safe (must also be pending safe, see DerivedFrom)
+	Concluding bool
 	// payload is promoted to pending-safe if non-zero
 	DerivedFrom eth.L1BlockRef
 
@@ -25,7 +25,7 @@ func (eq *EngDeriver) onPayloadSuccess(ev PayloadSuccessEvent) {
 	if ev.DerivedFrom != (eth.L1BlockRef{}) {
 		eq.emitter.Emit(PromotePendingSafeEvent{
 			Ref:         ev.Ref,
-			Safe:        ev.IsLastInSpan,
+			Concluding:  ev.Concluding,
 			DerivedFrom: ev.DerivedFrom,
 		})
 	}
@@ -34,7 +34,7 @@ func (eq *EngDeriver) onPayloadSuccess(ev PayloadSuccessEvent) {
 	eq.log.Info("Inserted block", "hash", payload.BlockHash, "number", uint64(payload.BlockNumber),
 		"state_root", payload.StateRoot, "timestamp", uint64(payload.Timestamp), "parent", payload.ParentHash,
 		"prev_randao", payload.PrevRandao, "fee_recipient", payload.FeeRecipient,
-		"txs", len(payload.Transactions), "last_in_span", ev.IsLastInSpan, "derived_from", ev.DerivedFrom)
+		"txs", len(payload.Transactions), "concluding", ev.Concluding, "derived_from", ev.DerivedFrom)
 
 	eq.emitter.Emit(TryUpdateEngineEvent{})
 }
diff --git a/op-node/rollup/sequencing/sequencer.go b/op-node/rollup/sequencing/sequencer.go
index 79b65734e5e8..b6605d601fa7 100644
--- a/op-node/rollup/sequencing/sequencer.go
+++ b/op-node/rollup/sequencing/sequencer.go
@@ -281,10 +281,10 @@ func (d *Sequencer) onBuildSealed(x engine.BuildSealedEvent) {
 	d.asyncGossip.Gossip(x.Envelope)
 	// Now after having gossiped the block, try to put it in our own canonical chain
 	d.emitter.Emit(engine.PayloadProcessEvent{
-		IsLastInSpan: x.IsLastInSpan,
-		DerivedFrom:  x.DerivedFrom,
-		Envelope:     x.Envelope,
-		Ref:          x.Ref,
+		Concluding:  x.Concluding,
+		DerivedFrom: x.DerivedFrom,
+		Envelope:    x.Envelope,
+		Ref:         x.Ref,
 	})
 	d.latest.Ref = x.Ref
 	d.latestSealed = x.Ref
@@ -334,7 +334,7 @@ func (d *Sequencer) onPayloadSuccess(x engine.PayloadSuccessEvent) {
 	d.asyncGossip.Clear()
 }
 
-func (d *Sequencer) onSequencerAction(x SequencerActionEvent) {
+func (d *Sequencer) onSequencerAction(SequencerActionEvent) {
 	d.log.Debug("Sequencer action")
 	payload := d.asyncGossip.Get()
 	if payload != nil {
@@ -356,10 +356,10 @@ func (d *Sequencer) onSequencerAction(x SequencerActionEvent) {
 		// meaning that we have seen BuildSealedEvent already.
 		// We can retry processing to make it canonical.
 		d.emitter.Emit(engine.PayloadProcessEvent{
-			IsLastInSpan: false,
-			DerivedFrom:  eth.L1BlockRef{},
-			Envelope:     payload,
-			Ref:          ref,
+			Concluding:  false,
+			DerivedFrom: eth.L1BlockRef{},
+			Envelope:    payload,
+			Ref:         ref,
 		})
 		d.latest.Ref = ref
 	} else {
@@ -371,7 +371,7 @@ func (d *Sequencer) onSequencerAction(x SequencerActionEvent) {
 			d.emitter.Emit(engine.BuildSealEvent{
 				Info:         d.latest.Info,
 				BuildStarted: d.latest.Started,
-				IsLastInSpan: false,
+				Concluding:   false,
 				DerivedFrom:  eth.L1BlockRef{},
 			})
 		} else if d.latest == (BuildingState{}) {
@@ -416,7 +416,7 @@ func (d *Sequencer) onReset(x rollup.ResetEvent) {
 	d.nextActionOK = false
 }
 
-func (d *Sequencer) onEngineResetConfirmedEvent(x engine.EngineResetConfirmedEvent) {
+func (d *Sequencer) onEngineResetConfirmedEvent(engine.EngineResetConfirmedEvent) {
 	d.nextActionOK = d.active.Load()
 	// Before sequencing we can wait a block,
 	// assuming the execution-engine just churned through some work for the reset.
@@ -552,10 +552,10 @@ func (d *Sequencer) startBuildingBlock() {
 
 	// Start a payload building process.
 	withParent := &derive.AttributesWithParent{
-		Attributes:   attrs,
-		Parent:       l2Head,
-		IsLastInSpan: false,
-		DerivedFrom:  eth.L1BlockRef{}, // zero, not going to be pending-safe / safe
+		Attributes:  attrs,
+		Parent:      l2Head,
+		Concluding:  false,
+		DerivedFrom: eth.L1BlockRef{}, // zero, not going to be pending-safe / safe
 	}
 
 	// Don't try to start building a block again, until we have heard back from this attempt
diff --git a/op-node/rollup/sequencing/sequencer_chaos_test.go b/op-node/rollup/sequencing/sequencer_chaos_test.go
index 5d64ab101d7c..d5000fbed339 100644
--- a/op-node/rollup/sequencing/sequencer_chaos_test.go
+++ b/op-node/rollup/sequencing/sequencer_chaos_test.go
@@ -91,7 +91,7 @@ func (c *ChaoticEngine) OnEvent(ev event.Event) bool {
 				Info:         c.currentPayloadInfo,
 				BuildStarted: c.clock.Now(),
 				Parent:       x.Attributes.Parent,
-				IsLastInSpan: false,
+				Concluding:   false,
 				DerivedFrom:  eth.L1BlockRef{},
 			})
 		}
@@ -124,10 +124,10 @@ func (c *ChaoticEngine) OnEvent(ev event.Event) bool {
 
 		if c.currentPayloadInfo == (eth.PayloadInfo{}) {
 			c.emitter.Emit(engine.PayloadSealExpiredErrorEvent{
-				Info:         x.Info,
-				Err:          errors.New("job was cancelled"),
-				IsLastInSpan: false,
-				DerivedFrom:  eth.L1BlockRef{},
+				Info:        x.Info,
+				Err:         errors.New("job was cancelled"),
+				Concluding:  false,
+				DerivedFrom: eth.L1BlockRef{},
 			})
 			return true
 		}
@@ -142,17 +142,17 @@ func (c *ChaoticEngine) OnEvent(ev event.Event) bool {
 		switch {
 		case p < 0.03: // 3%
 			c.emitter.Emit(engine.PayloadSealInvalidEvent{
-				Info:         x.Info,
-				Err:          errors.New("mock invalid seal"),
-				IsLastInSpan: x.IsLastInSpan,
-				DerivedFrom:  x.DerivedFrom,
+				Info:        x.Info,
+				Err:         errors.New("mock invalid seal"),
+				Concluding:  x.Concluding,
+				DerivedFrom: x.DerivedFrom,
 			})
 		case p < 0.08: // 5%
 			c.emitter.Emit(engine.PayloadSealExpiredErrorEvent{
-				Info:         x.Info,
-				Err:          errors.New("mock temp engine error"),
-				IsLastInSpan: x.IsLastInSpan,
-				DerivedFrom:  x.DerivedFrom,
+				Info:        x.Info,
+				Err:         errors.New("mock temp engine error"),
+				Concluding:  x.Concluding,
+				DerivedFrom: x.DerivedFrom,
 			})
 		default:
 			payloadEnvelope := &eth.ExecutionPayloadEnvelope{
@@ -178,11 +178,11 @@ func (c *ChaoticEngine) OnEvent(ev event.Event) bool {
 				SequenceNumber: 0, // ignored
 			}
 			c.emitter.Emit(engine.BuildSealedEvent{
-				Info:         x.Info,
-				Envelope:     payloadEnvelope,
-				Ref:          payloadRef,
-				IsLastInSpan: x.IsLastInSpan,
-				DerivedFrom:  x.DerivedFrom,
+				Info:        x.Info,
+				Envelope:    payloadEnvelope,
+				Ref:         payloadRef,
+				Concluding:  x.Concluding,
+				DerivedFrom: x.DerivedFrom,
 			})
 		}
 		c.currentPayloadInfo = eth.PayloadInfo{}
diff --git a/op-node/rollup/sequencing/sequencer_test.go b/op-node/rollup/sequencing/sequencer_test.go
index 18fee8f5a186..9c4e77ee7253 100644
--- a/op-node/rollup/sequencing/sequencer_test.go
+++ b/op-node/rollup/sequencing/sequencer_test.go
@@ -46,7 +46,8 @@ func decodeID(data []byte) eth.BlockID {
 }
 
 func (m *FakeAttributesBuilder) PreparePayloadAttributes(ctx context.Context,
-	l2Parent eth.L2BlockRef, epoch eth.BlockID) (attrs *eth.PayloadAttributes, err error) {
+	l2Parent eth.L2BlockRef, epoch eth.BlockID,
+) (attrs *eth.PayloadAttributes, err error) {
 	gasLimit := eth.Uint64Quantity(30_000_000)
 	attrs = &eth.PayloadAttributes{
 		Timestamp:             eth.Uint64Quantity(l2Parent.Time + m.cfg.BlockTime),
@@ -315,7 +316,7 @@ func TestSequencer_StaleBuild(t *testing.T) {
 		Info:         payloadInfo,
 		BuildStarted: startedTime,
 		Parent:       head,
-		IsLastInSpan: false,
+		Concluding:   false,
 		DerivedFrom:  eth.L1BlockRef{},
 	})
 
@@ -325,7 +326,7 @@ func TestSequencer_StaleBuild(t *testing.T) {
 	emitter.ExpectOnce(engine.BuildSealEvent{
 		Info:         payloadInfo,
 		BuildStarted: startedTime,
-		IsLastInSpan: false,
+		Concluding:   false,
 		DerivedFrom:  eth.L1BlockRef{},
 	})
 	seq.OnEvent(SequencerActionEvent{})
@@ -355,18 +356,18 @@ func TestSequencer_StaleBuild(t *testing.T) {
 		SequenceNumber: 0,
 	}
 	emitter.ExpectOnce(engine.PayloadProcessEvent{
-		IsLastInSpan: false,
-		DerivedFrom:  eth.L1BlockRef{},
-		Envelope:     payloadEnvelope,
-		Ref:          payloadRef,
+		Concluding:  false,
+		DerivedFrom: eth.L1BlockRef{},
+		Envelope:    payloadEnvelope,
+		Ref:         payloadRef,
 	})
 	// And report back the sealing result to the engine
 	seq.OnEvent(engine.BuildSealedEvent{
-		IsLastInSpan: false,
-		DerivedFrom:  eth.L1BlockRef{},
-		Info:         payloadInfo,
-		Envelope:     payloadEnvelope,
-		Ref:          payloadRef,
+		Concluding:  false,
+		DerivedFrom: eth.L1BlockRef{},
+		Info:        payloadInfo,
+		Envelope:    payloadEnvelope,
+		Ref:         payloadRef,
 	})
 	// The sequencer should start processing the payload
 	emitter.AssertExpectations(t)
@@ -521,7 +522,7 @@ func TestSequencerBuild(t *testing.T) {
 		Info:         payloadInfo,
 		BuildStarted: startedTime,
 		Parent:       head,
-		IsLastInSpan: false,
+		Concluding:   false,
 		DerivedFrom:  eth.L1BlockRef{},
 	})
 	// The sealing should now be scheduled as next action.
@@ -535,7 +536,7 @@ func TestSequencerBuild(t *testing.T) {
 	emitter.ExpectOnce(engine.BuildSealEvent{
 		Info:         payloadInfo,
 		BuildStarted: startedTime,
-		IsLastInSpan: false,
+		Concluding:   false,
 		DerivedFrom:  eth.L1BlockRef{},
 	})
 	seq.OnEvent(SequencerActionEvent{})
@@ -564,18 +565,18 @@ func TestSequencerBuild(t *testing.T) {
 		SequenceNumber: 0,
 	}
 	emitter.ExpectOnce(engine.PayloadProcessEvent{
-		IsLastInSpan: false,
-		DerivedFrom:  eth.L1BlockRef{},
-		Envelope:     payloadEnvelope,
-		Ref:          payloadRef,
+		Concluding:  false,
+		DerivedFrom: eth.L1BlockRef{},
+		Envelope:    payloadEnvelope,
+		Ref:         payloadRef,
 	})
 	// And report back the sealing result to the engine
 	seq.OnEvent(engine.BuildSealedEvent{
-		IsLastInSpan: false,
-		DerivedFrom:  eth.L1BlockRef{},
-		Info:         payloadInfo,
-		Envelope:     payloadEnvelope,
-		Ref:          payloadRef,
+		Concluding:  false,
+		DerivedFrom: eth.L1BlockRef{},
+		Info:        payloadInfo,
+		Envelope:    payloadEnvelope,
+		Ref:         payloadRef,
 	})
 	// The sequencer should start processing the payload
 	emitter.AssertExpectations(t)
@@ -587,10 +588,10 @@ func TestSequencerBuild(t *testing.T) {
 
 	// Mock that the processing was successful
 	seq.OnEvent(engine.PayloadSuccessEvent{
-		IsLastInSpan: false,
-		DerivedFrom:  eth.L1BlockRef{},
-		Envelope:     payloadEnvelope,
-		Ref:          payloadRef,
+		Concluding:  false,
+		DerivedFrom: eth.L1BlockRef{},
+		Envelope:    payloadEnvelope,
+		Ref:         payloadRef,
 	})
 	require.Nil(t, deps.asyncGossip.payload, "async gossip should have cleared,"+
 		" after previous publishing and now having persisted the block ourselves")

From caf63ce1dd8afbc66c9d042926f788775db6b01e Mon Sep 17 00:00:00 2001
From: Sam Stokes <35908605+bitwiseguy@users.noreply.github.com>
Date: Thu, 31 Oct 2024 12:19:18 -0400
Subject: [PATCH 088/451] op-deployer: add 'inspect superchain-registry'
 subcommand (#12736)

* op-deployer: add 'inspect superchain-registry' subcommand

* op-deployer: generate artifacts at runtime of superchain-registry cmd

* op-deployer: add missing err handler

* op-deployer: add Printf to prompt user to populate .env vals

* op-deployer: reformat addresses to superchain.AddressList
---
 .../pkg/deployer/inspect/deploy_config.go     |  35 ++--
 op-deployer/pkg/deployer/inspect/flags.go     |   8 +
 op-deployer/pkg/deployer/inspect/l1.go        |  36 ++--
 .../deployer/inspect/superchain_registry.go   | 173 ++++++++++++++++++
 op-deployer/pkg/deployer/standard/standard.go |  22 +++
 5 files changed, 250 insertions(+), 24 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/inspect/superchain_registry.go

diff --git a/op-deployer/pkg/deployer/inspect/deploy_config.go b/op-deployer/pkg/deployer/inspect/deploy_config.go
index ead006c7d622..575576633ab7 100644
--- a/op-deployer/pkg/deployer/inspect/deploy_config.go
+++ b/op-deployer/pkg/deployer/inspect/deploy_config.go
@@ -3,10 +3,12 @@ package inspect
 import (
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/urfave/cli/v2"
 )
 
@@ -18,29 +20,40 @@ func DeployConfigCLI(cliCtx *cli.Context) error {
 
 	globalState, err := pipeline.ReadState(cliCfg.Workdir)
 	if err != nil {
-		return fmt.Errorf("failed to read intent: %w", err)
+		return fmt.Errorf("failed to read globalState: %w", err)
 	}
-	chainState, err := globalState.Chain(cliCfg.ChainID)
+
+	config, err := DeployConfig(globalState, cliCfg.ChainID)
 	if err != nil {
-		return fmt.Errorf("failed to find chain state: %w", err)
+		return fmt.Errorf("failed to generate deploy config: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(config, ioutil.ToStdOutOrFileOrNoop(cliCfg.Outfile, 0o666)); err != nil {
+		return fmt.Errorf("failed to write deploy config: %w", err)
+	}
+
+	return nil
+}
+
+func DeployConfig(globalState *state.State, chainID common.Hash) (*genesis.DeployConfig, error) {
+	chainState, err := globalState.Chain(chainID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to find chain state: %w", err)
 	}
 
 	intent := globalState.AppliedIntent
 	if intent == nil {
-		return fmt.Errorf("can only run this command following a full apply")
+		return nil, fmt.Errorf("can only run this command following a full apply")
 	}
-	chainIntent, err := intent.Chain(cliCfg.ChainID)
+	chainIntent, err := intent.Chain(chainID)
 	if err != nil {
-		return fmt.Errorf("failed to find chain intent: %w", err)
+		return nil, fmt.Errorf("failed to find chain intent: %w", err)
 	}
 
 	config, err := state.CombineDeployConfig(intent, chainIntent, globalState, chainState)
 	if err != nil {
-		return fmt.Errorf("failed to generate deploy config: %w", err)
-	}
-	if err := jsonutil.WriteJSON(config, ioutil.ToStdOutOrFileOrNoop(cliCfg.Outfile, 0o666)); err != nil {
-		return fmt.Errorf("failed to write deploy config: %w", err)
+		return nil, fmt.Errorf("failed to generate deploy config: %w", err)
 	}
 
-	return nil
+	return &config, nil
 }
diff --git a/op-deployer/pkg/deployer/inspect/flags.go b/op-deployer/pkg/deployer/inspect/flags.go
index 2f94edc088e5..3f74e1d759b2 100644
--- a/op-deployer/pkg/deployer/inspect/flags.go
+++ b/op-deployer/pkg/deployer/inspect/flags.go
@@ -69,6 +69,14 @@ var Commands = []*cli.Command{
 		Action:    L2SemversCLI,
 		Flags:     Flags,
 	},
+	{
+		Name:      "superchain-registry",
+		Usage:     "outputs the .env file expected by superchain-registry add-chain tool",
+		Args:      true,
+		ArgsUsage: "<l2-chain-id>",
+		Action:    SuperchainRegistryCLI,
+		Flags:     Flags,
+	},
 }
 
 type cliConfig struct {
diff --git a/op-deployer/pkg/deployer/inspect/l1.go b/op-deployer/pkg/deployer/inspect/l1.go
index a5391810aec5..d0a4f88172d1 100644
--- a/op-deployer/pkg/deployer/inspect/l1.go
+++ b/op-deployer/pkg/deployer/inspect/l1.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
@@ -37,9 +38,9 @@ type OpChainDeployment struct {
 	DisputeGameFactoryProxyAddress           common.Address `json:"disputeGameFactoryProxyAddress"`
 	AnchorStateRegistryProxyAddress          common.Address `json:"anchorStateRegistryProxyAddress"`
 	AnchorStateRegistryImplAddress           common.Address `json:"anchorStateRegistryImplAddress"`
-	// FaultDisputeGameAddress                  common.Address `json:"faultDisputeGameAddress"`
-	PermissionedDisputeGameAddress          common.Address `json:"permissionedDisputeGameAddress"`
-	DelayedWETHPermissionedGameProxyAddress common.Address `json:"delayedWETHPermissionedGameProxyAddress"`
+	FaultDisputeGameAddress                  common.Address `json:"faultDisputeGameAddress"`
+	PermissionedDisputeGameAddress           common.Address `json:"permissionedDisputeGameAddress"`
+	DelayedWETHPermissionedGameProxyAddress  common.Address `json:"delayedWETHPermissionedGameProxyAddress"`
 	// DelayedWETHPermissionlessGameProxyAddress common.Address `json:"delayedWETHPermissionlessGameProxyAddress"`
 }
 
@@ -68,9 +69,22 @@ func L1CLI(cliCtx *cli.Context) error {
 		return fmt.Errorf("failed to read intent: %w", err)
 	}
 
-	chainState, err := globalState.Chain(cfg.ChainID)
+	l1Contracts, err := L1(globalState, cfg.ChainID)
 	if err != nil {
-		return fmt.Errorf("failed to get chain state for ID %s: %w", cfg.ChainID.String(), err)
+		return fmt.Errorf("failed to generate l1Contracts: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(l1Contracts, ioutil.ToStdOutOrFileOrNoop(cfg.Outfile, 0o666)); err != nil {
+		return fmt.Errorf("failed to write L1 contract addresses: %w", err)
+	}
+
+	return nil
+}
+
+func L1(globalState *state.State, chainID common.Hash) (*L1Contracts, error) {
+	chainState, err := globalState.Chain(chainID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get chain state for ID %s: %w", chainID.String(), err)
 	}
 
 	l1Contracts := L1Contracts{
@@ -93,9 +107,9 @@ func L1CLI(cliCtx *cli.Context) error {
 			DisputeGameFactoryProxyAddress:           chainState.DisputeGameFactoryProxyAddress,
 			AnchorStateRegistryProxyAddress:          chainState.AnchorStateRegistryProxyAddress,
 			AnchorStateRegistryImplAddress:           chainState.AnchorStateRegistryImplAddress,
-			// FaultDisputeGameAddress:                  chainState.FaultDisputeGameAddress,
-			PermissionedDisputeGameAddress:          chainState.PermissionedDisputeGameAddress,
-			DelayedWETHPermissionedGameProxyAddress: chainState.DelayedWETHPermissionedGameProxyAddress,
+			FaultDisputeGameAddress:                  chainState.FaultDisputeGameAddress,
+			PermissionedDisputeGameAddress:           chainState.PermissionedDisputeGameAddress,
+			DelayedWETHPermissionedGameProxyAddress:  chainState.DelayedWETHPermissionedGameProxyAddress,
 			// DelayedWETHPermissionlessGameProxyAddress: chainState.DelayedWETHPermissionlessGameProxyAddress,
 		},
 		ImplementationsDeployment: ImplementationsDeployment{
@@ -113,9 +127,5 @@ func L1CLI(cliCtx *cli.Context) error {
 		},
 	}
 
-	if err := jsonutil.WriteJSON(l1Contracts, ioutil.ToStdOutOrFileOrNoop(cfg.Outfile, 0o666)); err != nil {
-		return fmt.Errorf("failed to write L1 contract addresses: %w", err)
-	}
-
-	return nil
+	return &l1Contracts, nil
 }
diff --git a/op-deployer/pkg/deployer/inspect/superchain_registry.go b/op-deployer/pkg/deployer/inspect/superchain_registry.go
new file mode 100644
index 000000000000..7a6fe384db64
--- /dev/null
+++ b/op-deployer/pkg/deployer/inspect/superchain_registry.go
@@ -0,0 +1,173 @@
+package inspect
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/superchain-registry/superchain"
+
+	"github.com/urfave/cli/v2"
+)
+
+func SuperchainRegistryCLI(cliCtx *cli.Context) error {
+	cfg, err := readConfig(cliCtx)
+	if err != nil {
+		return err
+	}
+
+	globalIntent, err := pipeline.ReadIntent(cfg.Workdir)
+	if err != nil {
+		return fmt.Errorf("failed to read intent: %w", err)
+	}
+
+	envVars := map[string]string{}
+	envVars["SCR_CHAIN_NAME"] = ""
+	envVars["SCR_CHAIN_SHORT_NAME"] = ""
+	envVars["SCR_PUBLIC_RPC"] = ""
+	envVars["SCR_SEQUENCER_RPC"] = ""
+	envVars["SCR_EXPLORER"] = ""
+	envVars["SCR_STANDARD_CHAIN_CANDIDATE"] = "false"
+
+	creationCommit, err := standard.CommitForDeployTag(globalIntent.L2ContractsLocator.Tag)
+	if err != nil {
+		return fmt.Errorf("failed to get commit for deploy tag: %w", err)
+	}
+	envVars["SCR_GENESIS_CREATION_COMMIT"] = creationCommit
+
+	l1ChainName, err := standard.ChainNameFor(globalIntent.L1ChainID)
+	if err != nil {
+		return fmt.Errorf("failed to get l1 chain name: %w", err)
+	}
+	envVars["SCR_SUPERCHAIN_TARGET"] = l1ChainName
+
+	globalState, err := pipeline.ReadState(cfg.Workdir)
+	if err != nil {
+		return fmt.Errorf("failed to read state: %w", err)
+	}
+
+	genesis, rollup, err := GenesisAndRollup(globalState, cfg.ChainID)
+	if err != nil {
+		return fmt.Errorf("failed to generate genesis and rollup: %w", err)
+	}
+	genesisFilepath := filepath.Join(cfg.Workdir, "genesis.json")
+	if err := jsonutil.WriteJSON(genesis, ioutil.ToStdOutOrFileOrNoop(genesisFilepath, 0o666)); err != nil {
+		return fmt.Errorf("failed to write genesis: %w", err)
+	}
+	rollupFilepath := filepath.Join(cfg.Workdir, "rollup.json")
+	if err := jsonutil.WriteJSON(rollup, ioutil.ToStdOutOrFileOrNoop(rollupFilepath, 0o666)); err != nil {
+		return fmt.Errorf("failed to write rollup: %w", err)
+	}
+
+	deployConfig, err := DeployConfig(globalState, cfg.ChainID)
+	if err != nil {
+		return fmt.Errorf("failed to generate deploy config: %w", err)
+	}
+	deployConfigFilepath := filepath.Join(cfg.Workdir, "deploy-config.json")
+	if err := jsonutil.WriteJSON(deployConfig, ioutil.ToStdOutOrFileOrNoop(deployConfigFilepath, 0o666)); err != nil {
+		return fmt.Errorf("failed to write rollup: %w", err)
+	}
+
+	l1Contracts, err := L1(globalState, cfg.ChainID)
+	if err != nil {
+		return fmt.Errorf("failed to generate l1 contracts: %w", err)
+	}
+
+	addressList, err := createAddressList(l1Contracts, globalState.AppliedIntent, cfg.ChainID)
+	if err != nil {
+		return fmt.Errorf("failed to create address list: %w", err)
+	}
+
+	addressListFilepath := filepath.Join(cfg.Workdir, "addresses.json")
+	if err := jsonutil.WriteJSON(addressList, ioutil.ToStdOutOrFileOrNoop(addressListFilepath, 0o666)); err != nil {
+		return fmt.Errorf("failed to write address list: %w", err)
+	}
+
+	envVars["SCR_GENESIS"] = genesisFilepath
+	envVars["SCR_ROLLUP_CONFIG"] = rollupFilepath
+	envVars["SCR_DEPLOY_CONFIG"] = deployConfigFilepath
+	envVars["SCR_DEPLOYMENTS_DIR"] = addressListFilepath
+
+	envFilepath := filepath.Join(cfg.Workdir, "superchain-registry.env")
+	err = writeEnvFile(envFilepath, envVars)
+	if err != nil {
+		return fmt.Errorf("failed to write .env file: %w", err)
+	}
+
+	fmt.Printf("---------------------------------------------------\n"+
+		"Please populate any empty values in your .env file\n"+
+		"before creating your pull-request to add this chain\n"+
+		"to the superchain-registry repo.\n\n"+
+		"  * %s\n"+
+		"---------------------------------------------------\n", envFilepath,
+	)
+
+	return nil
+}
+
+func writeEnvFile(filepath string, envVars map[string]string) error {
+	file, err := os.Create(filepath)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	for key, value := range envVars {
+		_, err := file.WriteString(fmt.Sprintf("%s=\"%s\"\n", key, value))
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func createAddressList(l1Contracts *L1Contracts, appliedIntent *state.Intent, chainId common.Hash) (*superchain.AddressList, error) {
+	chainIntent, err := appliedIntent.Chain(chainId)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get applied chain intent: %w", err)
+	}
+
+	addressList := superchain.AddressList{
+		// Roles
+		Roles: superchain.Roles{
+			Guardian:          superchain.Address(appliedIntent.SuperchainRoles.Guardian),
+			SystemConfigOwner: superchain.Address(chainIntent.Roles.SystemConfigOwner),
+			ProxyAdminOwner:   superchain.Address(chainIntent.Roles.L1ProxyAdminOwner),
+			Challenger:        superchain.Address(chainIntent.Roles.Challenger),
+			Proposer:          superchain.Address(chainIntent.Roles.Proposer),
+			UnsafeBlockSigner: superchain.Address(chainIntent.Roles.UnsafeBlockSigner),
+			BatchSubmitter:    superchain.Address(chainIntent.Roles.Batcher),
+		},
+
+		// Contracts
+		AddressManager:                    superchain.Address(l1Contracts.OpChainDeployment.AddressManagerAddress),
+		L1CrossDomainMessengerProxy:       superchain.Address(l1Contracts.OpChainDeployment.L1CrossDomainMessengerProxyAddress),
+		L1ERC721BridgeProxy:               superchain.Address(l1Contracts.OpChainDeployment.L1ERC721BridgeProxyAddress),
+		L1StandardBridgeProxy:             superchain.Address(l1Contracts.OpChainDeployment.L1StandardBridgeProxyAddress),
+		OptimismMintableERC20FactoryProxy: superchain.Address(l1Contracts.OpChainDeployment.OptimismMintableERC20FactoryProxyAddress),
+		OptimismPortalProxy:               superchain.Address(l1Contracts.OpChainDeployment.OptimismPortalProxyAddress),
+		SystemConfigProxy:                 superchain.Address(l1Contracts.OpChainDeployment.SystemConfigProxyAddress),
+
+		ProxyAdmin:       superchain.Address(l1Contracts.OpChainDeployment.ProxyAdminAddress),
+		SuperchainConfig: superchain.Address(l1Contracts.SuperchainDeployment.SuperchainConfigProxyAddress),
+
+		// Fault proof contracts
+		AnchorStateRegistryProxy: superchain.Address(l1Contracts.OpChainDeployment.AnchorStateRegistryProxyAddress),
+		DelayedWETHProxy:         superchain.Address(l1Contracts.OpChainDeployment.L1CrossDomainMessengerProxyAddress),
+		DisputeGameFactoryProxy:  superchain.Address(l1Contracts.OpChainDeployment.DisputeGameFactoryProxyAddress),
+		FaultDisputeGame:         superchain.Address(l1Contracts.OpChainDeployment.FaultDisputeGameAddress),
+		MIPS:                     superchain.Address(l1Contracts.ImplementationsDeployment.MipsSingletonAddress),
+		PermissionedDisputeGame:  superchain.Address(l1Contracts.OpChainDeployment.PermissionedDisputeGameAddress),
+		PreimageOracle:           superchain.Address(l1Contracts.ImplementationsDeployment.PreimageOracleSingletonAddress),
+	}
+
+	return &addressList, nil
+}
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index ba3031bbe99e..2666891d96fc 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -105,6 +105,28 @@ func SuperchainFor(chainID uint64) (*superchain.Superchain, error) {
 	}
 }
 
+func ChainNameFor(chainID uint64) (string, error) {
+	switch chainID {
+	case 1:
+		return "mainnet", nil
+	case 11155111:
+		return "sepolia", nil
+	default:
+		return "", fmt.Errorf("unrecognized chain ID: %d", chainID)
+	}
+}
+
+func CommitForDeployTag(tag string) (string, error) {
+	switch tag {
+	case "op-contracts/v1.6.0":
+		return "33f06d2d5e4034125df02264a5ffe84571bd0359", nil
+	case "op-contracts/v1.7.0-beta.1+l2-contracts":
+		return "5e14a61547a45eef2ebeba677aee4a049f106ed8", nil
+	default:
+		return "", fmt.Errorf("unsupported tag: %s", tag)
+	}
+}
+
 func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
 	switch chainID {
 	case 1:

From 7f941b84c03beedee232eac9b5af2ff6f9a0d820 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Thu, 31 Oct 2024 23:21:32 +0700
Subject: [PATCH 089/451] Interop: local devnet (#11590)

* local interop devnet

* interop-devnet: experimental op-geth docker image, connect with op-supervisor

* interop-devnet: port and path fixes

* interop-devnet: datadir fix

* interop-local: more fixes

* interop-devnet: connect op-supervisor to L2 EL nodes using RPC

* more fixes

* ops-bedrock: fix l2 op geth dockerfile for interop

* interop-devnet: fix supervisor RPC add workaround

* interop-devnet: implement review suggestions

* fixes from run-testing

* Add op-deployer to dockerignore exceptions

* use latest geth rc

* use RW Locks in Update Functions

* add log for new cross-safe head

* make updates much more frequent

* use LocalDB for LastDerivedFrom

* Add log message for finalization update

* op-supervisor: fix db locking, fix crossdb usage

* interop-devnet: use chain IDs as chain indices, since it's not translated everywhere yet

* op-supervisor: cross-derived-from RPC method

* Work Process ErrFuture to Debug Log

---------

Co-authored-by: axelKingsley <axel.kingsley@gmail.com>
---
 interop-devnet/create-chains.sh               |  77 ++++
 interop-devnet/depset.json                    |  14 +
 interop-devnet/docker-compose.yml             | 354 ++++++++++++++++++
 interop-devnet/justfile                       |  33 ++
 op-chain-ops/devkeys/devkeys.go               |  30 ++
 op-node/cmd/interop/interop.go                | 299 +++++++++++++++
 op-node/cmd/main.go                           |   2 +
 op-node/flags/flags.go                        |   2 +-
 op-node/rollup/interop/interop.go             |   6 +-
 op-service/ioutil/streams.go                  |  16 +
 op-service/jsonutil/json.go                   |   1 +
 op-service/locks/rwmap.go                     |  48 +++
 op-service/locks/rwmap_test.go                |  52 +++
 op-service/locks/rwvalue.go                   |  24 ++
 op-service/locks/rwvalue_test.go              |  16 +
 op-service/sources/supervisor_client.go       |   4 +-
 op-service/testutils/fake_interop_backend.go  |   2 +-
 op-service/testutils/mock_interop_backend.go  |   6 +-
 op-supervisor/supervisor/backend/backend.go   |   4 +-
 .../backend/cross/safe_start_test.go          |   8 +-
 .../supervisor/backend/cross/worker.go        |   9 +-
 op-supervisor/supervisor/backend/db/db.go     |  77 ++--
 .../backend/db/fromda/update_test.go          |   2 +-
 op-supervisor/supervisor/backend/db/query.go  | 116 ++----
 op-supervisor/supervisor/backend/db/update.go |  44 +--
 op-supervisor/supervisor/backend/mock.go      |   2 +-
 op-supervisor/supervisor/frontend/frontend.go |   6 +-
 op-supervisor/supervisor/service.go           |  11 +
 ops-bedrock/l2-op-geth-interop.Dockerfile     |  10 +
 .../op-stack-go/Dockerfile.dockerignore       |   1 +
 30 files changed, 1091 insertions(+), 185 deletions(-)
 create mode 100755 interop-devnet/create-chains.sh
 create mode 100644 interop-devnet/depset.json
 create mode 100644 interop-devnet/docker-compose.yml
 create mode 100644 interop-devnet/justfile
 create mode 100644 op-node/cmd/interop/interop.go
 create mode 100644 op-service/locks/rwmap.go
 create mode 100644 op-service/locks/rwmap_test.go
 create mode 100644 op-service/locks/rwvalue.go
 create mode 100644 op-service/locks/rwvalue_test.go
 create mode 100644 ops-bedrock/l2-op-geth-interop.Dockerfile

diff --git a/interop-devnet/create-chains.sh b/interop-devnet/create-chains.sh
new file mode 100755
index 000000000000..506682099154
--- /dev/null
+++ b/interop-devnet/create-chains.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -eu
+
+# Run this with workdir set as root of the repo
+if [ -f "../versions.json" ]; then
+    echo "Running create-chains script."
+else
+    echo "Cannot run create-chains script, must be in interop-devnet dir, but currently in:"
+    pwd
+    exit 1
+fi
+
+# Navigate to repository root
+cd ..
+
+# Check if already created
+if [ -d ".devnet-interop" ]; then
+    echo "Already created chains."
+    exit 1
+else
+    echo "Creating new interop devnet chain configs"
+fi
+
+export OP_INTEROP_MNEMONIC="test test test test test test test test test test test junk"
+
+go run ./op-node/cmd interop dev-setup \
+  --artifacts-dir=packages/contracts-bedrock/forge-artifacts \
+  --foundry-dir=packages/contracts-bedrock \
+  --l1.chainid=900100 \
+  --l2.chainids=900200,900201 \
+  --out-dir=".devnet-interop" \
+  --log.format=logfmt \
+  --log.level=info
+
+# create L1 CL genesis
+eth2-testnet-genesis deneb \
+  --config=./ops-bedrock/beacon-data/config.yaml \
+  --preset-phase0=minimal \
+  --preset-altair=minimal \
+  --preset-bellatrix=minimal \
+  --preset-capella=minimal \
+  --preset-deneb=minimal \
+  --eth1-config=.devnet-interop/genesis/l1/genesis.json \
+  --state-output=.devnet-interop/genesis/l1/beaconstate.ssz \
+  --tranches-dir=.devnet-interop/genesis/l1/tranches \
+  --mnemonics=./ops-bedrock/mnemonics.yaml \
+  --eth1-withdrawal-address=0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
+  --eth1-match-genesis-time
+
+echo "Writing env files now..."
+
+# write env files for each L2 service
+
+chain_env=".devnet-interop/env/l2/900200"
+mkdir -p "$chain_env"
+key_cmd="go run ./op-node/cmd interop devkey secret --domain=chain-operator --chainid=900200"
+# op-node
+echo "OP_NODE_P2P_SEQUENCER_KEY=$($key_cmd --name=sequencer-p2p)" >> "$chain_env/op-node.env"
+# proposer
+echo "OP_PROPOSER_PRIVATE_KEY=$($key_cmd --name=proposer)" >> "$chain_env/op-proposer.env"
+echo "OP_PROPOSER_GAME_FACTORY_ADDRESS=$(jq -r .DisputeGameFactoryProxy .devnet-interop/deployments/l2/900200/addresses.json)" >> "$chain_env/op-proposer.env"
+# batcher
+echo "OP_BATCHER_PRIVATE_KEY=$($key_cmd --name=batcher)" >> "$chain_env/op-batcher.env"
+
+chain_env=".devnet-interop/env/l2/900201"
+mkdir -p "$chain_env"
+key_cmd="go run ./op-node/cmd interop devkey secret --domain=chain-operator --chainid=900201"
+# op-node
+echo "OP_NODE_P2P_SEQUENCER_KEY=$($key_cmd --name=sequencer-p2p)" >> "$chain_env/op-node.env"
+# proposer
+echo "OP_PROPOSER_PRIVATE_KEY=$($key_cmd --name=proposer)" >> "$chain_env/op-proposer.env"
+echo "OP_PROPOSER_GAME_FACTORY_ADDRESS=$(jq -r .DisputeGameFactoryProxy .devnet-interop/deployments/l2/900201/addresses.json)" >> "$chain_env/op-proposer.env"
+# batcher
+echo "OP_BATCHER_PRIVATE_KEY=$($key_cmd --name=batcher)" >> "$chain_env/op-batcher.env"
+
+echo "Interop devnet setup is complete!"
diff --git a/interop-devnet/depset.json b/interop-devnet/depset.json
new file mode 100644
index 000000000000..6f3600b1d296
--- /dev/null
+++ b/interop-devnet/depset.json
@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "900200": {
+      "chainIndex": "900200",
+      "activationTime": 0,
+      "historyMinTime": 0
+    },
+    "900201": {
+      "chainIndex": "900201",
+      "activationTime": 0,
+      "historyMinTime": 0
+    }
+  }
+}
diff --git a/interop-devnet/docker-compose.yml b/interop-devnet/docker-compose.yml
new file mode 100644
index 000000000000..97ddcbda655f
--- /dev/null
+++ b/interop-devnet/docker-compose.yml
@@ -0,0 +1,354 @@
+# This Compose file is expected to be used with the devnet-up.sh script.
+# The volumes below mount the configs generated by the script into each
+# service.
+
+volumes:
+  l1_data:
+  l1_bn_data:
+  l1_vc_data:
+  l2_a_data:
+  safedb_a_data:
+  l2_b_data:
+  safedb_b_data:
+  supervisor_data:
+  op_log_a:
+  op_log_b:
+
+services:
+
+  l1:
+    build:
+      context: ../ops-bedrock
+      dockerfile: l1-geth.Dockerfile
+    ports:
+      - "8545:8545"
+      - "8546:8546"
+      - "7060:6060"
+    volumes:
+      - "l1_data:/db"
+      - "${PWD}/../.devnet-interop/genesis/l1/genesis.json:/genesis.json"
+      - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
+    environment:
+      GETH_MINER_RECOMMIT: 100ms
+
+  l1-bn:
+    depends_on:
+      - l1
+    build:
+        context: ../ops-bedrock
+        dockerfile: l1-lighthouse.Dockerfile
+    ports:
+      - "9000:9000"
+      - "5052:5052"
+    volumes:
+      - "l1_bn_data:/db"
+      - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
+      - "${PWD}/../ops-bedrock/beacon-data/config.yaml:/genesis/config.yaml"
+      - "${PWD}/../ops-bedrock/beacon-data/deposit_contract_block.txt:/genesis/deposit_contract_block.txt"
+      - "${PWD}/../.devnet-interop/genesis/l1/beaconstate.ssz:/genesis/genesis.ssz"
+    environment:
+      LH_EXECUTION_ENDPOINT: "http://l1:8551"
+    entrypoint:
+      - "/bin/sh"
+      - "/entrypoint-bn.sh"
+
+  l1-vc:
+    depends_on:
+      - l1
+      - l1-bn
+    build:
+        context: ../ops-bedrock
+        dockerfile: l1-lighthouse.Dockerfile
+    volumes:
+      - "l1_vc_data:/db"
+      - "${PWD}/../ops-bedrock/beacon-data/data/keys:/validator_setup/validators"
+      - "${PWD}/../ops-bedrock/beacon-data/data/secrets:/validator_setup/secrets"
+      - "${PWD}/../ops-bedrock/beacon-data/config.yaml:/genesis/config.yaml"
+      - "${PWD}/../ops-bedrock/beacon-data/deposit_contract_block.txt:/genesis/deposit_contract_block.txt"
+      - "${PWD}/../.devnet-interop/genesis/l1/beaconstate.ssz:/genesis/genesis.ssz"
+    environment:
+      LH_BEACON_NODES: "http://l1-bn:5052/"
+    entrypoint:
+      - "/bin/sh"
+      - "/entrypoint-vc.sh"
+
+  op-supervisor:
+    depends_on:
+      - l1
+    build:
+      context: ../
+      dockerfile: ops/docker/op-stack-go/Dockerfile
+      target: op-supervisor-target
+    ports:
+      - "9045:8545"
+    volumes:
+      - "supervisor_data:/db"
+      - "./depset.json:/depset.json"
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-supervisor:devnet
+    command: >
+      op-supervisor
+      --datadir="/db"
+      --dependency-set="/depset.json"
+      --l2-rpcs=""
+      --rpc.addr="0.0.0.0"
+      --rpc.port=8545
+      --rpc.enable-admin
+      --l2-rpcs="ws://l2-a:8546,ws://l2-b:8546"
+
+  l2-a:
+    depends_on:
+      - op-supervisor
+    build:
+      context: ../ops-bedrock/
+      dockerfile: l2-op-geth-interop.Dockerfile
+    ports:
+      - "9145:8545"
+      - "8160:6060"
+    volumes:
+      - "l2_a_data:/db"
+      - "${PWD}/../.devnet-interop/genesis/l2/900200/genesis.json:/genesis.json"
+      - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
+    entrypoint:  # pass the L2 specific flags by overriding the entry-point and adding extra arguments
+      - "/bin/sh"
+      - "/entrypoint.sh"
+    environment:
+      GETH_MINER_RECOMMIT: 100ms
+      GETH_ROLLUP_INTEROPRPC: "ws://op-supervisor:8545"
+
+  l2-b:
+    depends_on:
+      - op-supervisor
+    build:
+      context: ../ops-bedrock/
+      dockerfile: l2-op-geth-interop.Dockerfile
+    ports:
+      - "9245:8545"
+      - "8260:6060"
+    volumes:
+      - "l2_b_data:/db"
+      - "${PWD}/../.devnet-interop/genesis/l2/900201/genesis.json:/genesis.json"
+      - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
+    entrypoint:  # pass the L2 specific flags by overriding the entry-point and adding extra arguments
+      - "/bin/sh"
+      - "/entrypoint.sh"
+    environment:
+      GETH_MINER_RECOMMIT: 100ms
+      GETH_ROLLUP_INTEROPRPC: "ws://op-supervisor:8545"
+
+  op-node-a:
+    depends_on:
+      - l1
+      - l1-bn
+      - l1-vc
+      - l2-a
+      - op-supervisor
+    build:
+      context: ../
+      dockerfile: ops/docker/op-stack-go/Dockerfile
+      target: op-node-target
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:devnet
+    command: >
+      op-node
+      --l1=ws://l1:8546
+      --l1.beacon=http://l1-bn:5052
+      --l1.epoch-poll-interval=12s
+      --l1.http-poll-interval=6s
+      --l2=http://l2-a:8551
+      --l2.jwt-secret=/config/jwt-secret.txt
+      --supervisor=http://op-supervisor:8545
+      --sequencer.enabled
+      --sequencer.l1-confs=0
+      --verifier.l1-confs=0
+      --rollup.config=/rollup.json
+      --rpc.addr=0.0.0.0
+      --rpc.port=8545
+      --p2p.listen.ip=0.0.0.0
+      --p2p.listen.tcp=9003
+      --p2p.listen.udp=9003
+      --p2p.scoring.peers=light
+      --p2p.ban.peers=true
+      --metrics.enabled
+      --metrics.addr=0.0.0.0
+      --metrics.port=7300
+      --pprof.enabled
+      --rpc.enable-admin
+      --safedb.path=/db
+    ports:
+      - "7145:8545"
+      - "9103:9003"
+      - "7100:7300"
+      - "6160:6060"
+    volumes:
+      - "safedb_a_data:/db"
+      - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
+      - "${PWD}/../.devnet-interop/genesis/l2/900200/rollup.json:/rollup.json"
+      - op_log_a:/op_log
+    env_file:
+      - "${PWD}/../.devnet-interop/env/l2/900200/op-node.env"
+
+  op-node-b:
+    depends_on:
+      - l1
+      - l1-bn
+      - l1-vc
+      - l2-b
+      - op-supervisor
+    build:
+      context: ../
+      dockerfile: ops/docker/op-stack-go/Dockerfile
+      target: op-node-target
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:devnet
+    command: >
+      op-node
+      --l1=ws://l1:8546
+      --l1.beacon=http://l1-bn:5052
+      --l1.epoch-poll-interval=12s
+      --l1.http-poll-interval=6s
+      --l2=http://l2-b:8551
+      --l2.jwt-secret=/config/jwt-secret.txt
+      --supervisor=http://op-supervisor:8545
+      --sequencer.enabled
+      --sequencer.l1-confs=0
+      --verifier.l1-confs=0
+      --rollup.config=/rollup.json
+      --rpc.addr=0.0.0.0
+      --rpc.port=8545
+      --p2p.listen.ip=0.0.0.0
+      --p2p.listen.tcp=9003
+      --p2p.listen.udp=9003
+      --p2p.scoring.peers=light
+      --p2p.ban.peers=true
+      --metrics.enabled
+      --metrics.addr=0.0.0.0
+      --metrics.port=7300
+      --pprof.enabled
+      --rpc.enable-admin
+      --safedb.path=/db
+    ports:
+      - "7245:8545"
+      - "9203:9003"
+      - "7200:7300"
+      - "6260:6060"
+    volumes:
+      - "safedb_b_data:/db"
+      - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
+      - "${PWD}/../.devnet-interop/genesis/l2/900201/rollup.json:/rollup.json"
+      - op_log_b:/op_log
+    env_file:
+      - "${PWD}/../.devnet-interop/env/l2/900201/op-node.env"
+
+  op-proposer-a:
+    depends_on:
+      - l1
+      - op-node-a
+    build:
+      context: ../
+      dockerfile: ops/docker/op-stack-go/Dockerfile
+      target: op-proposer-target
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:devnet
+    ports:
+      - "6162:6060"
+      - "7102:7300"
+      - "6146:8545"
+    environment:
+      OP_PROPOSER_L1_ETH_RPC: http://l1:8545
+      OP_PROPOSER_ROLLUP_RPC: http://op-node-a:8545
+      OP_PROPOSER_POLL_INTERVAL: 1s
+      OP_PROPOSER_NUM_CONFIRMATIONS: 1
+      OP_PROPOSER_GAME_TYPE: "254"
+      OP_PROPOSER_PROPOSAL_INTERVAL: "12s"
+      OP_PROPOSER_PPROF_ENABLED: "true"
+      OP_PROPOSER_METRICS_ENABLED: "true"
+      OP_PROPOSER_ALLOW_NON_FINALIZED: "true"
+      OP_PROPOSER_RPC_ENABLE_ADMIN: "true"
+    env_file:
+      - "${PWD}/../.devnet-interop/env/l2/900200/op-proposer.env"
+
+  op-proposer-b:
+    depends_on:
+      - l1
+      - op-node-b
+    build:
+      context: ../
+      dockerfile: ops/docker/op-stack-go/Dockerfile
+      target: op-proposer-target
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:devnet
+    ports:
+      - "6262:6060"
+      - "7202:7300"
+      - "6246:8545"
+    environment:
+      OP_PROPOSER_L1_ETH_RPC: http://l1:8545
+      OP_PROPOSER_ROLLUP_RPC: http://op-node-b:8545
+      OP_PROPOSER_POLL_INTERVAL: 1s
+      OP_PROPOSER_NUM_CONFIRMATIONS: 1
+      OP_PROPOSER_GAME_TYPE: "254"
+      OP_PROPOSER_PROPOSAL_INTERVAL: "12s"
+      OP_PROPOSER_PPROF_ENABLED: "true"
+      OP_PROPOSER_METRICS_ENABLED: "true"
+      OP_PROPOSER_ALLOW_NON_FINALIZED: "true"
+      OP_PROPOSER_RPC_ENABLE_ADMIN: "true"
+    env_file:
+      - "${PWD}/../.devnet-interop/env/l2/900201/op-proposer.env"
+
+  op-batcher-a:
+    depends_on:
+      - l1
+      - l2-a
+      - op-node-a
+    build:
+      context: ../
+      dockerfile: ops/docker/op-stack-go/Dockerfile
+      target: op-batcher-target
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:devnet
+    ports:
+      - "6161:6060"
+      - "7101:7300"
+      - "6145:8545"
+    environment:
+      OP_BATCHER_L1_ETH_RPC: http://l1:8545
+      OP_BATCHER_L2_ETH_RPC: http://l2-a:8545
+      OP_BATCHER_ROLLUP_RPC: http://op-node-a:8545
+      OP_BATCHER_MAX_CHANNEL_DURATION: 2
+      OP_BATCHER_SUB_SAFETY_MARGIN: 4 # SWS is 15, ChannelTimeout is 40
+      OP_BATCHER_POLL_INTERVAL: 1s
+      OP_BATCHER_NUM_CONFIRMATIONS: 1
+      OP_BATCHER_PPROF_ENABLED: "true"
+      OP_BATCHER_METRICS_ENABLED: "true"
+      OP_BATCHER_RPC_ENABLE_ADMIN: "true"
+      OP_BATCHER_BATCH_TYPE:
+      # uncomment to use blobs
+      # OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs
+    env_file:
+      - "${PWD}/../.devnet-interop/env/l2/900200/op-batcher.env"
+
+  op-batcher-b:
+    depends_on:
+      - l1
+      - l2-b
+      - op-node-b
+    build:
+      context: ../
+      dockerfile: ops/docker/op-stack-go/Dockerfile
+      target: op-batcher-target
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:devnet
+    ports:
+      - "6261:6060"
+      - "7201:7300"
+      - "6245:8545"
+    environment:
+      OP_BATCHER_L1_ETH_RPC: http://l1:8545
+      OP_BATCHER_L2_ETH_RPC: http://l2-b:8545
+      OP_BATCHER_ROLLUP_RPC: http://op-node-b:8545
+      OP_BATCHER_MAX_CHANNEL_DURATION: 2
+      OP_BATCHER_SUB_SAFETY_MARGIN: 4 # SWS is 15, ChannelTimeout is 40
+      OP_BATCHER_POLL_INTERVAL: 1s
+      OP_BATCHER_NUM_CONFIRMATIONS: 1
+      OP_BATCHER_PPROF_ENABLED: "true"
+      OP_BATCHER_METRICS_ENABLED: "true"
+      OP_BATCHER_RPC_ENABLE_ADMIN: "true"
+      OP_BATCHER_BATCH_TYPE:
+      # uncomment to use blobs
+      # OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs
+    env_file:
+      - "${PWD}/../.devnet-interop/env/l2/900201/op-batcher.env"
diff --git a/interop-devnet/justfile b/interop-devnet/justfile
new file mode 100644
index 000000000000..7aa215dbbd7f
--- /dev/null
+++ b/interop-devnet/justfile
@@ -0,0 +1,33 @@
+
+devnet-setup:
+  bash create-chains.sh
+
+devnet-build-images:
+  PWD="$(pwd)" DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=1 \
+    docker compose build --progress plain \
+       --build-arg GIT_COMMIT={git_commit} \
+       --build-arg GIT_DATE={git_date}
+
+devnet-up:
+  docker compose up -d l1 l1-bn l1-vc
+
+  docker compose up -d \
+    op-supervisor \
+    op-node-a op-batcher-a op-proposer-a \
+    op-node-b op-batcher-b op-proposer-b
+
+devnet-down:
+  # stops services, does not remove containers/networks
+  docker compose stop
+
+devnet-clean:
+  rm -rf ../.devnet-interop
+  # Stops services, and removes containers/networks
+  docker compose down
+  # Now manually clean up the related images and volumes
+  # Note: `justfile` interprets the curly brackets. So we escape them, by wrapping it with more, as a string, like Jinja2.
+  docker image ls 'interop-devnet*' --format='{{ '{{.Repository}}' }}' | xargs -r docker rmi
+  docker volume ls --filter name=interop-devnet --format='{{ '{{.Name}}' }}' | xargs -r docker volume rm
+
+devnet-logs:
+  docker compose logs -f
diff --git a/op-chain-ops/devkeys/devkeys.go b/op-chain-ops/devkeys/devkeys.go
index d0526c8c1d3a..fdb151e4e6fc 100644
--- a/op-chain-ops/devkeys/devkeys.go
+++ b/op-chain-ops/devkeys/devkeys.go
@@ -93,6 +93,21 @@ func (role SuperchainOperatorRole) Key(chainID *big.Int) Key {
 	}
 }
 
+func (role *SuperchainOperatorRole) UnmarshalText(data []byte) error {
+	v := string(data)
+	for i := SuperchainOperatorRole(0); i < 20; i++ {
+		if i.String() == v {
+			*role = i
+			return nil
+		}
+	}
+	return fmt.Errorf("unknown superchain operator role %q", v)
+}
+
+func (role *SuperchainOperatorRole) MarshalText() ([]byte, error) {
+	return []byte(role.String()), nil
+}
+
 // SuperchainOperatorKey is an account specific to an OperationRole of a given OP-Stack chain.
 type SuperchainOperatorKey struct {
 	ChainID *big.Int
@@ -181,6 +196,21 @@ func (role ChainOperatorRole) Key(chainID *big.Int) Key {
 	}
 }
 
+func (role *ChainOperatorRole) UnmarshalText(data []byte) error {
+	v := string(data)
+	for i := ChainOperatorRole(0); i < 20; i++ {
+		if i.String() == v {
+			*role = i
+			return nil
+		}
+	}
+	return fmt.Errorf("unknown chain operator role %q", v)
+}
+
+func (role *ChainOperatorRole) MarshalText() ([]byte, error) {
+	return []byte(role.String()), nil
+}
+
 // ChainOperatorKey is an account specific to an OperationRole of a given OP-Stack chain.
 type ChainOperatorKey struct {
 	ChainID *big.Int
diff --git a/op-node/cmd/interop/interop.go b/op-node/cmd/interop/interop.go
new file mode 100644
index 000000000000..3e6f75d530bb
--- /dev/null
+++ b/op-node/cmd/interop/interop.go
@@ -0,0 +1,299 @@
+package interop
+
+import (
+	"fmt"
+	"math/big"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/interopgen"
+	op_service "github.com/ethereum-optimism/optimism/op-service"
+	"github.com/ethereum-optimism/optimism/op-service/cliapp"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+var EnvPrefix = "OP_INTEROP"
+
+var (
+	l1ChainIDFlag = &cli.Uint64Flag{
+		Name:    "l1.chainid",
+		Value:   900100,
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "L1_CHAINID"),
+	}
+	l2ChainIDsFlag = &cli.Uint64SliceFlag{
+		Name:    "l2.chainids",
+		Value:   cli.NewUint64Slice(900200, 900201),
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "L2_CHAINIDS"),
+	}
+	timestampFlag = &cli.Uint64Flag{
+		Name:    "timestamp",
+		Value:   0,
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "TIMESTAMP"),
+		Usage:   "Will use current timestamp, plus 5 seconds, if not set",
+	}
+	artifactsDirFlag = &cli.StringFlag{
+		Name:    "artifacts-dir",
+		Value:   "packages/contracts-bedrock/forge-artifacts",
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "ARTIFACTS_DIR"),
+	}
+	foundryDirFlag = &cli.StringFlag{
+		Name:    "foundry-dir",
+		Value:   "packages/contracts-bedrock",
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "FOUNDRY_DIR"),
+		Usage:   "Optional, for source-map info during genesis generation",
+	}
+	outDirFlag = &cli.StringFlag{
+		Name:    "out-dir",
+		Value:   ".interop-devnet",
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "OUT_DIR"),
+	}
+	// used in both dev-setup and devkey commands
+	mnemonicFlag = &cli.StringFlag{
+		Name:    "mnemonic",
+		Value:   devkeys.TestMnemonic,
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "MNEMONIC"),
+	}
+	// for devkey command
+	devkeyDomainFlag = &cli.StringFlag{
+		Name:    "domain",
+		Value:   "chain-operator",
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "DEVKEY_DOMAIN"),
+	}
+	devkeyChainIdFlag = &cli.Uint64Flag{
+		Name:    "chainid",
+		Value:   0,
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "DEVKEY_CHAINID"),
+	}
+	devkeyNameFlag = &cli.StringFlag{
+		Name:    "name",
+		EnvVars: op_service.PrefixEnvVar(EnvPrefix, "DEVKEY_NAME"),
+	}
+)
+
+var InteropDevSetup = &cli.Command{
+	Name:  "dev-setup",
+	Usage: "Generate devnet genesis configs with one L1 and multiple L2s",
+	Flags: cliapp.ProtectFlags(append([]cli.Flag{
+		l1ChainIDFlag,
+		l2ChainIDsFlag,
+		timestampFlag,
+		mnemonicFlag,
+		artifactsDirFlag,
+		foundryDirFlag,
+		outDirFlag,
+	}, oplog.CLIFlags(EnvPrefix)...)),
+	Action: func(cliCtx *cli.Context) error {
+		logCfg := oplog.ReadCLIConfig(cliCtx)
+		logger := oplog.NewLogger(cliCtx.App.Writer, logCfg)
+
+		recipe := &interopgen.InteropDevRecipe{
+			L1ChainID:        cliCtx.Uint64(l1ChainIDFlag.Name),
+			L2ChainIDs:       cliCtx.Uint64Slice(l2ChainIDsFlag.Name),
+			GenesisTimestamp: cliCtx.Uint64(timestampFlag.Name),
+		}
+		if recipe.GenesisTimestamp == 0 {
+			recipe.GenesisTimestamp = uint64(time.Now().Unix() + 5)
+		}
+		mnemonic := strings.TrimSpace(cliCtx.String(mnemonicFlag.Name))
+		if mnemonic == devkeys.TestMnemonic {
+			logger.Warn("Using default test mnemonic!")
+		}
+		keys, err := devkeys.NewMnemonicDevKeys(mnemonic)
+		if err != nil {
+			return fmt.Errorf("failed to setup dev keys from mnemonic: %w", err)
+		}
+		worldCfg, err := recipe.Build(keys)
+		if err != nil {
+			return fmt.Errorf("failed to build deploy configs from interop recipe: %w", err)
+		}
+		if err := worldCfg.Check(logger); err != nil {
+			return fmt.Errorf("invalid deploy configs: %w", err)
+		}
+		artifactsDir := cliCtx.String(artifactsDirFlag.Name)
+		af := foundry.OpenArtifactsDir(artifactsDir)
+		var srcFs *foundry.SourceMapFS
+		if cliCtx.IsSet(foundryDirFlag.Name) {
+			srcDir := cliCtx.String(foundryDirFlag.Name)
+			srcFs = foundry.NewSourceMapFS(os.DirFS(srcDir))
+		}
+		worldDeployment, worldOutput, err := interopgen.Deploy(logger, af, srcFs, worldCfg)
+		if err != nil {
+			return fmt.Errorf("failed to deploy interop dev setup: %w", err)
+		}
+		outDir := cliCtx.String(outDirFlag.Name)
+		// Write deployments
+		{
+			deploymentsDir := filepath.Join(outDir, "deployments")
+			l1Dir := filepath.Join(deploymentsDir, "l1")
+			if err := writeJson(filepath.Join(l1Dir, "common.json"), worldDeployment.L1); err != nil {
+				return fmt.Errorf("failed to write L1 deployment data: %w", err)
+			}
+			if err := writeJson(filepath.Join(l1Dir, "superchain.json"), worldDeployment.Superchain); err != nil {
+				return fmt.Errorf("failed to write Superchain deployment data: %w", err)
+			}
+			l2sDir := filepath.Join(deploymentsDir, "l2")
+			for id, dep := range worldDeployment.L2s {
+				l2Dir := filepath.Join(l2sDir, id)
+				if err := writeJson(filepath.Join(l2Dir, "addresses.json"), dep); err != nil {
+					return fmt.Errorf("failed to write L2 %s deployment data: %w", id, err)
+				}
+			}
+		}
+		// write genesis
+		{
+			genesisDir := filepath.Join(outDir, "genesis")
+			l1Dir := filepath.Join(genesisDir, "l1")
+			if err := writeJson(filepath.Join(l1Dir, "genesis.json"), worldOutput.L1.Genesis); err != nil {
+				return fmt.Errorf("failed to write L1 genesis data: %w", err)
+			}
+			l2sDir := filepath.Join(genesisDir, "l2")
+			for id, dep := range worldOutput.L2s {
+				l2Dir := filepath.Join(l2sDir, id)
+				if err := writeJson(filepath.Join(l2Dir, "genesis.json"), dep.Genesis); err != nil {
+					return fmt.Errorf("failed to write L2 %s genesis config: %w", id, err)
+				}
+				if err := writeJson(filepath.Join(l2Dir, "rollup.json"), dep.RollupCfg); err != nil {
+					return fmt.Errorf("failed to write L2 %s rollup config: %w", id, err)
+				}
+			}
+		}
+		return nil
+	},
+}
+
+func writeJson(path string, content any) error {
+	return jsonutil.WriteJSON[any](content, ioutil.ToBasicFile(path, 0o755))
+}
+
+var DevKeySecretCmd = &cli.Command{
+	Name:  "secret",
+	Usage: "Retrieve devkey secret, by specifying domain, chain ID, name.",
+	Flags: cliapp.ProtectFlags([]cli.Flag{
+		mnemonicFlag,
+		devkeyDomainFlag,
+		devkeyChainIdFlag,
+		devkeyNameFlag,
+	}),
+	Action: func(context *cli.Context) error {
+		mnemonic := context.String(mnemonicFlag.Name)
+		domain := context.String(devkeyDomainFlag.Name)
+		chainID := context.Uint64(devkeyChainIdFlag.Name)
+		chainIDBig := new(big.Int).SetUint64(chainID)
+		name := context.String(devkeyNameFlag.Name)
+		k, err := parseKey(domain, chainIDBig, name)
+		if err != nil {
+			return err
+		}
+		mnemonicKeys, err := devkeys.NewMnemonicDevKeys(mnemonic)
+		if err != nil {
+			return err
+		}
+		secret, err := mnemonicKeys.Secret(k)
+		if err != nil {
+			return err
+		}
+		secretBin := crypto.FromECDSA(secret)
+		_, err = fmt.Fprintf(context.App.Writer, "%x", secretBin)
+		if err != nil {
+			return fmt.Errorf("failed to output secret key: %w", err)
+		}
+		return nil
+	},
+}
+
+var DevKeyAddressCmd = &cli.Command{
+	Name:  "address",
+	Usage: "Retrieve devkey address, by specifying domain, chain ID, name.",
+	Flags: cliapp.ProtectFlags([]cli.Flag{
+		mnemonicFlag,
+		devkeyDomainFlag,
+		devkeyChainIdFlag,
+		devkeyNameFlag,
+	}),
+	Action: func(context *cli.Context) error {
+		mnemonic := context.String(mnemonicFlag.Name)
+		domain := context.String(devkeyDomainFlag.Name)
+		chainID := context.Uint64(devkeyChainIdFlag.Name)
+		chainIDBig := new(big.Int).SetUint64(chainID)
+		name := context.String(devkeyNameFlag.Name)
+		k, err := parseKey(domain, chainIDBig, name)
+		if err != nil {
+			return err
+		}
+		mnemonicKeys, err := devkeys.NewMnemonicDevKeys(mnemonic)
+		if err != nil {
+			return err
+		}
+		addr, err := mnemonicKeys.Address(k)
+		if err != nil {
+			return err
+		}
+		_, err = fmt.Fprintf(context.App.Writer, "%s", addr)
+		if err != nil {
+			return fmt.Errorf("failed to output address: %w", err)
+		}
+		return nil
+	},
+}
+
+var DevKeyCmd = &cli.Command{
+	Name:  "devkey",
+	Usage: "Retrieve devkey secret or address",
+	Subcommands: cli.Commands{
+		DevKeySecretCmd,
+		DevKeyAddressCmd,
+	},
+}
+
+func parseKey(domain string, chainID *big.Int, name string) (devkeys.Key, error) {
+	switch domain {
+	case "user":
+		index, err := strconv.ParseUint(name, 10, 64)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse user index: %w", err)
+		}
+		return devkeys.ChainUserKey{
+			ChainID: chainID,
+			Index:   index,
+		}, nil
+	case "chain-operator":
+		var role devkeys.ChainOperatorRole
+		if err := role.UnmarshalText([]byte(name)); err != nil {
+			return nil, fmt.Errorf("failed to parse chain operator role: %w", err)
+		}
+		return devkeys.ChainOperatorKey{
+			ChainID: chainID,
+			Role:    role,
+		}, nil
+	case "superchain-operator":
+		var role devkeys.SuperchainOperatorRole
+		if err := role.UnmarshalText([]byte(name)); err != nil {
+			return nil, fmt.Errorf("failed to parse chain operator role: %w", err)
+		}
+		return devkeys.SuperchainOperatorKey{
+			ChainID: chainID,
+			Role:    role,
+		}, nil
+	default:
+		return nil, fmt.Errorf("unknown devkey domain %q", domain)
+	}
+}
+
+var InteropCmd = &cli.Command{
+	Name:  "interop",
+	Usage: "Experimental tools for OP-Stack interop networks.",
+	Subcommands: cli.Commands{
+		InteropDevSetup,
+		DevKeyCmd,
+	},
+}
diff --git a/op-node/cmd/main.go b/op-node/cmd/main.go
index 8f6688b51cbf..b82b3f6babce 100644
--- a/op-node/cmd/main.go
+++ b/op-node/cmd/main.go
@@ -12,6 +12,7 @@ import (
 	opnode "github.com/ethereum-optimism/optimism/op-node"
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/cmd/genesis"
+	"github.com/ethereum-optimism/optimism/op-node/cmd/interop"
 	"github.com/ethereum-optimism/optimism/op-node/cmd/networks"
 	"github.com/ethereum-optimism/optimism/op-node/cmd/p2p"
 	"github.com/ethereum-optimism/optimism/op-node/flags"
@@ -62,6 +63,7 @@ func main() {
 			Name:        "networks",
 			Subcommands: networks.Subcommands,
 		},
+		interop.InteropCmd,
 	}
 
 	ctx := ctxinterrupt.WithSignalWaiterMain(context.Background())
diff --git a/op-node/flags/flags.go b/op-node/flags/flags.go
index 54334c150296..de94b59c0e04 100644
--- a/op-node/flags/flags.go
+++ b/op-node/flags/flags.go
@@ -73,6 +73,7 @@ var (
 		EnvVars:  prefixEnvVars("L1_BEACON"),
 		Category: RollupCategory,
 	}
+	/* Optional Flags */
 	SupervisorAddr = &cli.StringFlag{
 		Name: "supervisor",
 		Usage: "RPC address of interop supervisor service for cross-chain safety verification." +
@@ -80,7 +81,6 @@ var (
 		Hidden:  true, // hidden for now during early testing.
 		EnvVars: prefixEnvVars("SUPERVISOR"),
 	}
-	/* Optional Flags */
 	BeaconHeader = &cli.StringFlag{
 		Name:     "l1.beacon-header",
 		Usage:    "Optional HTTP header to add to all requests to the L1 Beacon endpoint. Format: 'X-Key: Value'",
diff --git a/op-node/rollup/interop/interop.go b/op-node/rollup/interop/interop.go
index c929c8f0d01d..a4342b6a19f6 100644
--- a/op-node/rollup/interop/interop.go
+++ b/op-node/rollup/interop/interop.go
@@ -27,7 +27,7 @@ type InteropBackend interface {
 	SafeView(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error)
 	Finalized(ctx context.Context, chainID types.ChainID) (eth.BlockID, error)
 
-	DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error)
+	CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error)
 
 	UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error
 	UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error
@@ -232,10 +232,11 @@ func (d *InteropDeriver) onCrossSafeUpdateEvent(x engine.CrossSafeUpdateEvent) e
 		Hash:   result.Cross.Hash,
 		Number: result.Cross.Number,
 	}
-	derivedFrom, err := d.backend.DerivedFrom(ctx, d.chainID, derived)
+	derivedFrom, err := d.backend.CrossDerivedFrom(ctx, d.chainID, derived)
 	if err != nil {
 		return fmt.Errorf("failed to get derived-from of %s: %w", result.Cross, err)
 	}
+	d.log.Info("New cross-safe block", "block", result.Cross.Number)
 	ref, err := d.l2.L2BlockRefByHash(ctx, result.Cross.Hash)
 	if err != nil {
 		return fmt.Errorf("failed to get block ref of %s: %w", result.Cross, err)
@@ -272,6 +273,7 @@ func (d *InteropDeriver) onFinalizedUpdate(x engine.FinalizedUpdateEvent) error
 	if err != nil {
 		return fmt.Errorf("failed to get block ref of %s: %w", finalized, err)
 	}
+	d.log.Info("New finalized block from supervisor", "block", finalized.Number)
 	d.emitter.Emit(engine.PromoteFinalizedEvent{
 		Ref: ref,
 	})
diff --git a/op-service/ioutil/streams.go b/op-service/ioutil/streams.go
index 91f122906db0..c35aefa202ef 100644
--- a/op-service/ioutil/streams.go
+++ b/op-service/ioutil/streams.go
@@ -1,8 +1,10 @@
 package ioutil
 
 import (
+	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 )
 
 var (
@@ -21,6 +23,20 @@ func NoOutputStream() OutputTarget {
 	}
 }
 
+func ToBasicFile(path string, perm os.FileMode) OutputTarget {
+	return func() (io.Writer, io.Closer, Aborter, error) {
+		outDir := filepath.Dir(path)
+		if err := os.MkdirAll(outDir, perm); err != nil {
+			return nil, nil, nil, fmt.Errorf("failed to create dir %q: %w", outDir, err)
+		}
+		f, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, perm)
+		if err != nil {
+			return nil, nil, nil, fmt.Errorf("failed to open %q: %w", path, err)
+		}
+		return f, f, func() {}, nil
+	}
+}
+
 func ToAtomicFile(path string, perm os.FileMode) OutputTarget {
 	return func() (io.Writer, io.Closer, Aborter, error) {
 		f, err := NewAtomicWriterCompressed(path, perm)
diff --git a/op-service/jsonutil/json.go b/op-service/jsonutil/json.go
index 5993138595b4..8549c170d42a 100644
--- a/op-service/jsonutil/json.go
+++ b/op-service/jsonutil/json.go
@@ -67,6 +67,7 @@ type jsonEncoder struct {
 func newJSONEncoder(w io.Writer) Encoder {
 	e := json.NewEncoder(w)
 	e.SetIndent("", "  ")
+	e.SetEscapeHTML(false)
 	return &jsonEncoder{
 		e: e,
 	}
diff --git a/op-service/locks/rwmap.go b/op-service/locks/rwmap.go
new file mode 100644
index 000000000000..779e3554c824
--- /dev/null
+++ b/op-service/locks/rwmap.go
@@ -0,0 +1,48 @@
+package locks
+
+import "sync"
+
+// RWMap is a simple wrapper around a map, with global Read-Write protection.
+// For many concurrent reads/writes a sync.Map may be more performant,
+// although it does not utilize Go generics.
+// The RWMap does not have to be initialized,
+// it is immediately ready for reads/writes.
+type RWMap[K comparable, V any] struct {
+	inner map[K]V
+	mu    sync.RWMutex
+}
+
+func (m *RWMap[K, V]) Has(key K) (ok bool) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	_, ok = m.inner[key]
+	return
+}
+
+func (m *RWMap[K, V]) Get(key K) (value V, ok bool) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	value, ok = m.inner[key]
+	return
+}
+
+func (m *RWMap[K, V]) Set(key K, value V) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.inner == nil {
+		m.inner = make(map[K]V)
+	}
+	m.inner[key] = value
+}
+
+// Range calls f sequentially for each key and value present in the map.
+// If f returns false, range stops the iteration.
+func (m *RWMap[K, V]) Range(f func(key K, value V) bool) {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	for k, v := range m.inner {
+		if !f(k, v) {
+			break
+		}
+	}
+}
diff --git a/op-service/locks/rwmap_test.go b/op-service/locks/rwmap_test.go
new file mode 100644
index 000000000000..c78fab97034b
--- /dev/null
+++ b/op-service/locks/rwmap_test.go
@@ -0,0 +1,52 @@
+package locks
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestRWMap(t *testing.T) {
+	m := &RWMap[uint64, int64]{}
+
+	// get on new map
+	v, ok := m.Get(123)
+	require.False(t, ok)
+	require.Equal(t, int64(0), v)
+
+	// set a value
+	m.Set(123, 42)
+	v, ok = m.Get(123)
+	require.True(t, ok)
+	require.Equal(t, int64(42), v)
+
+	// overwrite a value
+	m.Set(123, -42)
+	v, ok = m.Get(123)
+	require.True(t, ok)
+	require.Equal(t, int64(-42), v)
+
+	// add a value
+	m.Set(10, 100)
+
+	// range over values
+	got := make(map[uint64]int64)
+	m.Range(func(key uint64, value int64) bool {
+		if _, ok := got[key]; ok {
+			panic("duplicate")
+		}
+		got[key] = value
+		return true
+	})
+	require.Len(t, got, 2)
+	require.Equal(t, int64(100), got[uint64(10)])
+	require.Equal(t, int64(-42), got[uint64(123)])
+
+	// range and stop early
+	clear(got)
+	m.Range(func(key uint64, value int64) bool {
+		got[key] = value
+		return false
+	})
+	require.Len(t, got, 1, "stop early")
+}
diff --git a/op-service/locks/rwvalue.go b/op-service/locks/rwvalue.go
new file mode 100644
index 000000000000..12ca65e61d73
--- /dev/null
+++ b/op-service/locks/rwvalue.go
@@ -0,0 +1,24 @@
+package locks
+
+import "sync"
+
+// RWValue is a simple container struct, to deconflict reads/writes of the value,
+// without locking up a bigger structure in the caller.
+// It exposes the underlying RWLock and Value for direct access where needed.
+type RWValue[E any] struct {
+	sync.RWMutex
+	Value E
+}
+
+func (c *RWValue[E]) Get() (out E) {
+	c.RLock()
+	defer c.RUnlock()
+	out = c.Value
+	return
+}
+
+func (c *RWValue[E]) Set(v E) {
+	c.Lock()
+	defer c.Unlock()
+	c.Value = v
+}
diff --git a/op-service/locks/rwvalue_test.go b/op-service/locks/rwvalue_test.go
new file mode 100644
index 000000000000..f99d9345a1cc
--- /dev/null
+++ b/op-service/locks/rwvalue_test.go
@@ -0,0 +1,16 @@
+package locks
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestRWValue(t *testing.T) {
+	v := &RWValue[uint64]{}
+	require.Equal(t, uint64(0), v.Get())
+	v.Set(123)
+	require.Equal(t, uint64(123), v.Get())
+	v.Set(42)
+	require.Equal(t, uint64(42), v.Get())
+}
diff --git a/op-service/sources/supervisor_client.go b/op-service/sources/supervisor_client.go
index ba8663c335ce..d6191b9cfb20 100644
--- a/op-service/sources/supervisor_client.go
+++ b/op-service/sources/supervisor_client.go
@@ -114,12 +114,12 @@ func (cl *SupervisorClient) Finalized(ctx context.Context, chainID types.ChainID
 	return result, err
 }
 
-func (cl *SupervisorClient) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.BlockRef, error) {
+func (cl *SupervisorClient) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.BlockRef, error) {
 	var result eth.BlockRef
 	err := cl.client.CallContext(
 		ctx,
 		&result,
-		"supervisor_derivedFrom",
+		"supervisor_crossDerivedFrom",
 		chainID,
 		derived)
 	return result, err
diff --git a/op-service/testutils/fake_interop_backend.go b/op-service/testutils/fake_interop_backend.go
index 4ef439a9a3bc..4c8624d53552 100644
--- a/op-service/testutils/fake_interop_backend.go
+++ b/op-service/testutils/fake_interop_backend.go
@@ -29,7 +29,7 @@ func (m *FakeInteropBackend) Finalized(ctx context.Context, chainID types.ChainI
 	return m.FinalizedFn(ctx, chainID)
 }
 
-func (m *FakeInteropBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
+func (m *FakeInteropBackend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
 	return m.DerivedFromFn(ctx, chainID, derived)
 }
 
diff --git a/op-service/testutils/mock_interop_backend.go b/op-service/testutils/mock_interop_backend.go
index 6724acedd43f..af6762c204cd 100644
--- a/op-service/testutils/mock_interop_backend.go
+++ b/op-service/testutils/mock_interop_backend.go
@@ -58,13 +58,13 @@ func (m *MockInteropBackend) ExpectFinalized(chainID types.ChainID, result eth.B
 	m.Mock.On("Finalized", chainID).Once().Return(result, &err)
 }
 
-func (m *MockInteropBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
-	result := m.Mock.MethodCalled("DerivedFrom", chainID, derived)
+func (m *MockInteropBackend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.L1BlockRef, error) {
+	result := m.Mock.MethodCalled("CrossDerivedFrom", chainID, derived)
 	return result.Get(0).(eth.L1BlockRef), *result.Get(1).(*error)
 }
 
 func (m *MockInteropBackend) ExpectDerivedFrom(chainID types.ChainID, derived eth.BlockID, result eth.L1BlockRef, err error) {
-	m.Mock.On("DerivedFrom", chainID, derived).Once().Return(result, &err)
+	m.Mock.On("CrossDerivedFrom", chainID, derived).Once().Return(result, &err)
 }
 
 func (m *MockInteropBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index ff5d5575cd31..d4328f6932c7 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -402,11 +402,11 @@ func (su *SupervisorBackend) Finalized(ctx context.Context, chainID types.ChainI
 	return v.ID(), nil
 }
 
-func (su *SupervisorBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
+func (su *SupervisorBackend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
-	v, err := su.chainDBs.DerivedFrom(chainID, derived)
+	v, err := su.chainDBs.CrossDerivedFromBlockRef(chainID, derived)
 	if err != nil {
 		return eth.BlockRef{}, err
 	}
diff --git a/op-supervisor/supervisor/backend/cross/safe_start_test.go b/op-supervisor/supervisor/backend/cross/safe_start_test.go
index cb6bd4757214..1a5924e06963 100644
--- a/op-supervisor/supervisor/backend/cross/safe_start_test.go
+++ b/op-supervisor/supervisor/backend/cross/safe_start_test.go
@@ -223,7 +223,7 @@ func TestCrossSafeHazards(t *testing.T) {
 		require.ErrorContains(t, err, "some error")
 		require.Empty(t, hazards)
 	})
-	t.Run("timestamp is less, DerivedFrom returns error", func(t *testing.T) {
+	t.Run("timestamp is less, CrossDerivedFrom returns error", func(t *testing.T) {
 		ssd := &mockSafeStartDeps{}
 		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
 		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
@@ -245,7 +245,7 @@ func TestCrossSafeHazards(t *testing.T) {
 		require.ErrorContains(t, err, "some error")
 		require.Empty(t, hazards)
 	})
-	t.Run("timestamp is less, DerivedFrom Number is greater", func(t *testing.T) {
+	t.Run("timestamp is less, CrossDerivedFrom Number is greater", func(t *testing.T) {
 		ssd := &mockSafeStartDeps{}
 		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
 		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
@@ -268,7 +268,7 @@ func TestCrossSafeHazards(t *testing.T) {
 		require.ErrorIs(t, err, types.ErrOutOfScope)
 		require.Empty(t, hazards)
 	})
-	t.Run("timestamp is less, DerivedFrom Number less", func(t *testing.T) {
+	t.Run("timestamp is less, CrossDerivedFrom Number less", func(t *testing.T) {
 		ssd := &mockSafeStartDeps{}
 		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
 		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
@@ -291,7 +291,7 @@ func TestCrossSafeHazards(t *testing.T) {
 		require.NoError(t, err)
 		require.Empty(t, hazards)
 	})
-	t.Run("timestamp is less, DerivedFrom Number equal", func(t *testing.T) {
+	t.Run("timestamp is less, CrossDerivedFrom Number equal", func(t *testing.T) {
 		ssd := &mockSafeStartDeps{}
 		sampleBlockSeal := types.BlockSeal{Number: 3, Hash: common.BytesToHash([]byte{0x02})}
 		ssd.checkFn = func() (includedIn types.BlockSeal, err error) {
diff --git a/op-supervisor/supervisor/backend/cross/worker.go b/op-supervisor/supervisor/backend/cross/worker.go
index 1342d7048fab..b80c78442c6b 100644
--- a/op-supervisor/supervisor/backend/cross/worker.go
+++ b/op-supervisor/supervisor/backend/cross/worker.go
@@ -6,6 +6,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 	"github.com/ethereum/go-ethereum/log"
 )
 
@@ -37,7 +38,7 @@ func NewWorker(log log.Logger, workFn workFn) *Worker {
 		log:  log,
 		poke: make(chan struct{}, 1),
 		// The data may have changed, and we may have missed a poke, so re-attempt regularly.
-		pollDuration: time.Second * 4,
+		pollDuration: 250 * time.Millisecond,
 		ctx:          ctx,
 		cancel:       cancel,
 	}
@@ -69,7 +70,11 @@ func (s *Worker) worker() {
 			if errors.Is(err, s.ctx.Err()) {
 				return
 			}
-			s.log.Error("Failed to process work", "err", err)
+			if errors.Is(err, types.ErrFuture) {
+				s.log.Debug("Failed to process work", "err", err)
+			} else {
+				s.log.Warn("Failed to process work", "err", err)
+			}
 		}
 
 		// await next time we process, or detect shutdown
diff --git a/op-supervisor/supervisor/backend/db/db.go b/op-supervisor/supervisor/backend/db/db.go
index 922f849dea05..b667718759b7 100644
--- a/op-supervisor/supervisor/backend/db/db.go
+++ b/op-supervisor/supervisor/backend/db/db.go
@@ -4,12 +4,12 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"sync"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/locks"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/fromda"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db/logs"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
@@ -73,28 +73,23 @@ var _ LogStorage = (*logs.DB)(nil)
 // ChainsDB is a database that stores logs and derived-from data for multiple chains.
 // it implements the LogStorage interface, as well as several DB interfaces needed by the cross package.
 type ChainsDB struct {
-	// RW mutex:
-	// Read = chains can be read / mutated.
-	// Write = set of chains is changing.
-	mu sync.RWMutex
-
 	// unsafe info: the sequence of block seals and events
-	logDBs map[types.ChainID]LogStorage
+	logDBs locks.RWMap[types.ChainID, LogStorage]
 
 	// cross-unsafe: how far we have processed the unsafe data.
 	// If present but set to a zeroed value the cross-unsafe will fallback to cross-safe.
-	crossUnsafe map[types.ChainID]types.BlockSeal
+	crossUnsafe locks.RWMap[types.ChainID, *locks.RWValue[types.BlockSeal]]
 
 	// local-safe: index of what we optimistically know about L2 blocks being derived from L1
-	localDBs map[types.ChainID]LocalDerivedFromStorage
+	localDBs locks.RWMap[types.ChainID, LocalDerivedFromStorage]
 
 	// cross-safe: index of L2 blocks we know to only have cross-L2 valid dependencies
-	crossDBs map[types.ChainID]CrossDerivedFromStorage
+	crossDBs locks.RWMap[types.ChainID, CrossDerivedFromStorage]
 
 	// finalized: the L1 finality progress. This can be translated into what may be considered as finalized in L2.
 	// It is initially zeroed, and the L2 finality query will return
 	// an error until it has this L1 finality to work with.
-	finalizedL1 eth.L1BlockRef
+	finalizedL1 locks.RWValue[eth.L1BlockRef]
 
 	// depSet is the dependency set, used to determine what may be tracked,
 	// what is missing, and to provide it to DB users.
@@ -105,78 +100,62 @@ type ChainsDB struct {
 
 func NewChainsDB(l log.Logger, depSet depset.DependencySet) *ChainsDB {
 	return &ChainsDB{
-		logDBs:      make(map[types.ChainID]LogStorage),
-		logger:      l,
-		localDBs:    make(map[types.ChainID]LocalDerivedFromStorage),
-		crossDBs:    make(map[types.ChainID]CrossDerivedFromStorage),
-		crossUnsafe: make(map[types.ChainID]types.BlockSeal),
-		depSet:      depSet,
+		logger: l,
+		depSet: depSet,
 	}
 }
 
 func (db *ChainsDB) AddLogDB(chainID types.ChainID, logDB LogStorage) {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-
-	if _, ok := db.logDBs[chainID]; ok {
+	if db.logDBs.Has(chainID) {
 		db.logger.Warn("overwriting existing log DB for chain", "chain", chainID)
 	}
 
-	db.logDBs[chainID] = logDB
+	db.logDBs.Set(chainID, logDB)
 }
 
 func (db *ChainsDB) AddLocalDerivedFromDB(chainID types.ChainID, dfDB LocalDerivedFromStorage) {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-
-	if _, ok := db.localDBs[chainID]; ok {
+	if db.localDBs.Has(chainID) {
 		db.logger.Warn("overwriting existing local derived-from DB for chain", "chain", chainID)
 	}
 
-	db.localDBs[chainID] = dfDB
+	db.localDBs.Set(chainID, dfDB)
 }
 
 func (db *ChainsDB) AddCrossDerivedFromDB(chainID types.ChainID, dfDB CrossDerivedFromStorage) {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-
-	if _, ok := db.crossDBs[chainID]; ok {
+	if db.crossDBs.Has(chainID) {
 		db.logger.Warn("overwriting existing cross derived-from DB for chain", "chain", chainID)
 	}
 
-	db.crossDBs[chainID] = dfDB
+	db.crossDBs.Set(chainID, dfDB)
 }
 
 func (db *ChainsDB) AddCrossUnsafeTracker(chainID types.ChainID) {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-
-	if _, ok := db.crossUnsafe[chainID]; ok {
+	if db.crossUnsafe.Has(chainID) {
 		db.logger.Warn("overwriting existing cross-unsafe tracker for chain", "chain", chainID)
 	}
-	db.crossUnsafe[chainID] = types.BlockSeal{}
+	db.crossUnsafe.Set(chainID, &locks.RWValue[types.BlockSeal]{})
 }
 
 // ResumeFromLastSealedBlock prepares the chains db to resume recording events after a restart.
 // It rewinds the database to the last block that is guaranteed to have been fully recorded to the database,
 // to ensure it can resume recording from the first log of the next block.
 func (db *ChainsDB) ResumeFromLastSealedBlock() error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	for chain, logStore := range db.logDBs {
+	var result error
+	db.logDBs.Range(func(chain types.ChainID, logStore LogStorage) bool {
 		headNum, ok := logStore.LatestSealedBlockNum()
 		if !ok {
 			// db must be empty, nothing to rewind to
 			db.logger.Info("Resuming, but found no DB contents", "chain", chain)
-			continue
+			return true
 		}
 		db.logger.Info("Resuming, starting from last sealed block", "head", headNum)
 		if err := logStore.Rewind(headNum); err != nil {
-			return fmt.Errorf("failed to rewind chain %s to sealed block %d", chain, headNum)
+			result = fmt.Errorf("failed to rewind chain %s to sealed block %d", chain, headNum)
+			return false
 		}
-	}
-	return nil
+		return true
+	})
+	return result
 }
 
 func (db *ChainsDB) DependencySet() depset.DependencySet {
@@ -184,14 +163,12 @@ func (db *ChainsDB) DependencySet() depset.DependencySet {
 }
 
 func (db *ChainsDB) Close() error {
-	db.mu.Lock()
-	defer db.mu.Unlock()
-
 	var combined error
-	for id, logDB := range db.logDBs {
+	db.logDBs.Range(func(id types.ChainID, logDB LogStorage) bool {
 		if err := logDB.Close(); err != nil {
 			combined = errors.Join(combined, fmt.Errorf("failed to close log db for chain %v: %w", id, err))
 		}
-	}
+		return true
+	})
 	return combined
 }
diff --git a/op-supervisor/supervisor/backend/db/fromda/update_test.go b/op-supervisor/supervisor/backend/db/fromda/update_test.go
index 41be48ae0815..10b6b3bdd053 100644
--- a/op-supervisor/supervisor/backend/db/fromda/update_test.go
+++ b/op-supervisor/supervisor/backend/db/fromda/update_test.go
@@ -64,7 +64,7 @@ func TestBadUpdates(t *testing.T) {
 			assertFn: noChange,
 		},
 		{
-			name: "DerivedFrom with conflicting parent root, same L1 height, new L2: accepted, L1 parent-hash is used only on L1 increments.",
+			name: "CrossDerivedFrom with conflicting parent root, same L1 height, new L2: accepted, L1 parent-hash is used only on L1 increments.",
 			setupFn: func(t *testing.T, db *DB, m *stubMetrics) {
 				require.NoError(t, db.AddDerived(toRef(dDerivedFrom, common.Hash{0x42}), toRef(eDerived, dDerived.Hash)), types.ErrConflict)
 			},
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index 01e5ef0171c6..867e4e71955b 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -12,10 +12,7 @@ import (
 )
 
 func (db *ChainsDB) FindSealedBlock(chain types.ChainID, number uint64) (seal types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	logDB, ok := db.logDBs[chain]
+	logDB, ok := db.logDBs.Get(chain)
 	if !ok {
 		return types.BlockSeal{}, fmt.Errorf("%w: %v", types.ErrUnknownChain, chain)
 	}
@@ -26,10 +23,7 @@ func (db *ChainsDB) FindSealedBlock(chain types.ChainID, number uint64) (seal ty
 // for the given chain. It does not contain safety guarantees.
 // The block number might not be available (empty database, or non-existent chain).
 func (db *ChainsDB) LatestBlockNum(chain types.ChainID) (num uint64, ok bool) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	logDB, knownChain := db.logDBs[chain]
+	logDB, knownChain := db.logDBs.Get(chain)
 	if !knownChain {
 		return 0, false
 	}
@@ -37,16 +31,15 @@ func (db *ChainsDB) LatestBlockNum(chain types.ChainID) (num uint64, ok bool) {
 }
 
 func (db *ChainsDB) IsCrossUnsafe(chainID types.ChainID, block eth.BlockID) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-	v, ok := db.crossUnsafe[chainID]
+	v, ok := db.crossUnsafe.Get(chainID)
 	if !ok {
 		return types.ErrUnknownChain
 	}
-	if v == (types.BlockSeal{}) {
+	crossUnsafe := v.Get()
+	if crossUnsafe == (types.BlockSeal{}) {
 		return types.ErrFuture
 	}
-	if block.Number > v.Number {
+	if block.Number > crossUnsafe.Number {
 		return types.ErrFuture
 	}
 	// TODO(#11693): make cross-unsafe reorg safe
@@ -54,9 +47,7 @@ func (db *ChainsDB) IsCrossUnsafe(chainID types.ChainID, block eth.BlockID) erro
 }
 
 func (db *ChainsDB) ParentBlock(chainID types.ChainID, parentOf eth.BlockID) (parent eth.BlockID, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-	logDB, ok := db.logDBs[chainID]
+	logDB, ok := db.logDBs.Get(chainID)
 	if !ok {
 		return eth.BlockID{}, types.ErrUnknownChain
 	}
@@ -72,9 +63,7 @@ func (db *ChainsDB) ParentBlock(chainID types.ChainID, parentOf eth.BlockID) (pa
 }
 
 func (db *ChainsDB) IsLocalUnsafe(chainID types.ChainID, block eth.BlockID) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-	logDB, ok := db.logDBs[chainID]
+	logDB, ok := db.logDBs.Get(chainID)
 	if !ok {
 		return types.ErrUnknownChain
 	}
@@ -89,10 +78,7 @@ func (db *ChainsDB) IsLocalUnsafe(chainID types.ChainID, block eth.BlockID) erro
 }
 
 func (db *ChainsDB) LocalUnsafe(chainID types.ChainID) (types.BlockSeal, error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	eventsDB, ok := db.logDBs[chainID]
+	eventsDB, ok := db.logDBs.Get(chainID)
 	if !ok {
 		return types.BlockSeal{}, types.ErrUnknownChain
 	}
@@ -104,29 +90,24 @@ func (db *ChainsDB) LocalUnsafe(chainID types.ChainID) (types.BlockSeal, error)
 }
 
 func (db *ChainsDB) CrossUnsafe(chainID types.ChainID) (types.BlockSeal, error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	result, ok := db.crossUnsafe[chainID]
+	result, ok := db.crossUnsafe.Get(chainID)
 	if !ok {
 		return types.BlockSeal{}, types.ErrUnknownChain
 	}
+	crossUnsafe := result.Get()
 	// Fall back to cross-safe if cross-unsafe is not known yet
-	if result == (types.BlockSeal{}) {
+	if crossUnsafe == (types.BlockSeal{}) {
 		_, crossSafe, err := db.CrossSafe(chainID)
 		if err != nil {
 			return types.BlockSeal{}, fmt.Errorf("no cross-unsafe known for chain %s, and failed to fall back to cross-safe value: %w", chainID, err)
 		}
 		return crossSafe, nil
 	}
-	return result, nil
+	return crossUnsafe, nil
 }
 
 func (db *ChainsDB) LocalSafe(chainID types.ChainID) (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	localDB, ok := db.localDBs[chainID]
+	localDB, ok := db.localDBs.Get(chainID)
 	if !ok {
 		return types.BlockSeal{}, types.BlockSeal{}, types.ErrUnknownChain
 	}
@@ -134,10 +115,7 @@ func (db *ChainsDB) LocalSafe(chainID types.ChainID) (derivedFrom types.BlockSea
 }
 
 func (db *ChainsDB) CrossSafe(chainID types.ChainID) (derivedFrom types.BlockSeal, derived types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	crossDB, ok := db.crossDBs[chainID]
+	crossDB, ok := db.crossDBs.Get(chainID)
 	if !ok {
 		return types.BlockSeal{}, types.BlockSeal{}, types.ErrUnknownChain
 	}
@@ -145,10 +123,7 @@ func (db *ChainsDB) CrossSafe(chainID types.ChainID) (derivedFrom types.BlockSea
 }
 
 func (db *ChainsDB) Finalized(chainID types.ChainID) (types.BlockSeal, error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	finalizedL1 := db.finalizedL1
+	finalizedL1 := db.finalizedL1.Get()
 	if finalizedL1 == (eth.L1BlockRef{}) {
 		return types.BlockSeal{}, errors.New("no finalized L1 signal, cannot determine L2 finality yet")
 	}
@@ -160,26 +135,25 @@ func (db *ChainsDB) Finalized(chainID types.ChainID) (types.BlockSeal, error) {
 }
 
 func (db *ChainsDB) LastDerivedFrom(chainID types.ChainID, derivedFrom eth.BlockID) (derived types.BlockSeal, err error) {
-	crossDB, ok := db.crossDBs[chainID]
+	crossDB, ok := db.crossDBs.Get(chainID)
 	if !ok {
 		return types.BlockSeal{}, types.ErrUnknownChain
 	}
 	return crossDB.LastDerivedAt(derivedFrom)
 }
 
-func (db *ChainsDB) DerivedFrom(chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	localDB, ok := db.localDBs[chainID]
+// CrossDerivedFromBlockRef returns the block that the given block was derived from, if it exists in the cross derived-from storage.
+// This includes the parent-block lookup. Use CrossDerivedFrom if no parent-block info is needed.
+func (db *ChainsDB) CrossDerivedFromBlockRef(chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
+	xdb, ok := db.crossDBs.Get(chainID)
 	if !ok {
 		return eth.BlockRef{}, types.ErrUnknownChain
 	}
-	res, err := localDB.DerivedFrom(derived)
+	res, err := xdb.DerivedFrom(derived)
 	if err != nil {
 		return eth.BlockRef{}, err
 	}
-	parent, err := localDB.PreviousDerivedFrom(res.ID())
+	parent, err := xdb.PreviousDerivedFrom(res.ID())
 	if err != nil {
 		return eth.BlockRef{}, err
 	}
@@ -189,10 +163,7 @@ func (db *ChainsDB) DerivedFrom(chainID types.ChainID, derived eth.BlockID) (der
 // Check calls the underlying logDB to determine if the given log entry exists at the given location.
 // If the block-seal of the block that includes the log is known, it is returned. It is fully zeroed otherwise, if the block is in-progress.
 func (db *ChainsDB) Check(chain types.ChainID, blockNum uint64, logIdx uint32, logHash common.Hash) (includedIn types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	logDB, ok := db.logDBs[chain]
+	logDB, ok := db.logDBs.Get(chain)
 	if !ok {
 		return types.BlockSeal{}, fmt.Errorf("%w: %v", types.ErrUnknownChain, chain)
 	}
@@ -202,10 +173,7 @@ func (db *ChainsDB) Check(chain types.ChainID, blockNum uint64, logIdx uint32, l
 // OpenBlock returns the Executing Messages for the block at the given number on the given chain.
 // it routes the request to the appropriate logDB.
 func (db *ChainsDB) OpenBlock(chainID types.ChainID, blockNum uint64) (seal eth.BlockRef, logCount uint32, execMsgs map[uint32]*types.ExecutingMessage, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	logDB, ok := db.logDBs[chainID]
+	logDB, ok := db.logDBs.Get(chainID)
 	if !ok {
 		return eth.BlockRef{}, 0, nil, types.ErrUnknownChain
 	}
@@ -215,10 +183,7 @@ func (db *ChainsDB) OpenBlock(chainID types.ChainID, blockNum uint64) (seal eth.
 // LocalDerivedFrom returns the block that the given block was derived from, if it exists in the local derived-from storage.
 // it routes the request to the appropriate localDB.
 func (db *ChainsDB) LocalDerivedFrom(chain types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	lDB, ok := db.localDBs[chain]
+	lDB, ok := db.localDBs.Get(chain)
 	if !ok {
 		return types.BlockSeal{}, types.ErrUnknownChain
 	}
@@ -228,10 +193,7 @@ func (db *ChainsDB) LocalDerivedFrom(chain types.ChainID, derived eth.BlockID) (
 // CrossDerivedFrom returns the block that the given block was derived from, if it exists in the cross derived-from storage.
 // it routes the request to the appropriate crossDB.
 func (db *ChainsDB) CrossDerivedFrom(chain types.ChainID, derived eth.BlockID) (derivedFrom types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	xDB, ok := db.crossDBs[chain]
+	xDB, ok := db.crossDBs.Get(chain)
 	if !ok {
 		return types.BlockSeal{}, types.ErrUnknownChain
 	}
@@ -247,15 +209,12 @@ func (db *ChainsDB) CrossDerivedFrom(chain types.ChainID, derived eth.BlockID) (
 // Or ErrOutOfScope, with non-zero derivedFromScope,
 // if additional L1 data is needed to cross-verify the candidate L2 block.
 func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, crossSafe eth.BlockRef, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	xDB, ok := db.crossDBs[chain]
+	xDB, ok := db.crossDBs.Get(chain)
 	if !ok {
 		return eth.BlockRef{}, eth.BlockRef{}, types.ErrUnknownChain
 	}
 
-	lDB, ok := db.localDBs[chain]
+	lDB, ok := db.localDBs.Get(chain)
 	if !ok {
 		return eth.BlockRef{}, eth.BlockRef{}, types.ErrUnknownChain
 	}
@@ -323,9 +282,7 @@ func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, c
 }
 
 func (db *ChainsDB) PreviousDerived(chain types.ChainID, derived eth.BlockID) (prevDerived types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-	lDB, ok := db.localDBs[chain]
+	lDB, ok := db.localDBs.Get(chain)
 	if !ok {
 		return types.BlockSeal{}, types.ErrUnknownChain
 	}
@@ -333,9 +290,7 @@ func (db *ChainsDB) PreviousDerived(chain types.ChainID, derived eth.BlockID) (p
 }
 
 func (db *ChainsDB) PreviousDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID) (prevDerivedFrom types.BlockSeal, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-	lDB, ok := db.localDBs[chain]
+	lDB, ok := db.localDBs.Get(chain)
 	if !ok {
 		return types.BlockSeal{}, types.ErrUnknownChain
 	}
@@ -343,9 +298,7 @@ func (db *ChainsDB) PreviousDerivedFrom(chain types.ChainID, derivedFrom eth.Blo
 }
 
 func (db *ChainsDB) NextDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID) (after eth.BlockRef, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-	lDB, ok := db.localDBs[chain]
+	lDB, ok := db.localDBs.Get(chain)
 	if !ok {
 		return eth.BlockRef{}, types.ErrUnknownChain
 	}
@@ -360,9 +313,6 @@ func (db *ChainsDB) NextDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID
 // it assumes the log entry has already been checked and is valid, this function only checks safety levels.
 // Safety levels are assumed to graduate from LocalUnsafe to LocalSafe to CrossUnsafe to CrossSafe, with Finalized as the strongest.
 func (db *ChainsDB) Safest(chainID types.ChainID, blockNum uint64, index uint32) (safest types.SafetyLevel, err error) {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
 	if finalized, err := db.Finalized(chainID); err == nil {
 		if finalized.Number >= blockNum {
 			return types.Finalized, nil
@@ -395,7 +345,7 @@ func (db *ChainsDB) Safest(chainID types.ChainID, blockNum uint64, index uint32)
 }
 
 func (db *ChainsDB) IteratorStartingAt(chain types.ChainID, sealedNum uint64, logIndex uint32) (logs.Iterator, error) {
-	logDB, ok := db.logDBs[chain]
+	logDB, ok := db.logDBs.Get(chain)
 	if !ok {
 		return nil, fmt.Errorf("%w: %v", types.ErrUnknownChain, chain)
 	}
diff --git a/op-supervisor/supervisor/backend/db/update.go b/op-supervisor/supervisor/backend/db/update.go
index e45fd3f469a5..932b19875575 100644
--- a/op-supervisor/supervisor/backend/db/update.go
+++ b/op-supervisor/supervisor/backend/db/update.go
@@ -15,10 +15,7 @@ func (db *ChainsDB) AddLog(
 	parentBlock eth.BlockID,
 	logIdx uint32,
 	execMsg *types.ExecutingMessage) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	logDB, ok := db.logDBs[chain]
+	logDB, ok := db.logDBs.Get(chain)
 	if !ok {
 		return fmt.Errorf("cannot AddLog: %w: %v", types.ErrUnknownChain, chain)
 	}
@@ -26,10 +23,7 @@ func (db *ChainsDB) AddLog(
 }
 
 func (db *ChainsDB) SealBlock(chain types.ChainID, block eth.BlockRef) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	logDB, ok := db.logDBs[chain]
+	logDB, ok := db.logDBs.Get(chain)
 	if !ok {
 		return fmt.Errorf("cannot SealBlock: %w: %v", types.ErrUnknownChain, chain)
 	}
@@ -42,10 +36,7 @@ func (db *ChainsDB) SealBlock(chain types.ChainID, block eth.BlockRef) error {
 }
 
 func (db *ChainsDB) Rewind(chain types.ChainID, headBlockNum uint64) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	logDB, ok := db.logDBs[chain]
+	logDB, ok := db.logDBs.Get(chain)
 	if !ok {
 		return fmt.Errorf("cannot Rewind: %w: %s", types.ErrUnknownChain, chain)
 	}
@@ -53,10 +44,7 @@ func (db *ChainsDB) Rewind(chain types.ChainID, headBlockNum uint64) error {
 }
 
 func (db *ChainsDB) UpdateLocalSafe(chain types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	localDB, ok := db.localDBs[chain]
+	localDB, ok := db.localDBs.Get(chain)
 	if !ok {
 		return fmt.Errorf("cannot UpdateLocalSafe: %w: %v", types.ErrUnknownChain, chain)
 	}
@@ -65,22 +53,17 @@ func (db *ChainsDB) UpdateLocalSafe(chain types.ChainID, derivedFrom eth.BlockRe
 }
 
 func (db *ChainsDB) UpdateCrossUnsafe(chain types.ChainID, crossUnsafe types.BlockSeal) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	if _, ok := db.crossUnsafe[chain]; !ok {
+	v, ok := db.crossUnsafe.Get(chain)
+	if !ok {
 		return fmt.Errorf("cannot UpdateCrossUnsafe: %w: %s", types.ErrUnknownChain, chain)
 	}
 	db.logger.Debug("Updating cross unsafe", "chain", chain, "crossUnsafe", crossUnsafe)
-	db.crossUnsafe[chain] = crossUnsafe
+	v.Set(crossUnsafe)
 	return nil
 }
 
 func (db *ChainsDB) UpdateCrossSafe(chain types.ChainID, l1View eth.BlockRef, lastCrossDerived eth.BlockRef) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
-
-	crossDB, ok := db.crossDBs[chain]
+	crossDB, ok := db.crossDBs.Get(chain)
 	if !ok {
 		return fmt.Errorf("cannot UpdateCrossSafe: %w: %s", types.ErrUnknownChain, chain)
 	}
@@ -89,13 +72,14 @@ func (db *ChainsDB) UpdateCrossSafe(chain types.ChainID, l1View eth.BlockRef, la
 }
 
 func (db *ChainsDB) UpdateFinalizedL1(finalized eth.BlockRef) error {
-	db.mu.RLock()
-	defer db.mu.RUnlock()
+	// Lock, so we avoid race-conditions in-between getting (for comparison) and setting.
+	db.finalizedL1.Lock()
+	defer db.finalizedL1.Unlock()
 
-	if db.finalizedL1.Number > finalized.Number {
-		return fmt.Errorf("cannot rewind finalized L1 head from %s to %s", db.finalizedL1, finalized)
+	if v := db.finalizedL1.Value; v.Number > finalized.Number {
+		return fmt.Errorf("cannot rewind finalized L1 head from %s to %s", v, finalized)
 	}
 	db.logger.Debug("Updating finalized L1", "finalizedL1", finalized)
-	db.finalizedL1 = finalized
+	db.finalizedL1.Value = finalized
 	return nil
 }
diff --git a/op-supervisor/supervisor/backend/mock.go b/op-supervisor/supervisor/backend/mock.go
index c07e74a40013..b40c5209d5ef 100644
--- a/op-supervisor/supervisor/backend/mock.go
+++ b/op-supervisor/supervisor/backend/mock.go
@@ -62,7 +62,7 @@ func (m *MockBackend) Finalized(ctx context.Context, chainID types.ChainID) (eth
 	return eth.BlockID{}, nil
 }
 
-func (m *MockBackend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
+func (m *MockBackend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	return eth.BlockRef{}, nil
 }
 
diff --git a/op-supervisor/supervisor/frontend/frontend.go b/op-supervisor/supervisor/frontend/frontend.go
index 26e751200a5a..0a5b70a4799a 100644
--- a/op-supervisor/supervisor/frontend/frontend.go
+++ b/op-supervisor/supervisor/frontend/frontend.go
@@ -17,7 +17,7 @@ type AdminBackend interface {
 type QueryBackend interface {
 	CheckMessage(identifier types.Identifier, payloadHash common.Hash) (types.SafetyLevel, error)
 	CheckMessages(messages []types.Message, minSafety types.SafetyLevel) error
-	DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error)
+	CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error)
 	UnsafeView(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error)
 	SafeView(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error)
 	Finalized(ctx context.Context, chainID types.ChainID) (eth.BlockID, error)
@@ -67,8 +67,8 @@ func (q *QueryFrontend) Finalized(ctx context.Context, chainID types.ChainID) (e
 	return q.Supervisor.Finalized(ctx, chainID)
 }
 
-func (q *QueryFrontend) DerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
-	return q.Supervisor.DerivedFrom(ctx, chainID, derived)
+func (q *QueryFrontend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
+	return q.Supervisor.CrossDerivedFrom(ctx, chainID, derived)
 }
 
 type AdminFrontend struct {
diff --git a/op-supervisor/supervisor/service.go b/op-supervisor/supervisor/service.go
index 469a80439e34..8bccaf1eb82f 100644
--- a/op-supervisor/supervisor/service.go
+++ b/op-supervisor/supervisor/service.go
@@ -72,6 +72,17 @@ func (su *SupervisorService) initBackend(ctx context.Context, cfg *config.Config
 		su.backend = backend.NewMockBackend()
 		return nil
 	}
+	// the flag is a string slice, which has the potential to have empty strings
+	filterBlank := func(in []string) []string {
+		out := make([]string, 0, len(in))
+		for _, s := range in {
+			if s != "" {
+				out = append(out, s)
+			}
+		}
+		return out
+	}
+	cfg.L2RPCs = filterBlank(cfg.L2RPCs)
 	be, err := backend.NewSupervisorBackend(ctx, su.log, su.metrics, cfg)
 	if err != nil {
 		return fmt.Errorf("failed to create supervisor backend: %w", err)
diff --git a/ops-bedrock/l2-op-geth-interop.Dockerfile b/ops-bedrock/l2-op-geth-interop.Dockerfile
new file mode 100644
index 000000000000..41a667c0fc29
--- /dev/null
+++ b/ops-bedrock/l2-op-geth-interop.Dockerfile
@@ -0,0 +1,10 @@
+FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101411.1-rc.3
+# Note: depend on dev-release for sequencer interop message checks
+
+RUN apk add --no-cache jq
+
+COPY l2-op-geth-entrypoint.sh /entrypoint.sh
+
+VOLUME ["/db"]
+
+ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
diff --git a/ops/docker/op-stack-go/Dockerfile.dockerignore b/ops/docker/op-stack-go/Dockerfile.dockerignore
index 1c0841df1f33..e5eceaea73b8 100644
--- a/ops/docker/op-stack-go/Dockerfile.dockerignore
+++ b/ops/docker/op-stack-go/Dockerfile.dockerignore
@@ -6,6 +6,7 @@
 !/op-batcher
 !/op-bootnode
 !/op-chain-ops
+!/op-deployer
 !/op-challenger
 !/packages/contracts-bedrock/snapshots
 !/op-dispute-mon

From 1f335f15ac4dc94ca5bb147da5517c042efb44eb Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 31 Oct 2024 11:25:36 -0600
Subject: [PATCH 090/451] op-deployer: Add support for Isthmus calls to OPCM
 (#12753)

---
 op-chain-ops/interopgen/deploy.go             |   2 +-
 .../pkg/deployer/opcm/deployOutput_v160.json  |  77 +++++
 op-deployer/pkg/deployer/opcm/opchain.go      | 275 +++++++++---------
 op-deployer/pkg/deployer/pipeline/opchain.go  |  90 ++++--
 op-deployer/pkg/deployer/standard/standard.go |   7 +-
 5 files changed, 286 insertions(+), 165 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/opcm/deployOutput_v160.json

diff --git a/op-chain-ops/interopgen/deploy.go b/op-chain-ops/interopgen/deploy.go
index fb1e71537d55..476406821ea5 100644
--- a/op-chain-ops/interopgen/deploy.go
+++ b/op-chain-ops/interopgen/deploy.go
@@ -200,7 +200,7 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 
 	l1Host.SetTxOrigin(cfg.Deployer)
 
-	output, err := opcm.DeployOPChain(l1Host, opcm.DeployOPChainInput{
+	output, err := opcm.DeployOPChainV160(l1Host, opcm.DeployOPChainInputV160{
 		OpChainProxyAdminOwner:  cfg.ProxyAdminOwner,
 		SystemConfigOwner:       cfg.SystemConfigOwner,
 		Batcher:                 cfg.BatchSenderAddress,
diff --git a/op-deployer/pkg/deployer/opcm/deployOutput_v160.json b/op-deployer/pkg/deployer/opcm/deployOutput_v160.json
new file mode 100644
index 000000000000..888e28a102f8
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/deployOutput_v160.json
@@ -0,0 +1,77 @@
+[
+  {
+    "type": "function",
+    "name": "decodeOutput",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "indexed": false,
+        "type": "tuple",
+        "components": [
+          {
+            "name": "opChainProxyAdmin",
+            "type": "address"
+          },
+          {
+            "name": "addressManager",
+            "type": "address"
+          },
+          {
+            "name": "l1ERC721BridgeProxy",
+            "type": "address"
+          },
+          {
+            "name": "systemConfigProxy",
+            "type": "address"
+          },
+          {
+            "name": "optimismMintableERC20FactoryProxy",
+            "type": "address"
+          },
+          {
+            "name": "l1StandardBridgeProxy",
+            "type": "address"
+          },
+          {
+            "name": "l1CrossDomainMessengerProxy",
+            "type": "address"
+          },
+          {
+            "name": "optimismPortalProxy",
+            "type": "address"
+          },
+          {
+            "name": "disputeGameFactoryProxy",
+            "type": "address"
+          },
+          {
+            "name": "anchorStateRegistryProxy",
+            "type": "address"
+          },
+          {
+            "name": "anchorStateRegistryImpl",
+            "type": "address"
+          },
+          {
+            "name": "faultDisputeGame",
+            "type": "address",
+            "internalType": "contract FaultDisputeGame"
+          },
+          {
+            "name": "permissionedDisputeGame",
+            "type": "address"
+          },
+          {
+            "name": "delayedWETHPermissionedGameProxy",
+            "type": "address"
+          },
+          {
+            "name": "delayedWETHPermissionlessGameProxy",
+            "type": "address"
+          }
+        ]
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index b6bf4fcb6b7c..537765ce5154 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -6,6 +6,8 @@ import (
 	"math/big"
 	"strings"
 
+	_ "embed"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
@@ -23,7 +25,49 @@ var PermissionedGameStartingAnchorRoots = []byte{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xde, 0xad, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 }
 
-type DeployOPChainInput struct {
+// opcmRolesBase is an internal struct used to pass the roles to OPCM. See opcmDeployInputV160 for more info.
+type opcmRolesBase struct {
+	OpChainProxyAdminOwner common.Address
+	SystemConfigOwner      common.Address
+	Batcher                common.Address
+	UnsafeBlockSigner      common.Address
+	Proposer               common.Address
+	Challenger             common.Address
+}
+
+type opcmDeployInputBase struct {
+	BasefeeScalar           uint32
+	BlobBasefeeScalar       uint32
+	L2ChainId               *big.Int
+	StartingAnchorRoots     []byte
+	SaltMixer               string
+	GasLimit                uint64
+	DisputeGameType         uint32
+	DisputeAbsolutePrestate common.Hash
+	DisputeMaxGameDepth     *big.Int
+	DisputeSplitDepth       *big.Int
+	DisputeClockExtension   uint64
+	DisputeMaxClockDuration uint64
+}
+
+// opcmDeployInputV160 is the input struct for the deploy method of the OPStackManager contract. We
+// define a separate struct here to match what the OPSM contract expects.
+type opcmDeployInputV160 struct {
+	opcmDeployInputBase
+	Roles opcmRolesBase
+}
+
+type opcmRolesIsthmus struct {
+	opcmRolesBase
+	FeeAdmin common.Address
+}
+
+type opcmDeployInputIsthmus struct {
+	opcmDeployInputBase
+	Roles opcmRolesIsthmus
+}
+
+type DeployOPChainInputV160 struct {
 	OpChainProxyAdminOwner common.Address
 	SystemConfigOwner      common.Address
 	Batcher                common.Address
@@ -47,14 +91,57 @@ type DeployOPChainInput struct {
 	AllowCustomDisputeParameters bool
 }
 
-func (input *DeployOPChainInput) InputSet() bool {
+func (input *DeployOPChainInputV160) InputSet() bool {
 	return true
 }
 
-func (input *DeployOPChainInput) StartingAnchorRoots() []byte {
+func (input *DeployOPChainInputV160) StartingAnchorRoots() []byte {
 	return PermissionedGameStartingAnchorRoots
 }
 
+func DeployOPChainInputV160DeployCalldata(input DeployOPChainInputV160) any {
+	return opcmDeployInputV160{
+		Roles: opcmRolesBase{
+			OpChainProxyAdminOwner: input.OpChainProxyAdminOwner,
+			SystemConfigOwner:      input.SystemConfigOwner,
+			Batcher:                input.Batcher,
+			UnsafeBlockSigner:      input.UnsafeBlockSigner,
+			Proposer:               input.Proposer,
+			Challenger:             input.Challenger,
+		},
+		opcmDeployInputBase: opcmDeployInputBase{
+			BasefeeScalar:           input.BasefeeScalar,
+			BlobBasefeeScalar:       input.BlobBaseFeeScalar,
+			L2ChainId:               input.L2ChainId,
+			StartingAnchorRoots:     input.StartingAnchorRoots(),
+			SaltMixer:               input.SaltMixer,
+			GasLimit:                input.GasLimit,
+			DisputeGameType:         input.DisputeGameType,
+			DisputeAbsolutePrestate: input.DisputeAbsolutePrestate,
+			DisputeMaxGameDepth:     new(big.Int).SetUint64(input.DisputeMaxGameDepth),
+			DisputeSplitDepth:       new(big.Int).SetUint64(input.DisputeSplitDepth),
+			DisputeClockExtension:   input.DisputeClockExtension,
+			DisputeMaxClockDuration: input.DisputeMaxClockDuration,
+		},
+	}
+}
+
+type DeployOPChainInputIsthmus struct {
+	DeployOPChainInputV160
+	SystemConfigFeeAdmin common.Address
+}
+
+func DeployOPChainInputIsthmusDeployCalldata(input DeployOPChainInputIsthmus) any {
+	v160Data := DeployOPChainInputV160DeployCalldata(input.DeployOPChainInputV160).(opcmDeployInputV160)
+	return opcmDeployInputIsthmus{
+		Roles: opcmRolesIsthmus{
+			opcmRolesBase: v160Data.Roles,
+			FeeAdmin:      input.SystemConfigFeeAdmin,
+		},
+		opcmDeployInputBase: v160Data.opcmDeployInputBase,
+	}
+}
+
 type DeployOPChainOutput struct {
 	OpChainProxyAdmin                 common.Address
 	AddressManager                    common.Address
@@ -82,12 +169,20 @@ type DeployOPChainScript struct {
 	Run func(input, output common.Address) error
 }
 
-func DeployOPChain(host *script.Host, input DeployOPChainInput) (DeployOPChainOutput, error) {
+func DeployOPChainV160(host *script.Host, input DeployOPChainInputV160) (DeployOPChainOutput, error) {
+	return deployOPChain(host, input)
+}
+
+func DeployOPChainIsthmus(host *script.Host, input DeployOPChainInputIsthmus) (DeployOPChainOutput, error) {
+	return deployOPChain(host, input)
+}
+
+func deployOPChain[T any](host *script.Host, input T) (DeployOPChainOutput, error) {
 	var dco DeployOPChainOutput
 	inputAddr := host.NewScriptAddress()
 	outputAddr := host.NewScriptAddress()
 
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeployOPChainInput](host, inputAddr, &input)
+	cleanupInput, err := script.WithPrecompileAtAddress[*T](host, inputAddr, &input)
 	if err != nil {
 		return dco, fmt.Errorf("failed to insert DeployOPChainInput precompile: %w", err)
 	}
@@ -115,127 +210,46 @@ func DeployOPChain(host *script.Host, input DeployOPChainInput) (DeployOPChainOu
 	return dco, nil
 }
 
-// opcmRoles is an internal struct used to pass the roles to OPSM. See opcmDeployInput for more info.
-type opcmRoles struct {
-	OpChainProxyAdminOwner common.Address
-	SystemConfigOwner      common.Address
-	Batcher                common.Address
-	UnsafeBlockSigner      common.Address
-	Proposer               common.Address
-	Challenger             common.Address
-}
+// decodeOutputABIJSONV160 defines an ABI for a fake method called "decodeOutput" that returns the
+// DeployOutput struct. This allows the code in the deployer to decode directly into a struct
+// using Geth's ABI library.
+//
+//go:embed deployOutput_v160.json
+var decodeOutputABIJSONV160 string
 
-// opcmDeployInput is the input struct for the deploy method of the OPStackManager contract. We
-// define a separate struct here to match what the OPSM contract expects.
-type opcmDeployInput struct {
-	Roles                   opcmRoles
-	BasefeeScalar           uint32
-	BlobBasefeeScalar       uint32
-	L2ChainId               *big.Int
-	StartingAnchorRoots     []byte
-	SaltMixer               string
-	GasLimit                uint64
-	DisputeGameType         uint32
-	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     *big.Int
-	DisputeSplitDepth       *big.Int
-	DisputeClockExtension   uint64
-	DisputeMaxClockDuration uint64
+var decodeOutputABIV160 abi.ABI
+
+func DeployOPChainRawV160(
+	ctx context.Context,
+	l1 *ethclient.Client,
+	bcast broadcaster.Broadcaster,
+	deployer common.Address,
+	artifacts foundry.StatDirFs,
+	input DeployOPChainInputV160,
+) (DeployOPChainOutput, error) {
+	return deployOPChainRaw(ctx, l1, bcast, deployer, artifacts, input.OpcmProxy, DeployOPChainInputV160DeployCalldata(input))
 }
 
-// decodeOutputABIJSON defines an ABI for a fake method called "decodeOutput" that returns the
-// DeployOutput struct. This allows the code in the deployer to decode directly into a struct
-// using Geth's ABI library.
-const decodeOutputABIJSON = `
-[
-  {
-    "type": "function",
-    "name": "decodeOutput",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "output",
-        "indexed": false,
-		"type": "tuple",
-        "components": [
-          {
-            "name": "opChainProxyAdmin",
-            "type": "address"
-          },
-          {
-            "name": "addressManager",
-            "type": "address"
-          },
-          {
-            "name": "l1ERC721BridgeProxy",
-            "type": "address"
-          },
-          {
-            "name": "systemConfigProxy",
-            "type": "address"
-          },
-          {
-            "name": "optimismMintableERC20FactoryProxy",
-            "type": "address"
-          },
-          {
-            "name": "l1StandardBridgeProxy",
-            "type": "address"
-          },
-          {
-            "name": "l1CrossDomainMessengerProxy",
-            "type": "address"
-          },
-          {
-            "name": "optimismPortalProxy",
-            "type": "address"
-          },
-          {
-            "name": "disputeGameFactoryProxy",
-            "type": "address"
-          },
-          {
-            "name": "anchorStateRegistryProxy",
-            "type": "address"
-          },
-          {
-            "name": "anchorStateRegistryImpl",
-            "type": "address"
-          },
-          {
-            "name": "faultDisputeGame",
-            "type": "address",
-            "internalType": "contract FaultDisputeGame"
-          },
-          {
-            "name": "permissionedDisputeGame",
-            "type": "address"
-          },
-          {
-            "name": "delayedWETHPermissionedGameProxy",
-            "type": "address"
-          },
-          {
-            "name": "delayedWETHPermissionlessGameProxy",
-            "type": "address"
-          }
-        ]
-      }
-    ]
-  }
-]
-`
-
-var decodeOutputABI abi.ABI
+func DeployOPChainRawIsthmus(
+	ctx context.Context,
+	l1 *ethclient.Client,
+	bcast broadcaster.Broadcaster,
+	deployer common.Address,
+	artifacts foundry.StatDirFs,
+	input DeployOPChainInputIsthmus,
+) (DeployOPChainOutput, error) {
+	return deployOPChainRaw(ctx, l1, bcast, deployer, artifacts, input.OpcmProxy, DeployOPChainInputIsthmusDeployCalldata(input))
+}
 
 // DeployOPChainRaw deploys an OP Chain using a raw call to a pre-deployed OPSM contract.
-func DeployOPChainRaw(
+func deployOPChainRaw(
 	ctx context.Context,
 	l1 *ethclient.Client,
 	bcast broadcaster.Broadcaster,
 	deployer common.Address,
 	artifacts foundry.StatDirFs,
-	input DeployOPChainInput,
+	opcmProxyAddress common.Address,
+	input any,
 ) (DeployOPChainOutput, error) {
 	var out DeployOPChainOutput
 
@@ -246,28 +260,7 @@ func DeployOPChainRaw(
 	}
 
 	opcmABI := opcmArtifacts.ABI
-	calldata, err := opcmABI.Pack("deploy", opcmDeployInput{
-		Roles: opcmRoles{
-			OpChainProxyAdminOwner: input.OpChainProxyAdminOwner,
-			SystemConfigOwner:      input.SystemConfigOwner,
-			Batcher:                input.Batcher,
-			UnsafeBlockSigner:      input.UnsafeBlockSigner,
-			Proposer:               input.Proposer,
-			Challenger:             input.Challenger,
-		},
-		BasefeeScalar:           input.BasefeeScalar,
-		BlobBasefeeScalar:       input.BlobBaseFeeScalar,
-		L2ChainId:               input.L2ChainId,
-		StartingAnchorRoots:     input.StartingAnchorRoots(),
-		SaltMixer:               input.SaltMixer,
-		GasLimit:                input.GasLimit,
-		DisputeGameType:         input.DisputeGameType,
-		DisputeAbsolutePrestate: input.DisputeAbsolutePrestate,
-		DisputeMaxGameDepth:     new(big.Int).SetUint64(input.DisputeMaxGameDepth),
-		DisputeSplitDepth:       new(big.Int).SetUint64(input.DisputeSplitDepth),
-		DisputeClockExtension:   input.DisputeClockExtension,
-		DisputeMaxClockDuration: input.DisputeMaxClockDuration,
-	})
+	calldata, err := opcmABI.Pack("deploy", input)
 	if err != nil {
 		return out, fmt.Errorf("failed to pack deploy input: %w", err)
 	}
@@ -279,7 +272,7 @@ func DeployOPChainRaw(
 
 	bcast.Hook(script.Broadcast{
 		From:  deployer,
-		To:    input.OpcmProxy,
+		To:    opcmProxyAddress,
 		Input: calldata,
 		Value: (*hexutil.U256)(uint256.NewInt(0)),
 		// use hardcoded 19MM gas for now since this is roughly what we've seen this deployment cost.
@@ -313,7 +306,7 @@ func DeployOPChainRaw(
 			Output DeployOPChainOutput
 		}
 		var outData OutputData
-		if err := decodeOutputABI.UnpackIntoInterface(&outData, "decodeOutput", data.DeployOutput); err != nil {
+		if err := decodeOutputABIV160.UnpackIntoInterface(&outData, "decodeOutput", data.DeployOutput); err != nil {
 			return out, fmt.Errorf("failed to unpack DeployOutput: %w", err)
 		}
 
@@ -325,7 +318,7 @@ func DeployOPChainRaw(
 
 func init() {
 	var err error
-	decodeOutputABI, err = abi.JSON(strings.NewReader(decodeOutputABIJSON))
+	decodeOutputABIV160, err = abi.JSON(strings.NewReader(decodeOutputABIJSONV160))
 	if err != nil {
 		panic(fmt.Sprintf("failed to parse decodeOutput ABI: %v", err))
 	}
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index ebc6c1af0bc8..66699348709d 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -29,21 +29,43 @@ func DeployOPChainLiveStrategy(ctx context.Context, env *Env, bundle ArtifactsBu
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
-	input, err := makeDCI(intent, thisIntent, chainID, st)
-	if err != nil {
-		return fmt.Errorf("error making deploy OP chain input: %w", err)
+	var deployFunc func() (opcm.DeployOPChainOutput, error)
+	switch intent.L1ContractsLocator.Tag {
+	case standard.ContractsV160Tag, standard.ContractsV170Beta1L2Tag:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIV160(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainRawV160(ctx,
+				env.L1Client,
+				env.Broadcaster,
+				env.Deployer,
+				bundle.L1,
+				input,
+			)
+		}
+	default:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIIsthmus(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainRawIsthmus(ctx,
+				env.L1Client,
+				env.Broadcaster,
+				env.Deployer,
+				bundle.L1,
+				input,
+			)
+		}
 	}
 
 	var dco opcm.DeployOPChainOutput
 	lgr.Info("deploying OP chain using existing OPCM", "id", chainID.Hex(), "opcmAddress", st.ImplementationsDeployment.OpcmProxyAddress.Hex())
-	dco, err = opcm.DeployOPChainRaw(
-		ctx,
-		env.L1Client,
-		env.Broadcaster,
-		env.Deployer,
-		bundle.L1,
-		input,
-	)
+	dco, err = deployFunc()
 	if err != nil {
 		return fmt.Errorf("error deploying OP chain: %w", err)
 	}
@@ -158,19 +180,33 @@ func DeployOPChainGenesisStrategy(env *Env, intent *state.Intent, st *state.Stat
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
-	input, err := makeDCI(intent, thisIntent, chainID, st)
-	if err != nil {
-		return fmt.Errorf("error making deploy OP chain input: %w", err)
+	var deployFunc func() (opcm.DeployOPChainOutput, error)
+	switch intent.L1ContractsLocator.Tag {
+	case standard.ContractsV160Tag, standard.ContractsV170Beta1L2Tag:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIV160(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainV160(env.L1ScriptHost, input)
+		}
+	default:
+		deployFunc = func() (opcm.DeployOPChainOutput, error) {
+			input, err := makeDCIIsthmus(intent, thisIntent, chainID, st)
+			if err != nil {
+				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+			}
+
+			return opcm.DeployOPChainIsthmus(env.L1ScriptHost, input)
+		}
 	}
 
 	env.L1ScriptHost.ImportState(st.L1StateDump.Data)
 
 	var dco opcm.DeployOPChainOutput
 	lgr.Info("deploying OP chain using local allocs", "id", chainID.Hex())
-	dco, err = opcm.DeployOPChain(
-		env.L1ScriptHost,
-		input,
-	)
+	dco, err = deployFunc()
 	if err != nil {
 		return fmt.Errorf("error deploying OP chain: %w", err)
 	}
@@ -190,7 +226,7 @@ type ChainProofParams struct {
 	DangerouslyAllowCustomDisputeParameters bool        `json:"dangerouslyAllowCustomDisputeParameters" toml:"dangerouslyAllowCustomDisputeParameters"`
 }
 
-func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInput, error) {
+func makeDCIV160(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInputV160, error) {
 	proofParams, err := jsonutil.MergeJSON(
 		ChainProofParams{
 			DisputeGameType:         standard.DisputeGameType,
@@ -204,10 +240,10 @@ func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common
 		thisIntent.DeployOverrides,
 	)
 	if err != nil {
-		return opcm.DeployOPChainInput{}, fmt.Errorf("error merging proof params from overrides: %w", err)
+		return opcm.DeployOPChainInputV160{}, fmt.Errorf("error merging proof params from overrides: %w", err)
 	}
 
-	return opcm.DeployOPChainInput{
+	return opcm.DeployOPChainInputV160{
 		OpChainProxyAdminOwner:       thisIntent.Roles.L1ProxyAdminOwner,
 		SystemConfigOwner:            thisIntent.Roles.SystemConfigOwner,
 		Batcher:                      thisIntent.Roles.Batcher,
@@ -230,6 +266,18 @@ func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common
 	}, nil
 }
 
+func makeDCIIsthmus(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInputIsthmus, error) {
+	dci, err := makeDCIV160(intent, thisIntent, chainID, st)
+	if err != nil {
+		return opcm.DeployOPChainInputIsthmus{}, fmt.Errorf("error making deploy OP chain input: %w", err)
+	}
+
+	return opcm.DeployOPChainInputIsthmus{
+		DeployOPChainInputV160: dci,
+		SystemConfigFeeAdmin:   common.Address{'D', 'E', 'A', 'D'},
+	}, nil
+}
+
 func makeChainState(chainID common.Hash, dco opcm.DeployOPChainOutput) *state.ChainState {
 	return &state.ChainState{
 		ID:                                        chainID,
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 2666891d96fc..46fb812b33c5 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -26,6 +26,9 @@ const (
 	DisputeSplitDepth               uint64 = 30
 	DisputeClockExtension           uint64 = 10800
 	DisputeMaxClockDuration         uint64 = 302400
+
+	ContractsV160Tag        = "op-contracts/v1.6.0"
+	ContractsV170Beta1L2Tag = "op-contracts/v1.7.0-beta.1+l2-contracts"
 )
 
 var DisputeAbsolutePrestate = common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c")
@@ -40,9 +43,9 @@ var L1VersionsSepolia L1Versions
 
 var L1VersionsMainnet L1Versions
 
-var DefaultL1ContractsTag = "op-contracts/v1.6.0"
+var DefaultL1ContractsTag = ContractsV160Tag
 
-var DefaultL2ContractsTag = "op-contracts/v1.7.0-beta.1+l2-contracts"
+var DefaultL2ContractsTag = ContractsV170Beta1L2Tag
 
 type L1Versions struct {
 	Releases map[string]L1VersionsReleases `toml:"releases"`

From 2c5f6ed312aa7b92e9c23d3c7056bed7735f8f47 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 1 Nov 2024 02:57:10 +0700
Subject: [PATCH 091/451] feat(ct): DeployDelayedWETH script (#12662)

* feat(ct): DeployDelayedWETH script

Adds a new deployment script for deploying a new DelayedWETH
proxy contract.

* fix tests

* lint

* delete letter o

* move testdata

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-deployer/pkg/deployer/apply.go             |  10 +-
 .../{pipeline => artifacts}/downloader.go     |   6 +-
 .../downloader_test.go                        |   8 +-
 .../locator.go}                               |  24 +-
 .../locator_test.go}                          |  14 +-
 .../testdata/artifacts.tar.gz                 | Bin
 .../pkg/deployer/bootstrap/delayed_weth.go    | 204 +++++++++++++++
 op-deployer/pkg/deployer/bootstrap/flags.go   |  12 +
 op-deployer/pkg/deployer/bootstrap/opcm.go    |  12 +-
 op-deployer/pkg/deployer/init.go              |   6 +-
 op-deployer/pkg/deployer/inspect/semvers.go   |   8 +-
 .../deployer/integration_test/apply_test.go   |  68 ++---
 op-deployer/pkg/deployer/opcm/delayed_weth.go |  71 +++++
 .../pkg/deployer/opcm/delayed_weth_test.go    |  46 ++++
 .../pkg/deployer/pipeline/l2genesis.go        |   4 +-
 op-deployer/pkg/deployer/pipeline/opchain.go  |   4 +-
 op-deployer/pkg/deployer/standard/standard.go |  13 +
 op-deployer/pkg/deployer/state/intent.go      |  12 +-
 op-deployer/pkg/deployer/testutil/env.go      |  37 +++
 .../pkg/{deployer/pipeline => env}/host.go    |   2 +-
 .../scripts/deploy/DeployDelayedWETH.s.sol    | 245 ++++++++++++++++++
 21 files changed, 708 insertions(+), 98 deletions(-)
 rename op-deployer/pkg/deployer/{pipeline => artifacts}/downloader.go (94%)
 rename op-deployer/pkg/deployer/{pipeline => artifacts}/downloader_test.go (82%)
 rename op-deployer/pkg/deployer/{opcm/artifacts_locator.go => artifacts/locator.go} (66%)
 rename op-deployer/pkg/deployer/{opcm/artifacts_locator_test.go => artifacts/locator_test.go} (88%)
 rename op-deployer/pkg/deployer/{pipeline => artifacts}/testdata/artifacts.tar.gz (100%)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/delayed_weth.go
 create mode 100644 op-deployer/pkg/deployer/opcm/delayed_weth.go
 create mode 100644 op-deployer/pkg/deployer/opcm/delayed_weth_test.go
 create mode 100644 op-deployer/pkg/deployer/testutil/env.go
 rename op-deployer/pkg/{deployer/pipeline => env}/host.go (98%)
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol

diff --git a/op-deployer/pkg/deployer/apply.go b/op-deployer/pkg/deployer/apply.go
index 95db427d8efb..f6eb38d11e08 100644
--- a/op-deployer/pkg/deployer/apply.go
+++ b/op-deployer/pkg/deployer/apply.go
@@ -7,6 +7,10 @@ import (
 	"math/big"
 	"strings"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 	"github.com/ethereum/go-ethereum/common"
@@ -146,7 +150,7 @@ func Apply(ctx context.Context, cfg ApplyConfig) error {
 		cfg.Logger.Info("artifacts download progress", "current", curr, "total", total)
 	}
 
-	l1ArtifactsFS, cleanupL1, err := pipeline.DownloadArtifacts(ctx, intent.L1ContractsLocator, progressor)
+	l1ArtifactsFS, cleanupL1, err := artifacts.Download(ctx, intent.L1ContractsLocator, progressor)
 	if err != nil {
 		return fmt.Errorf("failed to download L1 artifacts: %w", err)
 	}
@@ -156,7 +160,7 @@ func Apply(ctx context.Context, cfg ApplyConfig) error {
 		}
 	}()
 
-	l2ArtifactsFS, cleanupL2, err := pipeline.DownloadArtifacts(ctx, intent.L2ContractsLocator, progressor)
+	l2ArtifactsFS, cleanupL2, err := artifacts.Download(ctx, intent.L2ContractsLocator, progressor)
 	if err != nil {
 		return fmt.Errorf("failed to download L2 artifacts: %w", err)
 	}
@@ -171,7 +175,7 @@ func Apply(ctx context.Context, cfg ApplyConfig) error {
 		L2: l2ArtifactsFS,
 	}
 
-	l1Host, err := pipeline.DefaultScriptHost(bcaster, cfg.Logger, deployer, bundle.L1, startingNonce)
+	l1Host, err := env.DefaultScriptHost(bcaster, cfg.Logger, deployer, bundle.L1, startingNonce)
 	if err != nil {
 		return fmt.Errorf("failed to create L1 script host: %w", err)
 	}
diff --git a/op-deployer/pkg/deployer/pipeline/downloader.go b/op-deployer/pkg/deployer/artifacts/downloader.go
similarity index 94%
rename from op-deployer/pkg/deployer/pipeline/downloader.go
rename to op-deployer/pkg/deployer/artifacts/downloader.go
index ffafd6096869..1303adbe86aa 100644
--- a/op-deployer/pkg/deployer/pipeline/downloader.go
+++ b/op-deployer/pkg/deployer/artifacts/downloader.go
@@ -1,4 +1,4 @@
-package pipeline
+package artifacts
 
 import (
 	"archive/tar"
@@ -19,8 +19,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/log"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
-
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 )
 
@@ -40,7 +38,7 @@ func LogProgressor(lgr log.Logger) DownloadProgressor {
 	}
 }
 
-func DownloadArtifacts(ctx context.Context, loc *opcm.ArtifactsLocator, progress DownloadProgressor) (foundry.StatDirFs, CleanupFunc, error) {
+func Download(ctx context.Context, loc *Locator, progress DownloadProgressor) (foundry.StatDirFs, CleanupFunc, error) {
 	var u *url.URL
 	var err error
 	if loc.IsTag() {
diff --git a/op-deployer/pkg/deployer/pipeline/downloader_test.go b/op-deployer/pkg/deployer/artifacts/downloader_test.go
similarity index 82%
rename from op-deployer/pkg/deployer/pipeline/downloader_test.go
rename to op-deployer/pkg/deployer/artifacts/downloader_test.go
index 36183fe5afa5..e66b41f96a81 100644
--- a/op-deployer/pkg/deployer/pipeline/downloader_test.go
+++ b/op-deployer/pkg/deployer/artifacts/downloader_test.go
@@ -1,4 +1,4 @@
-package pipeline
+package artifacts
 
 import (
 	"context"
@@ -9,8 +9,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
-
 	"github.com/stretchr/testify/require"
 )
 
@@ -29,11 +27,11 @@ func TestDownloadArtifacts(t *testing.T) {
 	ctx := context.Background()
 	artifactsURL, err := url.Parse(ts.URL)
 	require.NoError(t, err)
-	loc := &opcm.ArtifactsLocator{
+	loc := &Locator{
 		URL: artifactsURL,
 	}
 
-	fs, cleanup, err := DownloadArtifacts(ctx, loc, nil)
+	fs, cleanup, err := Download(ctx, loc, nil)
 	require.NoError(t, err)
 	require.NotNil(t, fs)
 	defer func() {
diff --git a/op-deployer/pkg/deployer/opcm/artifacts_locator.go b/op-deployer/pkg/deployer/artifacts/locator.go
similarity index 66%
rename from op-deployer/pkg/deployer/opcm/artifacts_locator.go
rename to op-deployer/pkg/deployer/artifacts/locator.go
index 02a2b60b59fb..160e8790420b 100644
--- a/op-deployer/pkg/deployer/opcm/artifacts_locator.go
+++ b/op-deployer/pkg/deployer/artifacts/locator.go
@@ -1,4 +1,4 @@
-package opcm
+package artifacts
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 )
 
-type schemeUnmarshaler func(string) (*ArtifactsLocator, error)
+type schemeUnmarshaler func(string) (*Locator, error)
 
 var schemeUnmarshalerDispatch = map[string]schemeUnmarshaler{
 	"tag":   unmarshalTag,
@@ -16,20 +16,20 @@ var schemeUnmarshalerDispatch = map[string]schemeUnmarshaler{
 	"https": unmarshalURL,
 }
 
-var DefaultL1ContractsLocator = &ArtifactsLocator{
+var DefaultL1ContractsLocator = &Locator{
 	Tag: standard.DefaultL1ContractsTag,
 }
 
-var DefaultL2ContractsLocator = &ArtifactsLocator{
+var DefaultL2ContractsLocator = &Locator{
 	Tag: standard.DefaultL2ContractsTag,
 }
 
-type ArtifactsLocator struct {
+type Locator struct {
 	URL *url.URL
 	Tag string
 }
 
-func (a *ArtifactsLocator) UnmarshalText(text []byte) error {
+func (a *Locator) UnmarshalText(text []byte) error {
 	str := string(text)
 
 	for scheme, unmarshaler := range schemeUnmarshalerDispatch {
@@ -49,7 +49,7 @@ func (a *ArtifactsLocator) UnmarshalText(text []byte) error {
 	return fmt.Errorf("unsupported scheme")
 }
 
-func (a *ArtifactsLocator) MarshalText() ([]byte, error) {
+func (a *Locator) MarshalText() ([]byte, error) {
 	if a.URL != nil {
 		return []byte(a.URL.String()), nil
 	}
@@ -61,11 +61,11 @@ func (a *ArtifactsLocator) MarshalText() ([]byte, error) {
 	return nil, fmt.Errorf("no URL, path or tag set")
 }
 
-func (a *ArtifactsLocator) IsTag() bool {
+func (a *Locator) IsTag() bool {
 	return a.Tag != ""
 }
 
-func unmarshalTag(tag string) (*ArtifactsLocator, error) {
+func unmarshalTag(tag string) (*Locator, error) {
 	tag = strings.TrimPrefix(tag, "tag://")
 	if !strings.HasPrefix(tag, "op-contracts/") {
 		return nil, fmt.Errorf("invalid tag: %s", tag)
@@ -75,14 +75,14 @@ func unmarshalTag(tag string) (*ArtifactsLocator, error) {
 		return nil, err
 	}
 
-	return &ArtifactsLocator{Tag: tag}, nil
+	return &Locator{Tag: tag}, nil
 }
 
-func unmarshalURL(text string) (*ArtifactsLocator, error) {
+func unmarshalURL(text string) (*Locator, error) {
 	u, err := url.Parse(text)
 	if err != nil {
 		return nil, err
 	}
 
-	return &ArtifactsLocator{URL: u}, nil
+	return &Locator{URL: u}, nil
 }
diff --git a/op-deployer/pkg/deployer/opcm/artifacts_locator_test.go b/op-deployer/pkg/deployer/artifacts/locator_test.go
similarity index 88%
rename from op-deployer/pkg/deployer/opcm/artifacts_locator_test.go
rename to op-deployer/pkg/deployer/artifacts/locator_test.go
index 8771fad32ec9..678e2c252b32 100644
--- a/op-deployer/pkg/deployer/opcm/artifacts_locator_test.go
+++ b/op-deployer/pkg/deployer/artifacts/locator_test.go
@@ -1,4 +1,4 @@
-package opcm
+package artifacts
 
 import (
 	"net/url"
@@ -7,17 +7,17 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestArtifactsLocator_Marshaling(t *testing.T) {
+func TestLocator_Marshaling(t *testing.T) {
 	tests := []struct {
 		name string
 		in   string
-		out  *ArtifactsLocator
+		out  *Locator
 		err  bool
 	}{
 		{
 			name: "valid tag",
 			in:   "tag://op-contracts/v1.6.0",
-			out: &ArtifactsLocator{
+			out: &Locator{
 				Tag: "op-contracts/v1.6.0",
 			},
 			err: false,
@@ -37,7 +37,7 @@ func TestArtifactsLocator_Marshaling(t *testing.T) {
 		{
 			name: "valid HTTPS URL",
 			in:   "https://example.com",
-			out: &ArtifactsLocator{
+			out: &Locator{
 				URL: parseUrl(t, "https://example.com"),
 			},
 			err: false,
@@ -45,7 +45,7 @@ func TestArtifactsLocator_Marshaling(t *testing.T) {
 		{
 			name: "valid file URL",
 			in:   "file:///tmp/artifacts",
-			out: &ArtifactsLocator{
+			out: &Locator{
 				URL: parseUrl(t, "file:///tmp/artifacts"),
 			},
 			err: false,
@@ -71,7 +71,7 @@ func TestArtifactsLocator_Marshaling(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			var a ArtifactsLocator
+			var a Locator
 			err := a.UnmarshalText([]byte(tt.in))
 			if tt.err {
 				require.Error(t, err)
diff --git a/op-deployer/pkg/deployer/pipeline/testdata/artifacts.tar.gz b/op-deployer/pkg/deployer/artifacts/testdata/artifacts.tar.gz
similarity index 100%
rename from op-deployer/pkg/deployer/pipeline/testdata/artifacts.tar.gz
rename to op-deployer/pkg/deployer/artifacts/testdata/artifacts.tar.gz
diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
new file mode 100644
index 000000000000..45952d19e955
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -0,0 +1,204 @@
+package bootstrap
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"fmt"
+	"math/big"
+	"strings"
+
+	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
+	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/urfave/cli/v2"
+)
+
+type DelayedWETHConfig struct {
+	L1RPCUrl         string
+	PrivateKey       string
+	Logger           log.Logger
+	ArtifactsLocator *artifacts2.Locator
+
+	privateKeyECDSA *ecdsa.PrivateKey
+}
+
+func (c *DelayedWETHConfig) Check() error {
+	if c.L1RPCUrl == "" {
+		return fmt.Errorf("l1RPCUrl must be specified")
+	}
+
+	if c.PrivateKey == "" {
+		return fmt.Errorf("private key must be specified")
+	}
+
+	privECDSA, err := crypto.HexToECDSA(strings.TrimPrefix(c.PrivateKey, "0x"))
+	if err != nil {
+		return fmt.Errorf("failed to parse private key: %w", err)
+	}
+	c.privateKeyECDSA = privECDSA
+
+	if c.Logger == nil {
+		return fmt.Errorf("logger must be specified")
+	}
+
+	if c.ArtifactsLocator == nil {
+		return fmt.Errorf("artifacts locator must be specified")
+	}
+
+	return nil
+}
+
+func DelayedWETHCLI(cliCtx *cli.Context) error {
+	logCfg := oplog.ReadCLIConfig(cliCtx)
+	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
+	oplog.SetGlobalLogHandler(l.Handler())
+
+	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
+	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
+	artifactsLocator := new(artifacts2.Locator)
+	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
+		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+	}
+
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+
+	return DelayedWETH(ctx, DelayedWETHConfig{
+		L1RPCUrl:         l1RPCUrl,
+		PrivateKey:       privateKey,
+		Logger:           l,
+		ArtifactsLocator: artifactsLocator,
+	})
+}
+
+func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
+	if err := cfg.Check(); err != nil {
+		return fmt.Errorf("invalid config for DelayedWETH: %w", err)
+	}
+
+	lgr := cfg.Logger
+	progressor := func(curr, total int64) {
+		lgr.Info("artifacts download progress", "current", curr, "total", total)
+	}
+
+	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
+	if err != nil {
+		return fmt.Errorf("failed to download artifacts: %w", err)
+	}
+	defer func() {
+		if err := cleanup(); err != nil {
+			lgr.Warn("failed to clean up artifacts", "err", err)
+		}
+	}()
+
+	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	chainID, err := l1Client.ChainID(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get chain ID: %w", err)
+	}
+	chainIDU64 := chainID.Uint64()
+
+	superCfg, err := standard.SuperchainFor(chainIDU64)
+	if err != nil {
+		return fmt.Errorf("error getting superchain config: %w", err)
+	}
+	standardVersionsTOML, err := standard.L1VersionsDataFor(chainIDU64)
+	if err != nil {
+		return fmt.Errorf("error getting standard versions TOML: %w", err)
+	}
+	proxyAdmin, err := standard.ManagerOwnerAddrFor(chainIDU64)
+	if err != nil {
+		return fmt.Errorf("error getting superchain proxy admin: %w", err)
+	}
+	delayedWethOwner, err := standard.SystemOwnerAddrFor(chainIDU64)
+	if err != nil {
+		return fmt.Errorf("error getting superchain system owner: %w", err)
+	}
+
+	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
+	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
+
+	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+		Logger:  lgr,
+		ChainID: chainID,
+		Client:  l1Client,
+		Signer:  signer,
+		From:    chainDeployer,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create broadcaster: %w", err)
+	}
+
+	nonce, err := l1Client.NonceAt(ctx, chainDeployer, nil)
+	if err != nil {
+		return fmt.Errorf("failed to get starting nonce: %w", err)
+	}
+
+	host, err := env.DefaultScriptHost(
+		bcaster,
+		lgr,
+		chainDeployer,
+		artifactsFS,
+		nonce,
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create script host: %w", err)
+	}
+
+	var release string
+	if cfg.ArtifactsLocator.IsTag() {
+		release = cfg.ArtifactsLocator.Tag
+	} else {
+		release = "dev"
+	}
+
+	lgr.Info("deploying DelayedWETH", "release", release)
+
+	superchainConfigAddr := common.Address(*superCfg.Config.SuperchainConfigAddr)
+
+	dwo, err := opcm.DeployDelayedWETH(
+		host,
+		opcm.DeployDelayedWETHInput{
+			Release:               release,
+			StandardVersionsToml:  standardVersionsTOML,
+			ProxyAdmin:            proxyAdmin,
+			SuperchainConfigProxy: superchainConfigAddr,
+			DelayedWethOwner:      delayedWethOwner,
+			DelayedWethDelay:      big.NewInt(604800),
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("error deploying implementations: %w", err)
+	}
+
+	if _, err := bcaster.Broadcast(ctx); err != nil {
+		return fmt.Errorf("failed to broadcast: %w", err)
+	}
+
+	lgr.Info("deployed DelayedWETH")
+
+	if err := jsonutil.WriteJSON(dwo, ioutil.ToStdOut()); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index d0c9eb5e2ce2..6fd598780df5 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -73,6 +73,12 @@ var OPCMFlags = []cli.Flag{
 	MIPSVersionFlag,
 }
 
+var DelayedWETHFlags = []cli.Flag{
+	deployer.L1RPCURLFlag,
+	deployer.PrivateKeyFlag,
+	ArtifactsLocatorFlag,
+}
+
 var Commands = []*cli.Command{
 	{
 		Name:   "opcm",
@@ -80,4 +86,10 @@ var Commands = []*cli.Command{
 		Flags:  cliapp.ProtectFlags(OPCMFlags),
 		Action: OPCMCLI,
 	},
+	{
+		Name:   "delayedweth",
+		Usage:  "Bootstrap an instance of DelayedWETH.",
+		Flags:  cliapp.ProtectFlags(DelayedWETHFlags),
+		Action: DelayedWETHCLI,
+	},
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/opcm.go b/op-deployer/pkg/deployer/bootstrap/opcm.go
index 4b792ef92160..d584d6975f41 100644
--- a/op-deployer/pkg/deployer/bootstrap/opcm.go
+++ b/op-deployer/pkg/deployer/bootstrap/opcm.go
@@ -8,6 +8,10 @@ import (
 	"math/big"
 	"strings"
 
+	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
@@ -35,7 +39,7 @@ type OPCMConfig struct {
 	L1RPCUrl         string
 	PrivateKey       string
 	Logger           log.Logger
-	ArtifactsLocator *opcm.ArtifactsLocator
+	ArtifactsLocator *artifacts2.Locator
 
 	privateKeyECDSA *ecdsa.PrivateKey
 }
@@ -98,7 +102,7 @@ func OPCMCLI(cliCtx *cli.Context) error {
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
 	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
-	artifactsLocator := new(opcm.ArtifactsLocator)
+	artifactsLocator := new(artifacts2.Locator)
 	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
 		return fmt.Errorf("failed to parse artifacts URL: %w", err)
 	}
@@ -131,7 +135,7 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 		lgr.Info("artifacts download progress", "current", curr, "total", total)
 	}
 
-	artifactsFS, cleanup, err := pipeline.DownloadArtifacts(ctx, cfg.ArtifactsLocator, progressor)
+	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
 	if err != nil {
 		return fmt.Errorf("failed to download artifacts: %w", err)
 	}
@@ -184,7 +188,7 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 		return fmt.Errorf("failed to get starting nonce: %w", err)
 	}
 
-	host, err := pipeline.DefaultScriptHost(
+	host, err := env.DefaultScriptHost(
 		bcaster,
 		lgr,
 		chainDeployer,
diff --git a/op-deployer/pkg/deployer/init.go b/op-deployer/pkg/deployer/init.go
index 6dd26222fb82..3a8ae27d2ae7 100644
--- a/op-deployer/pkg/deployer/init.go
+++ b/op-deployer/pkg/deployer/init.go
@@ -7,7 +7,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
@@ -90,8 +90,8 @@ func Init(cfg InitConfig) error {
 		DeploymentStrategy: cfg.DeploymentStrategy,
 		L1ChainID:          cfg.L1ChainID,
 		FundDevAccounts:    true,
-		L1ContractsLocator: opcm.DefaultL1ContractsLocator,
-		L2ContractsLocator: opcm.DefaultL2ContractsLocator,
+		L1ContractsLocator: artifacts.DefaultL1ContractsLocator,
+		L2ContractsLocator: artifacts.DefaultL2ContractsLocator,
 	}
 
 	l1ChainIDBig := intent.L1ChainIDBig()
diff --git a/op-deployer/pkg/deployer/inspect/semvers.go b/op-deployer/pkg/deployer/inspect/semvers.go
index f88f2c01476a..7c8e4ce9f3dd 100644
--- a/op-deployer/pkg/deployer/inspect/semvers.go
+++ b/op-deployer/pkg/deployer/inspect/semvers.go
@@ -8,6 +8,10 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
@@ -53,7 +57,7 @@ func L2SemversCLI(cliCtx *cli.Context) error {
 		return fmt.Errorf("chain state does not have allocs")
 	}
 
-	artifactsFS, cleanup, err := pipeline.DownloadArtifacts(ctx, intent.L2ContractsLocator, pipeline.LogProgressor(l))
+	artifactsFS, cleanup, err := artifacts.Download(ctx, intent.L2ContractsLocator, artifacts.LogProgressor(l))
 	if err != nil {
 		return fmt.Errorf("failed to download L2 artifacts: %w", err)
 	}
@@ -63,7 +67,7 @@ func L2SemversCLI(cliCtx *cli.Context) error {
 		}
 	}()
 
-	host, err := pipeline.DefaultScriptHost(
+	host, err := env.DefaultScriptHost(
 		broadcaster.NoopBroadcaster(),
 		l,
 		common.Address{19: 0x01},
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index af240aeffa73..e0b34dc8ea6a 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -7,14 +7,16 @@ import (
 	"fmt"
 	"log/slog"
 	"math/big"
-	"net/url"
 	"os"
-	"path"
-	"runtime"
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
@@ -22,7 +24,6 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
@@ -109,7 +110,7 @@ func TestEndToEndApply(t *testing.T) {
 	deployerAddr, err := dk.Address(depKey)
 	require.NoError(t, err)
 
-	loc := localArtifactsLocator(t)
+	loc, _ := testutil.LocalArtifacts(t)
 
 	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
 		Logger:  log.NewLogger(log.DiscardHandler()),
@@ -120,7 +121,7 @@ func TestEndToEndApply(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	env, bundle, _ := createEnv(t, ctx, lgr, l1Client, bcaster, deployerAddr)
+	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	cg := ethClientCodeGetter(ctx, l1Client)
 
@@ -140,7 +141,7 @@ func TestEndToEndApply(t *testing.T) {
 	t.Run("subsequent chain", func(t *testing.T) {
 		// create a new environment with wiped state to ensure we can continue using the
 		// state from the previous deployment
-		env, bundle, _ = createEnv(t, ctx, lgr, l1Client, bcaster, deployerAddr)
+		env, bundle, _ = createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 		intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID2))
 
 		require.NoError(t, deployer.ApplyPipeline(
@@ -202,15 +203,15 @@ func TestApplyExistingOPCM(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	env, bundle, _ := createEnv(t, ctx, lgr, l1Client, bcaster, deployerAddr)
+	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 
 	intent, st := newIntent(
 		t,
 		l1ChainID,
 		dk,
 		l2ChainID,
-		opcm.DefaultL1ContractsLocator,
-		opcm.DefaultL2ContractsLocator,
+		artifacts.DefaultL1ContractsLocator,
+		artifacts.DefaultL2ContractsLocator,
 	)
 
 	require.NoError(t, deployer.ApplyPipeline(
@@ -421,7 +422,7 @@ func TestInvalidL2Genesis(t *testing.T) {
 	deployerAddr, err := dk.Address(depKey)
 	require.NoError(t, err)
 
-	loc := localArtifactsLocator(t)
+	loc, _ := testutil.LocalArtifacts(t)
 
 	// these tests were generated by grepping all usages of the deploy
 	// config in L2Genesis.s.sol.
@@ -468,7 +469,7 @@ func TestInvalidL2Genesis(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
+			env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
 			intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 			intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 			intent.DeploymentStrategy = state.DeploymentStrategyGenesis
@@ -490,9 +491,6 @@ func TestInvalidL2Genesis(t *testing.T) {
 func setupGenesisChain(t *testing.T) (*pipeline.Env, pipeline.ArtifactsBundle, *state.Intent, *state.State) {
 	lgr := testlog.Logger(t, slog.LevelDebug)
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
 	depKey := new(deployerKey)
 	l1ChainID := big.NewInt(77799777)
 	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
@@ -503,53 +501,25 @@ func setupGenesisChain(t *testing.T) (*pipeline.Env, pipeline.ArtifactsBundle, *
 	deployerAddr, err := dk.Address(depKey)
 	require.NoError(t, err)
 
-	loc := localArtifactsLocator(t)
+	loc, _ := testutil.LocalArtifacts(t)
 
-	env, bundle, _ := createEnv(t, ctx, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
+	env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
 	return env, bundle, intent, st
 }
 
-func localArtifactsLocator(t *testing.T) *opcm.ArtifactsLocator {
-	_, testFilename, _, ok := runtime.Caller(0)
-	require.Truef(t, ok, "failed to get test filename")
-	monorepoDir := path.Join(path.Dir(testFilename), "..", "..", "..", "..")
-	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
-	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
-	require.NoError(t, err)
-	loc := &opcm.ArtifactsLocator{
-		URL: artifactsURL,
-	}
-	return loc
-}
-
 func createEnv(
 	t *testing.T,
-	ctx context.Context,
 	lgr log.Logger,
 	l1Client *ethclient.Client,
 	bcaster broadcaster.Broadcaster,
 	deployerAddr common.Address,
 ) (*pipeline.Env, pipeline.ArtifactsBundle, *script.Host) {
-	_, testFilename, _, ok := runtime.Caller(0)
-	require.Truef(t, ok, "failed to get test filename")
-	monorepoDir := path.Join(path.Dir(testFilename), "..", "..", "..", "..")
-	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
-	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
-	require.NoError(t, err)
-	artifactsLocator := &opcm.ArtifactsLocator{
-		URL: artifactsURL,
-	}
-
-	artifactsFS, cleanupArtifacts, err := pipeline.DownloadArtifacts(ctx, artifactsLocator, pipeline.NoopDownloadProgressor)
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, cleanupArtifacts())
-	}()
+	_, artifactsFS := testutil.LocalArtifacts(t)
 
-	host, err := pipeline.DefaultScriptHost(
+	host, err := env.DefaultScriptHost(
 		bcaster,
 		lgr,
 		deployerAddr,
@@ -586,8 +556,8 @@ func newIntent(
 	l1ChainID *big.Int,
 	dk *devkeys.MnemonicDevKeys,
 	l2ChainID *uint256.Int,
-	l1Loc *opcm.ArtifactsLocator,
-	l2Loc *opcm.ArtifactsLocator,
+	l1Loc *artifacts.Locator,
+	l2Loc *artifacts.Locator,
 ) (*state.Intent, *state.State) {
 	intent := &state.Intent{
 		DeploymentStrategy: state.DeploymentStrategyLive,
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth.go b/op-deployer/pkg/deployer/opcm/delayed_weth.go
new file mode 100644
index 000000000000..d94e25cb9092
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth.go
@@ -0,0 +1,71 @@
+package opcm
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+)
+
+type DeployDelayedWETHInput struct {
+	Release               string
+	StandardVersionsToml  string
+	ProxyAdmin            common.Address
+	SuperchainConfigProxy common.Address
+	DelayedWethOwner      common.Address
+	DelayedWethDelay      *big.Int
+}
+
+func (input *DeployDelayedWETHInput) InputSet() bool {
+	return true
+}
+
+type DeployDelayedWETHOutput struct {
+	DelayedWethImpl  common.Address
+	DelayedWethProxy common.Address
+}
+
+func (output *DeployDelayedWETHOutput) CheckOutput(input common.Address) error {
+	return nil
+}
+
+type DeployDelayedWETHScript struct {
+	Run func(input, output common.Address) error
+}
+
+func DeployDelayedWETH(
+	host *script.Host,
+	input DeployDelayedWETHInput,
+) (DeployDelayedWETHOutput, error) {
+	var output DeployDelayedWETHOutput
+	inputAddr := host.NewScriptAddress()
+	outputAddr := host.NewScriptAddress()
+
+	cleanupInput, err := script.WithPrecompileAtAddress[*DeployDelayedWETHInput](host, inputAddr, &input)
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployDelayedWETHInput precompile: %w", err)
+	}
+	defer cleanupInput()
+
+	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployDelayedWETHOutput](host, outputAddr, &output,
+		script.WithFieldSetter[*DeployDelayedWETHOutput])
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployDelayedWETHOutput precompile: %w", err)
+	}
+	defer cleanupOutput()
+
+	implContract := "DeployDelayedWETH"
+	deployScript, cleanupDeploy, err := script.WithScript[DeployDelayedWETHScript](host, "DeployDelayedWETH.s.sol", implContract)
+	if err != nil {
+		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
+	}
+	defer cleanupDeploy()
+
+	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
+	}
+
+	return output, nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth_test.go b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
new file mode 100644
index 000000000000..98ca7ab6996b
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
@@ -0,0 +1,46 @@
+package opcm
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployDelayedWETH(t *testing.T) {
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+		0,
+	)
+	require.NoError(t, err)
+
+	standardVersionsTOML, err := standard.L1VersionsDataFor(11155111)
+	require.NoError(t, err)
+
+	input := DeployDelayedWETHInput{
+		Release:               "dev",
+		StandardVersionsToml:  standardVersionsTOML,
+		ProxyAdmin:            common.Address{'P'},
+		SuperchainConfigProxy: common.Address{'S'},
+		DelayedWethOwner:      common.Address{'O'},
+		DelayedWethDelay:      big.NewInt(100),
+	}
+
+	output, err := DeployDelayedWETH(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.DelayedWethImpl)
+	require.NotEmpty(t, output.DelayedWethProxy)
+}
diff --git a/op-deployer/pkg/deployer/pipeline/l2genesis.go b/op-deployer/pkg/deployer/pipeline/l2genesis.go
index 4fa8755df6ee..a5dabefd8e84 100644
--- a/op-deployer/pkg/deployer/pipeline/l2genesis.go
+++ b/op-deployer/pkg/deployer/pipeline/l2genesis.go
@@ -3,6 +3,8 @@ package pipeline
 import (
 	"fmt"
 
+	env2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
@@ -36,7 +38,7 @@ func GenerateL2Genesis(env *Env, intent *state.Intent, bundle ArtifactsBundle, s
 		return fmt.Errorf("failed to combine L2 init config: %w", err)
 	}
 
-	host, err := DefaultScriptHost(
+	host, err := env2.DefaultScriptHost(
 		broadcaster.NoopBroadcaster(),
 		env.Logger,
 		env.Deployer,
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index 66699348709d..59e5d214cf4f 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -6,6 +6,8 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 
@@ -144,7 +146,7 @@ func conditionallySetImplementationAddresses(ctx context.Context, client *ethcli
 	return nil
 }
 
-func setMipsSingletonAddress(ctx context.Context, client *ethclient.Client, l1ArtifactsLocator *opcm.ArtifactsLocator, errCh chan error, opcmProxyAddress common.Address, singletonAddress *common.Address) {
+func setMipsSingletonAddress(ctx context.Context, client *ethclient.Client, l1ArtifactsLocator *artifacts.Locator, errCh chan error, opcmProxyAddress common.Address, singletonAddress *common.Address) {
 	if !l1ArtifactsLocator.IsTag() {
 		errCh <- errors.New("L1 contracts locator is not a tag, cannot set MIPS singleton address")
 		return
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 46fb812b33c5..78144ca1a7bf 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -156,6 +156,19 @@ func ManagerOwnerAddrFor(chainID uint64) (common.Address, error) {
 	}
 }
 
+func SystemOwnerAddrFor(chainID uint64) (common.Address, error) {
+	switch chainID {
+	case 1:
+		// Set to owner of superchain proxy admin
+		return common.HexToAddress("0x5a0Aae59D09fccBdDb6C6CcEB07B7279367C3d2A"), nil
+	case 11155111:
+		// Set to development multisig
+		return common.HexToAddress("0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B"), nil
+	default:
+		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
 func ArtifactsURLForTag(tag string) (*url.URL, error) {
 	switch tag {
 	case "op-contracts/v1.6.0":
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index cbabe37fc8ef..681d166bc142 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
@@ -42,9 +42,9 @@ type Intent struct {
 
 	UseInterop bool `json:"useInterop" toml:"useInterop"`
 
-	L1ContractsLocator *opcm.ArtifactsLocator `json:"l1ContractsLocator" toml:"l1ContractsLocator"`
+	L1ContractsLocator *artifacts.Locator `json:"l1ContractsLocator" toml:"l1ContractsLocator"`
 
-	L2ContractsLocator *opcm.ArtifactsLocator `json:"l2ContractsLocator" toml:"l2ContractsLocator"`
+	L2ContractsLocator *artifacts.Locator `json:"l2ContractsLocator" toml:"l2ContractsLocator"`
 
 	Chains []*ChainIntent `json:"chains" toml:"chains"`
 
@@ -65,11 +65,11 @@ func (c *Intent) Check() error {
 	}
 
 	if c.L1ContractsLocator == nil {
-		c.L1ContractsLocator = opcm.DefaultL1ContractsLocator
+		c.L1ContractsLocator = artifacts.DefaultL1ContractsLocator
 	}
 
 	if c.L2ContractsLocator == nil {
-		c.L2ContractsLocator = opcm.DefaultL2ContractsLocator
+		c.L2ContractsLocator = artifacts.DefaultL2ContractsLocator
 	}
 
 	var err error
diff --git a/op-deployer/pkg/deployer/testutil/env.go b/op-deployer/pkg/deployer/testutil/env.go
new file mode 100644
index 000000000000..6b289c4503b7
--- /dev/null
+++ b/op-deployer/pkg/deployer/testutil/env.go
@@ -0,0 +1,37 @@
+package testutil
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+	"path"
+	"runtime"
+	"testing"
+
+	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
+	op_service "github.com/ethereum-optimism/optimism/op-service"
+	"github.com/stretchr/testify/require"
+)
+
+func LocalArtifacts(t *testing.T) (*artifacts2.Locator, foundry.StatDirFs) {
+	_, testFilename, _, ok := runtime.Caller(0)
+	require.Truef(t, ok, "failed to get test filename")
+	monorepoDir, err := op_service.FindMonorepoRoot(testFilename)
+	require.NoError(t, err)
+	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
+	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
+	require.NoError(t, err)
+	loc := &artifacts2.Locator{
+		URL: artifactsURL,
+	}
+
+	artifactsFS, cleanupArtifacts, err := artifacts2.Download(context.Background(), loc, artifacts2.NoopDownloadProgressor)
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		_ = cleanupArtifacts()
+	})
+
+	return loc, artifactsFS
+}
diff --git a/op-deployer/pkg/deployer/pipeline/host.go b/op-deployer/pkg/env/host.go
similarity index 98%
rename from op-deployer/pkg/deployer/pipeline/host.go
rename to op-deployer/pkg/env/host.go
index df8e6c9c789b..04a0c4a172d6 100644
--- a/op-deployer/pkg/deployer/pipeline/host.go
+++ b/op-deployer/pkg/env/host.go
@@ -1,4 +1,4 @@
-package pipeline
+package env
 
 import (
 	"fmt"
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
new file mode 100644
index 000000000000..979869cb3ad0
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
@@ -0,0 +1,245 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+// Forge
+import { Script } from "forge-std/Script.sol";
+
+// Scripts
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+// Libraries
+import { LibString } from "@solady/utils/LibString.sol";
+
+// Interfaces
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
+import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+
+/// @title DeployDelayedWETH
+contract DeployDelayedWETHInput is BaseDeployIO {
+    /// Required inputs.
+    string internal _release;
+    string internal _standardVersionsToml;
+    address public _proxyAdmin;
+    ISuperchainConfig public _superchainConfigProxy;
+    address public _delayedWethOwner;
+    uint256 public _delayedWethDelay;
+
+    function set(bytes4 _sel, uint256 _value) public {
+        if (_sel == this.delayedWethDelay.selector) {
+            require(_value != 0, "DeployDelayedWETH: delayedWethDelay cannot be zero");
+            _delayedWethDelay = _value;
+        } else {
+            revert("DeployDelayedWETH: unknown selector");
+        }
+    }
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.proxyAdmin.selector) {
+            require(_value != address(0), "DeployDelayedWETH: proxyAdmin cannot be zero address");
+            _proxyAdmin = _value;
+        } else if (_sel == this.superchainConfigProxy.selector) {
+            require(_value != address(0), "DeployDelayedWETH: superchainConfigProxy cannot be zero address");
+            _superchainConfigProxy = ISuperchainConfig(_value);
+        } else if (_sel == this.delayedWethOwner.selector) {
+            require(_value != address(0), "DeployDelayedWETH: delayedWethOwner cannot be zero address");
+            _delayedWethOwner = _value;
+        } else {
+            revert("DeployDelayedWETH: unknown selector");
+        }
+    }
+
+    function set(bytes4 _sel, string memory _value) public {
+        if (_sel == this.release.selector) {
+            require(!LibString.eq(_value, ""), "DeployDelayedWETH: release cannot be empty");
+            _release = _value;
+        } else if (_sel == this.standardVersionsToml.selector) {
+            require(!LibString.eq(_value, ""), "DeployDelayedWETH: standardVersionsToml cannot be empty");
+            _standardVersionsToml = _value;
+        } else {
+            revert("DeployDelayedWETH: unknown selector");
+        }
+    }
+
+    function release() public view returns (string memory) {
+        require(!LibString.eq(_release, ""), "DeployDelayedWETH: release not set");
+        return _release;
+    }
+
+    function standardVersionsToml() public view returns (string memory) {
+        require(!LibString.eq(_standardVersionsToml, ""), "DeployDelayedWETH: standardVersionsToml not set");
+        return _standardVersionsToml;
+    }
+
+    function proxyAdmin() public view returns (address) {
+        require(_proxyAdmin != address(0), "DeployDelayedWETH: proxyAdmin not set");
+        return _proxyAdmin;
+    }
+
+    function superchainConfigProxy() public view returns (ISuperchainConfig) {
+        require(address(_superchainConfigProxy) != address(0), "DeployDisputeGame: superchainConfigProxy not set");
+        return _superchainConfigProxy;
+    }
+
+    function delayedWethOwner() public view returns (address) {
+        require(_delayedWethOwner != address(0), "DeployDelayedWETH: delayedWethOwner not set");
+        return _delayedWethOwner;
+    }
+
+    function delayedWethDelay() public view returns (uint256) {
+        require(_delayedWethDelay != 0, "DeployDelayedWETH: delayedWethDelay not set");
+        return _delayedWethDelay;
+    }
+}
+
+/// @title DeployDelayedWETHOutput
+contract DeployDelayedWETHOutput is BaseDeployIO {
+    IDelayedWETH internal _delayedWethImpl;
+    IDelayedWETH internal _delayedWethProxy;
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.delayedWethImpl.selector) {
+            require(_value != address(0), "DeployDelayedWETHOutput: delayedWethImpl cannot be zero address");
+            _delayedWethImpl = IDelayedWETH(payable(_value));
+        } else if (_sel == this.delayedWethProxy.selector) {
+            require(_value != address(0), "DeployDelayedWETHOutput: delayedWethProxy cannot be zero address");
+            _delayedWethProxy = IDelayedWETH(payable(_value));
+        } else {
+            revert("DeployDelayedWETHOutput: unknown selector");
+        }
+    }
+
+    function checkOutput(DeployDelayedWETHInput _dwi) public {
+        DeployUtils.assertValidContractAddress(address(_delayedWethImpl));
+        DeployUtils.assertValidContractAddress(address(_delayedWethProxy));
+        assertValidDeploy(_dwi);
+    }
+
+    function delayedWethImpl() public view returns (IDelayedWETH) {
+        DeployUtils.assertValidContractAddress(address(_delayedWethImpl));
+        return _delayedWethImpl;
+    }
+
+    function delayedWethProxy() public view returns (IDelayedWETH) {
+        DeployUtils.assertValidContractAddress(address(_delayedWethProxy));
+        return _delayedWethProxy;
+    }
+
+    function assertValidDeploy(DeployDelayedWETHInput _dwi) public {
+        assertValidDelayedWethImpl(_dwi);
+        assertValidDelayedWethProxy(_dwi);
+    }
+
+    function assertValidDelayedWethImpl(DeployDelayedWETHInput _dwi) internal {
+        IProxy proxy = IProxy(payable(address(delayedWethProxy())));
+        vm.prank(address(0));
+        address impl = proxy.implementation();
+        require(impl == address(delayedWethImpl()), "DWI-10");
+        DeployUtils.assertInitialized({ _contractAddress: address(delayedWethImpl()), _slot: 0, _offset: 0 });
+        require(delayedWethImpl().owner() == address(0), "DWI-20");
+        require(delayedWethImpl().delay() == _dwi.delayedWethDelay(), "DWI-30");
+        require(address(delayedWethImpl().config()) == address(0), "DWI-30");
+    }
+
+    function assertValidDelayedWethProxy(DeployDelayedWETHInput _dwi) internal {
+        // Check as proxy.
+        IProxy proxy = IProxy(payable(address(delayedWethProxy())));
+        vm.prank(address(0));
+        address admin = proxy.admin();
+        require(admin == _dwi.proxyAdmin(), "DWP-10");
+
+        // Check as implementation.
+        DeployUtils.assertInitialized({ _contractAddress: address(delayedWethProxy()), _slot: 0, _offset: 0 });
+        require(delayedWethProxy().owner() == _dwi.delayedWethOwner(), "DWP-20");
+        require(delayedWethProxy().delay() == _dwi.delayedWethDelay(), "DWP-30");
+        require(delayedWethProxy().config() == _dwi.superchainConfigProxy(), "DWP-40");
+    }
+}
+
+/// @title DeployDelayedWETH
+contract DeployDelayedWETH is Script {
+    function run(DeployDelayedWETHInput _dwi, DeployDelayedWETHOutput _dwo) public {
+        deployDelayedWethProxy(_dwi, _dwo);
+        _dwo.checkOutput(_dwi);
+    }
+
+    function deployDelayedWethImpl(DeployDelayedWETHInput _dwi, DeployDelayedWETHOutput _dwo) internal {
+        string memory release = _dwi.release();
+        string memory stdVerToml = _dwi.standardVersionsToml();
+        string memory contractName = "delayed_weth";
+        IDelayedWETH impl;
+
+        address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
+        if (existingImplementation != address(0)) {
+            impl = IDelayedWETH(payable(existingImplementation));
+        } else if (isDevelopRelease(release)) {
+            vm.broadcast(msg.sender);
+            impl = IDelayedWETH(
+                DeployUtils.create1({
+                    _name: "DelayedWETH",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(IDelayedWETH.__constructor__, (_dwi.delayedWethDelay()))
+                    )
+                })
+            );
+        } else {
+            revert(string.concat("DeployDelayedWETH: failed to deploy release ", release));
+        }
+
+        vm.label(address(impl), "DelayedWETHImpl");
+        _dwo.set(_dwo.delayedWethImpl.selector, address(impl));
+    }
+
+    function deployDelayedWethProxy(DeployDelayedWETHInput _dwi, DeployDelayedWETHOutput _dwo) internal {
+        vm.broadcast(msg.sender);
+        IProxy proxy = IProxy(
+            DeployUtils.create1({
+                _name: "Proxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
+            })
+        );
+
+        deployDelayedWethImpl(_dwi, _dwo);
+        IDelayedWETH impl = _dwo.delayedWethImpl();
+
+        vm.startBroadcast(msg.sender);
+        proxy.upgradeToAndCall(
+            address(impl), abi.encodeCall(impl.initialize, (_dwi.delayedWethOwner(), _dwi.superchainConfigProxy()))
+        );
+        proxy.changeAdmin(_dwi.proxyAdmin());
+        vm.stopBroadcast();
+
+        vm.label(address(proxy), "DelayedWETHProxy");
+        _dwo.set(_dwo.delayedWethProxy.selector, address(proxy));
+    }
+
+    // Zero address is returned if the address is not found in '_standardVersionsToml'.
+    function getReleaseAddress(
+        string memory _version,
+        string memory _contractName,
+        string memory _standardVersionsToml
+    )
+        internal
+        pure
+        returns (address addr_)
+    {
+        string memory baseKey = string.concat('.releases["', _version, '"].', _contractName);
+        string memory implAddressKey = string.concat(baseKey, ".implementation_address");
+        string memory addressKey = string.concat(baseKey, ".address");
+        try vm.parseTomlAddress(_standardVersionsToml, implAddressKey) returns (address parsedAddr_) {
+            addr_ = parsedAddr_;
+        } catch {
+            try vm.parseTomlAddress(_standardVersionsToml, addressKey) returns (address parsedAddr_) {
+                addr_ = parsedAddr_;
+            } catch {
+                addr_ = address(0);
+            }
+        }
+    }
+
+    // A release is considered a 'develop' release if it does not start with 'op-contracts'.
+    function isDevelopRelease(string memory _release) internal pure returns (bool) {
+        return !LibString.startsWith(_release, "op-contracts");
+    }
+}

From 5e209a5256b2f011a99bc12a83e126a29a5cc3d6 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 1 Nov 2024 03:24:18 +0700
Subject: [PATCH 092/451] op-e2e: interop cross L2 inbox system test (#12754)

* op-e2e: interop cross L2 inbox system test

Co-authored-by: Axel Kingsley <axel.kingsley@gmail.com>

* point at latest interop op-geth commit

* lint

* test fixes

* update to latest geth commit

* op-supervisor: uint32 log index, improve chainid test

* correct uint64 to uint32 everywhere ; point at latest geth commit

* use tagged geth version

---------

Co-authored-by: Axel Kingsley <axel.kingsley@gmail.com>
---
 go.mod                                        |   4 +-
 go.sum                                        |   4 +-
 op-chain-ops/interopgen/recipe.go             |   1 +
 .../deployer/integration_test/apply_test.go   |   2 +-
 .../contracts/{ => bindings/emit}/emit.go     |   5 +-
 .../interop/contracts/bindings/inbox/inbox.go | 231 ++++++++++++++++++
 .../bindings/systemconfig/systemconfig.go     | 201 +++++++++++++++
 .../build/ICrossL2Inbox.sol/ICrossL2Inbox.abi |  97 ++++++++
 .../build/ICrossL2Inbox.sol/ICrossL2Inbox.bin |   1 +
 .../ICrossL2Inbox.sol/ICrossL2Inbox.json      |   1 +
 .../build/ISystemConfig.sol/ISystemConfig.abi |  15 ++
 .../build/ISystemConfig.sol/ISystemConfig.bin |   1 +
 .../ISystemConfig.sol/ISystemConfig.json      |   1 +
 .../contracts/build/emit.sol/EmitEvent.abi    |  28 +++
 .../contracts/build/emit.sol/EmitEvent.bin    |   1 +
 .../contracts/build/emit.sol/EmitEvent.json   |   1 +
 op-e2e/interop/contracts/generate.sh          |  19 +-
 .../interop/contracts/src/ICrossL2Inbox.sol   |  29 +++
 .../interop/contracts/src/ISystemConfig.sol   |   8 +
 op-e2e/interop/interop_test.go                | 110 ++++++++-
 op-e2e/interop/supersystem.go                 | 147 ++++++++++-
 op-supervisor/supervisor/backend/backend.go   |  19 +-
 .../supervisor/backend/db/logs/db.go          |   2 +-
 .../backend/processors/log_processor.go       |  14 +-
 op-supervisor/supervisor/service.go           |   1 +
 op-supervisor/supervisor/types/types.go       |  25 +-
 op-supervisor/supervisor/types/types_test.go  |  16 +-
 .../src/L1/OPContractsManagerInterop.sol      |   4 +-
 28 files changed, 946 insertions(+), 42 deletions(-)
 rename op-e2e/interop/contracts/{ => bindings/emit}/emit.go (99%)
 create mode 100644 op-e2e/interop/contracts/bindings/inbox/inbox.go
 create mode 100644 op-e2e/interop/contracts/bindings/systemconfig/systemconfig.go
 create mode 100644 op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi
 create mode 100644 op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin
 create mode 100644 op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json
 create mode 100644 op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi
 create mode 100644 op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin
 create mode 100644 op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json
 create mode 100644 op-e2e/interop/contracts/build/emit.sol/EmitEvent.abi
 create mode 100644 op-e2e/interop/contracts/build/emit.sol/EmitEvent.bin
 create mode 100644 op-e2e/interop/contracts/build/emit.sol/EmitEvent.json
 create mode 100644 op-e2e/interop/contracts/src/ICrossL2Inbox.sol
 create mode 100644 op-e2e/interop/contracts/src/ISystemConfig.sol

diff --git a/go.mod b/go.mod
index 3232ef0d42ce..3ff8ebb344ed 100644
--- a/go.mod
+++ b/go.mod
@@ -250,9 +250,9 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101411.1-rc.2
+replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101411.1-rc.5
 
-//replace github.com/ethereum/go-ethereum => ../op-geth
+//replace github.com/ethereum/go-ethereum => ../go-ethereum
 
 // replace github.com/ethereum-optimism/superchain-registry/superchain => ../superchain-registry/superchain
 
diff --git a/go.sum b/go.sum
index b183dc9ae47d..616fb9b7d453 100644
--- a/go.sum
+++ b/go.sum
@@ -187,8 +187,8 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.1-rc.2 h1:nOeSTzcFWUCvJO1MJ5AyI26dqR1F7vYgz2jNNKuEtoE=
-github.com/ethereum-optimism/op-geth v1.101411.1-rc.2/go.mod h1:7S4pp8KHBmEmKkRjL1BPOc6jY9hW+64YeMUjR3RVLw4=
+github.com/ethereum-optimism/op-geth v1.101411.1-rc.5 h1:LDSP85xTczjDYMBK0mOF5mzpZifLGz1TTW/6NgQsytc=
+github.com/ethereum-optimism/op-geth v1.101411.1-rc.5/go.mod h1:7S4pp8KHBmEmKkRjL1BPOc6jY9hW+64YeMUjR3RVLw4=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac h1:hCIrLuOPV3FJfMDvXeOhCC3uQNvFoMIIlkT2mN2cfeg=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac/go.mod h1:XaVXL9jg8BcyOeugECgIUGa9Y3DjYJj71RHmb5qon6M=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
diff --git a/op-chain-ops/interopgen/recipe.go b/op-chain-ops/interopgen/recipe.go
index 85f429eb793a..8983ee72da8e 100644
--- a/op-chain-ops/interopgen/recipe.go
+++ b/op-chain-ops/interopgen/recipe.go
@@ -109,6 +109,7 @@ func prefundL2Accounts(l1Cfg *L1Config, l2Cfg *L2Config, addrs devkeys.Addresses
 	l1Cfg.Prefund[l2Cfg.BatchSenderAddress] = Ether(10_000_000)
 	l1Cfg.Prefund[l2Cfg.Deployer] = Ether(10_000_000)
 	l1Cfg.Prefund[l2Cfg.FinalSystemOwner] = Ether(10_000_000)
+	l1Cfg.Prefund[l2Cfg.SystemConfigOwner] = Ether(10_000_000)
 	proposer, err := addrs.Address(devkeys.ChainOperatorKey{
 		ChainID: new(big.Int).SetUint64(l2Cfg.L2ChainID),
 		Role:    devkeys.ProposerRole,
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index e0b34dc8ea6a..f123953a3ea4 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -400,7 +400,7 @@ func TestInteropDeployment(t *testing.T) {
 	chainState := st.Chains[0]
 	depManagerSlot := common.HexToHash("0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c")
 	checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot)
-	proxyAdminOwnerHash := common.BytesToHash(intent.Chains[0].Roles.L1ProxyAdminOwner.Bytes())
+	proxyAdminOwnerHash := common.BytesToHash(intent.Chains[0].Roles.SystemConfigOwner.Bytes())
 	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, proxyAdminOwnerHash)
 }
 
diff --git a/op-e2e/interop/contracts/emit.go b/op-e2e/interop/contracts/bindings/emit/emit.go
similarity index 99%
rename from op-e2e/interop/contracts/emit.go
rename to op-e2e/interop/contracts/bindings/emit/emit.go
index ceae2412659b..7755ef5fd18f 100644
--- a/op-e2e/interop/contracts/emit.go
+++ b/op-e2e/interop/contracts/bindings/emit/emit.go
@@ -26,7 +26,6 @@ var (
 	_ = common.Big1
 	_ = types.BloomLookup
 	_ = event.NewSubscription
-	_ = abi.ConvertType
 )
 
 // EmitMetaData contains all meta data concerning the Emit contract.
@@ -157,11 +156,11 @@ func NewEmitFilterer(address common.Address, filterer bind.ContractFilterer) (*E
 
 // bindEmit binds a generic wrapper to an already deployed contract.
 func bindEmit(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
-	parsed, err := EmitMetaData.GetAbi()
+	parsed, err := abi.JSON(strings.NewReader(EmitABI))
 	if err != nil {
 		return nil, err
 	}
-	return bind.NewBoundContract(address, *parsed, caller, transactor, filterer), nil
+	return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil
 }
 
 // Call invokes the (constant) contract method with params as input values and
diff --git a/op-e2e/interop/contracts/bindings/inbox/inbox.go b/op-e2e/interop/contracts/bindings/inbox/inbox.go
new file mode 100644
index 000000000000..f73fd56355e4
--- /dev/null
+++ b/op-e2e/interop/contracts/bindings/inbox/inbox.go
@@ -0,0 +1,231 @@
+// Code generated - DO NOT EDIT.
+// This file is a generated binding and any manual changes will be lost.
+
+package inbox
+
+import (
+	"errors"
+	"math/big"
+	"strings"
+
+	ethereum "github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/event"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var (
+	_ = errors.New
+	_ = big.NewInt
+	_ = strings.NewReader
+	_ = ethereum.NotFound
+	_ = bind.Bind
+	_ = common.Big1
+	_ = types.BloomLookup
+	_ = event.NewSubscription
+)
+
+// Identifier is an auto generated low-level Go binding around an user-defined struct.
+type Identifier struct {
+	Origin      common.Address
+	BlockNumber *big.Int
+	LogIndex    *big.Int
+	Timestamp   *big.Int
+	ChainId     *big.Int
+}
+
+// InboxMetaData contains all meta data concerning the Inbox contract.
+var InboxMetaData = &bind.MetaData{
+	ABI: "[{\"type\":\"function\",\"name\":\"executeMessage\",\"inputs\":[{\"name\":\"_id\",\"type\":\"tuple\",\"internalType\":\"structIdentifier\",\"components\":[{\"name\":\"origin\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"blockNumber\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"logIndex\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"timestamp\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"chainId\",\"type\":\"uint256\",\"internalType\":\"uint256\"}]},{\"name\":\"_target\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_message\",\"type\":\"bytes\",\"internalType\":\"bytes\"}],\"outputs\":[],\"stateMutability\":\"payable\"},{\"type\":\"function\",\"name\":\"validateMessage\",\"inputs\":[{\"name\":\"_id\",\"type\":\"tuple\",\"internalType\":\"structIdentifier\",\"components\":[{\"name\":\"origin\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"blockNumber\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"logIndex\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"timestamp\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"chainId\",\"type\":\"uint256\",\"internalType\":\"uint256\"}]},{\"name\":\"_msgHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"}]",
+}
+
+// InboxABI is the input ABI used to generate the binding from.
+// Deprecated: Use InboxMetaData.ABI instead.
+var InboxABI = InboxMetaData.ABI
+
+// Inbox is an auto generated Go binding around an Ethereum contract.
+type Inbox struct {
+	InboxCaller     // Read-only binding to the contract
+	InboxTransactor // Write-only binding to the contract
+	InboxFilterer   // Log filterer for contract events
+}
+
+// InboxCaller is an auto generated read-only Go binding around an Ethereum contract.
+type InboxCaller struct {
+	contract *bind.BoundContract // Generic contract wrapper for the low level calls
+}
+
+// InboxTransactor is an auto generated write-only Go binding around an Ethereum contract.
+type InboxTransactor struct {
+	contract *bind.BoundContract // Generic contract wrapper for the low level calls
+}
+
+// InboxFilterer is an auto generated log filtering Go binding around an Ethereum contract events.
+type InboxFilterer struct {
+	contract *bind.BoundContract // Generic contract wrapper for the low level calls
+}
+
+// InboxSession is an auto generated Go binding around an Ethereum contract,
+// with pre-set call and transact options.
+type InboxSession struct {
+	Contract     *Inbox            // Generic contract binding to set the session for
+	CallOpts     bind.CallOpts     // Call options to use throughout this session
+	TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
+}
+
+// InboxCallerSession is an auto generated read-only Go binding around an Ethereum contract,
+// with pre-set call options.
+type InboxCallerSession struct {
+	Contract *InboxCaller  // Generic contract caller binding to set the session for
+	CallOpts bind.CallOpts // Call options to use throughout this session
+}
+
+// InboxTransactorSession is an auto generated write-only Go binding around an Ethereum contract,
+// with pre-set transact options.
+type InboxTransactorSession struct {
+	Contract     *InboxTransactor  // Generic contract transactor binding to set the session for
+	TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
+}
+
+// InboxRaw is an auto generated low-level Go binding around an Ethereum contract.
+type InboxRaw struct {
+	Contract *Inbox // Generic contract binding to access the raw methods on
+}
+
+// InboxCallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
+type InboxCallerRaw struct {
+	Contract *InboxCaller // Generic read-only contract binding to access the raw methods on
+}
+
+// InboxTransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
+type InboxTransactorRaw struct {
+	Contract *InboxTransactor // Generic write-only contract binding to access the raw methods on
+}
+
+// NewInbox creates a new instance of Inbox, bound to a specific deployed contract.
+func NewInbox(address common.Address, backend bind.ContractBackend) (*Inbox, error) {
+	contract, err := bindInbox(address, backend, backend, backend)
+	if err != nil {
+		return nil, err
+	}
+	return &Inbox{InboxCaller: InboxCaller{contract: contract}, InboxTransactor: InboxTransactor{contract: contract}, InboxFilterer: InboxFilterer{contract: contract}}, nil
+}
+
+// NewInboxCaller creates a new read-only instance of Inbox, bound to a specific deployed contract.
+func NewInboxCaller(address common.Address, caller bind.ContractCaller) (*InboxCaller, error) {
+	contract, err := bindInbox(address, caller, nil, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &InboxCaller{contract: contract}, nil
+}
+
+// NewInboxTransactor creates a new write-only instance of Inbox, bound to a specific deployed contract.
+func NewInboxTransactor(address common.Address, transactor bind.ContractTransactor) (*InboxTransactor, error) {
+	contract, err := bindInbox(address, nil, transactor, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &InboxTransactor{contract: contract}, nil
+}
+
+// NewInboxFilterer creates a new log filterer instance of Inbox, bound to a specific deployed contract.
+func NewInboxFilterer(address common.Address, filterer bind.ContractFilterer) (*InboxFilterer, error) {
+	contract, err := bindInbox(address, nil, nil, filterer)
+	if err != nil {
+		return nil, err
+	}
+	return &InboxFilterer{contract: contract}, nil
+}
+
+// bindInbox binds a generic wrapper to an already deployed contract.
+func bindInbox(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
+	parsed, err := abi.JSON(strings.NewReader(InboxABI))
+	if err != nil {
+		return nil, err
+	}
+	return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil
+}
+
+// Call invokes the (constant) contract method with params as input values and
+// sets the output to result. The result type might be a single field for simple
+// returns, a slice of interfaces for anonymous returns and a struct for named
+// returns.
+func (_Inbox *InboxRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _Inbox.Contract.InboxCaller.contract.Call(opts, result, method, params...)
+}
+
+// Transfer initiates a plain transaction to move funds to the contract, calling
+// its default method if one is available.
+func (_Inbox *InboxRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _Inbox.Contract.InboxTransactor.contract.Transfer(opts)
+}
+
+// Transact invokes the (paid) contract method with params as input values.
+func (_Inbox *InboxRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _Inbox.Contract.InboxTransactor.contract.Transact(opts, method, params...)
+}
+
+// Call invokes the (constant) contract method with params as input values and
+// sets the output to result. The result type might be a single field for simple
+// returns, a slice of interfaces for anonymous returns and a struct for named
+// returns.
+func (_Inbox *InboxCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _Inbox.Contract.contract.Call(opts, result, method, params...)
+}
+
+// Transfer initiates a plain transaction to move funds to the contract, calling
+// its default method if one is available.
+func (_Inbox *InboxTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _Inbox.Contract.contract.Transfer(opts)
+}
+
+// Transact invokes the (paid) contract method with params as input values.
+func (_Inbox *InboxTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _Inbox.Contract.contract.Transact(opts, method, params...)
+}
+
+// ExecuteMessage is a paid mutator transaction binding the contract method 0x5984c53e.
+//
+// Solidity: function executeMessage((address,uint256,uint256,uint256,uint256) _id, address _target, bytes _message) payable returns()
+func (_Inbox *InboxTransactor) ExecuteMessage(opts *bind.TransactOpts, _id Identifier, _target common.Address, _message []byte) (*types.Transaction, error) {
+	return _Inbox.contract.Transact(opts, "executeMessage", _id, _target, _message)
+}
+
+// ExecuteMessage is a paid mutator transaction binding the contract method 0x5984c53e.
+//
+// Solidity: function executeMessage((address,uint256,uint256,uint256,uint256) _id, address _target, bytes _message) payable returns()
+func (_Inbox *InboxSession) ExecuteMessage(_id Identifier, _target common.Address, _message []byte) (*types.Transaction, error) {
+	return _Inbox.Contract.ExecuteMessage(&_Inbox.TransactOpts, _id, _target, _message)
+}
+
+// ExecuteMessage is a paid mutator transaction binding the contract method 0x5984c53e.
+//
+// Solidity: function executeMessage((address,uint256,uint256,uint256,uint256) _id, address _target, bytes _message) payable returns()
+func (_Inbox *InboxTransactorSession) ExecuteMessage(_id Identifier, _target common.Address, _message []byte) (*types.Transaction, error) {
+	return _Inbox.Contract.ExecuteMessage(&_Inbox.TransactOpts, _id, _target, _message)
+}
+
+// ValidateMessage is a paid mutator transaction binding the contract method 0xab4d6f75.
+//
+// Solidity: function validateMessage((address,uint256,uint256,uint256,uint256) _id, bytes32 _msgHash) returns()
+func (_Inbox *InboxTransactor) ValidateMessage(opts *bind.TransactOpts, _id Identifier, _msgHash [32]byte) (*types.Transaction, error) {
+	return _Inbox.contract.Transact(opts, "validateMessage", _id, _msgHash)
+}
+
+// ValidateMessage is a paid mutator transaction binding the contract method 0xab4d6f75.
+//
+// Solidity: function validateMessage((address,uint256,uint256,uint256,uint256) _id, bytes32 _msgHash) returns()
+func (_Inbox *InboxSession) ValidateMessage(_id Identifier, _msgHash [32]byte) (*types.Transaction, error) {
+	return _Inbox.Contract.ValidateMessage(&_Inbox.TransactOpts, _id, _msgHash)
+}
+
+// ValidateMessage is a paid mutator transaction binding the contract method 0xab4d6f75.
+//
+// Solidity: function validateMessage((address,uint256,uint256,uint256,uint256) _id, bytes32 _msgHash) returns()
+func (_Inbox *InboxTransactorSession) ValidateMessage(_id Identifier, _msgHash [32]byte) (*types.Transaction, error) {
+	return _Inbox.Contract.ValidateMessage(&_Inbox.TransactOpts, _id, _msgHash)
+}
diff --git a/op-e2e/interop/contracts/bindings/systemconfig/systemconfig.go b/op-e2e/interop/contracts/bindings/systemconfig/systemconfig.go
new file mode 100644
index 000000000000..9e29cc4700e5
--- /dev/null
+++ b/op-e2e/interop/contracts/bindings/systemconfig/systemconfig.go
@@ -0,0 +1,201 @@
+// Code generated - DO NOT EDIT.
+// This file is a generated binding and any manual changes will be lost.
+
+package systemconfig
+
+import (
+	"errors"
+	"math/big"
+	"strings"
+
+	ethereum "github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/event"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var (
+	_ = errors.New
+	_ = big.NewInt
+	_ = strings.NewReader
+	_ = ethereum.NotFound
+	_ = bind.Bind
+	_ = common.Big1
+	_ = types.BloomLookup
+	_ = event.NewSubscription
+)
+
+// SystemconfigMetaData contains all meta data concerning the Systemconfig contract.
+var SystemconfigMetaData = &bind.MetaData{
+	ABI: "[{\"type\":\"function\",\"name\":\"addDependency\",\"inputs\":[{\"name\":\"_chainId\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"}]",
+}
+
+// SystemconfigABI is the input ABI used to generate the binding from.
+// Deprecated: Use SystemconfigMetaData.ABI instead.
+var SystemconfigABI = SystemconfigMetaData.ABI
+
+// Systemconfig is an auto generated Go binding around an Ethereum contract.
+type Systemconfig struct {
+	SystemconfigCaller     // Read-only binding to the contract
+	SystemconfigTransactor // Write-only binding to the contract
+	SystemconfigFilterer   // Log filterer for contract events
+}
+
+// SystemconfigCaller is an auto generated read-only Go binding around an Ethereum contract.
+type SystemconfigCaller struct {
+	contract *bind.BoundContract // Generic contract wrapper for the low level calls
+}
+
+// SystemconfigTransactor is an auto generated write-only Go binding around an Ethereum contract.
+type SystemconfigTransactor struct {
+	contract *bind.BoundContract // Generic contract wrapper for the low level calls
+}
+
+// SystemconfigFilterer is an auto generated log filtering Go binding around an Ethereum contract events.
+type SystemconfigFilterer struct {
+	contract *bind.BoundContract // Generic contract wrapper for the low level calls
+}
+
+// SystemconfigSession is an auto generated Go binding around an Ethereum contract,
+// with pre-set call and transact options.
+type SystemconfigSession struct {
+	Contract     *Systemconfig     // Generic contract binding to set the session for
+	CallOpts     bind.CallOpts     // Call options to use throughout this session
+	TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
+}
+
+// SystemconfigCallerSession is an auto generated read-only Go binding around an Ethereum contract,
+// with pre-set call options.
+type SystemconfigCallerSession struct {
+	Contract *SystemconfigCaller // Generic contract caller binding to set the session for
+	CallOpts bind.CallOpts       // Call options to use throughout this session
+}
+
+// SystemconfigTransactorSession is an auto generated write-only Go binding around an Ethereum contract,
+// with pre-set transact options.
+type SystemconfigTransactorSession struct {
+	Contract     *SystemconfigTransactor // Generic contract transactor binding to set the session for
+	TransactOpts bind.TransactOpts       // Transaction auth options to use throughout this session
+}
+
+// SystemconfigRaw is an auto generated low-level Go binding around an Ethereum contract.
+type SystemconfigRaw struct {
+	Contract *Systemconfig // Generic contract binding to access the raw methods on
+}
+
+// SystemconfigCallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
+type SystemconfigCallerRaw struct {
+	Contract *SystemconfigCaller // Generic read-only contract binding to access the raw methods on
+}
+
+// SystemconfigTransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
+type SystemconfigTransactorRaw struct {
+	Contract *SystemconfigTransactor // Generic write-only contract binding to access the raw methods on
+}
+
+// NewSystemconfig creates a new instance of Systemconfig, bound to a specific deployed contract.
+func NewSystemconfig(address common.Address, backend bind.ContractBackend) (*Systemconfig, error) {
+	contract, err := bindSystemconfig(address, backend, backend, backend)
+	if err != nil {
+		return nil, err
+	}
+	return &Systemconfig{SystemconfigCaller: SystemconfigCaller{contract: contract}, SystemconfigTransactor: SystemconfigTransactor{contract: contract}, SystemconfigFilterer: SystemconfigFilterer{contract: contract}}, nil
+}
+
+// NewSystemconfigCaller creates a new read-only instance of Systemconfig, bound to a specific deployed contract.
+func NewSystemconfigCaller(address common.Address, caller bind.ContractCaller) (*SystemconfigCaller, error) {
+	contract, err := bindSystemconfig(address, caller, nil, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &SystemconfigCaller{contract: contract}, nil
+}
+
+// NewSystemconfigTransactor creates a new write-only instance of Systemconfig, bound to a specific deployed contract.
+func NewSystemconfigTransactor(address common.Address, transactor bind.ContractTransactor) (*SystemconfigTransactor, error) {
+	contract, err := bindSystemconfig(address, nil, transactor, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &SystemconfigTransactor{contract: contract}, nil
+}
+
+// NewSystemconfigFilterer creates a new log filterer instance of Systemconfig, bound to a specific deployed contract.
+func NewSystemconfigFilterer(address common.Address, filterer bind.ContractFilterer) (*SystemconfigFilterer, error) {
+	contract, err := bindSystemconfig(address, nil, nil, filterer)
+	if err != nil {
+		return nil, err
+	}
+	return &SystemconfigFilterer{contract: contract}, nil
+}
+
+// bindSystemconfig binds a generic wrapper to an already deployed contract.
+func bindSystemconfig(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
+	parsed, err := abi.JSON(strings.NewReader(SystemconfigABI))
+	if err != nil {
+		return nil, err
+	}
+	return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil
+}
+
+// Call invokes the (constant) contract method with params as input values and
+// sets the output to result. The result type might be a single field for simple
+// returns, a slice of interfaces for anonymous returns and a struct for named
+// returns.
+func (_Systemconfig *SystemconfigRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _Systemconfig.Contract.SystemconfigCaller.contract.Call(opts, result, method, params...)
+}
+
+// Transfer initiates a plain transaction to move funds to the contract, calling
+// its default method if one is available.
+func (_Systemconfig *SystemconfigRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _Systemconfig.Contract.SystemconfigTransactor.contract.Transfer(opts)
+}
+
+// Transact invokes the (paid) contract method with params as input values.
+func (_Systemconfig *SystemconfigRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _Systemconfig.Contract.SystemconfigTransactor.contract.Transact(opts, method, params...)
+}
+
+// Call invokes the (constant) contract method with params as input values and
+// sets the output to result. The result type might be a single field for simple
+// returns, a slice of interfaces for anonymous returns and a struct for named
+// returns.
+func (_Systemconfig *SystemconfigCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
+	return _Systemconfig.Contract.contract.Call(opts, result, method, params...)
+}
+
+// Transfer initiates a plain transaction to move funds to the contract, calling
+// its default method if one is available.
+func (_Systemconfig *SystemconfigTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+	return _Systemconfig.Contract.contract.Transfer(opts)
+}
+
+// Transact invokes the (paid) contract method with params as input values.
+func (_Systemconfig *SystemconfigTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+	return _Systemconfig.Contract.contract.Transact(opts, method, params...)
+}
+
+// AddDependency is a paid mutator transaction binding the contract method 0xa89c793c.
+//
+// Solidity: function addDependency(uint256 _chainId) returns()
+func (_Systemconfig *SystemconfigTransactor) AddDependency(opts *bind.TransactOpts, _chainId *big.Int) (*types.Transaction, error) {
+	return _Systemconfig.contract.Transact(opts, "addDependency", _chainId)
+}
+
+// AddDependency is a paid mutator transaction binding the contract method 0xa89c793c.
+//
+// Solidity: function addDependency(uint256 _chainId) returns()
+func (_Systemconfig *SystemconfigSession) AddDependency(_chainId *big.Int) (*types.Transaction, error) {
+	return _Systemconfig.Contract.AddDependency(&_Systemconfig.TransactOpts, _chainId)
+}
+
+// AddDependency is a paid mutator transaction binding the contract method 0xa89c793c.
+//
+// Solidity: function addDependency(uint256 _chainId) returns()
+func (_Systemconfig *SystemconfigTransactorSession) AddDependency(_chainId *big.Int) (*types.Transaction, error) {
+	return _Systemconfig.Contract.AddDependency(&_Systemconfig.TransactOpts, _chainId)
+}
diff --git a/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi b/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi
new file mode 100644
index 000000000000..b724169ec6fa
--- /dev/null
+++ b/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi
@@ -0,0 +1,97 @@
+[
+  {
+    "type": "function",
+    "name": "executeMessage",
+    "inputs": [
+      {
+        "name": "_id",
+        "type": "tuple",
+        "internalType": "struct Identifier",
+        "components": [
+          {
+            "name": "origin",
+            "type": "address",
+            "internalType": "address"
+          },
+          {
+            "name": "blockNumber",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "logIndex",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "timestamp",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "chainId",
+            "type": "uint256",
+            "internalType": "uint256"
+          }
+        ]
+      },
+      {
+        "name": "_target",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "_message",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "payable"
+  },
+  {
+    "type": "function",
+    "name": "validateMessage",
+    "inputs": [
+      {
+        "name": "_id",
+        "type": "tuple",
+        "internalType": "struct Identifier",
+        "components": [
+          {
+            "name": "origin",
+            "type": "address",
+            "internalType": "address"
+          },
+          {
+            "name": "blockNumber",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "logIndex",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "timestamp",
+            "type": "uint256",
+            "internalType": "uint256"
+          },
+          {
+            "name": "chainId",
+            "type": "uint256",
+            "internalType": "uint256"
+          }
+        ]
+      },
+      {
+        "name": "_msgHash",
+        "type": "bytes32",
+        "internalType": "bytes32"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  }
+]
diff --git a/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin b/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin
new file mode 100644
index 000000000000..ec687260b851
--- /dev/null
+++ b/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin
@@ -0,0 +1 @@
+0x
diff --git a/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json b/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json
new file mode 100644
index 000000000000..96c8d6ddb036
--- /dev/null
+++ b/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"executeMessage","inputs":[{"name":"_id","type":"tuple","internalType":"struct Identifier","components":[{"name":"origin","type":"address","internalType":"address"},{"name":"blockNumber","type":"uint256","internalType":"uint256"},{"name":"logIndex","type":"uint256","internalType":"uint256"},{"name":"timestamp","type":"uint256","internalType":"uint256"},{"name":"chainId","type":"uint256","internalType":"uint256"}]},{"name":"_target","type":"address","internalType":"address"},{"name":"_message","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"payable"},{"type":"function","name":"validateMessage","inputs":[{"name":"_id","type":"tuple","internalType":"struct Identifier","components":[{"name":"origin","type":"address","internalType":"address"},{"name":"blockNumber","type":"uint256","internalType":"uint256"},{"name":"logIndex","type":"uint256","internalType":"uint256"},{"name":"timestamp","type":"uint256","internalType":"uint256"},{"name":"chainId","type":"uint256","internalType":"uint256"}]},{"name":"_msgHash","type":"bytes32","internalType":"bytes32"}],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"executeMessage((address,uint256,uint256,uint256,uint256),address,bytes)":"5984c53e","validateMessage((address,uint256,uint256,uint256,uint256),bytes32)":"ab4d6f75"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.25+commit.b61c2a91\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"origin\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"blockNumber\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"logIndex\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"chainId\",\"type\":\"uint256\"}],\"internalType\":\"struct Identifier\",\"name\":\"_id\",\"type\":\"tuple\"},{\"internalType\":\"address\",\"name\":\"_target\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"}],\"name\":\"executeMessage\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"internalType\":\"address\",\"name\":\"origin\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"blockNumber\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"logIndex\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"chainId\",\"type\":\"uint256\"}],\"internalType\":\"struct Identifier\",\"name\":\"_id\",\"type\":\"tuple\"},{\"internalType\":\"bytes32\",\"name\":\"_msgHash\",\"type\":\"bytes32\"}],\"name\":\"validateMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{\"executeMessage((address,uint256,uint256,uint256,uint256),address,bytes)\":{\"params\":{\"_id\":\"An Identifier pointing to the initiating message.\",\"_message\":\"The message payload, matching the initiating message.\",\"_target\":\"Account that is called with _msg.\"}},\"validateMessage((address,uint256,uint256,uint256,uint256),bytes32)\":{\"params\":{\"_id\":\"Identifier of the message.\",\"_msgHash\":\"Hash of the message payload to call target with.\"}}},\"title\":\"ICrossL2Inbox\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"executeMessage((address,uint256,uint256,uint256,uint256),address,bytes)\":{\"notice\":\"Executes a cross chain message on the destination chain.\"},\"validateMessage((address,uint256,uint256,uint256,uint256),bytes32)\":{\"notice\":\"Validates a cross chain message on the destination chain         and emits an ExecutingMessage event. This function is useful         for applications that understand the schema of the _message payload and want to         process it in a custom way.\"}},\"notice\":\"Interface for the CrossL2Inbox contract.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"src/ICrossL2Inbox.sol\":\"ICrossL2Inbox\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"src/ICrossL2Inbox.sol\":{\"keccak256\":\"0x97daf76e4a10b96d8062e71df352cbfa7577593fa96676fd43b40f4a0aca9b7f\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://74518c974318070da4e118cd28aa86d7f0702ed8cccc39d60906b93197687248\",\"dweb:/ipfs/QmWimBXYsDWDtNgzhjaLUx4xEiTMvbx5635E2TfNBKoV1E\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.25+commit.b61c2a91"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"struct Identifier","name":"_id","type":"tuple","components":[{"internalType":"address","name":"origin","type":"address"},{"internalType":"uint256","name":"blockNumber","type":"uint256"},{"internalType":"uint256","name":"logIndex","type":"uint256"},{"internalType":"uint256","name":"timestamp","type":"uint256"},{"internalType":"uint256","name":"chainId","type":"uint256"}]},{"internalType":"address","name":"_target","type":"address"},{"internalType":"bytes","name":"_message","type":"bytes"}],"stateMutability":"payable","type":"function","name":"executeMessage"},{"inputs":[{"internalType":"struct Identifier","name":"_id","type":"tuple","components":[{"internalType":"address","name":"origin","type":"address"},{"internalType":"uint256","name":"blockNumber","type":"uint256"},{"internalType":"uint256","name":"logIndex","type":"uint256"},{"internalType":"uint256","name":"timestamp","type":"uint256"},{"internalType":"uint256","name":"chainId","type":"uint256"}]},{"internalType":"bytes32","name":"_msgHash","type":"bytes32"}],"stateMutability":"nonpayable","type":"function","name":"validateMessage"}],"devdoc":{"kind":"dev","methods":{"executeMessage((address,uint256,uint256,uint256,uint256),address,bytes)":{"params":{"_id":"An Identifier pointing to the initiating message.","_message":"The message payload, matching the initiating message.","_target":"Account that is called with _msg."}},"validateMessage((address,uint256,uint256,uint256,uint256),bytes32)":{"params":{"_id":"Identifier of the message.","_msgHash":"Hash of the message payload to call target with."}}},"version":1},"userdoc":{"kind":"user","methods":{"executeMessage((address,uint256,uint256,uint256,uint256),address,bytes)":{"notice":"Executes a cross chain message on the destination chain."},"validateMessage((address,uint256,uint256,uint256,uint256),bytes32)":{"notice":"Validates a cross chain message on the destination chain         and emits an ExecutingMessage event. This function is useful         for applications that understand the schema of the _message payload and want to         process it in a custom way."}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"src/ICrossL2Inbox.sol":"ICrossL2Inbox"},"evmVersion":"cancun","libraries":{}},"sources":{"src/ICrossL2Inbox.sol":{"keccak256":"0x97daf76e4a10b96d8062e71df352cbfa7577593fa96676fd43b40f4a0aca9b7f","urls":["bzz-raw://74518c974318070da4e118cd28aa86d7f0702ed8cccc39d60906b93197687248","dweb:/ipfs/QmWimBXYsDWDtNgzhjaLUx4xEiTMvbx5635E2TfNBKoV1E"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user","methods":{"executeMessage((address,uint256,uint256,uint256,uint256),address,bytes)":{"notice":"Executes a cross chain message on the destination chain."},"validateMessage((address,uint256,uint256,uint256,uint256),bytes32)":{"notice":"Validates a cross chain message on the destination chain         and emits an ExecutingMessage event. This function is useful         for applications that understand the schema of the _message payload and want to         process it in a custom way."}},"notice":"Interface for the CrossL2Inbox contract."},"devdoc":{"version":1,"kind":"dev","methods":{"executeMessage((address,uint256,uint256,uint256,uint256),address,bytes)":{"params":{"_id":"An Identifier pointing to the initiating message.","_message":"The message payload, matching the initiating message.","_target":"Account that is called with _msg."}},"validateMessage((address,uint256,uint256,uint256,uint256),bytes32)":{"params":{"_id":"Identifier of the message.","_msgHash":"Hash of the message payload to call target with."}}},"title":"ICrossL2Inbox"},"ast":{"absolutePath":"src/ICrossL2Inbox.sol","id":35,"exportedSymbols":{"ICrossL2Inbox":[34],"Identifier":[12]},"nodeType":"SourceUnit","src":"32:1153:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","^","0.8",".0"]},{"id":12,"nodeType":"StructDefinition","src":"57:132:0","nodes":[],"canonicalName":"Identifier","members":[{"constant":false,"id":3,"mutability":"mutable","name":"origin","nameLocation":"89:6:0","nodeType":"VariableDeclaration","scope":12,"src":"81:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":2,"name":"address","nodeType":"ElementaryTypeName","src":"81:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"blockNumber","nameLocation":"109:11:0","nodeType":"VariableDeclaration","scope":12,"src":"101:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":4,"name":"uint256","nodeType":"ElementaryTypeName","src":"101:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"constant":false,"id":7,"mutability":"mutable","name":"logIndex","nameLocation":"134:8:0","nodeType":"VariableDeclaration","scope":12,"src":"126:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":6,"name":"uint256","nodeType":"ElementaryTypeName","src":"126:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"constant":false,"id":9,"mutability":"mutable","name":"timestamp","nameLocation":"156:9:0","nodeType":"VariableDeclaration","scope":12,"src":"148:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":8,"name":"uint256","nodeType":"ElementaryTypeName","src":"148:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"constant":false,"id":11,"mutability":"mutable","name":"chainId","nameLocation":"179:7:0","nodeType":"VariableDeclaration","scope":12,"src":"171:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":10,"name":"uint256","nodeType":"ElementaryTypeName","src":"171:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"name":"Identifier","nameLocation":"64:10:0","scope":35,"visibility":"public"},{"id":34,"nodeType":"ContractDefinition","src":"269:915:0","nodes":[{"id":24,"nodeType":"FunctionDefinition","src":"577:108:0","nodes":[],"documentation":{"id":14,"nodeType":"StructuredDocumentation","src":"300:272:0","text":"@notice Executes a cross chain message on the destination chain.\n @param _id An Identifier pointing to the initiating message.\n @param _target Account that is called with _msg.\n @param _message The message payload, matching the initiating message."},"functionSelector":"5984c53e","implemented":false,"kind":"function","modifiers":[],"name":"executeMessage","nameLocation":"586:14:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":17,"mutability":"mutable","name":"_id","nameLocation":"621:3:0","nodeType":"VariableDeclaration","scope":24,"src":"601:23:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_struct$_Identifier_$12_calldata_ptr","typeString":"struct Identifier"},"typeName":{"id":16,"nodeType":"UserDefinedTypeName","pathNode":{"id":15,"name":"Identifier","nameLocations":["601:10:0"],"nodeType":"IdentifierPath","referencedDeclaration":12,"src":"601:10:0"},"referencedDeclaration":12,"src":"601:10:0","typeDescriptions":{"typeIdentifier":"t_struct$_Identifier_$12_storage_ptr","typeString":"struct Identifier"}},"visibility":"internal"},{"constant":false,"id":19,"mutability":"mutable","name":"_target","nameLocation":"634:7:0","nodeType":"VariableDeclaration","scope":24,"src":"626:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":18,"name":"address","nodeType":"ElementaryTypeName","src":"626:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"_message","nameLocation":"658:8:0","nodeType":"VariableDeclaration","scope":24,"src":"643:23:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":20,"name":"bytes","nodeType":"ElementaryTypeName","src":"643:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"600:67:0"},"returnParameters":{"id":23,"nodeType":"ParameterList","parameters":[],"src":"684:0:0"},"scope":34,"stateMutability":"payable","virtual":false,"visibility":"external"},{"id":33,"nodeType":"FunctionDefinition","src":"1105:77:0","nodes":[],"documentation":{"id":25,"nodeType":"StructuredDocumentation","src":"691:409:0","text":"@notice Validates a cross chain message on the destination chain\n         and emits an ExecutingMessage event. This function is useful\n         for applications that understand the schema of the _message payload and want to\n         process it in a custom way.\n @param _id      Identifier of the message.\n @param _msgHash Hash of the message payload to call target with."},"functionSelector":"ab4d6f75","implemented":false,"kind":"function","modifiers":[],"name":"validateMessage","nameLocation":"1114:15:0","parameters":{"id":31,"nodeType":"ParameterList","parameters":[{"constant":false,"id":28,"mutability":"mutable","name":"_id","nameLocation":"1150:3:0","nodeType":"VariableDeclaration","scope":33,"src":"1130:23:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_struct$_Identifier_$12_calldata_ptr","typeString":"struct Identifier"},"typeName":{"id":27,"nodeType":"UserDefinedTypeName","pathNode":{"id":26,"name":"Identifier","nameLocations":["1130:10:0"],"nodeType":"IdentifierPath","referencedDeclaration":12,"src":"1130:10:0"},"referencedDeclaration":12,"src":"1130:10:0","typeDescriptions":{"typeIdentifier":"t_struct$_Identifier_$12_storage_ptr","typeString":"struct Identifier"}},"visibility":"internal"},{"constant":false,"id":30,"mutability":"mutable","name":"_msgHash","nameLocation":"1163:8:0","nodeType":"VariableDeclaration","scope":33,"src":"1155:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"},"typeName":{"id":29,"name":"bytes32","nodeType":"ElementaryTypeName","src":"1155:7:0","typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}},"visibility":"internal"}],"src":"1129:43:0"},"returnParameters":{"id":32,"nodeType":"ParameterList","parameters":[],"src":"1181:0:0"},"scope":34,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ICrossL2Inbox","contractDependencies":[],"contractKind":"interface","documentation":{"id":13,"nodeType":"StructuredDocumentation","src":"191:78:0","text":"@title ICrossL2Inbox\n @notice Interface for the CrossL2Inbox contract."},"fullyImplemented":false,"linearizedBaseContracts":[34],"name":"ICrossL2Inbox","nameLocation":"279:13:0","scope":35,"usedErrors":[],"usedEvents":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi b/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi
new file mode 100644
index 000000000000..7a7bffc2ca65
--- /dev/null
+++ b/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi
@@ -0,0 +1,15 @@
+[
+  {
+    "type": "function",
+    "name": "addDependency",
+    "inputs": [
+      {
+        "name": "_chainId",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  }
+]
diff --git a/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin b/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin
new file mode 100644
index 000000000000..ec687260b851
--- /dev/null
+++ b/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin
@@ -0,0 +1 @@
+0x
diff --git a/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json b/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json
new file mode 100644
index 000000000000..fef67d0a40fd
--- /dev/null
+++ b/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"addDependency","inputs":[{"name":"_chainId","type":"uint256","internalType":"uint256"}],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"addDependency(uint256)":"a89c793c"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.25+commit.b61c2a91\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_chainId\",\"type\":\"uint256\"}],\"name\":\"addDependency\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{\"addDependency(uint256)\":{\"params\":{\"_chainId\":\"Chain ID of chain to add.\"}}},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"addDependency(uint256)\":{\"notice\":\"Adds a chain to the interop dependency set. Can only be called by the dependency manager.\"}},\"version\":1}},\"settings\":{\"compilationTarget\":{\"src/ISystemConfig.sol\":\"ISystemConfig\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"src/ISystemConfig.sol\":{\"keccak256\":\"0x764ea7e528e9e5ab907515b4da22738a49a3d5d8ffb948def86d0cbb9e7765be\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://9307f5fd1e826f8d059f4aa9141c360aef54612ba8562ec996e7f078ef1d1cf2\",\"dweb:/ipfs/QmbzFSWWLoQUyeuD6U7detgjPy36L3DHJp9BPpaUZqVs68\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.25+commit.b61c2a91"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"_chainId","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"addDependency"}],"devdoc":{"kind":"dev","methods":{"addDependency(uint256)":{"params":{"_chainId":"Chain ID of chain to add."}}},"version":1},"userdoc":{"kind":"user","methods":{"addDependency(uint256)":{"notice":"Adds a chain to the interop dependency set. Can only be called by the dependency manager."}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"src/ISystemConfig.sol":"ISystemConfig"},"evmVersion":"cancun","libraries":{}},"sources":{"src/ISystemConfig.sol":{"keccak256":"0x764ea7e528e9e5ab907515b4da22738a49a3d5d8ffb948def86d0cbb9e7765be","urls":["bzz-raw://9307f5fd1e826f8d059f4aa9141c360aef54612ba8562ec996e7f078ef1d1cf2","dweb:/ipfs/QmbzFSWWLoQUyeuD6U7detgjPy36L3DHJp9BPpaUZqVs68"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user","methods":{"addDependency(uint256)":{"notice":"Adds a chain to the interop dependency set. Can only be called by the dependency manager."}}},"devdoc":{"version":1,"kind":"dev","methods":{"addDependency(uint256)":{"params":{"_chainId":"Chain ID of chain to add."}}}},"ast":{"absolutePath":"src/ISystemConfig.sol","id":9,"exportedSymbols":{"ISystemConfig":[8]},"nodeType":"SourceUnit","src":"32:264:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","^","0.8",".0"]},{"id":8,"nodeType":"ContractDefinition","src":"57:238:0","nodes":[{"id":7,"nodeType":"FunctionDefinition","src":"243:50:0","nodes":[],"documentation":{"id":2,"nodeType":"StructuredDocumentation","src":"87:151:0","text":"@notice Adds a chain to the interop dependency set. Can only be called by the dependency manager.\n @param _chainId Chain ID of chain to add."},"functionSelector":"a89c793c","implemented":false,"kind":"function","modifiers":[],"name":"addDependency","nameLocation":"252:13:0","parameters":{"id":5,"nodeType":"ParameterList","parameters":[{"constant":false,"id":4,"mutability":"mutable","name":"_chainId","nameLocation":"274:8:0","nodeType":"VariableDeclaration","scope":7,"src":"266:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":3,"name":"uint256","nodeType":"ElementaryTypeName","src":"266:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"265:18:0"},"returnParameters":{"id":6,"nodeType":"ParameterList","parameters":[],"src":"292:0:0"},"scope":8,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ISystemConfig","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[8],"name":"ISystemConfig","nameLocation":"67:13:0","scope":9,"usedErrors":[],"usedEvents":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-e2e/interop/contracts/build/emit.sol/EmitEvent.abi b/op-e2e/interop/contracts/build/emit.sol/EmitEvent.abi
new file mode 100644
index 000000000000..d30fa8fca93b
--- /dev/null
+++ b/op-e2e/interop/contracts/build/emit.sol/EmitEvent.abi
@@ -0,0 +1,28 @@
+[
+  {
+    "type": "function",
+    "name": "emitData",
+    "inputs": [
+      {
+        "name": "_data",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
+  {
+    "type": "event",
+    "name": "DataEmitted",
+    "inputs": [
+      {
+        "name": "_data",
+        "type": "bytes",
+        "indexed": true,
+        "internalType": "bytes"
+      }
+    ],
+    "anonymous": false
+  }
+]
diff --git a/op-e2e/interop/contracts/build/emit.sol/EmitEvent.bin b/op-e2e/interop/contracts/build/emit.sol/EmitEvent.bin
new file mode 100644
index 000000000000..f4c15ab05dca
--- /dev/null
+++ b/op-e2e/interop/contracts/build/emit.sol/EmitEvent.bin
@@ -0,0 +1 @@
+0x6080604052348015600e575f80fd5b5060ff8061001b5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c8063d836083e14602a575b5f80fd5b60396035366004607c565b603b565b005b8181604051604992919060e3565b604051908190038120907fe00bbfe6f6f8f1bbed2da38e3f5a139c6f9da594ab248a3cf8b44fc73627772c905f90a25050565b5f8060208385031215608c575f80fd5b823567ffffffffffffffff8082111560a2575f80fd5b818501915085601f83011260b4575f80fd5b81358181111560c1575f80fd5b86602082850101111560d1575f80fd5b60209290920196919550909350505050565b818382375f910190815291905056fea164736f6c6343000819000a
diff --git a/op-e2e/interop/contracts/build/emit.sol/EmitEvent.json b/op-e2e/interop/contracts/build/emit.sol/EmitEvent.json
new file mode 100644
index 000000000000..465823afa330
--- /dev/null
+++ b/op-e2e/interop/contracts/build/emit.sol/EmitEvent.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"emitData","inputs":[{"name":"_data","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"event","name":"DataEmitted","inputs":[{"name":"_data","type":"bytes","indexed":true,"internalType":"bytes"}],"anonymous":false}],"bytecode":{"object":"0x6080604052348015600e575f80fd5b5060ff8061001b5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c8063d836083e14602a575b5f80fd5b60396035366004607c565b603b565b005b8181604051604992919060e3565b604051908190038120907fe00bbfe6f6f8f1bbed2da38e3f5a139c6f9da594ab248a3cf8b44fc73627772c905f90a25050565b5f8060208385031215608c575f80fd5b823567ffffffffffffffff8082111560a2575f80fd5b818501915085601f83011260b4575f80fd5b81358181111560c1575f80fd5b86602082850101111560d1575f80fd5b60209290920196919550909350505050565b818382375f910190815291905056fea164736f6c6343000819000a","sourceMap":"58:278:1:-:0;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x6080604052348015600e575f80fd5b50600436106026575f3560e01c8063d836083e14602a575b5f80fd5b60396035366004607c565b603b565b005b8181604051604992919060e3565b604051908190038120907fe00bbfe6f6f8f1bbed2da38e3f5a139c6f9da594ab248a3cf8b44fc73627772c905f90a25050565b5f8060208385031215608c575f80fd5b823567ffffffffffffffff8082111560a2575f80fd5b818501915085601f83011260b4575f80fd5b81358181111560c1575f80fd5b86602082850101111560d1575f80fd5b60209290920196919550909350505050565b818382375f910190815291905056fea164736f6c6343000819000a","sourceMap":"58:278:1:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;245:89;;;;;;:::i;:::-;;:::i;:::-;;;321:5;;309:18;;;;;;;:::i;:::-;;;;;;;;;;;;;;;245:89;;:::o;14:591:2:-;84:6;92;145:2;133:9;124:7;120:23;116:32;113:52;;;161:1;158;151:12;113:52;201:9;188:23;230:18;271:2;263:6;260:14;257:34;;;287:1;284;277:12;257:34;325:6;314:9;310:22;300:32;;370:7;363:4;359:2;355:13;351:27;341:55;;392:1;389;382:12;341:55;432:2;419:16;458:2;450:6;447:14;444:34;;;474:1;471;464:12;444:34;519:7;514:2;505:6;501:2;497:15;493:24;490:37;487:57;;;540:1;537;530:12;487:57;571:2;563:11;;;;;593:6;;-1:-1:-1;14:591:2;;-1:-1:-1;;;;14:591:2:o;610:271::-;793:6;785;780:3;767:33;749:3;819:16;;844:13;;;819:16;610:271;-1:-1:-1;610:271:2:o","linkReferences":{}},"methodIdentifiers":{"emitData(bytes)":"d836083e"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.25+commit.b61c2a91\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"DataEmitted\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"emitData\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"src/emit.sol\":\"EmitEvent\"},\"evmVersion\":\"cancun\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"src/emit.sol\":{\"keccak256\":\"0xe078378fd445ed0cbbf1087c5013110412ab6a44850af24a15bcde945467accc\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://66c218de0059688c75903c2ba6d4066661dc6f5fa17a329dd7c385d151f3993a\",\"dweb:/ipfs/Qmby4S4N44naZ2miw3Tgdpq5Qbj4DwzJbcGapgqtd7qd26\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.25+commit.b61c2a91"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"bytes","name":"_data","type":"bytes","indexed":true}],"type":"event","name":"DataEmitted","anonymous":false},{"inputs":[{"internalType":"bytes","name":"_data","type":"bytes"}],"stateMutability":"nonpayable","type":"function","name":"emitData"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"src/emit.sol":"EmitEvent"},"evmVersion":"cancun","libraries":{}},"sources":{"src/emit.sol":{"keccak256":"0xe078378fd445ed0cbbf1087c5013110412ab6a44850af24a15bcde945467accc","urls":["bzz-raw://66c218de0059688c75903c2ba6d4066661dc6f5fa17a329dd7c385d151f3993a","dweb:/ipfs/Qmby4S4N44naZ2miw3Tgdpq5Qbj4DwzJbcGapgqtd7qd26"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"src/emit.sol","id":52,"exportedSymbols":{"EmitEvent":[51]},"nodeType":"SourceUnit","src":"32:305:1","nodes":[{"id":36,"nodeType":"PragmaDirective","src":"32:24:1","nodes":[],"literals":["solidity","^","0.8",".15"]},{"id":51,"nodeType":"ContractDefinition","src":"58:278:1","nodes":[{"id":40,"nodeType":"EventDefinition","src":"133:39:1","nodes":[],"anonymous":false,"eventSelector":"e00bbfe6f6f8f1bbed2da38e3f5a139c6f9da594ab248a3cf8b44fc73627772c","name":"DataEmitted","nameLocation":"139:11:1","parameters":{"id":39,"nodeType":"ParameterList","parameters":[{"constant":false,"id":38,"indexed":true,"mutability":"mutable","name":"_data","nameLocation":"165:5:1","nodeType":"VariableDeclaration","scope":40,"src":"151:19:1","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":37,"name":"bytes","nodeType":"ElementaryTypeName","src":"151:5:1","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"150:21:1"}},{"id":50,"nodeType":"FunctionDefinition","src":"245:89:1","nodes":[],"body":{"id":49,"nodeType":"Block","src":"294:40:1","nodes":[],"statements":[{"eventCall":{"arguments":[{"id":46,"name":"_data","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":42,"src":"321:5:1","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes calldata"}],"id":45,"name":"DataEmitted","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":40,"src":"309:11:1","typeDescriptions":{"typeIdentifier":"t_function_event_nonpayable$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory)"}},"id":47,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"nameLocations":[],"names":[],"nodeType":"FunctionCall","src":"309:18:1","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":48,"nodeType":"EmitStatement","src":"304:23:1"}]},"functionSelector":"d836083e","implemented":true,"kind":"function","modifiers":[],"name":"emitData","nameLocation":"254:8:1","parameters":{"id":43,"nodeType":"ParameterList","parameters":[{"constant":false,"id":42,"mutability":"mutable","name":"_data","nameLocation":"278:5:1","nodeType":"VariableDeclaration","scope":50,"src":"263:20:1","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":41,"name":"bytes","nodeType":"ElementaryTypeName","src":"263:5:1","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"262:22:1"},"returnParameters":{"id":44,"nodeType":"ParameterList","parameters":[],"src":"294:0:1"},"scope":51,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"EmitEvent","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[51],"name":"EmitEvent","nameLocation":"67:9:1","scope":52,"usedErrors":[],"usedEvents":[40]}],"license":"MIT"},"id":1}
\ No newline at end of file
diff --git a/op-e2e/interop/contracts/generate.sh b/op-e2e/interop/contracts/generate.sh
index bba960153ec6..d6107df9cc86 100755
--- a/op-e2e/interop/contracts/generate.sh
+++ b/op-e2e/interop/contracts/generate.sh
@@ -9,4 +9,21 @@ cat EmitEvent.json | jq -r '.bytecode.object' > EmitEvent.bin
 cat EmitEvent.json | jq '.abi' > EmitEvent.abi
 cd ../..
 
-abigen --abi ./build/emit.sol/EmitEvent.abi --bin ./build/emit.sol/EmitEvent.bin --pkg emit --out ./emit.go
+mkdir -p bindings/emit
+abigen --abi ./build/emit.sol/EmitEvent.abi --bin ./build/emit.sol/EmitEvent.bin --pkg emit --out ./bindings/emit/emit.go
+
+cd build/ICrossL2Inbox.sol
+cat ICrossL2Inbox.json | jq -r '.bytecode.object' > ICrossL2Inbox.bin
+cat ICrossL2Inbox.json | jq '.abi' > ICrossL2Inbox.abi
+cd ../..
+
+mkdir -p bindings/inbox
+abigen --abi ./build/ICrossL2Inbox.sol/ICrossL2Inbox.abi --bin ./build/ICrossL2Inbox.sol/ICrossL2Inbox.bin --pkg inbox --out ./bindings/inbox/inbox.go
+
+cd build/ISystemConfig.sol
+cat ISystemConfig.json | jq -r '.bytecode.object' > ISystemConfig.bin
+cat ISystemConfig.json | jq '.abi' > ISystemConfig.abi
+cd ../..
+
+mkdir -p bindings/systemconfig
+abigen --abi ./build/ISystemConfig.sol/ISystemConfig.abi --bin ./build/ISystemConfig.sol/ISystemConfig.bin --pkg systemconfig --out ./bindings/systemconfig/systemconfig.go
diff --git a/op-e2e/interop/contracts/src/ICrossL2Inbox.sol b/op-e2e/interop/contracts/src/ICrossL2Inbox.sol
new file mode 100644
index 000000000000..780b43d9753b
--- /dev/null
+++ b/op-e2e/interop/contracts/src/ICrossL2Inbox.sol
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+struct Identifier {
+    address origin;
+    uint256 blockNumber;
+    uint256 logIndex;
+    uint256 timestamp;
+    uint256 chainId;
+}
+
+/// @title ICrossL2Inbox
+/// @notice Interface for the CrossL2Inbox contract.
+interface ICrossL2Inbox {
+
+    /// @notice Executes a cross chain message on the destination chain.
+    /// @param _id An Identifier pointing to the initiating message.
+    /// @param _target Account that is called with _msg.
+    /// @param _message The message payload, matching the initiating message.
+    function executeMessage(Identifier calldata _id, address _target, bytes calldata _message) external payable;
+
+    /// @notice Validates a cross chain message on the destination chain
+    ///         and emits an ExecutingMessage event. This function is useful
+    ///         for applications that understand the schema of the _message payload and want to
+    ///         process it in a custom way.
+    /// @param _id      Identifier of the message.
+    /// @param _msgHash Hash of the message payload to call target with.
+    function validateMessage(Identifier calldata _id, bytes32 _msgHash) external;
+}
diff --git a/op-e2e/interop/contracts/src/ISystemConfig.sol b/op-e2e/interop/contracts/src/ISystemConfig.sol
new file mode 100644
index 000000000000..fd14f919b2d0
--- /dev/null
+++ b/op-e2e/interop/contracts/src/ISystemConfig.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+interface ISystemConfig {
+    /// @notice Adds a chain to the interop dependency set. Can only be called by the dependency manager.
+    /// @param _chainId Chain ID of chain to add.
+    function addDependency(uint256 _chainId) external;
+}
diff --git a/op-e2e/interop/interop_test.go b/op-e2e/interop/interop_test.go
index 6724f468be51..65efa9b84209 100644
--- a/op-e2e/interop/interop_test.go
+++ b/op-e2e/interop/interop_test.go
@@ -7,6 +7,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-service/dial"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -157,8 +162,6 @@ func TestInteropTrivial_EmitLogs(t *testing.T) {
 			}
 			msgPayload = append(msgPayload, log.Data...)
 			expectedHash := common.BytesToHash(crypto.Keccak256(msgPayload))
-			// convert payload hash to log hash
-			logHash := types.PayloadHashToLogHash(expectedHash, log.Address)
 
 			// get block for the log (for timestamp)
 			ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
@@ -170,16 +173,16 @@ func TestInteropTrivial_EmitLogs(t *testing.T) {
 			identifier := types.Identifier{
 				Origin:      log.Address,
 				BlockNumber: log.BlockNumber,
-				LogIndex:    uint64(log.Index),
+				LogIndex:    uint32(log.Index),
 				Timestamp:   block.Time(),
 				ChainID:     types.ChainIDFromBig(s2.ChainID(chainID)),
 			}
 
-			safety, error := supervisor.CheckMessage(context.Background(),
+			safety, err := supervisor.CheckMessage(context.Background(),
 				identifier,
-				logHash,
+				expectedHash,
 			)
-			require.ErrorIs(t, error, expectedError)
+			require.ErrorIs(t, err, expectedError)
 			// the supervisor could progress the safety level more quickly than we expect,
 			// which is why we check for a minimum safety level
 			require.True(t, safety.AtLeastAsSafe(expectedSafety), "log: %v should be at least %s, but is %s", log, expectedSafety.String(), safety.String())
@@ -194,3 +197,98 @@ func TestInteropTrivial_EmitLogs(t *testing.T) {
 	}
 	setupAndRun(t, test)
 }
+
+func TestInteropBlockBuilding(t *testing.T) {
+	logger := testlog.Logger(t, log.LevelInfo)
+	oplog.SetGlobalLogHandler(logger.Handler())
+
+	test := func(t *testing.T, s2 SuperSystem) {
+		ids := s2.L2IDs()
+		chainA := ids[0]
+		chainB := ids[1]
+		// We will initiate on chain A, and execute on chain B
+		s2.DeployEmitterContract(chainA, "Alice")
+
+		// Add chain A as dependency to chain B,
+		// such that we can execute a message on B that was initiated on A.
+		depRec := s2.AddDependency(chainB, s2.ChainID(chainA))
+		t.Logf("Dependency set in L1 block %d", depRec.BlockNumber)
+
+		rollupClA, err := dial.DialRollupClientWithTimeout(context.Background(), time.Second*15, logger, s2.OpNode(chainA).UserRPC().RPC())
+		require.NoError(t, err)
+
+		// Now wait for the dependency to be visible in the L2 (receipt needs to be picked up)
+		require.Eventually(t, func() bool {
+			status, err := rollupClA.SyncStatus(context.Background())
+			require.NoError(t, err)
+			return status.CrossUnsafeL2.L1Origin.Number >= depRec.BlockNumber.Uint64()
+		}, time.Second*30, time.Second, "wait for L1 origin to match dependency L1 block")
+		t.Log("Dependency information has been processed in L2 block")
+
+		// emit log on chain A
+		emitRec := s2.EmitData(chainA, "Alice", "hello world")
+		t.Logf("Emitted a log event in block %d", emitRec.BlockNumber.Uint64())
+
+		// Wait for initiating side to become cross-unsafe
+		require.Eventually(t, func() bool {
+			status, err := rollupClA.SyncStatus(context.Background())
+			require.NoError(t, err)
+			return status.CrossUnsafeL2.Number >= emitRec.BlockNumber.Uint64()
+		}, time.Second*60, time.Second, "wait for emitted data to become cross-unsafe")
+		t.Logf("Reached cross-unsafe block %d", emitRec.BlockNumber.Uint64())
+
+		// Identify the log
+		require.Len(t, emitRec.Logs, 1)
+		ev := emitRec.Logs[0]
+		ethCl := s2.L2GethClient(chainA)
+		header, err := ethCl.HeaderByHash(context.Background(), emitRec.BlockHash)
+		require.NoError(t, err)
+		identifier := types.Identifier{
+			Origin:      ev.Address,
+			BlockNumber: ev.BlockNumber,
+			LogIndex:    uint32(ev.Index),
+			Timestamp:   header.Time,
+			ChainID:     types.ChainIDFromBig(s2.ChainID(chainA)),
+		}
+
+		msgPayload := types.LogToMessagePayload(ev)
+		payloadHash := crypto.Keccak256Hash(msgPayload)
+		logHash := types.PayloadHashToLogHash(payloadHash, identifier.Origin)
+		t.Logf("expected payload hash: %s", payloadHash)
+		t.Logf("expected log hash: %s", logHash)
+
+		invalidPayload := []byte("test invalid message")
+		invalidPayloadHash := crypto.Keccak256Hash(invalidPayload)
+		invalidLogHash := types.PayloadHashToLogHash(invalidPayloadHash, identifier.Origin)
+		t.Logf("invalid payload hash: %s", invalidPayloadHash)
+		t.Logf("invalid log hash: %s", invalidLogHash)
+
+		// submit executing txs on B
+
+		t.Log("Testing invalid message")
+		{
+			bobAddr := s2.Address(chainA, "Bob") // direct it to a random account without code
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
+			defer cancel()
+			// Send an executing message, but with different payload.
+			// We expect the miner to be unable to include this tx, and confirmation to thus time out.
+			_, err := s2.ExecuteMessage(ctx, chainB, "Alice", identifier, bobAddr, invalidPayload)
+			require.NotNil(t, err)
+			require.ErrorIs(t, err, ctx.Err())
+			require.ErrorIs(t, ctx.Err(), context.DeadlineExceeded)
+		}
+
+		t.Log("Testing valid message now")
+		{
+			bobAddr := s2.Address(chainA, "Bob") // direct it to a random account without code
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
+			defer cancel()
+			// Send an executing message with the correct identifier / payload
+			rec, err := s2.ExecuteMessage(ctx, chainB, "Alice", identifier, bobAddr, msgPayload)
+			require.NoError(t, err, "expecting tx to be confirmed")
+			t.Logf("confirmed executing msg in block %s", rec.BlockNumber)
+		}
+		t.Log("Done")
+	}
+	setupAndRun(t, test)
+}
diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index 2d063174bdae..9f78c543bdcf 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -11,6 +11,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
+	"github.com/ethereum-optimism/optimism/op-e2e/interop/contracts/bindings/systemconfig"
+	"github.com/ethereum-optimism/optimism/op-service/predeploys"
+	"github.com/ethereum/go-ethereum/eth/ethconfig"
+	gn "github.com/ethereum/go-ethereum/node"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -33,7 +39,8 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/opnode"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/services"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/setuputils"
-	emit "github.com/ethereum-optimism/optimism/op-e2e/interop/contracts"
+	"github.com/ethereum-optimism/optimism/op-e2e/interop/contracts/bindings/emit"
+	"github.com/ethereum-optimism/optimism/op-e2e/interop/contracts/bindings/inbox"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/helpers"
 	"github.com/ethereum-optimism/optimism/op-node/node"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
@@ -96,6 +103,17 @@ type SuperSystem interface {
 	DeployEmitterContract(network string, username string) common.Address
 	// Use the Emitter Contract to emit an Event Log
 	EmitData(network string, username string, data string) *types.Receipt
+	// AddDependency adds a dependency (by chain ID) to the given chain
+	AddDependency(network string, dep *big.Int) *types.Receipt
+	// ExecuteMessage calls the CrossL2Inbox executeMessage function
+	ExecuteMessage(
+		ctx context.Context,
+		id string,
+		sender string,
+		msgIdentifier supervisortypes.Identifier,
+		target common.Address,
+		message []byte,
+	) (*types.Receipt, error)
 	// Access a contract on a network by name
 	Contract(network string, contractName string) interface{}
 }
@@ -121,6 +139,7 @@ type interopE2ESystem struct {
 	beacon          *fakebeacon.FakeBeacon
 	l1              *geth.GethInstance
 	l2s             map[string]l2Set
+	l1GethClient    *ethclient.Client
 	l2GethClients   map[string]*ethclient.Client
 	supervisor      *supervisor.SupervisorService
 	superClient     *sources.SupervisorClient
@@ -200,6 +219,7 @@ func (s *interopE2ESystem) prepareL1() (*fakebeacon.FakeBeacon, *geth.GethInstan
 	require.NoError(s.t, err)
 	require.NoError(s.t, l1Geth.Node.Start())
 	s.t.Cleanup(func() {
+		s.t.Logf("Closing L1 geth")
 		_ = l1Geth.Close()
 	})
 	return bcn, l1Geth
@@ -239,11 +259,17 @@ func (s *interopE2ESystem) newOperatorKeysForL2(l2Out *interopgen.L2Output) map[
 func (s *interopE2ESystem) newGethForL2(id string, l2Out *interopgen.L2Output) *geth.GethInstance {
 	jwtPath := writeDefaultJWT(s.t)
 	name := "l2-" + id
-	l2Geth, err := geth.InitL2(name, l2Out.Genesis, jwtPath)
+	l2Geth, err := geth.InitL2(name, l2Out.Genesis, jwtPath,
+		func(ethCfg *ethconfig.Config, nodeCfg *gn.Config) error {
+			ethCfg.InteropMessageRPC = s.supervisor.RPC()
+			return nil
+		})
 	require.NoError(s.t, err)
 	require.NoError(s.t, l2Geth.Node.Start())
 	s.t.Cleanup(func() {
-		_ = l2Geth.Close()
+		s.t.Logf("Closing L2 geth of chain %s", id)
+		closeErr := l2Geth.Close()
+		s.t.Logf("Closed L2 geth of chain %s: %v", id, closeErr)
 	})
 	return l2Geth
 }
@@ -306,7 +332,9 @@ func (s *interopE2ESystem) newNodeForL2(
 	s.t.Cleanup(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel() // force-quit
+		s.t.Logf("Closing op-node of chain %s", id)
 		_ = opNode.Stop(ctx)
+		s.t.Logf("Closed op-node of chain %s", id)
 	})
 	return opNode
 }
@@ -390,7 +418,9 @@ func (s *interopE2ESystem) newBatcherForL2(
 	s.t.Cleanup(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel() // force-quit
+		s.t.Logf("Closing batcher of chain %s", id)
 		_ = batcher.Stop(ctx)
+		s.t.Logf("Closed batcher of chain %s", id)
 	})
 	return batcher
 }
@@ -471,7 +501,9 @@ func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 	s.t.Cleanup(func() {
 		ctx, cancel := context.WithCancel(context.Background())
 		cancel() // force-quit
-		_ = super.Stop(ctx)
+		s.t.Logf("Closing supervisor")
+		closeErr := super.Stop(ctx)
+		s.t.Logf("Closed supervisor: %v", closeErr)
 	})
 	return super
 }
@@ -503,12 +535,23 @@ func (s *interopE2ESystem) prepare(t *testing.T, w worldResourcePaths) {
 	s.beacon, s.l1 = s.prepareL1()
 	s.l2s = s.prepareL2s()
 
+	s.prepareContracts()
+
 	// add the L2 RPCs to the supervisor now that the L2s are created
 	ctx := context.Background()
 	for _, l2 := range s.l2s {
 		err := s.SupervisorClient().AddL2RPC(ctx, l2.l2Geth.UserRPC().RPC())
 		require.NoError(s.t, err, "failed to add L2 RPC to supervisor")
 	}
+
+	// Try to close the op-supervisor first
+	s.t.Cleanup(func() {
+		ctx, cancel := context.WithCancel(context.Background())
+		cancel() // force-quit
+		s.t.Logf("Closing supervisor")
+		closeErr := s.supervisor.Stop(ctx)
+		s.t.Logf("Closed supervisor: %v", closeErr)
+	})
 }
 
 // AddUser adds a user to the system by creating a user key for each L2.
@@ -552,6 +595,44 @@ func (s *interopE2ESystem) prepareL2s() map[string]l2Set {
 	return l2s
 }
 
+// prepareContracts prepares contract-bindings for the L2s
+func (s *interopE2ESystem) prepareContracts() {
+	// Add bindings to common contracts for each L2
+	l1GethClient := s.L1GethClient()
+	for id, l2Dep := range s.worldDeployment.L2s {
+		{
+			contract, err := inbox.NewInbox(predeploys.CrossL2InboxAddr, s.L2GethClient(id))
+			require.NoError(s.t, err)
+			s.l2s[id].contracts["inbox"] = contract
+		}
+		{
+			contract, err := systemconfig.NewSystemconfig(l2Dep.SystemConfigProxy, l1GethClient)
+			require.NoError(s.t, err)
+			s.l2s[id].contracts["systemconfig"] = contract
+		}
+	}
+}
+
+func (s *interopE2ESystem) L1GethClient() *ethclient.Client {
+	if s.l1GethClient != nil {
+		return s.l1GethClient
+	}
+	rpcEndpoint := s.l1.UserRPC()
+	rpcCl := endpoint.DialRPC(
+		endpoint.PreferAnyRPC,
+		rpcEndpoint,
+		func(v string) *rpc.Client {
+			logger := testlog.Logger(s.t, log.LevelInfo)
+			cl, err := dial.DialRPCClientWithTimeout(context.Background(), 30*time.Second, logger, v)
+			require.NoError(s.t, err, "failed to dial L1 eth node instance")
+			return cl
+		})
+	nodeClient := ethclient.NewClient(rpcCl)
+	// register the client so it can be reused
+	s.l1GethClient = nodeClient
+	return nodeClient
+}
+
 func (s *interopE2ESystem) L2GethClient(id string) *ethclient.Client {
 	// guard: check if the client already exists and return it in that case
 	nodeClient, ok := s.l2GethClients[id]
@@ -639,6 +720,64 @@ func (s *interopE2ESystem) SendL2Tx(
 		newApply)
 }
 
+func (s *interopE2ESystem) ExecuteMessage(
+	ctx context.Context,
+	id string,
+	sender string,
+	msgIdentifier supervisortypes.Identifier,
+	target common.Address,
+	message []byte,
+) (*types.Receipt, error) {
+	secret := s.UserKey(id, sender)
+	auth, err := bind.NewKeyedTransactorWithChainID(&secret, s.l2s[id].chainID)
+
+	require.NoError(s.t, err)
+
+	auth.GasLimit = uint64(3000_000)
+	auth.GasPrice = big.NewInt(20_000_000_000)
+
+	contract := s.Contract(id, "inbox").(*inbox.Inbox)
+	identifier := inbox.Identifier{
+		Origin:      msgIdentifier.Origin,
+		BlockNumber: new(big.Int).SetUint64(msgIdentifier.BlockNumber),
+		LogIndex:    new(big.Int).SetUint64(uint64(msgIdentifier.LogIndex)),
+		Timestamp:   new(big.Int).SetUint64(msgIdentifier.Timestamp),
+		ChainId:     msgIdentifier.ChainID.ToBig(),
+	}
+	tx, err := contract.InboxTransactor.ExecuteMessage(auth, identifier, target, message)
+	require.NoError(s.t, err)
+	s.logger.Info("Executing message", "tx", tx.Hash(), "to", tx.To(), "target", target, "data", hexutil.Bytes(tx.Data()))
+	return bind.WaitMined(ctx, s.L2GethClient(id), tx)
+}
+
+func (s *interopE2ESystem) AddDependency(id string, dep *big.Int) *types.Receipt {
+	// There is a note in OPContractsManagerInterop that the proxy-admin is used for now,
+	// even though it should be a separate dependency-set-manager address.
+	secret, err := s.hdWallet.Secret(devkeys.ChainOperatorKey{
+		ChainID: s.l2s[id].chainID,
+		Role:    devkeys.SystemConfigOwner,
+	})
+	require.NoError(s.t, err)
+
+	auth, err := bind.NewKeyedTransactorWithChainID(secret, s.worldOutput.L1.Genesis.Config.ChainID)
+	require.NoError(s.t, err)
+
+	balance, err := s.l1GethClient.BalanceAt(context.Background(), crypto.PubkeyToAddress(secret.PublicKey), nil)
+	require.NoError(s.t, err)
+	require.False(s.t, balance.Sign() == 0, "system config owner needs a balance")
+
+	auth.GasLimit = uint64(3000000)
+	auth.GasPrice = big.NewInt(20000000000)
+
+	contract := s.Contract(id, "systemconfig").(*systemconfig.Systemconfig)
+	tx, err := contract.SystemconfigTransactor.AddDependency(auth, dep)
+	require.NoError(s.t, err)
+
+	receipt, err := wait.ForReceiptOK(context.Background(), s.L1GethClient(), tx.Hash())
+	require.NoError(s.t, err)
+	return receipt
+}
+
 func (s *interopE2ESystem) DeployEmitterContract(
 	id string,
 	sender string,
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index d4328f6932c7..cd824bfa6d31 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -267,6 +267,7 @@ func (su *SupervisorBackend) Stop(ctx context.Context) error {
 	if !su.started.CompareAndSwap(true, false) {
 		return errAlreadyStopped
 	}
+	su.logger.Info("Closing supervisor backend")
 	// close all processors
 	for id, processor := range su.chainProcessors {
 		su.logger.Info("stopping chain processor", "chainID", id)
@@ -308,24 +309,27 @@ func (su *SupervisorBackend) DependencySet() depset.DependencySet {
 // Query methods
 // ----------------------------
 
-func (su *SupervisorBackend) CheckMessage(identifier types.Identifier, logHash common.Hash) (types.SafetyLevel, error) {
+func (su *SupervisorBackend) CheckMessage(identifier types.Identifier, payloadHash common.Hash) (types.SafetyLevel, error) {
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
+	logHash := types.PayloadHashToLogHash(payloadHash, identifier.Origin)
 	chainID := identifier.ChainID
 	blockNum := identifier.BlockNumber
 	logIdx := identifier.LogIndex
-	_, err := su.chainDBs.Check(chainID, blockNum, uint32(logIdx), logHash)
+	_, err := su.chainDBs.Check(chainID, blockNum, logIdx, logHash)
 	if errors.Is(err, types.ErrFuture) {
+		su.logger.Debug("Future message", "identifier", identifier, "payloadHash", payloadHash, "err", err)
 		return types.LocalUnsafe, nil
 	}
 	if errors.Is(err, types.ErrConflict) {
+		su.logger.Debug("Conflicting message", "identifier", identifier, "payloadHash", payloadHash, "err", err)
 		return types.Invalid, nil
 	}
 	if err != nil {
 		return types.Invalid, fmt.Errorf("failed to check log: %w", err)
 	}
-	return su.chainDBs.Safest(chainID, blockNum, uint32(logIdx))
+	return su.chainDBs.Safest(chainID, blockNum, logIdx)
 }
 
 func (su *SupervisorBackend) CheckMessages(
@@ -334,12 +338,21 @@ func (su *SupervisorBackend) CheckMessages(
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
+	su.logger.Debug("Checking messages", "count", len(messages), "minSafety", minSafety)
+
 	for _, msg := range messages {
+		su.logger.Debug("Checking message",
+			"identifier", msg.Identifier, "payloadHash", msg.PayloadHash.String())
 		safety, err := su.CheckMessage(msg.Identifier, msg.PayloadHash)
 		if err != nil {
+			su.logger.Error("Check message failed", "err", err,
+				"identifier", msg.Identifier, "payloadHash", msg.PayloadHash.String())
 			return fmt.Errorf("failed to check message: %w", err)
 		}
 		if !safety.AtLeastAsSafe(minSafety) {
+			su.logger.Error("Message is not sufficiently safe",
+				"safety", safety, "minSafety", minSafety,
+				"identifier", msg.Identifier, "payloadHash", msg.PayloadHash.String())
 			return fmt.Errorf("message %v (safety level: %v) does not meet the minimum safety %v",
 				msg.Identifier,
 				safety,
diff --git a/op-supervisor/supervisor/backend/db/logs/db.go b/op-supervisor/supervisor/backend/db/logs/db.go
index dc98b7472074..5509c5e61df8 100644
--- a/op-supervisor/supervisor/backend/db/logs/db.go
+++ b/op-supervisor/supervisor/backend/db/logs/db.go
@@ -287,7 +287,7 @@ func (db *DB) Contains(blockNum uint64, logIdx uint32, logHash common.Hash) (typ
 	db.log.Trace("Found initiatingEvent", "blockNum", blockNum, "logIdx", logIdx, "hash", evtHash)
 	// Found the requested block and log index, check if the hash matches
 	if evtHash != logHash {
-		return types.BlockSeal{}, fmt.Errorf("payload hash mismatch: expected %s, got %s", logHash, evtHash)
+		return types.BlockSeal{}, fmt.Errorf("payload hash mismatch: expected %s, got %s %w", logHash, evtHash, types.ErrConflict)
 	}
 	// Now find the block seal after the log, to identify where the log was included in.
 	err = iter.TraverseConditional(func(state IteratorState) error {
diff --git a/op-supervisor/supervisor/backend/processors/log_processor.go b/op-supervisor/supervisor/backend/processors/log_processor.go
index 1434d2a60395..e8adb29ce6bf 100644
--- a/op-supervisor/supervisor/backend/processors/log_processor.go
+++ b/op-supervisor/supervisor/backend/processors/log_processor.go
@@ -77,18 +77,6 @@ func (p *logProcessor) ProcessLogs(_ context.Context, block eth.BlockRef, rcpts
 // The address is hashed into the payload hash to save space in the log storage,
 // and because they represent paired data.
 func logToLogHash(l *ethTypes.Log) common.Hash {
-	payloadHash := crypto.Keccak256(logToMessagePayload(l))
+	payloadHash := crypto.Keccak256(types.LogToMessagePayload(l))
 	return types.PayloadHashToLogHash(common.Hash(payloadHash), l.Address)
 }
-
-// logToMessagePayload is the data that is hashed to get the logHash
-// it is the concatenation of the log's topics and data
-// the implementation is based on the interop messaging spec
-func logToMessagePayload(l *ethTypes.Log) []byte {
-	msg := make([]byte, 0)
-	for _, topic := range l.Topics {
-		msg = append(msg, topic.Bytes()...)
-	}
-	msg = append(msg, l.Data...)
-	return msg
-}
diff --git a/op-supervisor/supervisor/service.go b/op-supervisor/supervisor/service.go
index 8bccaf1eb82f..7054c7e0ff55 100644
--- a/op-supervisor/supervisor/service.go
+++ b/op-supervisor/supervisor/service.go
@@ -184,6 +184,7 @@ func (su *SupervisorService) Start(ctx context.Context) error {
 
 func (su *SupervisorService) Stop(ctx context.Context) error {
 	if !su.closing.CompareAndSwap(false, true) {
+		su.log.Warn("Supervisor is already closing")
 		return nil // already closing
 	}
 	su.log.Info("Stopping JSON-RPC server")
diff --git a/op-supervisor/supervisor/types/types.go b/op-supervisor/supervisor/types/types.go
index b1aab4d081e8..bac2c377bfd7 100644
--- a/op-supervisor/supervisor/types/types.go
+++ b/op-supervisor/supervisor/types/types.go
@@ -8,6 +8,8 @@ import (
 	"math/big"
 	"strconv"
 
+	ethTypes "github.com/ethereum/go-ethereum/core/types"
+
 	"github.com/holiman/uint256"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -58,7 +60,7 @@ type Message struct {
 type Identifier struct {
 	Origin      common.Address
 	BlockNumber uint64
-	LogIndex    uint64
+	LogIndex    uint32
 	Timestamp   uint64
 	ChainID     ChainID // flat, not a pointer, to make Identifier safe as map key
 }
@@ -88,7 +90,10 @@ func (id *Identifier) UnmarshalJSON(input []byte) error {
 	}
 	id.Origin = dec.Origin
 	id.BlockNumber = uint64(dec.BlockNumber)
-	id.LogIndex = uint64(dec.LogIndex)
+	if dec.LogIndex > math.MaxUint32 {
+		return fmt.Errorf("log index too large: %d", dec.LogIndex)
+	}
+	id.LogIndex = uint32(dec.LogIndex)
 	id.Timestamp = uint64(dec.Timestamp)
 	id.ChainID = (ChainID)(dec.ChainID)
 	return nil
@@ -190,6 +195,10 @@ func (id ChainID) ToUInt32() (uint32, error) {
 	return uint32(v64), nil
 }
 
+func (id *ChainID) ToBig() *big.Int {
+	return (*uint256.Int)(id).ToBig()
+}
+
 func (id ChainID) MarshalText() ([]byte, error) {
 	return []byte(id.String()), nil
 }
@@ -264,3 +273,15 @@ func PayloadHashToLogHash(payloadHash common.Hash, addr common.Address) common.H
 	msg = append(msg, payloadHash.Bytes()...)
 	return crypto.Keccak256Hash(msg)
 }
+
+// LogToMessagePayload is the data that is hashed to get the payloadHash
+// it is the concatenation of the log's topics and data
+// the implementation is based on the interop messaging spec
+func LogToMessagePayload(l *ethTypes.Log) []byte {
+	msg := make([]byte, 0)
+	for _, topic := range l.Topics {
+		msg = append(msg, topic.Bytes()...)
+	}
+	msg = append(msg, l.Data...)
+	return msg
+}
diff --git a/op-supervisor/supervisor/types/types_test.go b/op-supervisor/supervisor/types/types_test.go
index 50c856bdc794..7e3e0d4843a9 100644
--- a/op-supervisor/supervisor/types/types_test.go
+++ b/op-supervisor/supervisor/types/types_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func FuzzRoundtripIdentifierJSONMarshal(f *testing.F) {
-	f.Fuzz(func(t *testing.T, origin []byte, blockNumber uint64, logIndex uint64, timestamp uint64, chainID []byte) {
+	f.Fuzz(func(t *testing.T, origin []byte, blockNumber uint64, logIndex uint32, timestamp uint64, chainID []byte) {
 		if len(chainID) > 32 {
 			chainID = chainID[:32]
 		}
@@ -55,7 +55,19 @@ func TestChainID_String(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.expected, func(t *testing.T) {
-			require.Equal(t, test.expected, test.input.String())
+			t.Run("String", func(t *testing.T) {
+				require.Equal(t, test.expected, test.input.String())
+			})
+			t.Run("MarshalText", func(t *testing.T) {
+				data, err := test.input.MarshalText()
+				require.NoError(t, err)
+				require.Equal(t, test.expected, string(data))
+			})
+			t.Run("UnmarshalText", func(t *testing.T) {
+				var id ChainID
+				require.NoError(t, id.UnmarshalText([]byte(test.expected)))
+				require.Equal(t, test.input, id)
+			})
 		})
 	}
 }
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
index 9d541434a397..19de5537b41c 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
@@ -32,12 +32,12 @@ contract OPContractsManagerInterop is OPContractsManager {
         (IResourceMetering.ResourceConfig memory referenceResourceConfig, ISystemConfig.Addresses memory opChainAddrs) =
             defaultSystemConfigParams(_selector, _input, _output);
 
-        // TODO For now we assume that the dependency manager is the same as the proxy admin owner.
+        // TODO For now we assume that the dependency manager is the same as system config owner.
         // This is currently undefined since it's not part of the standard config, so we may need
         // to update where this value is pulled from in the future. To support a different dependency
         // manager in this contract without an invasive change of redefining the `Roles` struct,
         // we will make the change described in https://github.com/ethereum-optimism/optimism/issues/11783.
-        address dependencyManager = address(_input.roles.opChainProxyAdminOwner);
+        address dependencyManager = address(_input.roles.systemConfigOwner);
 
         return abi.encodeWithSelector(
             _selector,

From 3b99809541de1cec181bc886b0c032c2ed6d1e55 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 31 Oct 2024 16:05:51 -0600
Subject: [PATCH 093/451] ci: Parallelize fuzz jobs (#12765)

* ci: Parallelize fuzz jobs

Parallelize fuzz `make` targets using `xargs`. Previously, they were all running serially which led to long job runtimes.

* Use machine

* reduce executors to 8
---
 .circleci/config.yml  | 23 ++++-------------------
 cannon/Makefile       | 32 +++++++++++++++-----------------
 op-batcher/Makefile   | 18 ++++++++++--------
 op-chain-ops/Makefile | 10 ++++++----
 op-e2e/Makefile       |  8 +++++---
 op-node/Makefile      | 28 +++++++++++++++-------------
 op-service/Makefile   | 18 ++++++++++--------
 7 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7a5d9e3a5ebb..7430b9b5c9ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -745,8 +745,8 @@ jobs:
         description: should load in foundry artifacts
         type: boolean
         default: false
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
+    machine: true
+    resource_class: ethereum-optimism/latitude-1
     steps:
       - checkout
       - check-changed:
@@ -754,23 +754,10 @@ jobs:
       - attach_workspace:
           at: "."
           if: ${{ uses_artifacts }}
-      - restore_cache:
-          name: Restore Go modules cache
-          key: gomod-{{ checksum "go.sum" }}
-      - restore_cache:
-          name: Restore Go build cache
-          keys:
-            - golang-build-cache-fuzz-golang-{{ checksum "go.sum" }}
-            - golang-build-cache-fuzz-golang-
       - run:
           name: Fuzz
           command: make fuzz
           working_directory: "<<parameters.package_name>>"
-      - save_cache:
-          name: Save Go build cache
-          key: golang-build-cache-fuzz-golang-{{ checksum "go.sum" }}
-          paths:
-            - "/root/.cache/go-build"
 
   go-lint:
     machine: true
@@ -1323,8 +1310,6 @@ workflows:
       - go-lint
       - fuzz-golang:
           name: fuzz-golang-<<matrix.package_name>>
-          requires:
-            - go-mod-download
           on_changes: <<matrix.package_name>>
           matrix:
             parameters:
@@ -1338,13 +1323,13 @@ workflows:
           package_name: cannon
           on_changes: cannon,packages/contracts-bedrock/src/cannon
           uses_artifacts: true
-          requires: ["go-mod-download", "contracts-bedrock-build"]
+          requires: ["contracts-bedrock-build"]
       - fuzz-golang:
           name: op-e2e-fuzz
           package_name: op-e2e
           on_changes: op-e2e,packages/contracts-bedrock/src
           uses_artifacts: true
-          requires: ["go-mod-download", "contracts-bedrock-build"]
+          requires: ["contracts-bedrock-build"]
       - go-test:
           name: go-test-all
           requires:
diff --git a/cannon/Makefile b/cannon/Makefile
index 141e7d5be85b..d487485a625b 100644
--- a/cannon/Makefile
+++ b/cannon/Makefile
@@ -86,23 +86,21 @@ cannon-stf-verify:
 	@docker build --progress plain -f Dockerfile.diff ../
 
 fuzz:
-  # Common vm tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallBrk ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallMmap ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallExitGroup ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallFcntl ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintRead ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintWrite ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite ./mipsevm/tests
-	# Single-threaded tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests
-	# Multi-threaded tests
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests
-	# 64-bit tests - increased fuzztime for a larger input space
-	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMulOp ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultOp ./mipsevm/tests
-	go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultuOp ./mipsevm/tests
+	printf "%s\n" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallBrk ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallMmap ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallExitGroup ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallFcntl ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintRead ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintWrite ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMulOp ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultOp ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultuOp ./mipsevm/tests" \
+	| parallel -j 8 {}
 
 .PHONY: \
 	cannon32-impl \
diff --git a/op-batcher/Makefile b/op-batcher/Makefile
index 8e680ec2bec1..22bb7a613861 100644
--- a/op-batcher/Makefile
+++ b/op-batcher/Makefile
@@ -34,14 +34,16 @@ test:
 	go test -v ./...
 
 fuzz:
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelConfig_CheckTimeout ./batcher
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationZero ./batcher
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationTimeoutMaxChannelDuration ./batcher
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationTimeoutZeroMaxChannelDuration ./batcher
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelCloseTimeout ./batcher
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelZeroCloseTimeout ./batcher
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzSeqWindowClose ./batcher
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzSeqWindowZeroTimeoutClose ./batcher
+	printf "%s\n" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelConfig_CheckTimeout ./batcher" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationZero ./batcher" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationTimeoutMaxChannelDuration ./batcher" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationTimeoutZeroMaxChannelDuration ./batcher" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelCloseTimeout ./batcher" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelZeroCloseTimeout ./batcher" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzSeqWindowClose ./batcher" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzSeqWindowZeroTimeoutClose ./batcher" \
+	| parallel -j 8 {}
 
 .PHONY: \
 	op-batcher \
diff --git a/op-chain-ops/Makefile b/op-chain-ops/Makefile
index 99cd1aa80d2c..ad595b65e367 100644
--- a/op-chain-ops/Makefile
+++ b/op-chain-ops/Makefile
@@ -39,10 +39,12 @@ op-deployer:
 	GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-deployer ../op-deployer/cmd/op-deployer/main.go
 
 fuzz:
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzEncodeDecodeWithdrawal ./crossdomain
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzEncodeDecodeLegacyWithdrawal ./crossdomain
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzAliasing ./crossdomain
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzVersionedNonce ./crossdomain
+	printf "%s\n" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzEncodeDecodeWithdrawal ./crossdomain" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzEncodeDecodeLegacyWithdrawal ./crossdomain" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzAliasing ./crossdomain" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzVersionedNonce ./crossdomain" \
+	| parallel -j 8 {}
 
 
 sync-standard-version:
diff --git a/op-e2e/Makefile b/op-e2e/Makefile
index 7ddbb42528bd..4c808ac45c04 100644
--- a/op-e2e/Makefile
+++ b/op-e2e/Makefile
@@ -69,6 +69,8 @@ clean:
 .PHONY: clean
 
 fuzz:
-	go test -run NOTAREALTEST -tags cgo_test -v -fuzztime 10s -fuzz FuzzFjordCostFunction ./opgeth
-	go test -run NOTAREALTEST -tags cgo_test -v -fuzztime 10s -fuzz FuzzFastLzGethSolidity ./opgeth
-	go test -run NOTAREALTEST -tags cgo_test -v -fuzztime 10s -fuzz FuzzFastLzCgo ./opgeth
+	printf "%s\n" \
+		"go test -run NOTAREALTEST -tags cgo_test -v -fuzztime 10s -fuzz FuzzFjordCostFunction ./opgeth" \
+		"go test -run NOTAREALTEST -tags cgo_test -v -fuzztime 10s -fuzz FuzzFastLzGethSolidity ./opgeth" \
+		"go test -run NOTAREALTEST -tags cgo_test -v -fuzztime 10s -fuzz FuzzFastLzCgo ./opgeth" \
+	| parallel -j 8 {}
diff --git a/op-node/Makefile b/op-node/Makefile
index 75b152b2d53e..c1d480d9b71a 100644
--- a/op-node/Makefile
+++ b/op-node/Makefile
@@ -35,19 +35,21 @@ test:
 	go test -v ./...
 
 fuzz:
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoBedrockRoundTrip ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoEcotoneRoundTrip ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoAgainstContract ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzUnmarshallLogEvent ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseFrames ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzFrameUnmarshalBinary ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzBatchRoundTrip ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDeriveDepositsRoundTrip ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDeriveDepositsBadVersion ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseL1InfoDepositTxDataValid ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseL1InfoDepositTxDataBadLength ./rollup/derive
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzRejectCreateBlockBadTimestamp ./rollup/driver
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDecodeDepositTxDataToL1Info ./rollup/driver
+	printf "%s\n" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoBedrockRoundTrip ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoEcotoneRoundTrip ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoAgainstContract ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzUnmarshallLogEvent ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseFrames ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzFrameUnmarshalBinary ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzBatchRoundTrip ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDeriveDepositsRoundTrip ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDeriveDepositsBadVersion ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseL1InfoDepositTxDataValid ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseL1InfoDepositTxDataBadLength ./rollup/derive" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzRejectCreateBlockBadTimestamp ./rollup/driver" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDecodeDepositTxDataToL1Info ./rollup/driver" \
+	| parallel -j 8 {}
 
 generate-mocks:
 	go generate ./...
diff --git a/op-service/Makefile b/op-service/Makefile
index 0978529f9b8d..f57c0b6b53a4 100644
--- a/op-service/Makefile
+++ b/op-service/Makefile
@@ -10,14 +10,16 @@ generate-mocks:
 	go generate ./...
 
 fuzz:
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadUnmarshal ./eth
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV1 ./eth
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV2 ./eth
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV3 ./eth
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzOBP01 ./eth
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzEncodeDecodeBlob ./eth
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDetectNonBijectivity ./eth
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzEncodeScalar ./eth
+	printf "%s\n" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadUnmarshal ./eth" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV1 ./eth" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV2 ./eth" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV3 ./eth" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzOBP01 ./eth" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzEncodeDecodeBlob ./eth" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDetectNonBijectivity ./eth" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzEncodeScalar ./eth" \
+	| parallel -j 8 {}
 
 .PHONY: \
 	test \

From 6f2058c4603c389c6d30d3d8f541508ee1eccf36 Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Thu, 31 Oct 2024 18:31:05 -0400
Subject: [PATCH 094/451] cannon: Add noop stat syscall to MIPS64.sol (#12766)

* cannon: Add stat syscall to MIP64 contracts

* cannon: Run semver lock task
---
 packages/contracts-bedrock/semver-lock.json                 | 4 ++--
 packages/contracts-bedrock/src/cannon/MIPS64.sol            | 6 ++++--
 .../src/cannon/libraries/MIPS64Syscalls.sol                 | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 502b9d0ba6f9..1cee134ca198 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -148,8 +148,8 @@
     "sourceCodeHash": "0x9fa2d1297ad1e93b4d3c5c0fed08bedcd8f746807589f0fd3369e79347c6a027"
   },
   "src/cannon/MIPS64.sol": {
-    "initCodeHash": "0x47c2bdd1e6fbb4941caa20a2ba5c2a66de198a8c7b540a9d4a0d84dbe8d3bfea",
-    "sourceCodeHash": "0xdb7f8a92ed552a2720f5fe3c0a32e4069026f0b23933145493ead88403206814"
+    "initCodeHash": "0x5094e3f488de838cba1422b508a899444ee27905abc9c0b97961d4b8b7392289",
+    "sourceCodeHash": "0xdc2393d2073348218a9c6e169c2e7f687590e237773b8fde53fae9cf84395978"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS64.sol b/packages/contracts-bedrock/src/cannon/MIPS64.sol
index dcc2a6ec2190..8c85a26acd43 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS64.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS64.sol
@@ -64,8 +64,8 @@ contract MIPS64 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS64 contract.
-    /// @custom:semver 1.0.0-beta.1
-    string public constant version = "1.0.0-beta.1";
+    /// @custom:semver 1.0.0-beta.2
+    string public constant version = "1.0.0-beta.2";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -598,6 +598,8 @@ contract MIPS64 is ISemver {
                 // ignored
             } else if (syscall_no == sys.SYS_PREAD64) {
                 // ignored
+            } else if (syscall_no == sys.SYS_STAT) {
+                // ignored
             } else if (syscall_no == sys.SYS_FSTAT) {
                 // ignored
             } else if (syscall_no == sys.SYS_OPENAT) {
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
index d03f04f08620..10954c64748e 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
@@ -58,6 +58,7 @@ library MIPS64Syscalls {
     uint32 internal constant SYS_PRLIMIT64 = 5297;
     uint32 internal constant SYS_CLOSE = 5003;
     uint32 internal constant SYS_PREAD64 = 5016;
+    uint32 internal constant SYS_STAT = 5004;
     uint32 internal constant SYS_FSTAT = 5005;
     //uint32 internal constant SYS_FSTAT64 = 0xFFFFFFFF;  // UndefinedSysNr - not supported by MIPS64
     uint32 internal constant SYS_OPENAT = 5247;

From 1b4fda30ac55a9e234321974492caa156e1a954a Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Thu, 31 Oct 2024 18:55:51 -0400
Subject: [PATCH 095/451] fix: Make public DeployUtils lib functions internal
 (#12759)

---
 .../contracts-bedrock/scripts/libraries/DeployUtils.sol  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
index 08bfd99f0131..597e5b100fc3 100644
--- a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
+++ b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
@@ -279,7 +279,10 @@ library DeployUtils {
 
     /// @notice Builds an L1ChugSplashProxy with a dummy implementation.
     /// @param _proxyImplName Name of the implementation contract.
-    function buildL1ChugSplashProxyWithImpl(string memory _proxyImplName) public returns (IL1ChugSplashProxy proxy_) {
+    function buildL1ChugSplashProxyWithImpl(string memory _proxyImplName)
+        internal
+        returns (IL1ChugSplashProxy proxy_)
+    {
         proxy_ = IL1ChugSplashProxy(
             create1({
                 _name: "L1ChugSplashProxy",
@@ -299,7 +302,7 @@ library DeployUtils {
         IAddressManager _addressManager,
         string memory _proxyImplName
     )
-        public
+        internal
         returns (IResolvedDelegateProxy proxy_)
     {
         proxy_ = IResolvedDelegateProxy(
@@ -316,7 +319,7 @@ library DeployUtils {
     }
 
     /// @notice Builds an AddressManager contract.
-    function buildAddressManager() public returns (IAddressManager addressManager_) {
+    function buildAddressManager() internal returns (IAddressManager addressManager_) {
         addressManager_ = IAddressManager(
             create1({
                 _name: "AddressManager",

From fde52b490211bd9361317167b3efb58ed92f31ee Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Fri, 1 Nov 2024 01:45:07 -0400
Subject: [PATCH 096/451] cannon: Enable 64-bit tests (#12729)

* cannon: Set up fuzz tests to run across 32- and 64-bit VMs

Update preimage read fuzz test to work on 64-bit vms

* cannon: Run both 32- and 64-bit Cannon tests in CI

* cannon: Separate log and coverage files for 32- and 64-bit tests

* cannon: Clean up evm validation code

* cannon: Move skip utility to testutil

* cannon: Make TestState_EncodeWitness 64-bit compatible

* cannon: Skip failing 64-bit tests

* cannon: Update TestEVM_EmptyThreadStacks to work across 32- and 64-bit vms

* cannon: Update version state tests, add build tags

* cannon: Fix code coverage upload paths

* cannon: Fix code coverage file extensions

* cannon: Run 32/64-bit tests using a matrix

* cannon: Try to set better name for arch-specific cannon tests

* cannon: Use generated job names in bedrock requirements list

* cannon: Add comment on new validator util

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 .circleci/config.yml                          | 41 +++++---
 cannon/Makefile                               | 27 ++++--
 cannon/mipsevm/multithreaded/state_test.go    | 18 ++--
 .../singlethreaded/instrumented_test.go       |  3 +
 cannon/mipsevm/singlethreaded/state_test.go   |  3 +
 cannon/mipsevm/tests/evm_common_test.go       | 51 +++-------
 .../mipsevm/tests/evm_multithreaded_test.go   | 31 +++---
 .../mipsevm/tests/evm_singlethreaded_test.go  |  3 +
 cannon/mipsevm/tests/fuzz_evm_common_test.go  | 96 ++++++++++++++++---
 .../tests/fuzz_evm_multithreaded_test.go      | 11 ++-
 .../tests/fuzz_evm_singlethreaded_test.go     | 11 +--
 cannon/mipsevm/testutil/mips.go               | 36 +++++--
 cannon/mipsevm/testutil/vmtests.go            |  7 ++
 cannon/mipsevm/versions/state64_test.go       | 64 +++++++++++++
 cannon/mipsevm/versions/state_test.go         | 10 +-
 15 files changed, 300 insertions(+), 112 deletions(-)
 create mode 100644 cannon/mipsevm/versions/state64_test.go

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7430b9b5c9ac..3a089dd72bb2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -162,9 +162,9 @@ jobs:
         description: Whether to notify on failure
         type: boolean
         default: false
-      mips64:
-        type: boolean
-        default: false
+      mips_word_size:
+        type: integer
+        default: 32
     steps:
       - checkout
       - check-changed:
@@ -187,28 +187,34 @@ jobs:
           working_directory: cannon
       - when:
           condition:
-            not: <<parameters.mips64>>
+            equal: [32, <<parameters.mips_word_size>>]
           steps:
             - run:
                 name: Cannon Go 32-bit tests
                 command: |
                   export SKIP_SLOW_TESTS=<<parameters.skip_slow_tests>>
-                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon.xml --jsonfile=../tmp/testlogs/log.json \
-                  -- -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage.out ./...
+                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon-32.xml --jsonfile=../tmp/testlogs/log-32.json \
+                  -- -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage-32.out ./...
+                working_directory: cannon
+            - run:
+                name: Upload Cannon coverage
+                command: codecov --verbose --clean --flags cannon-go-tests-32 -f ./coverage-32.out
                 working_directory: cannon
       - when:
-          condition: <<parameters.mips64>>
+          condition:
+            equal: [64, <<parameters.mips_word_size>>]
           steps:
             - run:
                 name: Cannon Go 64-bit tests
                 command: |
                   export SKIP_SLOW_TESTS=<<parameters.skip_slow_tests>>
-                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon.xml --jsonfile=../tmp/testlogs/log.json \
-                  -- --tags=cannon64 -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage.out ./...
+                  gotestsum --format=testname --junitfile=../tmp/test-results/cannon-64.xml --jsonfile=../tmp/testlogs/log-64.json \
+                  -- --tags=cannon64 -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage-64.out ./...
+                working_directory: cannon
+            - run:
+                name: Upload Cannon coverage
+                command: codecov --verbose --clean --flags cannon-go-tests-64 -f ./coverage-64.out
                 working_directory: cannon
-      - run:
-          name: upload Cannon coverage
-          command: codecov --verbose --clean --flags cannon-go-tests
       - store_test_results:
           path: ./tmp/test-results
       - store_artifacts:
@@ -1365,7 +1371,8 @@ workflows:
             - go-mod-download
             - go-lint
             - cannon-build-test-vectors
-            - cannon-go-lint-and-test
+            - cannon-go-lint-and-test-32-bit
+            - cannon-go-lint-and-test-64-bit
             - check-generated-mocks-op-node
             - check-generated-mocks-op-service
             - go-mod-download
@@ -1403,10 +1410,14 @@ workflows:
       - check-generated-mocks-op-node
       - check-generated-mocks-op-service
       - cannon-go-lint-and-test:
+          name: cannon-go-lint-and-test-<<matrix.mips_word_size>>-bit
           requires:
             - contracts-bedrock-build
           skip_slow_tests: true
           notify: true
+          matrix:
+            parameters:
+              mips_word_size: [ 32, 64 ]
       - cannon-build-test-vectors
       - todo-issues:
           name: todo-issues-check
@@ -1605,10 +1616,14 @@ workflows:
       - contracts-bedrock-build:
           skip_pattern: test
       - cannon-go-lint-and-test:
+          name: cannon-go-lint-and-test-<<matrix.mips_word_size>>-bit
           requires:
             - contracts-bedrock-build
           context:
             - slack
+          matrix:
+            parameters:
+              mips_word_size: [ 32, 64 ]
 
   scheduled-docker-publish:
     when:
diff --git a/cannon/Makefile b/cannon/Makefile
index d487485a625b..f71ffa24d200 100644
--- a/cannon/Makefile
+++ b/cannon/Makefile
@@ -87,19 +87,28 @@ cannon-stf-verify:
 
 fuzz:
 	printf "%s\n" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallBrk ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallMmap ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallExitGroup ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallFcntl ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintRead ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintWrite ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallBrk32 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallMmap32 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallExitGroup32 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallFcntl32 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintRead32 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead32 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintWrite32 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite32 ./mipsevm/tests" \
 		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT32 ./mipsevm/tests" \
 		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMulOp ./mipsevm/tests" \
 		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultOp ./mipsevm/tests" \
 		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultuOp ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallBrk64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallMmap64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallExitGroup64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallFcntl64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateHintRead64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateHintWrite64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallCloneMT64 ./mipsevm/tests" \
 	| parallel -j 8 {}
 
 .PHONY: \
diff --git a/cannon/mipsevm/multithreaded/state_test.go b/cannon/mipsevm/multithreaded/state_test.go
index 3f8954c63625..a4ed646b5325 100644
--- a/cannon/mipsevm/multithreaded/state_test.go
+++ b/cannon/mipsevm/multithreaded/state_test.go
@@ -25,6 +25,10 @@ func setWitnessField(witness StateWitness, fieldOffset int, fieldData []byte) {
 	copy(witness[start:end], fieldData)
 }
 
+func setWitnessWord(witness StateWitness, fieldOffset int, value arch.Word) {
+	arch.ByteOrderWord.PutWord(witness[fieldOffset:], value)
+}
+
 // Run through all permutations of `exited` / `exitCode` and ensure that the
 // correct witness, state hash, and VM Status is produced.
 func TestState_EncodeWitness(t *testing.T) {
@@ -70,27 +74,27 @@ func TestState_EncodeWitness(t *testing.T) {
 		expectedWitness := make(StateWitness, STATE_WITNESS_SIZE)
 		setWitnessField(expectedWitness, MEMROOT_WITNESS_OFFSET, memRoot[:])
 		setWitnessField(expectedWitness, PREIMAGE_KEY_WITNESS_OFFSET, preimageKey[:])
-		setWitnessField(expectedWitness, PREIMAGE_OFFSET_WITNESS_OFFSET, []byte{0, 0, 0, byte(preimageOffset)})
-		setWitnessField(expectedWitness, HEAP_WITNESS_OFFSET, []byte{0, 0, 0, byte(heap)})
+		setWitnessWord(expectedWitness, PREIMAGE_OFFSET_WITNESS_OFFSET, preimageOffset)
+		setWitnessWord(expectedWitness, HEAP_WITNESS_OFFSET, heap)
 		setWitnessField(expectedWitness, LL_RESERVATION_ACTIVE_OFFSET, []byte{1})
-		setWitnessField(expectedWitness, LL_ADDRESS_OFFSET, []byte{0, 0, 0, byte(llAddress)})
-		setWitnessField(expectedWitness, LL_OWNER_THREAD_OFFSET, []byte{0, 0, 0, byte(llThreadOwner)})
+		setWitnessWord(expectedWitness, LL_ADDRESS_OFFSET, llAddress)
+		setWitnessWord(expectedWitness, LL_OWNER_THREAD_OFFSET, llThreadOwner)
 		setWitnessField(expectedWitness, EXITCODE_WITNESS_OFFSET, []byte{c.exitCode})
 		if c.exited {
 			setWitnessField(expectedWitness, EXITED_WITNESS_OFFSET, []byte{1})
 		}
 		setWitnessField(expectedWitness, STEP_WITNESS_OFFSET, []byte{0, 0, 0, 0, 0, 0, 0, byte(step)})
 		setWitnessField(expectedWitness, STEPS_SINCE_CONTEXT_SWITCH_WITNESS_OFFSET, []byte{0, 0, 0, 0, 0, 0, 0, byte(stepsSinceContextSwitch)})
-		setWitnessField(expectedWitness, WAKEUP_WITNESS_OFFSET, []byte{0xFF, 0xFF, 0xFF, 0xFF})
+		setWitnessWord(expectedWitness, WAKEUP_WITNESS_OFFSET, ^arch.Word(0))
 		setWitnessField(expectedWitness, TRAVERSE_RIGHT_WITNESS_OFFSET, []byte{0})
 		setWitnessField(expectedWitness, LEFT_THREADS_ROOT_WITNESS_OFFSET, leftStackRoot[:])
 		setWitnessField(expectedWitness, RIGHT_THREADS_ROOT_WITNESS_OFFSET, rightStackRoot[:])
-		setWitnessField(expectedWitness, THREAD_ID_WITNESS_OFFSET, []byte{0, 0, 0, 1})
+		setWitnessWord(expectedWitness, THREAD_ID_WITNESS_OFFSET, 1)
 
 		// Validate witness
 		actualWitness, actualStateHash := state.EncodeWitness()
 		require.Equal(t, len(actualWitness), STATE_WITNESS_SIZE, "Incorrect witness size")
-		require.EqualValues(t, expectedWitness[:], actualWitness[:], "Incorrect witness")
+		require.EqualValues(t, expectedWitness[:], actualWitness[:], "Incorrect witness: \n\tactual = \t0x%x \n\texpected = \t0x%x", actualWitness, expectedWitness)
 		// Validate witness hash
 		expectedStateHash := crypto.Keccak256Hash(actualWitness)
 		expectedStateHash[0] = mipsevm.VmStatus(c.exited, c.exitCode)
diff --git a/cannon/mipsevm/singlethreaded/instrumented_test.go b/cannon/mipsevm/singlethreaded/instrumented_test.go
index d4c190d9cd91..f1dfc8fae4db 100644
--- a/cannon/mipsevm/singlethreaded/instrumented_test.go
+++ b/cannon/mipsevm/singlethreaded/instrumented_test.go
@@ -1,3 +1,6 @@
+//go:build !cannon64
+// +build !cannon64
+
 package singlethreaded
 
 import (
diff --git a/cannon/mipsevm/singlethreaded/state_test.go b/cannon/mipsevm/singlethreaded/state_test.go
index e0639c3dbeec..bfab4dd27988 100644
--- a/cannon/mipsevm/singlethreaded/state_test.go
+++ b/cannon/mipsevm/singlethreaded/state_test.go
@@ -1,3 +1,6 @@
+//go:build !cannon64
+// +build !cannon64
+
 package singlethreaded
 
 import (
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index be316749cd61..2aa1def61ca7 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/stretchr/testify/require"
 
@@ -37,6 +36,7 @@ func TestEVM(t *testing.T) {
 		for _, f := range testFiles {
 			testName := fmt.Sprintf("%v (%v)", f.Name(), c.Name)
 			t.Run(testName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				for _, skipped := range skipped {
 					if f.Name() == skipped {
 						t.Skipf("Skipping explicitly excluded open_mips testcase: %v", f.Name())
@@ -47,10 +47,7 @@ func TestEVM(t *testing.T) {
 				// Short-circuit early for exit_group.bin
 				exitGroup := f.Name() == "exit_group.bin"
 				expectPanic := strings.HasSuffix(f.Name(), "panic.bin")
-
-				evm := testutil.NewMIPSEVM(c.Contracts)
-				evm.SetLocalOracle(oracle)
-				testutil.LogStepFailureAtCleanup(t, evm)
+				validator := testutil.NewEvmValidator(t, c.StateHashFn, c.Contracts, testutil.WithLocalOracle(oracle))
 
 				fn := path.Join("open_mips_tests/test/bin", f.Name())
 				programMem, err := os.ReadFile(fn)
@@ -88,12 +85,7 @@ func TestEVM(t *testing.T) {
 
 					stepWitness, err := goVm.Step(true)
 					require.NoError(t, err)
-					evmPost := evm.Step(t, stepWitness, curStep, c.StateHashFn)
-					// verify the post-state matches.
-					// TODO: maybe more readable to decode the evmPost state, and do attribute-wise comparison.
-					goPost, _ := goVm.GetState().EncodeWitness()
-					require.Equalf(t, hexutil.Bytes(goPost).String(), hexutil.Bytes(evmPost).String(),
-						"mipsevm produced different state than EVM at step %d", state.GetStep())
+					validator.ValidateEVM(t, stepWitness, curStep, goVm)
 				}
 				if exitGroup {
 					require.NotEqual(t, arch.Word(testutil.EndAddr), goVm.GetState().GetPC(), "must not reach end")
@@ -215,6 +207,7 @@ func TestEVMSingleStep_Operators(t *testing.T) {
 		for i, tt := range cases {
 			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
 			t.Run(testName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
 				state := goVm.GetState()
 				var insn uint32
@@ -316,6 +309,7 @@ func TestEVMSingleStep_LoadStore(t *testing.T) {
 		for _, v := range versions {
 			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
 			t.Run(testName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				addr := tt.base + Word(tt.imm)
 				effAddr := arch.AddressMask & addr
 
@@ -490,6 +484,7 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 		for i, tt := range cases {
 			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
 			t.Run(testName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
 				state := goVm.GetState()
 				var insn uint32
@@ -864,6 +859,7 @@ func TestEVMFault(t *testing.T) {
 		for _, tt := range cases {
 			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
 			t.Run(testName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithPC(tt.pc), testutil.WithNextPC(tt.nextPC))
 				state := goVm.GetState()
 				testutil.StoreInstruction(state.GetMemory(), 0, tt.insn)
@@ -886,8 +882,7 @@ func TestHelloEVM(t *testing.T) {
 		v := v
 		t.Run(v.Name, func(t *testing.T) {
 			t.Parallel()
-			evm := testutil.NewMIPSEVM(v.Contracts)
-			testutil.LogStepFailureAtCleanup(t, evm)
+			validator := testutil.NewEvmValidator(t, v.StateHashFn, v.Contracts)
 
 			var stdOutBuf, stdErrBuf bytes.Buffer
 			elfFile := testutil.ProgramPath("hello")
@@ -907,12 +902,7 @@ func TestHelloEVM(t *testing.T) {
 
 				stepWitness, err := goVm.Step(true)
 				require.NoError(t, err)
-				evmPost := evm.Step(t, stepWitness, step, v.StateHashFn)
-				// verify the post-state matches.
-				// TODO: maybe more readable to decode the evmPost state, and do attribute-wise comparison.
-				goPost, _ := goVm.GetState().EncodeWitness()
-				require.Equalf(t, hexutil.Bytes(goPost).String(), hexutil.Bytes(evmPost).String(),
-					"mipsevm produced different state than EVM. insn: %x", insn)
+				validator.ValidateEVM(t, stepWitness, step, goVm)
 			}
 			end := time.Now()
 			delta := end.Sub(start)
@@ -935,9 +925,7 @@ func TestClaimEVM(t *testing.T) {
 		v := v
 		t.Run(v.Name, func(t *testing.T) {
 			t.Parallel()
-			evm := testutil.NewMIPSEVM(v.Contracts)
-			testutil.LogStepFailureAtCleanup(t, evm)
-
+			validator := testutil.NewEvmValidator(t, v.StateHashFn, v.Contracts)
 			oracle, expectedStdOut, expectedStdErr := testutil.ClaimTestOracle(t)
 
 			var stdOutBuf, stdErrBuf bytes.Buffer
@@ -958,12 +946,7 @@ func TestClaimEVM(t *testing.T) {
 
 				stepWitness, err := goVm.Step(true)
 				require.NoError(t, err)
-
-				evmPost := evm.Step(t, stepWitness, curStep, v.StateHashFn)
-
-				goPost, _ := goVm.GetState().EncodeWitness()
-				require.Equal(t, hexutil.Bytes(goPost).String(), hexutil.Bytes(evmPost).String(),
-					"mipsevm produced different state than EVM")
+				validator.ValidateEVM(t, stepWitness, curStep, goVm)
 			}
 
 			require.True(t, state.GetExited(), "must complete program")
@@ -983,8 +966,7 @@ func TestEntryEVM(t *testing.T) {
 		v := v
 		t.Run(v.Name, func(t *testing.T) {
 			t.Parallel()
-			evm := testutil.NewMIPSEVM(v.Contracts)
-			testutil.LogStepFailureAtCleanup(t, evm)
+			validator := testutil.NewEvmValidator(t, v.StateHashFn, v.Contracts)
 
 			var stdOutBuf, stdErrBuf bytes.Buffer
 			elfFile := testutil.ProgramPath("entry")
@@ -992,7 +974,7 @@ func TestEntryEVM(t *testing.T) {
 			state := goVm.GetState()
 
 			start := time.Now()
-			for i := 0; i < 400_000; i++ {
+			for i := 0; i < 500_000; i++ {
 				curStep := goVm.GetState().GetStep()
 				if goVm.GetState().GetExited() {
 					break
@@ -1004,11 +986,7 @@ func TestEntryEVM(t *testing.T) {
 
 				stepWitness, err := goVm.Step(true)
 				require.NoError(t, err)
-				evmPost := evm.Step(t, stepWitness, curStep, v.StateHashFn)
-				// verify the post-state matches.
-				goPost, _ := goVm.GetState().EncodeWitness()
-				require.Equal(t, hexutil.Bytes(goPost).String(), hexutil.Bytes(evmPost).String(),
-					"mipsevm produced different state than EVM")
+				validator.ValidateEVM(t, stepWitness, curStep, goVm)
 			}
 			end := time.Now()
 			delta := end.Sub(start)
@@ -1090,6 +1068,7 @@ func TestEVMSingleStepBranch(t *testing.T) {
 		for i, tt := range cases {
 			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
 			t.Run(testName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(tt.pc))
 				state := goVm.GetState()
 				const rsReg = 8 // t0
diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index 1e1704558abd..ba858585980b 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -8,7 +8,6 @@ import (
 	"slices"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
@@ -243,6 +242,7 @@ func TestEVM_MT_SysRead_Preimage(t *testing.T) {
 		for _, v := range llVariations {
 			tName := fmt.Sprintf("%v (%v)", c.name, v.name)
 			t.Run(tName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				effAddr := arch.AddressMask & c.addr
 				preimageKey := preimage.Keccak256Key(crypto.Keccak256Hash(preimageValue)).PreimageKey()
 				oracle := testutil.StaticOracle(t, preimageValue)
@@ -339,6 +339,7 @@ func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
 		for _, v := range llVariations {
 			tName := fmt.Sprintf("%v (%v)", c.name, v.name)
 			t.Run(tName, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				insn := uint32((c.opcode << 26) | (baseReg & 0x1F << 21) | (rtReg & 0x1F << 16) | (0xFFFF & c.offset))
 				goVm, state, contracts := setup(t, i, nil, testutil.WithPCAndNextPC(0x08))
 				step := state.GetStep()
@@ -409,31 +410,25 @@ func TestEVM_SysClone_FlagHandling(t *testing.T) {
 
 			var err error
 			var stepWitness *mipsevm.StepWitness
-			us := multithreaded.NewInstrumentedState(state, nil, os.Stdout, os.Stderr, nil, nil)
+			goVm := multithreaded.NewInstrumentedState(state, nil, os.Stdout, os.Stderr, nil, nil)
 			if !c.valid {
 				// The VM should exit
-				stepWitness, err = us.Step(true)
+				stepWitness, err = goVm.Step(true)
 				require.NoError(t, err)
 				require.Equal(t, curStep+1, state.GetStep())
-				require.Equal(t, true, us.GetState().GetExited())
-				require.Equal(t, uint8(mipsevm.VMStatusPanic), us.GetState().GetExitCode())
+				require.Equal(t, true, goVm.GetState().GetExited())
+				require.Equal(t, uint8(mipsevm.VMStatusPanic), goVm.GetState().GetExitCode())
 				require.Equal(t, 1, state.ThreadCount())
 			} else {
-				stepWitness, err = us.Step(true)
+				stepWitness, err = goVm.Step(true)
 				require.NoError(t, err)
 				require.Equal(t, curStep+1, state.GetStep())
-				require.Equal(t, false, us.GetState().GetExited())
-				require.Equal(t, uint8(0), us.GetState().GetExitCode())
+				require.Equal(t, false, goVm.GetState().GetExited())
+				require.Equal(t, uint8(0), goVm.GetState().GetExitCode())
 				require.Equal(t, 2, state.ThreadCount())
 			}
 
-			evm := testutil.NewMIPSEVM(contracts)
-			testutil.LogStepFailureAtCleanup(t, evm)
-
-			evmPost := evm.Step(t, stepWitness, curStep, multithreaded.GetStateHashFn())
-			goPost, _ := us.GetState().EncodeWitness()
-			require.Equal(t, hexutil.Bytes(goPost).String(), hexutil.Bytes(evmPost).String(),
-				"mipsevm produced different state than EVM")
+			testutil.ValidateEVM(t, stepWitness, curStep, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
 }
@@ -660,6 +655,7 @@ func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
 
 	for i, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
+			testutil.TemporarilySkip64BitTests(t)
 			goVm, state, contracts := setup(t, i*1234, nil)
 			step := state.GetStep()
 
@@ -729,6 +725,7 @@ func TestEVM_SysFutex_WakePrivate(t *testing.T) {
 
 	for i, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
+			testutil.TemporarilySkip64BitTests(t)
 			goVm, state, contracts := setup(t, i*1122, nil)
 			mttestutil.SetupThreads(int64(i*2244), state, c.traverseRight, c.activeThreadCount, c.inactiveThreadCount)
 			step := state.Step
@@ -1109,6 +1106,7 @@ var NoopSyscalls = map[string]uint32{
 func TestEVM_NoopSyscall(t *testing.T) {
 	for noopName, noopVal := range NoopSyscalls {
 		t.Run(noopName, func(t *testing.T) {
+			testutil.TemporarilySkip64BitTests(t)
 			goVm, state, contracts := setup(t, int(noopVal), nil)
 
 			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
@@ -1155,6 +1153,7 @@ func TestEVM_UnsupportedSyscall(t *testing.T) {
 		i := i
 		syscallNum := syscallNum
 		t.Run(testName, func(t *testing.T) {
+			testutil.TemporarilySkip64BitTests(t)
 			t.Parallel()
 			goVm, state, contracts := setup(t, i*3434, nil)
 			// Setup basic getThreadId syscall instruction
@@ -1196,7 +1195,7 @@ func TestEVM_EmptyThreadStacks(t *testing.T) {
 
 				require.PanicsWithValue(t, "Active thread stack is empty", func() { _, _ = goVm.Step(false) })
 
-				errorMessage := "MIPS2: active thread stack is empty"
+				errorMessage := "active thread stack is empty"
 				testutil.AssertEVMReverts(t, state, contracts, tracer, proofCase.Proof, testutil.CreateErrorStringMatcher(errorMessage))
 			})
 		}
diff --git a/cannon/mipsevm/tests/evm_singlethreaded_test.go b/cannon/mipsevm/tests/evm_singlethreaded_test.go
index f13ac5a68fa8..56c5e31c3463 100644
--- a/cannon/mipsevm/tests/evm_singlethreaded_test.go
+++ b/cannon/mipsevm/tests/evm_singlethreaded_test.go
@@ -1,3 +1,6 @@
+//go:build !cannon64
+// +build !cannon64
+
 package tests
 
 import (
diff --git a/cannon/mipsevm/tests/fuzz_evm_common_test.go b/cannon/mipsevm/tests/fuzz_evm_common_test.go
index d1d10fbeb3cb..c58e1421a9e1 100644
--- a/cannon/mipsevm/tests/fuzz_evm_common_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_common_test.go
@@ -19,11 +19,20 @@ import (
 
 const syscallInsn = uint32(0x00_00_00_0c)
 
-func FuzzStateSyscallBrk(f *testing.F) {
+func FuzzStateSyscallBrk32(f *testing.F) {
+	doFuzzStateSyscallBrk(f)
+}
+
+func FuzzStateSyscallBrk64(f *testing.F) {
+	doFuzzStateSyscallBrk(f)
+}
+
+func doFuzzStateSyscallBrk(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(seed))
 				state := goVm.GetState()
 				state.GetRegistersRef()[2] = arch.SysBrk
@@ -48,7 +57,15 @@ func FuzzStateSyscallBrk(f *testing.F) {
 	})
 }
 
-func FuzzStateSyscallMmap(f *testing.F) {
+func FuzzStateSyscallMmap32(f *testing.F) {
+	doFuzzStateSyscallMmap(f)
+}
+
+func FuzzStateSyscallMmap64(f *testing.F) {
+	doFuzzStateSyscallMmap(f)
+}
+
+func doFuzzStateSyscallMmap(f *testing.F) {
 	// Add special cases for large memory allocation
 	f.Add(Word(0), Word(0x1000), Word(program.HEAP_END), int64(1))
 	f.Add(Word(0), Word(1<<31), Word(program.HEAP_START), int64(2))
@@ -59,6 +76,7 @@ func FuzzStateSyscallMmap(f *testing.F) {
 	f.Fuzz(func(t *testing.T, addr Word, siz Word, heap Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(),
 					testutil.WithRandomization(seed), testutil.WithHeap(heap))
 				state := goVm.GetState()
@@ -103,11 +121,20 @@ func FuzzStateSyscallMmap(f *testing.F) {
 	})
 }
 
-func FuzzStateSyscallExitGroup(f *testing.F) {
+func FuzzStateSyscallExitGroup32(f *testing.F) {
+	doFuzzStateSyscallExitGroup(f)
+}
+
+func FuzzStateSyscallExitGroup64(f *testing.F) {
+	doFuzzStateSyscallExitGroup(f)
+}
+
+func doFuzzStateSyscallExitGroup(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, exitCode uint8, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(),
 					testutil.WithRandomization(seed))
 				state := goVm.GetState()
@@ -132,11 +159,20 @@ func FuzzStateSyscallExitGroup(f *testing.F) {
 	})
 }
 
-func FuzzStateSyscallFcntl(f *testing.F) {
+func FuzzStateSyscallFcntl32(f *testing.F) {
+	doFuzzStateSyscallFcntl(f)
+}
+
+func FuzzStateSyscallFcntl64(f *testing.F) {
+	doFuzzStateSyscallFcntl(f)
+}
+
+func doFuzzStateSyscallFcntl(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, fd Word, cmd Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(),
 					testutil.WithRandomization(seed))
 				state := goVm.GetState()
@@ -188,11 +224,20 @@ func FuzzStateSyscallFcntl(f *testing.F) {
 	})
 }
 
-func FuzzStateHintRead(f *testing.F) {
+func FuzzStateHintRead32(f *testing.F) {
+	doFuzzStateHintRead(f)
+}
+
+func FuzzStateHintRead64(f *testing.F) {
+	doFuzzStateHintRead(f)
+}
+
+func doFuzzStateHintRead(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr Word, count Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				preimageData := []byte("hello world")
 				preimageKey := preimage.Keccak256Key(crypto.Keccak256Hash(preimageData)).PreimageKey()
 				oracle := testutil.StaticOracle(t, preimageData) // only used for hinting
@@ -225,14 +270,22 @@ func FuzzStateHintRead(f *testing.F) {
 	})
 }
 
-func FuzzStatePreimageRead(f *testing.F) {
+func FuzzStatePreimageRead32(f *testing.F) {
+	doFuzzStatePreimageRead(f)
+}
+
+func FuzzStatePreimageRead64(f *testing.F) {
+	doFuzzStatePreimageRead(f)
+}
+
+func doFuzzStatePreimageRead(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr arch.Word, pc arch.Word, count arch.Word, preimageOffset arch.Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
 				effAddr := addr & arch.AddressMask
 				pc = pc & arch.AddressMask
-				preexistingMemoryVal := [4]byte{0xFF, 0xFF, 0xFF, 0xFF}
+				preexistingMemoryVal := ^arch.Word(0)
 				preimageValue := []byte("hello world")
 				preimageData := testutil.AddPreimageLengthPrefix(preimageValue)
 				if preimageOffset >= Word(len(preimageData)) || pc == effAddr {
@@ -249,11 +302,11 @@ func FuzzStatePreimageRead(f *testing.F) {
 				state.GetRegistersRef()[5] = addr
 				state.GetRegistersRef()[6] = count
 				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
-				state.GetMemory().SetWord(effAddr, arch.ByteOrderWord.Word(preexistingMemoryVal[:]))
+				state.GetMemory().SetWord(effAddr, preexistingMemoryVal)
 				step := state.GetStep()
 
 				alignment := addr & arch.ExtMask
-				writeLen := 4 - alignment
+				writeLen := arch.WordSizeBytes - alignment
 				if count < writeLen {
 					writeLen = count
 				}
@@ -272,7 +325,8 @@ func FuzzStatePreimageRead(f *testing.F) {
 				expected.PreimageOffset += writeLen
 				if writeLen > 0 {
 					// Expect a memory write
-					expectedMemory := preexistingMemoryVal
+					var expectedMemory []byte
+					expectedMemory = arch.ByteOrderWord.AppendWord(expectedMemory, preexistingMemoryVal)
 					copy(expectedMemory[alignment:], preimageData[preimageOffset:preimageOffset+writeLen])
 					expected.ExpectMemoryWriteWord(effAddr, arch.ByteOrderWord.Word(expectedMemory[:]))
 				}
@@ -288,11 +342,20 @@ func FuzzStatePreimageRead(f *testing.F) {
 	})
 }
 
-func FuzzStateHintWrite(f *testing.F) {
+func FuzzStateHintWrite32(f *testing.F) {
+	doFuzzStateHintWrite(f)
+}
+
+func FuzzStateHintWrite64(f *testing.F) {
+	doFuzzStateHintWrite(f)
+}
+
+func doFuzzStateHintWrite(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr Word, count Word, hint1, hint2, hint3 []byte, randSeed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				// Make sure pc does not overlap with hint data in memory
 				pc := Word(0)
 				if addr <= 8 {
@@ -370,11 +433,20 @@ func FuzzStateHintWrite(f *testing.F) {
 	})
 }
 
-func FuzzStatePreimageWrite(f *testing.F) {
+func FuzzStatePreimageWrite32(f *testing.F) {
+	doFuzzStatePreimageWrite(f)
+}
+
+func FuzzStatePreimageWrite64(f *testing.F) {
+	doFuzzStatePreimageWrite(f)
+}
+
+func doFuzzStatePreimageWrite(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr arch.Word, count arch.Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
+				testutil.TemporarilySkip64BitTests(t)
 				// Make sure pc does not overlap with preimage data in memory
 				pc := Word(0)
 				if addr <= 8 {
diff --git a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
index 49f45a4a5f2c..9d4bb46a4271 100644
--- a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
@@ -13,9 +13,18 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
-func FuzzStateSyscallCloneMT(f *testing.F) {
+func FuzzStateSyscallCloneMT32(f *testing.F) {
+	doFuzzStateSyscallCloneMT(f)
+}
+
+func FuzzStateSyscallCloneMT64(f *testing.F) {
+	doFuzzStateSyscallCloneMT(f)
+}
+
+func doFuzzStateSyscallCloneMT(f *testing.F) {
 	v := GetMultiThreadedTestCase(f)
 	f.Fuzz(func(t *testing.T, nextThreadId, stackPtr Word, seed int64) {
+		testutil.TemporarilySkip64BitTests(t)
 		goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(seed))
 		state := mttestutil.GetMtState(t, goVm)
 		// Update existing threads to avoid collision with nextThreadId
diff --git a/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go b/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go
index 4c6542269a72..375e1fec1832 100644
--- a/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_singlethreaded_test.go
@@ -1,10 +1,12 @@
+//go:build !cannon64
+// +build !cannon64
+
 package tests
 
 import (
 	"os"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
@@ -32,11 +34,6 @@ func FuzzStateSyscallCloneST(f *testing.F) {
 		require.False(t, stepWitness.HasPreimage())
 
 		expected.Validate(t, state)
-
-		evm := testutil.NewMIPSEVM(v.Contracts)
-		evmPost := evm.Step(t, stepWitness, step, v.StateHashFn)
-		goPost, _ := goVm.GetState().EncodeWitness()
-		require.Equal(t, hexutil.Bytes(goPost).String(), hexutil.Bytes(evmPost).String(),
-			"mipsevm produced different state than EVM")
+		testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
 	})
 }
diff --git a/cannon/mipsevm/testutil/mips.go b/cannon/mipsevm/testutil/mips.go
index 9ba37cb30e2a..0d5322c6fb6e 100644
--- a/cannon/mipsevm/testutil/mips.go
+++ b/cannon/mipsevm/testutil/mips.go
@@ -40,7 +40,7 @@ type MIPSEVM struct {
 	lastPreimageOracleInput []byte
 }
 
-func NewMIPSEVM(contracts *ContractMetadata, opts ...evmOption) *MIPSEVM {
+func newMIPSEVM(contracts *ContractMetadata, opts ...evmOption) *MIPSEVM {
 	env, evmState := NewEVMEnv(contracts)
 	sender := vm.AccountRef{0x13, 0x37}
 	startingGas := uint64(maxStepGas)
@@ -65,6 +65,12 @@ func WithTracingHooks(tracer *tracing.Hooks) evmOption {
 	}
 }
 
+func WithLocalOracle(oracle mipsevm.PreimageOracle) evmOption {
+	return func(evm *MIPSEVM) {
+		evm.SetLocalOracle(oracle)
+	}
+}
+
 func (m *MIPSEVM) SetTracer(tracer *tracing.Hooks) {
 	m.env.Config.Tracer = tracer
 }
@@ -192,17 +198,35 @@ func LogStepFailureAtCleanup(t *testing.T, mipsEvm *MIPSEVM) {
 	})
 }
 
-// ValidateEVM runs a single evm step and validates against an FPVM poststate
-func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, goVm mipsevm.FPVM, hashFn mipsevm.HashFn, contracts *ContractMetadata, opts ...evmOption) {
-	evm := NewMIPSEVM(contracts, opts...)
+type EvmValidator struct {
+	evm    *MIPSEVM
+	hashFn mipsevm.HashFn
+}
+
+// NewEvmValidator creates a validator that can be run repeatedly across multiple steps
+func NewEvmValidator(t *testing.T, hashFn mipsevm.HashFn, contracts *ContractMetadata, opts ...evmOption) *EvmValidator {
+	evm := newMIPSEVM(contracts, opts...)
 	LogStepFailureAtCleanup(t, evm)
 
-	evmPost := evm.Step(t, stepWitness, step, hashFn)
+	return &EvmValidator{
+		evm:    evm,
+		hashFn: hashFn,
+	}
+}
+
+func (v *EvmValidator) ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, goVm mipsevm.FPVM) {
+	evmPost := v.evm.Step(t, stepWitness, step, v.hashFn)
 	goPost, _ := goVm.GetState().EncodeWitness()
 	require.Equal(t, hexutil.Bytes(goPost).String(), hexutil.Bytes(evmPost).String(),
 		"mipsevm produced different state than EVM")
 }
 
+// ValidateEVM runs a single evm step and validates against an FPVM poststate
+func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, goVm mipsevm.FPVM, hashFn mipsevm.HashFn, contracts *ContractMetadata, opts ...evmOption) {
+	validator := NewEvmValidator(t, hashFn, contracts)
+	validator.ValidateEVM(t, stepWitness, step, goVm)
+}
+
 type ErrMatcher func(*testing.T, []byte)
 
 func CreateNoopErrorMatcher() ErrMatcher {
@@ -250,7 +274,7 @@ func AssertEVMReverts(t *testing.T, state mipsevm.FPVMState, contracts *Contract
 }
 
 func AssertPreimageOracleReverts(t *testing.T, preimageKey [32]byte, preimageValue []byte, preimageOffset arch.Word, contracts *ContractMetadata, opts ...evmOption) {
-	evm := NewMIPSEVM(contracts, opts...)
+	evm := newMIPSEVM(contracts, opts...)
 	LogStepFailureAtCleanup(t, evm)
 
 	evm.assertPreimageOracleReverts(t, preimageKey, preimageValue, preimageOffset)
diff --git a/cannon/mipsevm/testutil/vmtests.go b/cannon/mipsevm/testutil/vmtests.go
index 333720a4ec02..b16550e446c7 100644
--- a/cannon/mipsevm/testutil/vmtests.go
+++ b/cannon/mipsevm/testutil/vmtests.go
@@ -141,3 +141,10 @@ func RunVMTest_Claim[T mipsevm.FPVMState](t *testing.T, initState program.Create
 	require.Equal(t, expectedStdOut, stdOutBuf.String(), "stdout")
 	require.Equal(t, expectedStdErr, stdErrBuf.String(), "stderr")
 }
+
+func TemporarilySkip64BitTests(t *testing.T) {
+	if !arch.IsMips32 {
+		// TODO(#12598) Update and enable these tests
+		t.Skip("Skipping 64-bit test")
+	}
+}
diff --git a/cannon/mipsevm/versions/state64_test.go b/cannon/mipsevm/versions/state64_test.go
new file mode 100644
index 000000000000..ddffd7e618a5
--- /dev/null
+++ b/cannon/mipsevm/versions/state64_test.go
@@ -0,0 +1,64 @@
+//go:build cannon64
+// +build cannon64
+
+package versions
+
+import (
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
+	"github.com/ethereum-optimism/optimism/op-service/serialize"
+)
+
+func TestNewFromState(t *testing.T) {
+	t.Run("multithreaded64", func(t *testing.T) {
+		actual, err := NewFromState(multithreaded.CreateEmptyState())
+		require.NoError(t, err)
+		require.IsType(t, &multithreaded.State{}, actual.FPVMState)
+		require.Equal(t, VersionMultiThreaded64, actual.Version)
+	})
+}
+
+func TestLoadStateFromFile(t *testing.T) {
+	t.Run("Multithreaded64FromBinary", func(t *testing.T) {
+		expected, err := NewFromState(multithreaded.CreateEmptyState())
+		require.NoError(t, err)
+
+		path := writeToFile(t, "state.bin.gz", expected)
+		actual, err := LoadStateFromFile(path)
+		require.NoError(t, err)
+		require.Equal(t, expected, actual)
+	})
+}
+
+func TestVersionsOtherThanZeroDoNotSupportJSON(t *testing.T) {
+	tests := []struct {
+		version     StateVersion
+		createState func() mipsevm.FPVMState
+	}{
+		{VersionMultiThreaded64, func() mipsevm.FPVMState { return multithreaded.CreateEmptyState() }},
+	}
+	for _, test := range tests {
+		test := test
+		t.Run(test.version.String(), func(t *testing.T) {
+			state, err := NewFromState(test.createState())
+			require.NoError(t, err)
+
+			dir := t.TempDir()
+			path := filepath.Join(dir, "test.json")
+			err = serialize.Write(path, state, 0o644)
+			require.ErrorIs(t, err, ErrJsonNotSupported)
+		})
+	}
+}
+
+func writeToFile(t *testing.T, filename string, data serialize.Serializable) string {
+	dir := t.TempDir()
+	path := filepath.Join(dir, filename)
+	require.NoError(t, serialize.Write(path, data, 0o644))
+	return path
+}
diff --git a/cannon/mipsevm/versions/state_test.go b/cannon/mipsevm/versions/state_test.go
index c9bcc7e6f165..cf8eed639af9 100644
--- a/cannon/mipsevm/versions/state_test.go
+++ b/cannon/mipsevm/versions/state_test.go
@@ -1,14 +1,18 @@
+//go:build !cannon64
+// +build !cannon64
+
 package versions
 
 import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/singlethreaded"
 	"github.com/ethereum-optimism/optimism/op-service/serialize"
-	"github.com/stretchr/testify/require"
 )
 
 func TestNewFromState(t *testing.T) {
@@ -49,10 +53,6 @@ func TestLoadStateFromFile(t *testing.T) {
 	})
 }
 
-func TestLoadStateFromFile64(t *testing.T) {
-	t.Skip("TODO(#12205): Test asserting that cannon64 fails to decode a 32-bit state")
-}
-
 func TestVersionsOtherThanZeroDoNotSupportJSON(t *testing.T) {
 	tests := []struct {
 		version     StateVersion

From 08cf004ffcc16135c0fff7838d4cadfbae8e4958 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 12:53:44 +0700
Subject: [PATCH 097/451] dependabot(gomod): bump
 github.com/multiformats/go-multiaddr (#12762)

Bumps [github.com/multiformats/go-multiaddr](https://github.com/multiformats/go-multiaddr) from 0.13.0 to 0.14.0.
- [Release notes](https://github.com/multiformats/go-multiaddr/releases)
- [Commits](https://github.com/multiformats/go-multiaddr/compare/v0.13.0...v0.14.0)

---
updated-dependencies:
- dependency-name: github.com/multiformats/go-multiaddr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 3ff8ebb344ed..ec589c842052 100644
--- a/go.mod
+++ b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/mattn/go-isatty v0.0.20
 	github.com/minio/minio-go/v7 v7.0.80
 	github.com/multiformats/go-base32 v0.1.0
-	github.com/multiformats/go-multiaddr v0.13.0
+	github.com/multiformats/go-multiaddr v0.14.0
 	github.com/multiformats/go-multiaddr-dns v0.4.0
 	github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
 	github.com/olekukonko/tablewriter v0.0.5
diff --git a/go.sum b/go.sum
index 616fb9b7d453..3e2239b81bba 100644
--- a/go.sum
+++ b/go.sum
@@ -549,8 +549,8 @@ github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYg
 github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0=
 github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
 github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
-github.com/multiformats/go-multiaddr v0.13.0 h1:BCBzs61E3AGHcYYTv8dqRH43ZfyrqM8RXVPT8t13tLQ=
-github.com/multiformats/go-multiaddr v0.13.0/go.mod h1:sBXrNzucqkFJhvKOiwwLyqamGa/P5EIXNPLovyhQCII=
+github.com/multiformats/go-multiaddr v0.14.0 h1:bfrHrJhrRuh/NXH5mCnemjpbGjzRw/b+tJFOD41g2tU=
+github.com/multiformats/go-multiaddr v0.14.0/go.mod h1:6EkVAxtznq2yC3QT5CM1UTAwG0GTP3EWAIcjHuzQ+r4=
 github.com/multiformats/go-multiaddr-dns v0.4.0 h1:P76EJ3qzBXpUXZ3twdCDx/kvagMsNo0LMFXpyms/zgU=
 github.com/multiformats/go-multiaddr-dns v0.4.0/go.mod h1:7hfthtB4E4pQwirrz+J0CcDUfbWzTqEzVyYKKIKpgkc=
 github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=

From 33a03313fcdec0de79f60949d830c37c36b79c7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:23:24 +0700
Subject: [PATCH 098/451] dependabot(gomod): bump github.com/fsnotify/fsnotify
 from 1.7.0 to 1.8.0 (#12761)

Bumps [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/fsnotify/fsnotify/releases)
- [Changelog](https://github.com/fsnotify/fsnotify/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fsnotify/fsnotify/compare/v1.7.0...v1.8.0)

---
updated-dependencies:
- dependency-name: github.com/fsnotify/fsnotify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index ec589c842052..3f61278e07c2 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
 	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac
 	github.com/ethereum/go-ethereum v1.14.11
-	github.com/fsnotify/fsnotify v1.7.0
+	github.com/fsnotify/fsnotify v1.8.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gofuzz v1.2.1-0.20220503160820-4a35382e8fc8
diff --git a/go.sum b/go.sum
index 3e2239b81bba..9794a2c370f4 100644
--- a/go.sum
+++ b/go.sum
@@ -213,8 +213,8 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays=
 github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=

From dead005d9029327ad92c9fc871b0bf2a0398e3ef Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 1 Nov 2024 15:42:38 +0700
Subject: [PATCH 099/451] op-supervisor: improve logging, add update signals to
 trigger worker routines (#12770)

---
 op-supervisor/supervisor/backend/backend.go   | 51 ++++++++++++++++---
 .../supervisor/backend/cross/worker.go        |  5 +-
 .../supervisor/backend/cross/worker_test.go   |  2 +-
 op-supervisor/supervisor/backend/db/update.go | 13 +++--
 .../backend/processors/chain_processor.go     | 13 +++--
 5 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index cd824bfa6d31..37596c5d8b6b 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -117,13 +117,6 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 		}
 	}
 
-	// for each chain initialize a chain processor service
-	for _, chainID := range chains {
-		logProcessor := processors.NewLogProcessor(chainID, su.chainDBs)
-		chainProcessor := processors.NewChainProcessor(su.logger, chainID, logProcessor, su.chainDBs)
-		su.chainProcessors[chainID] = chainProcessor
-	}
-
 	// initialize all cross-unsafe processors
 	for _, chainID := range chains {
 		worker := cross.NewCrossUnsafeWorker(su.logger, chainID, su.chainDBs)
@@ -134,6 +127,13 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 		worker := cross.NewCrossSafeWorker(su.logger, chainID, su.chainDBs)
 		su.crossSafeProcessors[chainID] = worker
 	}
+	// For each chain initialize a chain processor service,
+	// after cross-unsafe workers are ready to receive updates
+	for _, chainID := range chains {
+		logProcessor := processors.NewLogProcessor(chainID, su.chainDBs)
+		chainProcessor := processors.NewChainProcessor(su.logger, chainID, logProcessor, su.chainDBs, su.onIndexedLocalUnsafeData)
+		su.chainProcessors[chainID] = chainProcessor
+	}
 
 	// the config has some RPC connections to attach to the chain-processors
 	for _, rpc := range cfg.L2RPCs {
@@ -145,6 +145,36 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 	return nil
 }
 
+// onIndexedLocalUnsafeData is called by the event indexing workers.
+// This signals to cross-unsafe workers that there's data to index.
+func (su *SupervisorBackend) onIndexedLocalUnsafeData() {
+	su.mu.RLock()
+	defer su.mu.RUnlock()
+
+	// We signal all workers, since dependencies on a chain may be unblocked
+	// by new data on other chains.
+	// Busy workers don't block processing.
+	// The signal is picked up only if the worker is running in the background.
+	for _, w := range su.crossUnsafeProcessors {
+		w.OnNewData()
+	}
+}
+
+// onNewLocalSafeData is called by the safety-indexing.
+// This signals to cross-safe workers that there's data to index.
+func (su *SupervisorBackend) onNewLocalSafeData() {
+	su.mu.RLock()
+	defer su.mu.RUnlock()
+
+	// We signal all workers, since dependencies on a chain may be unblocked
+	// by new data on other chains.
+	// Busy workers don't block processing.
+	// The signal is picked up only if the worker is running in the background.
+	for _, w := range su.crossSafeProcessors {
+		w.OnNewData()
+	}
+}
+
 // openChainDBs initializes all the DB resources of a specific chain.
 // It is a sub-task of initResources.
 func (su *SupervisorBackend) openChainDBs(chainID types.ChainID) error {
@@ -443,7 +473,12 @@ func (su *SupervisorBackend) UpdateLocalSafe(ctx context.Context, chainID types.
 	su.mu.RLock()
 	defer su.mu.RUnlock()
 
-	return su.chainDBs.UpdateLocalSafe(chainID, derivedFrom, lastDerived)
+	err := su.chainDBs.UpdateLocalSafe(chainID, derivedFrom, lastDerived)
+	if err != nil {
+		return err
+	}
+	su.onNewLocalSafeData()
+	return nil
 }
 
 func (su *SupervisorBackend) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error {
diff --git a/op-supervisor/supervisor/backend/cross/worker.go b/op-supervisor/supervisor/backend/cross/worker.go
index b80c78442c6b..a555a5f11b13 100644
--- a/op-supervisor/supervisor/backend/cross/worker.go
+++ b/op-supervisor/supervisor/backend/cross/worker.go
@@ -71,7 +71,7 @@ func (s *Worker) worker() {
 				return
 			}
 			if errors.Is(err, types.ErrFuture) {
-				s.log.Debug("Failed to process work", "err", err)
+				s.log.Debug("Worker awaits more data", "err", err)
 			} else {
 				s.log.Warn("Failed to process work", "err", err)
 			}
@@ -92,14 +92,13 @@ func (s *Worker) worker() {
 	}
 }
 
-func (s *Worker) OnNewData() error {
+func (s *Worker) OnNewData() {
 	// signal that we have something to process
 	select {
 	case s.poke <- struct{}{}:
 	default:
 		// already requested an update
 	}
-	return nil
 }
 
 func (s *Worker) Close() {
diff --git a/op-supervisor/supervisor/backend/cross/worker_test.go b/op-supervisor/supervisor/backend/cross/worker_test.go
index 64f4d2d8d12f..03fda620350b 100644
--- a/op-supervisor/supervisor/backend/cross/worker_test.go
+++ b/op-supervisor/supervisor/backend/cross/worker_test.go
@@ -55,7 +55,7 @@ func TestWorker(t *testing.T) {
 			return count == 1
 		}, 2*time.Second, 100*time.Millisecond)
 		// when OnNewData is called, the worker runs again
-		require.NoError(t, w.OnNewData())
+		w.OnNewData()
 		require.Eventually(t, func() bool {
 			return count == 2
 		}, 2*time.Second, 100*time.Millisecond)
diff --git a/op-supervisor/supervisor/backend/db/update.go b/op-supervisor/supervisor/backend/db/update.go
index 932b19875575..7ae7fde58a8b 100644
--- a/op-supervisor/supervisor/backend/db/update.go
+++ b/op-supervisor/supervisor/backend/db/update.go
@@ -27,11 +27,11 @@ func (db *ChainsDB) SealBlock(chain types.ChainID, block eth.BlockRef) error {
 	if !ok {
 		return fmt.Errorf("cannot SealBlock: %w: %v", types.ErrUnknownChain, chain)
 	}
-	db.logger.Debug("Updating local unsafe", "chain", chain, "block", block)
 	err := logDB.SealBlock(block.ParentHash, block.ID(), block.Time)
 	if err != nil {
 		return fmt.Errorf("failed to seal block %v: %w", block, err)
 	}
+	db.logger.Info("Updated local unsafe", "chain", chain, "block", block)
 	return nil
 }
 
@@ -57,8 +57,8 @@ func (db *ChainsDB) UpdateCrossUnsafe(chain types.ChainID, crossUnsafe types.Blo
 	if !ok {
 		return fmt.Errorf("cannot UpdateCrossUnsafe: %w: %s", types.ErrUnknownChain, chain)
 	}
-	db.logger.Debug("Updating cross unsafe", "chain", chain, "crossUnsafe", crossUnsafe)
 	v.Set(crossUnsafe)
+	db.logger.Info("Updated cross-unsafe", "chain", chain, "crossUnsafe", crossUnsafe)
 	return nil
 }
 
@@ -67,8 +67,11 @@ func (db *ChainsDB) UpdateCrossSafe(chain types.ChainID, l1View eth.BlockRef, la
 	if !ok {
 		return fmt.Errorf("cannot UpdateCrossSafe: %w: %s", types.ErrUnknownChain, chain)
 	}
-	db.logger.Debug("Updating cross safe", "chain", chain, "l1View", l1View, "lastCrossDerived", lastCrossDerived)
-	return crossDB.AddDerived(l1View, lastCrossDerived)
+	if err := crossDB.AddDerived(l1View, lastCrossDerived); err != nil {
+		return err
+	}
+	db.logger.Info("Updated cross-safe", "chain", chain, "l1View", l1View, "lastCrossDerived", lastCrossDerived)
+	return nil
 }
 
 func (db *ChainsDB) UpdateFinalizedL1(finalized eth.BlockRef) error {
@@ -79,7 +82,7 @@ func (db *ChainsDB) UpdateFinalizedL1(finalized eth.BlockRef) error {
 	if v := db.finalizedL1.Value; v.Number > finalized.Number {
 		return fmt.Errorf("cannot rewind finalized L1 head from %s to %s", v, finalized)
 	}
-	db.logger.Debug("Updating finalized L1", "finalizedL1", finalized)
 	db.finalizedL1.Value = finalized
+	db.logger.Info("Updated finalized L1", "finalizedL1", finalized)
 	return nil
 }
diff --git a/op-supervisor/supervisor/backend/processors/chain_processor.go b/op-supervisor/supervisor/backend/processors/chain_processor.go
index 7f4687086030..688f68ac6119 100644
--- a/op-supervisor/supervisor/backend/processors/chain_processor.go
+++ b/op-supervisor/supervisor/backend/processors/chain_processor.go
@@ -55,8 +55,8 @@ type ChainProcessor struct {
 	// channel with capacity of 1, full if there is work to do
 	newHead chan struct{}
 
-	// channel with capacity of 1, to signal work complete if running in synchroneous mode
-	out chan struct{}
+	// to signal to the other services that new indexed data is available
+	onIndexed func()
 
 	// lifetime management of the chain processor
 	ctx    context.Context
@@ -64,7 +64,7 @@ type ChainProcessor struct {
 	wg     sync.WaitGroup
 }
 
-func NewChainProcessor(log log.Logger, chain types.ChainID, processor LogProcessor, rewinder DatabaseRewinder) *ChainProcessor {
+func NewChainProcessor(log log.Logger, chain types.ChainID, processor LogProcessor, rewinder DatabaseRewinder, onIndexed func()) *ChainProcessor {
 	ctx, cancel := context.WithCancel(context.Background())
 	out := &ChainProcessor{
 		log:       log.New("chain", chain),
@@ -73,7 +73,7 @@ func NewChainProcessor(log log.Logger, chain types.ChainID, processor LogProcess
 		processor: processor,
 		rewinder:  rewinder,
 		newHead:   make(chan struct{}, 1),
-		out:       make(chan struct{}, 1),
+		onIndexed: onIndexed,
 		ctx:       ctx,
 		cancel:    cancel,
 	}
@@ -134,7 +134,7 @@ func (s *ChainProcessor) work() {
 		target := s.nextNum()
 		if err := s.update(target); err != nil {
 			if errors.Is(err, ethereum.NotFound) {
-				s.log.Info("Cannot find next block yet", "target", target, "err", err)
+				s.log.Debug("Event-indexer cannot find next block yet", "target", target, "err", err)
 			} else if errors.Is(err, types.ErrNoRPCSource) {
 				s.log.Warn("No RPC source configured, cannot process new blocks")
 			} else {
@@ -192,7 +192,10 @@ func (s *ChainProcessor) update(nextNum uint64) error {
 			// If no logs were written successfully then the rewind wouldn't have done anything anyway.
 			s.log.Error("Failed to rewind after error processing block", "block", next, "err", err)
 		}
+		return err
 	}
+	s.log.Info("Indexed block events", "block", next, "txs", len(receipts))
+	s.onIndexed()
 	return nil
 }
 

From 3d03f5f731c6c3a2dae6b74397ae392910de1f8b Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Fri, 1 Nov 2024 05:35:58 -0400
Subject: [PATCH 100/451] feat: log diff in interfaces check (#12757)

---
 packages/contracts-bedrock/scripts/checks/interfaces/main.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/contracts-bedrock/scripts/checks/interfaces/main.go b/packages/contracts-bedrock/scripts/checks/interfaces/main.go
index 5d62a2e3b4ff..8bdbf79514e2 100644
--- a/packages/contracts-bedrock/scripts/checks/interfaces/main.go
+++ b/packages/contracts-bedrock/scripts/checks/interfaces/main.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -301,6 +302,7 @@ func compareABIs(abi1, abi2 json.RawMessage) (bool, error) {
 	// Compare using go-cmp
 	diff := cmp.Diff(data1, data2)
 	if diff != "" {
+		log.Printf("ABI diff: %s", diff)
 		return false, nil
 	}
 	return true, nil

From 15c50ee9a7621eae532d8c797964cf884bfea54b Mon Sep 17 00:00:00 2001
From: Tyler Smith <mail@tcry.pt>
Date: Fri, 1 Nov 2024 17:10:25 +0700
Subject: [PATCH 101/451] refactor: Move interop e2e test contracts to
 e2eutils/interop. (#12772)

* refactor: Move interop e2e test contracts to e2eutils/interop.

* refactor: Move interop e2e test contracts to e2eutils/interop/contracts.
---
 .../interop/contracts/bindings/emit/emit.go           |  0
 .../interop/contracts/bindings/inbox/inbox.go         |  0
 .../contracts/bindings/systemconfig/systemconfig.go   |  0
 .../build/ICrossL2Inbox.sol/ICrossL2Inbox.abi         |  0
 .../build/ICrossL2Inbox.sol/ICrossL2Inbox.bin         |  0
 .../build/ICrossL2Inbox.sol/ICrossL2Inbox.json        |  0
 .../build/ISystemConfig.sol/ISystemConfig.abi         |  0
 .../build/ISystemConfig.sol/ISystemConfig.bin         |  0
 .../build/ISystemConfig.sol/ISystemConfig.json        |  0
 .../interop/contracts/build/emit.sol/EmitEvent.abi    |  0
 .../interop/contracts/build/emit.sol/EmitEvent.bin    |  0
 .../interop/contracts/build/emit.sol/EmitEvent.json   |  0
 op-e2e/{ => e2eutils}/interop/contracts/foundry.toml  |  0
 op-e2e/{ => e2eutils}/interop/contracts/generate.sh   |  0
 .../interop/contracts/src/ICrossL2Inbox.sol           |  0
 .../interop/contracts/src/ISystemConfig.sol           |  0
 op-e2e/{ => e2eutils}/interop/contracts/src/emit.sol  |  0
 .../contracts/test-artifacts/emit.sol/EmitEvent.abi   |  0
 .../contracts/test-artifacts/emit.sol/EmitEvent.bin   |  0
 .../contracts/test-artifacts/emit.sol/EmitEvent.json  |  0
 op-e2e/interop/supersystem.go                         | 11 ++++++-----
 21 files changed, 6 insertions(+), 5 deletions(-)
 rename op-e2e/{ => e2eutils}/interop/contracts/bindings/emit/emit.go (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/bindings/inbox/inbox.go (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/bindings/systemconfig/systemconfig.go (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/emit.sol/EmitEvent.abi (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/emit.sol/EmitEvent.bin (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/build/emit.sol/EmitEvent.json (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/foundry.toml (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/generate.sh (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/src/ICrossL2Inbox.sol (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/src/ISystemConfig.sol (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/src/emit.sol (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/test-artifacts/emit.sol/EmitEvent.abi (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/test-artifacts/emit.sol/EmitEvent.bin (100%)
 rename op-e2e/{ => e2eutils}/interop/contracts/test-artifacts/emit.sol/EmitEvent.json (100%)

diff --git a/op-e2e/interop/contracts/bindings/emit/emit.go b/op-e2e/e2eutils/interop/contracts/bindings/emit/emit.go
similarity index 100%
rename from op-e2e/interop/contracts/bindings/emit/emit.go
rename to op-e2e/e2eutils/interop/contracts/bindings/emit/emit.go
diff --git a/op-e2e/interop/contracts/bindings/inbox/inbox.go b/op-e2e/e2eutils/interop/contracts/bindings/inbox/inbox.go
similarity index 100%
rename from op-e2e/interop/contracts/bindings/inbox/inbox.go
rename to op-e2e/e2eutils/interop/contracts/bindings/inbox/inbox.go
diff --git a/op-e2e/interop/contracts/bindings/systemconfig/systemconfig.go b/op-e2e/e2eutils/interop/contracts/bindings/systemconfig/systemconfig.go
similarity index 100%
rename from op-e2e/interop/contracts/bindings/systemconfig/systemconfig.go
rename to op-e2e/e2eutils/interop/contracts/bindings/systemconfig/systemconfig.go
diff --git a/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi b/op-e2e/e2eutils/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi
similarity index 100%
rename from op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi
rename to op-e2e/e2eutils/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.abi
diff --git a/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin b/op-e2e/e2eutils/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin
similarity index 100%
rename from op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin
rename to op-e2e/e2eutils/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.bin
diff --git a/op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json b/op-e2e/e2eutils/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json
similarity index 100%
rename from op-e2e/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json
rename to op-e2e/e2eutils/interop/contracts/build/ICrossL2Inbox.sol/ICrossL2Inbox.json
diff --git a/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi b/op-e2e/e2eutils/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi
similarity index 100%
rename from op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi
rename to op-e2e/e2eutils/interop/contracts/build/ISystemConfig.sol/ISystemConfig.abi
diff --git a/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin b/op-e2e/e2eutils/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin
similarity index 100%
rename from op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin
rename to op-e2e/e2eutils/interop/contracts/build/ISystemConfig.sol/ISystemConfig.bin
diff --git a/op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json b/op-e2e/e2eutils/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json
similarity index 100%
rename from op-e2e/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json
rename to op-e2e/e2eutils/interop/contracts/build/ISystemConfig.sol/ISystemConfig.json
diff --git a/op-e2e/interop/contracts/build/emit.sol/EmitEvent.abi b/op-e2e/e2eutils/interop/contracts/build/emit.sol/EmitEvent.abi
similarity index 100%
rename from op-e2e/interop/contracts/build/emit.sol/EmitEvent.abi
rename to op-e2e/e2eutils/interop/contracts/build/emit.sol/EmitEvent.abi
diff --git a/op-e2e/interop/contracts/build/emit.sol/EmitEvent.bin b/op-e2e/e2eutils/interop/contracts/build/emit.sol/EmitEvent.bin
similarity index 100%
rename from op-e2e/interop/contracts/build/emit.sol/EmitEvent.bin
rename to op-e2e/e2eutils/interop/contracts/build/emit.sol/EmitEvent.bin
diff --git a/op-e2e/interop/contracts/build/emit.sol/EmitEvent.json b/op-e2e/e2eutils/interop/contracts/build/emit.sol/EmitEvent.json
similarity index 100%
rename from op-e2e/interop/contracts/build/emit.sol/EmitEvent.json
rename to op-e2e/e2eutils/interop/contracts/build/emit.sol/EmitEvent.json
diff --git a/op-e2e/interop/contracts/foundry.toml b/op-e2e/e2eutils/interop/contracts/foundry.toml
similarity index 100%
rename from op-e2e/interop/contracts/foundry.toml
rename to op-e2e/e2eutils/interop/contracts/foundry.toml
diff --git a/op-e2e/interop/contracts/generate.sh b/op-e2e/e2eutils/interop/contracts/generate.sh
similarity index 100%
rename from op-e2e/interop/contracts/generate.sh
rename to op-e2e/e2eutils/interop/contracts/generate.sh
diff --git a/op-e2e/interop/contracts/src/ICrossL2Inbox.sol b/op-e2e/e2eutils/interop/contracts/src/ICrossL2Inbox.sol
similarity index 100%
rename from op-e2e/interop/contracts/src/ICrossL2Inbox.sol
rename to op-e2e/e2eutils/interop/contracts/src/ICrossL2Inbox.sol
diff --git a/op-e2e/interop/contracts/src/ISystemConfig.sol b/op-e2e/e2eutils/interop/contracts/src/ISystemConfig.sol
similarity index 100%
rename from op-e2e/interop/contracts/src/ISystemConfig.sol
rename to op-e2e/e2eutils/interop/contracts/src/ISystemConfig.sol
diff --git a/op-e2e/interop/contracts/src/emit.sol b/op-e2e/e2eutils/interop/contracts/src/emit.sol
similarity index 100%
rename from op-e2e/interop/contracts/src/emit.sol
rename to op-e2e/e2eutils/interop/contracts/src/emit.sol
diff --git a/op-e2e/interop/contracts/test-artifacts/emit.sol/EmitEvent.abi b/op-e2e/e2eutils/interop/contracts/test-artifacts/emit.sol/EmitEvent.abi
similarity index 100%
rename from op-e2e/interop/contracts/test-artifacts/emit.sol/EmitEvent.abi
rename to op-e2e/e2eutils/interop/contracts/test-artifacts/emit.sol/EmitEvent.abi
diff --git a/op-e2e/interop/contracts/test-artifacts/emit.sol/EmitEvent.bin b/op-e2e/e2eutils/interop/contracts/test-artifacts/emit.sol/EmitEvent.bin
similarity index 100%
rename from op-e2e/interop/contracts/test-artifacts/emit.sol/EmitEvent.bin
rename to op-e2e/e2eutils/interop/contracts/test-artifacts/emit.sol/EmitEvent.bin
diff --git a/op-e2e/interop/contracts/test-artifacts/emit.sol/EmitEvent.json b/op-e2e/e2eutils/interop/contracts/test-artifacts/emit.sol/EmitEvent.json
similarity index 100%
rename from op-e2e/interop/contracts/test-artifacts/emit.sol/EmitEvent.json
rename to op-e2e/e2eutils/interop/contracts/test-artifacts/emit.sol/EmitEvent.json
diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index 9f78c543bdcf..f18c7475073e 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -11,9 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
-	"github.com/ethereum-optimism/optimism/op-e2e/interop/contracts/bindings/systemconfig"
-	"github.com/ethereum-optimism/optimism/op-service/predeploys"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
 	gn "github.com/ethereum/go-ethereum/node"
 
@@ -28,6 +25,12 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rpc"
 
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/emit"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/inbox"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/systemconfig"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
+	"github.com/ethereum-optimism/optimism/op-service/predeploys"
+
 	bss "github.com/ethereum-optimism/optimism/op-batcher/batcher"
 	batcherFlags "github.com/ethereum-optimism/optimism/op-batcher/flags"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
@@ -39,8 +42,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/opnode"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/services"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/setuputils"
-	"github.com/ethereum-optimism/optimism/op-e2e/interop/contracts/bindings/emit"
-	"github.com/ethereum-optimism/optimism/op-e2e/interop/contracts/bindings/inbox"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/helpers"
 	"github.com/ethereum-optimism/optimism/op-node/node"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"

From 28da3f803d2650651ed3286e957b5e2e6eaa1e56 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 1 Nov 2024 18:22:54 +0700
Subject: [PATCH 102/451] interop-devnet: add grafana/loki/promtrail (#12773)

* interop-devnet: add grafana/loki/promtrail

Revival of PR https://github.com/ethereum-optimism/optimism/pull/11628
to enhance local interop devnet.

Co-authored-by: Ethen Pociask <ethenpo@gmail.com>
Co-authored-by: Samuel Laferriere <samlaf92@gmail.com>

* interop-devnet: use custom grafana port

* interop-devnet: fix ports

* interop-devnet: enable op-supervisor metrics

---------

Co-authored-by: Ethen Pociask <ethenpo@gmail.com>
Co-authored-by: Samuel Laferriere <samlaf92@gmail.com>
---
 interop-devnet/docker-compose.yml             |   43 +
 interop-devnet/justfile                       |    9 +-
 interop-devnet/monitoring/grafana.env         |    1 +
 .../op_stack_compose_dashboard.json           | 2203 +++++++++++++++++
 .../grafana/provisioning/dashboards/all.yml   |   11 +
 .../grafana/provisioning/datasources/all.yml  |   24 +
 interop-devnet/monitoring/loki/config.yaml    |   29 +
 .../monitoring/prometheus/prometheus.yml      |   43 +
 .../monitoring/promtail/config.yaml           |   32 +
 9 files changed, 2394 insertions(+), 1 deletion(-)
 create mode 100644 interop-devnet/monitoring/grafana.env
 create mode 100644 interop-devnet/monitoring/grafana/dashboards/op_stack_compose_dashboard.json
 create mode 100644 interop-devnet/monitoring/grafana/provisioning/dashboards/all.yml
 create mode 100644 interop-devnet/monitoring/grafana/provisioning/datasources/all.yml
 create mode 100644 interop-devnet/monitoring/loki/config.yaml
 create mode 100644 interop-devnet/monitoring/prometheus/prometheus.yml
 create mode 100644 interop-devnet/monitoring/promtail/config.yaml

diff --git a/interop-devnet/docker-compose.yml b/interop-devnet/docker-compose.yml
index 97ddcbda655f..de97c9967b64 100644
--- a/interop-devnet/docker-compose.yml
+++ b/interop-devnet/docker-compose.yml
@@ -94,6 +94,8 @@ services:
       --rpc.port=8545
       --rpc.enable-admin
       --l2-rpcs="ws://l2-a:8546,ws://l2-b:8546"
+    environment:
+      OP_SUPERVISOR_METRICS_ENABLED: "true"
 
   l2-a:
     depends_on:
@@ -352,3 +354,44 @@ services:
       # OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs
     env_file:
       - "${PWD}/../.devnet-interop/env/l2/900201/op-batcher.env"
+
+  grafana:
+    image: grafana/grafana:11.1.0
+    restart: unless-stopped
+    env_file:
+      - monitoring/grafana.env
+    volumes:
+      - ./monitoring/grafana/provisioning/:/etc/grafana/provisioning/:ro
+      - ./monitoring/grafana/dashboards:/var/lib/grafana/dashboards
+      # - grafana_data:/var/lib/grafana
+    ports:
+      - 3300:3000
+
+  prometheus:
+    image: prom/prometheus:latest
+    restart: unless-stopped
+    volumes:
+      - ./monitoring/prometheus:/etc/prometheus
+      # - prometheus_data:/prometheus
+    ports:
+      - 3090:9090
+    command: --config.file=/etc/prometheus/prometheus.yml --log.level=debug
+
+  loki:
+    image: grafana/loki:3.1.1
+    restart: unless-stopped
+    volumes:
+      - ./monitoring/loki:/etc/loki
+    ports:
+      - 3200:3200
+    command: -config.file=/etc/loki/config.yaml
+
+  promtail:
+    image: grafana/promtail:3.1.1
+    restart: unless-stopped
+    volumes:
+      # uncomment to scrape system logs
+      # - /var/log:/var/log
+      - ./monitoring/promtail:/etc/promtail
+      - /var/run/docker.sock:/var/run/docker.sock # Mount Docker socket to read container logs
+    command: -config.file=/etc/promtail/config.yaml
diff --git a/interop-devnet/justfile b/interop-devnet/justfile
index 7aa215dbbd7f..6af11ccc8fb8 100644
--- a/interop-devnet/justfile
+++ b/interop-devnet/justfile
@@ -20,14 +20,21 @@ devnet-down:
   # stops services, does not remove containers/networks
   docker compose stop
 
+devnet-metrics-up:
+  docker compose up -d prometheus grafana loki promtail
+
+devnet-metrics-down:
+  docker compose down -d prometheus grafana loki promtail
+
 devnet-clean:
-  rm -rf ../.devnet-interop
   # Stops services, and removes containers/networks
   docker compose down
   # Now manually clean up the related images and volumes
   # Note: `justfile` interprets the curly brackets. So we escape them, by wrapping it with more, as a string, like Jinja2.
   docker image ls 'interop-devnet*' --format='{{ '{{.Repository}}' }}' | xargs -r docker rmi
   docker volume ls --filter name=interop-devnet --format='{{ '{{.Name}}' }}' | xargs -r docker volume rm
+  # docker compose down needs the env files before being able to shut down, so remove the devnet config resources last
+  rm -rf ../.devnet-interop
 
 devnet-logs:
   docker compose logs -f
diff --git a/interop-devnet/monitoring/grafana.env b/interop-devnet/monitoring/grafana.env
new file mode 100644
index 000000000000..3a7446dfccfa
--- /dev/null
+++ b/interop-devnet/monitoring/grafana.env
@@ -0,0 +1 @@
+GF_SECURITY_ADMIN_PASSWORD=admin
diff --git a/interop-devnet/monitoring/grafana/dashboards/op_stack_compose_dashboard.json b/interop-devnet/monitoring/grafana/dashboards/op_stack_compose_dashboard.json
new file mode 100644
index 000000000000..c3d34c9d8a56
--- /dev/null
+++ b/interop-devnet/monitoring/grafana/dashboards/op_stack_compose_dashboard.json
@@ -0,0 +1,2203 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 31,
+      "panels": [],
+      "title": "Logs",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "loki-datasource"
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 24,
+        "x": 0,
+        "y": 1
+      },
+      "id": 24,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": false,
+        "sortOrder": "Descending",
+        "wrapLogMessage": false
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "loki-datasource"
+          },
+          "expr": "{container=\"ops-bedrock-op-batcher-1\"}",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Batcher Logs",
+      "type": "logs"
+    },
+    {
+      "datasource": {
+        "type": "loki",
+        "uid": "loki-datasource"
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 24,
+        "x": 0,
+        "y": 11
+      },
+      "id": 32,
+      "options": {
+        "dedupStrategy": "none",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": false,
+        "sortOrder": "Descending",
+        "wrapLogMessage": false
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki",
+            "uid": "loki-datasource"
+          },
+          "editorMode": "code",
+          "expr": "{container=\"ops-bedrock-op-proposer-1\"}",
+          "queryType": "range",
+          "refId": "A"
+        }
+      ],
+      "title": "Proposer Logs",
+      "type": "logs"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 21
+      },
+      "id": 14,
+      "panels": [],
+      "title": "Batcher",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 22
+      },
+      "id": 20,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_pending_blocks_count",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "pending_blocks_count {{stage}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Number of pending blocks, not added to a channel yet.",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 22
+      },
+      "id": 19,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_input_bytes",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "input {{stage}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_output_bytes",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "output",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
+        }
+      ],
+      "title": "Total number of input/output bytes per channel.",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 30
+      },
+      "id": 17,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_pending_blocks_bytes_total",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "op_batcher_default_pending_blocks_bytes_current",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
+        }
+      ],
+      "title": "Total size of transactions in pending blocks as they are fetched from L2",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 30
+      },
+      "id": 16,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_blocks_added_count",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Total number of blocks added to current channel.",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 38
+      },
+      "id": 18,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_channel_num_frames",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Total number of frames of closed channel.",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 12,
+        "x": 12,
+        "y": 38
+      },
+      "id": 25,
+      "interval": "2s",
+      "options": {
+        "displayMode": "basic",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "sizing": "auto",
+        "valueMode": "color"
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_blob_used_bytes_bucket",
+          "format": "heatmap",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": false,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
+        }
+      ],
+      "title": "Blob sizes",
+      "type": "bargauge"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 50
+      },
+      "id": 26,
+      "panels": [],
+      "title": "Batcher txmgr",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 51
+      },
+      "id": 21,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_txmgr_last_confirm_unix",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_txmgr_last_publish_unix",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
+        }
+      ],
+      "title": "Batcher Tx Publish/Confirm Times",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "description": "TODO: batcher_tx_total is 2x txs sent b/c of bug. See https://github.com/ethereum-optimism/optimism/pull/11438",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 51
+      },
+      "id": 15,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_batcher_tx_total",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_txmgr_confirm_total",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_txmgr_current_nonce",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "C",
+          "useBackend": false
+        }
+      ],
+      "title": "Batcher Txs",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 59
+      },
+      "id": 23,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_txmgr_pending_txs",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Batcher Pending Txs",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 59
+      },
+      "id": 22,
+      "interval": "2s",
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_txmgr_tx_confirmed_latency_ms",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{__name__}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Tx confirmation latency",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 67
+      },
+      "id": 6,
+      "panels": [],
+      "title": "Sequencer",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 0,
+        "y": 68
+      },
+      "id": 7,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_node_default_refs_number{type=\"l2_unsafe\", layer=\"l2\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "L2 Unsafe Block",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 5,
+        "y": 68
+      },
+      "id": 10,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_node_default_refs_number{type=\"l2_safe\", layer=\"l2\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "L2 Safe Block",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 10,
+        "y": 68
+      },
+      "id": 9,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_node_default_refs_number{type=\"l2_finalized\", layer=\"l2\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "L2 Finalized Block",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byFrameRefID",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Balance"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 9,
+        "x": 15,
+        "y": 68
+      },
+      "id": 13,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "hoverProximity": -46,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "rate(op_node_default_l1_reorg_depth_count[$__rate_interval])",
+          "fullMetaSearch": false,
+          "includeNullMetadata": false,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "L1 Reorg Count",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 0,
+        "y": 72
+      },
+      "id": 8,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_node_default_refs_number{type=\"l1_head\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "L1 Head",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 5,
+        "y": 72
+      },
+      "id": 11,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_node_default_refs_number{type=\"l1_safe\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "L1 Safe Block",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 10,
+        "y": 72
+      },
+      "id": 12,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_node_default_refs_number{type=\"l1_finalized\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "L1 Finalized Block",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 76
+      },
+      "id": 5,
+      "panels": [],
+      "title": "Balances",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "decimals": 4,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 0.5
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 24,
+        "x": 0,
+        "y": 77
+      },
+      "id": 3,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_balance",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Batcher Balance",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "decimals": 4,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              },
+              {
+                "color": "yellow",
+                "value": 1
+              },
+              {
+                "color": "green",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 24,
+        "x": 0,
+        "y": 80
+      },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "percentChangeColorMode": "standard",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "text": {
+          "valueSize": 54
+        },
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "11.1.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_proposer_default_balance",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Proposer Balance",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byFrameRefID",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Balance"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 83
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "hoverProximity": -46,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_batcher_default_balance",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Batcher Balance",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "ddshms3dlineoe"
+      },
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byFrameRefID",
+              "options": "A"
+            },
+            "properties": [
+              {
+                "id": "displayName",
+                "value": "Balance"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 83
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "ddshms3dlineoe"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "op_proposer_default_balance",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Proposer Balance",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "OP Stack Compose",
+  "uid": "ddshn0bgt86ioc",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/interop-devnet/monitoring/grafana/provisioning/dashboards/all.yml b/interop-devnet/monitoring/grafana/provisioning/dashboards/all.yml
new file mode 100644
index 000000000000..e281a1e592c8
--- /dev/null
+++ b/interop-devnet/monitoring/grafana/provisioning/dashboards/all.yml
@@ -0,0 +1,11 @@
+apiVersion: 1
+
+providers:
+  - name: 'default'
+    orgId: 1
+    folder: ''
+    type: file
+    disableDeletion: true
+    editable: true
+    options:
+      path: /var/lib/grafana/dashboards
diff --git a/interop-devnet/monitoring/grafana/provisioning/datasources/all.yml b/interop-devnet/monitoring/grafana/provisioning/datasources/all.yml
new file mode 100644
index 000000000000..8a97e63640d4
--- /dev/null
+++ b/interop-devnet/monitoring/grafana/provisioning/datasources/all.yml
@@ -0,0 +1,24 @@
+apiVersion: 1
+
+deleteDatasources:
+  - name: "Prometheus"
+
+datasources:
+  - access: "proxy"
+    editable: true
+    is_default: true
+    name: "Prometheus"
+    uid: "ddshms3dlineoe"
+    org_id: 1
+    type: "prometheus"
+    url: "http://prometheus:9090"
+    version: 1
+
+  - access: "proxy"
+    editable: true
+    name: "Loki"
+    uid: "loki-datasource"
+    org_id: 1
+    type: "loki"
+    url: "http://loki:3200"
+    version: 1
diff --git a/interop-devnet/monitoring/loki/config.yaml b/interop-devnet/monitoring/loki/config.yaml
new file mode 100644
index 000000000000..f5350cfc2444
--- /dev/null
+++ b/interop-devnet/monitoring/loki/config.yaml
@@ -0,0 +1,29 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3200
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: tsdb
+      object_store: filesystem
+      schema: v13
+      index:
+        prefix: index_
+        period: 24h
+
+analytics:
+  reporting_enabled: false
diff --git a/interop-devnet/monitoring/prometheus/prometheus.yml b/interop-devnet/monitoring/prometheus/prometheus.yml
new file mode 100644
index 000000000000..c2a7e6fe3a62
--- /dev/null
+++ b/interop-devnet/monitoring/prometheus/prometheus.yml
@@ -0,0 +1,43 @@
+global:
+  scrape_interval: 4s
+  evaluation_interval: 15s
+
+scrape_configs:
+  - job_name: "l1-geth"
+    static_configs:
+      - targets: ["l1:6060"]
+    metrics_path: /debug/metrics/prometheus
+
+  - job_name: "l2-a-geth"
+    static_configs:
+      - targets: ["l2-a:6060"]
+    metrics_path: /debug/metrics/prometheus
+  - job_name: "l2-b-geth"
+    static_configs:
+      - targets: ["l2-b:6060"]
+    metrics_path: /debug/metrics/prometheus
+
+  - job_name: "op-node-a"
+    static_configs:
+      - targets: ["op-node-a:7300"]
+  - job_name: "op-node-b"
+    static_configs:
+      - targets: ["op-node-b:7300"]
+
+  - job_name: "op-batcher-a"
+    static_configs:
+      - targets: ["op-batcher-a:7300"]
+  - job_name: "op-batcher-b"
+    static_configs:
+      - targets: ["op-batcher-b:7300"]
+
+  - job_name: "op-proposer-a"
+    static_configs:
+      - targets: ["op-proposer-a:7300"]
+  - job_name: "op-proposer-b"
+    static_configs:
+      - targets: ["op-proposer-b:7300"]
+
+  - job_name: "op-supervisor"
+    static_configs:
+      - targets: ["op-supervisor:7300"]
diff --git a/interop-devnet/monitoring/promtail/config.yaml b/interop-devnet/monitoring/promtail/config.yaml
new file mode 100644
index 000000000000..1f724873c2d0
--- /dev/null
+++ b/interop-devnet/monitoring/promtail/config.yaml
@@ -0,0 +1,32 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://loki:3200/loki/api/v1/push
+
+scrape_configs:
+  # Uncomment to scrape system logs
+  # - job_name: system
+  #   static_configs:
+  #     - targets:
+  #         - localhost
+  #       labels:
+  #         job: varlogs
+  #         __path__: /var/log/*log
+  # This scrapes docker container logs
+  # copied from https://stackoverflow.com/questions/74776432/with-promtail-how-do-i-only-keep-log-messages-for-specified-docker-containers
+  - job_name: docker
+    docker_sd_configs:
+      - host: unix:///var/run/docker.sock
+        filters:
+          - name: name
+            # Filter logging to just our containers
+            values: ["op-batcher-*", "op-proposer-*", "op-node-*", "op-supervisor-*"]
+    relabel_configs:
+      - source_labels: ["__meta_docker_container_name"]
+        regex: "/(.*)"
+        target_label: "container"

From cc22e24361e822182bb73f6cc0fcd69597c73557 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Fri, 1 Nov 2024 07:32:57 -0700
Subject: [PATCH 103/451] cannon: Avoid running expensive program tests in
 merge queue (#12779)

---
 cannon/mipsevm/tests/evm_common_test.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index 2aa1def61ca7..f61ee0850d51 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -875,6 +875,10 @@ func TestEVMFault(t *testing.T) {
 }
 
 func TestHelloEVM(t *testing.T) {
+	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
+		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
+	}
+
 	t.Parallel()
 	versions := GetMipsVersionTestCases(t)
 
@@ -918,6 +922,10 @@ func TestHelloEVM(t *testing.T) {
 }
 
 func TestClaimEVM(t *testing.T) {
+	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
+		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
+	}
+
 	t.Parallel()
 	versions := GetMipsVersionTestCases(t)
 
@@ -959,6 +967,10 @@ func TestClaimEVM(t *testing.T) {
 }
 
 func TestEntryEVM(t *testing.T) {
+	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
+		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
+	}
+
 	t.Parallel()
 	versions := GetMipsVersionTestCases(t)
 

From 1f8044e52101deadde766128f90ff23b4c7317f4 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 1 Nov 2024 22:07:57 +0700
Subject: [PATCH 104/451] op-supervisor: fix executing message decoding
 (#12782)

---
 .../backend/processors/contracts/l2inbox.go   | 118 ------------------
 .../processors/contracts/l2inbox_test.go      |  75 -----------
 .../backend/processors/executing_message.go   |  38 ++++++
 .../processors/executing_message_test.go      |  58 +++++++++
 .../backend/processors/log_processor.go       |  30 ++---
 .../backend/processors/log_processor_test.go  |  14 +--
 6 files changed, 110 insertions(+), 223 deletions(-)
 delete mode 100644 op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
 delete mode 100644 op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
 create mode 100644 op-supervisor/supervisor/backend/processors/executing_message.go
 create mode 100644 op-supervisor/supervisor/backend/processors/executing_message_test.go

diff --git a/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go b/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
deleted file mode 100644
index 3d0eb1a6b3b0..000000000000
--- a/op-supervisor/supervisor/backend/processors/contracts/l2inbox.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package contracts
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-
-	"github.com/ethereum-optimism/optimism/op-service/predeploys"
-	"github.com/ethereum-optimism/optimism/op-service/solabi"
-	"github.com/ethereum-optimism/optimism/op-service/sources/batching"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
-	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/snapshots"
-	"github.com/ethereum/go-ethereum/common"
-	ethTypes "github.com/ethereum/go-ethereum/core/types"
-)
-
-const (
-	eventExecutingMessage = "ExecutingMessage"
-)
-
-var (
-	ErrEventNotFound = errors.New("event not found")
-)
-
-type contractIdentifier struct {
-	// Origin represents the address that initiated the message
-	// it is used in combination with the MsgHash to uniquely identify a message
-	// and is hashed into the log hash, not stored directly.
-	Origin      common.Address
-	LogIndex    *big.Int
-	BlockNumber *big.Int
-	ChainId     *big.Int
-	Timestamp   *big.Int
-}
-
-type CrossL2Inbox struct {
-	contract *batching.BoundContract
-}
-
-func NewCrossL2Inbox() *CrossL2Inbox {
-	abi := snapshots.LoadCrossL2InboxABI()
-	return &CrossL2Inbox{
-		contract: batching.NewBoundContract(abi, predeploys.CrossL2InboxAddr),
-	}
-}
-
-func (i *CrossL2Inbox) DecodeExecutingMessageLog(l *ethTypes.Log) (types.ExecutingMessage, error) {
-	if l.Address != i.contract.Addr() {
-		return types.ExecutingMessage{}, fmt.Errorf("%w: log not from CrossL2Inbox", ErrEventNotFound)
-	}
-	// use DecodeEvent to check the name of the event
-	// but the actual decoding is done manually to extract the contract identifier
-	name, _, err := i.contract.DecodeEvent(l)
-	if errors.Is(err, batching.ErrUnknownEvent) {
-		return types.ExecutingMessage{}, fmt.Errorf("%w: %v", ErrEventNotFound, err.Error())
-	} else if err != nil {
-		return types.ExecutingMessage{}, fmt.Errorf("failed to decode event: %w", err)
-	}
-	if name != eventExecutingMessage {
-		return types.ExecutingMessage{}, fmt.Errorf("%w: event %v not an ExecutingMessage event", ErrEventNotFound, name)
-	}
-	// the second topic is the hash of the payload (the first is the event ID)
-	msgHash := l.Topics[1]
-	// the first 32 bytes of the data are the msgHash, so we skip them
-	identifierBytes := bytes.NewReader(l.Data[32:])
-	identifier, err := identifierFromBytes(identifierBytes)
-	if err != nil {
-		return types.ExecutingMessage{}, fmt.Errorf("failed to read contract identifier: %w", err)
-	}
-	chainID, err := types.ChainIDFromBig(identifier.ChainId).ToUInt32()
-	if err != nil {
-		return types.ExecutingMessage{}, fmt.Errorf("failed to convert chain ID %v to uint32: %w", identifier.ChainId, err)
-	}
-	hash := types.PayloadHashToLogHash(msgHash, identifier.Origin)
-	return types.ExecutingMessage{
-		Chain:     types.ChainIndex(chainID), // TODO(#11105): translate chain ID to chain index
-		Hash:      hash,
-		BlockNum:  identifier.BlockNumber.Uint64(),
-		LogIdx:    uint32(identifier.LogIndex.Uint64()),
-		Timestamp: identifier.Timestamp.Uint64(),
-	}, nil
-}
-
-// identifierFromBytes reads a contract identifier from a byte stream.
-// it follows the spec and matches the CrossL2Inbox.json definition,
-// rather than relying on reflection, as that can be error-prone regarding struct ordering
-func identifierFromBytes(identifierBytes io.Reader) (contractIdentifier, error) {
-	origin, err := solabi.ReadAddress(identifierBytes)
-	if err != nil {
-		return contractIdentifier{}, fmt.Errorf("failed to read origin address: %w", err)
-	}
-	originAddr := common.BytesToAddress(origin[:])
-	blockNumber, err := solabi.ReadUint256(identifierBytes)
-	if err != nil {
-		return contractIdentifier{}, fmt.Errorf("failed to read block number: %w", err)
-	}
-	logIndex, err := solabi.ReadUint256(identifierBytes)
-	if err != nil {
-		return contractIdentifier{}, fmt.Errorf("failed to read log index: %w", err)
-	}
-	timestamp, err := solabi.ReadUint256(identifierBytes)
-	if err != nil {
-		return contractIdentifier{}, fmt.Errorf("failed to read timestamp: %w", err)
-	}
-	chainID, err := solabi.ReadUint256(identifierBytes)
-	if err != nil {
-		return contractIdentifier{}, fmt.Errorf("failed to read chain ID: %w", err)
-	}
-	return contractIdentifier{
-		Origin:      originAddr,
-		BlockNumber: blockNumber,
-		LogIndex:    logIndex,
-		Timestamp:   timestamp,
-		ChainId:     chainID,
-	}, nil
-}
diff --git a/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go b/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
deleted file mode 100644
index b3973c61e30b..000000000000
--- a/op-supervisor/supervisor/backend/processors/contracts/l2inbox_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package contracts
-
-import (
-	"bytes"
-	"math/big"
-	"testing"
-
-	"github.com/ethereum-optimism/optimism/op-service/predeploys"
-	"github.com/ethereum-optimism/optimism/op-service/sources/batching"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
-	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/snapshots"
-	"github.com/ethereum/go-ethereum/common"
-	ethTypes "github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDecodeExecutingMessageEvent(t *testing.T) {
-	inbox := NewCrossL2Inbox()
-	payload := bytes.Repeat([]byte{0xaa, 0xbb}, 50)
-	payloadHash := crypto.Keccak256Hash(payload)
-	expected := types.ExecutingMessage{
-		Chain:     42424, // TODO(#11105): translate chain ID to chain index
-		BlockNum:  12345,
-		LogIdx:    98,
-		Timestamp: 9578295,
-	}
-	contractIdent := contractIdentifier{
-		Origin:      common.Address{0xbb, 0xcc},
-		ChainId:     new(big.Int).SetUint64(uint64(expected.Chain)), // TODO(#11105): translate chain ID to chain index
-		BlockNumber: new(big.Int).SetUint64(expected.BlockNum),
-		Timestamp:   new(big.Int).SetUint64(expected.Timestamp),
-		LogIndex:    new(big.Int).SetUint64(uint64(expected.LogIdx)),
-	}
-	expected.Hash = types.PayloadHashToLogHash(payloadHash, contractIdent.Origin)
-	abi := snapshots.LoadCrossL2InboxABI()
-	validData, err := abi.Events[eventExecutingMessage].Inputs.Pack(payloadHash, contractIdent)
-	require.NoError(t, err)
-	createValidLog := func() *ethTypes.Log {
-		//protoHack := bytes.Repeat([]byte{0x00}, 32*5)
-		return &ethTypes.Log{
-			Address: predeploys.CrossL2InboxAddr,
-			Topics:  []common.Hash{abi.Events[eventExecutingMessage].ID, payloadHash},
-			Data:    validData,
-		}
-	}
-
-	t.Run("ParseValid", func(t *testing.T) {
-		l := createValidLog()
-		result, err := inbox.DecodeExecutingMessageLog(l)
-		require.NoError(t, err)
-		require.Equal(t, expected, result)
-	})
-
-	t.Run("IgnoreIncorrectContract", func(t *testing.T) {
-		l := createValidLog()
-		l.Address = common.Address{0xff}
-		_, err := inbox.DecodeExecutingMessageLog(l)
-		require.ErrorIs(t, err, ErrEventNotFound)
-	})
-
-	t.Run("IgnoreWrongEvent", func(t *testing.T) {
-		l := createValidLog()
-		l.Topics[0] = common.Hash{0xbb}
-		_, err := inbox.DecodeExecutingMessageLog(l)
-		require.ErrorIs(t, err, ErrEventNotFound)
-	})
-
-	t.Run("ErrorOnInvalidEvent", func(t *testing.T) {
-		l := createValidLog()
-		l.Data = []byte{0xbb, 0xcc}
-		_, err := inbox.DecodeExecutingMessageLog(l)
-		require.ErrorIs(t, err, batching.ErrInvalidEvent)
-	})
-}
diff --git a/op-supervisor/supervisor/backend/processors/executing_message.go b/op-supervisor/supervisor/backend/processors/executing_message.go
new file mode 100644
index 000000000000..eedd8ce4b1e3
--- /dev/null
+++ b/op-supervisor/supervisor/backend/processors/executing_message.go
@@ -0,0 +1,38 @@
+package processors
+
+import (
+	"fmt"
+
+	ethTypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/types/interoptypes"
+	"github.com/ethereum/go-ethereum/params"
+
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+type EventDecoderFn func(*ethTypes.Log) (*types.ExecutingMessage, error)
+
+func DecodeExecutingMessageLog(l *ethTypes.Log) (*types.ExecutingMessage, error) {
+	if l.Address != params.InteropCrossL2InboxAddress {
+		return nil, nil
+	}
+	if len(l.Topics) != 2 { // topics: event-id and payload-hash
+		return nil, nil
+	}
+	if l.Topics[0] != interoptypes.ExecutingMessageEventTopic {
+		return nil, nil
+	}
+	var msg interoptypes.Message
+	if err := msg.DecodeEvent(l.Topics, l.Data); err != nil {
+		return nil, fmt.Errorf("invalid executing message: %w", err)
+	}
+	logHash := types.PayloadHashToLogHash(msg.PayloadHash, msg.Identifier.Origin)
+	return &types.ExecutingMessage{
+		// TODO(#11105): translate chain index to chain ID
+		Chain:     types.ChainIndex(msg.Identifier.ChainID.Uint64()),
+		BlockNum:  msg.Identifier.BlockNumber,
+		LogIdx:    msg.Identifier.LogIndex,
+		Timestamp: msg.Identifier.Timestamp,
+		Hash:      logHash,
+	}, nil
+}
diff --git a/op-supervisor/supervisor/backend/processors/executing_message_test.go b/op-supervisor/supervisor/backend/processors/executing_message_test.go
new file mode 100644
index 000000000000..6badeb201672
--- /dev/null
+++ b/op-supervisor/supervisor/backend/processors/executing_message_test.go
@@ -0,0 +1,58 @@
+package processors
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/common"
+	ethTypes "github.com/ethereum/go-ethereum/core/types"
+
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+func TestDecodeExecutingMessageLog(t *testing.T) {
+	data := `
+{
+  "address": "0x4200000000000000000000000000000000000022",
+  "topics": [
+    "0x5c37832d2e8d10e346e55ad62071a6a2f9fa5130614ef2ec6617555c6f467ba7",
+    "0xc3f57e1f0dd62a4f77787d834029bfeaab8894022c47edbe13b044fb658c9190"
+  ],
+  "data": "0x0000000000000000000000005fbdb2315678afecb367f032d93f642f64180aa3000000000000000000000000000000000000000000000000000000000000119d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006724d56300000000000000000000000000000000000000000000000000000000000dbc68",
+  "blockHash": "0x355b82e9db9105fe3e7b7ed1897878ecbba8be7f30f94aca9dc55b6296a624cf",
+  "blockNumber": "0x13a8",
+  "transactionHash": "0x6eb22bb67562ac6a8fdbf60d6227c0b1f3f9d1d15ead1b0de055358f4fb9fa69",
+  "transactionIndex": "0x2",
+  "logIndex": "0x0",
+  "removed": false
+}
+`
+	var logEvent ethTypes.Log
+	require.NoError(t, json.Unmarshal([]byte(data), &logEvent))
+
+	msg, err := DecodeExecutingMessageLog(&logEvent)
+	require.NoError(t, err)
+	require.NotNil(t, msg)
+
+	// struct Identifier {
+	//     address origin;
+	//     uint256 blockNumber;
+	//     uint256 logIndex;
+	//     uint256 timestamp;
+	//     uint256 chainId;
+	// }
+	// function executeMessage(Identifier calldata _id,
+	//     address _target, bytes calldata _message) external payable;
+
+	originAddr := common.HexToAddress("0x5fbdb2315678afecb367f032d93f642f64180aa3")
+	payloadHash := common.HexToHash("0xc3f57e1f0dd62a4f77787d834029bfeaab8894022c47edbe13b044fb658c9190")
+	logHash := types.PayloadHashToLogHash(payloadHash, originAddr)
+
+	require.Equal(t, logHash, msg.Hash)
+	require.Equal(t, uint64(4509), msg.BlockNum)
+	require.Equal(t, uint32(0), msg.LogIdx)
+	require.Equal(t, uint64(1730467171), msg.Timestamp)
+	require.Equal(t, types.ChainIndex(900200), msg.Chain)
+}
diff --git a/op-supervisor/supervisor/backend/processors/log_processor.go b/op-supervisor/supervisor/backend/processors/log_processor.go
index e8adb29ce6bf..2ca79c4d2f2f 100644
--- a/op-supervisor/supervisor/backend/processors/log_processor.go
+++ b/op-supervisor/supervisor/backend/processors/log_processor.go
@@ -2,7 +2,6 @@ package processors
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -10,7 +9,6 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/processors/contracts"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -24,21 +22,17 @@ type ChainsDBClientForLogProcessor interface {
 	AddLog(chain types.ChainID, logHash common.Hash, parentBlock eth.BlockID, logIdx uint32, execMsg *types.ExecutingMessage) error
 }
 
-type EventDecoder interface {
-	DecodeExecutingMessageLog(log *ethTypes.Log) (types.ExecutingMessage, error)
-}
-
 type logProcessor struct {
 	chain        types.ChainID
 	logStore     LogStorage
-	eventDecoder EventDecoder
+	eventDecoder EventDecoderFn
 }
 
 func NewLogProcessor(chain types.ChainID, logStore LogStorage) LogProcessor {
 	return &logProcessor{
 		chain:        chain,
 		logStore:     logStore,
-		eventDecoder: contracts.NewCrossL2Inbox(),
+		eventDecoder: DecodeExecutingMessageLog,
 	}
 }
 
@@ -49,19 +43,15 @@ func (p *logProcessor) ProcessLogs(_ context.Context, block eth.BlockRef, rcpts
 		for _, l := range rcpt.Logs {
 			// log hash represents the hash of *this* log as a potentially initiating message
 			logHash := logToLogHash(l)
-			var execMsg *types.ExecutingMessage
-			msg, err := p.eventDecoder.DecodeExecutingMessageLog(l)
-			if err != nil && !errors.Is(err, contracts.ErrEventNotFound) {
-				return fmt.Errorf("failed to decode executing message log: %w", err)
-			} else if err == nil {
-				// if the log is an executing message, store the message
-				execMsg = &msg
+			// The log may be an executing message emitted by the CrossL2Inbox
+			execMsg, err := p.eventDecoder(l)
+			if err != nil {
+				return fmt.Errorf("invalid log %d from block %s: %w", l.Index, block.ID(), err)
 			}
 			// executing messages have multiple entries in the database
 			// they should start with the initiating message and then include the execution
-			err = p.logStore.AddLog(p.chain, logHash, block.ParentID(), uint32(l.Index), execMsg)
-			if err != nil {
-				return fmt.Errorf("failed to add log %d from block %v: %w", l.Index, block.ID(), err)
+			if err := p.logStore.AddLog(p.chain, logHash, block.ParentID(), uint32(l.Index), execMsg); err != nil {
+				return fmt.Errorf("failed to add log %d from block %s: %w", l.Index, block.ID(), err)
 			}
 		}
 	}
@@ -77,6 +67,6 @@ func (p *logProcessor) ProcessLogs(_ context.Context, block eth.BlockRef, rcpts
 // The address is hashed into the payload hash to save space in the log storage,
 // and because they represent paired data.
 func logToLogHash(l *ethTypes.Log) common.Hash {
-	payloadHash := crypto.Keccak256(types.LogToMessagePayload(l))
-	return types.PayloadHashToLogHash(common.Hash(payloadHash), l.Address)
+	payloadHash := crypto.Keccak256Hash(types.LogToMessagePayload(l))
+	return types.PayloadHashToLogHash(payloadHash, l.Address)
 }
diff --git a/op-supervisor/supervisor/backend/processors/log_processor_test.go b/op-supervisor/supervisor/backend/processors/log_processor_test.go
index e23ad6933f74..f919d4f801ed 100644
--- a/op-supervisor/supervisor/backend/processors/log_processor_test.go
+++ b/op-supervisor/supervisor/backend/processors/log_processor_test.go
@@ -107,7 +107,7 @@ func TestLogProcessor(t *testing.T) {
 				},
 			},
 		}
-		execMsg := types.ExecutingMessage{
+		execMsg := &types.ExecutingMessage{
 			Chain:     4, // TODO(#11105): translate chain ID to chain index
 			BlockNum:  6,
 			LogIdx:    8,
@@ -116,10 +116,10 @@ func TestLogProcessor(t *testing.T) {
 		}
 		store := &stubLogStorage{}
 		processor := NewLogProcessor(types.ChainID{4}, store).(*logProcessor)
-		processor.eventDecoder = EventDecoderFn(func(l *ethTypes.Log) (types.ExecutingMessage, error) {
+		processor.eventDecoder = func(l *ethTypes.Log) (*types.ExecutingMessage, error) {
 			require.Equal(t, rcpts[0].Logs[0], l)
 			return execMsg, nil
-		})
+		}
 
 		err := processor.ProcessLogs(ctx, block1, rcpts)
 		require.NoError(t, err)
@@ -128,7 +128,7 @@ func TestLogProcessor(t *testing.T) {
 				parent:  block1.ParentID(),
 				logIdx:  0,
 				logHash: logToLogHash(rcpts[0].Logs[0]),
-				execMsg: &execMsg,
+				execMsg: execMsg,
 			},
 		}
 		require.Equal(t, expected, store.logs)
@@ -242,9 +242,3 @@ type storedLog struct {
 	logHash common.Hash
 	execMsg *types.ExecutingMessage
 }
-
-type EventDecoderFn func(*ethTypes.Log) (types.ExecutingMessage, error)
-
-func (f EventDecoderFn) DecodeExecutingMessageLog(log *ethTypes.Log) (types.ExecutingMessage, error) {
-	return f(log)
-}

From 20c0e146ee83e78c8d779f9d5d1a6ff18c3f6e3c Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Fri, 1 Nov 2024 08:55:50 -0700
Subject: [PATCH 105/451] ci: Skip expensive fp e2e tests in main workflow
 (#12780)

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 .circleci/config.yml                       | 6 ++++++
 op-e2e/e2e.go                              | 7 +++++++
 op-e2e/faultproofs/output_alphabet_test.go | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a089dd72bb2..01eba4e466d6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -897,6 +897,10 @@ jobs:
         description: Machine resource class
         type: string
         default: ethereum-optimism/latitude-1
+      skip_slow_tests:
+        description: Indicates that slow tests should be skipped
+        type: boolean
+        default: false
     machine: true
     resource_class: <<parameters.resource_class>>
     steps:
@@ -925,6 +929,7 @@ jobs:
             # need to explicitly set it here to prevent Cannon from running when we don't
             # want it to.
             export OP_E2E_CANNON_ENABLED="false"
+            export OP_E2E_SKIP_SLOW_TEST=<<parameters.skip_slow_tests>>
             # Note: We don't use circle CI test splits because we need to split by test name, not by package. There is an additional
             # constraint that gotestsum does not currently (nor likely will) accept files from different packages when building.
             JUNIT_FILE=../tmp/test-results/<<parameters.module>>_<<parameters.target>>.xml JSON_LOG_FILE=../tmp/testlogs/test.log make <<parameters.target>>
@@ -1362,6 +1367,7 @@ workflows:
           name: op-e2e-fault-proof-tests
           module: op-e2e
           target: test-fault-proofs
+          skip_slow_tests: true
           requires:
             - contracts-bedrock-build
             - cannon-prestate
diff --git a/op-e2e/e2e.go b/op-e2e/e2e.go
index 54533cf4fef9..f603b97f6fbd 100644
--- a/op-e2e/e2e.go
+++ b/op-e2e/e2e.go
@@ -52,6 +52,13 @@ func UsesCannon(t e2eutils.TestingBase) {
 	}
 }
 
+// IsSlow indicates that the test is too expensive to run on the main CI workflow
+func IsSlow(t e2eutils.TestingBase) {
+	if os.Getenv("OP_E2E_SKIP_SLOW_TEST") == "true" {
+		t.Skip("Skipping slow test")
+	}
+}
+
 type executorInfo struct {
 	total      uint64
 	idx        uint64
diff --git a/op-e2e/faultproofs/output_alphabet_test.go b/op-e2e/faultproofs/output_alphabet_test.go
index 9255214ff39b..258066305ef3 100644
--- a/op-e2e/faultproofs/output_alphabet_test.go
+++ b/op-e2e/faultproofs/output_alphabet_test.go
@@ -167,7 +167,7 @@ func TestOutputAlphabetGame_ValidOutputRoot(t *testing.T) {
 }
 
 func TestChallengerCompleteExhaustiveDisputeGame(t *testing.T) {
-	op_e2e.InitParallel(t)
+	op_e2e.InitParallel(t, op_e2e.IsSlow)
 
 	testCase := func(t *testing.T, isRootCorrect bool) {
 		ctx := context.Background()

From 69875d1fa7a0f0d82ac4e4d65b4fba68d2cf5663 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 1 Nov 2024 22:56:36 +0700
Subject: [PATCH 106/451] fix(ct): no public functions in libraries (#12777)

Adds a new semgrep rule that blocks the usage of public functions
in libraries. We don't use linked libraries and they cause issues
with foundry.
---
 packages/contracts-bedrock/justfile           |   4 +
 .../scripts/libraries/DeployUtils.sol         |   2 +-
 semgrep/sol-rules.t.sol                       | 122 ++++++++++++++++++
 semgrep/sol-rules.yaml                        |  11 ++
 4 files changed, 138 insertions(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index d77e93822462..e73673634745 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -201,6 +201,10 @@ check-kontrol-summaries-unchanged:
 semgrep:
   cd ../../ && semgrep scan --config=semgrep ./packages/contracts-bedrock
 
+# Runs semgrep tests.
+semgrep-test:
+  cd ../../ && semgrep scan --test semgrep
+
 # TODO: Also run lint-forge-tests-check but we need to fix the test names first.
 # Runs all checks.
 check:
diff --git a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
index 597e5b100fc3..da9aea12a0ac 100644
--- a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
+++ b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
@@ -263,7 +263,7 @@ library DeployUtils {
 
     /// @notice Builds an ERC1967 Proxy with a dummy implementation.
     /// @param _proxyImplName Name of the implementation contract.
-    function buildERC1967ProxyWithImpl(string memory _proxyImplName) public returns (IProxy genericProxy_) {
+    function buildERC1967ProxyWithImpl(string memory _proxyImplName) internal returns (IProxy genericProxy_) {
         genericProxy_ = IProxy(
             create1({
                 _name: "Proxy",
diff --git a/semgrep/sol-rules.t.sol b/semgrep/sol-rules.t.sol
index b2b769e144e6..8b82dce33ed0 100644
--- a/semgrep/sol-rules.t.sol
+++ b/semgrep/sol-rules.t.sol
@@ -154,6 +154,128 @@ contract SemgrepTest__sol_safety_natspec_semver_match {
     }
 }
 
+library SemgrepTest__sol_safety_no_public_in_libraries {
+    // ok: sol-safety-no-public-in-libraries
+    function test() internal {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test() private {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test(uint256 _value, address _addr) internal {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test(uint256 _value, address _addr) private {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test() internal pure returns (uint256) {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test() private pure returns (uint256) {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test() internal view returns (uint256, address) {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test() private view returns (uint256, address) {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test() internal returns (uint256 amount_, bool success_) {
+        // ...
+    }
+
+    // ok: sol-safety-no-public-in-libraries
+    function test() private returns (uint256 amount_, bool success_) {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() public {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() external {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() public pure {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() external pure {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() public view {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() external view {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test(uint256 _value, address _addr) public {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test(uint256 _value, address _addr) external {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() public pure returns (uint256) {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() external pure returns (uint256) {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() public view returns (uint256, address) {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() external view returns (uint256, address) {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() public returns (uint256 amount_, bool success_) {
+        // ...
+    }
+
+    // ruleid: sol-safety-no-public-in-libraries
+    function test() external returns (uint256 amount_, bool success_) {
+        // ...
+    }
+}
+
 contract SemgrepTest__sol_style_input_arg_fmt {
     // ok: sol-style-input-arg-fmt
     event Test(address indexed src, address indexed guy, uint256 wad);
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index bd9a80d57804..59e0374b26db 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -66,6 +66,17 @@ rules:
       include:
         - packages/contracts-bedrock/src
 
+  - id: sol-safety-no-public-in-libraries
+    languages: [generic]
+    severity: ERROR
+    message: Public functions in libraries are not allowed
+    patterns:
+      - pattern-inside: |
+          library $LIBRARY {
+              ...
+          }
+      - pattern-regex: function\s+\w+\s*\([^)]*\)\s+(?:.*\s+)?(public|external)\s+.*\{
+
   - id: sol-style-input-arg-fmt
     languages: [solidity]
     severity: ERROR

From 39dc07942350899bc93b413a1688efd17048982f Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 1 Nov 2024 23:54:26 +0700
Subject: [PATCH 107/451] interop-devnet: monitor logs of L1 BN/VC/EL and L2 EL
 containers (#12783)

---
 interop-devnet/monitoring/promtail/config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interop-devnet/monitoring/promtail/config.yaml b/interop-devnet/monitoring/promtail/config.yaml
index 1f724873c2d0..60116fb463f6 100644
--- a/interop-devnet/monitoring/promtail/config.yaml
+++ b/interop-devnet/monitoring/promtail/config.yaml
@@ -25,7 +25,7 @@ scrape_configs:
         filters:
           - name: name
             # Filter logging to just our containers
-            values: ["op-batcher-*", "op-proposer-*", "op-node-*", "op-supervisor-*"]
+            values: ["op-batcher-*", "op-proposer-*", "op-node-*", "op-supervisor-*", "l1-*", "l1-bn-*", "l1-vc-*", "l2-a-*", "l2-b-*"]
     relabel_configs:
       - source_labels: ["__meta_docker_container_name"]
         regex: "/(.*)"

From 1ebbd2911d216cf8d03a753ccc4d15d32cd893ef Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Fri, 1 Nov 2024 12:34:31 -0500
Subject: [PATCH 108/451] use RWMap for Supervisor Backend (#12785)

* use RWMap for Supervisor Backend

* adjust Clear method
---
 op-service/locks/rwmap.go                     |   7 +
 op-supervisor/supervisor/backend/backend.go   | 152 ++++++------------
 .../supervisor/backend/backend_test.go        |   3 +-
 3 files changed, 59 insertions(+), 103 deletions(-)

diff --git a/op-service/locks/rwmap.go b/op-service/locks/rwmap.go
index 779e3554c824..2a6badf25525 100644
--- a/op-service/locks/rwmap.go
+++ b/op-service/locks/rwmap.go
@@ -46,3 +46,10 @@ func (m *RWMap[K, V]) Range(f func(key K, value V) bool) {
 		}
 	}
 }
+
+// Clear removes all key-value pairs from the map.
+func (m *RWMap[K, V]) Clear() {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	clear(m.inner)
+}
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 37596c5d8b6b..7d368cb40f15 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"sync"
 	"sync/atomic"
 	"time"
 
@@ -14,6 +13,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/client"
 	"github.com/ethereum-optimism/optimism/op-service/dial"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/locks"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/cross"
@@ -30,11 +30,6 @@ type SupervisorBackend struct {
 	m       Metrics
 	dataDir string
 
-	// RW lock to avoid concurrent map mutations.
-	// Read = any chain may be used and mutated.
-	// Write = set of chains is changing.
-	mu sync.RWMutex
-
 	// depSet is the dependency set that the backend uses to know about the chains it is indexing
 	depSet depset.DependencySet
 
@@ -42,21 +37,21 @@ type SupervisorBackend struct {
 	chainDBs *db.ChainsDB
 
 	// chainProcessors are notified of new unsafe blocks, and add the unsafe log events data into the events DB
-	chainProcessors map[types.ChainID]*processors.ChainProcessor
+	chainProcessors locks.RWMap[types.ChainID, *processors.ChainProcessor]
 
 	// crossSafeProcessors take local-safe data and promote it to cross-safe when verified
-	crossSafeProcessors map[types.ChainID]*cross.Worker
+	crossSafeProcessors locks.RWMap[types.ChainID, *cross.Worker]
 
 	// crossUnsafeProcessors take local-unsafe data and promote it to cross-unsafe when verified
-	crossUnsafeProcessors map[types.ChainID]*cross.Worker
+	crossUnsafeProcessors locks.RWMap[types.ChainID, *cross.Worker]
+
+	// chainMetrics are used to track metrics for each chain
+	// they are reused for processors and databases of the same chain
+	chainMetrics locks.RWMap[types.ChainID, *chainMetrics]
 
 	// synchronousProcessors disables background-workers,
 	// requiring manual triggers for the backend to process anything.
 	synchronousProcessors bool
-
-	// chainMetrics are used to track metrics for each chain
-	// they are reused for processors and databases of the same chain
-	chainMetrics map[types.ChainID]*chainMetrics
 }
 
 var _ frontend.Backend = (*SupervisorBackend)(nil)
@@ -74,22 +69,17 @@ func NewSupervisorBackend(ctx context.Context, logger log.Logger, m Metrics, cfg
 	if err != nil {
 		return nil, fmt.Errorf("failed to load dependency set: %w", err)
 	}
-	chains := depSet.Chains()
 
 	// create initial per-chain resources
 	chainsDBs := db.NewChainsDB(logger, depSet)
 
 	// create the supervisor backend
 	super := &SupervisorBackend{
-		logger:                logger,
-		m:                     m,
-		dataDir:               cfg.Datadir,
-		depSet:                depSet,
-		chainDBs:              chainsDBs,
-		chainProcessors:       make(map[types.ChainID]*processors.ChainProcessor, len(chains)),
-		chainMetrics:          make(map[types.ChainID]*chainMetrics, len(chains)),
-		crossUnsafeProcessors: make(map[types.ChainID]*cross.Worker, len(chains)),
-		crossSafeProcessors:   make(map[types.ChainID]*cross.Worker, len(chains)),
+		logger:   logger,
+		m:        m,
+		dataDir:  cfg.Datadir,
+		depSet:   depSet,
+		chainDBs: chainsDBs,
 		// For testing we can avoid running the processors.
 		synchronousProcessors: cfg.SynchronousProcessors,
 	}
@@ -120,19 +110,19 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 	// initialize all cross-unsafe processors
 	for _, chainID := range chains {
 		worker := cross.NewCrossUnsafeWorker(su.logger, chainID, su.chainDBs)
-		su.crossUnsafeProcessors[chainID] = worker
+		su.crossUnsafeProcessors.Set(chainID, worker)
 	}
 	// initialize all cross-safe processors
 	for _, chainID := range chains {
 		worker := cross.NewCrossSafeWorker(su.logger, chainID, su.chainDBs)
-		su.crossSafeProcessors[chainID] = worker
+		su.crossSafeProcessors.Set(chainID, worker)
 	}
 	// For each chain initialize a chain processor service,
 	// after cross-unsafe workers are ready to receive updates
 	for _, chainID := range chains {
 		logProcessor := processors.NewLogProcessor(chainID, su.chainDBs)
 		chainProcessor := processors.NewChainProcessor(su.logger, chainID, logProcessor, su.chainDBs, su.onIndexedLocalUnsafeData)
-		su.chainProcessors[chainID] = chainProcessor
+		su.chainProcessors.Set(chainID, chainProcessor)
 	}
 
 	// the config has some RPC connections to attach to the chain-processors
@@ -148,31 +138,27 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 // onIndexedLocalUnsafeData is called by the event indexing workers.
 // This signals to cross-unsafe workers that there's data to index.
 func (su *SupervisorBackend) onIndexedLocalUnsafeData() {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	// We signal all workers, since dependencies on a chain may be unblocked
 	// by new data on other chains.
 	// Busy workers don't block processing.
 	// The signal is picked up only if the worker is running in the background.
-	for _, w := range su.crossUnsafeProcessors {
+	su.crossUnsafeProcessors.Range(func(_ types.ChainID, w *cross.Worker) bool {
 		w.OnNewData()
-	}
+		return true
+	})
 }
 
 // onNewLocalSafeData is called by the safety-indexing.
 // This signals to cross-safe workers that there's data to index.
 func (su *SupervisorBackend) onNewLocalSafeData() {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	// We signal all workers, since dependencies on a chain may be unblocked
 	// by new data on other chains.
 	// Busy workers don't block processing.
 	// The signal is picked up only if the worker is running in the background.
-	for _, w := range su.crossSafeProcessors {
+	su.crossSafeProcessors.Range(func(_ types.ChainID, w *cross.Worker) bool {
 		w.OnNewData()
-	}
+		return true
+	})
 }
 
 // openChainDBs initializes all the DB resources of a specific chain.
@@ -180,7 +166,7 @@ func (su *SupervisorBackend) onNewLocalSafeData() {
 func (su *SupervisorBackend) openChainDBs(chainID types.ChainID) error {
 	cm := newChainMetrics(chainID, su.m)
 	// create metrics and a logdb for the chain
-	su.chainMetrics[chainID] = cm
+	su.chainMetrics.Set(chainID, cm)
 
 	logDB, err := db.OpenLogDB(su.logger, chainID, su.dataDir, cm)
 	if err != nil {
@@ -216,7 +202,7 @@ func (su *SupervisorBackend) attachRPC(ctx context.Context, rpc string) error {
 	if !su.depSet.HasChain(chainID) {
 		return fmt.Errorf("chain %s is not part of the interop dependency set: %w", chainID, types.ErrUnknownChain)
 	}
-	cm, ok := su.chainMetrics[chainID]
+	cm, ok := su.chainMetrics.Get(chainID)
 	if !ok {
 		return fmt.Errorf("failed to find metrics for chain %v", chainID)
 	}
@@ -236,10 +222,7 @@ func (su *SupervisorBackend) attachRPC(ctx context.Context, rpc string) error {
 }
 
 func (su *SupervisorBackend) AttachProcessorSource(chainID types.ChainID, src processors.Source) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
-	proc, ok := su.chainProcessors[chainID]
+	proc, ok := su.chainProcessors.Get(chainID)
 	if !ok {
 		return fmt.Errorf("unknown chain %s, cannot attach RPC to processor", chainID)
 	}
@@ -260,9 +243,6 @@ func clientForL2(ctx context.Context, logger log.Logger, rpc string) (client.RPC
 }
 
 func (su *SupervisorBackend) Start(ctx context.Context) error {
-	su.mu.Lock()
-	defer su.mu.Unlock()
-
 	// ensure we only start once
 	if !su.started.CompareAndSwap(false, true) {
 		return errors.New("already started")
@@ -276,46 +256,49 @@ func (su *SupervisorBackend) Start(ctx context.Context) error {
 
 	if !su.synchronousProcessors {
 		// Make all the chain-processors run automatic background processing
-		for _, processor := range su.chainProcessors {
+		su.chainProcessors.Range(func(_ types.ChainID, processor *processors.ChainProcessor) bool {
 			processor.StartBackground()
-		}
-		for _, worker := range su.crossUnsafeProcessors {
+			return true
+		})
+		su.crossUnsafeProcessors.Range(func(_ types.ChainID, worker *cross.Worker) bool {
 			worker.StartBackground()
-		}
-		for _, worker := range su.crossSafeProcessors {
+			return true
+		})
+		su.crossSafeProcessors.Range(func(_ types.ChainID, worker *cross.Worker) bool {
 			worker.StartBackground()
-		}
+			return true
+		})
 	}
 
 	return nil
 }
 
 func (su *SupervisorBackend) Stop(ctx context.Context) error {
-	su.mu.Lock()
-	defer su.mu.Unlock()
-
 	if !su.started.CompareAndSwap(true, false) {
 		return errAlreadyStopped
 	}
 	su.logger.Info("Closing supervisor backend")
 	// close all processors
-	for id, processor := range su.chainProcessors {
+	su.chainProcessors.Range(func(id types.ChainID, processor *processors.ChainProcessor) bool {
 		su.logger.Info("stopping chain processor", "chainID", id)
 		processor.Close()
-	}
-	clear(su.chainProcessors)
+		return true
+	})
+	su.chainProcessors.Clear()
 
-	for id, worker := range su.crossUnsafeProcessors {
+	su.crossUnsafeProcessors.Range(func(id types.ChainID, worker *cross.Worker) bool {
 		su.logger.Info("stopping cross-unsafe processor", "chainID", id)
 		worker.Close()
-	}
-	clear(su.crossUnsafeProcessors)
+		return true
+	})
+	su.crossUnsafeProcessors.Clear()
 
-	for id, worker := range su.crossSafeProcessors {
+	su.crossSafeProcessors.Range(func(id types.ChainID, worker *cross.Worker) bool {
 		su.logger.Info("stopping cross-safe processor", "chainID", id)
 		worker.Close()
-	}
-	clear(su.crossSafeProcessors)
+		return true
+	})
+	su.crossSafeProcessors.Clear()
 
 	// close the databases
 	return su.chainDBs.Close()
@@ -323,9 +306,6 @@ func (su *SupervisorBackend) Stop(ctx context.Context) error {
 
 // AddL2RPC attaches an RPC as the RPC for the given chain, overriding the previous RPC source, if any.
 func (su *SupervisorBackend) AddL2RPC(ctx context.Context, rpc string) error {
-	su.mu.RLock() // read-lock: we only modify an existing chain, we don't add/remove chains
-	defer su.mu.RUnlock()
-
 	return su.attachRPC(ctx, rpc)
 }
 
@@ -340,9 +320,6 @@ func (su *SupervisorBackend) DependencySet() depset.DependencySet {
 // ----------------------------
 
 func (su *SupervisorBackend) CheckMessage(identifier types.Identifier, payloadHash common.Hash) (types.SafetyLevel, error) {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	logHash := types.PayloadHashToLogHash(payloadHash, identifier.Origin)
 	chainID := identifier.ChainID
 	blockNum := identifier.BlockNumber
@@ -365,9 +342,6 @@ func (su *SupervisorBackend) CheckMessage(identifier types.Identifier, payloadHa
 func (su *SupervisorBackend) CheckMessages(
 	messages []types.Message,
 	minSafety types.SafetyLevel) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	su.logger.Debug("Checking messages", "count", len(messages), "minSafety", minSafety)
 
 	for _, msg := range messages {
@@ -393,9 +367,6 @@ func (su *SupervisorBackend) CheckMessages(
 }
 
 func (su *SupervisorBackend) UnsafeView(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error) {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	head, err := su.chainDBs.LocalUnsafe(chainID)
 	if err != nil {
 		return types.ReferenceView{}, fmt.Errorf("failed to get local-unsafe head: %w", err)
@@ -414,9 +385,6 @@ func (su *SupervisorBackend) UnsafeView(ctx context.Context, chainID types.Chain
 }
 
 func (su *SupervisorBackend) SafeView(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error) {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	_, localSafe, err := su.chainDBs.LocalSafe(chainID)
 	if err != nil {
 		return types.ReferenceView{}, fmt.Errorf("failed to get local-safe head: %w", err)
@@ -435,9 +403,6 @@ func (su *SupervisorBackend) SafeView(ctx context.Context, chainID types.ChainID
 }
 
 func (su *SupervisorBackend) Finalized(ctx context.Context, chainID types.ChainID) (eth.BlockID, error) {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	v, err := su.chainDBs.Finalized(chainID)
 	if err != nil {
 		return eth.BlockID{}, err
@@ -446,9 +411,6 @@ func (su *SupervisorBackend) Finalized(ctx context.Context, chainID types.ChainI
 }
 
 func (su *SupervisorBackend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	v, err := su.chainDBs.CrossDerivedFromBlockRef(chainID, derived)
 	if err != nil {
 		return eth.BlockRef{}, err
@@ -460,9 +422,7 @@ func (su *SupervisorBackend) CrossDerivedFrom(ctx context.Context, chainID types
 // ----------------------------
 
 func (su *SupervisorBackend) UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-	ch, ok := su.chainProcessors[chainID]
+	ch, ok := su.chainProcessors.Get(chainID)
 	if !ok {
 		return types.ErrUnknownChain
 	}
@@ -470,9 +430,6 @@ func (su *SupervisorBackend) UpdateLocalUnsafe(ctx context.Context, chainID type
 }
 
 func (su *SupervisorBackend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	err := su.chainDBs.UpdateLocalSafe(chainID, derivedFrom, lastDerived)
 	if err != nil {
 		return err
@@ -482,9 +439,6 @@ func (su *SupervisorBackend) UpdateLocalSafe(ctx context.Context, chainID types.
 }
 
 func (su *SupervisorBackend) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-
 	return su.chainDBs.UpdateFinalizedL1(finalized)
 }
 
@@ -492,9 +446,7 @@ func (su *SupervisorBackend) UpdateFinalizedL1(ctx context.Context, chainID type
 // ----------------------------
 
 func (su *SupervisorBackend) SyncEvents(chainID types.ChainID) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-	ch, ok := su.chainProcessors[chainID]
+	ch, ok := su.chainProcessors.Get(chainID)
 	if !ok {
 		return types.ErrUnknownChain
 	}
@@ -503,9 +455,7 @@ func (su *SupervisorBackend) SyncEvents(chainID types.ChainID) error {
 }
 
 func (su *SupervisorBackend) SyncCrossUnsafe(chainID types.ChainID) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-	ch, ok := su.crossUnsafeProcessors[chainID]
+	ch, ok := su.crossUnsafeProcessors.Get(chainID)
 	if !ok {
 		return types.ErrUnknownChain
 	}
@@ -513,9 +463,7 @@ func (su *SupervisorBackend) SyncCrossUnsafe(chainID types.ChainID) error {
 }
 
 func (su *SupervisorBackend) SyncCrossSafe(chainID types.ChainID) error {
-	su.mu.RLock()
-	defer su.mu.RUnlock()
-	ch, ok := su.crossSafeProcessors[chainID]
+	ch, ok := su.crossSafeProcessors.Get(chainID)
 	if !ok {
 		return types.ErrUnknownChain
 	}
diff --git a/op-supervisor/supervisor/backend/backend_test.go b/op-supervisor/supervisor/backend/backend_test.go
index 6ddfcac662b2..c104bf0bae5d 100644
--- a/op-supervisor/supervisor/backend/backend_test.go
+++ b/op-supervisor/supervisor/backend/backend_test.go
@@ -117,7 +117,8 @@ func TestBackendLifetime(t *testing.T) {
 	require.NoError(t, err)
 	// Make the processing happen, so we can rely on the new chain information,
 	// and not run into errors for future data that isn't mocked at this time.
-	b.chainProcessors[chainA].ProcessToHead()
+	proc, _ := b.chainProcessors.Get(chainA)
+	proc.ProcessToHead()
 
 	_, err = b.UnsafeView(context.Background(), chainA, types.ReferenceView{})
 	require.ErrorIs(t, err, types.ErrFuture, "still no data yet, need cross-unsafe")

From 4c25686adee5485e52ce9548d614dc9be11f5111 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 1 Nov 2024 20:29:29 -0600
Subject: [PATCH 109/451] op-e2e: Fix flakiness in TestP2PFull (#12793)

The ConnectedF callback was sending to a channel that was only ever read from once. This causes the test to time out under certain conditions.
---
 op-node/p2p/host_test.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/op-node/p2p/host_test.go b/op-node/p2p/host_test.go
index 2bab3239e55e..85b0c9e60588 100644
--- a/op-node/p2p/host_test.go
+++ b/op-node/p2p/host_test.go
@@ -6,6 +6,7 @@ import (
 	"math/big"
 	"net"
 	"slices"
+	gosync "sync"
 	"testing"
 	"time"
 
@@ -126,9 +127,12 @@ func TestP2PFull(t *testing.T) {
 
 	conns := make(chan network.Conn, 1)
 	hostA := nodeA.Host()
+	var once gosync.Once
 	hostA.Network().Notify(&network.NotifyBundle{
 		ConnectedF: func(n network.Network, conn network.Conn) {
-			conns <- conn
+			once.Do(func() {
+				conns <- conn
+			})
 		}})
 
 	backend := NewP2PAPIBackend(nodeA, logA, nil)

From 4872837d5b4c604103086a2c238be028d8c32871 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Sat, 2 Nov 2024 01:07:28 -0600
Subject: [PATCH 110/451] op-e2e: Retry the receipts fetcher test (#12794)

This is one of our flakiest tests since it's very dependent on the test runner's CPU usage.
---
 op-service/sources/receipts_basic_test.go | 62 +++++++++++++++--------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/op-service/sources/receipts_basic_test.go b/op-service/sources/receipts_basic_test.go
index ca2f00f9aa21..ad1ed16013ad 100644
--- a/op-service/sources/receipts_basic_test.go
+++ b/op-service/sources/receipts_basic_test.go
@@ -9,6 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-service/retry"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -104,32 +106,48 @@ func TestBasicRPCReceiptsFetcher_Concurrency(t *testing.T) {
 	for _, rec := range receipts {
 		recMap[rec.TxHash] = rec
 	}
-	mrpc := new(mockRPC)
-	rp := NewBasicRPCReceiptsFetcher(mrpc, batchSize)
 
-	// prepare mock
-	var numCalls atomic.Int32
-	mrpc.On("BatchCallContext", mock.Anything, mock.AnythingOfType("[]rpc.BatchElem")).
-		Run(func(args mock.Arguments) {
-			numCalls.Add(1)
-			els := args.Get(1).([]rpc.BatchElem)
-			for _, el := range els {
-				if el.Method == "eth_getTransactionReceipt" {
-					txHash := el.Args[0].(common.Hash)
-					// The IterativeBatchCall expects that the values are written
-					// to the fields of the allocated *types.Receipt.
-					**(el.Result.(**types.Receipt)) = *recMap[txHash]
+	boff := &retry.ExponentialStrategy{
+		Min:       0,
+		Max:       time.Second,
+		MaxJitter: 100 * time.Millisecond,
+	}
+	err := retry.Do0(context.Background(), 10, boff, func() error {
+		mrpc := new(mockRPC)
+		rp := NewBasicRPCReceiptsFetcher(mrpc, batchSize)
+
+		// prepare mock
+		var numCalls atomic.Int32
+		mrpc.On("BatchCallContext", mock.Anything, mock.AnythingOfType("[]rpc.BatchElem")).
+			Run(func(args mock.Arguments) {
+				numCalls.Add(1)
+				els := args.Get(1).([]rpc.BatchElem)
+				for _, el := range els {
+					if el.Method == "eth_getTransactionReceipt" {
+						txHash := el.Args[0].(common.Hash)
+						// The IterativeBatchCall expects that the values are written
+						// to the fields of the allocated *types.Receipt.
+						**(el.Result.(**types.Receipt)) = *recMap[txHash]
+					}
 				}
-			}
-		}).
-		Return([]error{nil})
+			}).
+			Return([]error{nil})
 
-	runConcurrentFetchingTest(t, rp, numFetchers, receipts, block)
+		runConcurrentFetchingTest(t, rp, numFetchers, receipts, block)
 
-	mrpc.AssertExpectations(t)
-	finalNumCalls := int(numCalls.Load())
-	require.NotZero(finalNumCalls, "BatchCallContext should have been called.")
-	require.Less(finalNumCalls, numFetchers*numBatchCalls, "Some IterativeBatchCalls should have been shared.")
+		mrpc.AssertExpectations(t)
+		finalNumCalls := int(numCalls.Load())
+
+		if finalNumCalls == 0 {
+			return errors.New("batchCallContext should have been called")
+		}
+
+		if finalNumCalls >= numFetchers*numBatchCalls {
+			return errors.New("some IterativeBatchCalls should have been shared")
+		}
+		return nil
+	})
+	require.NoError(err)
 }
 
 func runConcurrentFetchingTest(t *testing.T, rp ReceiptsProvider, numFetchers int, receipts types.Receipts, block *RPCBlock) {

From 2e0223f26fd6845ae3625943ed664b02799a99ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 2 Nov 2024 07:10:13 +0000
Subject: [PATCH 111/451] dependabot(gomod): bump
 github.com/kurtosis-tech/kurtosis/api/golang (#12787)

Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kurtosis-tech/kurtosis/compare/1.4.0...1.4.1)

---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 3f61278e07c2..66c99169912c 100644
--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/klauspost/compress v1.17.11
-	github.com/kurtosis-tech/kurtosis/api/golang v1.4.0
+	github.com/kurtosis-tech/kurtosis/api/golang v1.4.1
 	github.com/libp2p/go-libp2p v0.36.2
 	github.com/libp2p/go-libp2p-mplex v0.9.0
 	github.com/libp2p/go-libp2p-pubsub v0.12.0
diff --git a/go.sum b/go.sum
index 9794a2c370f4..3eaeda632c7b 100644
--- a/go.sum
+++ b/go.sum
@@ -440,8 +440,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2 h1:izciXrFyFR+ihJ7nLTOkoIX5GzBPIp8gVKlw94gIc98=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2/go.mod h1:bWSMQK3WHVTGHX9CjxPAb/LtzcmfOxID2wdzakSWQxo=
-github.com/kurtosis-tech/kurtosis/api/golang v1.4.0 h1:Iczs8diUFpbl4R2JJoofu6R/ZDwBsHe0O6wot45fxgQ=
-github.com/kurtosis-tech/kurtosis/api/golang v1.4.0/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.1 h1:V/T5k7t1iKgFof1cGhyLh396YKdTehUqO97AsTPDy+k=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.1/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b h1:hMoIM99QKcYQqsnK4AF7Lovi9ZD9ac6lZLZ5D/jx2x8=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b/go.mod h1:4pFdrRwDz5R+Fov2ZuTaPhAVgjA2jhGh1Izf832sX7A=
 github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc h1:7IlEpSehmWcNXOFpNP24Cu5HQI3af7GCBQw//m+LnvQ=

From 9e9effa2414b578fb9f0cbaab129b1d8fde6b6db Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Sat, 2 Nov 2024 14:43:10 +0700
Subject: [PATCH 112/451] feat: DeployDisputeGame script (#12641)

Adds a new deployment script for deploying a new dispute game
implementation.
---
 .../pkg/deployer/bootstrap/delayed_weth.go    |   2 +-
 .../pkg/deployer/bootstrap/dispute_game.go    | 216 ++++++++
 op-deployer/pkg/deployer/bootstrap/flags.go   | 108 ++++
 op-deployer/pkg/deployer/opcm/dispute_game.go |  82 +++
 .../pkg/deployer/opcm/dispute_game_test.go    |  57 ++
 .../scripts/deploy/DeployDisputeGame.s.sol    | 495 ++++++++++++++++++
 6 files changed, 959 insertions(+), 1 deletion(-)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/dispute_game.go
 create mode 100644 op-deployer/pkg/deployer/opcm/dispute_game.go
 create mode 100644 op-deployer/pkg/deployer/opcm/dispute_game_test.go
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol

diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index 45952d19e955..1e6e10535f87 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -188,7 +188,7 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		},
 	)
 	if err != nil {
-		return fmt.Errorf("error deploying implementations: %w", err)
+		return fmt.Errorf("error deploying DelayedWETH: %w", err)
 	}
 
 	if _, err := bcaster.Broadcast(ctx); err != nil {
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
new file mode 100644
index 000000000000..65ca4a731124
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -0,0 +1,216 @@
+package bootstrap
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"fmt"
+	"strings"
+
+	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
+	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/urfave/cli/v2"
+)
+
+type DisputeGameConfig struct {
+	L1RPCUrl         string
+	PrivateKey       string
+	Logger           log.Logger
+	ArtifactsLocator *artifacts2.Locator
+
+	privateKeyECDSA *ecdsa.PrivateKey
+
+	MinProposalSizeBytes     uint64
+	ChallengePeriodSeconds   uint64
+	MipsVersion              uint8
+	GameKind                 string
+	GameType                 uint32
+	AbsolutePrestate         common.Hash
+	MaxGameDepth             uint64
+	SplitDepth               uint64
+	ClockExtension           uint64
+	MaxClockDuration         uint64
+	DelayedWethProxy         common.Address
+	AnchorStateRegistryProxy common.Address
+	L2ChainId                uint64
+	Proposer                 common.Address
+	Challenger               common.Address
+}
+
+func (c *DisputeGameConfig) Check() error {
+	if c.L1RPCUrl == "" {
+		return fmt.Errorf("l1RPCUrl must be specified")
+	}
+
+	if c.PrivateKey == "" {
+		return fmt.Errorf("private key must be specified")
+	}
+
+	privECDSA, err := crypto.HexToECDSA(strings.TrimPrefix(c.PrivateKey, "0x"))
+	if err != nil {
+		return fmt.Errorf("failed to parse private key: %w", err)
+	}
+	c.privateKeyECDSA = privECDSA
+
+	if c.Logger == nil {
+		return fmt.Errorf("logger must be specified")
+	}
+
+	if c.ArtifactsLocator == nil {
+		return fmt.Errorf("artifacts locator must be specified")
+	}
+
+	return nil
+}
+
+func DisputeGameCLI(cliCtx *cli.Context) error {
+	logCfg := oplog.ReadCLIConfig(cliCtx)
+	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
+	oplog.SetGlobalLogHandler(l.Handler())
+
+	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
+	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
+	artifactsLocator := new(artifacts2.Locator)
+	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
+		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+	}
+
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+
+	return DisputeGame(ctx, DisputeGameConfig{
+		L1RPCUrl:         l1RPCUrl,
+		PrivateKey:       privateKey,
+		Logger:           l,
+		ArtifactsLocator: artifactsLocator,
+	})
+}
+
+func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
+	if err := cfg.Check(); err != nil {
+		return fmt.Errorf("invalid config for DisputeGame: %w", err)
+	}
+
+	lgr := cfg.Logger
+	progressor := func(curr, total int64) {
+		lgr.Info("artifacts download progress", "current", curr, "total", total)
+	}
+
+	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
+	if err != nil {
+		return fmt.Errorf("failed to download artifacts: %w", err)
+	}
+	defer func() {
+		if err := cleanup(); err != nil {
+			lgr.Warn("failed to clean up artifacts", "err", err)
+		}
+	}()
+
+	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	chainID, err := l1Client.ChainID(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get chain ID: %w", err)
+	}
+	chainIDU64 := chainID.Uint64()
+
+	standardVersionsTOML, err := standard.L1VersionsDataFor(chainIDU64)
+	if err != nil {
+		return fmt.Errorf("error getting standard versions TOML: %w", err)
+	}
+
+	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
+	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
+
+	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+		Logger:  lgr,
+		ChainID: chainID,
+		Client:  l1Client,
+		Signer:  signer,
+		From:    chainDeployer,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create broadcaster: %w", err)
+	}
+
+	nonce, err := l1Client.NonceAt(ctx, chainDeployer, nil)
+	if err != nil {
+		return fmt.Errorf("failed to get starting nonce: %w", err)
+	}
+
+	host, err := env.DefaultScriptHost(
+		bcaster,
+		lgr,
+		chainDeployer,
+		artifactsFS,
+		nonce,
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create script host: %w", err)
+	}
+
+	var release string
+	if cfg.ArtifactsLocator.IsTag() {
+		release = cfg.ArtifactsLocator.Tag
+	} else {
+		release = "dev"
+	}
+
+	lgr.Info("deploying dispute game", "release", release)
+
+	dgo, err := opcm.DeployDisputeGame(
+		host,
+		opcm.DeployDisputeGameInput{
+			Release:                  release,
+			StandardVersionsToml:     standardVersionsTOML,
+			MipsVersion:              cfg.MipsVersion,
+			MinProposalSizeBytes:     cfg.MinProposalSizeBytes,
+			ChallengePeriodSeconds:   cfg.ChallengePeriodSeconds,
+			GameKind:                 cfg.GameKind,
+			GameType:                 cfg.GameType,
+			AbsolutePrestate:         cfg.AbsolutePrestate,
+			MaxGameDepth:             cfg.MaxGameDepth,
+			SplitDepth:               cfg.SplitDepth,
+			ClockExtension:           cfg.ClockExtension,
+			MaxClockDuration:         cfg.MaxClockDuration,
+			DelayedWethProxy:         cfg.DelayedWethProxy,
+			AnchorStateRegistryProxy: cfg.AnchorStateRegistryProxy,
+			L2ChainId:                cfg.L2ChainId,
+			Proposer:                 cfg.Proposer,
+			Challenger:               cfg.Challenger,
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("error deploying dispute game: %w", err)
+	}
+
+	if _, err := bcaster.Broadcast(ctx); err != nil {
+		return fmt.Errorf("failed to broadcast: %w", err)
+	}
+
+	lgr.Info("deployed dispute game")
+
+	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index 6fd598780df5..a7b80daf6e7f 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -4,6 +4,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/urfave/cli/v2"
 )
 
@@ -15,6 +16,18 @@ const (
 	ProofMaturityDelaySecondsFlagName       = "proof-maturity-delay-seconds"
 	DisputeGameFinalityDelaySecondsFlagName = "dispute-game-finality-delay-seconds"
 	MIPSVersionFlagName                     = "mips-version"
+	GameKindFlagName                        = "game-kind"
+	GameTypeFlagName                        = "game-type"
+	AbsolutePrestateFlagName                = "absolute-prestate"
+	MaxGameDepthFlagName                    = "max-game-depth"
+	SplitDepthFlagName                      = "split-depth"
+	ClockExtensionFlagName                  = "clock-extension"
+	MaxClockDurationFlagName                = "max-clock-duration"
+	DelayedWethProxyFlagName                = "delayed-weth-proxy"
+	AnchorStateRegistryProxyFlagName        = "anchor-state-registry-proxy"
+	L2ChainIdFlagName                       = "l2-chain-id"
+	ProposerFlagName                        = "proposer"
+	ChallengerFlagName                      = "challenger"
 )
 
 var (
@@ -59,6 +72,74 @@ var (
 		EnvVars: deployer.PrefixEnvVar("MIPS_VERSION"),
 		Value:   standard.MIPSVersion,
 	}
+	GameKindFlag = &cli.StringFlag{
+		Name:    GameKindFlagName,
+		Usage:   "Game kind (FaultDisputeGame or PermissionedDisputeGame).",
+		EnvVars: deployer.PrefixEnvVar("GAME_KIND"),
+		Value:   "FaultDisputeGame",
+	}
+	GameTypeFlag = &cli.StringFlag{
+		Name:    GameTypeFlagName,
+		Usage:   "Game type (integer or fractional).",
+		EnvVars: deployer.PrefixEnvVar("GAME_TYPE"),
+	}
+	AbsolutePrestateFlag = &cli.StringFlag{
+		Name:    AbsolutePrestateFlagName,
+		Usage:   "Absolute prestate.",
+		EnvVars: deployer.PrefixEnvVar("ABSOLUTE_PRESTATE"),
+		Value:   standard.DisputeAbsolutePrestate.Hex(),
+	}
+	MaxGameDepthFlag = &cli.Uint64Flag{
+		Name:    MaxGameDepthFlagName,
+		Usage:   "Max game depth.",
+		EnvVars: deployer.PrefixEnvVar("MAX_GAME_DEPTH"),
+		Value:   standard.DisputeMaxGameDepth,
+	}
+	SplitDepthFlag = &cli.Uint64Flag{
+		Name:    SplitDepthFlagName,
+		Usage:   "Split depth.",
+		EnvVars: deployer.PrefixEnvVar("SPLIT_DEPTH"),
+		Value:   standard.DisputeSplitDepth,
+	}
+	ClockExtensionFlag = &cli.Uint64Flag{
+		Name:    ClockExtensionFlagName,
+		Usage:   "Clock extension.",
+		EnvVars: deployer.PrefixEnvVar("CLOCK_EXTENSION"),
+		Value:   standard.DisputeClockExtension,
+	}
+	MaxClockDurationFlag = &cli.Uint64Flag{
+		Name:    MaxClockDurationFlagName,
+		Usage:   "Max clock duration.",
+		EnvVars: deployer.PrefixEnvVar("MAX_CLOCK_DURATION"),
+		Value:   standard.DisputeMaxClockDuration,
+	}
+	DelayedWethProxyFlag = &cli.StringFlag{
+		Name:    DelayedWethProxyFlagName,
+		Usage:   "Delayed WETH proxy.",
+		EnvVars: deployer.PrefixEnvVar("DELAYED_WETH_PROXY"),
+	}
+	AnchorStateRegistryProxyFlag = &cli.StringFlag{
+		Name:    AnchorStateRegistryProxyFlagName,
+		Usage:   "Anchor state registry proxy.",
+		EnvVars: deployer.PrefixEnvVar("ANCHOR_STATE_REGISTRY_PROXY"),
+	}
+	L2ChainIdFlag = &cli.Uint64Flag{
+		Name:    L2ChainIdFlagName,
+		Usage:   "L2 chain ID.",
+		EnvVars: deployer.PrefixEnvVar("L2_CHAIN_ID"),
+	}
+	ProposerFlag = &cli.StringFlag{
+		Name:    ProposerFlagName,
+		Usage:   "Proposer address (permissioned game only).",
+		EnvVars: deployer.PrefixEnvVar("PROPOSER"),
+		Value:   common.Address{}.Hex(),
+	}
+	ChallengerFlag = &cli.StringFlag{
+		Name:    ChallengerFlagName,
+		Usage:   "Challenger address (permissioned game only).",
+		EnvVars: deployer.PrefixEnvVar("CHALLENGER"),
+		Value:   common.Address{}.Hex(),
+	}
 )
 
 var OPCMFlags = []cli.Flag{
@@ -79,6 +160,27 @@ var DelayedWETHFlags = []cli.Flag{
 	ArtifactsLocatorFlag,
 }
 
+var DisputeGameFlags = []cli.Flag{
+	deployer.L1RPCURLFlag,
+	deployer.PrivateKeyFlag,
+	ArtifactsLocatorFlag,
+	MinProposalSizeBytesFlag,
+	ChallengePeriodSecondsFlag,
+	MIPSVersionFlag,
+	GameKindFlag,
+	GameTypeFlag,
+	AbsolutePrestateFlag,
+	MaxGameDepthFlag,
+	SplitDepthFlag,
+	ClockExtensionFlag,
+	MaxClockDurationFlag,
+	DelayedWethProxyFlag,
+	AnchorStateRegistryProxyFlag,
+	L2ChainIdFlag,
+	ProposerFlag,
+	ChallengerFlag,
+}
+
 var Commands = []*cli.Command{
 	{
 		Name:   "opcm",
@@ -92,4 +194,10 @@ var Commands = []*cli.Command{
 		Flags:  cliapp.ProtectFlags(DelayedWETHFlags),
 		Action: DelayedWETHCLI,
 	},
+	{
+		Name:   "disputegame",
+		Usage:  "Bootstrap an instance of a FaultDisputeGame or PermissionedDisputeGame.",
+		Flags:  cliapp.ProtectFlags(DisputeGameFlags),
+		Action: DisputeGameCLI,
+	},
 }
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game.go b/op-deployer/pkg/deployer/opcm/dispute_game.go
new file mode 100644
index 000000000000..001987afaeed
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/dispute_game.go
@@ -0,0 +1,82 @@
+package opcm
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+)
+
+type DeployDisputeGameInput struct {
+	Release                  string
+	StandardVersionsToml     string
+	MipsVersion              uint8
+	MinProposalSizeBytes     uint64
+	ChallengePeriodSeconds   uint64
+	GameKind                 string
+	GameType                 uint32
+	AbsolutePrestate         common.Hash
+	MaxGameDepth             uint64
+	SplitDepth               uint64
+	ClockExtension           uint64
+	MaxClockDuration         uint64
+	DelayedWethProxy         common.Address
+	AnchorStateRegistryProxy common.Address
+	L2ChainId                uint64
+	Proposer                 common.Address
+	Challenger               common.Address
+}
+
+func (input *DeployDisputeGameInput) InputSet() bool {
+	return true
+}
+
+type DeployDisputeGameOutput struct {
+	DisputeGameImpl         common.Address
+	MipsSingleton           common.Address
+	PreimageOracleSingleton common.Address
+}
+
+func (output *DeployDisputeGameOutput) CheckOutput(input common.Address) error {
+	return nil
+}
+
+type DeployDisputeGameScript struct {
+	Run func(input, output common.Address) error
+}
+
+func DeployDisputeGame(
+	host *script.Host,
+	input DeployDisputeGameInput,
+) (DeployDisputeGameOutput, error) {
+	var output DeployDisputeGameOutput
+	inputAddr := host.NewScriptAddress()
+	outputAddr := host.NewScriptAddress()
+
+	cleanupInput, err := script.WithPrecompileAtAddress[*DeployDisputeGameInput](host, inputAddr, &input)
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployDisputeGameInput precompile: %w", err)
+	}
+	defer cleanupInput()
+
+	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployDisputeGameOutput](host, outputAddr, &output,
+		script.WithFieldSetter[*DeployDisputeGameOutput])
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployDisputeGameOutput precompile: %w", err)
+	}
+	defer cleanupOutput()
+
+	implContract := "DeployDisputeGame"
+	deployScript, cleanupDeploy, err := script.WithScript[DeployDisputeGameScript](host, "DeployDisputeGame.s.sol", implContract)
+	if err != nil {
+		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
+	}
+	defer cleanupDeploy()
+
+	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
+	}
+
+	return output, nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game_test.go b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
new file mode 100644
index 000000000000..d31f94f8d83b
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
@@ -0,0 +1,57 @@
+package opcm
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployDisputeGame(t *testing.T) {
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+		0,
+	)
+	require.NoError(t, err)
+
+	standardVersionsTOML, err := standard.L1VersionsDataFor(11155111)
+	require.NoError(t, err)
+
+	input := DeployDisputeGameInput{
+		Release:                  "dev",
+		StandardVersionsToml:     standardVersionsTOML,
+		MipsVersion:              1,
+		MinProposalSizeBytes:     standard.MinProposalSizeBytes,
+		ChallengePeriodSeconds:   standard.ChallengePeriodSeconds,
+		GameKind:                 "PermissionedDisputeGame",
+		GameType:                 1,
+		AbsolutePrestate:         common.Hash{'A'},
+		MaxGameDepth:             standard.DisputeMaxGameDepth,
+		SplitDepth:               standard.DisputeSplitDepth,
+		ClockExtension:           standard.DisputeClockExtension,
+		MaxClockDuration:         standard.DisputeMaxClockDuration,
+		DelayedWethProxy:         common.Address{'D'},
+		AnchorStateRegistryProxy: common.Address{'A'},
+		L2ChainId:                69,
+		Proposer:                 common.Address{'P'},
+		Challenger:               common.Address{'C'},
+	}
+
+	output, err := DeployDisputeGame(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.DisputeGameImpl)
+	require.NotEmpty(t, output.MipsSingleton)
+	require.NotEmpty(t, output.PreimageOracleSingleton)
+}
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
new file mode 100644
index 000000000000..51b60c6c2995
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
@@ -0,0 +1,495 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+// Forge
+import { Script } from "forge-std/Script.sol";
+
+// Scripts
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+// Libraries
+import { GameType, Claim, Duration } from "src/dispute/lib/Types.sol";
+import { LibString } from "@solady/utils/LibString.sol";
+
+// Interfaces
+import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
+import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
+import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
+import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
+
+/// @title DeployDisputeGameInput
+contract DeployDisputeGameInput is BaseDeployIO {
+    // Common inputs.
+    string internal _release;
+    string internal _standardVersionsToml;
+
+    // Specify which MIPS version to use.
+    uint256 internal _mipsVersion;
+
+    // All inputs required to deploy PreimageOracle.
+    uint256 internal _minProposalSizeBytes;
+    uint256 internal _challengePeriodSeconds;
+
+    // Specify which game kind is being deployed here.
+    string internal _gameKind;
+
+    // All inputs required to deploy FaultDisputeGame.
+    uint256 internal _gameType;
+    bytes32 internal _absolutePrestate;
+    uint256 internal _maxGameDepth;
+    uint256 internal _splitDepth;
+    uint256 internal _clockExtension;
+    uint256 internal _maxClockDuration;
+    IDelayedWETH internal _delayedWethProxy;
+    IAnchorStateRegistry internal _anchorStateRegistryProxy;
+    uint256 internal _l2ChainId;
+
+    // Additional inputs required to deploy PermissionedDisputeGame.
+    address internal _proposer;
+    address internal _challenger;
+
+    function set(bytes4 _sel, uint256 _value) public {
+        if (_sel == this.mipsVersion.selector) {
+            require(_value == 1 || _value == 2, "DeployDisputeGame: unknown mips version");
+            _mipsVersion = _value;
+        } else if (_sel == this.minProposalSizeBytes.selector) {
+            require(_value != 0, "DeployDisputeGame: minProposalSizeBytes cannot be zero");
+            _minProposalSizeBytes = _value;
+        } else if (_sel == this.challengePeriodSeconds.selector) {
+            require(_value != 0, "DeployDisputeGame: challengePeriodSeconds cannot be zero");
+            _challengePeriodSeconds = _value;
+        } else if (_sel == this.gameType.selector) {
+            require(_value <= type(uint32).max, "DeployDisputeGame: gameType must fit inside uint32");
+            _gameType = _value;
+        } else if (_sel == this.maxGameDepth.selector) {
+            require(_value != 0, "DeployDisputeGame: maxGameDepth cannot be zero");
+            _maxGameDepth = _value;
+        } else if (_sel == this.splitDepth.selector) {
+            require(_value != 0, "DeployDisputeGame: splitDepth cannot be zero");
+            _splitDepth = _value;
+        } else if (_sel == this.clockExtension.selector) {
+            require(_value <= type(uint64).max, "DeployDisputeGame: clockExtension must fit inside uint64");
+            require(_value != 0, "DeployDisputeGame: clockExtension cannot be zero");
+            _clockExtension = _value;
+        } else if (_sel == this.maxClockDuration.selector) {
+            require(_value <= type(uint64).max, "DeployDisputeGame: maxClockDuration must fit inside uint64");
+            require(_value != 0, "DeployDisputeGame: maxClockDuration cannot be zero");
+            _maxClockDuration = _value;
+        } else if (_sel == this.l2ChainId.selector) {
+            require(_value != 0, "DeployDisputeGame: l2ChainId cannot be zero");
+            _l2ChainId = _value;
+        } else {
+            revert("DeployDisputeGame: unknown selector");
+        }
+    }
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.delayedWethProxy.selector) {
+            require(_value != address(0), "DeployDisputeGame: delayedWethProxy cannot be zero address");
+            _delayedWethProxy = IDelayedWETH(payable(_value));
+        } else if (_sel == this.anchorStateRegistryProxy.selector) {
+            require(_value != address(0), "DeployDisputeGame: anchorStateRegistryProxy cannot be zero address");
+            _anchorStateRegistryProxy = IAnchorStateRegistry(payable(_value));
+        } else if (_sel == this.proposer.selector) {
+            require(_value != address(0), "DeployDisputeGame: proposer cannot be zero address");
+            _proposer = _value;
+        } else if (_sel == this.challenger.selector) {
+            require(_value != address(0), "DeployDisputeGame: challenger cannot be zero address");
+            _challenger = _value;
+        } else {
+            revert("DeployDisputeGame: unknown selector");
+        }
+    }
+
+    function set(bytes4 _sel, string memory _value) public {
+        if (_sel == this.gameKind.selector) {
+            require(
+                LibString.eq(_value, "FaultDisputeGame") || LibString.eq(_value, "PermissionedDisputeGame"),
+                "DeployDisputeGame: unknown game kind"
+            );
+            _gameKind = _value;
+        } else if (_sel == this.release.selector) {
+            require(!LibString.eq(_value, ""), "DeployDisputeGame: release cannot be empty");
+            _release = _value;
+        } else if (_sel == this.standardVersionsToml.selector) {
+            require(!LibString.eq(_value, ""), "DeployDisputeGame: standardVersionsToml cannot be empty");
+            _standardVersionsToml = _value;
+        } else {
+            revert("DeployDisputeGame: unknown selector");
+        }
+    }
+
+    function release() public view returns (string memory) {
+        require(!LibString.eq(_release, ""), "DeployDisputeGame: release not set");
+        return _release;
+    }
+
+    function standardVersionsToml() public view returns (string memory) {
+        require(!LibString.eq(_standardVersionsToml, ""), "DeployDisputeGame: standardVersionsToml not set");
+        return _standardVersionsToml;
+    }
+
+    function mipsVersion() public view returns (uint256) {
+        require(_mipsVersion != 0, "DeployDisputeGame: mipsVersion not set");
+        require(_mipsVersion == 1 || _mipsVersion == 2, "DeployDisputeGame: unknown mips version");
+        return _mipsVersion;
+    }
+
+    function minProposalSizeBytes() public view returns (uint256) {
+        require(_minProposalSizeBytes != 0, "DeployDisputeGame: minProposalSizeBytes not set");
+        return _minProposalSizeBytes;
+    }
+
+    function challengePeriodSeconds() public view returns (uint256) {
+        require(_challengePeriodSeconds != 0, "DeployDisputeGame: challengePeriodSeconds not set");
+        return _challengePeriodSeconds;
+    }
+
+    function gameKind() public view returns (string memory) {
+        require(
+            LibString.eq(_gameKind, "FaultDisputeGame") || LibString.eq(_gameKind, "PermissionedDisputeGame"),
+            "DeployDisputeGame: unknown game kind"
+        );
+        return _gameKind;
+    }
+
+    function gameType() public view returns (uint256) {
+        require(_gameType <= type(uint32).max, "DeployDisputeGame: gameType must fit inside uint32");
+        return _gameType;
+    }
+
+    function absolutePrestate() public view returns (bytes32) {
+        require(_absolutePrestate != bytes32(0), "DeployDisputeGame: absolutePrestate not set");
+        return _absolutePrestate;
+    }
+
+    function maxGameDepth() public view returns (uint256) {
+        require(_maxGameDepth != 0, "DeployDisputeGame: maxGameDepth not set");
+        return _maxGameDepth;
+    }
+
+    function splitDepth() public view returns (uint256) {
+        require(_splitDepth != 0, "DeployDisputeGame: splitDepth not set");
+        return _splitDepth;
+    }
+
+    function clockExtension() public view returns (uint256) {
+        require(_clockExtension <= type(uint64).max, "DeployDisputeGame: clockExtension must fit inside uint64");
+        require(_clockExtension != 0, "DeployDisputeGame: clockExtension not set");
+        return _clockExtension;
+    }
+
+    function maxClockDuration() public view returns (uint256) {
+        require(_maxClockDuration <= type(uint64).max, "DeployDisputeGame: maxClockDuration must fit inside uint64");
+        require(_maxClockDuration != 0, "DeployDisputeGame: maxClockDuration not set");
+        return _maxClockDuration;
+    }
+
+    function delayedWethProxy() public view returns (IDelayedWETH) {
+        require(address(_delayedWethProxy) != address(0), "DeployDisputeGame: delayedWethProxy not set");
+        return _delayedWethProxy;
+    }
+
+    function anchorStateRegistryProxy() public view returns (IAnchorStateRegistry) {
+        require(address(_anchorStateRegistryProxy) != address(0), "DeployDisputeGame: anchorStateRegistryProxy not set");
+        return _anchorStateRegistryProxy;
+    }
+
+    function l2ChainId() public view returns (uint256) {
+        require(_l2ChainId != 0, "DeployDisputeGame: l2ChainId not set");
+        return _l2ChainId;
+    }
+
+    function proposer() public view returns (address) {
+        if (LibString.eq(_gameKind, "FaultDisputeGame")) {
+            require(_proposer == address(0), "DeployDisputeGame: proposer must be empty");
+        } else {
+            require(_proposer != address(0), "DeployDisputeGame: proposer not set");
+        }
+        return _proposer;
+    }
+
+    function challenger() public view returns (address) {
+        if (LibString.eq(_gameKind, "FaultDisputeGame")) {
+            require(_challenger == address(0), "DeployDisputeGame: challenger must be empty");
+        } else {
+            require(_challenger != address(0), "DeployDisputeGame: challenger not set");
+        }
+        return _challenger;
+    }
+}
+
+/// @title DeployDisputeGameOutput
+contract DeployDisputeGameOutput is BaseDeployIO {
+    // PermissionedDisputeGame is used as the type here because it has all of the same functions as
+    // FaultDisputeGame but with the added proposer and challenger fields.
+    IPermissionedDisputeGame internal _disputeGameImpl;
+    IMIPS internal _mipsSingleton;
+    IPreimageOracle internal _preimageOracleSingleton;
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.disputeGameImpl.selector) {
+            require(_value != address(0), "DeployDisputeGame: disputeGameImpl cannot be zero address");
+            _disputeGameImpl = IPermissionedDisputeGame(_value);
+        } else if (_sel == this.mipsSingleton.selector) {
+            require(_value != address(0), "DeployDisputeGame: mipsSingleton cannot be zero address");
+            _mipsSingleton = IMIPS(_value);
+        } else if (_sel == this.preimageOracleSingleton.selector) {
+            require(_value != address(0), "DeployDisputeGame: preimageOracleSingleton cannot be zero address");
+            _preimageOracleSingleton = IPreimageOracle(_value);
+        } else {
+            revert("DeployDisputeGame: unknown selector");
+        }
+    }
+
+    function checkOutput(DeployDisputeGameInput _dgi) public view {
+        DeployUtils.assertValidContractAddress(address(_preimageOracleSingleton));
+        DeployUtils.assertValidContractAddress(address(_mipsSingleton));
+        DeployUtils.assertValidContractAddress(address(_disputeGameImpl));
+        assertValidDeploy(_dgi);
+    }
+
+    function preimageOracleSingleton() public view returns (IPreimageOracle) {
+        DeployUtils.assertValidContractAddress(address(_preimageOracleSingleton));
+        return _preimageOracleSingleton;
+    }
+
+    function mipsSingleton() public view returns (IMIPS) {
+        DeployUtils.assertValidContractAddress(address(_mipsSingleton));
+        return _mipsSingleton;
+    }
+
+    function disputeGameImpl() public view returns (IPermissionedDisputeGame) {
+        DeployUtils.assertValidContractAddress(address(_disputeGameImpl));
+        return _disputeGameImpl;
+    }
+
+    function assertValidDeploy(DeployDisputeGameInput _dgi) public view {
+        assertValidPreimageOracleSingleton(_dgi);
+        assertValidMipsSingleton(_dgi);
+        assertValidDisputeGameImpl(_dgi);
+    }
+
+    function assertValidPreimageOracleSingleton(DeployDisputeGameInput _dgi) internal view {
+        IPreimageOracle oracle = preimageOracleSingleton();
+
+        require(oracle.minProposalSize() == _dgi.minProposalSizeBytes(), "PO-10");
+        require(oracle.challengePeriod() == _dgi.challengePeriodSeconds(), "PO-20");
+    }
+
+    function assertValidMipsSingleton(DeployDisputeGameInput) internal view {
+        IMIPS mips = mipsSingleton();
+
+        require(address(mips.oracle()) == address(preimageOracleSingleton()), "MIPS-10");
+    }
+
+    function assertValidDisputeGameImpl(DeployDisputeGameInput _dgi) internal view {
+        IPermissionedDisputeGame game = disputeGameImpl();
+
+        require(game.gameType().raw() == uint32(_dgi.gameType()), "DG-10");
+        require(game.maxGameDepth() == _dgi.maxGameDepth(), "DG-20");
+        require(game.splitDepth() == _dgi.splitDepth(), "DG-30");
+        require(game.clockExtension().raw() == uint64(_dgi.clockExtension()), "DG-40");
+        require(game.maxClockDuration().raw() == uint64(_dgi.maxClockDuration()), "DG-50");
+        require(game.vm() == IBigStepper(address(mipsSingleton())), "DG-60");
+        require(game.weth() == _dgi.delayedWethProxy(), "DG-70");
+        require(game.anchorStateRegistry() == _dgi.anchorStateRegistryProxy(), "DG-80");
+        require(game.l2ChainId() == _dgi.l2ChainId(), "DG-90");
+
+        if (LibString.eq(_dgi.gameKind(), "PermissionedDisputeGame")) {
+            require(game.proposer() == _dgi.proposer(), "DG-100");
+            require(game.challenger() == _dgi.challenger(), "DG-110");
+        }
+    }
+}
+
+/// @title DeployDisputeGame
+contract DeployDisputeGame is Script {
+    /// We need a struct for constructor args to avoid stack-too-deep errors.
+    struct DisputeGameConstructorArgs {
+        GameType gameType;
+        Claim absolutePrestate;
+        uint256 maxGameDepth;
+        uint256 splitDepth;
+        Duration clockExtension;
+        Duration maxClockDuration;
+        IBigStepper gameVm;
+        IDelayedWETH delayedWethProxy;
+        IAnchorStateRegistry anchorStateRegistryProxy;
+        uint256 l2ChainId;
+        address proposer;
+        address challenger;
+    }
+
+    function run(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) public {
+        deployPreimageOracleSingleton(_dgi, _dgo);
+        deployMipsSingleton(_dgi, _dgo);
+        deployDisputeGameImpl(_dgi, _dgo);
+        _dgo.checkOutput(_dgi);
+    }
+
+    function deployPreimageOracleSingleton(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) internal {
+        string memory release = _dgi.release();
+        string memory stdVerToml = _dgi.standardVersionsToml();
+        string memory contractName = "preimage_oracle";
+        IPreimageOracle singleton;
+
+        address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
+        if (existingImplementation != address(0)) {
+            singleton = IPreimageOracle(payable(existingImplementation));
+        } else if (isDevelopRelease(release)) {
+            uint256 minProposalSizeBytes = _dgi.minProposalSizeBytes();
+            uint256 challengePeriodSeconds = _dgi.challengePeriodSeconds();
+            vm.broadcast(msg.sender);
+            singleton = IPreimageOracle(
+                DeployUtils.create1({
+                    _name: "PreimageOracle",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(IPreimageOracle.__constructor__, (minProposalSizeBytes, challengePeriodSeconds))
+                    )
+                })
+            );
+        } else {
+            revert(string.concat("DeployImplementations: failed to deploy release ", release));
+        }
+
+        vm.label(address(singleton), "PreimageOracleSingleton");
+        _dgo.set(_dgo.preimageOracleSingleton.selector, address(singleton));
+    }
+
+    function deployMipsSingleton(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) internal {
+        string memory release = _dgi.release();
+        string memory stdVerToml = _dgi.standardVersionsToml();
+        string memory contractName = "mips";
+        IMIPS singleton;
+
+        address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
+        if (existingImplementation != address(0)) {
+            singleton = IMIPS(payable(existingImplementation));
+        } else if (isDevelopRelease(release)) {
+            uint256 mipsVersion = _dgi.mipsVersion();
+            IPreimageOracle preimageOracle = IPreimageOracle(address(_dgo.preimageOracleSingleton()));
+            vm.broadcast(msg.sender);
+            singleton = IMIPS(
+                DeployUtils.create1({
+                    _name: mipsVersion == 1 ? "MIPS" : "MIPS2",
+                    _args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS.__constructor__, (preimageOracle)))
+                })
+            );
+        } else {
+            revert(string.concat("DeployImplementations: failed to deploy release ", release));
+        }
+
+        vm.label(address(singleton), "MIPSSingleton");
+        _dgo.set(_dgo.mipsSingleton.selector, address(singleton));
+    }
+
+    function deployDisputeGameImpl(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) internal {
+        // Shove the arguments into a struct to avoid stack-too-deep errors.
+        DisputeGameConstructorArgs memory args = DisputeGameConstructorArgs({
+            gameType: GameType.wrap(uint32(_dgi.gameType())),
+            absolutePrestate: Claim.wrap(_dgi.absolutePrestate()),
+            maxGameDepth: _dgi.maxGameDepth(),
+            splitDepth: _dgi.splitDepth(),
+            clockExtension: Duration.wrap(uint64(_dgi.clockExtension())),
+            maxClockDuration: Duration.wrap(uint64(_dgi.maxClockDuration())),
+            gameVm: IBigStepper(address(_dgo.mipsSingleton())),
+            delayedWethProxy: _dgi.delayedWethProxy(),
+            anchorStateRegistryProxy: _dgi.anchorStateRegistryProxy(),
+            l2ChainId: _dgi.l2ChainId(),
+            proposer: _dgi.proposer(),
+            challenger: _dgi.challenger()
+        });
+
+        // PermissionedDisputeGame is used as the type here because it is a superset of
+        // FaultDisputeGame. If the user requests to deploy a FaultDisputeGame, the user will get a
+        // FaultDisputeGame (and not a PermissionedDisputeGame).
+        vm.broadcast(msg.sender);
+        IPermissionedDisputeGame impl;
+        if (LibString.eq(_dgi.gameKind(), "FaultDisputeGame")) {
+            impl = IPermissionedDisputeGame(
+                DeployUtils.create1({
+                    _name: "FaultDisputeGame",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(
+                            IFaultDisputeGame.__constructor__,
+                            (
+                                args.gameType,
+                                args.absolutePrestate,
+                                args.maxGameDepth,
+                                args.splitDepth,
+                                args.clockExtension,
+                                args.maxClockDuration,
+                                args.gameVm,
+                                args.delayedWethProxy,
+                                args.anchorStateRegistryProxy,
+                                args.l2ChainId
+                            )
+                        )
+                    )
+                })
+            );
+        } else {
+            impl = IPermissionedDisputeGame(
+                DeployUtils.create1({
+                    _name: "PermissionedDisputeGame",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(
+                            IPermissionedDisputeGame.__constructor__,
+                            (
+                                args.gameType,
+                                args.absolutePrestate,
+                                args.maxGameDepth,
+                                args.splitDepth,
+                                args.clockExtension,
+                                args.maxClockDuration,
+                                args.gameVm,
+                                args.delayedWethProxy,
+                                args.anchorStateRegistryProxy,
+                                args.l2ChainId,
+                                args.proposer,
+                                args.challenger
+                            )
+                        )
+                    )
+                })
+            );
+        }
+
+        vm.label(address(impl), string.concat(_dgi.gameKind(), "Impl"));
+        _dgo.set(_dgo.disputeGameImpl.selector, address(impl));
+    }
+
+    // Zero address is returned if the address is not found in '_standardVersionsToml'.
+    function getReleaseAddress(
+        string memory _version,
+        string memory _contractName,
+        string memory _standardVersionsToml
+    )
+        internal
+        pure
+        returns (address addr_)
+    {
+        string memory baseKey = string.concat('.releases["', _version, '"].', _contractName);
+        string memory implAddressKey = string.concat(baseKey, ".implementation_address");
+        string memory addressKey = string.concat(baseKey, ".address");
+        try vm.parseTomlAddress(_standardVersionsToml, implAddressKey) returns (address parsedAddr_) {
+            addr_ = parsedAddr_;
+        } catch {
+            try vm.parseTomlAddress(_standardVersionsToml, addressKey) returns (address parsedAddr_) {
+                addr_ = parsedAddr_;
+            } catch {
+                addr_ = address(0);
+            }
+        }
+    }
+
+    // A release is considered a 'develop' release if it does not start with 'op-contracts'.
+    function isDevelopRelease(string memory _release) internal pure returns (bool) {
+        return !LibString.startsWith(_release, "op-contracts");
+    }
+}

From c73832d58507d283a7ef0ee4aa5391bb32b145ab Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Sat, 2 Nov 2024 16:59:52 +0800
Subject: [PATCH 113/451] remove unnecessary assignment to `--l2-eth-rpc`
 (#12796)

---
 op-challenger/cmd/main_test.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/op-challenger/cmd/main_test.go b/op-challenger/cmd/main_test.go
index d960fa607059..1de92468306c 100644
--- a/op-challenger/cmd/main_test.go
+++ b/op-challenger/cmd/main_test.go
@@ -1022,7 +1022,6 @@ func addRequiredCannonArgs(args map[string]string) {
 	args["--cannon-bin"] = cannonBin
 	args["--cannon-server"] = cannonServer
 	args["--cannon-prestate"] = cannonPreState
-	args["--l2-eth-rpc"] = l2EthRpc
 }
 
 func addRequiredAsteriscArgs(args map[string]string) {
@@ -1030,7 +1029,6 @@ func addRequiredAsteriscArgs(args map[string]string) {
 	args["--asterisc-bin"] = asteriscBin
 	args["--asterisc-server"] = asteriscServer
 	args["--asterisc-prestate"] = asteriscPreState
-	args["--l2-eth-rpc"] = l2EthRpc
 }
 
 func addRequiredAsteriscKonaArgs(args map[string]string) {
@@ -1038,7 +1036,6 @@ func addRequiredAsteriscKonaArgs(args map[string]string) {
 	args["--asterisc-bin"] = asteriscBin
 	args["--asterisc-kona-server"] = asteriscServer
 	args["--asterisc-kona-prestate"] = asteriscPreState
-	args["--l2-eth-rpc"] = l2EthRpc
 }
 
 func toArgList(req map[string]string) []string {

From fcb462f9108b423c6bf07e39d0e876dc5321f7d7 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Mon, 4 Nov 2024 19:57:03 +1000
Subject: [PATCH 114/451] op-e2e: Add action test for op-program trace
 extension behaviour. (#12803)

---
 op-e2e/actions/proofs/helpers/env.go          |  6 ++
 op-e2e/actions/proofs/trace_extension_test.go | 68 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 op-e2e/actions/proofs/trace_extension_test.go

diff --git a/op-e2e/actions/proofs/helpers/env.go b/op-e2e/actions/proofs/helpers/env.go
index 45e8b4d7e346..aa13eb6331a4 100644
--- a/op-e2e/actions/proofs/helpers/env.go
+++ b/op-e2e/actions/proofs/helpers/env.go
@@ -145,6 +145,12 @@ func WithL2Claim(claim common.Hash) FixtureInputParam {
 	}
 }
 
+func WithL2BlockNumber(num uint64) FixtureInputParam {
+	return func(f *FixtureInputs) {
+		f.L2BlockNumber = num
+	}
+}
+
 func (env *L2FaultProofEnv) RunFaultProofProgram(t helpers.Testing, l2ClaimBlockNum uint64, checkResult CheckResult, fixtureInputParams ...FixtureInputParam) {
 	// Fetch the pre and post output roots for the fault proof.
 	preRoot, err := env.Sequencer.RollupClient().OutputAtBlock(t.Ctx(), l2ClaimBlockNum-1)
diff --git a/op-e2e/actions/proofs/trace_extension_test.go b/op-e2e/actions/proofs/trace_extension_test.go
new file mode 100644
index 000000000000..7dac46594d2c
--- /dev/null
+++ b/op-e2e/actions/proofs/trace_extension_test.go
@@ -0,0 +1,68 @@
+package proofs
+
+import (
+	"testing"
+
+	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/actions/proofs/helpers"
+	"github.com/ethereum-optimism/optimism/op-program/client/claim"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func runSafeHeadTraceExtensionTest(gt *testing.T, testCfg *helpers.TestCfg[any]) {
+	t := actionsHelpers.NewDefaultTesting(gt)
+	env := helpers.NewL2FaultProofEnv(t, testCfg, helpers.NewTestParams(), helpers.NewBatcherCfg())
+
+	// Build an empty block on L2
+	env.Sequencer.ActL2StartBlock(t)
+	env.Sequencer.ActL2EndBlock(t)
+
+	// Instruct the batcher to submit the block to L1, and include the transaction.
+	env.Batcher.ActSubmitAll(t)
+	env.Miner.ActL1StartBlock(12)(t)
+	env.Miner.ActL1IncludeTxByHash(env.Batcher.LastSubmitted.Hash())(t)
+	env.Miner.ActL1EndBlock(t)
+
+	// Instruct the sequencer to derive the L2 chain from the data on L1 that the batcher just posted.
+	env.Sequencer.ActL1HeadSignal(t)
+	env.Sequencer.ActL2PipelineFull(t)
+
+	l1Head := env.Miner.L1Chain().CurrentBlock()
+	l2SafeHead := env.Engine.L2Chain().CurrentSafeBlock()
+
+	// Ensure there is only 1 block on L1.
+	require.Equal(t, uint64(1), l1Head.Number.Uint64())
+	// Ensure the block is marked as safe before we attempt to fault prove it.
+	require.Equal(t, uint64(1), l2SafeHead.Number.Uint64())
+
+	// Set claimed L2 block number to be past the actual safe head (still using the safe head output as the claim)
+	params := []helpers.FixtureInputParam{helpers.WithL2BlockNumber(l2SafeHead.Number.Uint64() + 1)}
+	params = append(params, testCfg.InputParams...)
+	env.RunFaultProofProgram(t, l2SafeHead.Number.Uint64(), testCfg.CheckResult, params...)
+}
+
+// Test_ProgramAction_SafeHeadTraceExtension checks that op-program correctly handles the trace extension case where
+// the claimed l2 block number is after the safe head. The honest actor should repeat the output root from the safe head
+// and op-program should consider it valid even though the claimed l2 block number is not reached.
+// Output roots other than from the safe head should be invalid if the claimed l2 block number is not reached.
+func Test_ProgramAction_SafeHeadTraceExtension(gt *testing.T) {
+	matrix := helpers.NewMatrix[any]()
+	defer matrix.Run(gt)
+
+	matrix.AddTestCase(
+		"HonestClaim",
+		nil,
+		helpers.LatestForkOnly,
+		runSafeHeadTraceExtensionTest,
+		helpers.ExpectNoError(),
+	)
+	matrix.AddTestCase(
+		"JunkClaim",
+		nil,
+		helpers.LatestForkOnly,
+		runSafeHeadTraceExtensionTest,
+		helpers.ExpectError(claim.ErrClaimNotValid),
+		helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
+	)
+}

From 5cc83a8e2780bdeaa8e5699f86311e70d1e32bcb Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Mon, 4 Nov 2024 20:12:14 +1000
Subject: [PATCH 115/451] op-program: Run until all events are exhausted
 instead of running until the derivation is idle (#12804)

* op-e2e: Add action test for op-program trace extension behaviour.

* op-program: Run until all events are exhausted instead of running until the derivation is idle.
---
 op-program/client/driver/driver.go       | 5 ++---
 op-program/client/driver/driver_test.go  | 5 +++--
 op-program/client/driver/program.go      | 4 ----
 op-program/client/driver/program_test.go | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/op-program/client/driver/driver.go b/op-program/client/driver/driver.go
index fc232c5fcd43..56fffb5b155c 100644
--- a/op-program/client/driver/driver.go
+++ b/op-program/client/driver/driver.go
@@ -73,15 +73,14 @@ func (d *Driver) Emit(ev event.Event) {
 	d.events = append(d.events, ev)
 }
 
-var ExhaustErr = errors.New("exhausted events before completing program")
-
 func (d *Driver) RunComplete() error {
 	// Initial reset
 	d.Emit(engine.ResetEngineRequestEvent{})
 
 	for !d.end.Closing() {
 		if len(d.events) == 0 {
-			return ExhaustErr
+			d.logger.Info("Derivation complete: no further data to process")
+			return d.end.Result()
 		}
 		if len(d.events) > 10000 { // sanity check, in case of bugs. Better than going OOM.
 			return errors.New("way too many events queued up, something is wrong")
diff --git a/op-program/client/driver/driver_test.go b/op-program/client/driver/driver_test.go
index 2f1249aff6a4..8a5d02fe83f9 100644
--- a/op-program/client/driver/driver_test.go
+++ b/op-program/client/driver/driver_test.go
@@ -92,7 +92,8 @@ func TestDriver(t *testing.T) {
 			}
 			count += 1
 		})
-		require.ErrorIs(t, ExhaustErr, d.RunComplete())
+		// No further processing to be done so evaluate if the claims output root is correct.
+		require.NoError(t, d.RunComplete())
 	})
 
 	t.Run("queued events", func(t *testing.T) {
@@ -104,7 +105,7 @@ func TestDriver(t *testing.T) {
 			}
 			count += 1
 		})
-		require.ErrorIs(t, ExhaustErr, d.RunComplete())
+		require.NoError(t, d.RunComplete())
 		// add 1 for initial event that RunComplete fires
 		require.Equal(t, 1+3*2, count, "must have queued up 2 events 3 times")
 	})
diff --git a/op-program/client/driver/program.go b/op-program/client/driver/program.go
index 0ef36f8f6a47..cb3cd65542cc 100644
--- a/op-program/client/driver/program.go
+++ b/op-program/client/driver/program.go
@@ -62,10 +62,6 @@ func (d *ProgramDeriver) OnEvent(ev event.Event) bool {
 			d.logger.Info("Derivation complete: reached L2 block", "head", x.SafeL2Head)
 			d.closing = true
 		}
-	case derive.DeriverIdleEvent:
-		// Not enough data to reach target
-		d.closing = true
-		d.logger.Info("Derivation complete: no further data to process")
 	case rollup.ResetEvent:
 		d.closing = true
 		d.result = fmt.Errorf("unexpected reset error: %w", x.Err)
diff --git a/op-program/client/driver/program_test.go b/op-program/client/driver/program_test.go
index 4c9941d754b4..59206050a7f8 100644
--- a/op-program/client/driver/program_test.go
+++ b/op-program/client/driver/program_test.go
@@ -104,12 +104,12 @@ func TestProgramDeriver(t *testing.T) {
 			require.NoError(t, p.result)
 		})
 	})
-	// on exhaustion of input data: stop without error
+	// Do not stop processing when the deriver is idle, the engine may still be busy and create further events.
 	t.Run("deriver idle", func(t *testing.T) {
 		p, m := newProgram(t, 1000)
 		p.OnEvent(derive.DeriverIdleEvent{})
 		m.AssertExpectations(t)
-		require.True(t, p.closing)
+		require.False(t, p.closing)
 		require.Nil(t, p.result)
 	})
 	// on inconsistent chain data: stop with error

From afe849ea0b0f5ee5889e0fe440ad7827d7ceef5f Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 4 Nov 2024 18:06:41 +0700
Subject: [PATCH 116/451] op-e2e/actions: Add Holocene FP action tests (#12520)

* Add Holocene action tests

* fix invalid batch tests

* Handle rpc.Errors directly instead of relying on eth.InputErrors

The fault proof program's L2 Engine API doesn't return eth.InputErrors,
like the sources engine client, but directly returns rpc.Errors.
So instead of relying on this translation, derivers need to deal
directly with rpc.Errors.

* In TryBackupUnsafeReorg, only reset on InvalidForkchoiceState error code

* Add logs

* include genesis FPP tests

---------

Co-authored-by: Sebastian Stammler <seb@oplabs.co>
---
 op-e2e/actions/helpers/l2_batcher.go          | 100 +++++---
 op-e2e/actions/helpers/l2_engine.go           |  21 ++
 op-e2e/actions/helpers/l2_sequencer.go        |  17 +-
 op-e2e/actions/proofs/bad_tx_in_batch_test.go |   6 +-
 op-e2e/actions/proofs/helpers/env.go          |   7 +-
 .../actions/proofs/holocene_batches_test.go   | 142 +++++++++++
 op-e2e/actions/proofs/holocene_frame_test.go  | 156 ++++++++++++
 .../proofs/holocene_invalid_batch_test.go     | 236 ++++++++++++++++++
 op-e2e/actions/proofs/l1_lookback_test.go     |   3 +-
 op-e2e/actions/sync/sync_test.go              |   4 +-
 op-e2e/actions/upgrades/holocene_fork_test.go |   3 +-
 op-e2e/opgeth/op_geth_test.go                 |  22 +-
 op-node/rollup/derive/attributes.go           |  12 +-
 op-node/rollup/engine/build_cancel.go         |   7 +-
 op-node/rollup/engine/build_seal.go           |   6 +-
 op-node/rollup/engine/engine_controller.go    |  33 +--
 op-node/rollup/engine/engine_update.go        |  13 +-
 op-node/rollup/engine/events.go               |   3 +
 op-program/client/driver/program.go           |   4 +
 .../client/l2/engineapi/l2_engine_api.go      |   2 +-
 op-service/eth/types.go                       |   8 +-
 op-service/eth/types_test.go                  |   5 +
 op-service/sources/engine_client.go           |  48 +---
 23 files changed, 742 insertions(+), 116 deletions(-)
 create mode 100644 op-e2e/actions/proofs/holocene_batches_test.go
 create mode 100644 op-e2e/actions/proofs/holocene_frame_test.go
 create mode 100644 op-e2e/actions/proofs/holocene_invalid_batch_test.go

diff --git a/op-e2e/actions/helpers/l2_batcher.go b/op-e2e/actions/helpers/l2_batcher.go
index a2121f77ca54..9fc9971a26e2 100644
--- a/op-e2e/actions/helpers/l2_batcher.go
+++ b/op-e2e/actions/helpers/l2_batcher.go
@@ -150,7 +150,48 @@ func (s *L2Batcher) ActL2BatchBuffer(t Testing, opts ...BlockModifier) {
 	require.NoError(t, s.Buffer(t, opts...), "failed to add block to channel")
 }
 
-type BlockModifier = func(block *types.Block)
+// ActCreateChannel creates a channel if we don't have one yet.
+func (s *L2Batcher) ActCreateChannel(t Testing, useSpanChannelOut bool) {
+	var err error
+	if s.L2ChannelOut == nil {
+		var ch ChannelOutIface
+		if s.l2BatcherCfg.GarbageCfg != nil {
+			ch, err = NewGarbageChannelOut(s.l2BatcherCfg.GarbageCfg)
+		} else {
+			target := batcher.MaxDataSize(1, s.l2BatcherCfg.MaxL1TxSize)
+			c, e := compressor.NewShadowCompressor(compressor.Config{
+				TargetOutputSize: target,
+				CompressionAlgo:  derive.Zlib,
+			})
+			require.NoError(t, e, "failed to create compressor")
+
+			if s.l2BatcherCfg.ForceSubmitSingularBatch && s.l2BatcherCfg.ForceSubmitSpanBatch {
+				t.Fatalf("ForceSubmitSingularBatch and ForceSubmitSpanBatch cannot be set to true at the same time")
+			} else {
+				chainSpec := rollup.NewChainSpec(s.rollupCfg)
+				// use span batch if we're forcing it or if we're at/beyond delta
+				if s.l2BatcherCfg.ForceSubmitSpanBatch || useSpanChannelOut {
+					ch, err = derive.NewSpanChannelOut(target, derive.Zlib, chainSpec)
+					// use singular batches in all other cases
+				} else {
+					ch, err = derive.NewSingularChannelOut(c, chainSpec)
+				}
+			}
+		}
+		require.NoError(t, err, "failed to create channel")
+		s.L2ChannelOut = ch
+	}
+}
+
+type BlockModifier = func(block *types.Block) *types.Block
+
+func BlockLogger(t e2eutils.TestingBase) BlockModifier {
+	f := func(block *types.Block) *types.Block {
+		t.Log("added block", "num", block.Number(), "txs", block.Transactions(), "time", block.Time())
+		return block
+	}
+	return f
+}
 
 func (s *L2Batcher) Buffer(t Testing, opts ...BlockModifier) error {
 	if s.l2Submitting { // break ongoing submitting work if necessary
@@ -197,38 +238,13 @@ func (s *L2Batcher) Buffer(t Testing, opts ...BlockModifier) error {
 
 	// Apply modifications to the block
 	for _, f := range opts {
-		f(block)
+		if f != nil {
+			block = f(block)
+		}
 	}
 
-	// Create channel if we don't have one yet
-	if s.L2ChannelOut == nil {
-		var ch ChannelOutIface
-		if s.l2BatcherCfg.GarbageCfg != nil {
-			ch, err = NewGarbageChannelOut(s.l2BatcherCfg.GarbageCfg)
-		} else {
-			target := batcher.MaxDataSize(1, s.l2BatcherCfg.MaxL1TxSize)
-			c, e := compressor.NewShadowCompressor(compressor.Config{
-				TargetOutputSize: target,
-				CompressionAlgo:  derive.Zlib,
-			})
-			require.NoError(t, e, "failed to create compressor")
+	s.ActCreateChannel(t, s.rollupCfg.IsDelta(block.Time()))
 
-			if s.l2BatcherCfg.ForceSubmitSingularBatch && s.l2BatcherCfg.ForceSubmitSpanBatch {
-				t.Fatalf("ForceSubmitSingularBatch and ForceSubmitSpanBatch cannot be set to true at the same time")
-			} else {
-				chainSpec := rollup.NewChainSpec(s.rollupCfg)
-				// use span batch if we're forcing it or if we're at/beyond delta
-				if s.l2BatcherCfg.ForceSubmitSpanBatch || s.rollupCfg.IsDelta(block.Time()) {
-					ch, err = derive.NewSpanChannelOut(target, derive.Zlib, chainSpec)
-					// use singular batches in all other cases
-				} else {
-					ch, err = derive.NewSingularChannelOut(c, chainSpec)
-				}
-			}
-		}
-		require.NoError(t, err, "failed to create channel")
-		s.L2ChannelOut = ch
-	}
 	if _, err := s.L2ChannelOut.AddBlock(s.rollupCfg, block); err != nil {
 		return err
 	}
@@ -238,6 +254,30 @@ func (s *L2Batcher) Buffer(t Testing, opts ...BlockModifier) error {
 	return nil
 }
 
+// ActAddBlockByNumber causes the batcher to pull the block with the provided
+// number, and add it to its ChannelOut.
+func (s *L2Batcher) ActAddBlockByNumber(t Testing, blockNumber int64, opts ...BlockModifier) {
+	block, err := s.l2.BlockByNumber(t.Ctx(), big.NewInt(blockNumber))
+	require.NoError(t, err)
+	require.NotNil(t, block)
+
+	// cache block hash before we modify the block
+	blockHash := block.Hash()
+
+	// Apply modifications to the block
+	for _, f := range opts {
+		if f != nil {
+			block = f(block)
+		}
+	}
+
+	_, err = s.L2ChannelOut.AddBlock(s.rollupCfg, block)
+	require.NoError(t, err)
+	ref, err := s.engCl.L2BlockRefByHash(t.Ctx(), blockHash)
+	require.NoError(t, err, "failed to get L2BlockRef")
+	s.L2BufferedBlock = ref
+}
+
 func (s *L2Batcher) ActL2ChannelClose(t Testing) {
 	// Don't run this action if there's no data to submit
 	if s.L2ChannelOut == nil {
diff --git a/op-e2e/actions/helpers/l2_engine.go b/op-e2e/actions/helpers/l2_engine.go
index 963a18769e6c..8d2f318a08dc 100644
--- a/op-e2e/actions/helpers/l2_engine.go
+++ b/op-e2e/actions/helpers/l2_engine.go
@@ -191,9 +191,30 @@ func (e *L2Engine) ActL2RPCFail(t Testing, err error) {
 	}
 }
 
+// ActL2IncludeTx includes the next transaction from the given address in the block that is being built,
+// skipping the usual check for e.EngineApi.ForcedEmpty()
+func (e *L2Engine) ActL2IncludeTxIgnoreForcedEmpty(from common.Address) Action {
+	return func(t Testing) {
+		if e.EngineApi.ForcedEmpty() {
+			e.log.Info("Ignoring e.L2ForceEmpty=true")
+		}
+
+		tx := firstValidTx(t, from, e.EngineApi.PendingIndices, e.Eth.TxPool().ContentFrom, e.EthClient().NonceAt)
+		err := e.EngineApi.IncludeTx(tx, from)
+		if errors.Is(err, engineapi.ErrNotBuildingBlock) {
+			t.InvalidAction(err.Error())
+		} else if errors.Is(err, engineapi.ErrUsesTooMuchGas) {
+			t.InvalidAction("included tx uses too much gas: %v", err)
+		} else if err != nil {
+			require.NoError(t, err, "include tx")
+		}
+	}
+}
+
 // ActL2IncludeTx includes the next transaction from the given address in the block that is being built
 func (e *L2Engine) ActL2IncludeTx(from common.Address) Action {
 	return func(t Testing) {
+
 		if e.EngineApi.ForcedEmpty() {
 			e.log.Info("Skipping including a transaction because e.L2ForceEmpty is true")
 			return
diff --git a/op-e2e/actions/helpers/l2_sequencer.go b/op-e2e/actions/helpers/l2_sequencer.go
index 23fe7b0686f8..daf267839581 100644
--- a/op-e2e/actions/helpers/l2_sequencer.go
+++ b/op-e2e/actions/helpers/l2_sequencer.go
@@ -43,7 +43,8 @@ func (m *MockL1OriginSelector) FindL1Origin(ctx context.Context, l2Head eth.L2Bl
 type L2Sequencer struct {
 	*L2Verifier
 
-	sequencer *sequencing.Sequencer
+	sequencer   *sequencing.Sequencer
+	attrBuilder *derive.FetchingAttributesBuilder
 
 	failL2GossipUnsafeBlock error // mock error
 
@@ -85,6 +86,7 @@ func NewL2Sequencer(t Testing, log log.Logger, l1 derive.L1Fetcher, blobSrc deri
 	return &L2Sequencer{
 		L2Verifier:              ver,
 		sequencer:               seq,
+		attrBuilder:             attrBuilder,
 		mockL1OriginSelector:    l1OriginSelector,
 		failL2GossipUnsafeBlock: nil,
 	}
@@ -139,12 +141,23 @@ func (s *L2Sequencer) ActL2EmptyBlock(t Testing) {
 // ActL2KeepL1Origin makes the sequencer use the current L1 origin, even if the next origin is available.
 func (s *L2Sequencer) ActL2KeepL1Origin(t Testing) {
 	parent := s.engine.UnsafeL2Head()
-	// force old origin, for testing purposes
+	// force old origin
 	oldOrigin, err := s.l1.L1BlockRefByHash(t.Ctx(), parent.L1Origin.Hash)
 	require.NoError(t, err, "failed to get current origin: %s", parent.L1Origin)
 	s.mockL1OriginSelector.originOverride = oldOrigin
 }
 
+// ActL2ForceAdvanceL1Origin forces the sequencer to advance the current L1 origin, even if the next origin's timestamp is too new.
+func (s *L2Sequencer) ActL2ForceAdvanceL1Origin(t Testing) {
+	s.attrBuilder.TestSkipL1OriginCheck() // skip check in attributes builder
+	parent := s.engine.UnsafeL2Head()
+	// force next origin
+	nextNum := parent.L1Origin.Number + 1
+	nextOrigin, err := s.l1.L1BlockRefByNumber(t.Ctx(), nextNum)
+	require.NoError(t, err, "failed to get next origin by number: %d", nextNum)
+	s.mockL1OriginSelector.originOverride = nextOrigin
+}
+
 // ActBuildToL1Head builds empty blocks until (incl.) the L1 head becomes the L2 origin
 func (s *L2Sequencer) ActBuildToL1Head(t Testing) {
 	for s.engine.UnsafeL2Head().L1Origin.Number < s.syncStatus.L1Head().Number {
diff --git a/op-e2e/actions/proofs/bad_tx_in_batch_test.go b/op-e2e/actions/proofs/bad_tx_in_batch_test.go
index b750e8f9e649..ce6e37469c1b 100644
--- a/op-e2e/actions/proofs/bad_tx_in_batch_test.go
+++ b/op-e2e/actions/proofs/bad_tx_in_batch_test.go
@@ -26,12 +26,13 @@ func runBadTxInBatchTest(gt *testing.T, testCfg *helpers.TestCfg[any]) {
 	env.Alice.L2.ActCheckReceiptStatusOfLastTx(true)(t)
 
 	// Instruct the batcher to submit a faulty channel, with an invalid tx.
-	env.Batcher.ActL2BatchBuffer(t, func(block *types.Block) {
+	env.Batcher.ActL2BatchBuffer(t, func(block *types.Block) *types.Block {
 		// Replace the tx with one that has a bad signature.
 		txs := block.Transactions()
 		newTx, err := txs[1].WithSignature(env.Alice.L2.Signer(), make([]byte, 65))
 		txs[1] = newTx
 		require.NoError(t, err)
+		return block
 	})
 	env.Batcher.ActL2ChannelClose(t)
 	env.Batcher.ActL2BatchSubmit(t)
@@ -90,12 +91,13 @@ func runBadTxInBatch_ResubmitBadFirstFrame_Test(gt *testing.T, testCfg *helpers.
 	// Instruct the batcher to submit a faulty channel, with an invalid tx in the second block
 	// within the span batch.
 	env.Batcher.ActL2BatchBuffer(t)
-	err := env.Batcher.Buffer(t, func(block *types.Block) {
+	err := env.Batcher.Buffer(t, func(block *types.Block) *types.Block {
 		// Replace the tx with one that has a bad signature.
 		txs := block.Transactions()
 		newTx, err := txs[1].WithSignature(env.Alice.L2.Signer(), make([]byte, 65))
 		txs[1] = newTx
 		require.NoError(t, err)
+		return block
 	})
 	require.NoError(t, err)
 	env.Batcher.ActL2ChannelClose(t)
diff --git a/op-e2e/actions/proofs/helpers/env.go b/op-e2e/actions/proofs/helpers/env.go
index aa13eb6331a4..8ba29a6101ea 100644
--- a/op-e2e/actions/proofs/helpers/env.go
+++ b/op-e2e/actions/proofs/helpers/env.go
@@ -153,7 +153,12 @@ func WithL2BlockNumber(num uint64) FixtureInputParam {
 
 func (env *L2FaultProofEnv) RunFaultProofProgram(t helpers.Testing, l2ClaimBlockNum uint64, checkResult CheckResult, fixtureInputParams ...FixtureInputParam) {
 	// Fetch the pre and post output roots for the fault proof.
-	preRoot, err := env.Sequencer.RollupClient().OutputAtBlock(t.Ctx(), l2ClaimBlockNum-1)
+	l2PreBlockNum := l2ClaimBlockNum - 1
+	if l2ClaimBlockNum == 0 {
+		// If we are at genesis, we assert that we don't move the chain at all.
+		l2PreBlockNum = 0
+	}
+	preRoot, err := env.Sequencer.RollupClient().OutputAtBlock(t.Ctx(), l2PreBlockNum)
 	require.NoError(t, err)
 	claimRoot, err := env.Sequencer.RollupClient().OutputAtBlock(t.Ctx(), l2ClaimBlockNum)
 	require.NoError(t, err)
diff --git a/op-e2e/actions/proofs/holocene_batches_test.go b/op-e2e/actions/proofs/holocene_batches_test.go
new file mode 100644
index 000000000000..b67d2bd9da6d
--- /dev/null
+++ b/op-e2e/actions/proofs/holocene_batches_test.go
@@ -0,0 +1,142 @@
+package proofs
+
+import (
+	"fmt"
+	"testing"
+
+	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/actions/proofs/helpers"
+	"github.com/ethereum-optimism/optimism/op-program/client/claim"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_ProgramAction_HoloceneBatches(gt *testing.T) {
+	type testCase struct {
+		name        string
+		blocks      []uint // blocks is an ordered list of blocks (by number) to add to a single channel.
+		isSpanBatch bool
+		holoceneExpectations
+	}
+
+	// Depending on the blocks list,  we expect a different
+	// progression of the safe head under Holocene
+	// derivation rules, compared with pre Holocene.
+	testCases := []testCase{
+		// Standard channel composition
+		{
+			name: "case-0", blocks: []uint{1, 2, 3},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3,
+				safeHeadHolocene:    3,
+			},
+		},
+
+		// Non-standard channel composition
+		{
+			name: "case-2a", blocks: []uint{1, 3, 2},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, // batches are buffered, so the block ordering does not matter
+				safeHeadHolocene:    1, // batch for block 3 is considered invalid because it is from the future. This batch + remaining channel is dropped.
+			},
+		},
+		{
+			name: "case-2b", blocks: []uint{2, 1, 3},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, // batches are buffered, so the block ordering does not matter
+				safeHeadHolocene:    0, // batch for block 2 is considered invalid because it is from the future. This batch + remaining channel is dropped.
+			},
+		},
+
+		{
+			name: "case-2c", blocks: []uint{1, 1, 2, 3},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, // duplicate batches are silently dropped, so this reduceds to case-0
+				safeHeadHolocene:    3, // duplicate batches are silently dropped
+			},
+		},
+		{
+			name: "case-2d", blocks: []uint{2, 2, 1, 3},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, // duplicate batches are silently dropped, so this reduces to case-2b
+				safeHeadHolocene:    0, // duplicate batches are silently dropped, so this reduces to case-2b
+			},
+		},
+	}
+
+	runHoloceneDerivationTest := func(gt *testing.T, testCfg *helpers.TestCfg[testCase]) {
+		t := actionsHelpers.NewDefaultTesting(gt)
+		env := helpers.NewL2FaultProofEnv(t, testCfg, helpers.NewTestParams(), helpers.NewBatcherCfg())
+
+		includeBatchTx := func() {
+			// Include the last transaction submitted by the batcher.
+			env.Miner.ActL1StartBlock(12)(t)
+			env.Miner.ActL1IncludeTxByHash(env.Batcher.LastSubmitted.Hash())(t)
+			env.Miner.ActL1EndBlock(t)
+		}
+
+		max := func(input []uint) uint {
+			max := uint(0)
+			for _, val := range input {
+				if val > max {
+					max = val
+				}
+			}
+			return max
+		}
+
+		targetHeadNumber := max(testCfg.Custom.blocks)
+		for env.Engine.L2Chain().CurrentBlock().Number.Uint64() < uint64(targetHeadNumber) {
+			env.Sequencer.ActL2StartBlock(t)
+			// Send an L2 tx
+			env.Alice.L2.ActResetTxOpts(t)
+			env.Alice.L2.ActSetTxToAddr(&env.Dp.Addresses.Bob)
+			env.Alice.L2.ActMakeTx(t)
+			env.Engine.ActL2IncludeTx(env.Alice.Address())(t)
+			env.Sequencer.ActL2EndBlock(t)
+		}
+
+		// Buffer the blocks in the batcher.
+		env.Batcher.ActCreateChannel(t, testCfg.Custom.isSpanBatch)
+		for _, blockNum := range testCfg.Custom.blocks {
+			env.Batcher.ActAddBlockByNumber(t, int64(blockNum), actionsHelpers.BlockLogger(t))
+		}
+		env.Batcher.ActL2ChannelClose(t)
+		frame := env.Batcher.ReadNextOutputFrame(t)
+		require.NotEmpty(t, frame)
+		env.Batcher.ActL2BatchSubmitRaw(t, frame)
+		includeBatchTx()
+
+		// Instruct the sequencer to derive the L2 chain from the data on L1 that the batcher just posted.
+		env.Sequencer.ActL1HeadSignal(t)
+		env.Sequencer.ActL2PipelineFull(t)
+
+		l2SafeHead := env.Sequencer.L2Safe()
+		testCfg.Custom.RequireExpectedProgress(t, l2SafeHead, testCfg.Hardfork.Precedence < helpers.Holocene.Precedence, env.Engine)
+
+		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
+
+		env.RunFaultProofProgram(t, l2SafeHead.Number, testCfg.CheckResult, testCfg.InputParams...)
+	}
+
+	matrix := helpers.NewMatrix[testCase]()
+	defer matrix.Run(gt)
+
+	for _, ordering := range testCases {
+		matrix.AddTestCase(
+			fmt.Sprintf("HonestClaim-%s", ordering.name),
+			ordering,
+			helpers.NewForkMatrix(helpers.Granite, helpers.LatestFork),
+			runHoloceneDerivationTest,
+			helpers.ExpectNoError(),
+		)
+		matrix.AddTestCase(
+			fmt.Sprintf("JunkClaim-%s", ordering.name),
+			ordering,
+			helpers.NewForkMatrix(helpers.Granite, helpers.LatestFork),
+			runHoloceneDerivationTest,
+			helpers.ExpectError(claim.ErrClaimNotValid),
+			helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
+		)
+	}
+}
diff --git a/op-e2e/actions/proofs/holocene_frame_test.go b/op-e2e/actions/proofs/holocene_frame_test.go
new file mode 100644
index 000000000000..5093527b758d
--- /dev/null
+++ b/op-e2e/actions/proofs/holocene_frame_test.go
@@ -0,0 +1,156 @@
+package proofs
+
+import (
+	"fmt"
+	"testing"
+
+	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/actions/proofs/helpers"
+	"github.com/ethereum-optimism/optimism/op-program/client/claim"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+type holoceneExpectations struct {
+	safeHeadPreHolocene uint64
+	safeHeadHolocene    uint64
+}
+
+func (h holoceneExpectations) RequireExpectedProgress(t actionsHelpers.StatefulTesting, actualSafeHead eth.L2BlockRef, isHolocene bool, engine *actionsHelpers.L2Engine) {
+	if isHolocene {
+		require.Equal(t, h.safeHeadPreHolocene, actualSafeHead.Number)
+		expectedHash := engine.L2Chain().GetBlockByNumber(h.safeHeadPreHolocene).Hash()
+		require.Equal(t, expectedHash, actualSafeHead.Hash)
+	} else {
+		require.Equal(t, h.safeHeadHolocene, actualSafeHead.Number)
+		expectedHash := engine.L2Chain().GetBlockByNumber(h.safeHeadHolocene).Hash()
+		require.Equal(t, expectedHash, actualSafeHead.Hash)
+	}
+}
+
+func Test_ProgramAction_HoloceneFrames(gt *testing.T) {
+	type testCase struct {
+		name   string
+		frames []uint
+		holoceneExpectations
+	}
+
+	// An ordered list of frames to read from the channel and submit
+	// on L1. We expect a different progression of the safe head under Holocene
+	// derivation rules, compared with pre Holocene.
+	testCases := []testCase{
+		// Standard frame submission,
+		{
+			name: "case-0", frames: []uint{0, 1, 2},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3,
+				safeHeadHolocene:    3,
+			},
+		},
+
+		// Non-standard frame submission
+		{
+			name: "case-1a", frames: []uint{2, 1, 0},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, // frames are buffered, so ordering does not matter
+				safeHeadHolocene:    0, // non-first frames will be dropped b/c it is the first seen with that channel Id. The safe head won't move until the channel is closed/completed.
+			},
+		},
+		{
+			name: "case-1b", frames: []uint{0, 1, 0, 2},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, // frames are buffered, so ordering does not matter
+				safeHeadHolocene:    0, // non-first frames will be dropped b/c it is the first seen with that channel Id. The safe head won't move until the channel is closed/completed.
+			},
+		},
+		{
+			name: "case-1c", frames: []uint{0, 1, 1, 2},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, // frames are buffered, so ordering does not matter
+				safeHeadHolocene:    3, // non-contiguous frames are dropped. So this reduces to case-0.
+			},
+		},
+	}
+
+	runHoloceneDerivationTest := func(gt *testing.T, testCfg *helpers.TestCfg[testCase]) {
+		t := actionsHelpers.NewDefaultTesting(gt)
+		env := helpers.NewL2FaultProofEnv(t, testCfg, helpers.NewTestParams(), helpers.NewBatcherCfg())
+
+		blocks := []uint{1, 2, 3}
+		targetHeadNumber := 3
+		for env.Engine.L2Chain().CurrentBlock().Number.Uint64() < uint64(targetHeadNumber) {
+			env.Sequencer.ActL2StartBlock(t)
+			// Send an L2 tx
+			env.Alice.L2.ActResetTxOpts(t)
+			env.Alice.L2.ActSetTxToAddr(&env.Dp.Addresses.Bob)
+			env.Alice.L2.ActMakeTx(t)
+			env.Engine.ActL2IncludeTx(env.Alice.Address())(t)
+			env.Sequencer.ActL2EndBlock(t)
+		}
+
+		// Build up a local list of frames
+		orderedFrames := make([][]byte, 0, len(testCfg.Custom.frames))
+		// Buffer the blocks in the batcher and populat orderedFrames list
+		env.Batcher.ActCreateChannel(t, false)
+		for i, blockNum := range blocks {
+			env.Batcher.ActAddBlockByNumber(t, int64(blockNum), actionsHelpers.BlockLogger(t))
+			if i == len(blocks)-1 {
+				env.Batcher.ActL2ChannelClose(t)
+			}
+			frame := env.Batcher.ReadNextOutputFrame(t)
+			require.NotEmpty(t, frame, "frame %d", i)
+			orderedFrames = append(orderedFrames, frame)
+		}
+
+		includeBatchTx := func() {
+			// Include the last transaction submitted by the batcher.
+			env.Miner.ActL1StartBlock(12)(t)
+			env.Miner.ActL1IncludeTxByHash(env.Batcher.LastSubmitted.Hash())(t)
+			env.Miner.ActL1EndBlock(t)
+
+			// Finalize the block with the first channel frame on L1.
+			env.Miner.ActL1SafeNext(t)
+			env.Miner.ActL1FinalizeNext(t)
+		}
+
+		// Submit frames in specified order order
+		for _, j := range testCfg.Custom.frames {
+			env.Batcher.ActL2BatchSubmitRaw(t, orderedFrames[j])
+			includeBatchTx()
+		}
+
+		// Instruct the sequencer to derive the L2 chain from the data on L1 that the batcher just posted.
+		env.Sequencer.ActL1HeadSignal(t)
+		env.Sequencer.ActL2PipelineFull(t)
+
+		l2SafeHead := env.Sequencer.L2Safe()
+
+		testCfg.Custom.RequireExpectedProgress(t, l2SafeHead, testCfg.Hardfork.Precedence < helpers.Holocene.Precedence, env.Engine)
+
+		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
+
+		env.RunFaultProofProgram(t, l2SafeHead.Number, testCfg.CheckResult, testCfg.InputParams...)
+	}
+
+	matrix := helpers.NewMatrix[testCase]()
+	defer matrix.Run(gt)
+
+	for _, ordering := range testCases {
+		matrix.AddTestCase(
+			fmt.Sprintf("HonestClaim-%s", ordering.name),
+			ordering,
+			helpers.NewForkMatrix(helpers.Granite, helpers.LatestFork),
+			runHoloceneDerivationTest,
+			helpers.ExpectNoError(),
+		)
+		matrix.AddTestCase(
+			fmt.Sprintf("JunkClaim-%s", ordering.name),
+			ordering,
+			helpers.NewForkMatrix(helpers.Granite, helpers.LatestFork),
+			runHoloceneDerivationTest,
+			helpers.ExpectError(claim.ErrClaimNotValid),
+			helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
+		)
+	}
+}
diff --git a/op-e2e/actions/proofs/holocene_invalid_batch_test.go b/op-e2e/actions/proofs/holocene_invalid_batch_test.go
new file mode 100644
index 000000000000..3e210ab72ee4
--- /dev/null
+++ b/op-e2e/actions/proofs/holocene_invalid_batch_test.go
@@ -0,0 +1,236 @@
+package proofs
+
+import (
+	"fmt"
+	"math/big"
+	"testing"
+
+	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/actions/proofs/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
+	"github.com/ethereum-optimism/optimism/op-program/client/claim"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_ProgramAction_HoloceneInvalidBatch(gt *testing.T) {
+	type testCase struct {
+		name                    string
+		blocks                  []uint // An ordered list of blocks (by number) to add to a single channel.
+		useSpanBatch            bool
+		blockModifiers          []actionsHelpers.BlockModifier
+		breachMaxSequencerDrift bool
+		overAdvanceL1Origin     int // block number at which to over-advance
+		holoceneExpectations
+	}
+
+	// invalidPayload invalidates the signature for the second transaction in the block.
+	// This should result in an invalid payload in the engine queue.
+	invalidPayload := func(block *types.Block) *types.Block {
+		alice := types.NewCancunSigner(big.NewInt(901))
+		txs := block.Transactions()
+		newTx, err := txs[1].WithSignature(alice, make([]byte, 65))
+		if err != nil {
+			panic(err)
+		}
+		txs[1] = newTx
+		return block
+	}
+
+	// invalidParentHash invalidates the parentHash of the block.
+	// This should result in an invalid batch being derived,
+	// but only for singular (not for span) batches.
+	invalidParentHash := func(block *types.Block) *types.Block {
+		headerCopy := block.Header()
+		headerCopy.ParentHash = common.MaxHash
+		return block.WithSeal(headerCopy)
+	}
+
+	k := 2000
+	twoThousandBlocks := make([]uint, k)
+	for i := 0; i < k; i++ {
+		twoThousandBlocks[i] = uint(i) + 1
+	}
+
+	// Depending on the blocks list, whether the channel is built as
+	// as span batch channel, and whether the blocks are modified / invalidated
+	// we expect a different progression of the safe head under Holocene
+	// derivation rules, compared with pre Holocene.
+	testCases := []testCase{
+		// Standard frame submission, standard channel composition
+		{
+			name: "valid", blocks: []uint{1, 2, 3},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 3, safeHeadHolocene: 3,
+			},
+		},
+
+		{
+			name: "invalid-payload", blocks: []uint{1, 2, 3}, blockModifiers: []actionsHelpers.BlockModifier{nil, invalidPayload, nil},
+			useSpanBatch: false,
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 1, // Invalid signature in block 2 causes an invalid _payload_ in the engine queue. Entire span batch is invalidated.
+				safeHeadHolocene:    2, // We expect the safe head to move to 2 due to creation of an deposit-only block.
+			},
+		},
+		{
+			name: "invalid-payload-span", blocks: []uint{1, 2, 3}, blockModifiers: []actionsHelpers.BlockModifier{nil, invalidPayload, nil},
+			useSpanBatch: true,
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 0, // Invalid signature in block 2 causes an invalid _payload_ in the engine queue. Entire span batch is invalidated.
+				safeHeadHolocene:    2, // We expect the safe head to move to 2 due to creation of an deposit-only block.
+			},
+		},
+
+		{
+			name: "invalid-parent-hash", blocks: []uint{1, 2, 3}, blockModifiers: []actionsHelpers.BlockModifier{nil, invalidParentHash, nil},
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 1, // Invalid parentHash in block 2 causes an invalid batch to be dropped.
+				safeHeadHolocene:    1, // Same with Holocene.
+			},
+		},
+		{
+			name: "seq-drift-span", blocks: twoThousandBlocks, // if we artificially stall the l1 origin, this should be enough to trigger violation of the max sequencer drift
+			useSpanBatch:            true,
+			breachMaxSequencerDrift: true,
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 0,    // Entire span batch invalidated.
+				safeHeadHolocene:    1800, // We expect partial validity until we hit sequencer drift.
+			},
+		},
+		{
+			name:                "future-l1-origin-span",
+			blocks:              []uint{1, 2, 3, 4},
+			useSpanBatch:        true,
+			overAdvanceL1Origin: 3, // this will over-advance the L1 origin of block 3
+			holoceneExpectations: holoceneExpectations{
+				safeHeadPreHolocene: 0, // Entire span batch invalidated.
+				safeHeadHolocene:    2, // We expect partial validity, safe head should move to block 2, dropping invalid block 3 and remaining channel.
+			},
+		},
+	}
+
+	runHoloceneDerivationTest := func(gt *testing.T, testCfg *helpers.TestCfg[testCase]) {
+		t := actionsHelpers.NewDefaultTesting(gt)
+		tp := helpers.NewTestParams(func(tp *e2eutils.TestParams) {
+			// Set the channel timeout to 10 blocks, 12x lower than the sequencing window.
+			tp.ChannelTimeout = 10
+		})
+
+		env := helpers.NewL2FaultProofEnv(t, testCfg, tp, helpers.NewBatcherCfg())
+
+		includeBatchTx := func() {
+			// Include the last transaction submitted by the batcher.
+			env.Miner.ActL1StartBlock(12)(t)
+			env.Miner.ActL1IncludeTxByHash(env.Batcher.LastSubmitted.Hash())(t)
+			env.Miner.ActL1EndBlock(t)
+			// Finalize the block with the first channel frame on L1.
+			env.Miner.ActL1SafeNext(t)
+			env.Miner.ActL1FinalizeNext(t)
+		}
+
+		env.Batcher.ActCreateChannel(t, testCfg.Custom.useSpanBatch)
+
+		max := func(input []uint) uint {
+			max := uint(0)
+			for _, val := range input {
+				if val > max {
+					max = val
+				}
+			}
+			return max
+		}
+
+		if testCfg.Custom.overAdvanceL1Origin > 0 {
+			// Generate future L1 origin or we cannot advance to it.
+			env.Miner.ActEmptyBlock(t)
+		}
+
+		targetHeadNumber := max(testCfg.Custom.blocks)
+		for env.Engine.L2Chain().CurrentBlock().Number.Uint64() < uint64(targetHeadNumber) {
+			parentNum := env.Engine.L2Chain().CurrentBlock().Number.Uint64()
+
+			if testCfg.Custom.breachMaxSequencerDrift {
+				// prevent L1 origin from progressing
+				env.Sequencer.ActL2KeepL1Origin(t)
+			} else if oa := testCfg.Custom.overAdvanceL1Origin; oa > 0 && oa == int(parentNum)+1 {
+				env.Sequencer.ActL2ForceAdvanceL1Origin(t)
+			}
+
+			env.Sequencer.ActL2StartBlock(t)
+
+			if !testCfg.Custom.breachMaxSequencerDrift {
+				// Send an L2 tx
+				env.Alice.L2.ActResetTxOpts(t)
+				env.Alice.L2.ActSetTxToAddr(&env.Dp.Addresses.Bob)
+				env.Alice.L2.ActMakeTx(t)
+				env.Engine.ActL2IncludeTx(env.Alice.Address())(t)
+			}
+
+			if testCfg.Custom.breachMaxSequencerDrift &&
+				parentNum == 1799 ||
+				parentNum == 1800 ||
+				parentNum == 1801 {
+				// Send an L2 tx and force sequencer to include it
+				env.Alice.L2.ActResetTxOpts(t)
+				env.Alice.L2.ActSetTxToAddr(&env.Dp.Addresses.Bob)
+				env.Alice.L2.ActMakeTx(t)
+				env.Engine.ActL2IncludeTxIgnoreForcedEmpty(env.Alice.Address())(t)
+			}
+
+			env.Sequencer.ActL2EndBlock(t)
+		}
+
+		// Buffer the blocks in the batcher.
+		for i, blockNum := range testCfg.Custom.blocks {
+			var blockModifier actionsHelpers.BlockModifier
+			if len(testCfg.Custom.blockModifiers) > i {
+				blockModifier = testCfg.Custom.blockModifiers[i]
+			}
+			env.Batcher.ActAddBlockByNumber(t, int64(blockNum), blockModifier, actionsHelpers.BlockLogger(t))
+
+		}
+
+		env.Batcher.ActL2ChannelClose(t)
+		frame := env.Batcher.ReadNextOutputFrame(t)
+		require.NotEmpty(t, frame)
+		env.Batcher.ActL2BatchSubmitRaw(t, frame)
+		includeBatchTx()
+
+		// Instruct the sequencer to derive the L2 chain from the data on L1 that the batcher just posted.
+		env.Sequencer.ActL1HeadSignal(t)
+		env.Sequencer.ActL2PipelineFull(t)
+
+		l2SafeHead := env.Sequencer.L2Safe()
+
+		testCfg.Custom.RequireExpectedProgress(t, l2SafeHead, testCfg.Hardfork.Precedence < helpers.Holocene.Precedence, env.Engine)
+
+		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
+
+		if safeHeadNumber := l2SafeHead.Number; safeHeadNumber > 0 {
+			env.RunFaultProofProgram(t, safeHeadNumber, testCfg.CheckResult, testCfg.InputParams...)
+		}
+	}
+
+	matrix := helpers.NewMatrix[testCase]()
+	defer matrix.Run(gt)
+
+	for _, ordering := range testCases {
+		matrix.AddTestCase(
+			fmt.Sprintf("HonestClaim-%s", ordering.name),
+			ordering,
+			helpers.NewForkMatrix(helpers.Granite, helpers.LatestFork),
+			runHoloceneDerivationTest,
+			helpers.ExpectNoError(),
+		)
+		matrix.AddTestCase(
+			fmt.Sprintf("JunkClaim-%s", ordering.name),
+			ordering,
+			helpers.NewForkMatrix(helpers.Granite, helpers.LatestFork),
+			runHoloceneDerivationTest,
+			helpers.ExpectError(claim.ErrClaimNotValid),
+			helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
+		)
+	}
+}
diff --git a/op-e2e/actions/proofs/l1_lookback_test.go b/op-e2e/actions/proofs/l1_lookback_test.go
index b40635ac5509..3e9c6fdcd52b 100644
--- a/op-e2e/actions/proofs/l1_lookback_test.go
+++ b/op-e2e/actions/proofs/l1_lookback_test.go
@@ -73,11 +73,12 @@ func runL1LookbackTest_ReopenChannel(gt *testing.T, testCfg *helpers.TestCfg[any
 	env.Miner.ActL1SafeNext(t)
 
 	// Re-submit the first L2 block frame w/ different transaction data.
-	err := env.Batcher.Buffer(t, func(block *types.Block) {
+	err := env.Batcher.Buffer(t, func(block *types.Block) *types.Block {
 		env.Bob.L2.ActResetTxOpts(t)
 		env.Bob.L2.ActSetTxToAddr(&env.Dp.Addresses.Mallory)
 		tx := env.Bob.L2.MakeTransaction(t)
 		block.Transactions()[1] = tx
+		return block
 	})
 	require.NoError(t, err)
 	env.Batcher.ActL2BatchSubmit(t)
diff --git a/op-e2e/actions/sync/sync_test.go b/op-e2e/actions/sync/sync_test.go
index 95f55d63fcdd..b9c29404dca5 100644
--- a/op-e2e/actions/sync/sync_test.go
+++ b/op-e2e/actions/sync/sync_test.go
@@ -618,8 +618,8 @@ func TestBackupUnsafeReorgForkChoiceNotInputError(gt *testing.T) {
 	// check pendingSafe is reset
 	require.Equal(t, sequencer.L2PendingSafe().Number, uint64(0))
 	// check backupUnsafe is applied
-	require.Equal(t, sequencer.L2Unsafe().Hash, targetUnsafeHeadHash)
-	require.Equal(t, sequencer.L2Unsafe().Number, uint64(5))
+	require.Equal(t, uint64(5), sequencer.L2Unsafe().Number)
+	require.Equal(t, targetUnsafeHeadHash, sequencer.L2Unsafe().Hash)
 	// safe head cannot be advanced because batch contained invalid blocks
 	require.Equal(t, sequencer.L2Safe().Number, uint64(0))
 }
diff --git a/op-e2e/actions/upgrades/holocene_fork_test.go b/op-e2e/actions/upgrades/holocene_fork_test.go
index 7fd46296aaa9..12c0dcde6d19 100644
--- a/op-e2e/actions/upgrades/holocene_fork_test.go
+++ b/op-e2e/actions/upgrades/holocene_fork_test.go
@@ -170,12 +170,13 @@ func TestHoloceneInvalidPayload(gt *testing.T) {
 	require.Len(t, b.Transactions(), 2)
 
 	// buffer into the batcher, invalidating the tx via signature zeroing
-	env.Batcher.ActL2BatchBuffer(t, func(block *types.Block) {
+	env.Batcher.ActL2BatchBuffer(t, func(block *types.Block) *types.Block {
 		// Replace the tx with one that has a bad signature.
 		txs := block.Transactions()
 		newTx, err := txs[1].WithSignature(env.Alice.L2.Signer(), make([]byte, 65))
 		require.NoError(t, err)
 		txs[1] = newTx
+		return block
 	})
 
 	// generate two more empty blocks
diff --git a/op-e2e/opgeth/op_geth_test.go b/op-e2e/opgeth/op_geth_test.go
index 0f27e7b7f047..dcc18440f917 100644
--- a/op-e2e/opgeth/op_geth_test.go
+++ b/op-e2e/opgeth/op_geth_test.go
@@ -7,13 +7,9 @@ import (
 	"testing"
 	"time"
 
-	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
-
-	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
-	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
-	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -22,8 +18,13 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
+	"github.com/ethereum/go-ethereum/rpc"
+
+	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
+	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
 var (
@@ -51,8 +52,9 @@ func TestMissingGasLimit(t *testing.T) {
 
 	res, err := opGeth.StartBlockBuilding(ctx, attrs)
 	require.Error(t, err)
-	require.ErrorIs(t, err, eth.InputError{})
-	require.Equal(t, eth.InvalidPayloadAttributes, err.(eth.InputError).Code)
+	var rpcErr rpc.Error
+	require.ErrorAs(t, err, &rpcErr)
+	require.EqualValues(t, eth.InvalidPayloadAttributes, rpcErr.ErrorCode())
 	require.Nil(t, res)
 }
 
diff --git a/op-node/rollup/derive/attributes.go b/op-node/rollup/derive/attributes.go
index e17888201bae..5d859a9fcd59 100644
--- a/op-node/rollup/derive/attributes.go
+++ b/op-node/rollup/derive/attributes.go
@@ -28,6 +28,8 @@ type FetchingAttributesBuilder struct {
 	rollupCfg *rollup.Config
 	l1        L1ReceiptsFetcher
 	l2        SystemConfigL2Fetcher
+	// whether to skip the L1 origin timestamp check - only for testing purposes
+	testSkipL1OriginCheck bool
 }
 
 func NewFetchingAttributesBuilder(rollupCfg *rollup.Config, l1 L1ReceiptsFetcher, l2 SystemConfigL2Fetcher) *FetchingAttributesBuilder {
@@ -38,6 +40,12 @@ func NewFetchingAttributesBuilder(rollupCfg *rollup.Config, l1 L1ReceiptsFetcher
 	}
 }
 
+// TestSkipL1OriginCheck skips the L1 origin timestamp check for testing purposes.
+// Must not be used in production!
+func (ba *FetchingAttributesBuilder) TestSkipL1OriginCheck() {
+	ba.testSkipL1OriginCheck = true
+}
+
 // PreparePayloadAttributes prepares a PayloadAttributes template that is ready to build a L2 block with deposits only, on top of the given l2Parent, with the given epoch as L1 origin.
 // The template defaults to NoTxPool=true, and no sequencer transactions: the caller has to modify the template to add transactions,
 // by setting NoTxPool=false as sequencer, or by appending batch transactions as verifier.
@@ -93,9 +101,9 @@ func (ba *FetchingAttributesBuilder) PreparePayloadAttributes(ctx context.Contex
 		seqNumber = l2Parent.SequenceNumber + 1
 	}
 
-	// Sanity check the L1 origin was correctly selected to maintain the time invariant between L1 and L2
 	nextL2Time := l2Parent.Time + ba.rollupCfg.BlockTime
-	if nextL2Time < l1Info.Time() {
+	// Sanity check the L1 origin was correctly selected to maintain the time invariant between L1 and L2
+	if !ba.testSkipL1OriginCheck && nextL2Time < l1Info.Time() {
 		return nil, NewResetError(fmt.Errorf("cannot build L2 block on top %s for time %d before L1 origin %s at time %d",
 			l2Parent, nextL2Time, eth.ToBlockID(l1Info), l1Info.Time()))
 	}
diff --git a/op-node/rollup/engine/build_cancel.go b/op-node/rollup/engine/build_cancel.go
index 7c9995c28e85..4215e2d6c7f8 100644
--- a/op-node/rollup/engine/build_cancel.go
+++ b/op-node/rollup/engine/build_cancel.go
@@ -2,6 +2,9 @@ package engine
 
 import (
 	"context"
+	"errors"
+
+	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
@@ -23,7 +26,9 @@ func (eq *EngDeriver) onBuildCancel(ev BuildCancelEvent) {
 	eq.log.Warn("cancelling old block building job", "info", ev.Info)
 	_, err := eq.ec.engine.GetPayload(ctx, ev.Info)
 	if err != nil {
-		if x, ok := err.(eth.InputError); ok && x.Code == eth.UnknownPayload { //nolint:all
+		var rpcErr rpc.Error
+		if errors.As(err, &rpcErr) && eth.ErrorCode(rpcErr.ErrorCode()) == eth.UnknownPayload {
+			eq.log.Warn("tried cancelling unknown block building job", "info", ev.Info, "err", err)
 			return // if unknown, then it did not need to be cancelled anymore.
 		}
 		eq.log.Error("failed to cancel block building job", "info", ev.Info, "err", err)
diff --git a/op-node/rollup/engine/build_seal.go b/op-node/rollup/engine/build_seal.go
index 8c4e5baeeec7..b292681e13f1 100644
--- a/op-node/rollup/engine/build_seal.go
+++ b/op-node/rollup/engine/build_seal.go
@@ -2,9 +2,12 @@ package engine
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
+	"github.com/ethereum/go-ethereum/rpc"
+
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
@@ -58,7 +61,8 @@ func (eq *EngDeriver) onBuildSeal(ev BuildSealEvent) {
 	sealingStart := time.Now()
 	envelope, err := eq.ec.engine.GetPayload(ctx, ev.Info)
 	if err != nil {
-		if x, ok := err.(eth.InputError); ok && x.Code == eth.UnknownPayload { //nolint:all
+		var rpcErr rpc.Error
+		if errors.As(err, &rpcErr) && eth.ErrorCode(rpcErr.ErrorCode()) == eth.UnknownPayload {
 			eq.log.Warn("Cannot seal block, payload ID is unknown",
 				"payloadID", ev.Info.ID, "payload_time", ev.Info.Timestamp,
 				"started_time", ev.BuildStarted)
diff --git a/op-node/rollup/engine/engine_controller.go b/op-node/rollup/engine/engine_controller.go
index 4ac8b88a50cf..b088e382f07f 100644
--- a/op-node/rollup/engine/engine_controller.go
+++ b/op-node/rollup/engine/engine_controller.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
@@ -86,7 +87,8 @@ type EngineController struct {
 }
 
 func NewEngineController(engine ExecEngine, log log.Logger, metrics derive.Metrics,
-	rollupCfg *rollup.Config, syncCfg *sync.Config, emitter event.Emitter) *EngineController {
+	rollupCfg *rollup.Config, syncCfg *sync.Config, emitter event.Emitter,
+) *EngineController {
 	syncStatus := syncStatusCL
 	if syncCfg.SyncMode == sync.ELSync {
 		syncStatus = syncStatusWillStartEL
@@ -283,11 +285,11 @@ func (e *EngineController) TryUpdateEngine(ctx context.Context) error {
 	defer logFn()
 	fcRes, err := e.engine.ForkchoiceUpdate(ctx, &fc, nil)
 	if err != nil {
-		var inputErr eth.InputError
-		if errors.As(err, &inputErr) {
-			switch inputErr.Code {
+		var rpcErr rpc.Error
+		if errors.As(err, &rpcErr) {
+			switch eth.ErrorCode(rpcErr.ErrorCode()) {
 			case eth.InvalidForkchoiceState:
-				return derive.NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap()))
+				return derive.NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", rpcErr))
 			default:
 				return derive.NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err))
 			}
@@ -361,11 +363,11 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
 	defer logFn()
 	fcRes, err := e.engine.ForkchoiceUpdate(ctx, &fc, nil)
 	if err != nil {
-		var inputErr eth.InputError
-		if errors.As(err, &inputErr) {
-			switch inputErr.Code {
+		var rpcErr rpc.Error
+		if errors.As(err, &rpcErr) {
+			switch eth.ErrorCode(rpcErr.ErrorCode()) {
 			case eth.InvalidForkchoiceState:
-				return derive.NewResetError(fmt.Errorf("pre-unsafe-block forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap()))
+				return derive.NewResetError(fmt.Errorf("pre-unsafe-block forkchoice update was inconsistent with engine, need reset to resolve: %w", rpcErr))
 			default:
 				return derive.NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err))
 			}
@@ -439,13 +441,16 @@ func (e *EngineController) TryBackupUnsafeReorg(ctx context.Context) (bool, erro
 	defer logFn()
 	fcRes, err := e.engine.ForkchoiceUpdate(ctx, &fc, nil)
 	if err != nil {
-		var inputErr eth.InputError
-		if errors.As(err, &inputErr) {
-			e.SetBackupUnsafeL2Head(eth.L2BlockRef{}, false)
-			switch inputErr.Code {
+		var rpcErr rpc.Error
+		if errors.As(err, &rpcErr) {
+			switch eth.ErrorCode(rpcErr.ErrorCode()) {
 			case eth.InvalidForkchoiceState:
-				return true, derive.NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap()))
+				e.SetBackupUnsafeL2Head(eth.L2BlockRef{}, false)
+				return true, derive.NewResetError(fmt.Errorf("forkchoice update was inconsistent with engine, need reset to resolve: %w", rpcErr))
 			default:
+				// Retry when forkChoiceUpdate returns non-input error.
+				// Do not reset backupUnsafeHead because it will be used again.
+				e.needFCUCallForBackupUnsafeReorg = true
 				return true, derive.NewTemporaryError(fmt.Errorf("unexpected error code in forkchoice-updated response: %w", err))
 			}
 		} else {
diff --git a/op-node/rollup/engine/engine_update.go b/op-node/rollup/engine/engine_update.go
index c79dbdcd0f4d..dbf578d30376 100644
--- a/op-node/rollup/engine/engine_update.go
+++ b/op-node/rollup/engine/engine_update.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rpc"
 )
 
 // isDepositTx checks an opaqueTx to determine if it is a Deposit Transaction
@@ -84,15 +85,15 @@ const (
 func startPayload(ctx context.Context, eng ExecEngine, fc eth.ForkchoiceState, attrs *eth.PayloadAttributes) (id eth.PayloadID, errType BlockInsertionErrType, err error) {
 	fcRes, err := eng.ForkchoiceUpdate(ctx, &fc, attrs)
 	if err != nil {
-		var inputErr eth.InputError
-		if errors.As(err, &inputErr) {
-			switch inputErr.Code {
+		var rpcErr rpc.Error
+		if errors.As(err, &rpcErr) {
+			switch code := eth.ErrorCode(rpcErr.ErrorCode()); code {
 			case eth.InvalidForkchoiceState:
-				return eth.PayloadID{}, BlockInsertPrestateErr, fmt.Errorf("pre-block-creation forkchoice update was inconsistent with engine, need reset to resolve: %w", inputErr.Unwrap())
+				return eth.PayloadID{}, BlockInsertPrestateErr, fmt.Errorf("pre-block-creation forkchoice update was inconsistent with engine, need reset to resolve: %w", rpcErr)
 			case eth.InvalidPayloadAttributes:
-				return eth.PayloadID{}, BlockInsertPayloadErr, fmt.Errorf("payload attributes are not valid, cannot build block: %w", inputErr.Unwrap())
+				return eth.PayloadID{}, BlockInsertPayloadErr, fmt.Errorf("payload attributes are not valid, cannot build block: %w", rpcErr)
 			default:
-				if inputErr.Code.IsEngineError() {
+				if code.IsEngineError() {
 					return eth.PayloadID{}, BlockInsertPrestateErr, fmt.Errorf("unexpected engine error code in forkchoice-updated response: %w", err)
 				} else {
 					return eth.PayloadID{}, BlockInsertTemporaryErr, fmt.Errorf("unexpected generic error code in forkchoice-updated response: %w", err)
diff --git a/op-node/rollup/engine/events.go b/op-node/rollup/engine/events.go
index bb1dcb66200d..bb4499564875 100644
--- a/op-node/rollup/engine/events.go
+++ b/op-node/rollup/engine/events.go
@@ -401,6 +401,7 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 		// Only promote if not already stale.
 		// Resets/overwrites happen through engine-resets, not through promotion.
 		if x.Ref.Number > d.ec.PendingSafeL2Head().Number {
+			d.log.Debug("Updating pending safe", "pending_safe", x.Ref, "local_safe", d.ec.LocalSafeL2Head(), "unsafe", d.ec.UnsafeL2Head(), "concluding", x.Concluding)
 			d.ec.SetPendingSafeL2Head(x.Ref)
 			d.emitter.Emit(PendingSafeUpdateEvent{
 				PendingSafe: d.ec.PendingSafeL2Head(),
@@ -419,6 +420,7 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 			DerivedFrom: x.DerivedFrom,
 		})
 	case PromoteLocalSafeEvent:
+		d.log.Debug("Updating local safe", "local_safe", x.Ref, "safe", d.ec.SafeL2Head(), "unsafe", d.ec.UnsafeL2Head())
 		d.ec.SetLocalSafeHead(x.Ref)
 		d.emitter.Emit(LocalSafeUpdateEvent(x))
 	case LocalSafeUpdateEvent:
@@ -427,6 +429,7 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 			d.emitter.Emit(PromoteSafeEvent(x))
 		}
 	case PromoteSafeEvent:
+		d.log.Debug("Updating safe", "safe", x.Ref, "unsafe", d.ec.UnsafeL2Head())
 		d.ec.SetSafeHead(x.Ref)
 		// Finalizer can pick up this safe cross-block now
 		d.emitter.Emit(SafeDerivedEvent{Safe: x.Ref, DerivedFrom: x.DerivedFrom})
diff --git a/op-program/client/driver/program.go b/op-program/client/driver/program.go
index cb3cd65542cc..b83a1566c8ce 100644
--- a/op-program/client/driver/program.go
+++ b/op-program/client/driver/program.go
@@ -62,6 +62,10 @@ func (d *ProgramDeriver) OnEvent(ev event.Event) bool {
 			d.logger.Info("Derivation complete: reached L2 block", "head", x.SafeL2Head)
 			d.closing = true
 		}
+	case derive.DeriverIdleEvent:
+		// We dont't close the deriver yet, as the engine may still be processing events to reach
+		// the target. A ForkchoiceUpdateEvent will close the deriver when the target is reached.
+		d.logger.Info("Derivation complete: no further L1 data to process")
 	case rollup.ResetEvent:
 		d.closing = true
 		d.result = fmt.Errorf("unexpected reset error: %w", x.Err)
diff --git a/op-program/client/l2/engineapi/l2_engine_api.go b/op-program/client/l2/engineapi/l2_engine_api.go
index 13910d971c3a..273483893b37 100644
--- a/op-program/client/l2/engineapi/l2_engine_api.go
+++ b/op-program/client/l2/engineapi/l2_engine_api.go
@@ -130,9 +130,9 @@ func (ea *L2EngineAPI) IncludeTx(tx *types.Transaction, from common.Address) err
 	if ea.blockProcessor == nil {
 		return ErrNotBuildingBlock
 	}
+
 	if ea.l2ForceEmpty {
 		ea.log.Info("Skipping including a transaction because e.L2ForceEmpty is true")
-		// t.InvalidAction("cannot include any sequencer txs")
 		return nil
 	}
 
diff --git a/op-service/eth/types.go b/op-service/eth/types.go
index 60eb7171d651..7b4d1c053348 100644
--- a/op-service/eth/types.go
+++ b/op-service/eth/types.go
@@ -38,8 +38,7 @@ const (
 
 var ErrBedrockScalarPaddingNotEmpty = errors.New("version 0 scalar value has non-empty padding")
 
-// InputError distinguishes an user-input error from regular rpc errors,
-// to help the (Engine) API user divert from accidental input mistakes.
+// InputError can be used to create rpc.Error instances with a specific error code.
 type InputError struct {
 	Inner error
 	Code  ErrorCode
@@ -49,6 +48,11 @@ func (ie InputError) Error() string {
 	return fmt.Sprintf("input error %d: %s", ie.Code, ie.Inner.Error())
 }
 
+// Makes InputError implement the rpc.Error interface
+func (ie InputError) ErrorCode() int {
+	return int(ie.Code)
+}
+
 func (ie InputError) Unwrap() error {
 	return ie.Inner
 }
diff --git a/op-service/eth/types_test.go b/op-service/eth/types_test.go
index 36aae514be48..03409e16008d 100644
--- a/op-service/eth/types_test.go
+++ b/op-service/eth/types_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/stretchr/testify/require"
 )
@@ -21,6 +22,10 @@ func TestInputError(t *testing.T) {
 		t.Fatalf("need InputError to be detected as such")
 	}
 	require.ErrorIs(t, err, InputError{}, "need to detect input error with errors.Is")
+
+	var rpcErr rpc.Error
+	require.ErrorAs(t, err, &rpcErr, "need input error to be rpc.Error with errors.As")
+	require.EqualValues(t, err.Code, rpcErr.ErrorCode())
 }
 
 type scalarTest struct {
diff --git a/op-service/sources/engine_client.go b/op-service/sources/engine_client.go
index 79921192f9e7..66b6521065f9 100644
--- a/op-service/sources/engine_client.go
+++ b/op-service/sources/engine_client.go
@@ -9,7 +9,6 @@ import (
 	"github.com/ethereum/go-ethereum/eth/catalyst"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/client"
@@ -86,11 +85,7 @@ func (s *EngineAPIClient) EngineVersionProvider() EngineVersionProvider { return
 
 // ForkchoiceUpdate updates the forkchoice on the execution client. If attributes is not nil, the engine client will also begin building a block
 // based on attributes after the new head block and return the payload ID.
-//
-// The RPC may return three types of errors:
-// 1. Processing error: ForkchoiceUpdatedResult.PayloadStatusV1.ValidationError or other non-success PayloadStatusV1,
-// 2. `error` as eth.InputError: the forkchoice state or attributes are not valid.
-// 3. Other types of `error`: temporary RPC errors, like timeouts.
+// It's the caller's responsibility to check the error type, and in case of an rpc.Error, check the ErrorCode.
 func (s *EngineAPIClient) ForkchoiceUpdate(ctx context.Context, fc *eth.ForkchoiceState, attributes *eth.PayloadAttributes) (*eth.ForkchoiceUpdatedResult, error) {
 	llog := s.log.New("state", fc)       // local logger
 	tlog := llog.New("attr", attributes) // trace logger
@@ -100,28 +95,15 @@ func (s *EngineAPIClient) ForkchoiceUpdate(ctx context.Context, fc *eth.Forkchoi
 	var result eth.ForkchoiceUpdatedResult
 	method := s.evp.ForkchoiceUpdatedVersion(attributes)
 	err := s.RPC.CallContext(fcCtx, &result, string(method), fc, attributes)
-	if err == nil {
-		tlog.Trace("Shared forkchoice-updated signal")
-		if attributes != nil { // block building is optional, we only get a payload ID if we are building a block
-			tlog.Trace("Received payload id", "payloadId", result.PayloadID)
-		}
-		return &result, nil
-	} else {
+	if err != nil {
 		llog.Warn("Failed to share forkchoice-updated signal", "err", err)
-		if rpcErr, ok := err.(rpc.Error); ok {
-			code := eth.ErrorCode(rpcErr.ErrorCode())
-			switch code {
-			case eth.InvalidParams, eth.InvalidForkchoiceState, eth.InvalidPayloadAttributes:
-				return nil, eth.InputError{
-					Inner: err,
-					Code:  code,
-				}
-			default:
-				return nil, fmt.Errorf("unrecognized rpc error: %w", err)
-			}
-		}
 		return nil, err
 	}
+	tlog.Trace("Shared forkchoice-updated signal")
+	if attributes != nil { // block building is optional, we only get a payload ID if we are building a block
+		tlog.Trace("Received payload id", "payloadId", result.PayloadID)
+	}
+	return &result, nil
 }
 
 // NewPayload executes a full block on the execution engine.
@@ -154,9 +136,7 @@ func (s *EngineAPIClient) NewPayload(ctx context.Context, payload *eth.Execution
 }
 
 // GetPayload gets the execution payload associated with the PayloadId.
-// There may be two types of error:
-// 1. `error` as eth.InputError: the payload ID may be unknown
-// 2. Other types of `error`: temporary RPC errors, like timeouts.
+// It's the caller's responsibility to check the error type, and in case of an rpc.Error, check the ErrorCode.
 func (s *EngineAPIClient) GetPayload(ctx context.Context, payloadInfo eth.PayloadInfo) (*eth.ExecutionPayloadEnvelope, error) {
 	e := s.log.New("payload_id", payloadInfo.ID)
 	e.Trace("getting payload")
@@ -165,18 +145,6 @@ func (s *EngineAPIClient) GetPayload(ctx context.Context, payloadInfo eth.Payloa
 	err := s.RPC.CallContext(ctx, &result, string(method), payloadInfo.ID)
 	if err != nil {
 		e.Warn("Failed to get payload", "payload_id", payloadInfo.ID, "err", err)
-		if rpcErr, ok := err.(rpc.Error); ok {
-			code := eth.ErrorCode(rpcErr.ErrorCode())
-			switch code {
-			case eth.UnknownPayload:
-				return nil, eth.InputError{
-					Inner: err,
-					Code:  code,
-				}
-			default:
-				return nil, fmt.Errorf("unrecognized rpc error: %w", err)
-			}
-		}
 		return nil, err
 	}
 	e.Trace("Received payload")

From 99d637a3fb495732bba554384668dc509fd9f9ae Mon Sep 17 00:00:00 2001
From: DenseDenise <DenseDenise12@proton.me>
Date: Mon, 4 Nov 2024 12:06:22 +0000
Subject: [PATCH 117/451] docs: Unified input parameter names (#12797)

* Change the name

* Update op-challenger/README.md

Co-authored-by: smartcontracts <kelvinfichter@gmail.com>

---------

Co-authored-by: smartcontracts <kelvinfichter@gmail.com>
---
 op-challenger/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-challenger/README.md b/op-challenger/README.md
index 3274dc47d808..97fafab8e6f7 100644
--- a/op-challenger/README.md
+++ b/op-challenger/README.md
@@ -187,7 +187,7 @@ Prints the list of current claims in a dispute game.
 
 ```shell
 ./bin/op-challenger run-trace \
-  --network <PREDEFINED_NETWORK> \
+  --network=<NETWORK_NAME> \
   --l1-eth-rpc=<L1_ETH_RPC> \
   --l1-beacon=<L1_BEACON> \
   --l2-eth-rpc=<L2_ETH_RPC> \
@@ -197,7 +197,7 @@ Prints the list of current claims in a dispute game.
   --run=<RUN_CONFIG>
 ```
 
-* `PREDEFINED_NETWORK` - the name of a predefined L2 network.
+* `NETWORK_NAME` - the name of a predefined L2 network.
 * `L1_ETH_RPC` - the RPC endpoint of the L1 endpoint to use (e.g. `http://localhost:8545`).
 * `L1_BEACON` - the REST endpoint of the L1 beacon node to use (e.g. `http://localhost:5100`).
 * `L2_ETH_RPC` - the RPC endpoint of the L2 execution client to use

From 0c5617983d4ba1c8b083759749198e710271a09a Mon Sep 17 00:00:00 2001
From: Delweng <delweng@gmail.com>
Date: Mon, 4 Nov 2024 21:04:21 +0800
Subject: [PATCH 118/451] feat(semgrep): add sol-style-force-require-msg
 (#12806)

* feat(semgrep): add sol-force-require-msg rule

Signed-off-by: jsvisa <delweng@gmail.com>

* feat(semgrep): exclude packages temporary

Signed-off-by: jsvisa <delweng@gmail.com>

* feat(semgrep): add testcase

Signed-off-by: jsvisa <delweng@gmail.com>

* test script example

Signed-off-by: jsvisa <delweng@gmail.com>

* require msg more clear

Signed-off-by: jsvisa <delweng@gmail.com>

---------

Signed-off-by: jsvisa <delweng@gmail.com>
---
 .../script/testdata/scripts/ScriptExample.s.sol     |  4 ++--
 semgrep/sol-rules.t.sol                             | 13 ++++++++++---
 semgrep/sol-rules.yaml                              | 11 +++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol b/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
index 84b9c0381da4..f9ea6239d433 100644
--- a/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
+++ b/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
@@ -124,12 +124,12 @@ contract ScriptExample {
         console.log("contract deployment");
         vm.broadcast(address(uint160(0x123456)));
         FooBar x = new FooBar(1234);
-        require(x.foo() == 1234);
+        require(x.foo() == 1234, "FooBar: foo in create is not 1234");
 
         console.log("create 2");
         vm.broadcast(address(uint160(0xcafe)));
         FooBar y = new FooBar{salt: bytes32(uint256(42))}(1234);
-        require(y.foo() == 1234);
+        require(y.foo() == 1234, "FooBar: foo in create2 is not 1234");
         console.log("done!");
 
         // Deploy a script without a pranked sender and check the nonce.
diff --git a/semgrep/sol-rules.t.sol b/semgrep/sol-rules.t.sol
index 8b82dce33ed0..3b4329f7e388 100644
--- a/semgrep/sol-rules.t.sol
+++ b/semgrep/sol-rules.t.sol
@@ -483,9 +483,6 @@ contract SemgrepTest__sol_style_malformed_require {
         // ok: sol-style-malformed-require
         require(cond, "CHECK-L2OO-140");
 
-        // ok: sol-style-malformed-require
-        require(cond);
-
         // ok: sol-style-malformed-require
         require(bytes(env_).length > 0, "Config: must set DEPLOY_CONFIG_PATH to filesystem path of deploy config");
 
@@ -551,3 +548,13 @@ contract SemgrepTest__sol_style_malformed_revert {
         revert("test");
     }
 }
+
+contract SemgrepTest__sol_style_enforce_require_msg {
+    function test() {
+        // ok: sol-style-enforce-require-msg
+        require(cond, "MyContract: test message good");
+
+        // ruleid: sol-style-enforce-require-msg
+        require(cond);
+    }
+}
diff --git a/semgrep/sol-rules.yaml b/semgrep/sol-rules.yaml
index 59e0374b26db..e0d83414c4bd 100644
--- a/semgrep/sol-rules.yaml
+++ b/semgrep/sol-rules.yaml
@@ -175,3 +175,14 @@ rules:
         - packages/contracts-bedrock/src/L1/OPContractsManager.sol
         - packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
         - packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol
+
+  - id: sol-style-enforce-require-msg
+    languages: [solidity]
+    severity: ERROR
+    message: Require statement must have an error message
+    patterns:
+      - pattern: require($ERR);
+      - pattern-not: require($ERR, $MSG);
+    paths:
+      exclude:
+        - packages/contracts-bedrock/

From 11f0298e1ebd25a0783d7cb798358dea04ecc235 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 4 Nov 2024 07:30:15 -0800
Subject: [PATCH 119/451] cannon: Add godoc to ExecMipsCoreStepLogic (#12786)

* cannon: Add godoc to ExecMipsCoreStepLogic

* update MIPS64.sol

* update semver
---
 cannon/mipsevm/exec/mips_instructions.go      |  6 +++--
 cannon/mipsevm/multithreaded/mips.go          |  8 +++----
 packages/contracts-bedrock/semver-lock.json   |  4 ++--
 .../contracts-bedrock/src/cannon/MIPS64.sol   | 14 ++++++------
 .../cannon/libraries/MIPS64Instructions.sol   | 22 +++++++++----------
 5 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index b72c5113e607..bf1a8fdd0e7c 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -33,7 +33,9 @@ func GetInstructionDetails(pc Word, memory *memory.Memory) (insn, opcode, fun ui
 	return insn, opcode, fun
 }
 
-func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory *memory.Memory, insn, opcode, fun uint32, memTracker MemTracker, stackTracker StackTracker) (memUpdated bool, memAddr Word, err error) {
+// ExecMipsCoreStepLogic executes a MIPS instruction that isn't a syscall nor a RMW operation
+// If a store operation occurred, then it returns the effective address of the store memory location.
+func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory *memory.Memory, insn, opcode, fun uint32, memTracker MemTracker, stackTracker StackTracker) (memUpdated bool, effMemAddr Word, err error) {
 	// j-type j/jal
 	if opcode == 2 || opcode == 3 {
 		linkReg := Word(0)
@@ -153,7 +155,7 @@ func ExecMipsCoreStepLogic(cpu *mipsevm.CpuScalars, registers *[32]Word, memory
 		memTracker.TrackMemAccess(storeAddr)
 		memory.SetWord(storeAddr, val)
 		memUpdated = true
-		memAddr = storeAddr
+		effMemAddr = storeAddr
 	}
 
 	// write back the value to destination register
diff --git a/cannon/mipsevm/multithreaded/mips.go b/cannon/mipsevm/multithreaded/mips.go
index 65c911d9c9eb..4051465a3023 100644
--- a/cannon/mipsevm/multithreaded/mips.go
+++ b/cannon/mipsevm/multithreaded/mips.go
@@ -316,19 +316,19 @@ func (m *InstrumentedState) mipsStep() error {
 	}
 
 	// Exec the rest of the step logic
-	memUpdated, memAddr, err := exec.ExecMipsCoreStepLogic(m.state.getCpuRef(), m.state.GetRegistersRef(), m.state.Memory, insn, opcode, fun, m.memoryTracker, m.stackTracker)
+	memUpdated, effMemAddr, err := exec.ExecMipsCoreStepLogic(m.state.getCpuRef(), m.state.GetRegistersRef(), m.state.Memory, insn, opcode, fun, m.memoryTracker, m.stackTracker)
 	if err != nil {
 		return err
 	}
 	if memUpdated {
-		m.handleMemoryUpdate(memAddr)
+		m.handleMemoryUpdate(effMemAddr)
 	}
 
 	return nil
 }
 
-func (m *InstrumentedState) handleMemoryUpdate(memAddr Word) {
-	if memAddr == (arch.AddressMask & m.state.LLAddress) {
+func (m *InstrumentedState) handleMemoryUpdate(effMemAddr Word) {
+	if effMemAddr == (arch.AddressMask & m.state.LLAddress) {
 		// Reserved address was modified, clear the reservation
 		m.clearLLMemoryReservation()
 	}
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 1cee134ca198..62672e3852f0 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -148,8 +148,8 @@
     "sourceCodeHash": "0x9fa2d1297ad1e93b4d3c5c0fed08bedcd8f746807589f0fd3369e79347c6a027"
   },
   "src/cannon/MIPS64.sol": {
-    "initCodeHash": "0x5094e3f488de838cba1422b508a899444ee27905abc9c0b97961d4b8b7392289",
-    "sourceCodeHash": "0xdc2393d2073348218a9c6e169c2e7f687590e237773b8fde53fae9cf84395978"
+    "initCodeHash": "0xc615a8f321f3bfb29c9459705f3012e512c463ba9ba2e1bcb6f9349f2d911d10",
+    "sourceCodeHash": "0x8fd0f4167d80f48010ad1241a9f6fb93576887dcc1f97be6b05adaf0086a537b"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS64.sol b/packages/contracts-bedrock/src/cannon/MIPS64.sol
index 8c85a26acd43..3ca24d632eed 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS64.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS64.sol
@@ -64,8 +64,8 @@ contract MIPS64 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS64 contract.
-    /// @custom:semver 1.0.0-beta.2
-    string public constant version = "1.0.0-beta.2";
+    /// @custom:semver 1.0.0-beta.3
+    string public constant version = "1.0.0-beta.3";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -272,20 +272,20 @@ contract MIPS64 is ISemver {
                 fun: fun
             });
             bool memUpdated;
-            uint64 memAddr;
-            (state.memRoot, memUpdated, memAddr) = ins.execMipsCoreStepLogic(coreStepArgs);
+            uint64 effMemAddr;
+            (state.memRoot, memUpdated, effMemAddr) = ins.execMipsCoreStepLogic(coreStepArgs);
             setStateCpuScalars(thread, cpu);
             updateCurrentThreadRoot();
             if (memUpdated) {
-                handleMemoryUpdate(state, memAddr);
+                handleMemoryUpdate(state, effMemAddr);
             }
 
             return outputState();
         }
     }
 
-    function handleMemoryUpdate(State memory _state, uint64 _memAddr) internal pure {
-        if (_memAddr == (arch.ADDRESS_MASK & _state.llAddress)) {
+    function handleMemoryUpdate(State memory _state, uint64 _effMemAddr) internal pure {
+        if (_effMemAddr == (arch.ADDRESS_MASK & _state.llAddress)) {
             // Reserved address was modified, clear the reservation
             clearLLMemoryReservation(_state);
         }
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
index 98bf87ec6239..d24ec036e819 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
@@ -66,23 +66,23 @@ library MIPS64Instructions {
     /// @notice Execute core MIPS step logic.
     /// @return newMemRoot_ The updated merkle root of memory after any modifications, may be unchanged.
     /// @return memUpdated_ True if memory was modified.
-    /// @return memAddr_ Holds the memory address that was updated if memUpdated_ is true.
+    /// @return effMemAddr_ Holds the effective address that was updated if memUpdated_ is true.
     function execMipsCoreStepLogic(CoreStepLogicParams memory _args)
         internal
         pure
-        returns (bytes32 newMemRoot_, bool memUpdated_, uint64 memAddr_)
+        returns (bytes32 newMemRoot_, bool memUpdated_, uint64 effMemAddr_)
     {
         unchecked {
             newMemRoot_ = _args.memRoot;
             memUpdated_ = false;
-            memAddr_ = 0;
+            effMemAddr_ = 0;
 
             // j-type j/jal
             if (_args.opcode == 2 || _args.opcode == 3) {
                 // Take top 4 bits of the next PC (its 256 MB region), and concatenate with the 26-bit offset
                 uint64 target = (_args.cpu.nextPC & signExtend(0xF0000000, 32)) | uint64((_args.insn & 0x03FFFFFF) << 2);
                 handleJump(_args.cpu, _args.registers, _args.opcode == 2 ? 0 : REG_RA, target);
-                return (newMemRoot_, memUpdated_, memAddr_);
+                return (newMemRoot_, memUpdated_, effMemAddr_);
             }
 
             // register fetch
@@ -129,7 +129,7 @@ library MIPS64Instructions {
                     _rtReg: rtReg,
                     _rs: rs
                 });
-                return (newMemRoot_, memUpdated_, memAddr_);
+                return (newMemRoot_, memUpdated_, effMemAddr_);
             }
 
             uint64 storeAddr = U64_MASK;
@@ -162,18 +162,18 @@ library MIPS64Instructions {
                 if (_args.fun == 8 || _args.fun == 9) {
                     // jr/jalr
                     handleJump(_args.cpu, _args.registers, _args.fun == 8 ? 0 : rdReg, rs);
-                    return (newMemRoot_, memUpdated_, memAddr_);
+                    return (newMemRoot_, memUpdated_, effMemAddr_);
                 }
 
                 if (_args.fun == 0xa) {
                     // movz
                     handleRd(_args.cpu, _args.registers, rdReg, rs, rt == 0);
-                    return (newMemRoot_, memUpdated_, memAddr_);
+                    return (newMemRoot_, memUpdated_, effMemAddr_);
                 }
                 if (_args.fun == 0xb) {
                     // movn
                     handleRd(_args.cpu, _args.registers, rdReg, rs, rt != 0);
-                    return (newMemRoot_, memUpdated_, memAddr_);
+                    return (newMemRoot_, memUpdated_, effMemAddr_);
                 }
 
                 // lo and hi registers
@@ -187,7 +187,7 @@ library MIPS64Instructions {
                         _rt: rt,
                         _storeReg: rdReg
                     });
-                    return (newMemRoot_, memUpdated_, memAddr_);
+                    return (newMemRoot_, memUpdated_, effMemAddr_);
                 }
             }
 
@@ -195,13 +195,13 @@ library MIPS64Instructions {
             if (storeAddr != U64_MASK) {
                 newMemRoot_ = MIPS64Memory.writeMem(storeAddr, _args.memProofOffset, val);
                 memUpdated_ = true;
-                memAddr_ = storeAddr;
+                effMemAddr_ = storeAddr;
             }
 
             // write back the value to destination register
             handleRd(_args.cpu, _args.registers, rdReg, val, true);
 
-            return (newMemRoot_, memUpdated_, memAddr_);
+            return (newMemRoot_, memUpdated_, effMemAddr_);
         }
     }
 

From 0eb090e15849e74836e050dc414647d54e5bb250 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Mon, 4 Nov 2024 14:24:58 -0500
Subject: [PATCH 120/451] fix: Security reviews clean (#12811)

This updates the markdown table in security-reviews/README.md to:
1. Correct the scope of the 2024-03 Sherlock audit to Fault Proofs.
2. Rename pdfs to match the existing convetion
3. Fix Reviewer attribution on the Mips and no Mips audits.
---
 ...ps.pdf => 2024_08_Fault-Proofs-MIPS_Cantina.pdf} | Bin
 ...df => 2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf} | Bin
 docs/security-reviews/README.md                     |   6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename docs/security-reviews/{2024_08_report-cantinacode-coinbase-fault-proofs-mips.pdf => 2024_08_Fault-Proofs-MIPS_Cantina.pdf} (100%)
 rename docs/security-reviews/{2024_08_report-cb-fault-proofs-non-mips.pdf => 2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf} (100%)

diff --git a/docs/security-reviews/2024_08_report-cantinacode-coinbase-fault-proofs-mips.pdf b/docs/security-reviews/2024_08_Fault-Proofs-MIPS_Cantina.pdf
similarity index 100%
rename from docs/security-reviews/2024_08_report-cantinacode-coinbase-fault-proofs-mips.pdf
rename to docs/security-reviews/2024_08_Fault-Proofs-MIPS_Cantina.pdf
diff --git a/docs/security-reviews/2024_08_report-cb-fault-proofs-non-mips.pdf b/docs/security-reviews/2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf
similarity index 100%
rename from docs/security-reviews/2024_08_report-cb-fault-proofs-non-mips.pdf
rename to docs/security-reviews/2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf
diff --git a/docs/security-reviews/README.md b/docs/security-reviews/README.md
index 79e756e43f57..483dc1541858 100644
--- a/docs/security-reviews/README.md
+++ b/docs/security-reviews/README.md
@@ -24,8 +24,8 @@ Please see the report for the specific details.
 | 2023-12 | Trust                | Superchain Config Upgrade: `SuperchainConfig.sol`, `L1CrossDomainMessenger.sol`, `L1ERC721Bridge.sol`, `L1StandardBridge.sol`, `OptimismPortal.sol`, `CrossDomainMessenger.sol`, `ERC721Bridge.sol`, `StandardBridge.sol` | [2023_12_SuperchainConfigUpgrade_Trust.pdf](./2023_12_SuperchainConfigUpgrade_Trust.pdf)                                                                   | d1651bb22645ebd41ac4bb2ab4786f9a56fc1003     | op-contracts/v1.2.0 |
 | 2024-02 | Runtime Verification | Pausability                                                                                                                                                                                                               | [Kontrol Verification][kontrol]                                                                                                                            |                                              |                     |
 | 2024-02 | Cantina              | MCP L1: `OptimismPortal.sol`, `L1CrossDomainMessenger.sol`, `L1StandardBridge.sol`, `L1ERC721Bridge.sol`, `OptimismMintableERC20Factory.sol`, `L2OutputOracle.sol`, `SystemConfig.sol`                                    | [2024_02-MCP_L1-Cantina.pdf](./2024_02-MCP_L1-Cantina.pdf)                                                                                                 | e6ef3a900c42c8722e72c2e2314027f85d12ced5     | op-contracts/v1.3.0 |
-| 2024-03 | Sherlock             | MCP L1                                                                                                                                                                                                                    | Sherlock Optimism Fault Proofs Contest ([site](https://audits.sherlock.xyz/contests/205), [repo](https://github.com/sherlock-audit/2024-02-optimism-2024)) |                                              |                     |
-| 2024-08 | Spearbit             | Fault proof no-MIPS: All contracts in the `packages/contracts-bedrock/src/dispute` directory                                                                                                                              | [Base Fault Proof No MIPS](./2024_08_report-cb-fault-proofs-non-mips.pdf)                                                                                  | 1f7081798ce2d49b8643514663d10681cb853a3d     | op-contracts/v1.4.0 |
-| 2024-08 | Cantina              | Fault proof MIPS: `MIPS.sol`                                                                                                                                                                                              | [Base Fault Proof MIPS](./2024_08_report-cantinacode-coinbase-fault-proofs-mips.pdf)                                                                       | 71b93116738ee98c9f8713b1a5dfe626ce06c1b2     | op-contracts/v1.6.0 |
+| 2024-03 | Sherlock             | Fault Proofs                                                                                                                                                                                                              | Sherlock Optimism Fault Proofs Contest ([site](https://audits.sherlock.xyz/contests/205), [repo](https://github.com/sherlock-audit/2024-02-optimism-2024)) |                                              |                     |
+| 2024-08 | Cantina              | Fault proof no-MIPS: All contracts in the `packages/contracts-bedrock/src/dispute` directory                                                                                                                              | [./2024_08_Fault-Proofs-MIPS_Cantina.pdf](./2024_08_Fault-Proofs-MIPS_Cantina.pdf)                                                                         | 1f7081798ce2d49b8643514663d10681cb853a3d     | op-contracts/v1.4.0 |
+| 2024-08 | Spearbit             | Fault proof MIPS: `MIPS.sol`                                                                                                                                                                                              | [./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf](./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf)                                                                 | 71b93116738ee98c9f8713b1a5dfe626ce06c1b2     | op-contracts/v1.6.0 |
 
 [kontrol]: https://github.com/ethereum-optimism/optimism/blob/876e16ad04968f0bb641eb76f98eb77e7e1a3e16/packages/contracts-bedrock/test/kontrol/README.md

From f80eb8dd2d4371ba0e303e15d364b9171c0cf08d Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Mon, 4 Nov 2024 14:37:11 -0500
Subject: [PATCH 121/451] cannon: Add post-state checks (#12809)

* cannon: Add post-state assertions

* cannon: Bump MIPS64 contract version
---
 cannon/mipsevm/multithreaded/mips.go          | 17 +++++++++
 packages/contracts-bedrock/semver-lock.json   |  4 +-
 .../snapshots/abi/MIPS64.json                 |  2 +-
 .../contracts-bedrock/src/cannon/MIPS64.sol   | 38 +++++++++++++++++--
 4 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/cannon/mipsevm/multithreaded/mips.go b/cannon/mipsevm/multithreaded/mips.go
index 4051465a3023..b537953a31e6 100644
--- a/cannon/mipsevm/multithreaded/mips.go
+++ b/cannon/mipsevm/multithreaded/mips.go
@@ -224,6 +224,23 @@ func (m *InstrumentedState) handleSyscall() error {
 }
 
 func (m *InstrumentedState) mipsStep() error {
+	err := m.doMipsStep()
+	if err != nil {
+		return err
+	}
+
+	m.assertPostStateChecks()
+	return err
+}
+
+func (m *InstrumentedState) assertPostStateChecks() {
+	activeStack := m.state.getActiveThreadStack()
+	if len(activeStack) == 0 {
+		panic("post-state active thread stack is empty")
+	}
+}
+
+func (m *InstrumentedState) doMipsStep() error {
 	if m.state.Exited {
 		return nil
 	}
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 62672e3852f0..8082c799f755 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -148,8 +148,8 @@
     "sourceCodeHash": "0x9fa2d1297ad1e93b4d3c5c0fed08bedcd8f746807589f0fd3369e79347c6a027"
   },
   "src/cannon/MIPS64.sol": {
-    "initCodeHash": "0xc615a8f321f3bfb29c9459705f3012e512c463ba9ba2e1bcb6f9349f2d911d10",
-    "sourceCodeHash": "0x8fd0f4167d80f48010ad1241a9f6fb93576887dcc1f97be6b05adaf0086a537b"
+    "initCodeHash": "0x93aa8d7f9fd3c22276c0d303a3fefdf8f73cc55807b35e483bba64c92d02aaef",
+    "sourceCodeHash": "0x171d66c651fdad2ac9c287da92689815a5b09589945ada092179508ad2326306"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
diff --git a/packages/contracts-bedrock/snapshots/abi/MIPS64.json b/packages/contracts-bedrock/snapshots/abi/MIPS64.json
index fe6007b60a89..a12c96c7a70d 100644
--- a/packages/contracts-bedrock/snapshots/abi/MIPS64.json
+++ b/packages/contracts-bedrock/snapshots/abi/MIPS64.json
@@ -45,7 +45,7 @@
     "outputs": [
       {
         "internalType": "bytes32",
-        "name": "",
+        "name": "postState_",
         "type": "bytes32"
       }
     ],
diff --git a/packages/contracts-bedrock/src/cannon/MIPS64.sol b/packages/contracts-bedrock/src/cannon/MIPS64.sol
index 3ca24d632eed..53dd0649405d 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS64.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS64.sol
@@ -64,8 +64,8 @@ contract MIPS64 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS64 contract.
-    /// @custom:semver 1.0.0-beta.3
-    string public constant version = "1.0.0-beta.3";
+    /// @custom:semver 1.0.0-beta.4
+    string public constant version = "1.0.0-beta.4";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -106,7 +106,39 @@ contract MIPS64 is ISemver {
     /// the current thread stack.
     /// @param _localContext The local key context for the preimage oracle. Optional, can be set as a constant
     ///                      if the caller only requires one set of local keys.
-    function step(bytes calldata _stateData, bytes calldata _proof, bytes32 _localContext) public returns (bytes32) {
+    /// @return postState_ The hash of the post state witness after the state transition.
+    function step(
+        bytes calldata _stateData,
+        bytes calldata _proof,
+        bytes32 _localContext
+    )
+        public
+        returns (bytes32 postState_)
+    {
+        postState_ = doStep(_stateData, _proof, _localContext);
+        assertPostStateChecks();
+    }
+
+    function assertPostStateChecks() internal pure {
+        State memory state;
+        assembly {
+            state := STATE_MEM_OFFSET
+        }
+
+        bytes32 activeStack = state.traverseRight ? state.rightThreadStack : state.leftThreadStack;
+        if (activeStack == EMPTY_THREAD_ROOT) {
+            revert("MIPS64: post-state active thread stack is empty");
+        }
+    }
+
+    function doStep(
+        bytes calldata _stateData,
+        bytes calldata _proof,
+        bytes32 _localContext
+    )
+        internal
+        returns (bytes32)
+    {
         unchecked {
             State memory state;
             ThreadState memory thread;

From 9bdcb02631d47994aa49f4f23595376d1e816dcf Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 4 Nov 2024 13:20:06 -0700
Subject: [PATCH 122/451] op-deployer: Fix useInterop flag (#12813)

* op-deployer: Fix useInterop flag

* set interop offset
---
 op-deployer/pkg/deployer/state/deploy_config.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/op-deployer/pkg/deployer/state/deploy_config.go b/op-deployer/pkg/deployer/state/deploy_config.go
index 534b1292d125..15d5491ce8b8 100644
--- a/op-deployer/pkg/deployer/state/deploy_config.go
+++ b/op-deployer/pkg/deployer/state/deploy_config.go
@@ -70,7 +70,7 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 				L2GenesisEcotoneTimeOffset:  u64UtilPtr(0),
 				L2GenesisFjordTimeOffset:    u64UtilPtr(0),
 				L2GenesisGraniteTimeOffset:  u64UtilPtr(0),
-				UseInterop:                  false,
+				UseInterop:                  intent.UseInterop,
 			},
 			L2CoreDeployConfig: genesis.L2CoreDeployConfig{
 				L1ChainID:                 intent.L1ChainID,
@@ -102,6 +102,10 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 		},
 	}
 
+	if intent.UseInterop {
+		cfg.L2InitializationConfig.UpgradeScheduleDeployConfig.L2GenesisInteropTimeOffset = u64UtilPtr(0)
+	}
+
 	if chainState.StartBlock == nil {
 		// These are dummy variables - see below for rationale.
 		num := rpc.LatestBlockNumber

From 94ab846ab439ef26802ca32d6bc5921aadbafa0f Mon Sep 17 00:00:00 2001
From: AgusDuha <81362284+agusduha@users.noreply.github.com>
Date: Mon, 4 Nov 2024 18:04:47 -0300
Subject: [PATCH 123/451] feat: implement IERC7802 (#12790)

* feat: add IERC7802 (#123)

* feat: add IERC7802

* fix: token address fuzz error

* feat: remove ERC165 contract inheritance

* feat: add IERC20 interface support (#124)

* feat: add IERC20 interface support

* fix: interfaces tests
---
 packages/contracts-bedrock/semver-lock.json   | 14 ++++-----
 .../snapshots/abi/SuperchainTokenBridge.json  |  5 ++++
 .../snapshots/abi/SuperchainWETH.json         | 19 ++++++++++++
 .../src/L2/OptimismSuperchainERC20.sol        |  7 ++---
 .../src/L2/SuperchainERC20.sol                | 20 ++++++++-----
 .../src/L2/SuperchainTokenBridge.sol          | 11 +++++--
 .../src/L2/SuperchainWETH.sol                 | 15 +++++++---
 .../{ICrosschainERC20.sol => IERC7802.sol}    |  6 ++--
 .../src/L2/interfaces/ISuperchainERC20.sol    |  6 ++--
 .../L2/interfaces/ISuperchainTokenBridge.sol  |  1 +
 .../src/L2/interfaces/ISuperchainWETH.sol     |  5 ++--
 .../test/L2/SuperchainERC20.t.sol             | 24 ++++++++++++---
 .../test/L2/SuperchainTokenBridge.t.sol       | 30 +++++++++++++++++--
 .../test/L2/SuperchainWETH.t.sol              | 18 +++++++++++
 14 files changed, 145 insertions(+), 36 deletions(-)
 rename packages/contracts-bedrock/src/L2/interfaces/{ICrosschainERC20.sol => IERC7802.sol} (89%)

diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 8082c799f755..1e14f5d286b5 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -108,8 +108,8 @@
     "sourceCodeHash": "0xa76133db7f449ae742f9ba988ad86ccb5672475f61298b9fefe411b63b63e9f6"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0x24d85d246858d1aff78ae86c614dd0dc0f63b3326b2b662e3462c3a6f9b7965e",
-    "sourceCodeHash": "0xcb705d26e63e733051c8bd442ea69ce637a00c16d646ccc37b687b20941366fe"
+    "initCodeHash": "0x5bc5824030ecdb531e1f615d207cb73cdaa702e198769445d0ddbe717271eba9",
+    "sourceCodeHash": "0x0819c9411a155dca592d19b60c4176954202e4fe5d632a4ffbf88d465461252c"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
     "initCodeHash": "0x23dba3ceb9e58646695c306996c9e15251ac79acc6339c1a93d10a4c79da6dab",
@@ -125,15 +125,15 @@
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-    "sourceCodeHash": "0xba47f404e66e010ce417410476f26c704f2be4ce584cb79210bc5536a82ddb1f"
+    "sourceCodeHash": "0xcf39c16893cace1e7d61350bfff05a27f3ce8da8eb0ac02cb5ac7bf603f163fa"
   },
   "src/L2/SuperchainTokenBridge.sol": {
-    "initCodeHash": "0xef7590c30630a75f105384e339e52758569c25a5aa0a5934c521e004b8f86220",
-    "sourceCodeHash": "0x4f539e9d9096d31e861982b8f751fa2d7de0849590523375cf92e175294d1036"
+    "initCodeHash": "0x1cd2afdae6dd1b6ebc17f1d529e7d74c9b8b21b02db8589b8e389e2d5523d775",
+    "sourceCodeHash": "0x617aa994f659c5d8ebd54128d994f86f5b175ceca095b024b8524a7898e8ae62"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0xc72cb486b815a65daa8bd5d0af8c965b6708cf8caf03de0a18023a63a6e6c604",
-    "sourceCodeHash": "0x39fff1d4702a2fec3dcba29c7f9604eabf20d32e9c5bf4377edeb620624aa467"
+    "initCodeHash": "0x5aef986a7c9c102b1e9b3068e2a2b66adce0a71dd5f39e03694622bf494f8d97",
+    "sourceCodeHash": "0xa62101a23b860e97f393027c898082a1c73d50679eceb6c6793844af29702359"
   },
   "src/L2/WETH.sol": {
     "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainTokenBridge.json b/packages/contracts-bedrock/snapshots/abi/SuperchainTokenBridge.json
index 36358db1b307..a75bb2ba7234 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainTokenBridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainTokenBridge.json
@@ -153,6 +153,11 @@
     "name": "InvalidCrossDomainSender",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "InvalidERC7802",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "Unauthorized",
diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
index fe53a4cbfb5e..32d84df7d889 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
@@ -143,6 +143,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "_interfaceId",
+        "type": "bytes4"
+      }
+    ],
+    "name": "supportsInterface",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "symbol",
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
index 1e7cdb4a7190..c323d8b7577b 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
@@ -3,7 +3,6 @@ pragma solidity 0.8.25;
 
 import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { ERC165 } from "@openzeppelin/contracts-v5/utils/introspection/ERC165.sol";
 import { SuperchainERC20 } from "src/L2/SuperchainERC20.sol";
 import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
 import { ZeroAddress, Unauthorized } from "src/libraries/errors/CommonErrors.sol";
@@ -16,7 +15,7 @@ import { ZeroAddress, Unauthorized } from "src/libraries/errors/CommonErrors.sol
 ///         OptimismSuperchainERC20 token, turning it fungible and interoperable across the superchain. Likewise, it
 ///         also enables the inverse conversion path.
 ///         Moreover, it builds on top of the L2ToL2CrossDomainMessenger for both replay protection and domain binding.
-contract OptimismSuperchainERC20 is SuperchainERC20, Initializable, ERC165 {
+contract OptimismSuperchainERC20 is SuperchainERC20, Initializable {
     /// @notice Emitted whenever tokens are minted for an account.
     /// @param to Address of the account tokens are being minted for.
     /// @param amount  Amount of tokens minted.
@@ -59,8 +58,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable, ERC165 {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.8
-    string public constant override version = "1.0.0-beta.8";
+    /// @custom:semver 1.0.0-beta.9
+    string public constant override version = "1.0.0-beta.9";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
index f18f91ad2413..b9e6bbfbf780 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
@@ -1,21 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import { ICrosschainERC20 } from "src/L2/interfaces/ICrosschainERC20.sol";
+import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { ERC20 } from "@solady-v0.0.245/tokens/ERC20.sol";
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 
 /// @title SuperchainERC20
-/// @notice SuperchainERC20 is a standard extension of the base ERC20 token contract that unifies ERC20 token
-///         bridging to make it fungible across the Superchain. This construction allows the SuperchainTokenBridge to
-///         burn and mint tokens.
-abstract contract SuperchainERC20 is ERC20, ICrosschainERC20, ISemver {
+/// @notice A standard ERC20 extension implementing IERC7802 for unified cross-chain fungibility across
+///         the Superchain. Allows the SuperchainTokenBridge to mint and burn tokens as needed.
+abstract contract SuperchainERC20 is ERC20, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.4
+    /// @custom:semver 1.0.0-beta.5
     function version() external view virtual returns (string memory) {
-        return "1.0.0-beta.4";
+        return "1.0.0-beta.5";
     }
 
     /// @notice Allows the SuperchainTokenBridge to mint tokens.
@@ -39,4 +39,10 @@ abstract contract SuperchainERC20 is ERC20, ICrosschainERC20, ISemver {
 
         emit CrosschainBurn(_from, _amount);
     }
+
+    /// @inheritdoc IERC165
+    function supportsInterface(bytes4 _interfaceId) public view virtual returns (bool) {
+        return _interfaceId == type(IERC7802).interfaceId || _interfaceId == type(IERC20).interfaceId
+            || _interfaceId == type(IERC165).interfaceId;
+    }
 }
diff --git a/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol b/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol
index 284beb79ec0e..104f8ef95043 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol
@@ -7,6 +7,7 @@ import { ZeroAddress, Unauthorized } from "src/libraries/errors/CommonErrors.sol
 
 // Interfaces
 import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
+import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
 import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
 
 /// @custom:proxied true
@@ -20,6 +21,9 @@ contract SuperchainTokenBridge {
     /// SuperchainTokenBridge.
     error InvalidCrossDomainSender();
 
+    /// @notice Thrown when attempting to use a token that does not implement the ERC7802 interface.
+    error InvalidERC7802();
+
     /// @notice Emitted when tokens are sent from one chain to another.
     /// @param token         Address of the token sent.
     /// @param from          Address of the sender.
@@ -42,8 +46,8 @@ contract SuperchainTokenBridge {
     address internal constant MESSENGER = Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.2
-    string public constant version = "1.0.0-beta.2";
+    /// @custom:semver 1.0.0-beta.3
+    string public constant version = "1.0.0-beta.3";
 
     /// @notice Sends tokens to a target address on another chain.
     /// @dev Tokens are burned on the source chain.
@@ -63,6 +67,8 @@ contract SuperchainTokenBridge {
     {
         if (_to == address(0)) revert ZeroAddress();
 
+        if (!IERC165(_token).supportsInterface(type(IERC7802).interfaceId)) revert InvalidERC7802();
+
         ISuperchainERC20(_token).crosschainBurn(msg.sender, _amount);
 
         bytes memory message = abi.encodeCall(this.relayERC20, (_token, msg.sender, _to, _amount));
@@ -82,6 +88,7 @@ contract SuperchainTokenBridge {
 
         (address crossDomainMessageSender, uint256 source) =
             IL2ToL2CrossDomainMessenger(MESSENGER).crossDomainMessageContext();
+
         if (crossDomainMessageSender != address(this)) revert InvalidCrossDomainSender();
 
         ISuperchainERC20(_token).crosschainMint(_to, _amount);
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index e03b689ba150..29e179eba82c 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -12,7 +12,8 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
-import { ICrosschainERC20 } from "src/L2/interfaces/ICrosschainERC20.sol";
+import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErrors.sol";
 
 /// @custom:proxied true
@@ -21,10 +22,10 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 /// @notice SuperchainWETH is a version of WETH that can be freely transfrered between chains
 ///         within the superchain. SuperchainWETH can be converted into native ETH on chains that
 ///         do not use a custom gas token.
-contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
+contract SuperchainWETH is WETH98, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.9
-    string public constant version = "1.0.0-beta.9";
+    /// @custom:semver 1.0.0-beta.10
+    string public constant version = "1.0.0-beta.10";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
@@ -91,4 +92,10 @@ contract SuperchainWETH is WETH98, ICrosschainERC20, ISemver {
 
         emit CrosschainBurn(_from, _amount);
     }
+
+    /// @inheritdoc IERC165
+    function supportsInterface(bytes4 _interfaceId) public view virtual returns (bool) {
+        return _interfaceId == type(IERC7802).interfaceId || _interfaceId == type(IERC20).interfaceId
+            || _interfaceId == type(IERC165).interfaceId;
+    }
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ICrosschainERC20.sol b/packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol
similarity index 89%
rename from packages/contracts-bedrock/src/L2/interfaces/ICrosschainERC20.sol
rename to packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol
index 9fbfe8c65f33..469230e822d1 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ICrosschainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol
@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-/// @title ICrosschainERC20
+import { IERC165 } from "@openzeppelin/contracts/interfaces/IERC165.sol";
+
+/// @title IERC7802
 /// @notice Defines the interface for crosschain ERC20 transfers.
-interface ICrosschainERC20 {
+interface IERC7802 is IERC165 {
     /// @notice Emitted when a crosschain transfer mints tokens.
     /// @param to       Address of the account tokens are being minted for.
     /// @param amount   Amount of tokens minted.
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol
index ce066a27b88c..029b13d5520a 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol
@@ -2,15 +2,17 @@
 pragma solidity ^0.8.0;
 
 // Interfaces
-import { ICrosschainERC20 } from "src/L2/interfaces/ICrosschainERC20.sol";
+import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
 import { IERC20Solady as IERC20 } from "src/vendor/interfaces/IERC20Solady.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @title ISuperchainERC20
 /// @notice This interface is available on the SuperchainERC20 contract.
 /// @dev This interface is needed for the abstract SuperchainERC20 implementation but is not part of the standard
-interface ISuperchainERC20 is ICrosschainERC20, IERC20, ISemver {
+interface ISuperchainERC20 is IERC7802, IERC20, ISemver {
     error Unauthorized();
 
+    function supportsInterface(bytes4 _interfaceId) external view returns (bool);
+
     function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol
index f2a61d02d555..af9d7d8d8411 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol
@@ -9,6 +9,7 @@ interface ISuperchainTokenBridge is ISemver {
     error ZeroAddress();
     error Unauthorized();
     error InvalidCrossDomainSender();
+    error InvalidERC7802();
 
     event SendERC20(
         address indexed token, address indexed from, address indexed to, uint256 amount, uint256 destination
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
index 1935b4d5b0b5..fa10b237dbb5 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
@@ -2,15 +2,16 @@
 pragma solidity ^0.8.0;
 
 import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
-import { ICrosschainERC20 } from "src/L2/interfaces/ICrosschainERC20.sol";
+import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
-interface ISuperchainWETH is IWETH98, ICrosschainERC20, ISemver {
+interface ISuperchainWETH is IWETH98, IERC7802, ISemver {
     error Unauthorized();
     error NotCustomGasToken();
 
     function balanceOf(address src) external view returns (uint256);
     function withdraw(uint256 _amount) external;
+    function supportsInterface(bytes4 _interfaceId) external view returns (bool);
 
     function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
index f814c06c76df..a9aa3b501618 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
@@ -6,11 +6,11 @@ import { Test } from "forge-std/Test.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { IERC20Solady as IERC20 } from "src/vendor/interfaces/IERC20Solady.sol";
 
 // Target contract
 import { SuperchainERC20 } from "src/L2/SuperchainERC20.sol";
-import { ICrosschainERC20 } from "src/L2/interfaces/ICrosschainERC20.sol";
+import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
 import { MockSuperchainERC20Implementation } from "test/mocks/SuperchainERC20Implementation.sol";
 
@@ -62,7 +62,7 @@ contract SuperchainERC20Test is Test {
 
         // Look for the emit of the `CrosschainMint` event
         vm.expectEmit(address(superchainERC20));
-        emit ICrosschainERC20.CrosschainMint(_to, _amount);
+        emit IERC7802.CrosschainMint(_to, _amount);
 
         // Call the `mint` function with the bridge caller
         vm.prank(SUPERCHAIN_TOKEN_BRIDGE);
@@ -105,7 +105,7 @@ contract SuperchainERC20Test is Test {
 
         // Look for the emit of the `CrosschainBurn` event
         vm.expectEmit(address(superchainERC20));
-        emit ICrosschainERC20.CrosschainBurn(_from, _amount);
+        emit IERC7802.CrosschainBurn(_from, _amount);
 
         // Call the `burn` function with the bridge caller
         vm.prank(SUPERCHAIN_TOKEN_BRIDGE);
@@ -115,4 +115,20 @@ contract SuperchainERC20Test is Test {
         assertEq(superchainERC20.totalSupply(), _totalSupplyBefore - _amount);
         assertEq(superchainERC20.balanceOf(_from), _fromBalanceBefore - _amount);
     }
+
+    /// @notice Tests that the `supportsInterface` function returns true for the `IERC7802` interface.
+    function test_supportInterface_succeeds() public view {
+        assertTrue(superchainERC20.supportsInterface(type(IERC165).interfaceId));
+        assertTrue(superchainERC20.supportsInterface(type(IERC7802).interfaceId));
+        assertTrue(superchainERC20.supportsInterface(type(IERC20).interfaceId));
+    }
+
+    /// @notice Tests that the `supportsInterface` function returns false for any other interface than the
+    /// `IERC7802` one.
+    function testFuzz_supportInterface_returnFalse(bytes4 _interfaceId) public view {
+        vm.assume(_interfaceId != type(IERC165).interfaceId);
+        vm.assume(_interfaceId != type(IERC7802).interfaceId);
+        vm.assume(_interfaceId != type(IERC20).interfaceId);
+        assertFalse(superchainERC20.supportsInterface(_interfaceId));
+    }
 }
diff --git a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
index 2ff6cecfd12b..1dc01ba0008e 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
@@ -13,6 +13,7 @@ import { ISuperchainTokenBridge } from "src/L2/interfaces/ISuperchainTokenBridge
 import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
 import { IOptimismSuperchainERC20Factory } from "src/L2/interfaces/IOptimismSuperchainERC20Factory.sol";
 import { IERC20 } from "@openzeppelin/contracts/interfaces/IERC20.sol";
+import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
 
 /// @title SuperchainTokenBridgeTest
 /// @notice Contract for testing the SuperchainTokenBridge contract.
@@ -60,6 +61,32 @@ contract SuperchainTokenBridgeTest is Bridge_Initializer {
         superchainTokenBridge.sendERC20(address(superchainERC20), ZERO_ADDRESS, _amount, _chainId);
     }
 
+    /// @notice Tests the `sendERC20` function reverts when the `token` does not support the IERC7802 interface.
+    function testFuzz_sendERC20_notSupportedIERC7802_reverts(
+        address _token,
+        address _sender,
+        address _to,
+        uint256 _amount,
+        uint256 _chainId
+    )
+        public
+    {
+        vm.assume(_to != ZERO_ADDRESS);
+        assumeAddressIsNot(_token, AddressType.Precompile, AddressType.ForgeAddress);
+
+        // Mock the call over the `supportsInterface` function to return false
+        vm.mockCall(
+            _token, abi.encodeCall(ISuperchainERC20.supportsInterface, (type(IERC7802).interfaceId)), abi.encode(false)
+        );
+
+        // Expect the revert with `InvalidERC7802` selector
+        vm.expectRevert(ISuperchainTokenBridge.InvalidERC7802.selector);
+
+        // Call the `sendERC20` function
+        vm.prank(_sender);
+        superchainTokenBridge.sendERC20(_token, _to, _amount, _chainId);
+    }
+
     /// @notice Tests the `sendERC20` function burns the sender tokens, sends the message, and emits the `SendERC20`
     /// event.
     function testFuzz_sendERC20_succeeds(
@@ -137,7 +164,6 @@ contract SuperchainTokenBridgeTest is Bridge_Initializer {
     /// @notice Tests the `relayERC20` function reverts when the `crossDomainMessageSender` that sent the message is not
     /// the same SuperchainTokenBridge.
     function testFuzz_relayERC20_notCrossDomainSender_reverts(
-        address _token,
         address _crossDomainMessageSender,
         uint256 _source,
         address _to,
@@ -159,7 +185,7 @@ contract SuperchainTokenBridgeTest is Bridge_Initializer {
 
         // Call the `relayERC20` function with the sender caller
         vm.prank(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
-        superchainTokenBridge.relayERC20(_token, _crossDomainMessageSender, _to, _amount);
+        superchainTokenBridge.relayERC20(address(superchainERC20), _crossDomainMessageSender, _to, _amount);
     }
 
     /// @notice Tests the `relayERC20` mints the proper amount and emits the `RelayERC20` event.
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index 9a65544dc7ee..4d4109b6885a 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -12,6 +12,8 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 // Interfaces
 import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
 import { ISuperchainWETH } from "src/L2/interfaces/ISuperchainWETH.sol";
+import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 /// @title SuperchainWETH_Test
 /// @notice Contract for testing the SuperchainWETH contract.
@@ -457,4 +459,20 @@ contract SuperchainWETH_Test is CommonTest {
         // Assert
         assertEq(superchainWeth.balanceOf(_user), _wad);
     }
+
+    /// @notice Tests that the `supportsInterface` function returns true for the `IERC7802` interface.
+    function test_supportInterface_succeeds() public view {
+        assertTrue(superchainWeth.supportsInterface(type(IERC165).interfaceId));
+        assertTrue(superchainWeth.supportsInterface(type(IERC7802).interfaceId));
+        assertTrue(superchainWeth.supportsInterface(type(IERC20).interfaceId));
+    }
+
+    /// @notice Tests that the `supportsInterface` function returns false for any other interface than the
+    /// `IERC7802` one.
+    function testFuzz_supportInterface_returnFalse(bytes4 _interfaceId) public view {
+        vm.assume(_interfaceId != type(IERC165).interfaceId);
+        vm.assume(_interfaceId != type(IERC7802).interfaceId);
+        vm.assume(_interfaceId != type(IERC20).interfaceId);
+        assertFalse(superchainWeth.supportsInterface(_interfaceId));
+    }
 }

From c1c0d2c5177bc4e24a2e4e1441813a3f611c3a7a Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Mon, 4 Nov 2024 19:52:37 -0500
Subject: [PATCH 124/451] feat: Update `kona` in `proofs-tools` image (#12817)

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 4f72678a8cab..5f7f311cefe4 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -207,7 +207,7 @@ target "proofs-tools" {
   context = "."
   args = {
     CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="kona-client-v0.1.0-alpha.6"
+    KONA_VERSION="kona-client-v0.1.0-alpha.7"
   }
   target="proofs-tools"
   platforms = split(",", PLATFORMS)

From b638304da21b2ae8b5208a70c49f4d463e6b2e6b Mon Sep 17 00:00:00 2001
From: ControlCplusControlV
 <44706811+ControlCplusControlV@users.noreply.github.com>
Date: Tue, 5 Nov 2024 01:03:53 -0500
Subject: [PATCH 125/451] Move top-level markdown files into meta/docs folder
 (#12727)

* Moved meta files to a new folder

* doctoc POLICY

* fix versioning

* remove doctoc on versioning
---
 packages/contracts-bedrock/README.md          |  8 ++---
 .../{ => meta}/CONTRIBUTING.md                |  0
 .../{ => meta}/INTERFACES.md                  |  0
 packages/contracts-bedrock/{ => meta}/LICENSE |  0
 packages/contracts-bedrock/meta/POLICY.md     | 36 +++++++++++++++++++
 .../{ => meta}/SOLIDITY_UPGRADES.md           |  0
 .../{ => meta}/STYLE_GUIDE.md                 |  0
 .../{ => meta}/VERSIONING.md                  | 12 -------
 8 files changed, 40 insertions(+), 16 deletions(-)
 rename packages/contracts-bedrock/{ => meta}/CONTRIBUTING.md (100%)
 rename packages/contracts-bedrock/{ => meta}/INTERFACES.md (100%)
 rename packages/contracts-bedrock/{ => meta}/LICENSE (100%)
 create mode 100644 packages/contracts-bedrock/meta/POLICY.md
 rename packages/contracts-bedrock/{ => meta}/SOLIDITY_UPGRADES.md (100%)
 rename packages/contracts-bedrock/{ => meta}/STYLE_GUIDE.md (100%)
 rename packages/contracts-bedrock/{ => meta}/VERSIONING.md (91%)

diff --git a/packages/contracts-bedrock/README.md b/packages/contracts-bedrock/README.md
index f3c70baf0914..a9f1dbeeaa5f 100644
--- a/packages/contracts-bedrock/README.md
+++ b/packages/contracts-bedrock/README.md
@@ -66,22 +66,22 @@ See the [Optimism Developer Docs](https://docs.optimism.io/chain/addresses) for
 ### Contributing Guide
 
 Contributions to the OP Stack are always welcome.
-Please refer to the [CONTRIBUTING.md](https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts-bedrock/CONTRIBUTING.md) for more information about how to contribute to the OP Stack smart contracts.
+Please refer to the [CONTRIBUTING.md](./meta/CONTRIBUTING.md) for more information about how to contribute to the OP Stack smart contracts.
 
 ### Style Guide
 
-OP Stack smart contracts should be written according to the [STYLE_GUIDE.md](./STYLE_GUIDE.md) found within this repository.
+OP Stack smart contracts should be written according to the [STYLE_GUIDE.md](./meta/STYLE_GUIDE.md) found within this repository.
 Maintaining a consistent code style makes code easier to review and maintain, ultimately making the development process safer.
 
 ### Contract Interfaces
 
 OP Stack smart contracts use contract interfaces in a relatively unique way. Please refer to
-[INTERFACES.md](./INTERFACES.md) to read more about how the OP Stack uses contract interfaces.
+[INTERFACES.md](./meta/INTERFACES.md) to read more about how the OP Stack uses contract interfaces.
 
 ### Solidity Versioning
 
 OP Stack smart contracts are designed to utilize a single, consistent Solidity version. Please
-refer to [SOLIDITY_UPGRADES.md](./SOLIDITY_UPGRADES.md) to understand the process for updating to
+refer to [SOLIDITY_UPGRADES.md](./meta/SOLIDITY_UPGRADES.md) to understand the process for updating to
 newer Solidity versions.
 
 ## Deployment
diff --git a/packages/contracts-bedrock/CONTRIBUTING.md b/packages/contracts-bedrock/meta/CONTRIBUTING.md
similarity index 100%
rename from packages/contracts-bedrock/CONTRIBUTING.md
rename to packages/contracts-bedrock/meta/CONTRIBUTING.md
diff --git a/packages/contracts-bedrock/INTERFACES.md b/packages/contracts-bedrock/meta/INTERFACES.md
similarity index 100%
rename from packages/contracts-bedrock/INTERFACES.md
rename to packages/contracts-bedrock/meta/INTERFACES.md
diff --git a/packages/contracts-bedrock/LICENSE b/packages/contracts-bedrock/meta/LICENSE
similarity index 100%
rename from packages/contracts-bedrock/LICENSE
rename to packages/contracts-bedrock/meta/LICENSE
diff --git a/packages/contracts-bedrock/meta/POLICY.md b/packages/contracts-bedrock/meta/POLICY.md
new file mode 100644
index 000000000000..e2759f4eff12
--- /dev/null
+++ b/packages/contracts-bedrock/meta/POLICY.md
@@ -0,0 +1,36 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+
+- [Policy](#policy)
+  - [Contributing](#contributing)
+  - [Versioning Policy](#versioning-policy)
+  - [Upgrade Policy](#upgrade-policy)
+  - [Style Guide](#style-guide)
+  - [Revert Data](#revert-data)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# Policy
+
+This document outlines upgrade policies regarding the OP Stack codebase.
+
+## Contributing
+
+For any policies on contributing, please see [CONTRIBUTING](./CONTRIBUTING.md)
+
+## Versioning Policy
+
+For our versioning policy, please see our policy on [VERSIONING](./VERSIONING.md)
+
+## Upgrade Policy
+
+For the solidity upgrade policy, please see our doc on [SOLIDITY UPGRADES](./SOLIDITY_UPGRADES.md)
+
+## Style Guide
+
+For an indepth review of the code style used in the OP Stack contracts, please see our [STYLE GUIDE](./STYLE_GUIDE.md)
+
+## Revert Data
+
+Revert data may be changed in the future, and is not a reliable interface for external consumers. Contracts should not depend on specific revert data returned by OP Stack contracts, which can be changed during any future OP Stack contract upgrades. Revert data includes both custom errors returned by contracts, as a well as revert strings.
diff --git a/packages/contracts-bedrock/SOLIDITY_UPGRADES.md b/packages/contracts-bedrock/meta/SOLIDITY_UPGRADES.md
similarity index 100%
rename from packages/contracts-bedrock/SOLIDITY_UPGRADES.md
rename to packages/contracts-bedrock/meta/SOLIDITY_UPGRADES.md
diff --git a/packages/contracts-bedrock/STYLE_GUIDE.md b/packages/contracts-bedrock/meta/STYLE_GUIDE.md
similarity index 100%
rename from packages/contracts-bedrock/STYLE_GUIDE.md
rename to packages/contracts-bedrock/meta/STYLE_GUIDE.md
diff --git a/packages/contracts-bedrock/VERSIONING.md b/packages/contracts-bedrock/meta/VERSIONING.md
similarity index 91%
rename from packages/contracts-bedrock/VERSIONING.md
rename to packages/contracts-bedrock/meta/VERSIONING.md
index fefc2211b3e5..cb2b6b692124 100644
--- a/packages/contracts-bedrock/VERSIONING.md
+++ b/packages/contracts-bedrock/meta/VERSIONING.md
@@ -11,7 +11,6 @@ There are five parts to the versioning and release process:
 - [Release Process](#release-process): The process for deploying contracts, creating a governance proposal, and the required associated releases.
   - [Additional Release Candidates](#additional-release-candidates): How to handle additional release candidates after an initial `op-contracts/vX.Y.Z-rc.1` release.
   - [Merging Back to Develop After Governance Approval](#merging-back-to-develop-after-governance-approval): Explains how to choose the resulting contract versions when merging back into `develop`.
-- [Changelog](#changelog): A CHANGELOG for contract releases is maintained.
 
 > [!NOTE]
 > The rules described in this document must be enforced manually.
@@ -119,14 +118,3 @@ Now there are two scenarios for the PR that merges the release branch back into
     - In practice, this one unlikely to occur when using inheritance for feature development, as specified in [Smart Contract Feature Development](https://github.com/ethereum-optimism/design-docs/blob/main/smart-contract-feature-development.md) architecture. It's more likely that (1) is the case, and we merge the version change into the base contract.
 
 This flow also provides a dedicated branch for each release, making it easy to deploy a patch or bug fix, regardless of other changes that may have occurred on develop since the release.
-
-## Changelog
-
-Lastly, a CHANGELOG for contract releases must be maintained:
-
-- Each upcoming release will have a tracking issue that documents the new versions of each contract that will be included in the release, along with links to the PRs that made the changes.
-- Every contracts PR must have an accompanying changelog entry in a tracking issue once it is merged.
-- Tracking issue titles should be named based on the expected Upgrade number they will go to governance with, e.g. "op-contracts changelog: Upgrade 9".
-  - See [ethereum-optimism/optimism#10592](https://github.com/ethereum-optimism/optimism/issues/10592) for an example of what this tracking issue should look like.
-  - We do not include a version number in the issue because it may be hard to predict the final version number of a release until all PRs are merged.
-  - Using upgrade numbers also acts as a forcing function to ensure upgrade sequencing and the governance process is accounted for early in the development process.

From 5cb2daba68f5d3b6f4fd51c33d12f8861a4b57fc Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Tue, 5 Nov 2024 00:06:37 -0600
Subject: [PATCH 126/451] test: longer Eventually timeout for TestWorker
 (#12822)

---
 op-supervisor/supervisor/backend/cross/worker_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-supervisor/supervisor/backend/cross/worker_test.go b/op-supervisor/supervisor/backend/cross/worker_test.go
index 03fda620350b..cc9d173a28d0 100644
--- a/op-supervisor/supervisor/backend/cross/worker_test.go
+++ b/op-supervisor/supervisor/backend/cross/worker_test.go
@@ -94,7 +94,7 @@ func TestWorker(t *testing.T) {
 		w.StartBackground()
 		require.Eventually(t, func() bool {
 			return count == 10
-		}, 2*time.Second, 100*time.Millisecond)
+		}, 10*time.Second, time.Second)
 		// once the worker is closed, it stops running
 		// and the count does not increment
 		w.Close()

From fd7d34ccb8f1aad58dbe1ff09fe0030858d1f4a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 23:29:28 -0700
Subject: [PATCH 127/451] dependabot(gomod): bump github.com/golang-jwt/jwt/v4
 from 4.5.0 to 4.5.1 (#12816)

Bumps [github.com/golang-jwt/jwt/v4](https://github.com/golang-jwt/jwt) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/golang-jwt/jwt/releases)
- [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md)
- [Commits](https://github.com/golang-jwt/jwt/compare/v4.5.0...v4.5.1)

---
updated-dependencies:
- dependency-name: github.com/golang-jwt/jwt/v4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 66c99169912c..0cf83e382d24 100644
--- a/go.mod
+++ b/go.mod
@@ -110,7 +110,7 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
diff --git a/go.sum b/go.sum
index 3eaeda632c7b..3819b1e73fae 100644
--- a/go.sum
+++ b/go.sum
@@ -264,8 +264,8 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
-github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
+github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=

From 6fbf9db6d57158797127516bc231dad480918289 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 5 Nov 2024 00:43:48 -0700
Subject: [PATCH 128/451] op-supervisor: fix data race in test (#12824)

* op-supervisor: fix data race in test

This test is flaky in CI. I believe it may be related to a data race: the `count` variable was being read from/written to across multiple threads which could lead to invalid data being read by the test. I verified that the data race was gone by running the test with `-race`.

* Use >= rather than exact numbers
---
 .../supervisor/backend/cross/worker_test.go   | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/op-supervisor/supervisor/backend/cross/worker_test.go b/op-supervisor/supervisor/backend/cross/worker_test.go
index cc9d173a28d0..6f9d543fde1a 100644
--- a/op-supervisor/supervisor/backend/cross/worker_test.go
+++ b/op-supervisor/supervisor/backend/cross/worker_test.go
@@ -2,6 +2,7 @@ package cross
 
 import (
 	"context"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -13,20 +14,20 @@ import (
 func TestWorker(t *testing.T) {
 	logger := testlog.Logger(t, log.LevelDebug)
 	t.Run("do work", func(t *testing.T) {
-		count := 0
+		var count int32
 		w := NewWorker(logger, func(ctx context.Context) error {
-			count++
+			atomic.AddInt32(&count, 1)
 			return nil
 		})
 		t.Cleanup(w.Close)
 		// when ProcessWork is called, the workFn is called once
 		require.NoError(t, w.ProcessWork())
-		require.Equal(t, 1, count)
+		require.EqualValues(t, 1, atomic.LoadInt32(&count))
 	})
 	t.Run("background worker", func(t *testing.T) {
-		count := 0
+		var count int32
 		w := NewWorker(logger, func(ctx context.Context) error {
-			count++
+			atomic.AddInt32(&count, 1)
 			return nil
 		})
 		t.Cleanup(w.Close)
@@ -36,13 +37,13 @@ func TestWorker(t *testing.T) {
 		// the count should increment once
 		w.StartBackground()
 		require.Eventually(t, func() bool {
-			return count == 1
+			return atomic.LoadInt32(&count) == 1
 		}, 2*time.Second, 100*time.Millisecond)
 	})
 	t.Run("background worker OnNewData", func(t *testing.T) {
-		count := 0
+		var count int32
 		w := NewWorker(logger, func(ctx context.Context) error {
-			count++
+			atomic.AddInt32(&count, 1)
 			return nil
 		})
 		t.Cleanup(w.Close)
@@ -52,55 +53,55 @@ func TestWorker(t *testing.T) {
 		// the count should increment once
 		w.StartBackground()
 		require.Eventually(t, func() bool {
-			return count == 1
+			return atomic.LoadInt32(&count) == 1
 		}, 2*time.Second, 100*time.Millisecond)
 		// when OnNewData is called, the worker runs again
 		w.OnNewData()
 		require.Eventually(t, func() bool {
-			return count == 2
+			return atomic.LoadInt32(&count) == 2
 		}, 2*time.Second, 100*time.Millisecond)
 		// and due to the long poll duration, the worker does not run again
 		require.Never(t, func() bool {
-			return count > 2
-		}, 10*time.Second, 100*time.Millisecond)
+			return atomic.LoadInt32(&count) > 2
+		}, time.Second, 100*time.Millisecond)
 	})
 	t.Run("background fast poll", func(t *testing.T) {
-		count := 0
+		var count int32
 		w := NewWorker(logger, func(ctx context.Context) error {
-			count++
+			atomic.AddInt32(&count, 1)
 			return nil
 		})
 		t.Cleanup(w.Close)
 		// set a long poll duration so the worker does not auto-run
 		w.pollDuration = 100 * time.Millisecond
 		// when StartBackground is called, the worker runs in the background
-		// the count should increment rapidly and reach 10 in 1 second
+		// the count should increment rapidly and reach at least 10 in 1 second
 		w.StartBackground()
 		require.Eventually(t, func() bool {
-			return count == 10
+			return atomic.LoadInt32(&count) >= 10
 		}, 2*time.Second, 100*time.Millisecond)
 	})
 	t.Run("close", func(t *testing.T) {
-		count := 0
+		var count int32
 		w := NewWorker(logger, func(ctx context.Context) error {
-			count++
+			atomic.AddInt32(&count, 1)
 			return nil
 		})
 		t.Cleanup(w.Close) // close on cleanup in case of early error
 		// set a long poll duration so the worker does not auto-run
 		w.pollDuration = 100 * time.Millisecond
 		// when StartBackground is called, the worker runs in the background
-		// the count should increment rapidly and reach 10 in 1 second
+		// the count should increment rapidly and reach at least 10 in 1 second
 		w.StartBackground()
 		require.Eventually(t, func() bool {
-			return count == 10
+			return atomic.LoadInt32(&count) >= 10
 		}, 10*time.Second, time.Second)
 		// once the worker is closed, it stops running
 		// and the count does not increment
 		w.Close()
-		stopCount := count
+		stopCount := atomic.LoadInt32(&count)
 		require.Never(t, func() bool {
-			return count != stopCount
-		}, 3*time.Second, 100*time.Millisecond)
+			return atomic.LoadInt32(&count) != stopCount
+		}, time.Second, 100*time.Millisecond)
 	})
 }

From 4fa3ede7e7acee59aa08bd6c5c9d826e90605a62 Mon Sep 17 00:00:00 2001
From: AgusDuha <81362284+agusduha@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:49:26 -0300
Subject: [PATCH 129/451] test: fix superc20 interface test (#125) (#12825)

---
 .../test/L2/OptimismSuperchainERC20.t.sol                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
index 8b83b2821796..e1dc1286d2bd 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
@@ -7,10 +7,11 @@ import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { IERC20Solady as IERC20 } from "src/vendor/interfaces/IERC20Solady.sol";
 
 import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
 import { IERC165 } from "@openzeppelin/contracts-v5/utils/introspection/IERC165.sol";
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
 import { IBeacon } from "@openzeppelin/contracts-v5/proxy/beacon/IBeacon.sol";
 import { BeaconProxy } from "@openzeppelin/contracts-v5/proxy/beacon/BeaconProxy.sol";
 import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
@@ -248,6 +249,8 @@ contract OptimismSuperchainERC20Test is Test {
     /// @notice Tests that the `supportsInterface` function returns true for the `ISuperchainERC20` interface.
     function test_supportInterface_succeeds() public view {
         assertTrue(optimismSuperchainERC20.supportsInterface(type(IERC165).interfaceId));
+        assertTrue(optimismSuperchainERC20.supportsInterface(type(IERC20).interfaceId));
+        assertTrue(optimismSuperchainERC20.supportsInterface(type(IERC7802).interfaceId));
         assertTrue(optimismSuperchainERC20.supportsInterface(type(IOptimismSuperchainERC20).interfaceId));
     }
 
@@ -255,6 +258,8 @@ contract OptimismSuperchainERC20Test is Test {
     /// `ISuperchainERC20` one.
     function testFuzz_supportInterface_returnFalse(bytes4 _interfaceId) public view {
         vm.assume(_interfaceId != type(IERC165).interfaceId);
+        vm.assume(_interfaceId != type(IERC20).interfaceId);
+        vm.assume(_interfaceId != type(IERC7802).interfaceId);
         vm.assume(_interfaceId != type(IOptimismSuperchainERC20).interfaceId);
         assertFalse(optimismSuperchainERC20.supportsInterface(_interfaceId));
     }

From 9948426d734fb275eed40cae9b629a61c0ef7ff1 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 6 Nov 2024 00:01:45 +0700
Subject: [PATCH 130/451] maint: remove proxyd and specs folders (#12826)

Kills old folders that aren't used anymore.
---
 README.md        | 3 +--
 proxyd/README.md | 2 --
 specs/README.md  | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 proxyd/README.md
 delete mode 100644 specs/README.md

diff --git a/README.md b/README.md
index 789b0539d8ff..42a880f5f427 100644
--- a/README.md
+++ b/README.md
@@ -80,8 +80,7 @@ The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vuln
 ├── <a href="./ops-bedrock">ops-bedrock</a>: Bedrock devnet work
 ├── <a href="./packages">packages</a>
 │   ├── <a href="./packages/contracts-bedrock">contracts-bedrock</a>: OP Stack smart contracts
-├── <a href="./proxyd">proxyd</a>: Configurable RPC request router and proxy
-├── <a href="./specs">specs</a>: Specs of the rollup starting at the Bedrock upgrade
+├── <a href="./semgrep">semgrep</a>: Semgrep rules and tests
 </pre>
 
 ## Development and Release Process
diff --git a/proxyd/README.md b/proxyd/README.md
deleted file mode 100644
index f44b815ab2dc..000000000000
--- a/proxyd/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# ⚠️  Important
-This project has been moved to [ethereum-optimism/infra](https://github.com/ethereum-optimism/infra)
diff --git a/specs/README.md b/specs/README.md
deleted file mode 100644
index e75cc2b9f668..000000000000
--- a/specs/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Specs Have Moved
-
-Specs have moved to a [dedicated repository](https://github.com/ethereum-optimism/specs). 
\ No newline at end of file

From dec8c60acdada4286469e8fcb8123967be445991 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 5 Nov 2024 10:03:17 -0700
Subject: [PATCH 131/451] op-deployer: Add support for alt-DA deployments
 (#12798)

* op-deployer: Add support for alt-DA deployments

Gives users the ability to deploy an alt-DA chain by specifying an alt-DA config in their chain's intent. The chain will be deployed using OPCM, then an additional pipeline step will deploy the alt-DA challenge contracts. The owner of the challenge contract is set to the L1 proxy admin owner.

To reflect the experimental nature of this feature, the field in the intent is prefixed with `Dangerous`. Users should not use this for production chains until we have performed further testing.

This may not appear like an important feature on its surface. However, without it we cannot delete the legacy allocs files. Since it was low lift I figured I'd just knock it out, and get us one step closer to being able to rip out the legacy deployment scripts and tooling once and for all.

* semgrep

* forge fmt

* label

* flip args
---
 op-chain-ops/genesis/config.go                |  12 +-
 op-chain-ops/script/cheatcodes_utilities.go   |  11 +
 .../script/cheatcodes_utilities_test.go       |  11 +
 op-deployer/pkg/deployer/apply.go             |   5 +
 .../deployer/integration_test/apply_test.go   |  43 +++
 op-deployer/pkg/deployer/opcm/alt_da.go       |  63 +++++
 op-deployer/pkg/deployer/opcm/alt_da_test.go  |  43 +++
 op-deployer/pkg/deployer/pipeline/alt_da.go   |  56 ++++
 .../pkg/deployer/state/deploy_config.go       |   5 +
 op-deployer/pkg/deployer/state/intent.go      |   8 +
 op-deployer/pkg/deployer/state/state.go       |   2 +
 .../scripts/deploy/DeployAltDA.s.sol          | 199 +++++++++++++
 .../test/opcm/DeployAltDA.t.sol               | 266 ++++++++++++++++++
 13 files changed, 718 insertions(+), 6 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/opcm/alt_da.go
 create mode 100644 op-deployer/pkg/deployer/opcm/alt_da_test.go
 create mode 100644 op-deployer/pkg/deployer/pipeline/alt_da.go
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol
 create mode 100644 packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol

diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
index d89c124e6d31..7ed0a6e2f682 100644
--- a/op-chain-ops/genesis/config.go
+++ b/op-chain-ops/genesis/config.go
@@ -597,18 +597,18 @@ func (d *L2CoreDeployConfig) Check(log log.Logger) error {
 // AltDADeployConfig configures optional AltDA functionality.
 type AltDADeployConfig struct {
 	// UseAltDA is a flag that indicates if the system is using op-alt-da
-	UseAltDA bool `json:"useAltDA"`
+	UseAltDA bool `json:"useAltDA" toml:"useAltDA"`
 	// DACommitmentType specifies the allowed commitment
-	DACommitmentType string `json:"daCommitmentType"`
+	DACommitmentType string `json:"daCommitmentType" toml:"daCommitmentType"`
 	// DAChallengeWindow represents the block interval during which the availability of a data commitment can be challenged.
-	DAChallengeWindow uint64 `json:"daChallengeWindow"`
+	DAChallengeWindow uint64 `json:"daChallengeWindow" toml:"daChallengeWindow"`
 	// DAResolveWindow represents the block interval during which a data availability challenge can be resolved.
-	DAResolveWindow uint64 `json:"daResolveWindow"`
+	DAResolveWindow uint64 `json:"daResolveWindow" toml:"daResolveWindow"`
 	// DABondSize represents the required bond size to initiate a data availability challenge.
-	DABondSize uint64 `json:"daBondSize"`
+	DABondSize uint64 `json:"daBondSize" toml:"daBondSize"`
 	// DAResolverRefundPercentage represents the percentage of the resolving cost to be refunded to the resolver
 	// such as 100 means 100% refund.
-	DAResolverRefundPercentage uint64 `json:"daResolverRefundPercentage"`
+	DAResolverRefundPercentage uint64 `json:"daResolverRefundPercentage" toml:"daResolverRefundPercentage"`
 }
 
 var _ ConfigChecker = (*AltDADeployConfig)(nil)
diff --git a/op-chain-ops/script/cheatcodes_utilities.go b/op-chain-ops/script/cheatcodes_utilities.go
index 022befa60627..4f7606d7e4fb 100644
--- a/op-chain-ops/script/cheatcodes_utilities.go
+++ b/op-chain-ops/script/cheatcodes_utilities.go
@@ -233,6 +233,17 @@ func (c *CheatCodesPrecompile) ParseTomlAddress_65e7c844(tomlStr string, key str
 	panic("should never get here")
 }
 
+func (c *CheatCodesPrecompile) ComputeCreate2Address_890c283b(salt, codeHash [32]byte) (common.Address, error) {
+	data := make([]byte, 1+20+32+32)
+	data[0] = 0xff
+	copy(data[1:], DeterministicDeployerAddress.Bytes())
+	copy(data[1+20:], salt[:])
+	copy(data[1+20+32:], codeHash[:])
+	finalHash := crypto.Keccak256(data)
+	// Take the last 20 bytes of the hash to get the address
+	return common.BytesToAddress(finalHash[12:]), nil
+}
+
 // unsupported
 //func (c *CheatCodesPrecompile) CreateWallet() {}
 
diff --git a/op-chain-ops/script/cheatcodes_utilities_test.go b/op-chain-ops/script/cheatcodes_utilities_test.go
index 23936a10e344..4870ec8129db 100644
--- a/op-chain-ops/script/cheatcodes_utilities_test.go
+++ b/op-chain-ops/script/cheatcodes_utilities_test.go
@@ -57,3 +57,14 @@ func TestParseTomlAddress(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, common.HexToAddress("0xff4ce7b6a91a35c31d7d62b327d19617c8da6f23"), addr)
 }
+
+func TestComputeCreate2Address(t *testing.T) {
+	c := &CheatCodesPrecompile{}
+	var salt [32]byte
+	salt[31] = 'S'
+	var codeHash [32]byte
+	codeHash[31] = 'C'
+	addr, err := c.ComputeCreate2Address_890c283b(salt, codeHash)
+	require.NoError(t, err)
+	require.EqualValues(t, common.HexToAddress("0x2f29AF1b5a7083bf98C4A89976c2f17FF980735f"), addr)
+}
diff --git a/op-deployer/pkg/deployer/apply.go b/op-deployer/pkg/deployer/apply.go
index f6eb38d11e08..bdfd5c55ea1e 100644
--- a/op-deployer/pkg/deployer/apply.go
+++ b/op-deployer/pkg/deployer/apply.go
@@ -236,6 +236,11 @@ func ApplyPipeline(
 					return pipeline.DeployOPChainGenesisStrategy(env, intent, st, chainID)
 				}
 			},
+		}, pipelineStage{
+			fmt.Sprintf("deploy-alt-da-%s", chainID.Hex()),
+			func() error {
+				return pipeline.DeployAltDA(env, intent, st, chainID)
+			},
 		}, pipelineStage{
 			fmt.Sprintf("generate-l2-genesis-%s", chainID.Hex()),
 			func() error {
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index f123953a3ea4..fa59c49dc8ac 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -11,6 +11,10 @@ import (
 	"testing"
 	"time"
 
+	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/inspect"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -404,6 +408,45 @@ func TestInteropDeployment(t *testing.T) {
 	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, proxyAdminOwnerHash)
 }
 
+func TestAltDADeployment(t *testing.T) {
+	op_e2e.InitParallel(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	env, bundle, intent, st := setupGenesisChain(t)
+	altDACfg := genesis.AltDADeployConfig{
+		UseAltDA:                   true,
+		DACommitmentType:           altda.KeccakCommitmentString,
+		DAChallengeWindow:          10,
+		DAResolveWindow:            10,
+		DABondSize:                 100,
+		DAResolverRefundPercentage: 50,
+	}
+	intent.Chains[0].DangerousAltDAConfig = altDACfg
+
+	require.NoError(t, deployer.ApplyPipeline(
+		ctx,
+		env,
+		bundle,
+		intent,
+		st,
+	))
+
+	chainState := st.Chains[0]
+	require.NotEmpty(t, chainState.DataAvailabilityChallengeProxyAddress)
+	require.NotEmpty(t, chainState.DataAvailabilityChallengeImplAddress)
+
+	_, rollupCfg, err := inspect.GenesisAndRollup(st, chainState.ID)
+	require.NoError(t, err)
+	require.EqualValues(t, &rollup.AltDAConfig{
+		CommitmentType:     altda.KeccakCommitmentString,
+		DAChallengeWindow:  altDACfg.DAChallengeWindow,
+		DAChallengeAddress: chainState.DataAvailabilityChallengeProxyAddress,
+		DAResolveWindow:    altDACfg.DAResolveWindow,
+	}, rollupCfg.AltDAConfig)
+}
+
 func TestInvalidL2Genesis(t *testing.T) {
 	op_e2e.InitParallel(t)
 
diff --git a/op-deployer/pkg/deployer/opcm/alt_da.go b/op-deployer/pkg/deployer/opcm/alt_da.go
new file mode 100644
index 000000000000..7c05a42a7a5a
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/alt_da.go
@@ -0,0 +1,63 @@
+package opcm
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type DeployAltDAInput struct {
+	Salt                     common.Hash
+	ProxyAdmin               common.Address
+	ChallengeContractOwner   common.Address
+	ChallengeWindow          *big.Int
+	ResolveWindow            *big.Int
+	BondSize                 *big.Int
+	ResolverRefundPercentage *big.Int
+}
+
+type DeployAltDAOutput struct {
+	DataAvailabilityChallengeProxy common.Address
+	DataAvailabilityChallengeImpl  common.Address
+}
+
+type DeployAltDAScript struct {
+	Run func(input, output common.Address) error
+}
+
+func DeployAltDA(
+	host *script.Host,
+	input DeployAltDAInput,
+) (DeployAltDAOutput, error) {
+	var output DeployAltDAOutput
+	inputAddr := host.NewScriptAddress()
+	outputAddr := host.NewScriptAddress()
+
+	cleanupInput, err := script.WithPrecompileAtAddress[*DeployAltDAInput](host, inputAddr, &input)
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployAltDAInput precompile: %w", err)
+	}
+	defer cleanupInput()
+
+	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployAltDAOutput](host, outputAddr, &output,
+		script.WithFieldSetter[*DeployAltDAOutput])
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployAltDAOutput precompile: %w", err)
+	}
+	defer cleanupOutput()
+
+	implContract := "DeployAltDA"
+	deployScript, cleanupDeploy, err := script.WithScript[DeployAltDAScript](host, "DeployAltDA.s.sol", implContract)
+	if err != nil {
+		return output, fmt.Errorf("failed to laod %s script: %w", implContract, err)
+	}
+	defer cleanupDeploy()
+
+	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
+	}
+
+	return output, nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/alt_da_test.go b/op-deployer/pkg/deployer/opcm/alt_da_test.go
new file mode 100644
index 000000000000..20b93907ebea
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/alt_da_test.go
@@ -0,0 +1,43 @@
+package opcm
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployAltDA(t *testing.T) {
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+		0,
+	)
+	require.NoError(t, err)
+
+	input := DeployAltDAInput{
+		Salt:                     common.HexToHash("0x1234"),
+		ProxyAdmin:               common.Address{'P'},
+		ChallengeContractOwner:   common.Address{'O'},
+		ChallengeWindow:          big.NewInt(100),
+		ResolveWindow:            big.NewInt(200),
+		BondSize:                 big.NewInt(300),
+		ResolverRefundPercentage: big.NewInt(50), // must be < 100
+	}
+
+	output, err := DeployAltDA(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.DataAvailabilityChallengeProxy)
+	require.NotEmpty(t, output.DataAvailabilityChallengeImpl)
+}
diff --git a/op-deployer/pkg/deployer/pipeline/alt_da.go b/op-deployer/pkg/deployer/pipeline/alt_da.go
new file mode 100644
index 000000000000..62796832c93c
--- /dev/null
+++ b/op-deployer/pkg/deployer/pipeline/alt_da.go
@@ -0,0 +1,56 @@
+package pipeline
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+func DeployAltDA(env *Env, intent *state.Intent, st *state.State, chainID common.Hash) error {
+	lgr := env.Logger.New("stage", "deploy-alt-da")
+
+	chainIntent, err := intent.Chain(chainID)
+	if err != nil {
+		return fmt.Errorf("failed to get chain intent: %w", err)
+	}
+
+	chainState, err := st.Chain(chainID)
+	if err != nil {
+		return fmt.Errorf("failed to get chain state: %w", err)
+	}
+
+	if !shouldDeployAltDA(chainIntent, chainState) {
+		lgr.Info("alt-da deployment not needed")
+		return nil
+	}
+
+	var dao opcm.DeployAltDAOutput
+	lgr.Info("deploying alt-da contracts")
+	dao, err = opcm.DeployAltDA(env.L1ScriptHost, opcm.DeployAltDAInput{
+		Salt:                     st.Create2Salt,
+		ProxyAdmin:               st.ImplementationsDeployment.OpcmProxyAddress,
+		ChallengeContractOwner:   chainIntent.Roles.L1ProxyAdminOwner,
+		ChallengeWindow:          new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DAChallengeWindow),
+		ResolveWindow:            new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DAResolveWindow),
+		BondSize:                 new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DABondSize),
+		ResolverRefundPercentage: new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DAResolverRefundPercentage),
+	})
+	if err != nil {
+		return fmt.Errorf("failed to deploy alt-da contracts: %w", err)
+	}
+
+	chainState.DataAvailabilityChallengeProxyAddress = dao.DataAvailabilityChallengeProxy
+	chainState.DataAvailabilityChallengeImplAddress = dao.DataAvailabilityChallengeImpl
+	return nil
+}
+
+func shouldDeployAltDA(chainIntent *state.ChainIntent, chainState *state.ChainState) bool {
+	if !chainIntent.DangerousAltDAConfig.UseAltDA {
+		return false
+	}
+
+	return chainState.DataAvailabilityChallengeImplAddress == common.Address{}
+}
diff --git a/op-deployer/pkg/deployer/state/deploy_config.go b/op-deployer/pkg/deployer/state/deploy_config.go
index 15d5491ce8b8..1a03c21d7e94 100644
--- a/op-deployer/pkg/deployer/state/deploy_config.go
+++ b/op-deployer/pkg/deployer/state/deploy_config.go
@@ -119,6 +119,11 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 		}
 	}
 
+	if chainIntent.DangerousAltDAConfig.UseAltDA {
+		cfg.AltDADeployConfig = chainIntent.DangerousAltDAConfig
+		cfg.L1DependenciesConfig.DAChallengeProxy = chainState.DataAvailabilityChallengeProxyAddress
+	}
+
 	// The below dummy variables are set in order to allow the deploy
 	// config to pass validation. The validation checks are useful to
 	// ensure that the L2 is properly configured. They are not used by
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index 681d166bc142..860944666e9e 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
@@ -163,6 +165,8 @@ type ChainIntent struct {
 	Roles ChainRoles `json:"roles" toml:"roles"`
 
 	DeployOverrides map[string]any `json:"deployOverrides" toml:"deployOverrides"`
+
+	DangerousAltDAConfig genesis.AltDADeployConfig `json:"dangerousAltDAConfig,omitempty" toml:"dangerousAltDAConfig,omitempty"`
 }
 
 type ChainRoles struct {
@@ -207,5 +211,9 @@ func (c *ChainIntent) Check() error {
 		return fmt.Errorf("batcher must be set")
 	}
 
+	if c.DangerousAltDAConfig.UseAltDA {
+		return c.DangerousAltDAConfig.Check(nil)
+	}
+
 	return nil
 }
diff --git a/op-deployer/pkg/deployer/state/state.go b/op-deployer/pkg/deployer/state/state.go
index 3df543c56cdd..e3974fa2a78c 100644
--- a/op-deployer/pkg/deployer/state/state.go
+++ b/op-deployer/pkg/deployer/state/state.go
@@ -95,6 +95,8 @@ type ChainState struct {
 	PermissionedDisputeGameAddress            common.Address `json:"permissionedDisputeGameAddress"`
 	DelayedWETHPermissionedGameProxyAddress   common.Address `json:"delayedWETHPermissionedGameProxyAddress"`
 	DelayedWETHPermissionlessGameProxyAddress common.Address `json:"delayedWETHPermissionlessGameProxyAddress"`
+	DataAvailabilityChallengeProxyAddress     common.Address `json:"dataAvailabilityChallengeProxyAddress"`
+	DataAvailabilityChallengeImplAddress      common.Address `json:"dataAvailabilityChallengeImplAddress"`
 
 	Allocs *GzipData[foundry.ForgeAllocs] `json:"allocs"`
 
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol
new file mode 100644
index 000000000000..a5071474926b
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol
@@ -0,0 +1,199 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { Script } from "forge-std/Script.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
+import { Solarray } from "scripts/libraries/Solarray.sol";
+
+contract DeployAltDAInput is BaseDeployIO {
+    bytes32 internal _salt;
+    IProxyAdmin internal _proxyAdmin;
+    address internal _challengeContractOwner;
+    uint256 internal _challengeWindow;
+    uint256 internal _resolveWindow;
+    uint256 internal _bondSize;
+    uint256 internal _resolverRefundPercentage;
+
+    function set(bytes4 _sel, bytes32 _val) public {
+        if (_sel == this.salt.selector) _salt = _val;
+        else revert("DeployAltDAInput: unknown selector");
+    }
+
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "DeployAltDAInput: cannot set zero address");
+        if (_sel == this.proxyAdmin.selector) _proxyAdmin = IProxyAdmin(_addr);
+        else if (_sel == this.challengeContractOwner.selector) _challengeContractOwner = _addr;
+        else revert("DeployAltDAInput: unknown selector");
+    }
+
+    function set(bytes4 _sel, uint256 _val) public {
+        if (_sel == this.challengeWindow.selector) _challengeWindow = _val;
+        else if (_sel == this.resolveWindow.selector) _resolveWindow = _val;
+        else if (_sel == this.bondSize.selector) _bondSize = _val;
+        else if (_sel == this.resolverRefundPercentage.selector) _resolverRefundPercentage = _val;
+        else revert("DeployAltDAInput: unknown selector");
+    }
+
+    function salt() public view returns (bytes32) {
+        require(_salt != 0, "DeployAltDAInput: salt not set");
+        return _salt;
+    }
+
+    function proxyAdmin() public view returns (IProxyAdmin) {
+        require(address(_proxyAdmin) != address(0), "DeployAltDAInput: proxyAdmin not set");
+        return _proxyAdmin;
+    }
+
+    function challengeContractOwner() public view returns (address) {
+        require(_challengeContractOwner != address(0), "DeployAltDAInput: challengeContractOwner not set");
+        return _challengeContractOwner;
+    }
+
+    function challengeWindow() public view returns (uint256) {
+        require(_challengeWindow != 0, "DeployAltDAInput: challengeWindow not set");
+        return _challengeWindow;
+    }
+
+    function resolveWindow() public view returns (uint256) {
+        require(_resolveWindow != 0, "DeployAltDAInput: resolveWindow not set");
+        return _resolveWindow;
+    }
+
+    function bondSize() public view returns (uint256) {
+        require(_bondSize != 0, "DeployAltDAInput: bondSize not set");
+        return _bondSize;
+    }
+
+    function resolverRefundPercentage() public view returns (uint256) {
+        require(_resolverRefundPercentage != 0, "DeployAltDAInput: resolverRefundPercentage not set");
+        return _resolverRefundPercentage;
+    }
+}
+
+contract DeployAltDAOutput is BaseDeployIO {
+    IDataAvailabilityChallenge internal _dataAvailabilityChallengeProxy;
+    IDataAvailabilityChallenge internal _dataAvailabilityChallengeImpl;
+
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "DeployAltDAOutput: cannot set zero address");
+        if (_sel == this.dataAvailabilityChallengeProxy.selector) {
+            _dataAvailabilityChallengeProxy = IDataAvailabilityChallenge(payable(_addr));
+        } else if (_sel == this.dataAvailabilityChallengeImpl.selector) {
+            _dataAvailabilityChallengeImpl = IDataAvailabilityChallenge(payable(_addr));
+        } else {
+            revert("DeployAltDAOutput: unknown selector");
+        }
+    }
+
+    function dataAvailabilityChallengeProxy() public view returns (IDataAvailabilityChallenge) {
+        DeployUtils.assertValidContractAddress(address(_dataAvailabilityChallengeProxy));
+        return _dataAvailabilityChallengeProxy;
+    }
+
+    function dataAvailabilityChallengeImpl() public view returns (IDataAvailabilityChallenge) {
+        DeployUtils.assertValidContractAddress(address(_dataAvailabilityChallengeImpl));
+        return _dataAvailabilityChallengeImpl;
+    }
+}
+
+contract DeployAltDA is Script {
+    function run(DeployAltDAInput _dai, DeployAltDAOutput _dao) public {
+        deployDataAvailabilityChallengeProxy(_dai, _dao);
+        deployDataAvailabilityChallengeImpl(_dai, _dao);
+        initializeDataAvailabilityChallengeProxy(_dai, _dao);
+
+        checkOutput(_dai, _dao);
+    }
+
+    function deployDataAvailabilityChallengeProxy(DeployAltDAInput _dai, DeployAltDAOutput _dao) public {
+        bytes32 salt = _dai.salt();
+        vm.broadcast(msg.sender);
+        IProxy proxy = IProxy(
+            DeployUtils.create2({
+                _name: "Proxy",
+                _salt: salt,
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
+            })
+        );
+        vm.label(address(proxy), "DataAvailabilityChallengeProxy");
+        _dao.set(_dao.dataAvailabilityChallengeProxy.selector, address(proxy));
+    }
+
+    function deployDataAvailabilityChallengeImpl(DeployAltDAInput _dai, DeployAltDAOutput _dao) public {
+        bytes32 salt = _dai.salt();
+        vm.broadcast(msg.sender);
+        IDataAvailabilityChallenge impl = IDataAvailabilityChallenge(
+            DeployUtils.create2({
+                _name: "DataAvailabilityChallenge",
+                _salt: salt,
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IDataAvailabilityChallenge.__constructor__, ()))
+            })
+        );
+        vm.label(address(impl), "DataAvailabilityChallengeImpl");
+        _dao.set(_dao.dataAvailabilityChallengeImpl.selector, address(impl));
+    }
+
+    function initializeDataAvailabilityChallengeProxy(DeployAltDAInput _dai, DeployAltDAOutput _dao) public {
+        IProxy proxy = IProxy(payable(address(_dao.dataAvailabilityChallengeProxy())));
+        IDataAvailabilityChallenge impl = _dao.dataAvailabilityChallengeImpl();
+        IProxyAdmin proxyAdmin = IProxyAdmin(payable(address(_dai.proxyAdmin())));
+
+        address contractOwner = _dai.challengeContractOwner();
+        uint256 challengeWindow = _dai.challengeWindow();
+        uint256 resolveWindow = _dai.resolveWindow();
+        uint256 bondSize = _dai.bondSize();
+        uint256 resolverRefundPercentage = _dai.resolverRefundPercentage();
+
+        vm.startBroadcast(msg.sender);
+        proxy.upgradeToAndCall(
+            address(impl),
+            abi.encodeCall(
+                IDataAvailabilityChallenge.initialize,
+                (contractOwner, challengeWindow, resolveWindow, bondSize, resolverRefundPercentage)
+            )
+        );
+        proxy.changeAdmin(address(proxyAdmin));
+        vm.stopBroadcast();
+    }
+
+    function checkOutput(DeployAltDAInput _dai, DeployAltDAOutput _dao) public {
+        address[] memory addresses = Solarray.addresses(
+            address(_dao.dataAvailabilityChallengeProxy()), address(_dao.dataAvailabilityChallengeImpl())
+        );
+        DeployUtils.assertValidContractAddresses(addresses);
+
+        assertValidDataAvailabilityChallengeProxy(_dai, _dao);
+        assertValidDataAvailabilityChallengeImpl(_dao);
+    }
+
+    function assertValidDataAvailabilityChallengeProxy(DeployAltDAInput _dai, DeployAltDAOutput _dao) public {
+        DeployUtils.assertERC1967ImplementationSet(address(_dao.dataAvailabilityChallengeProxy()));
+
+        IProxy proxy = IProxy(payable(address(_dao.dataAvailabilityChallengeProxy())));
+        vm.prank(address(0));
+        address admin = proxy.admin();
+        require(admin == address(_dai.proxyAdmin()), "DACP-10");
+
+        DeployUtils.assertInitialized({ _contractAddress: address(proxy), _slot: 0, _offset: 0 });
+
+        vm.prank(address(0));
+        address impl = proxy.implementation();
+        require(impl == address(_dao.dataAvailabilityChallengeImpl()), "DACP-20");
+
+        IDataAvailabilityChallenge dac = _dao.dataAvailabilityChallengeProxy();
+        require(dac.owner() == _dai.challengeContractOwner(), "DACP-30");
+        require(dac.challengeWindow() == _dai.challengeWindow(), "DACP-40");
+        require(dac.resolveWindow() == _dai.resolveWindow(), "DACP-50");
+        require(dac.bondSize() == _dai.bondSize(), "DACP-60");
+        require(dac.resolverRefundPercentage() == _dai.resolverRefundPercentage(), "DACP-70");
+    }
+
+    function assertValidDataAvailabilityChallengeImpl(DeployAltDAOutput _dao) public view {
+        IDataAvailabilityChallenge dac = _dao.dataAvailabilityChallengeImpl();
+        DeployUtils.assertInitialized({ _contractAddress: address(dac), _slot: 0, _offset: 0 });
+    }
+}
diff --git a/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol b/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
new file mode 100644
index 000000000000..e48a9b37a9f8
--- /dev/null
+++ b/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
@@ -0,0 +1,266 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { Test } from "forge-std/Test.sol";
+
+import { DeployAltDAInput, DeployAltDAOutput, DeployAltDA } from "scripts/deploy/DeployAltDA.s.sol";
+import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
+import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+contract DeployAltDAInput_Test is Test {
+    DeployAltDAInput dai;
+
+    // Define defaults
+    bytes32 salt = bytes32(uint256(1));
+    address proxyAdminAddr = makeAddr("proxyAdmin");
+    address challengeContractOwner = makeAddr("challengeContractOwner");
+    uint256 challengeWindow = 100;
+    uint256 resolveWindow = 200;
+    uint256 bondSize = 1 ether;
+    uint256 resolverRefundPercentage = 10;
+
+    function setUp() public {
+        dai = new DeployAltDAInput();
+    }
+
+    function test_set_succeeds() public {
+        dai.set(dai.salt.selector, salt);
+        dai.set(dai.proxyAdmin.selector, proxyAdminAddr);
+        dai.set(dai.challengeContractOwner.selector, challengeContractOwner);
+        dai.set(dai.challengeWindow.selector, challengeWindow);
+        dai.set(dai.resolveWindow.selector, resolveWindow);
+        dai.set(dai.bondSize.selector, bondSize);
+        dai.set(dai.resolverRefundPercentage.selector, resolverRefundPercentage);
+
+        // Compare the default inputs to the getter methods
+        assertEq(salt, dai.salt(), "100");
+        assertEq(proxyAdminAddr, address(dai.proxyAdmin()), "200");
+        assertEq(challengeContractOwner, dai.challengeContractOwner(), "300");
+        assertEq(challengeWindow, dai.challengeWindow(), "400");
+        assertEq(resolveWindow, dai.resolveWindow(), "500");
+        assertEq(bondSize, dai.bondSize(), "600");
+        assertEq(resolverRefundPercentage, dai.resolverRefundPercentage(), "700");
+    }
+
+    function test_getters_whenNotSet_revert() public {
+        bytes memory expectedErr = "DeployAltDAInput: ";
+
+        vm.expectRevert(abi.encodePacked(expectedErr, "salt not set"));
+        dai.salt();
+
+        vm.expectRevert(abi.encodePacked(expectedErr, "proxyAdmin not set"));
+        dai.proxyAdmin();
+
+        vm.expectRevert(abi.encodePacked(expectedErr, "challengeContractOwner not set"));
+        dai.challengeContractOwner();
+
+        vm.expectRevert(abi.encodePacked(expectedErr, "challengeWindow not set"));
+        dai.challengeWindow();
+
+        vm.expectRevert(abi.encodePacked(expectedErr, "resolveWindow not set"));
+        dai.resolveWindow();
+
+        vm.expectRevert(abi.encodePacked(expectedErr, "bondSize not set"));
+        dai.bondSize();
+
+        vm.expectRevert(abi.encodePacked(expectedErr, "resolverRefundPercentage not set"));
+        dai.resolverRefundPercentage();
+    }
+
+    function test_set_zeroAddress_reverts() public {
+        vm.expectRevert("DeployAltDAInput: cannot set zero address");
+        dai.set(dai.proxyAdmin.selector, address(0));
+
+        vm.expectRevert("DeployAltDAInput: cannot set zero address");
+        dai.set(dai.challengeContractOwner.selector, address(0));
+    }
+
+    function test_set_unknownSelector_reverts() public {
+        bytes4 unknownSelector = bytes4(keccak256("unknown()"));
+
+        vm.expectRevert("DeployAltDAInput: unknown selector");
+        dai.set(unknownSelector, bytes32(0));
+
+        vm.expectRevert("DeployAltDAInput: unknown selector");
+        dai.set(unknownSelector, address(1));
+
+        vm.expectRevert("DeployAltDAInput: unknown selector");
+        dai.set(unknownSelector, uint256(1));
+    }
+}
+
+contract DeployAltDAOutput_Test is Test {
+    DeployAltDAOutput dao;
+
+    // Store contract references to avoid stack too deep
+    IDataAvailabilityChallenge internal dataAvailabilityChallengeImpl;
+
+    function setUp() public {
+        dao = new DeployAltDAOutput();
+        dataAvailabilityChallengeImpl = IDataAvailabilityChallenge(payable(makeAddr("dataAvailabilityChallengeImpl")));
+    }
+
+    function test_set_succeeds() public {
+        // Build the implementation with some bytecode
+        vm.etch(address(dataAvailabilityChallengeImpl), hex"01");
+
+        // Build proxy with implementation
+        (IProxy dataAvailabilityChallengeProxy) =
+            DeployUtils.buildERC1967ProxyWithImpl("dataAvailabilityChallengeProxy");
+
+        // Set the addresses
+        dao.set(dao.dataAvailabilityChallengeProxy.selector, address(dataAvailabilityChallengeProxy));
+        dao.set(dao.dataAvailabilityChallengeImpl.selector, address(dataAvailabilityChallengeImpl));
+
+        // Verify the addresses were set correctly
+        assertEq(address(dataAvailabilityChallengeProxy), address(dao.dataAvailabilityChallengeProxy()), "100");
+        assertEq(address(dataAvailabilityChallengeImpl), address(dao.dataAvailabilityChallengeImpl()), "200");
+    }
+
+    function test_getters_whenNotSet_revert() public {
+        vm.expectRevert("DeployUtils: zero address");
+        dao.dataAvailabilityChallengeProxy();
+
+        vm.expectRevert("DeployUtils: zero address");
+        dao.dataAvailabilityChallengeImpl();
+    }
+
+    function test_getters_whenAddrHasNoCode_reverts() public {
+        address emptyAddr = makeAddr("emptyAddr");
+        bytes memory expectedErr = bytes(string.concat("DeployUtils: no code at ", vm.toString(emptyAddr)));
+
+        dao.set(dao.dataAvailabilityChallengeProxy.selector, emptyAddr);
+        vm.expectRevert(expectedErr);
+        dao.dataAvailabilityChallengeProxy();
+
+        dao.set(dao.dataAvailabilityChallengeImpl.selector, emptyAddr);
+        vm.expectRevert(expectedErr);
+        dao.dataAvailabilityChallengeImpl();
+    }
+
+    function test_set_zeroAddress_reverts() public {
+        vm.expectRevert("DeployAltDAOutput: cannot set zero address");
+        dao.set(dao.dataAvailabilityChallengeProxy.selector, address(0));
+
+        vm.expectRevert("DeployAltDAOutput: cannot set zero address");
+        dao.set(dao.dataAvailabilityChallengeImpl.selector, address(0));
+    }
+
+    function test_set_unknownSelector_reverts() public {
+        bytes4 unknownSelector = bytes4(keccak256("unknown()"));
+        vm.expectRevert("DeployAltDAOutput: unknown selector");
+        dao.set(unknownSelector, address(1));
+    }
+}
+
+contract DeployAltDA_Test is Test {
+    DeployAltDA deployer;
+    DeployAltDAInput dai;
+    DeployAltDAOutput dao;
+
+    // Define defaults
+    bytes32 salt = bytes32(uint256(1));
+    IProxyAdmin proxyAdmin;
+    address challengeContractOwner = makeAddr("challengeContractOwner");
+    uint256 challengeWindow = 100;
+    uint256 resolveWindow = 200;
+    uint256 bondSize = 1 ether;
+    uint256 resolverRefundPercentage = 10;
+
+    function setUp() public {
+        // Deploy the main contract and get input/output contracts
+        deployer = new DeployAltDA();
+        (dai, dao) = _setupIOContracts();
+
+        // Setup proxyAdmin
+        proxyAdmin = IProxyAdmin(
+            DeployUtils.create1({
+                _name: "ProxyAdmin",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxyAdmin.__constructor__, (msg.sender)))
+            })
+        );
+
+        // Set the default values
+        dai.set(dai.salt.selector, salt);
+        dai.set(dai.proxyAdmin.selector, address(proxyAdmin));
+        dai.set(dai.challengeContractOwner.selector, challengeContractOwner);
+        dai.set(dai.challengeWindow.selector, challengeWindow);
+        dai.set(dai.resolveWindow.selector, resolveWindow);
+        dai.set(dai.bondSize.selector, bondSize);
+        dai.set(dai.resolverRefundPercentage.selector, resolverRefundPercentage);
+    }
+
+    function _setupIOContracts() internal returns (DeployAltDAInput, DeployAltDAOutput) {
+        DeployAltDAInput _dai = new DeployAltDAInput();
+        DeployAltDAOutput _dao = new DeployAltDAOutput();
+        return (_dai, _dao);
+    }
+
+    function test_run_succeeds() public {
+        deployer.run(dai, dao);
+
+        // Verify everything is set up correctly
+        IDataAvailabilityChallenge dac = dao.dataAvailabilityChallengeProxy();
+        assertTrue(address(dac).code.length > 0, "100");
+        assertTrue(address(dao.dataAvailabilityChallengeImpl()).code.length > 0, "200");
+
+        // Check all initialization parameters
+        assertEq(dac.owner(), challengeContractOwner, "300");
+        assertEq(dac.challengeWindow(), challengeWindow, "400");
+        assertEq(dac.resolveWindow(), resolveWindow, "500");
+        assertEq(dac.bondSize(), bondSize, "600");
+        assertEq(dac.resolverRefundPercentage(), resolverRefundPercentage, "700");
+        // Make sure the proxy admin is set correctly.
+        vm.prank(address(0));
+        assertEq(IProxy(payable(address(dac))).admin(), address(proxyAdmin), "800");
+    }
+
+    function test_checkOutput_whenNotInitialized_reverts() public {
+        vm.expectRevert("DeployUtils: zero address");
+        deployer.checkOutput(dai, dao);
+    }
+
+    function test_checkOutput_whenProxyNotInitialized_reverts() public {
+        // Deploy but don't initialize
+        deployer.deployDataAvailabilityChallengeProxy(dai, dao);
+        deployer.deployDataAvailabilityChallengeImpl(dai, dao);
+
+        vm.expectRevert("DeployUtils: zero address");
+        deployer.checkOutput(dai, dao);
+    }
+
+    function testFuzz_run_withDifferentParameters(
+        uint256 _challengeWindow,
+        uint256 _resolveWindow,
+        uint256 _bondSize,
+        uint256 _resolverRefundPercentage
+    )
+        public
+    {
+        // Bound the values to reasonable ranges
+        _challengeWindow = bound(_challengeWindow, 1, 365 days);
+        _resolveWindow = bound(_resolveWindow, 1, 365 days);
+        _bondSize = bound(_bondSize, 0.1 ether, 100 ether);
+        _resolverRefundPercentage = bound(_resolverRefundPercentage, 1, 100);
+
+        // Set the new values
+        dai.set(dai.salt.selector, salt);
+        dai.set(dai.proxyAdmin.selector, address(proxyAdmin));
+        dai.set(dai.challengeWindow.selector, _challengeWindow);
+        dai.set(dai.resolveWindow.selector, _resolveWindow);
+        dai.set(dai.bondSize.selector, _bondSize);
+        dai.set(dai.resolverRefundPercentage.selector, _resolverRefundPercentage);
+
+        // Run deployment
+        deployer.run(dai, dao);
+
+        // Verify values
+        IDataAvailabilityChallenge dac = dao.dataAvailabilityChallengeProxy();
+        assertEq(dac.challengeWindow(), _challengeWindow, "100");
+        assertEq(dac.resolveWindow(), _resolveWindow, "200");
+        assertEq(dac.bondSize(), _bondSize, "300");
+        assertEq(dac.resolverRefundPercentage(), _resolverRefundPercentage, "400");
+    }
+}

From 8565b8f6928380bcaf0e20b4b5ea7ef120841be9 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Tue, 5 Nov 2024 11:32:29 -0600
Subject: [PATCH 132/451] Interop: Add error case for parent of start of
 database (#12818)

* Add error case for parent of start of database

* fix unit tests
---
 .../supervisor/backend/db/fromda/db.go        |  9 ++-
 .../supervisor/backend/db/fromda/db_test.go   | 59 +++++++++++++------
 2 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/op-supervisor/supervisor/backend/db/fromda/db.go b/op-supervisor/supervisor/backend/db/fromda/db.go
index 5ee609ecdfe7..c4c98624d26d 100644
--- a/op-supervisor/supervisor/backend/db/fromda/db.go
+++ b/op-supervisor/supervisor/backend/db/fromda/db.go
@@ -184,8 +184,13 @@ func (db *DB) PreviousDerivedFrom(derivedFrom eth.BlockID) (prevDerivedFrom type
 	if self.derivedFrom.ID() != derivedFrom {
 		return types.BlockSeal{}, fmt.Errorf("found %s, but expected %s: %w", self.derivedFrom, derivedFrom, types.ErrConflict)
 	}
-	if selfIndex == 0 { // genesis block has a zeroed block as parent block
-		return types.BlockSeal{}, nil
+	if selfIndex == 0 {
+		// genesis block has a zeroed block as parent block
+		if self.derivedFrom.Number == 0 {
+			return types.BlockSeal{}, nil
+		} else {
+			return types.BlockSeal{}, fmt.Errorf("cannot find previous derived before start of database: %s", derivedFrom)
+		}
 	}
 	prev, err := db.readAt(selfIndex - 1)
 	if err != nil {
diff --git a/op-supervisor/supervisor/backend/db/fromda/db_test.go b/op-supervisor/supervisor/backend/db/fromda/db_test.go
index fbcf82ab194e..8d6a273e1f98 100644
--- a/op-supervisor/supervisor/backend/db/fromda/db_test.go
+++ b/op-supervisor/supervisor/backend/db/fromda/db_test.go
@@ -131,74 +131,95 @@ func toRef(seal types.BlockSeal, parentHash common.Hash) eth.BlockRef {
 }
 
 func TestSingleEntryDB(t *testing.T) {
-	expectedDerivedFrom := mockL1(1)
+	expectedDerivedFrom := mockL1(0)
 	expectedDerived := mockL2(2)
 	runDBTest(t,
 		func(t *testing.T, db *DB, m *stubMetrics) {
 			require.NoError(t, db.AddDerived(toRef(expectedDerivedFrom, mockL1(0).Hash), toRef(expectedDerived, mockL2(0).Hash)))
 		},
 		func(t *testing.T, db *DB, m *stubMetrics) {
-			derivedFrom, derived, err := db.Latest()
+			// First
+			derivedFrom, derived, err := db.First()
 			require.NoError(t, err)
 			require.Equal(t, expectedDerivedFrom, derivedFrom)
 			require.Equal(t, expectedDerived, derived)
 
-			derivedFrom, derived, err = db.First()
+			// Latest
+			derivedFrom, derived, err = db.Latest()
 			require.NoError(t, err)
 			require.Equal(t, expectedDerivedFrom, derivedFrom)
 			require.Equal(t, expectedDerived, derived)
 
+			// FirstAfter Latest
+			_, _, err = db.FirstAfter(derivedFrom.ID(), derived.ID())
+			require.ErrorIs(t, err, types.ErrFuture)
+
+			// LastDerivedAt
 			derived, err = db.LastDerivedAt(expectedDerivedFrom.ID())
 			require.NoError(t, err)
 			require.Equal(t, expectedDerived, derived)
 
+			// LastDerivedAt with a non-existent block
 			_, err = db.LastDerivedAt(eth.BlockID{Hash: common.Hash{0xaa}, Number: expectedDerivedFrom.Number})
 			require.ErrorIs(t, err, types.ErrConflict)
 
-			// No block known, yet, after the given block pair
-			_, _, err = db.FirstAfter(derivedFrom.ID(), derived.ID())
-			require.ErrorIs(t, err, types.ErrFuture)
-
-			// Not after a non-existent block pair
+			// FirstAfter with a non-existent block (derived and derivedFrom)
 			_, _, err = db.FirstAfter(eth.BlockID{Hash: common.Hash{0xaa}, Number: expectedDerivedFrom.Number}, expectedDerived.ID())
 			require.ErrorIs(t, err, types.ErrConflict)
 			_, _, err = db.FirstAfter(expectedDerivedFrom.ID(), eth.BlockID{Hash: common.Hash{0xaa}, Number: expectedDerived.Number})
 			require.ErrorIs(t, err, types.ErrConflict)
 
+			// DerivedFrom
 			derivedFrom, err = db.DerivedFrom(expectedDerived.ID())
 			require.NoError(t, err)
 			require.Equal(t, expectedDerivedFrom, derivedFrom)
 
+			// DerivedFrom with a non-existent block
 			_, err = db.DerivedFrom(eth.BlockID{Hash: common.Hash{0xbb}, Number: expectedDerived.Number})
 			require.ErrorIs(t, err, types.ErrConflict)
 
+			// PreviousDerived
 			prev, err := db.PreviousDerived(expectedDerived.ID())
 			require.NoError(t, err)
 			require.Equal(t, types.BlockSeal{}, prev, "zeroed seal before first entry")
 
-			_, _, err = db.NextDerived(expectedDerived.ID())
-			require.ErrorIs(t, err, types.ErrFuture)
-
-			// if 1 was the first inserted entry, then we skipped 0
-			_, _, err = db.NextDerived(mockL2(0).ID())
-			require.ErrorIs(t, err, types.ErrSkipped)
-
+			// PreviousDerivedFrom
 			prev, err = db.PreviousDerivedFrom(expectedDerivedFrom.ID())
 			require.NoError(t, err)
 			require.Equal(t, types.BlockSeal{}, prev, "zeroed seal before first entry")
 
-			_, err = db.NextDerivedFrom(expectedDerivedFrom.ID())
+			// NextDerived
+			_, _, err = db.NextDerived(expectedDerived.ID())
 			require.ErrorIs(t, err, types.ErrFuture)
 
-			// if 1 was the first inserted entry, then we skipped 0
-			_, err = db.NextDerivedFrom(mockL1(0).ID())
-			require.ErrorIs(t, err, types.ErrSkipped)
+			// NextDerivedFrom
+			_, err = db.NextDerivedFrom(expectedDerivedFrom.ID())
+			require.ErrorIs(t, err, types.ErrFuture)
 
+			// FirstAfter
 			_, _, err = db.FirstAfter(expectedDerivedFrom.ID(), expectedDerived.ID())
 			require.ErrorIs(t, err, types.ErrFuture)
 		})
 }
 
+func TestGap(t *testing.T) {
+	// mockL1 starts at block 1 to produce a gap
+	expectedDerivedFrom := mockL1(1)
+	// mockL2 starts at block 2 to produce a gap
+	expectedDerived := mockL2(2)
+	runDBTest(t,
+		func(t *testing.T, db *DB, m *stubMetrics) {
+			require.NoError(t, db.AddDerived(toRef(expectedDerivedFrom, mockL1(0).Hash), toRef(expectedDerived, mockL2(0).Hash)))
+		},
+		func(t *testing.T, db *DB, m *stubMetrics) {
+			_, _, err := db.NextDerived(mockL2(0).ID())
+			require.ErrorIs(t, err, types.ErrSkipped)
+
+			_, err = db.NextDerivedFrom(mockL1(0).ID())
+			require.ErrorIs(t, err, types.ErrSkipped)
+		})
+}
+
 func TestThreeEntryDB(t *testing.T) {
 	l1Block0 := mockL1(0)
 	l1Block1 := mockL1(1)

From 39e6e6f6ecdec8cf9d112020ed1179cb0a681e6c Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Tue, 5 Nov 2024 14:16:58 -0600
Subject: [PATCH 133/451] Handle first L1 Parent Ref in CandidateCrossSafe
 (#12830)

---
 .../supervisor/backend/cross/safe_update.go   |  2 +-
 .../backend/cross/safe_update_test.go         |  2 +-
 op-supervisor/supervisor/backend/db/query.go  | 23 ++++++++++++-------
 op-supervisor/supervisor/types/types.go       | 21 +++++++++++++++--
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/op-supervisor/supervisor/backend/cross/safe_update.go b/op-supervisor/supervisor/backend/cross/safe_update.go
index 6d74ca8ad2ba..bcda7c9f782b 100644
--- a/op-supervisor/supervisor/backend/cross/safe_update.go
+++ b/op-supervisor/supervisor/backend/cross/safe_update.go
@@ -57,7 +57,7 @@ func CrossSafeUpdate(ctx context.Context, logger log.Logger, chainID types.Chain
 	if err != nil {
 		return fmt.Errorf("cannot find parent-block of cross-safe: %w", err)
 	}
-	crossSafeRef := currentCrossSafe.WithParent(parent.ID())
+	crossSafeRef := currentCrossSafe.MustWithParent(parent.ID())
 	logger.Debug("Bumping cross-safe scope", "scope", newScope, "crossSafe", crossSafeRef)
 	if err := d.UpdateCrossSafe(chainID, newScope, crossSafeRef); err != nil {
 		return fmt.Errorf("failed to update cross-safe head with L1 scope increment to %s and repeat of L2 block %s: %w", candidateScope, crossSafeRef, err)
diff --git a/op-supervisor/supervisor/backend/cross/safe_update_test.go b/op-supervisor/supervisor/backend/cross/safe_update_test.go
index b3361c711bd0..3fc0ebba1388 100644
--- a/op-supervisor/supervisor/backend/cross/safe_update_test.go
+++ b/op-supervisor/supervisor/backend/cross/safe_update_test.go
@@ -102,7 +102,7 @@ func TestCrossSafeUpdate(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, chainID, updatingChain)
 		require.Equal(t, newScope, updatingCandidateScope)
-		crossSafeRef := currentCrossSafe.WithParent(parent.ID())
+		crossSafeRef := currentCrossSafe.MustWithParent(parent.ID())
 		require.Equal(t, crossSafeRef, updatingCandidate)
 	})
 	t.Run("NextDerivedFrom returns error", func(t *testing.T) {
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index 867e4e71955b..bc3547cd023e 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -157,7 +157,7 @@ func (db *ChainsDB) CrossDerivedFromBlockRef(chainID types.ChainID, derived eth.
 	if err != nil {
 		return eth.BlockRef{}, err
 	}
-	return res.WithParent(parent.ID()), nil
+	return res.MustWithParent(parent.ID()), nil
 }
 
 // Check calls the underlying logDB to determine if the given log entry exists at the given location.
@@ -238,9 +238,16 @@ func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, c
 			if err != nil {
 				return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find first local-safe block: %w", err)
 			}
-			// First block has no parent
-			return derivedFrom.WithParent(eth.BlockID{}),
-				derived.WithParent(eth.BlockID{}), nil
+			// the first derivedFrom (L1 block) is unlikely to be the genesis block,
+			derivedFromRef, err := derivedFrom.WithParent(eth.BlockID{})
+			if err != nil {
+				// if the first derivedFrom isn't the genesis block, just warn and continue anyway
+				db.logger.Warn("First DerivedFrom is not genesis block")
+				derivedFromRef = derivedFrom.ForceWithParent(eth.BlockID{})
+			}
+			// the first derived must be the genesis block, panic otherwise
+			derivedRef := derived.MustWithParent(derivedFrom.ID())
+			return derivedFromRef, derivedRef, nil
 		}
 		return eth.BlockRef{}, eth.BlockRef{}, err
 	}
@@ -256,13 +263,13 @@ func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, c
 		return eth.BlockRef{}, eth.BlockRef{}, err
 	}
 
-	candidateRef := candidate.WithParent(crossDerived.ID())
+	candidateRef := candidate.MustWithParent(crossDerived.ID())
 
 	parentDerivedFrom, err := lDB.PreviousDerivedFrom(candidateFrom.ID())
 	if err != nil {
 		return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find parent-block of derived-from %s: %w", candidateFrom, err)
 	}
-	candidateFromRef := candidateFrom.WithParent(parentDerivedFrom.ID())
+	candidateFromRef := candidateFrom.MustWithParent(parentDerivedFrom.ID())
 
 	// Allow increment of DA by 1, if we know the floor (due to local safety) is 1 ahead of the current cross-safe L1 scope.
 	if candidateFrom.Number > crossDerivedFrom.Number+1 {
@@ -273,7 +280,7 @@ func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, c
 			return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find parent-block of cross-derived-from %s: %w",
 				crossDerivedFrom, err)
 		}
-		crossDerivedFromRef := crossDerivedFrom.WithParent(parent.ID())
+		crossDerivedFromRef := crossDerivedFrom.MustWithParent(parent.ID())
 		return crossDerivedFromRef, eth.BlockRef{},
 			fmt.Errorf("candidate is from %s, while current scope is %s: %w",
 				candidateFrom, crossDerivedFrom, types.ErrOutOfScope)
@@ -306,7 +313,7 @@ func (db *ChainsDB) NextDerivedFrom(chain types.ChainID, derivedFrom eth.BlockID
 	if err != nil {
 		return eth.BlockRef{}, err
 	}
-	return v.WithParent(derivedFrom), nil
+	return v.MustWithParent(derivedFrom), nil
 }
 
 // Safest returns the strongest safety level that can be guaranteed for the given log entry.
diff --git a/op-supervisor/supervisor/types/types.go b/op-supervisor/supervisor/types/types.go
index bac2c377bfd7..381d1fc3cbda 100644
--- a/op-supervisor/supervisor/types/types.go
+++ b/op-supervisor/supervisor/types/types.go
@@ -240,12 +240,29 @@ func (s BlockSeal) ID() eth.BlockID {
 	return eth.BlockID{Hash: s.Hash, Number: s.Number}
 }
 
-func (s BlockSeal) WithParent(parent eth.BlockID) eth.BlockRef {
+func (s BlockSeal) MustWithParent(parent eth.BlockID) eth.BlockRef {
+	ref, err := s.WithParent(parent)
+	if err != nil {
+		panic(err)
+	}
+	return ref
+}
+
+func (s BlockSeal) WithParent(parent eth.BlockID) (eth.BlockRef, error) {
 	// prevent parent attachment if the parent is not the previous block,
 	// and the block is not the genesis block
 	if s.Number != parent.Number+1 && s.Number != 0 {
-		panic(fmt.Errorf("invalid parent block %s to combine with %s", parent, s))
+		return eth.BlockRef{}, fmt.Errorf("invalid parent block %s to combine with %s", parent, s)
 	}
+	return eth.BlockRef{
+		Hash:       s.Hash,
+		Number:     s.Number,
+		ParentHash: parent.Hash,
+		Time:       s.Timestamp,
+	}, nil
+}
+
+func (s BlockSeal) ForceWithParent(parent eth.BlockID) eth.BlockRef {
 	return eth.BlockRef{
 		Hash:       s.Hash,
 		Number:     s.Number,

From d627f1189666c5e4606a3180109791e846d73e32 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Tue, 5 Nov 2024 15:08:59 -0600
Subject: [PATCH 134/451] interop: correct error in prior WithParent commit
 (#12832)

---
 op-supervisor/supervisor/backend/db/query.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index bc3547cd023e..e3040998859f 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -246,7 +246,7 @@ func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, c
 				derivedFromRef = derivedFrom.ForceWithParent(eth.BlockID{})
 			}
 			// the first derived must be the genesis block, panic otherwise
-			derivedRef := derived.MustWithParent(derivedFrom.ID())
+			derivedRef := derived.MustWithParent(eth.BlockID{})
 			return derivedFromRef, derivedRef, nil
 		}
 		return eth.BlockRef{}, eth.BlockRef{}, err

From b20ca5db16da5dbe66f64ea97a2ac60915caa4ea Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Tue, 5 Nov 2024 22:59:56 -0600
Subject: [PATCH 135/451] Handle ErrParentTo from PreviousDerivedFrom (#12833)

---
 .../supervisor/backend/db/fromda/db.go        |  3 ++-
 op-supervisor/supervisor/backend/db/query.go  | 26 ++++++++++++++-----
 op-supervisor/supervisor/types/error.go       |  3 +++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/op-supervisor/supervisor/backend/db/fromda/db.go b/op-supervisor/supervisor/backend/db/fromda/db.go
index c4c98624d26d..48d8564ced20 100644
--- a/op-supervisor/supervisor/backend/db/fromda/db.go
+++ b/op-supervisor/supervisor/backend/db/fromda/db.go
@@ -189,7 +189,8 @@ func (db *DB) PreviousDerivedFrom(derivedFrom eth.BlockID) (prevDerivedFrom type
 		if self.derivedFrom.Number == 0 {
 			return types.BlockSeal{}, nil
 		} else {
-			return types.BlockSeal{}, fmt.Errorf("cannot find previous derived before start of database: %s", derivedFrom)
+			return types.BlockSeal{},
+				fmt.Errorf("cannot find previous derived before start of database: %s (%w)", derivedFrom, types.ErrPreviousToFirst)
 		}
 	}
 	prev, err := db.readAt(selfIndex - 1)
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index e3040998859f..bbee01d71b4d 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -154,7 +154,11 @@ func (db *ChainsDB) CrossDerivedFromBlockRef(chainID types.ChainID, derived eth.
 		return eth.BlockRef{}, err
 	}
 	parent, err := xdb.PreviousDerivedFrom(res.ID())
-	if err != nil {
+	// if we are working with the first item in the database, PreviousDerivedFrom will return ErrPreviousToFirst
+	// in which case we can attach a zero parent to the cross-derived-from block, as the parent block is unknown
+	if errors.Is(err, types.ErrPreviousToFirst) {
+		return res.ForceWithParent(eth.BlockID{}), nil
+	} else if err != nil {
 		return eth.BlockRef{}, err
 	}
 	return res.MustWithParent(parent.ID()), nil
@@ -266,7 +270,11 @@ func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, c
 	candidateRef := candidate.MustWithParent(crossDerived.ID())
 
 	parentDerivedFrom, err := lDB.PreviousDerivedFrom(candidateFrom.ID())
-	if err != nil {
+	// if we are working with the first item in the database, PreviousDerivedFrom will return ErrPreviousToFirst
+	// in which case we can attach a zero parent to the cross-derived-from block, as the parent block is unknown
+	if errors.Is(err, types.ErrPreviousToFirst) {
+		parentDerivedFrom = types.BlockSeal{}
+	} else if err != nil {
 		return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find parent-block of derived-from %s: %w", candidateFrom, err)
 	}
 	candidateFromRef := candidateFrom.MustWithParent(parentDerivedFrom.ID())
@@ -275,12 +283,18 @@ func (db *ChainsDB) CandidateCrossSafe(chain types.ChainID) (derivedFromScope, c
 	if candidateFrom.Number > crossDerivedFrom.Number+1 {
 		// If we are not ready to process the candidate block,
 		// then we need to stick to the current scope, so the caller can bump up from there.
+		var crossDerivedFromRef eth.BlockRef
 		parent, err := lDB.PreviousDerivedFrom(crossDerivedFrom.ID())
-		if err != nil {
-			return eth.BlockRef{}, eth.BlockRef{}, fmt.Errorf("failed to find parent-block of cross-derived-from %s: %w",
-				crossDerivedFrom, err)
+		// if we are working with the first item in the database, PreviousDerivedFrom will return ErrPreviousToFirst
+		// in which case we can attach a zero parent to the cross-derived-from block, as the parent block is unknown
+		if errors.Is(err, types.ErrPreviousToFirst) {
+			crossDerivedFromRef = crossDerivedFrom.ForceWithParent(eth.BlockID{})
+		} else if err != nil {
+			return eth.BlockRef{}, eth.BlockRef{},
+				fmt.Errorf("failed to find parent-block of cross-derived-from %s: %w", crossDerivedFrom, err)
+		} else {
+			crossDerivedFromRef = crossDerivedFrom.MustWithParent(parent.ID())
 		}
-		crossDerivedFromRef := crossDerivedFrom.MustWithParent(parent.ID())
 		return crossDerivedFromRef, eth.BlockRef{},
 			fmt.Errorf("candidate is from %s, while current scope is %s: %w",
 				candidateFrom, crossDerivedFrom, types.ErrOutOfScope)
diff --git a/op-supervisor/supervisor/types/error.go b/op-supervisor/supervisor/types/error.go
index b4e1c57ba908..fc493fb87f91 100644
--- a/op-supervisor/supervisor/types/error.go
+++ b/op-supervisor/supervisor/types/error.go
@@ -20,6 +20,9 @@ var (
 	// ErrOutOfScope is when data is accessed, but access is not allowed, because of a limited scope.
 	// E.g. when limiting scope to L2 blocks derived from a specific subset of the L1 chain.
 	ErrOutOfScope = errors.New("out of scope")
+	// ErrPreviousToFirst is when you try to get the previous block of the first block
+	// E.g. when calling PreviousDerivedFrom on the first L1 block in the DB.
+	ErrPreviousToFirst = errors.New("cannot get parent of first block in the database")
 	// ErrUnknownChain is when a chain is unknown, not in the dependency set.
 	ErrUnknownChain = errors.New("unknown chain")
 	// ErrNoRPCSource happens when a sub-service needs an RPC data source, but is not configured with one.

From 4052ab925c5d33f6f096591e92fde62ef5378bec Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Wed, 6 Nov 2024 13:37:35 +0700
Subject: [PATCH 136/451] ensure we increase the pending_blocks metric when a
 channel times out (#12810)

In this situation, the blocks get another chance to be put into a channel, when the metric will be decremented. This leads to inaccurate (even negative) metrics.
---
 op-batcher/batcher/channel_manager.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 887c51f4ebf2..4bfbd3124cec 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -115,11 +115,11 @@ func (s *channelManager) TxConfirmed(_id txID, inclusionBlock eth.BlockID) {
 	id := _id.String()
 	if channel, ok := s.txChannels[id]; ok {
 		delete(s.txChannels, id)
-		done, blocks := channel.TxConfirmed(id, inclusionBlock)
+		done, blocksToRequeue := channel.TxConfirmed(id, inclusionBlock)
 		if done {
-			s.removePendingChannel(channel)
-			if len(blocks) > 0 {
-				s.blocks.Prepend(blocks...)
+			for _, b := range blocksToRequeue {
+				s.blocks.Prepend(b)
+				s.metr.RecordL2BlockInPendingQueue(b)
 			}
 		}
 	} else {
@@ -504,9 +504,8 @@ func (s *channelManager) Requeue(newCfg ChannelConfig) {
 	}
 
 	// We put the blocks back at the front of the queue:
-	s.blocks.Prepend(blocksToRequeue...)
-
 	for _, b := range blocksToRequeue {
+		s.blocks.Prepend(b)
 		s.metr.RecordL2BlockInPendingQueue(b)
 	}
 

From dd3ec4c9a0bb1a7a2cf652e45849e2e474ce0c41 Mon Sep 17 00:00:00 2001
From: Roberto Bayardo <roberto.bayardo@coinbase.com>
Date: Tue, 5 Nov 2024 23:10:00 -0800
Subject: [PATCH 137/451] op-batcher: control loop to throttle DA usage
 (#12735)

* implement throttling feedback loop based on the amount of data pending for DA settlement

* make ThrottleInterval of 0 indicate do not start throttling loop

* use modular batcher e2esys config

* disable batcher throttling by default

---------

Co-authored-by: Sebastian Stammler <seb@oplabs.co>
---
 op-batcher/batcher/channel_manager.go   |  14 ++
 op-batcher/batcher/config.go            |  18 +++
 op-batcher/batcher/config_test.go       |   7 +-
 op-batcher/batcher/driver.go            | 133 ++++++++++++----
 op-batcher/batcher/service.go           |  22 +++
 op-batcher/flags/flags.go               |  35 +++++
 op-batcher/metrics/metrics.go           |  55 +++++--
 op-batcher/metrics/noop.go              |  14 ++
 op-e2e/e2eutils/geth/geth.go            |  12 +-
 op-e2e/system/da/brotli_batcher_test.go |   3 +-
 op-e2e/system/da/da_throttling_test.go  | 192 ++++++++++++++++++++++++
 op-e2e/system/e2esys/setup.go           |  38 ++++-
 op-service/dial/ethclient_interface.go  |   2 +
 op-service/metrics/factory.go           |  10 ++
 op-service/testutils/mock_eth_client.go |   6 +
 ops-bedrock/l2-op-geth-entrypoint.sh    |   4 +-
 16 files changed, 506 insertions(+), 59 deletions(-)
 create mode 100644 op-e2e/system/da/da_throttling_test.go

diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 4bfbd3124cec..25900906d0dd 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"sync"
 
 	"github.com/ethereum-optimism/optimism/op-batcher/metrics"
@@ -516,3 +517,16 @@ func (s *channelManager) Requeue(newCfg ChannelConfig) {
 	// to pick up the new ChannelConfig
 	s.defaultCfg = newCfg
 }
+
+// PendingDABytes returns the current number of bytes pending to be written to the DA layer (from blocks fetched from L2
+// but not yet in a channel).
+func (s *channelManager) PendingDABytes() int64 {
+	f := s.metr.PendingDABytes()
+	if f >= math.MaxInt64 {
+		return math.MaxInt64
+	}
+	if f <= math.MinInt64 {
+		return math.MinInt64
+	}
+	return int64(f)
+}
diff --git a/op-batcher/batcher/config.go b/op-batcher/batcher/config.go
index ac8bad7791a7..82be687af325 100644
--- a/op-batcher/batcher/config.go
+++ b/op-batcher/batcher/config.go
@@ -96,6 +96,19 @@ type CLIConfig struct {
 	// ActiveSequencerCheckDuration is the duration between checks to determine the active sequencer endpoint.
 	ActiveSequencerCheckDuration time.Duration
 
+	// ThrottleInterval is the interval between notifying the block builder of the latest DA throttling state, or 0 to
+	// disable notifications entirely (only recommended for testing).
+	ThrottleInterval time.Duration
+	// ThrottleThreshold is the number of pending bytes beyond which the batcher will start throttling future bytes
+	// written to DA.
+	ThrottleThreshold uint64
+	// ThrottleTxSize is the DA size of a transaction to start throttling when we are over the throttling threshold.
+	ThrottleTxSize uint64
+	// ThrottleBlockSize is the total per-block DA limit to start imposing on block building when we are over the throttling threshold.
+	ThrottleBlockSize uint64
+	// ThrottleAlwaysBlockSize is the total per-block DA limit to always imposing on block building.
+	ThrottleAlwaysBlockSize uint64
+
 	// TestUseMaxTxSizeForBlobs allows to set the blob size with MaxL1TxSize.
 	// Should only be used for testing purposes.
 	TestUseMaxTxSizeForBlobs bool
@@ -195,5 +208,10 @@ func NewConfig(ctx *cli.Context) *CLIConfig {
 		PprofConfig:                  oppprof.ReadCLIConfig(ctx),
 		RPC:                          oprpc.ReadCLIConfig(ctx),
 		AltDA:                        altda.ReadCLIConfig(ctx),
+		ThrottleThreshold:            ctx.Uint64(flags.ThrottleThresholdFlag.Name),
+		ThrottleInterval:             ctx.Duration(flags.ThrottleIntervalFlag.Name),
+		ThrottleTxSize:               ctx.Uint64(flags.ThrottleTxSizeFlag.Name),
+		ThrottleBlockSize:            ctx.Uint64(flags.ThrottleBlockSizeFlag.Name),
+		ThrottleAlwaysBlockSize:      ctx.Uint64(flags.ThrottleAlwaysBlockSizeFlag.Name),
 	}
 }
diff --git a/op-batcher/batcher/config_test.go b/op-batcher/batcher/config_test.go
index 4b90ebaccb68..9ce1ab4628fa 100644
--- a/op-batcher/batcher/config_test.go
+++ b/op-batcher/batcher/config_test.go
@@ -38,8 +38,11 @@ func validBatcherConfig() batcher.CLIConfig {
 		MetricsConfig:          metrics.DefaultCLIConfig(),
 		PprofConfig:            oppprof.DefaultCLIConfig(),
 		// The compressor config is not checked in config.Check()
-		RPC:             rpc.DefaultCLIConfig(),
-		CompressionAlgo: derive.Zlib,
+		RPC:               rpc.DefaultCLIConfig(),
+		CompressionAlgo:   derive.Zlib,
+		ThrottleThreshold: 0, // no DA throttling
+		ThrottleInterval:  12 * time.Second,
+		ThrottleTxSize:    0,
 	}
 }
 
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index b31dd29e2e05..000fb89d16f1 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -18,6 +18,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/txpool"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -34,6 +35,7 @@ var (
 			},
 		},
 	}
+	SetMaxDASizeMethod = "miner_setMaxDASize"
 )
 
 type txRef struct {
@@ -100,6 +102,8 @@ type BatchSubmitter struct {
 	killCtx           context.Context
 	cancelKillCtx     context.CancelFunc
 
+	l2BlockAdded chan struct{} // notifies the throttling loop whenever an l2 block is added
+
 	mutex   sync.Mutex
 	running bool
 
@@ -290,6 +294,12 @@ func (l *BatchSubmitter) loadBlockIntoState(ctx context.Context, blockNumber uin
 		return nil, fmt.Errorf("adding L2 block to state: %w", err)
 	}
 
+	// notify the throttling loop it may be time to initiate throttling without blocking
+	select {
+	case l.l2BlockAdded <- struct{}{}:
+	default:
+	}
+
 	l.Log.Info("Added L2 block to local state", "block", eth.ToBlockID(block), "tx_count", len(block.Transactions()), "time", block.Time())
 	return block, nil
 }
@@ -384,7 +394,6 @@ const (
 func (l *BatchSubmitter) loop() {
 	defer l.wg.Done()
 
-	receiptsCh := make(chan txmgr.TxReceipt[txRef])
 	queue := txmgr.NewQueue[txRef](l.killCtx, l.Txmgr, l.Config.MaxPendingTransactions)
 	daGroup := &errgroup.Group{}
 	// errgroup with limit of 0 means no goroutine is able to run concurrently,
@@ -393,37 +402,26 @@ func (l *BatchSubmitter) loop() {
 		daGroup.SetLimit(int(l.Config.MaxConcurrentDARequests))
 	}
 
-	// start the receipt/result processing loop
-	receiptLoopDone := make(chan struct{})
-	defer close(receiptLoopDone) // shut down receipt loop
-
 	l.txpoolMutex.Lock()
 	l.txpoolState = TxpoolGood
 	l.txpoolMutex.Unlock()
-	go func() {
-		for {
-			select {
-			case r := <-receiptsCh:
-				l.txpoolMutex.Lock()
-				if errors.Is(r.Err, txpool.ErrAlreadyReserved) && l.txpoolState == TxpoolGood {
-					l.txpoolState = TxpoolBlocked
-					l.txpoolBlockedBlob = r.ID.isBlob
-					l.Log.Info("incompatible tx in txpool", "is_blob", r.ID.isBlob)
-				} else if r.ID.isCancel && l.txpoolState == TxpoolCancelPending {
-					// Set state to TxpoolGood even if the cancellation transaction ended in error
-					// since the stuck transaction could have cleared while we were waiting.
-					l.txpoolState = TxpoolGood
-					l.Log.Info("txpool may no longer be blocked", "err", r.Err)
-				}
-				l.txpoolMutex.Unlock()
-				l.Log.Info("Handling receipt", "id", r.ID)
-				l.handleReceipt(r)
-			case <-receiptLoopDone:
-				l.Log.Info("Receipt processing loop done")
-				return
-			}
-		}
-	}()
+
+	// start the receipt/result processing loop
+	receiptsLoopDone := make(chan struct{})
+	defer close(receiptsLoopDone) // shut down receipt loop
+	l.l2BlockAdded = make(chan struct{})
+	defer close(l.l2BlockAdded)
+	receiptsCh := make(chan txmgr.TxReceipt[txRef])
+	go l.processReceiptsLoop(receiptsCh, receiptsLoopDone)
+
+	// DA throttling loop should always be started except for testing (indicated by ThrottleInterval == 0)
+	if l.Config.ThrottleInterval > 0 {
+		throttlingLoopDone := make(chan struct{})
+		defer close(throttlingLoopDone)
+		go l.throttlingLoop(throttlingLoopDone)
+	} else {
+		l.Log.Warn("Throttling loop is DISABLED due to 0 throttle-interval. This should not be disabled in prod.")
+	}
 
 	ticker := time.NewTicker(l.Config.PollInterval)
 	defer ticker.Stop()
@@ -492,6 +490,83 @@ func (l *BatchSubmitter) loop() {
 	}
 }
 
+func (l *BatchSubmitter) processReceiptsLoop(receiptsCh chan txmgr.TxReceipt[txRef], receiptsLoopDone chan struct{}) {
+	l.Log.Info("Starting receipts processing loop")
+	for {
+		select {
+		case r := <-receiptsCh:
+			l.txpoolMutex.Lock()
+			if errors.Is(r.Err, txpool.ErrAlreadyReserved) && l.txpoolState == TxpoolGood {
+				l.txpoolState = TxpoolBlocked
+				l.txpoolBlockedBlob = r.ID.isBlob
+				l.Log.Info("incompatible tx in txpool", "is_blob", r.ID.isBlob)
+			} else if r.ID.isCancel && l.txpoolState == TxpoolCancelPending {
+				// Set state to TxpoolGood even if the cancellation transaction ended in error
+				// since the stuck transaction could have cleared while we were waiting.
+				l.txpoolState = TxpoolGood
+				l.Log.Info("txpool may no longer be blocked", "err", r.Err)
+			}
+			l.txpoolMutex.Unlock()
+			l.Log.Info("Handling receipt", "id", r.ID)
+			l.handleReceipt(r)
+		case <-receiptsLoopDone:
+			l.Log.Info("Receipts processing loop done")
+			return
+		}
+	}
+}
+
+// throttlingLoop monitors the backlog in bytes we need to make available, and appropriately enables or disables
+// throttling of incoming data prevent the backlog from growing too large. By looping & calling the miner API setter
+// continuously, we ensure the engine currently in use is always going to be reset to the proper throttling settings
+// even in the event of sequencer failover.
+func (l *BatchSubmitter) throttlingLoop(throttlingLoopDone chan struct{}) {
+	l.Log.Info("Starting DA throttling loop")
+	ticker := time.NewTicker(l.Config.ThrottleInterval)
+	defer ticker.Stop()
+
+	updateParams := func() {
+		ctx, cancel := context.WithTimeout(l.shutdownCtx, l.Config.NetworkTimeout)
+		defer cancel()
+		cl, err := l.EndpointProvider.EthClient(ctx)
+		if err != nil {
+			l.Log.Error("Can't reach sequencer execution RPC", "err", err)
+			return
+		}
+		pendingBytes := l.state.PendingDABytes()
+		maxTxSize := uint64(0)
+		maxBlockSize := l.Config.ThrottleAlwaysBlockSize
+		if pendingBytes > int64(l.Config.ThrottleThreshold) {
+			l.Log.Warn("Pending bytes over limit, throttling DA", "bytes", pendingBytes, "limit", l.Config.ThrottleThreshold)
+			maxTxSize = l.Config.ThrottleTxSize
+			if maxBlockSize == 0 || (l.Config.ThrottleBlockSize != 0 && l.Config.ThrottleBlockSize < maxBlockSize) {
+				maxBlockSize = l.Config.ThrottleBlockSize
+			}
+		}
+		var success bool
+		if err := cl.Client().CallContext(
+			ctx, &success, SetMaxDASizeMethod, hexutil.Uint64(maxTxSize), hexutil.Uint64(maxBlockSize)); err != nil {
+			l.Log.Error("SetMaxDASize rpc failed", "err", err)
+			return
+		}
+		if !success {
+			l.Log.Error("Result of SetMaxDASize was false")
+		}
+	}
+
+	for {
+		select {
+		case <-l.l2BlockAdded:
+			updateParams()
+		case <-ticker.C:
+			updateParams()
+		case <-throttlingLoopDone:
+			l.Log.Info("DA throttling loop done")
+			return
+		}
+	}
+}
+
 // waitNodeSync Check to see if there was a batcher tx sent recently that
 // still needs more block confirmations before being considered finalized
 func (l *BatchSubmitter) waitNodeSync() error {
diff --git a/op-batcher/batcher/service.go b/op-batcher/batcher/service.go
index 90a85cc4ee48..1b150642261f 100644
--- a/op-batcher/batcher/service.go
+++ b/op-batcher/batcher/service.go
@@ -44,6 +44,11 @@ type BatcherConfig struct {
 
 	WaitNodeSync        bool
 	CheckRecentTxsDepth int
+
+	// For throttling DA. See CLIConfig in config.go for details on these parameters.
+	ThrottleThreshold, ThrottleTxSize          uint64
+	ThrottleBlockSize, ThrottleAlwaysBlockSize uint64
+	ThrottleInterval                           time.Duration
 }
 
 // BatcherService represents a full batch-submitter instance and its resources,
@@ -101,6 +106,13 @@ func (bs *BatcherService) initFromCLIConfig(ctx context.Context, version string,
 	bs.NetworkTimeout = cfg.TxMgrConfig.NetworkTimeout
 	bs.CheckRecentTxsDepth = cfg.CheckRecentTxsDepth
 	bs.WaitNodeSync = cfg.WaitNodeSync
+
+	bs.ThrottleThreshold = cfg.ThrottleThreshold
+	bs.ThrottleTxSize = cfg.ThrottleTxSize
+	bs.ThrottleBlockSize = cfg.ThrottleBlockSize
+	bs.ThrottleAlwaysBlockSize = cfg.ThrottleAlwaysBlockSize
+	bs.ThrottleInterval = cfg.ThrottleInterval
+
 	if err := bs.initRPCClients(ctx, cfg); err != nil {
 		return err
 	}
@@ -457,3 +469,13 @@ func (bs *BatcherService) TestDriver() *TestBatchSubmitter {
 		BatchSubmitter: bs.driver,
 	}
 }
+
+// ThrottlingTestDriver returns a handler for the batch-submitter driver element that is in "always throttle" mode, for
+// use only in testing.
+func (bs *BatcherService) ThrottlingTestDriver() *TestBatchSubmitter {
+	tbs := &TestBatchSubmitter{
+		BatchSubmitter: bs.driver,
+	}
+	tbs.BatchSubmitter.state.metr = new(metrics.ThrottlingMetrics)
+	return tbs
+}
diff --git a/op-batcher/flags/flags.go b/op-batcher/flags/flags.go
index 3fe66f33981b..538b70b6c9fa 100644
--- a/op-batcher/flags/flags.go
+++ b/op-batcher/flags/flags.go
@@ -156,6 +156,36 @@ var (
 		Value:   false,
 		EnvVars: prefixEnvVars("WAIT_NODE_SYNC"),
 	}
+	ThrottleIntervalFlag = &cli.DurationFlag{
+		Name: "throttle-interval",
+		Usage: "Interval between potential DA throttling actions. Zero (default) disables throttling. " +
+			"Recommended to be set to L2 block time if enabling.",
+		EnvVars: prefixEnvVars("THROTTLE_INTERVAL"),
+	}
+	ThrottleThresholdFlag = &cli.IntFlag{
+		Name:    "throttle-threshold",
+		Usage:   "The threshold on pending-blocks-bytes-current beyond which the batcher will instruct the block builder to start throttling transactions with larger DA demands",
+		Value:   1_000_000,
+		EnvVars: prefixEnvVars("THROTTLE_THRESHOLD"),
+	}
+	ThrottleTxSizeFlag = &cli.IntFlag{
+		Name:    "throttle-tx-size",
+		Usage:   "The DA size of transactions to start throttling when we are over the throttle threshold",
+		Value:   300, // most transactions compress to under 300 bytes. TODO: compute exact distribution
+		EnvVars: prefixEnvVars("THROTTLE_TX_SIZE"),
+	}
+	ThrottleBlockSizeFlag = &cli.IntFlag{
+		Name:    "throttle-block-size",
+		Usage:   "The total DA limit to start imposing on block building when we are over the throttle threshold",
+		Value:   21_000, // at least 70 transactions per block of up to 300 compressed bytes each.
+		EnvVars: prefixEnvVars("THROTTLE_BLOCK_SIZE"),
+	}
+	ThrottleAlwaysBlockSizeFlag = &cli.IntFlag{
+		Name:    "throttle-always-block-size",
+		Usage:   "The total DA limit to start imposing on block building at all times",
+		Value:   130_000, // should be larger than the builder's max-l2-tx-size to prevent endlessly throttling some txs
+		EnvVars: prefixEnvVars("THROTTLE_ALWAYS_BLOCK_SIZE"),
+	}
 	// Legacy Flags
 	SequencerHDPathFlag = txmgr.SequencerHDPathFlag
 )
@@ -184,6 +214,11 @@ var optionalFlags = []cli.Flag{
 	DataAvailabilityTypeFlag,
 	ActiveSequencerCheckDurationFlag,
 	CompressionAlgoFlag,
+	ThrottleThresholdFlag,
+	ThrottleIntervalFlag,
+	ThrottleTxSizeFlag,
+	ThrottleBlockSizeFlag,
+	ThrottleAlwaysBlockSizeFlag,
 }
 
 func init() {
diff --git a/op-batcher/metrics/metrics.go b/op-batcher/metrics/metrics.go
index 417f927ee6f6..6443e489bd46 100644
--- a/op-batcher/metrics/metrics.go
+++ b/op-batcher/metrics/metrics.go
@@ -2,6 +2,7 @@ package metrics
 
 import (
 	"io"
+	"sync/atomic"
 
 	"github.com/prometheus/client_golang/prometheus"
 
@@ -49,6 +50,8 @@ type Metricer interface {
 	RecordBlobUsedBytes(num int)
 
 	Document() []opmetrics.DocumentedMetric
+
+	PendingDABytes() float64
 }
 
 type Metrics struct {
@@ -69,7 +72,11 @@ type Metrics struct {
 	pendingBlocksCount        prometheus.GaugeVec
 	pendingBlocksBytesTotal   prometheus.Counter
 	pendingBlocksBytesCurrent prometheus.Gauge
-	blocksAddedCount          prometheus.Gauge
+
+	pendingDABytes          int64
+	pendingDABytesGaugeFunc prometheus.GaugeFunc
+
+	blocksAddedCount prometheus.Gauge
 
 	channelInputBytes       prometheus.GaugeVec
 	channelReadyBytes       prometheus.Gauge
@@ -99,7 +106,7 @@ func NewMetrics(procName string) *Metrics {
 	registry := opmetrics.NewRegistry()
 	factory := opmetrics.With(registry)
 
-	return &Metrics{
+	m := &Metrics{
 		ns:       ns,
 		registry: registry,
 		factory:  factory,
@@ -143,7 +150,6 @@ func NewMetrics(procName string) *Metrics {
 			Name:      "blocks_added_count",
 			Help:      "Total number of blocks added to current channel.",
 		}),
-
 		channelInputBytes: *factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: ns,
 			Name:      "input_bytes",
@@ -194,6 +200,13 @@ func NewMetrics(procName string) *Metrics {
 
 		batcherTxEvs: opmetrics.NewEventVec(factory, ns, "", "batcher_tx", "BatcherTx", []string{"stage"}),
 	}
+	m.pendingDABytesGaugeFunc = factory.NewGaugeFunc(prometheus.GaugeOpts{
+		Namespace: ns,
+		Name:      "pending_da_bytes",
+		Help:      "The estimated amount of data currently pending to be written to the DA layer (from blocks fetched from L2 but not yet in a channel).",
+	}, m.PendingDABytes)
+
+	return m
 }
 
 func (m *Metrics) Registry() *prometheus.Registry {
@@ -204,6 +217,12 @@ func (m *Metrics) Document() []opmetrics.DocumentedMetric {
 	return m.factory.Document()
 }
 
+// PendingDABytes returns the current number of bytes pending to be written to the DA layer (from blocks fetched from L2
+// but not yet in a channel).
+func (m *Metrics) PendingDABytes() float64 {
+	return float64(atomic.LoadInt64(&m.pendingDABytes))
+}
+
 func (m *Metrics) StartBalanceMetrics(l log.Logger, client *ethclient.Client, account common.Address) io.Closer {
 	return opmetrics.LaunchBalanceMetrics(l, m.registry, m.ns, client, account)
 }
@@ -278,14 +297,16 @@ func (m *Metrics) RecordChannelClosed(id derive.ChannelID, numPendingBlocks int,
 }
 
 func (m *Metrics) RecordL2BlockInPendingQueue(block *types.Block) {
-	size := float64(estimateBatchSize(block))
-	m.pendingBlocksBytesTotal.Add(size)
-	m.pendingBlocksBytesCurrent.Add(size)
+	daSize, rawSize := estimateBatchSize(block)
+	m.pendingBlocksBytesTotal.Add(float64(rawSize))
+	m.pendingBlocksBytesCurrent.Add(float64(rawSize))
+	atomic.AddInt64(&m.pendingDABytes, int64(daSize))
 }
 
 func (m *Metrics) RecordL2BlockInChannel(block *types.Block) {
-	size := float64(estimateBatchSize(block))
-	m.pendingBlocksBytesCurrent.Add(-1 * size)
+	daSize, rawSize := estimateBatchSize(block)
+	m.pendingBlocksBytesCurrent.Add(-1.0 * float64(rawSize))
+	atomic.AddInt64(&m.pendingDABytes, -1*int64(daSize))
 	// Refer to RecordL2BlocksAdded to see the current + count of bytes added to a channel
 }
 
@@ -318,16 +339,22 @@ func (m *Metrics) RecordBlobUsedBytes(num int) {
 	m.blobUsedBytes.Observe(float64(num))
 }
 
-// estimateBatchSize estimates the size of the batch
-func estimateBatchSize(block *types.Block) uint64 {
-	size := uint64(70) // estimated overhead of batch metadata
+// estimateBatchSize returns the estimated size of the block in a batch both with compression ('daSize') and without
+// ('rawSize').
+func estimateBatchSize(block *types.Block) (daSize, rawSize uint64) {
+	daSize = uint64(70) // estimated overhead of batch metadata
+	rawSize = uint64(70)
 	for _, tx := range block.Transactions() {
-		// Don't include deposit transactions in the batch.
+		// Deposit transactions are not included in batches
 		if tx.IsDepositTx() {
 			continue
 		}
+		bigSize := tx.RollupCostData().EstimatedDASize()
+		if bigSize.IsUint64() { // this should always be true, but if not just ignore
+			daSize += bigSize.Uint64()
+		}
 		// Add 2 for the overhead of encoding the tx bytes in a RLP list
-		size += tx.Size() + 2
+		rawSize += tx.Size() + 2
 	}
-	return size
+	return
 }
diff --git a/op-batcher/metrics/noop.go b/op-batcher/metrics/noop.go
index 36594efe47c7..92711ee883d9 100644
--- a/op-batcher/metrics/noop.go
+++ b/op-batcher/metrics/noop.go
@@ -2,6 +2,7 @@ package metrics
 
 import (
 	"io"
+	"math"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -46,3 +47,16 @@ func (*noopMetrics) RecordBlobUsedBytes(int) {}
 func (*noopMetrics) StartBalanceMetrics(log.Logger, *ethclient.Client, common.Address) io.Closer {
 	return nil
 }
+func (nm *noopMetrics) PendingDABytes() float64 {
+	return 0.0
+}
+
+// ThrottlingMetrics is a noopMetrics that always returns a max value for PendingDABytes, to use in testing batcher
+// backlog throttling.
+type ThrottlingMetrics struct {
+	noopMetrics
+}
+
+func (nm *ThrottlingMetrics) PendingDABytes() float64 {
+	return math.MaxFloat64
+}
diff --git a/op-e2e/e2eutils/geth/geth.go b/op-e2e/e2eutils/geth/geth.go
index de5b12b77d3c..b210949803bb 100644
--- a/op-e2e/e2eutils/geth/geth.go
+++ b/op-e2e/e2eutils/geth/geth.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/txpool/blobpool"
+	"github.com/ethereum/go-ethereum/core/txpool/legacypool"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/eth/catalyst"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
@@ -49,8 +50,8 @@ func InitL1(blockTime uint64, finalizedDistance uint64, genesis *core.Genesis, c
 		HTTPPort:    0,
 		WSHost:      "127.0.0.1",
 		WSPort:      0,
-		WSModules:   []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine"},
-		HTTPModules: []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine"},
+		WSModules:   []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine", "miner"},
+		HTTPModules: []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine", "miner"},
 	}
 
 	gethInstance, err := createGethNode(false, nodeConfig, ethConfig, opts...)
@@ -82,8 +83,8 @@ func defaultNodeConfig(name string, jwtPath string) *node.Config {
 		AuthPort:    0,
 		HTTPHost:    "127.0.0.1",
 		HTTPPort:    0,
-		WSModules:   []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine"},
-		HTTPModules: []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine"},
+		WSModules:   []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine", "miner"},
+		HTTPModules: []string{"debug", "admin", "eth", "txpool", "net", "rpc", "web3", "personal", "engine", "miner"},
 		JWTSecret:   jwtPath,
 	}
 }
@@ -104,6 +105,9 @@ func InitL2(name string, genesis *core.Genesis, jwtPath string, opts ...GethOpti
 			// enough to build blocks within 1 second, but high enough to avoid unnecessary test CPU cycles.
 			Recommit: time.Millisecond * 400,
 		},
+		TxPool: legacypool.Config{
+			NoLocals: true,
+		},
 	}
 	nodeConfig := defaultNodeConfig(fmt.Sprintf("l2-geth-%v", name), jwtPath)
 	return createGethNode(true, nodeConfig, ethConfig, opts...)
diff --git a/op-e2e/system/da/brotli_batcher_test.go b/op-e2e/system/da/brotli_batcher_test.go
index a55e5bced8ad..fe9b4a9fab97 100644
--- a/op-e2e/system/da/brotli_batcher_test.go
+++ b/op-e2e/system/da/brotli_batcher_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 
 	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/helpers"
@@ -67,7 +68,7 @@ func TestBrotliBatcherFjord(t *testing.T) {
 	cfg.DeployConfig.L2GenesisFjordTimeOffset = &genesisActivation
 
 	// set up batcher to use brotli
-	sys, err := cfg.Start(t, e2esys.StartOption{Key: "compressionAlgo", Role: "brotli", Action: nil})
+	sys, err := cfg.Start(t, e2esys.WithBatcherCompressionAlgo(derive.Brotli))
 	require.Nil(t, err, "Error starting up system")
 
 	log := testlog.Logger(t, log.LevelInfo)
diff --git a/op-e2e/system/da/da_throttling_test.go b/op-e2e/system/da/da_throttling_test.go
new file mode 100644
index 000000000000..e98ad9d3338d
--- /dev/null
+++ b/op-e2e/system/da/da_throttling_test.go
@@ -0,0 +1,192 @@
+package da
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"crypto/rand"
+	"math/big"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/eth/ethconfig"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/node"
+
+	"github.com/ethereum-optimism/optimism/op-batcher/batcher"
+	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/geth"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
+	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
+)
+
+const (
+	bigTxSize = 10000 // amount of incompressible calldata to put in a "big" transaction
+)
+
+func TestDATxThrottling(t *testing.T) {
+	op_e2e.InitParallel(t)
+
+	cfg, rollupClient, l2Seq, l2Verif, batcher := setupTest(t, 100, 0)
+
+	sendTx := func(senderKey *ecdsa.PrivateKey, nonce uint64, size int) *types.Receipt {
+		hash := sendTx(t, senderKey, nonce, size, cfg.L2ChainIDBig(), l2Seq)
+		return waitForReceipt(t, hash, l2Seq)
+	}
+
+	// send a big transaction before throttling could have started, this transaction should land
+	receipt := sendTx(cfg.Secrets.Alice, 0, bigTxSize)
+
+	// start batch submission, which should trigger throttling future large transactions
+	err := batcher.StartBatchSubmitting()
+	require.NoError(t, err)
+
+	// wait until the block containing the above tx shows up as safe to confirm batcher is running.
+	waitForBlock(t, receipt.BlockNumber, l2Verif, rollupClient)
+
+	// send another big tx, this one should get "stuck" so we wait for its receipt in a parallel goroutine.
+	done := make(chan bool, 1)
+	var bigReceipt *types.Receipt
+	go func() {
+		bigReceipt = sendTx(cfg.Secrets.Alice, 1, bigTxSize)
+		done <- true
+	}()
+
+	safeBlockInclusionDuration := time.Duration(6*cfg.DeployConfig.L1BlockTime) * time.Second
+	time.Sleep(safeBlockInclusionDuration)
+	require.Nil(t, bigReceipt, "large tx did not get throttled")
+
+	// Send a small tx, it should get included before the earlier one as long as it's from another sender
+	r := sendTx(cfg.Secrets.Bob, 0, 0)
+	// wait until the block the tx was first included in shows up in the safe chain on the verifier
+	waitForBlock(t, r.BlockNumber, l2Verif, rollupClient)
+
+	// second tx should still be throttled
+	require.Nil(t, bigReceipt, "large tx did not get throttled")
+
+	// disable throttling to let big tx through
+	batcher.Config.ThrottleTxSize = 0
+	<-done
+	require.NotNil(t, bigReceipt, "large tx did not get throttled")
+}
+
+func TestDABlockThrottling(t *testing.T) {
+	op_e2e.InitParallel(t)
+	cfg, rollupClient, l2Seq, l2Verif, batcher := setupTest(t, 0, bigTxSize+bigTxSize/10)
+
+	sendTx := func(senderKey *ecdsa.PrivateKey, nonce uint64, size int) common.Hash {
+		return sendTx(t, senderKey, nonce, size, cfg.L2ChainIDBig(), l2Seq)
+	}
+
+	// Send three big transactions before throttling could have started and make sure some eventually appear in the same
+	// block to confirm there is no block-level DA throttling active. This usually happens the first try but might
+	// require a second iteration in some cases due to stochasticity.
+	nonce := uint64(0)
+	for {
+		h1 := sendTx(cfg.Secrets.Alice, nonce, bigTxSize)
+		h2 := sendTx(cfg.Secrets.Bob, nonce, bigTxSize)
+		h3 := sendTx(cfg.Secrets.Mallory, nonce, bigTxSize)
+		nonce++
+
+		r1 := waitForReceipt(t, h1, l2Seq)
+		r2 := waitForReceipt(t, h2, l2Seq)
+		r3 := waitForReceipt(t, h3, l2Seq)
+
+		// wait until the blocks containing the above txs show up in the unsafe chain
+		waitForBlock(t, r1.BlockNumber, l2Seq, rollupClient)
+		waitForBlock(t, r2.BlockNumber, l2Seq, rollupClient)
+		waitForBlock(t, r3.BlockNumber, l2Seq, rollupClient)
+		t.Log("Some block numbers should be the same:", r1.BlockNumber, r2.BlockNumber, r3.BlockNumber)
+
+		if r1.BlockNumber.Cmp(r2.BlockNumber) == 0 || r1.BlockNumber.Cmp(r3.BlockNumber) == 0 || r2.BlockNumber.Cmp(r3.BlockNumber) == 0 {
+			// At least 2 transactions appeared in the same block, so we can exit the loop.
+			// But first we start batch submission, which will enabling DA throttling.
+			err := batcher.StartBatchSubmitting()
+			require.NoError(t, err)
+			// wait for a safe block containing one of the above transactions to ensure the batcher is running
+			waitForBlock(t, r1.BlockNumber, l2Verif, rollupClient)
+			break
+		}
+		t.Log("Another iteration required:", nonce)
+	}
+
+	// Send 3 more big transactions at a time, but this time they must all appear in different blocks due to the
+	// block-level DA limit. Repeat the test 3 times to reduce the probability this happened just due to bad luck.
+	for i := 0; i < 3; i++ {
+		h1 := sendTx(cfg.Secrets.Alice, nonce, bigTxSize)
+		h2 := sendTx(cfg.Secrets.Bob, nonce, bigTxSize)
+		h3 := sendTx(cfg.Secrets.Mallory, nonce, bigTxSize)
+		nonce++
+
+		r1 := waitForReceipt(t, h1, l2Seq)
+		r2 := waitForReceipt(t, h2, l2Seq)
+		r3 := waitForReceipt(t, h3, l2Seq)
+		t.Log("Block numbers should all be different:", r1.BlockNumber, r2.BlockNumber, r3.BlockNumber)
+
+		require.NotEqual(t, 0, r1.BlockNumber.Cmp(r2.BlockNumber))
+		require.NotEqual(t, 0, r1.BlockNumber.Cmp(r3.BlockNumber))
+		require.NotEqual(t, 0, r2.BlockNumber.Cmp(r3.BlockNumber))
+	}
+}
+
+func setupTest(t *testing.T, maxTxSize, maxBlockSize uint64) (e2esys.SystemConfig, *sources.RollupClient, *ethclient.Client, *ethclient.Client, *batcher.TestBatchSubmitter) {
+	cfg := e2esys.DefaultSystemConfig(t)
+	cfg.GethOptions["sequencer"] = append(cfg.GethOptions["sequencer"], []geth.GethOption{
+		func(ethCfg *ethconfig.Config, nodeCfg *node.Config) error {
+			ethCfg.Miner.GasCeil = 30_000_000
+			return nil
+		},
+	}...)
+	// disable batcher because we start it manually later
+	cfg.DisableBatcher = true
+
+	sys, err := cfg.Start(t,
+		e2esys.WithBatcherThrottling(500*time.Millisecond, 1, maxTxSize, maxBlockSize))
+	require.NoError(t, err, "Error starting up system")
+
+	rollupClient := sys.RollupClient("verifier")
+	l2Seq := sys.NodeClient("sequencer")
+	l2Verif := sys.NodeClient("verifier")
+	batcher := sys.BatchSubmitter.ThrottlingTestDriver()
+
+	return cfg, rollupClient, l2Seq, l2Verif, batcher
+}
+
+// sendTx sends a tx containing the 'size' amount of random calldata
+func sendTx(t *testing.T, senderKey *ecdsa.PrivateKey, nonce uint64, size int, chainID *big.Int, cl *ethclient.Client) common.Hash {
+	randomBytes := make([]byte, size)
+	_, err := rand.Read(randomBytes)
+	if err != nil {
+		panic(err)
+	}
+	tx := types.MustSignNewTx(senderKey, types.LatestSignerForChainID(chainID), &types.DynamicFeeTx{
+		ChainID:   chainID,
+		Nonce:     nonce,
+		To:        &common.Address{0xff, 0xff},
+		Value:     big.NewInt(1_000_000_000),
+		GasTipCap: big.NewInt(10),
+		GasFeeCap: big.NewInt(200),
+		Gas:       21_000 + uint64(len(randomBytes))*16,
+		Data:      randomBytes,
+	})
+	err = cl.SendTransaction(context.Background(), tx)
+	require.NoError(t, err, "sending L2 tx")
+	return tx.Hash()
+}
+
+func waitForReceipt(t *testing.T, hash common.Hash, cl *ethclient.Client) *types.Receipt {
+	receipt, err := wait.ForReceiptOK(context.Background(), cl, hash)
+	require.NoError(t, err, "waiting for L2 tx")
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt.Status, "tx not successful")
+	return receipt
+}
+
+func waitForBlock(t *testing.T, blockNumber *big.Int, cl *ethclient.Client, rc *sources.RollupClient) {
+	_, err := geth.WaitForBlock(blockNumber, cl)
+	require.NoError(t, err, "Waiting for block on verifier")
+	require.NoError(t, wait.ForProcessingFullBatch(context.Background(), rc))
+}
diff --git a/op-e2e/system/e2esys/setup.go b/op-e2e/system/e2esys/setup.go
index 5d046b3c649c..9ab6d2de14f6 100644
--- a/op-e2e/system/e2esys/setup.go
+++ b/op-e2e/system/e2esys/setup.go
@@ -471,6 +471,9 @@ type StartOption struct {
 	Key    string
 	Role   string
 	Action SystemConfigHook
+
+	// Batcher CLIConfig modifications to apply before starting the batcher.
+	BatcherMod func(*bss.CLIConfig)
 }
 
 type startOptions struct {
@@ -491,6 +494,25 @@ func parseStartOptions(_opts []StartOption) (startOptions, error) {
 	}, nil
 }
 
+func WithBatcherCompressionAlgo(ca derive.CompressionAlgo) StartOption {
+	return StartOption{
+		BatcherMod: func(cfg *bss.CLIConfig) {
+			cfg.CompressionAlgo = ca
+		},
+	}
+}
+
+func WithBatcherThrottling(interval time.Duration, threshold, txSize, blockSize uint64) StartOption {
+	return StartOption{
+		BatcherMod: func(cfg *bss.CLIConfig) {
+			cfg.ThrottleInterval = interval
+			cfg.ThrottleThreshold = threshold
+			cfg.ThrottleTxSize = txSize
+			cfg.ThrottleBlockSize = blockSize
+		},
+	}
+}
+
 func (s *startOptions) Get(key, role string) (SystemConfigHook, bool) {
 	v, ok := s.opts[key+":"+role]
 	return v, ok
@@ -859,12 +881,6 @@ func (cfg SystemConfig) Start(t *testing.T, startOpts ...StartOption) (*System,
 		batcherTargetNumFrames = 1
 	}
 
-	var compressionAlgo derive.CompressionAlgo = derive.Zlib
-	// if opt has brotli key, set the compression algo as brotli
-	if _, ok := parsedStartOpts.Get("compressionAlgo", "brotli"); ok {
-		compressionAlgo = derive.Brotli10
-	}
-
 	var batcherAltDACLIConfig altda.CLIConfig
 	if cfg.DeployConfig.UseAltDA {
 		fakeAltDAServer := altda.NewFakeDAServer("127.0.0.1", 0, sys.Cfg.Loggers["da-server"])
@@ -902,9 +918,17 @@ func (cfg SystemConfig) Start(t *testing.T, startOpts ...StartOption) (*System,
 		BatchType:             cfg.BatcherBatchType,
 		MaxBlocksPerSpanBatch: cfg.BatcherMaxBlocksPerSpanBatch,
 		DataAvailabilityType:  sys.Cfg.DataAvailabilityType,
-		CompressionAlgo:       compressionAlgo,
+		CompressionAlgo:       derive.Zlib,
 		AltDA:                 batcherAltDACLIConfig,
 	}
+
+	// Apply batcher cli modifications
+	for _, opt := range startOpts {
+		if opt.BatcherMod != nil {
+			opt.BatcherMod(batcherCLIConfig)
+		}
+	}
+
 	// Batch Submitter
 	batcher, err := bss.BatcherServiceFromCLIConfig(context.Background(), "0.0.1", batcherCLIConfig, sys.Cfg.Loggers["batcher"])
 	if err != nil {
diff --git a/op-service/dial/ethclient_interface.go b/op-service/dial/ethclient_interface.go
index 58a2070974ee..292c7b07fa4c 100644
--- a/op-service/dial/ethclient_interface.go
+++ b/op-service/dial/ethclient_interface.go
@@ -5,12 +5,14 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rpc"
 )
 
 // EthClientInterface is an interface for providing an ethclient.Client
 // It does not describe all of the functions an ethclient.Client has, only the ones used by callers of the L2 Providers
 type EthClientInterface interface {
 	BlockByNumber(ctx context.Context, number *big.Int) (*types.Block, error)
+	Client() *rpc.Client
 
 	Close()
 }
diff --git a/op-service/metrics/factory.go b/op-service/metrics/factory.go
index 0bd4da2373db..315b7c52e058 100644
--- a/op-service/metrics/factory.go
+++ b/op-service/metrics/factory.go
@@ -9,6 +9,7 @@ type Factory interface {
 	NewCounter(opts prometheus.CounterOpts) prometheus.Counter
 	NewCounterVec(opts prometheus.CounterOpts, labelNames []string) *prometheus.CounterVec
 	NewGauge(opts prometheus.GaugeOpts) prometheus.Gauge
+	NewGaugeFunc(opts prometheus.GaugeOpts, function func() float64) prometheus.GaugeFunc
 	NewGaugeVec(opts prometheus.GaugeOpts, labelNames []string) *prometheus.GaugeVec
 	NewHistogram(opts prometheus.HistogramOpts) prometheus.Histogram
 	NewHistogramVec(opts prometheus.HistogramOpts, labelNames []string) *prometheus.HistogramVec
@@ -63,6 +64,15 @@ func (d *documentor) NewGauge(opts prometheus.GaugeOpts) prometheus.Gauge {
 	return d.factory.NewGauge(opts)
 }
 
+func (d *documentor) NewGaugeFunc(opts prometheus.GaugeOpts, function func() float64) prometheus.GaugeFunc {
+	d.metrics = append(d.metrics, DocumentedMetric{
+		Type: "gauge",
+		Name: fullName(opts.Namespace, opts.Subsystem, opts.Name),
+		Help: opts.Help,
+	})
+	return d.factory.NewGaugeFunc(opts, function)
+}
+
 func (d *documentor) NewGaugeVec(opts prometheus.GaugeOpts, labelNames []string) *prometheus.GaugeVec {
 	d.metrics = append(d.metrics, DocumentedMetric{
 		Type:   "gauge",
diff --git a/op-service/testutils/mock_eth_client.go b/op-service/testutils/mock_eth_client.go
index fcb0a60c24b0..2d82966724b3 100644
--- a/op-service/testutils/mock_eth_client.go
+++ b/op-service/testutils/mock_eth_client.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
@@ -16,6 +17,11 @@ type MockEthClient struct {
 	mock.Mock
 }
 
+func (m *MockEthClient) Client() *rpc.Client {
+	out := m.Mock.Called()
+	return out.Get(0).(*rpc.Client)
+}
+
 func (m *MockEthClient) InfoByHash(ctx context.Context, hash common.Hash) (eth.BlockInfo, error) {
 	out := m.Mock.Called(hash)
 	return *out.Get(0).(*eth.BlockInfo), out.Error(1)
diff --git a/ops-bedrock/l2-op-geth-entrypoint.sh b/ops-bedrock/l2-op-geth-entrypoint.sh
index f760a87f1875..eee8684e97b0 100644
--- a/ops-bedrock/l2-op-geth-entrypoint.sh
+++ b/ops-bedrock/l2-op-geth-entrypoint.sh
@@ -31,12 +31,12 @@ exec geth \
 	--http.vhosts="*" \
 	--http.addr=0.0.0.0 \
 	--http.port="$RPC_PORT" \
-	--http.api=web3,debug,eth,txpool,net,engine \
+	--http.api=web3,debug,eth,txpool,net,engine,miner \
 	--ws \
 	--ws.addr=0.0.0.0 \
 	--ws.port="$WS_PORT" \
 	--ws.origins="*" \
-	--ws.api=debug,eth,txpool,net,engine \
+	--ws.api=debug,eth,txpool,net,engine,miner \
 	--syncmode=full \
 	--nodiscover \
 	--maxpeers=0 \

From bc9b6cd588588c9c4167c926a1782c658e5df921 Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Wed, 6 Nov 2024 11:28:27 +0100
Subject: [PATCH 138/451] op-batcher: Enable throttling by default, shutdown on
 broken RPC (#12840)

---
 op-batcher/batcher/driver.go      | 37 ++++++++++++++++++++++---------
 op-batcher/batcher/driver_test.go |  2 --
 op-batcher/flags/flags.go         |  6 ++---
 op-service/eth/types.go           |  5 +++++
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 000fb89d16f1..6d8b6eb9da1f 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -10,6 +10,16 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/sync/errgroup"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/txpool"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
+
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	"github.com/ethereum-optimism/optimism/op-batcher/metrics"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -17,13 +27,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/dial"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/txpool"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/log"
-	"golang.org/x/sync/errgroup"
 )
 
 var (
@@ -543,14 +546,26 @@ func (l *BatchSubmitter) throttlingLoop(throttlingLoopDone chan struct{}) {
 				maxBlockSize = l.Config.ThrottleBlockSize
 			}
 		}
-		var success bool
+		var (
+			success bool
+			rpcErr  rpc.Error
+		)
 		if err := cl.Client().CallContext(
-			ctx, &success, SetMaxDASizeMethod, hexutil.Uint64(maxTxSize), hexutil.Uint64(maxBlockSize)); err != nil {
-			l.Log.Error("SetMaxDASize rpc failed", "err", err)
+			ctx, &success, SetMaxDASizeMethod, hexutil.Uint64(maxTxSize), hexutil.Uint64(maxBlockSize),
+		); errors.As(err, &rpcErr) && eth.ErrorCode(rpcErr.ErrorCode()).IsGenericRPCError() {
+			l.Log.Error("SetMaxDASize rpc unavailable or broken, shutting down. Either enable it or disable throttling.", "err", err)
+			// We'd probably hit this error right after startup, so a short shutdown duration should suffice.
+			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+			defer cancel()
+			// Always returns nil. An error is only returned to expose this function as an RPC.
+			_ = l.StopBatchSubmitting(ctx)
+			return
+		} else if err != nil {
+			l.Log.Error("SetMaxDASize rpc failed, retrying.", "err", err)
 			return
 		}
 		if !success {
-			l.Log.Error("Result of SetMaxDASize was false")
+			l.Log.Error("Result of SetMaxDASize was false, retrying.")
 		}
 	}
 
diff --git a/op-batcher/batcher/driver_test.go b/op-batcher/batcher/driver_test.go
index 5ce0983bfe1a..f4e39e22cee2 100644
--- a/op-batcher/batcher/driver_test.go
+++ b/op-batcher/batcher/driver_test.go
@@ -86,7 +86,6 @@ func TestBatchSubmitter_SafeL1Origin(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.failsToFetchSyncStatus {
 				ep.rollupClient.ExpectSyncStatus(&eth.SyncStatus{}, errors.New("failed to fetch sync status"))
-
 			} else {
 				ep.rollupClient.ExpectSyncStatus(&eth.SyncStatus{
 					SafeL2: eth.L2BlockRef{
@@ -107,7 +106,6 @@ func TestBatchSubmitter_SafeL1Origin(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func TestBatchSubmitter_SafeL1Origin_FailsToResolveRollupClient(t *testing.T) {
diff --git a/op-batcher/flags/flags.go b/op-batcher/flags/flags.go
index 538b70b6c9fa..d5681ea87234 100644
--- a/op-batcher/flags/flags.go
+++ b/op-batcher/flags/flags.go
@@ -157,9 +157,9 @@ var (
 		EnvVars: prefixEnvVars("WAIT_NODE_SYNC"),
 	}
 	ThrottleIntervalFlag = &cli.DurationFlag{
-		Name: "throttle-interval",
-		Usage: "Interval between potential DA throttling actions. Zero (default) disables throttling. " +
-			"Recommended to be set to L2 block time if enabling.",
+		Name:    "throttle-interval",
+		Usage:   "Interval between potential DA throttling actions. Zero disables throttling.",
+		Value:   2 * time.Second,
 		EnvVars: prefixEnvVars("THROTTLE_INTERVAL"),
 	}
 	ThrottleThresholdFlag = &cli.IntFlag{
diff --git a/op-service/eth/types.go b/op-service/eth/types.go
index 7b4d1c053348..122e9a4df783 100644
--- a/op-service/eth/types.go
+++ b/op-service/eth/types.go
@@ -25,9 +25,14 @@ func (c ErrorCode) IsEngineError() bool {
 	return -38100 < c && c <= -38000
 }
 
+func (c ErrorCode) IsGenericRPCError() bool {
+	return -32700 < c && c <= -32600
+}
+
 // Engine error codes used to be -3200x, but were rebased to -3800x:
 // https://github.com/ethereum/execution-apis/pull/214
 const (
+	MethodNotFound           ErrorCode = -32601 // RPC method not found or not available.
 	InvalidParams            ErrorCode = -32602
 	UnknownPayload           ErrorCode = -38001 // Payload does not exist / is not available.
 	InvalidForkchoiceState   ErrorCode = -38002 // Forkchoice state is invalid / inconsistent.

From ac5587eb15703d9cff9b365159fc2c8d5c6bb4ec Mon Sep 17 00:00:00 2001
From: Francis Li <francis.li@coinbase.com>
Date: Wed, 6 Nov 2024 11:43:36 -0800
Subject: [PATCH 139/451] docs: add conductor runbook (#12604)

---
 op-conductor/README.md  |  2 ++
 op-conductor/RUNBOOK.md | 78 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 op-conductor/RUNBOOK.md

diff --git a/op-conductor/README.md b/op-conductor/README.md
index 084899e2fe4b..497156b8eee8 100644
--- a/op-conductor/README.md
+++ b/op-conductor/README.md
@@ -13,6 +13,8 @@ The design will provide below guarantees:
 2. No unsafe head stall during network partition
 3. 100% uptime with no more than 1 node failure (for a standard 3 node setup)
 
+For configuration and runbook, please refer to [RUNBOOK.md](./RUNBOOK.md)
+
 ## Design
 
 ### Architecture
diff --git a/op-conductor/RUNBOOK.md b/op-conductor/RUNBOOK.md
new file mode 100644
index 000000000000..8e80fde6b6c0
--- /dev/null
+++ b/op-conductor/RUNBOOK.md
@@ -0,0 +1,78 @@
+## op-conductor runbook
+
+### conductor configurations
+
+In order to setup op-conductor, you need to configure the following env vars for both op-conductor and op-node service:
+
+#### op-node
+
+```env
+OP_NODE_CONDUCTOR_ENABLED=true
+OP_NODE_CONDUCTOR_RPC=<conductor-rpc-endpoint> # for example http://conductor:8545
+```
+
+#### op-conductor
+
+```env
+# prefix for the server id, used to identify the server in the raft cluster
+RAFT_SERVER_ID_PREFIX=<prefix-for-server-id> # for example, sequencer-1, sequencer-2, etc
+OP_CONDUCTOR_RAFT_STORAGE_DIR=<raft-storage-dir>
+OP_CONDUCTOR_RPC_ADDR=<rpc-address> # for example, 0.0.0.0
+OP_CONDUCTOR_RPC_PORT=<rpc-port> # for example, 8545
+OP_CONDUCTOR_METRICS_ENABLED=true/false
+OP_CONDUCTOR_METRICS_ADDR=<metrics-address> # for example 0.0.0.0
+OP_CONDUCTOR_METRICS_PORT=<metrics-port> # for example 7300
+OP_CONDUCTOR_CONSENSUS_PORT=<consensus-port> # for example 50050
+OP_CONDUCTOR_PAUSED=true # set to true to start conductor in paused state
+OP_CONDUCTOR_NODE_RPC=<node-rpc-endpoint> # for example, http://op-node:8545
+OP_CONDUCTOR_EXECUTION_RPC=<execution-rpc-endpoint> # for example, http://op-geth:8545
+OP_CONDUCTOR_NETWORK=<network-name> # for example, base-mainnet, op-mainnet, etc, should be same as OP_NODE_NETWORK
+OP_CONDUCTOR_HEALTHCHECK_INTERVAL=<healthcheck-interval> # in seconds
+OP_CONDUCTOR_HEALTHCHECK_UNSAFE_INTERVAL=<unsafe-interval> # Interval allowed between unsafe head and now measured in seconds in seconds
+OP_CONDUCTOR_HEALTHCHECK_MIN_PEER_COUNT=<min-peer-count> # minimum number of peers required to be considered healthy
+OP_CONDUCTOR_RAFT_BOOTSTRAP=true/false # set to true if you want to bootstrap the raft cluster
+```
+
+### How to bootstrap a sequencer cluster from scratch
+
+In normal situations, you probably have a running sequencer already and you want to turn it into a HA cluster. What you need to do in this situation is to:
+
+1. start a completely new sequencer with above mentioned configurations and
+   1. `OP_CONDUCTOR_RAFT_BOOTSTRAP=true` set on op-conductor
+   2. `OP_CONDUCTOR_PAUSED=true` set on op-conductor
+   3. `OP_NODE_SEQUENCER_ENABLED=true` set on op-node
+2. wait for the new sequencer to start and get synced up with the rest of the nodes
+3. once the new sequencer is synced up, manually or use automation to stop sequencing on the old sequencer and start sequencing on the new sequencer
+4. resume the conductor on the new sequencer by calling `conductor_resume` json rpc method on op-conductor
+5. set `OP_CONDUCTOR_RAFT_BOOTSTRAP=false` on the sequencer so that it doesn't attempt to bootstrap the cluster during redeploy
+
+Now you have a single HA sequencer which treats itself as the cluster leader! Next steps would be to add more sequencers to the cluster depending on your needs. For example, we want a 3-node cluster, you can follow the same process to add 2 more sequencers.
+
+1. start a new sequencer with
+   1. `OP_CONDUCTOR_RAFT_BOOTSTRAP=false` set on op-conductor
+   2. `OP_CONDUCTOR_PAUSED=true` set on op-conductor
+2. wait for the new sequencer to start and get synced up with the rest of the nodes
+3. once the new sequencer is synced up, manually or use automation to add it to the cluster by calling `conductor_addServerAsVoter` json rpc method on the leader sequencer
+4. call `conductor_clusterMembership` json rpc method on the leader sequencer to get the updated cluster membership
+5. resume the conductor on the new sequencer by calling `conductor_resume` json rpc method on op-conductor
+
+Once finished, you should have a 3-node HA sequencer cluster!
+
+### Redeploy a HA sequencer
+
+For every redeploy, depending on your underlying infrastructure, you need to make sure to:
+
+1. `OP_CONDUCTOR_PAUSED=true` set on op-conductor so that conductor doesn't attempt to control sequencer while it's still syncing / redeploying
+2. make sure sequencer is caught up with the rest of the nodes (this step isn't strictly necessary as conductor could handle this, but from a HA perspective, it does not make sense to have a sequencer that is lagging behind to join the cluster to potentially become the leader)
+3. resume conductor after it's caught up with the rest of the nodes so that conductor can start managing the sequencer
+
+### Disaster recovery
+
+Whenever there are a disaster situation that you see no route to have 2 healthy conductor in the cluster communicating with each other, you need to manually intervene to resume sequencing. The steps are as follows:
+
+1. call `conductor_pause` json rpc method on the all conductors so that they don't attempt to start / stop sequencer
+2. choose a sequencer that can be used to resume sequencing
+3. call `conductor_overrideLeader` json rpc method on the conductor to force it to treat itself as the leader
+4. If no conductor is functioning, call `admin_overrideLeader` json rpc method on the op-node to force it to treat itself as the leader
+5. manually start sequencing on the chosen sequencer
+6. Go back to bootstrap step to re-bootstrap the cluster.

From dd10e2e299cf9405b856ca4101629344c9d011f8 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 6 Nov 2024 11:51:35 -0800
Subject: [PATCH 140/451] vm-runner: Check L1 head sync status (#12853)

---
 op-challenger/runner/runner.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op-challenger/runner/runner.go b/op-challenger/runner/runner.go
index 289bb0cfe105..312981430413 100644
--- a/op-challenger/runner/runner.go
+++ b/op-challenger/runner/runner.go
@@ -199,6 +199,9 @@ func (r *Runner) createGameInputs(ctx context.Context, client *sources.RollupCli
 		// This only matters if op-node is behind and hasn't processed all finalized L1 blocks yet.
 		l1Head = status.CurrentL1
 	}
+	if l1Head.Number == 0 {
+		return utils.LocalGameInputs{}, errors.New("l1 head is 0")
+	}
 	blockNumber, err := r.findL2BlockNumberToDispute(ctx, client, l1Head.Number, status.FinalizedL2.Number)
 	if err != nil {
 		return utils.LocalGameInputs{}, fmt.Errorf("failed to find l2 block number to dispute: %w", err)

From 11843b48eed9beefe2111c5bde817a971ca8bc89 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Thu, 7 Nov 2024 07:39:24 +1000
Subject: [PATCH 141/451] op-deployer: Add deploy mips script (#12835)

* op-deployer: Add deploy mips script

* op-deployer: Explicitly set the PreimageOracle to use with deployed MIPS

* op-deployer: Validate mips version in go code.
---
 .../pkg/deployer/bootstrap/dispute_game.go    |   2 +-
 op-deployer/pkg/deployer/bootstrap/flags.go   |  21 ++
 op-deployer/pkg/deployer/bootstrap/mips.go    | 196 ++++++++++++++++++
 op-deployer/pkg/deployer/opcm/dispute_game.go |   2 +-
 op-deployer/pkg/deployer/opcm/mips.go         |  65 ++++++
 op-deployer/pkg/deployer/opcm/mips_test.go    |  36 ++++
 .../scripts/deploy/DeployMIPS.s.sol           | 109 ++++++++++
 7 files changed, 429 insertions(+), 2 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/mips.go
 create mode 100644 op-deployer/pkg/deployer/opcm/mips.go
 create mode 100644 op-deployer/pkg/deployer/opcm/mips_test.go
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol

diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
index 65ca4a731124..2b17a35be7bb 100644
--- a/op-deployer/pkg/deployer/bootstrap/dispute_game.go
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -38,7 +38,7 @@ type DisputeGameConfig struct {
 
 	MinProposalSizeBytes     uint64
 	ChallengePeriodSeconds   uint64
-	MipsVersion              uint8
+	MipsVersion              uint64
 	GameKind                 string
 	GameType                 uint32
 	AbsolutePrestate         common.Hash
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index a7b80daf6e7f..73f99e7b4325 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -28,6 +28,7 @@ const (
 	L2ChainIdFlagName                       = "l2-chain-id"
 	ProposerFlagName                        = "proposer"
 	ChallengerFlagName                      = "challenger"
+	PreimageOracleFlagName                  = "preimage-oracle"
 )
 
 var (
@@ -140,6 +141,12 @@ var (
 		EnvVars: deployer.PrefixEnvVar("CHALLENGER"),
 		Value:   common.Address{}.Hex(),
 	}
+	PreimageOracleFlag = &cli.StringFlag{
+		Name:    PreimageOracleFlagName,
+		Usage:   "Preimage oracle address.",
+		EnvVars: deployer.PrefixEnvVar("PREIMAGE_ORACLE"),
+		Value:   common.Address{}.Hex(),
+	}
 )
 
 var OPCMFlags = []cli.Flag{
@@ -181,6 +188,14 @@ var DisputeGameFlags = []cli.Flag{
 	ChallengerFlag,
 }
 
+var MIPSFlags = []cli.Flag{
+	deployer.L1RPCURLFlag,
+	deployer.PrivateKeyFlag,
+	ArtifactsLocatorFlag,
+	PreimageOracleFlag,
+	MIPSVersionFlag,
+}
+
 var Commands = []*cli.Command{
 	{
 		Name:   "opcm",
@@ -200,4 +215,10 @@ var Commands = []*cli.Command{
 		Flags:  cliapp.ProtectFlags(DisputeGameFlags),
 		Action: DisputeGameCLI,
 	},
+	{
+		Name:   "mips",
+		Usage:  "Bootstrap an instance of MIPS.",
+		Flags:  cliapp.ProtectFlags(MIPSFlags),
+		Action: MIPSCLI,
+	},
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/mips.go b/op-deployer/pkg/deployer/bootstrap/mips.go
new file mode 100644
index 000000000000..42abae208eb5
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/mips.go
@@ -0,0 +1,196 @@
+package bootstrap
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"fmt"
+	"strings"
+
+	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
+	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/urfave/cli/v2"
+)
+
+type MIPSConfig struct {
+	L1RPCUrl         string
+	PrivateKey       string
+	Logger           log.Logger
+	ArtifactsLocator *artifacts2.Locator
+
+	privateKeyECDSA *ecdsa.PrivateKey
+
+	PreimageOracle common.Address
+	MipsVersion    uint64
+}
+
+func (c *MIPSConfig) Check() error {
+	if c.L1RPCUrl == "" {
+		return fmt.Errorf("l1RPCUrl must be specified")
+	}
+
+	if c.PrivateKey == "" {
+		return fmt.Errorf("private key must be specified")
+	}
+
+	privECDSA, err := crypto.HexToECDSA(strings.TrimPrefix(c.PrivateKey, "0x"))
+	if err != nil {
+		return fmt.Errorf("failed to parse private key: %w", err)
+	}
+	c.privateKeyECDSA = privECDSA
+
+	if c.Logger == nil {
+		return fmt.Errorf("logger must be specified")
+	}
+
+	if c.ArtifactsLocator == nil {
+		return fmt.Errorf("artifacts locator must be specified")
+	}
+
+	if c.PreimageOracle == (common.Address{}) {
+		return fmt.Errorf("preimage oracle must be specified")
+	}
+
+	if c.MipsVersion == 0 {
+		return fmt.Errorf("mips version must be specified")
+	}
+	if c.MipsVersion != 1 && c.MipsVersion != 2 {
+		return fmt.Errorf("mips version must be either 1 or 2")
+	}
+
+	return nil
+}
+
+func MIPSCLI(cliCtx *cli.Context) error {
+	logCfg := oplog.ReadCLIConfig(cliCtx)
+	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
+	oplog.SetGlobalLogHandler(l.Handler())
+
+	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
+	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
+	artifactsLocator := new(artifacts2.Locator)
+	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
+		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+	}
+
+	mipsVersion := cliCtx.Uint64(MIPSVersionFlagName)
+	preimageOracle := common.HexToAddress(cliCtx.String(PreimageOracleFlagName))
+
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+
+	return MIPS(ctx, MIPSConfig{
+		L1RPCUrl:         l1RPCUrl,
+		PrivateKey:       privateKey,
+		Logger:           l,
+		ArtifactsLocator: artifactsLocator,
+		MipsVersion:      mipsVersion,
+		PreimageOracle:   preimageOracle,
+	})
+}
+
+func MIPS(ctx context.Context, cfg MIPSConfig) error {
+	if err := cfg.Check(); err != nil {
+		return fmt.Errorf("invalid config for MIPS: %w", err)
+	}
+
+	lgr := cfg.Logger
+	progressor := func(curr, total int64) {
+		lgr.Info("artifacts download progress", "current", curr, "total", total)
+	}
+
+	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
+	if err != nil {
+		return fmt.Errorf("failed to download artifacts: %w", err)
+	}
+	defer func() {
+		if err := cleanup(); err != nil {
+			lgr.Warn("failed to clean up artifacts", "err", err)
+		}
+	}()
+
+	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	chainID, err := l1Client.ChainID(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get chain ID: %w", err)
+	}
+
+	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
+	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
+
+	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+		Logger:  lgr,
+		ChainID: chainID,
+		Client:  l1Client,
+		Signer:  signer,
+		From:    chainDeployer,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create broadcaster: %w", err)
+	}
+
+	nonce, err := l1Client.NonceAt(ctx, chainDeployer, nil)
+	if err != nil {
+		return fmt.Errorf("failed to get starting nonce: %w", err)
+	}
+
+	host, err := env.DefaultScriptHost(
+		bcaster,
+		lgr,
+		chainDeployer,
+		artifactsFS,
+		nonce,
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create script host: %w", err)
+	}
+
+	var release string
+	if cfg.ArtifactsLocator.IsTag() {
+		release = cfg.ArtifactsLocator.Tag
+	} else {
+		release = "dev"
+	}
+
+	lgr.Info("deploying dispute game", "release", release)
+
+	dgo, err := opcm.DeployMIPS(
+		host,
+		opcm.DeployMIPSInput{
+			MipsVersion:    cfg.MipsVersion,
+			PreimageOracle: cfg.PreimageOracle,
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("error deploying dispute game: %w", err)
+	}
+
+	if _, err := bcaster.Broadcast(ctx); err != nil {
+		return fmt.Errorf("failed to broadcast: %w", err)
+	}
+
+	lgr.Info("deployed dispute game")
+
+	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game.go b/op-deployer/pkg/deployer/opcm/dispute_game.go
index 001987afaeed..0e117c040d83 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game.go
@@ -11,7 +11,7 @@ import (
 type DeployDisputeGameInput struct {
 	Release                  string
 	StandardVersionsToml     string
-	MipsVersion              uint8
+	MipsVersion              uint64
 	MinProposalSizeBytes     uint64
 	ChallengePeriodSeconds   uint64
 	GameKind                 string
diff --git a/op-deployer/pkg/deployer/opcm/mips.go b/op-deployer/pkg/deployer/opcm/mips.go
new file mode 100644
index 000000000000..5d1a7798cedb
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/mips.go
@@ -0,0 +1,65 @@
+package opcm
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+)
+
+type DeployMIPSInput struct {
+	MipsVersion    uint64
+	PreimageOracle common.Address
+}
+
+func (input *DeployMIPSInput) InputSet() bool {
+	return true
+}
+
+type DeployMIPSOutput struct {
+	MipsSingleton common.Address
+}
+
+func (output *DeployMIPSOutput) CheckOutput(input common.Address) error {
+	return nil
+}
+
+type DeployMIPSScript struct {
+	Run func(input, output common.Address) error
+}
+
+func DeployMIPS(
+	host *script.Host,
+	input DeployMIPSInput,
+) (DeployMIPSOutput, error) {
+	var output DeployMIPSOutput
+	inputAddr := host.NewScriptAddress()
+	outputAddr := host.NewScriptAddress()
+
+	cleanupInput, err := script.WithPrecompileAtAddress[*DeployMIPSInput](host, inputAddr, &input)
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployMIPSInput precompile: %w", err)
+	}
+	defer cleanupInput()
+
+	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployMIPSOutput](host, outputAddr, &output,
+		script.WithFieldSetter[*DeployMIPSOutput])
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployMIPSOutput precompile: %w", err)
+	}
+	defer cleanupOutput()
+
+	implContract := "DeployMIPS"
+	deployScript, cleanupDeploy, err := script.WithScript[DeployMIPSScript](host, "DeployMIPS.s.sol", implContract)
+	if err != nil {
+		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
+	}
+	defer cleanupDeploy()
+
+	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
+	}
+
+	return output, nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/mips_test.go b/op-deployer/pkg/deployer/opcm/mips_test.go
new file mode 100644
index 000000000000..04f8d93ae9bd
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/mips_test.go
@@ -0,0 +1,36 @@
+package opcm
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployMIPS(t *testing.T) {
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+		0,
+	)
+	require.NoError(t, err)
+
+	input := DeployMIPSInput{
+		MipsVersion:    1,
+		PreimageOracle: common.Address{0xab},
+	}
+
+	output, err := DeployMIPS(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.MipsSingleton)
+}
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
new file mode 100644
index 000000000000..5890630c9c22
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+// Forge
+import { Script } from "forge-std/Script.sol";
+
+// Scripts
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+// Interfaces
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
+
+/// @title DeployMIPSInput
+contract DeployMIPSInput is BaseDeployIO {
+    // Specify the PreimageOracle to use
+    address internal _preimageOracle;
+
+    // Specify which MIPS version to use.
+    uint256 internal _mipsVersion;
+
+    function set(bytes4 _sel, uint256 _value) public {
+        if (_sel == this.mipsVersion.selector) {
+            require(_value == 1 || _value == 2, "DeployMIPS: unknown mips version");
+            _mipsVersion = _value;
+        } else {
+            revert("DeployMIPS: unknown selector");
+        }
+    }
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.preimageOracle.selector) {
+            require(_value != address(0), "DeployMIPS: preimageOracle cannot be empty");
+            _preimageOracle = _value;
+        } else {
+            revert("DeployMIPS: unknown selector");
+        }
+    }
+
+    function mipsVersion() public view returns (uint256) {
+        require(_mipsVersion != 0, "DeployMIPS: mipsVersion not set");
+        require(_mipsVersion == 1 || _mipsVersion == 2, "DeployMIPS: unknown mips version");
+        return _mipsVersion;
+    }
+
+    function preimageOracle() public view returns (address) {
+        require(_preimageOracle != address(0), "DeployMIPS: preimageOracle not set");
+        return _preimageOracle;
+    }
+}
+
+/// @title DeployMIPSOutput
+contract DeployMIPSOutput is BaseDeployIO {
+    IMIPS internal _mipsSingleton;
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.mipsSingleton.selector) {
+            require(_value != address(0), "DeployMIPS: mipsSingleton cannot be zero address");
+            _mipsSingleton = IMIPS(_value);
+        } else {
+            revert("DeployMIPS: unknown selector");
+        }
+    }
+
+    function checkOutput(DeployMIPSInput _mi) public view {
+        DeployUtils.assertValidContractAddress(address(_mipsSingleton));
+        assertValidDeploy(_mi);
+    }
+
+    function mipsSingleton() public view returns (IMIPS) {
+        DeployUtils.assertValidContractAddress(address(_mipsSingleton));
+        return _mipsSingleton;
+    }
+
+    function assertValidDeploy(DeployMIPSInput _mi) public view {
+        assertValidMipsSingleton(_mi);
+    }
+
+    function assertValidMipsSingleton(DeployMIPSInput _mi) internal view {
+        IMIPS mips = mipsSingleton();
+
+        require(address(mips.oracle()) == address(_mi.preimageOracle()), "MIPS-10");
+    }
+}
+
+/// @title DeployMIPS
+contract DeployMIPS is Script {
+    function run(DeployMIPSInput _mi, DeployMIPSOutput _mo) public {
+        deployMipsSingleton(_mi, _mo);
+        _mo.checkOutput(_mi);
+    }
+
+    function deployMipsSingleton(DeployMIPSInput _mi, DeployMIPSOutput _mo) internal {
+        IMIPS singleton;
+        uint256 mipsVersion = _mi.mipsVersion();
+        IPreimageOracle preimageOracle = IPreimageOracle(_mi.preimageOracle());
+        vm.broadcast(msg.sender);
+        singleton = IMIPS(
+            DeployUtils.create1({
+                _name: mipsVersion == 1 ? "MIPS" : "MIPS2",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS.__constructor__, (preimageOracle)))
+            })
+        );
+
+        vm.label(address(singleton), "MIPSSingleton");
+        _mo.set(_mo.mipsSingleton.selector, address(singleton));
+    }
+}

From b5a2955a1bbca510402d5e40ecf88d0cd06ebfbd Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Wed, 6 Nov 2024 22:42:04 +0100
Subject: [PATCH 142/451] goreleaser: cleanup (#12856)

* chore(op-deployer): use goreleaser-pro schema

This avoids getting schema validation errors wherever pro features are used.

* chore: bump goreleaser-pro to 2.4.3

No functional change, just good hygiene.
---
 .circleci/config.yml         | 2 +-
 op-deployer/.goreleaser.yaml | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 01eba4e466d6..061825f164a1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1257,7 +1257,7 @@ jobs:
           command: |
             mkdir -p /tmp/goreleaser
             cd /tmp/goreleaser
-            curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.3.2-pro/goreleaser-pro_Linux_x86_64.tar.gz
+            curl -L -o goreleaser.tgz https://github.com/goreleaser/goreleaser-pro/releases/download/v2.4.3-pro/goreleaser-pro_Linux_x86_64.tar.gz
             tar -xzvf goreleaser.tgz
             mv goreleaser /usr/local/bin/goreleaser
       - run:
diff --git a/op-deployer/.goreleaser.yaml b/op-deployer/.goreleaser.yaml
index 0104574ec865..5040ed4bc4d4 100644
--- a/op-deployer/.goreleaser.yaml
+++ b/op-deployer/.goreleaser.yaml
@@ -1,9 +1,4 @@
-# This is an example .goreleaser.yml file with some sensible defaults.
-# Make sure to check the documentation at https://goreleaser.com
-
-# The lines below are called `modelines`. See `:help modeline`
-# Feel free to remove those if you don't want/need to use them.
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# yaml-language-server: $schema=https://goreleaser.com/static/schema-pro.json
 # vim: set ts=2 sw=2 tw=0 fo=cnqoj
 
 version: 2

From 15912abe12928473838284ebd2dcf45de0f23cb9 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Wed, 6 Nov 2024 22:42:44 +0100
Subject: [PATCH 143/451] ci(lint): fix the lint-shellcheck target (#12857)

Excessive backslashing made the command invalid.
Also address the lint-shellcheck current discoveries.
---
 justfile                                                    | 2 +-
 .../contracts-bedrock/test/kontrol/scripts/run-kontrol.sh   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/justfile b/justfile
index 57d7fa5da218..788f96fc7cc0 100644
--- a/justfile
+++ b/justfile
@@ -10,7 +10,7 @@ semgrep-test:
   semgrep scan --test semgrep/
 
 lint-shellcheck:
-  find . -type f -name '*.sh' -not -path '*/node_modules/*' -not -path './packages/contracts-bedrock/lib/*' -not -path './packages/contracts-bedrock/kout*/*' -exec sh -c 'echo \"Checking $1\"; shellcheck \"$1\"' _ {} \\;
+  find . -type f -name '*.sh' -not -path '*/node_modules/*' -not -path './packages/contracts-bedrock/lib/*' -not -path './packages/contracts-bedrock/kout*/*' -exec sh -c 'echo "Checking $1"; shellcheck "$1"' _ {} \;
 
 install-foundry:
   curl -L https://foundry.paradigm.xyz | bash && just update-foundry
diff --git a/packages/contracts-bedrock/test/kontrol/scripts/run-kontrol.sh b/packages/contracts-bedrock/test/kontrol/scripts/run-kontrol.sh
index 935f6e3b4903..a1487eecd867 100755
--- a/packages/contracts-bedrock/test/kontrol/scripts/run-kontrol.sh
+++ b/packages/contracts-bedrock/test/kontrol/scripts/run-kontrol.sh
@@ -207,13 +207,13 @@ get_log_results
 
 # Now you can use ${results[0]} and ${results[1]}
 # to check the results of kontrol_build and kontrol_prove, respectively
-if [ ${results[0]} -ne 0 ] && [ ${results[1]} -ne 0 ]; then
+if [ "${results[0]}" -ne 0 ] && [ "${results[1]}" -ne 0 ]; then
   echo "Kontrol Build and Prove Failed"
   exit 1
-elif [ ${results[0]} -ne 0 ]; then
+elif [ "${results[0]}" -ne 0 ]; then
   echo "Kontrol Build Failed"
   exit 1
-elif [ ${results[1]} -ne 0 ]; then
+elif [ "${results[1]}" -ne 0 ]; then
   echo "Kontrol Prove Failed"
   exit 2
 else

From b6bd58eeea5e4b90d58defea19114d3b36071d1d Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 7 Nov 2024 04:43:39 +0700
Subject: [PATCH 144/451] maint: move semgrep folder again (#12828)

Moves the semgrep folder back into .semgrep now that we worked out
how to actually execute the tests when they're located inside of
a hidden folder.
---
 .circleci/config.yml                        | 4 ++--
 {semgrep => .semgrep/rules}/sol-rules.yaml  | 0
 {semgrep => .semgrep/tests}/sol-rules.t.sol | 0
 .semgrepignore                              | 2 +-
 justfile                                    | 4 ++--
 packages/contracts-bedrock/justfile         | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename {semgrep => .semgrep/rules}/sol-rules.yaml (100%)
 rename {semgrep => .semgrep/tests}/sol-rules.t.sol (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 061825f164a1..680577e5acad 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1314,10 +1314,10 @@ workflows:
             - contracts-bedrock-build
       - semgrep-scan:
           name: semgrep-scan-local
-          scan_command: semgrep scan --timeout=100 --config=./semgrep --error .
+          scan_command: semgrep scan --timeout=100 --config .semgrep/rules/ --error .
       - semgrep-scan:
           name: semgrep-test
-          scan_command: semgrep scan --test semgrep/
+          scan_command: semgrep scan --test --config .semgrep/rules/ .semgrep/tests/
       - go-lint
       - fuzz-golang:
           name: fuzz-golang-<<matrix.package_name>>
diff --git a/semgrep/sol-rules.yaml b/.semgrep/rules/sol-rules.yaml
similarity index 100%
rename from semgrep/sol-rules.yaml
rename to .semgrep/rules/sol-rules.yaml
diff --git a/semgrep/sol-rules.t.sol b/.semgrep/tests/sol-rules.t.sol
similarity index 100%
rename from semgrep/sol-rules.t.sol
rename to .semgrep/tests/sol-rules.t.sol
diff --git a/.semgrepignore b/.semgrepignore
index 0e7e4044b758..b5fcb0303882 100644
--- a/.semgrepignore
+++ b/.semgrepignore
@@ -9,7 +9,7 @@ vendor/
 *.min.js
 
 # Semgrep rules folder
-semgrep/
+.semgrep/
 
 # Semgrep-action log folder
 .semgrep_logs/
diff --git a/justfile b/justfile
index 788f96fc7cc0..00a272e899ae 100644
--- a/justfile
+++ b/justfile
@@ -3,11 +3,11 @@ issues:
 
 # Runs semgrep on the entire monorepo.
 semgrep:
-  semgrep scan --config=semgrep --error .
+  semgrep scan --config .semgrep/rules/ --error .
 
 # Runs semgrep tests.
 semgrep-test:
-  semgrep scan --test semgrep/
+  semgrep scan --test --config .semgrep/rules/ .semgrep/tests/
 
 lint-shellcheck:
   find . -type f -name '*.sh' -not -path '*/node_modules/*' -not -path './packages/contracts-bedrock/lib/*' -not -path './packages/contracts-bedrock/kout*/*' -exec sh -c 'echo "Checking $1"; shellcheck "$1"' _ {} \;
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index e73673634745..41cfd24bb2d6 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -163,7 +163,7 @@ semver-diff-check: build semver-diff-check-no-build
 
 # Checks that the semgrep tests are valid.
 semgrep-test-validity-check:
-  forge fmt ../../semgrep/sol-rules.t.sol --check
+  forge fmt ../../.semgrep/tests/sol-rules.t.sol --check
 
 # Checks that forge test names are correctly formatted.
 lint-forge-tests-check:
@@ -199,11 +199,11 @@ check-kontrol-summaries-unchanged:
 
 # Runs semgrep on the contracts.
 semgrep:
-  cd ../../ && semgrep scan --config=semgrep ./packages/contracts-bedrock
+  cd ../../ && semgrep scan --config .semgrep/rules/ ./packages/contracts-bedrock
 
 # Runs semgrep tests.
 semgrep-test:
-  cd ../../ && semgrep scan --test semgrep
+  cd ../../ && semgrep scan --test --config .semgrep/rules/ .semgrep/tests/
 
 # TODO: Also run lint-forge-tests-check but we need to fix the test names first.
 # Runs all checks.

From b1efd7c52f3f79ed1940ada7c7ade3bdbc6cdc63 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 6 Nov 2024 16:39:01 -0700
Subject: [PATCH 145/451] ci: Move develop-fault-proofs e2e job onto dedicated
 runner (#12860)

This job is CPU-heavy, and causes other workflows to fail due to resource exhaustion. This PR moves this job onto a dedicated Latitude runner and resource class. The resource class is configured so that it can only run one job at a time, which is fine since this job only runs on commits to develop.
---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 680577e5acad..030c15ae6367 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1593,6 +1593,7 @@ workflows:
           target: test-cannon
           notify: true
           mentions: "@proofs-team"
+          resource_class: ethereum-optimism/latitude-fps-1
           requires:
             - contracts-bedrock-build
             - cannon-prestate

From 3952e601016acf5f3a98b81b27873428d02a207f Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 7 Nov 2024 10:42:19 -0700
Subject: [PATCH 146/451] op-e2e: Fix hanging network notify test (#12868)

---
 op-node/p2p/sync_test.go | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/op-node/p2p/sync_test.go b/op-node/p2p/sync_test.go
index 7c0b3350df04..2527f48fbc65 100644
--- a/op-node/p2p/sync_test.go
+++ b/op-node/p2p/sync_test.go
@@ -360,18 +360,24 @@ func TestNetworkNotifyAddPeerAndRemovePeer(t *testing.T) {
 		return nil
 	}, metrics.NoopMetrics, &NoopApplicationScorer{})
 
-	waitChan := make(chan struct{}, 1)
+	waitChan := make(chan struct{}, 2)
+	var connectedOnce sync.Once
+	var disconnectedOnce sync.Once
 	hostA.Network().Notify(&network.NotifyBundle{
 		ConnectedF: func(nw network.Network, conn network.Conn) {
-			syncCl.AddPeer(conn.RemotePeer())
-			waitChan <- struct{}{}
+			connectedOnce.Do(func() {
+				syncCl.AddPeer(conn.RemotePeer())
+				waitChan <- struct{}{}
+			})
 		},
 		DisconnectedF: func(nw network.Network, conn network.Conn) {
-			// only when no connection is available, we can remove the peer
-			if nw.Connectedness(conn.RemotePeer()) == network.NotConnected {
-				syncCl.RemovePeer(conn.RemotePeer())
-			}
-			waitChan <- struct{}{}
+			disconnectedOnce.Do(func() {
+				// only when no connection is available, we can remove the peer
+				if nw.Connectedness(conn.RemotePeer()) == network.NotConnected {
+					syncCl.RemovePeer(conn.RemotePeer())
+				}
+				waitChan <- struct{}{}
+			})
 		},
 	})
 	syncCl.Start()

From dad1087728ceb3021ff2c02b8e153cfc65ea7810 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Thu, 7 Nov 2024 12:44:40 -0500
Subject: [PATCH 147/451] feat: Isthmus Contracts (#12746)

* feat: Isthmus Contracts work squashed

remove unused import

fix: IOptimismMintableERC721 interface

feat: move semver out of abstract OptimismMintableERC20Factory

Also add spacer after _initialized/ing

fix: Initializer check in DeployOPChain

fix: CrossDomainOwnable3 test

feat: update semver-lock

feat: Add systemConfigAdmin to deploy-config

fix: IL1BlockInterop iface

fix: update devnetL1-template

fix: casing on systemConfigFeeAdmin

feat: update ConfigType names

feat: rename setHolocene to setL1BlockValuesIsthmus

feat: refine setL1BLockValuesIsthmus to read fee vault config directly from getters.

fix: read remoteChainId from ERC721 Factory, not Bridge

feat: Update test_setL1BlockValuesIsthmus_isDepositor_succeeds to compare with cfg

feat: use setIsthmus()

* debug: Add fee admin to intent

* fix: fee vault immutable checks no longer necessary

* fix: TestConfigDataMarshalUnmarshal

* fix: immutable check for L2ProxyAdmin owner

* fix: SystemConfigFeeAdmin naming in opchain.go

* feat: op-deployer - get SystemConfigFeeAdmin from intent.Roles

* remove dead comments

* feat: resolve feeAdmin setting todo coment

* feat: move unsafeBLockSigner into SystemConfig.Roles struct

* feat: move batcherHash into SystemConfig.Roles struct

* fix: Add missing feeAdmin setter in DeployOpChain test

* fix: SystemConfig.init in specs

* feat: resolve todo

* feat: resolve some todos

* feat: Natspec in StaticConfig

* feat: resolve some todos

* fix: test_getConfigRoundtripGasPayingToken_succeeds with normalizeSmallString

* pre-pr

* test: Implement roll and reset prevBought gas in SystemConfig Test's cleanStorageAndInit()

* feat: Add natspec on SystemConfig.Roles

* feat: Fix all incomplete @notice natspec comments

* feat: systemConfigFeeAdmin name in opcm

* rebuild snapshots

* Add ArtifactsFromURL utility

* add configurability to createEnv

* clean up env.go

* fix apply test

* fix: TestInteropDeployment

* fix: TestApplyExistingOPCM

* fix: unchecked return on checkImmutable

* fix: goimports env.go

* fix: Add devkey for SystemConfigFeeAdmin

* fix: TestInteropDeployment

* fix: TestInteropDevRecipe

* feat: use base CDM interface in L1Block

* feat: configure L1 Block config values in L2Genesis

* feat: document Isthmus upgrade transactions on `setIsthmus()`

* semver fixes

* feat: L2 Genesis with cheated config in L1Block

* ok: how'd those warnings get in there in the first place?

* chore: update semver-lock

* works

* allocs build, cfg calls commented out cuz they fail

* fix: read DeployConfig before it gets deleted

* fix: test_allocs_size

* fix: restore l1 deps

* fix: test_getConfigRoundtripGasPayingToken_succeeds disallow eth address

* fix: update test_proveWithdrawalTransaction_benchmark

Unclear why this cost changed?

* feat: Add Isthmus to Config.sol

* feat: hoist L1Block population above allocs writes

* chore: delete debug logs

* WIP: update SystemConfig bindings and go usage

* fix: go linting

* feat: deposit setGasPayingToken as first call in SystemConfig.init

* semver lock

* TODO in L2Genesis

* chore: semver

* fix: Remove outdated comments

* feat: extract logic into _setNetworkConfig()

* test: Add total gas usage test

* remove dead comment

* ci: reduce heavy fuzz runs temporarily

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 .semgrep/rules/sol-rules.yaml                 |   4 +-
 .semgrep/tests/sol-rules.t.sol                |   6 +
 bedrock-devnet/devnet/__init__.py             |   2 +-
 op-chain-ops/devkeys/devkeys.go               |   4 +
 op-chain-ops/genesis/config.go                |   3 +
 .../testdata/test-deploy-config-full.json     |   1 +
 op-chain-ops/interopgen/configs.go            |   9 +-
 op-chain-ops/interopgen/deploy.go             |  40 +--
 op-chain-ops/interopgen/recipe.go             |  13 +-
 .../deployer/integration_test/apply_test.go   | 116 ++++---
 op-deployer/pkg/deployer/opcm/opchain.go      |   6 +-
 op-deployer/pkg/deployer/pipeline/opchain.go  |   2 +-
 op-deployer/pkg/deployer/state/intent.go      |   6 +
 op-deployer/pkg/deployer/testutil/env.go      |  22 +-
 op-e2e/bindings/systemconfig.go               | 108 ++++++-
 op-e2e/system/gastoken/gastoken_test.go       |  17 +-
 packages/contracts-bedrock/.gas-snapshot      |  20 +-
 .../deploy-config/devnetL1-template.json      |   1 +
 .../deploy-config/hardhat.json                |   1 +
 packages/contracts-bedrock/foundry.toml       |   4 +-
 .../contracts-bedrock/scripts/Artifacts.s.sol |   2 -
 .../contracts-bedrock/scripts/L2Genesis.s.sol | 275 ++++++++--------
 .../scripts/deploy/ChainAssertions.sol        |  61 ++--
 .../scripts/deploy/Deploy.s.sol               |  24 +-
 .../scripts/deploy/DeployConfig.s.sol         |   2 +
 .../deploy/DeployImplementations.s.sol        |  32 +-
 .../scripts/deploy/DeployOPChain.s.sol        |  23 +-
 .../scripts/deploy/DeploySuperchain.s.sol     |   3 +-
 .../scripts/libraries/Config.sol              |   9 +-
 .../scripts/libraries/DeployUtils.sol         |  10 +
 .../scripts/libraries/ForgeArtifacts.sol      |  19 +-
 packages/contracts-bedrock/semver-lock.json   | 128 ++++----
 .../snapshots/abi/BaseFeeVault.json           |  48 +--
 .../CrossDomainMessengerLegacySpacer0.json    |   1 -
 .../CrossDomainMessengerLegacySpacer1.json    |   1 -
 .../snapshots/abi/L1Block.json                |  62 ++++
 .../snapshots/abi/L1BlockInterop.json         |  46 ++-
 .../snapshots/abi/L1CrossDomainMessenger.json |   2 +-
 .../snapshots/abi/L1ERC721Bridge.json         |  16 +-
 .../snapshots/abi/L1FeeVault.json             |  48 +--
 ...on => L1OptimismMintableERC20Factory.json} |   0
 .../snapshots/abi/L1StandardBridge.json       |   8 +-
 .../snapshots/abi/L2CrossDomainMessenger.json |  31 --
 .../snapshots/abi/L2ERC721Bridge.json         |  33 +-
 .../abi/L2OptimismMintableERC20Factory.json   | 196 ++++++++++++
 .../snapshots/abi/L2ProxyAdmin.json           | 300 ++++++++++++++++++
 .../snapshots/abi/L2StandardBridge.json       |  37 +--
 .../abi/L2StandardBridgeInterop.json          |  32 +-
 .../snapshots/abi/OPContractsManager.json     |   5 +
 .../abi/OPContractsManagerInterop.json        |   5 +
 .../snapshots/abi/OptimismMintableERC721.json |   6 +-
 .../abi/OptimismMintableERC721Factory.json    |  26 +-
 .../snapshots/abi/OptimismPortal.json         |  22 +-
 .../snapshots/abi/OptimismPortal2.json        |  40 ++-
 .../snapshots/abi/OptimismPortalInterop.json  |  48 ++-
 .../snapshots/abi/SequencerFeeVault.json      |  50 +--
 .../snapshots/abi/SuperchainConfig.json       |  31 ++
 .../snapshots/abi/SystemConfig.json           |  84 ++++-
 .../snapshots/abi/SystemConfigInterop.json    | 132 ++++++--
 .../CrossDomainMessengerLegacySpacer0.json    |   9 -
 .../CrossDomainMessengerLegacySpacer1.json    |  65 ----
 .../snapshots/storageLayout/L1Block.json      |   7 +
 .../storageLayout/L1BlockInterop.json         |   9 +-
 .../storageLayout/L1CrossDomainMessenger.json |  62 +++-
 .../storageLayout/L1ERC721Bridge.json         |  35 +-
 ...on => L1OptimismMintableERC20Factory.json} |  54 ++--
 .../storageLayout/L1StandardBridge.json       |  60 ++--
 .../storageLayout/L2CrossDomainMessenger.json |  41 ++-
 .../storageLayout/L2ERC721Bridge.json         |  28 +-
 .../L2OptimismMintableERC20Factory.json       |  30 ++
 .../snapshots/storageLayout/L2ProxyAdmin.json |  37 +++
 .../storageLayout/L2StandardBridge.json       |  32 +-
 .../L2StandardBridgeInterop.json              |  32 +-
 .../src/L1/L1CrossDomainMessenger.sol         |  25 +-
 .../src/L1/L1ERC721Bridge.sol                 |  30 +-
 .../src/L1/L1OptimismMintableERC20Factory.sol |  41 +++
 .../src/L1/L1StandardBridge.sol               |  44 ++-
 .../src/L1/OPContractsManager.sol             |  25 +-
 .../src/L1/OPContractsManagerInterop.sol      |   9 +-
 .../src/L1/OptimismPortal.sol                 |  18 +-
 .../src/L1/OptimismPortal2.sol                |  41 ++-
 .../src/L1/OptimismPortalInterop.sol          |  35 +-
 .../src/L1/SuperchainConfig.sol               |  30 +-
 .../contracts-bedrock/src/L1/SystemConfig.sol | 175 +++++++---
 .../src/L1/SystemConfigInterop.sol            |  54 +---
 .../L1/interfaces/IL1CrossDomainMessenger.sol |   4 +
 .../src/L1/interfaces/IL1ERC721Bridge.sol     |   6 +
 .../IL1OptimismMintableERC20Factory.sol       |  38 +++
 .../src/L1/interfaces/IL1StandardBridge.sol   |   5 +-
 .../src/L1/interfaces/IOptimismPortal.sol     |   3 +-
 .../src/L1/interfaces/IOptimismPortal2.sol    |   4 +-
 .../L1/interfaces/IOptimismPortalInterop.sol  |   5 +-
 .../src/L1/interfaces/ISuperchainConfig.sol   |   4 +-
 .../src/L1/interfaces/ISystemConfig.sol       |  22 +-
 .../L1/interfaces/ISystemConfigInterop.sol    |   5 +-
 .../contracts-bedrock/src/L2/BaseFeeVault.sol |  30 +-
 .../contracts-bedrock/src/L2/FeeVault.sol     |  91 +++---
 .../src/L2/GasPriceOracle.sol                 |   4 +-
 packages/contracts-bedrock/src/L2/L1Block.sol | 151 ++++++++-
 .../src/L2/L1BlockInterop.sol                 |  36 +--
 .../contracts-bedrock/src/L2/L1FeeVault.sol   |  30 +-
 .../src/L2/L2CrossDomainMessenger.sol         |  27 +-
 .../src/L2/L2ERC721Bridge.sol                 |  30 +-
 .../src/L2/L2OptimismMintableERC20Factory.sol |  25 ++
 .../contracts-bedrock/src/L2/L2ProxyAdmin.sol |  17 +
 .../src/L2/L2StandardBridge.sol               |  26 +-
 .../src/L2/L2StandardBridgeInterop.sol        |   4 +-
 .../src/L2/L2ToL2CrossDomainMessenger.sol     |   4 +-
 .../OptimismMintableERC721Factory.sol         |  52 +--
 .../src/L2/OptimismSuperchainERC20.sol        |   4 +-
 .../src/L2/OptimismSuperchainERC20Beacon.sol  |   4 +-
 .../src/L2/OptimismSuperchainERC20Factory.sol |   4 +-
 .../src/L2/SequencerFeeVault.sol              |  36 ++-
 .../src/L2/SuperchainWETH.sol                 |   4 +-
 packages/contracts-bedrock/src/L2/WETH.sol    |   4 +-
 .../src/L2/interfaces/IBaseFeeVault.sol       |  16 +-
 .../src/L2/interfaces/IFeeVault.sol           |   8 +-
 .../src/L2/interfaces/IL1Block.sol            |   7 +
 .../src/L2/interfaces/IL1BlockInterop.sol     |  12 +-
 .../src/L2/interfaces/IL1FeeVault.sol         |  15 +-
 .../L2/interfaces/IL2CrossDomainMessenger.sol |   3 +-
 .../src/L2/interfaces/IL2ERC721Bridge.sol     |   3 +-
 .../IL2OptimismMintableERC20Factory.sol       |  36 +++
 .../src/L2/interfaces/IL2StandardBridge.sol   |   8 +-
 .../interfaces/IL2StandardBridgeInterop.sol   |  10 +-
 .../IOptimismMintableERC721Factory.sol        |  12 +-
 .../src/L2/interfaces/ISequencerFeeVault.sol  |  18 +-
 .../src/libraries/Encoding.sol                |  36 +++
 .../src/libraries/Predeploys.sol              |   4 +-
 .../src/libraries/StaticConfig.sol            |  58 ++++
 .../contracts-bedrock/src/libraries/Types.sol |  25 ++
 .../src/universal/CrossDomainMessenger.sol    | 108 ++++---
 .../src/universal/ERC721Bridge.sol            |  51 ++-
 .../OptimismMintableERC20Factory.sol          |  43 +--
 .../src/universal/OptimismMintableERC721.sol  |  17 +-
 .../src/universal/StandardBridge.sol          |  70 ++--
 .../interfaces/ICrossDomainMessenger.sol      |   3 +-
 .../universal/interfaces/IERC721Bridge.sol    |   1 -
 .../IOptimismMintableERC20Factory.sol         |   2 -
 .../interfaces/IOptimismMintableERC721.sol    |  10 +-
 .../universal/interfaces/IStandardBridge.sol  |   3 +-
 .../test/L1/OPContractsManager.t.sol          |   3 +-
 .../test/L1/OptimismPortal.t.sol              |  16 +-
 .../test/L1/OptimismPortal2.t.sol             | 116 ++++++-
 .../test/L1/OptimismPortalInterop.t.sol       |  73 ++---
 .../test/L1/SuperchainConfig.t.sol            |   9 +-
 .../test/L1/SystemConfig.t.sol                | 196 ++++++++++--
 .../test/L1/SystemConfigInterop.t.sol         |  17 +-
 .../test/L2/BaseFeeVault.t.sol                |   2 +-
 .../test/L2/CrossDomainOwnable2.t.sol         |  13 -
 .../test/L2/CrossDomainOwnable3.t.sol         |   2 +-
 .../contracts-bedrock/test/L2/FeeVault.t.sol  |  21 ++
 .../contracts-bedrock/test/L2/L1Block.t.sol   | 145 +++++++++
 .../test/L2/L1BlockInterop.t.sol              |  37 ++-
 .../test/L2/L1FeeVault.t.sol                  |   2 +-
 .../test/L2/L2CrossDomainMessenger.t.sol      |   8 +-
 .../test/L2/L2ERC721Bridge.t.sol              |   4 +-
 .../contracts-bedrock/test/L2/L2Genesis.t.sol |   4 +-
 .../test/L2/L2StandardBridge.t.sol            |  10 +-
 .../OptimismMintableERC721Factory.t.sol       |   9 +-
 .../test/L2/Predeploys.t.sol                  |  17 +-
 .../test/L2/SequencerFeeVault.t.sol           |  71 ++---
 .../test/invariants/SystemConfig.t.sol        |  18 +-
 .../test/libraries/Encoding.t.sol             |  11 +
 .../test/opcm/DeployOPChain.t.sol             |  26 +-
 .../contracts-bedrock/test/setup/Setup.sol    |  76 ++++-
 .../OptimismMintableERC20Factory.t.sol        |  10 +-
 .../universal/OptimismMintableERC721.t.sol    |   6 +-
 .../test/universal/Specs.t.sol                |  56 +++-
 .../test/universal/StandardBridge.t.sol       |  10 +
 .../test/vendor/Initializable.t.sol           |  79 ++---
 171 files changed, 3733 insertions(+), 1903 deletions(-)
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json
 rename packages/contracts-bedrock/snapshots/abi/{OptimismMintableERC20Factory.json => L1OptimismMintableERC20Factory.json} (100%)
 create mode 100644 packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json
 create mode 100644 packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json
 rename packages/contracts-bedrock/snapshots/storageLayout/{OptimismMintableERC20Factory.json => L1OptimismMintableERC20Factory.json} (64%)
 create mode 100644 packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json
 create mode 100644 packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json
 create mode 100644 packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol
 create mode 100644 packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol
 create mode 100644 packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol
 create mode 100644 packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol
 rename packages/contracts-bedrock/src/{universal => L2}/OptimismMintableERC721Factory.sol (51%)
 create mode 100644 packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol
 rename packages/contracts-bedrock/src/{universal => L2}/interfaces/IOptimismMintableERC721Factory.sol (66%)
 create mode 100644 packages/contracts-bedrock/test/L2/FeeVault.t.sol
 rename packages/contracts-bedrock/test/{universal => L2}/OptimismMintableERC721Factory.t.sol (89%)

diff --git a/.semgrep/rules/sol-rules.yaml b/.semgrep/rules/sol-rules.yaml
index e0d83414c4bd..e801bd9be25f 100644
--- a/.semgrep/rules/sol-rules.yaml
+++ b/.semgrep/rules/sol-rules.yaml
@@ -131,7 +131,7 @@ rules:
       - pattern-not: require($ERR);
       - focus-metavariable: $ERR
       - pattern-not-regex: \"(\w+:\s[^"]+)\"
-      - pattern-not-regex: string\.concat\(\"(\w+:\s[^"]+)\"\,[^"]+\)
+      - pattern-not-regex: string\.concat\(\"(\w+:\s)\"[^)]+\)
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
     paths:
@@ -152,7 +152,7 @@ rules:
       - pattern-not: revert $ERR(...);
       - focus-metavariable: $MSG
       - pattern-not-regex: \"(\w+:\s[^"]+)\"
-      - pattern-not-regex: string\.concat\(\"(\w+:\s[^"]+)\"\,[^"]+\)
+      - pattern-not-regex: string\.concat\(\"(\w+:\s)\"[^)]+\)
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
     paths:
diff --git a/.semgrep/tests/sol-rules.t.sol b/.semgrep/tests/sol-rules.t.sol
index 3b4329f7e388..be4816dc3931 100644
--- a/.semgrep/tests/sol-rules.t.sol
+++ b/.semgrep/tests/sol-rules.t.sol
@@ -497,6 +497,9 @@ contract SemgrepTest__sol_style_malformed_require {
             )
         );
 
+        // ok: sol-style-malformed-require
+        require(result.length > 0, string.concat("ForgeArtifacts: ", _contractName, "is not initializable"));
+
         // ruleid: sol-style-malformed-require
         require(cond, "MyContract: ");
 
@@ -541,6 +544,9 @@ contract SemgrepTest__sol_style_malformed_revert {
             )
         );
 
+        // ok: sol-style-malformed-revert
+        revert(string.concat("ForgeArtifacts: ", _contractName, "is not initializable"));
+
         // ruleid: sol-style-malformed-revert
         revert("MyContract: ");
 
diff --git a/bedrock-devnet/devnet/__init__.py b/bedrock-devnet/devnet/__init__.py
index 70243dc790c8..7bf5c6a2595c 100644
--- a/bedrock-devnet/devnet/__init__.py
+++ b/bedrock-devnet/devnet/__init__.py
@@ -24,7 +24,7 @@
 log = logging.getLogger()
 
 # Global constants
-FORKS = ["delta", "ecotone", "fjord", "granite", "holocene"]
+FORKS = ["delta", "ecotone", "fjord", "granite", "holocene", "isthmus"]
 
 # Global environment variables
 DEVNET_NO_BUILD = os.getenv('DEVNET_NO_BUILD') == "true"
diff --git a/op-chain-ops/devkeys/devkeys.go b/op-chain-ops/devkeys/devkeys.go
index fdb151e4e6fc..1eb011b07eaa 100644
--- a/op-chain-ops/devkeys/devkeys.go
+++ b/op-chain-ops/devkeys/devkeys.go
@@ -158,6 +158,8 @@ const (
 	SequencerFeeVaultRecipientRole ChainOperatorRole = 9
 	// SystemConfigOwner is the key that can make SystemConfig changes.
 	SystemConfigOwner ChainOperatorRole = 10
+	// SystemConfigFeeAdmin is the key that can make SystemConfigFee changes.
+	SystemConfigFeeAdmin ChainOperatorRole = 11
 )
 
 func (role ChainOperatorRole) String() string {
@@ -184,6 +186,8 @@ func (role ChainOperatorRole) String() string {
 		return "sequencer-fee-vault-recipient"
 	case SystemConfigOwner:
 		return "system-config-owner"
+	case SystemConfigFeeAdmin:
+		return "system-config-fee-admin"
 	default:
 		return fmt.Sprintf("unknown-operator-%d", uint64(role))
 	}
diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
index 7ed0a6e2f682..8446241a9417 100644
--- a/op-chain-ops/genesis/config.go
+++ b/op-chain-ops/genesis/config.go
@@ -286,6 +286,9 @@ type OperatorDeployConfig struct {
 	// BatchSenderAddress represents the initial sequencer account that authorizes batches.
 	// Transactions sent from this account to the batch inbox address are considered valid.
 	BatchSenderAddress common.Address `json:"batchSenderAddress"`
+
+	// SystemConfigfeeAdmin is the address of the account that has the ability to set the fee parameters.
+	SystemConfigfeeAdmin common.Address `json:"systemConfigFeeAdmin"`
 }
 
 var _ ConfigChecker = (*OperatorDeployConfig)(nil)
diff --git a/op-chain-ops/genesis/testdata/test-deploy-config-full.json b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
index 814fff245b0d..da1e346c407b 100644
--- a/op-chain-ops/genesis/testdata/test-deploy-config-full.json
+++ b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
@@ -22,6 +22,7 @@
   "l1GenesisBlockGasLimit": "0x1c9c380",
   "l1GenesisBlockDifficulty": "0x1",
   "finalSystemOwner": "0xbcd4042de499d14e55001ccbb24a551f3b954096",
+  "systemConfigFeeAdmin": "0xbcd4042de499d14e55001ccbb24a551f3b954096",
   "superchainConfigGuardian": "0x0000000000000000000000000000000000000112",
   "finalizationPeriodSeconds": 2,
   "l1GenesisBlockMixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
diff --git a/op-chain-ops/interopgen/configs.go b/op-chain-ops/interopgen/configs.go
index 942588a9929c..e3fca23a629e 100644
--- a/op-chain-ops/interopgen/configs.go
+++ b/op-chain-ops/interopgen/configs.go
@@ -71,10 +71,11 @@ func (c *SuperchainConfig) Check(log log.Logger) error {
 }
 
 type L2Config struct {
-	Deployer          common.Address // account used to deploy contracts to L2
-	Proposer          common.Address
-	Challenger        common.Address
-	SystemConfigOwner common.Address
+	Deployer             common.Address // account used to deploy contracts to L2
+	Proposer             common.Address
+	Challenger           common.Address
+	SystemConfigOwner    common.Address
+	SystemConfigFeeAdmin common.Address
 	genesis.L2InitializationConfig
 	Prefund                 map[common.Address]*big.Int
 	SaltMixer               string
diff --git a/op-chain-ops/interopgen/deploy.go b/op-chain-ops/interopgen/deploy.go
index 476406821ea5..10f361b643ac 100644
--- a/op-chain-ops/interopgen/deploy.go
+++ b/op-chain-ops/interopgen/deploy.go
@@ -200,25 +200,27 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 
 	l1Host.SetTxOrigin(cfg.Deployer)
 
-	output, err := opcm.DeployOPChainV160(l1Host, opcm.DeployOPChainInputV160{
-		OpChainProxyAdminOwner:  cfg.ProxyAdminOwner,
-		SystemConfigOwner:       cfg.SystemConfigOwner,
-		Batcher:                 cfg.BatchSenderAddress,
-		UnsafeBlockSigner:       cfg.P2PSequencerAddress,
-		Proposer:                cfg.Proposer,
-		Challenger:              cfg.Challenger,
-		BasefeeScalar:           cfg.GasPriceOracleBaseFeeScalar,
-		BlobBaseFeeScalar:       cfg.GasPriceOracleBlobBaseFeeScalar,
-		L2ChainId:               new(big.Int).SetUint64(cfg.L2ChainID),
-		OpcmProxy:               superDeployment.OpcmProxy,
-		SaltMixer:               cfg.SaltMixer,
-		GasLimit:                cfg.GasLimit,
-		DisputeGameType:         cfg.DisputeGameType,
-		DisputeAbsolutePrestate: cfg.DisputeAbsolutePrestate,
-		DisputeMaxGameDepth:     cfg.DisputeMaxGameDepth,
-		DisputeSplitDepth:       cfg.DisputeSplitDepth,
-		DisputeClockExtension:   cfg.DisputeClockExtension,
-		DisputeMaxClockDuration: cfg.DisputeMaxClockDuration,
+	output, err := opcm.DeployOPChainIsthmus(l1Host, opcm.DeployOPChainInputIsthmus{
+		DeployOPChainInputV160: opcm.DeployOPChainInputV160{
+			OpChainProxyAdminOwner:  cfg.ProxyAdminOwner,
+			SystemConfigOwner:       cfg.SystemConfigOwner,
+			Batcher:                 cfg.BatchSenderAddress,
+			UnsafeBlockSigner:       cfg.P2PSequencerAddress,
+			Proposer:                cfg.Proposer,
+			Challenger:              cfg.Challenger,
+			BasefeeScalar:           cfg.GasPriceOracleBaseFeeScalar,
+			BlobBaseFeeScalar:       cfg.GasPriceOracleBlobBaseFeeScalar,
+			L2ChainId:               new(big.Int).SetUint64(cfg.L2ChainID),
+			OpcmProxy:               superDeployment.OpcmProxy,
+			SaltMixer:               cfg.SaltMixer,
+			GasLimit:                cfg.GasLimit,
+			DisputeGameType:         cfg.DisputeGameType,
+			DisputeAbsolutePrestate: cfg.DisputeAbsolutePrestate,
+			DisputeMaxGameDepth:     cfg.DisputeMaxGameDepth,
+			DisputeSplitDepth:       cfg.DisputeSplitDepth,
+			DisputeClockExtension:   cfg.DisputeClockExtension,
+			DisputeMaxClockDuration: cfg.DisputeMaxClockDuration},
+		SystemConfigFeeAdmin: cfg.SystemConfigFeeAdmin,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy L2 OP chain: %w", err)
diff --git a/op-chain-ops/interopgen/recipe.go b/op-chain-ops/interopgen/recipe.go
index 8983ee72da8e..06bcf8bfca03 100644
--- a/op-chain-ops/interopgen/recipe.go
+++ b/op-chain-ops/interopgen/recipe.go
@@ -178,12 +178,17 @@ func InteropL2DevConfig(l1ChainID, l2ChainID uint64, addrs devkeys.Addresses) (*
 	if err != nil {
 		return nil, err
 	}
+	systemConfigFeeAdmin, err := addrs.Address(chainOps(devkeys.SystemConfigFeeAdmin))
+	if err != nil {
+		return nil, err
+	}
 
 	l2Cfg := &L2Config{
-		Deployer:          deployer,
-		Proposer:          proposer,
-		Challenger:        challenger,
-		SystemConfigOwner: systemConfigOwner,
+		Deployer:             deployer,
+		Proposer:             proposer,
+		Challenger:           challenger,
+		SystemConfigOwner:    systemConfigOwner,
+		SystemConfigFeeAdmin: systemConfigFeeAdmin,
 		L2InitializationConfig: genesis.L2InitializationConfig{
 			DevDeployConfig: genesis.DevDeployConfig{
 				FundDevAccounts: true,
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index fa59c49dc8ac..919b717cc055 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/inspect"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 
@@ -125,7 +126,7 @@ func TestEndToEndApply(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
+	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr, localArtifactsFactory, localArtifactsFactory)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	cg := ethClientCodeGetter(ctx, l1Client)
 
@@ -145,7 +146,7 @@ func TestEndToEndApply(t *testing.T) {
 	t.Run("subsequent chain", func(t *testing.T) {
 		// create a new environment with wiped state to ensure we can continue using the
 		// state from the previous deployment
-		env, bundle, _ = createEnv(t, lgr, l1Client, bcaster, deployerAddr)
+		env, bundle, _ = createEnv(t, lgr, l1Client, bcaster, deployerAddr, localArtifactsFactory, localArtifactsFactory)
 		intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID2))
 
 		require.NoError(t, deployer.ApplyPipeline(
@@ -207,7 +208,17 @@ func TestApplyExistingOPCM(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
+	// use the l2 contracts here because the v1.7.0 contracts are compatible with the v1.6.0
+	// contracts and createEnv uses the same artifacts for both L1/L2 in the bundle.
+	env, bundle, _ := createEnv(
+		t,
+		lgr,
+		l1Client,
+		bcaster,
+		deployerAddr,
+		taggedArtifactsFactory(standard.DefaultL1ContractsTag),
+		taggedArtifactsFactory(standard.DefaultL2ContractsTag),
+	)
 
 	intent, st := newIntent(
 		t,
@@ -379,7 +390,8 @@ func TestProofParamOverrides(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			checkImmutable(t, allocs, tt.address, tt.caster(t, intent.GlobalDeployOverrides[tt.name]))
+			err := checkImmutable(t, allocs, tt.address, tt.caster(t, intent.GlobalDeployOverrides[tt.name]))
+			require.NoError(t, err)
 		})
 	}
 }
@@ -403,9 +415,9 @@ func TestInteropDeployment(t *testing.T) {
 
 	chainState := st.Chains[0]
 	depManagerSlot := common.HexToHash("0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c")
-	checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot)
-	proxyAdminOwnerHash := common.BytesToHash(intent.Chains[0].Roles.SystemConfigOwner.Bytes())
-	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, proxyAdminOwnerHash)
+	require.NoError(t, checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot))
+	systemConfigOwnerHash := common.BytesToHash(intent.Chains[0].Roles.SystemConfigOwner.Bytes())
+	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, systemConfigOwnerHash)
 }
 
 func TestAltDADeployment(t *testing.T) {
@@ -512,7 +524,7 @@ func TestInvalidL2Genesis(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
+			env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr, localArtifactsFactory, localArtifactsFactory)
 			intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 			intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 			intent.DeploymentStrategy = state.DeploymentStrategyGenesis
@@ -546,27 +558,42 @@ func setupGenesisChain(t *testing.T) (*pipeline.Env, pipeline.ArtifactsBundle, *
 
 	loc, _ := testutil.LocalArtifacts(t)
 
-	env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
+	env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr, localArtifactsFactory, localArtifactsFactory)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
 	return env, bundle, intent, st
 }
 
+type artifactsFactory func(t *testing.T) (*artifacts.Locator, foundry.StatDirFs)
+
+func localArtifactsFactory(t *testing.T) (*artifacts.Locator, foundry.StatDirFs) {
+	return testutil.LocalArtifacts(t)
+}
+
+func taggedArtifactsFactory(tag string) artifactsFactory {
+	return func(t *testing.T) (*artifacts.Locator, foundry.StatDirFs) {
+		return testutil.ArtifactsFromURL(t, fmt.Sprintf("tag://%s", tag))
+	}
+}
+
 func createEnv(
 	t *testing.T,
 	lgr log.Logger,
 	l1Client *ethclient.Client,
 	bcaster broadcaster.Broadcaster,
 	deployerAddr common.Address,
+	l1Factory artifactsFactory,
+	l2Factory artifactsFactory,
 ) (*pipeline.Env, pipeline.ArtifactsBundle, *script.Host) {
-	_, artifactsFS := testutil.LocalArtifacts(t)
+	_, l1AFS := l1Factory(t)
+	_, l2AFS := l2Factory(t)
 
 	host, err := env.DefaultScriptHost(
 		bcaster,
 		lgr,
 		deployerAddr,
-		artifactsFS,
+		l1AFS,
 		0,
 	)
 	require.NoError(t, err)
@@ -581,8 +608,8 @@ func createEnv(
 	}
 
 	bundle := pipeline.ArtifactsBundle{
-		L1: artifactsFS,
-		L2: artifactsFS,
+		L1: l1AFS,
+		L2: l2AFS,
 	}
 
 	return env, bundle, host
@@ -632,13 +659,14 @@ func newChainIntent(t *testing.T, dk *devkeys.MnemonicDevKeys, l1ChainID *big.In
 		Eip1559Denominator:         50,
 		Eip1559Elasticity:          6,
 		Roles: state.ChainRoles{
-			L1ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
-			L2ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
-			SystemConfigOwner: addrFor(t, dk, devkeys.SystemConfigOwner.Key(l1ChainID)),
-			UnsafeBlockSigner: addrFor(t, dk, devkeys.SequencerP2PRole.Key(l1ChainID)),
-			Batcher:           addrFor(t, dk, devkeys.BatcherRole.Key(l1ChainID)),
-			Proposer:          addrFor(t, dk, devkeys.ProposerRole.Key(l1ChainID)),
-			Challenger:        addrFor(t, dk, devkeys.ChallengerRole.Key(l1ChainID)),
+			L1ProxyAdminOwner:    addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
+			L2ProxyAdminOwner:    addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
+			SystemConfigOwner:    addrFor(t, dk, devkeys.SystemConfigOwner.Key(l1ChainID)),
+			SystemConfigFeeAdmin: addrFor(t, dk, devkeys.SystemConfigFeeAdmin.Key(l1ChainID)),
+			UnsafeBlockSigner:    addrFor(t, dk, devkeys.SequencerP2PRole.Key(l1ChainID)),
+			Batcher:              addrFor(t, dk, devkeys.BatcherRole.Key(l1ChainID)),
+			Proposer:             addrFor(t, dk, devkeys.ProposerRole.Key(l1ChainID)),
+			Challenger:           addrFor(t, dk, devkeys.ChallengerRole.Key(l1ChainID)),
 		},
 	}
 }
@@ -739,17 +767,20 @@ func validateOPChainDeployment(t *testing.T, cg codeGetter, st *state.State, int
 		alloc := chainState.Allocs.Data.Accounts
 
 		chainIntent := intent.Chains[i]
-		checkImmutableBehindProxy(t, alloc, predeploys.BaseFeeVaultAddr, chainIntent.BaseFeeVaultRecipient)
-		checkImmutableBehindProxy(t, alloc, predeploys.L1FeeVaultAddr, chainIntent.L1FeeVaultRecipient)
-		checkImmutableBehindProxy(t, alloc, predeploys.SequencerFeeVaultAddr, chainIntent.SequencerFeeVaultRecipient)
-		checkImmutableBehindProxy(t, alloc, predeploys.OptimismMintableERC721FactoryAddr, common.BigToHash(new(big.Int).SetUint64(intent.L1ChainID)))
-
-		// ownership slots
-		var addrAsSlot common.Hash
-		addrAsSlot.SetBytes(chainIntent.Roles.L1ProxyAdminOwner.Bytes())
-		// slot 0
-		ownerSlot := common.Hash{}
-		checkStorageSlot(t, alloc, predeploys.ProxyAdminAddr, ownerSlot, addrAsSlot)
+
+		// First try to read the owner from the bytecode, which is the situation with the
+		// Isthmus L2ProxyAdmin (on this commit).
+		if err := checkImmutableBehindProxy(t, alloc, predeploys.ProxyAdminAddr, common.HexToAddress("0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001")); err != nil {
+			t.Logf("Warning: Failed to check immutable behind proxy for L2ProxyAdmin, falling back to <=v1.6.0 storage check")
+			// If the bytecode check fails, fall back to reading the owner from storage.
+			// Note however that the L2ProxyAdmin owner address here (0xe59a881b2626f948f56f509f180c32428585629a) comes from the chainIntent,
+			// and does not actually match the `owner()` of the L2ProxyAdmin contract deployed on Sepolia (0x2FC3ffc903729a0f03966b917003800B145F67F3).
+			// It seems the L2 state is locally constructed rather than pulled from an L2 RPC.
+			var L2ProxyAdminOwner common.Hash
+			L2ProxyAdminOwner.SetBytes(chainIntent.Roles.L2ProxyAdminOwner.Bytes())
+			checkStorageSlot(t, alloc, predeploys.ProxyAdminAddr, common.Hash{}, L2ProxyAdminOwner)
+		}
+
 		var defaultGovOwner common.Hash
 		defaultGovOwner.SetBytes(common.HexToAddress("0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAdDEad").Bytes())
 		checkStorageSlot(t, alloc, predeploys.GovernanceTokenAddr, common.Hash{31: 0x0a}, defaultGovOwner)
@@ -770,20 +801,23 @@ type bytesMarshaler interface {
 	Bytes() []byte
 }
 
-func checkImmutableBehindProxy(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) {
+func checkImmutableBehindProxy(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) error {
 	implementationAddress := getEIP1967ImplementationAddress(t, allocations, proxyContract)
-	checkImmutable(t, allocations, implementationAddress, thing)
+	return checkImmutable(t, allocations, implementationAddress, thing)
 }
 
-func checkImmutable(t *testing.T, allocations types.GenesisAlloc, implementationAddress common.Address, thing bytesMarshaler) {
+func checkImmutable(t *testing.T, allocations types.GenesisAlloc, implementationAddress common.Address, thing bytesMarshaler) error {
 	account, ok := allocations[implementationAddress]
-	require.True(t, ok, "%s not found in allocations", implementationAddress)
-	require.NotEmpty(t, account.Code, "%s should have code", implementationAddress)
-	require.True(
-		t,
-		bytes.Contains(account.Code, thing.Bytes()),
-		"%s code should contain %s immutable", implementationAddress, hex.EncodeToString(thing.Bytes()),
-	)
+	if !ok {
+		return fmt.Errorf("%s not found in allocations", implementationAddress)
+	}
+	if len(account.Code) == 0 {
+		return fmt.Errorf("%s should have code", implementationAddress)
+	}
+	if !bytes.Contains(account.Code, thing.Bytes()) {
+		return fmt.Errorf("%s code should contain %s immutable", implementationAddress, hex.EncodeToString(thing.Bytes()))
+	}
+	return nil
 }
 
 func checkStorageSlot(t *testing.T, allocs types.GenesisAlloc, address common.Address, slot common.Hash, expected common.Hash) {
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index 537765ce5154..c8c803d72d4f 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -59,7 +59,7 @@ type opcmDeployInputV160 struct {
 
 type opcmRolesIsthmus struct {
 	opcmRolesBase
-	FeeAdmin common.Address
+	SystemConfigFeeAdmin common.Address
 }
 
 type opcmDeployInputIsthmus struct {
@@ -135,8 +135,8 @@ func DeployOPChainInputIsthmusDeployCalldata(input DeployOPChainInputIsthmus) an
 	v160Data := DeployOPChainInputV160DeployCalldata(input.DeployOPChainInputV160).(opcmDeployInputV160)
 	return opcmDeployInputIsthmus{
 		Roles: opcmRolesIsthmus{
-			opcmRolesBase: v160Data.Roles,
-			FeeAdmin:      input.SystemConfigFeeAdmin,
+			opcmRolesBase:        v160Data.Roles,
+			SystemConfigFeeAdmin: input.SystemConfigFeeAdmin,
 		},
 		opcmDeployInputBase: v160Data.opcmDeployInputBase,
 	}
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index 59e5d214cf4f..72e4703e0503 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -276,7 +276,7 @@ func makeDCIIsthmus(intent *state.Intent, thisIntent *state.ChainIntent, chainID
 
 	return opcm.DeployOPChainInputIsthmus{
 		DeployOPChainInputV160: dci,
-		SystemConfigFeeAdmin:   common.Address{'D', 'E', 'A', 'D'},
+		SystemConfigFeeAdmin:   thisIntent.Roles.SystemConfigFeeAdmin,
 	}, nil
 }
 
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index 860944666e9e..2459ddbec528 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -176,6 +176,8 @@ type ChainRoles struct {
 
 	SystemConfigOwner common.Address `json:"systemConfigOwner" toml:"systemConfigOwner"`
 
+	SystemConfigFeeAdmin common.Address `json:"systemConfigFeeAdmin" toml:"systemConfigFeeAdmin"`
+
 	UnsafeBlockSigner common.Address `json:"unsafeBlockSigner" toml:"unsafeBlockSigner"`
 
 	Batcher common.Address `json:"batcher" toml:"batcher"`
@@ -199,6 +201,10 @@ func (c *ChainIntent) Check() error {
 		c.Roles.SystemConfigOwner = c.Roles.L1ProxyAdminOwner
 	}
 
+	if c.Roles.SystemConfigFeeAdmin == emptyAddress {
+		return fmt.Errorf("systemConfigFeeAdmin must be set")
+	}
+
 	if c.Roles.L2ProxyAdminOwner == emptyAddress {
 		return fmt.Errorf("l2ProxyAdminOwner must be set")
 	}
diff --git a/op-deployer/pkg/deployer/testutil/env.go b/op-deployer/pkg/deployer/testutil/env.go
index 6b289c4503b7..a1731fb34b35 100644
--- a/op-deployer/pkg/deployer/testutil/env.go
+++ b/op-deployer/pkg/deployer/testutil/env.go
@@ -3,31 +3,35 @@ package testutil
 import (
 	"context"
 	"fmt"
-	"net/url"
 	"path"
 	"runtime"
 	"testing"
 
-	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	op_service "github.com/ethereum-optimism/optimism/op-service"
 	"github.com/stretchr/testify/require"
 )
 
-func LocalArtifacts(t *testing.T) (*artifacts2.Locator, foundry.StatDirFs) {
+func LocalArtifacts(t *testing.T) (*artifacts.Locator, foundry.StatDirFs) {
 	_, testFilename, _, ok := runtime.Caller(0)
 	require.Truef(t, ok, "failed to get test filename")
 	monorepoDir, err := op_service.FindMonorepoRoot(testFilename)
 	require.NoError(t, err)
 	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
-	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
-	require.NoError(t, err)
-	loc := &artifacts2.Locator{
-		URL: artifactsURL,
-	}
+	return ArtifactsFromURL(t, fmt.Sprintf("file://%s", artifactsDir))
+}
+
+func ArtifactsFromURL(t *testing.T, artifactsURLStr string) (*artifacts.Locator, foundry.StatDirFs) {
+	loc := new(artifacts.Locator)
+	require.NoError(t, loc.UnmarshalText([]byte(artifactsURLStr)))
 
-	artifactsFS, cleanupArtifacts, err := artifacts2.Download(context.Background(), loc, artifacts2.NoopDownloadProgressor)
+	progressor := artifacts.LogProgressor(testlog.Logger(t, log.LevelInfo))
+	artifactsFS, cleanupArtifacts, err := artifacts.Download(context.Background(), loc, progressor)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = cleanupArtifacts()
diff --git a/op-e2e/bindings/systemconfig.go b/op-e2e/bindings/systemconfig.go
index a6ff5ce1480e..9b845fa5e19e 100644
--- a/op-e2e/bindings/systemconfig.go
+++ b/op-e2e/bindings/systemconfig.go
@@ -49,15 +49,45 @@ type SystemConfigAddresses struct {
 	GasPayingToken               common.Address
 }
 
+// SystemConfigRoles is an auto generated low-level Go binding around an user-defined struct.
+type SystemConfigRoles struct {
+	Owner             common.Address
+	FeeAdmin          common.Address
+	UnsafeBlockSigner common.Address
+	BatcherHash       [32]byte
+}
+
 // SystemConfigMetaData contains all meta data concerning the SystemConfig contract.
 var SystemConfigMetaData = &bind.MetaData{
-	ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"BATCH_INBOX_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"DISPUTE_GAME_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_CROSS_DOMAIN_MESSENGER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_ERC_721_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_STANDARD_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_PORTAL_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"START_BLOCK_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"UNSAFE_BLOCK_SIGNER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"VERSION\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"basefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batchInbox\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batcherHash\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobbasefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"disputeGameFactory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Denominator\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Elasticity\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingToken\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"decimals_\",\"type\":\"uint8\",\"internalType\":\"uint8\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenName\",\"inputs\":[],\"outputs\":[{\"name\":\"name_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenSymbol\",\"inputs\":[],\"outputs\":[{\"name\":\"symbol_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"_unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_config\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]},{\"name\":\"_batchInbox\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_addresses\",\"type\":\"tuple\",\"internalType\":\"structSystemConfig.Addresses\",\"components\":[{\"name\":\"l1CrossDomainMessenger\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1ERC721Bridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1StandardBridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"disputeGameFactory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismPortal\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismMintableERC20Factory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"gasPayingToken\",\"type\":\"address\",\"internalType\":\"address\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"isCustomGasToken\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1CrossDomainMessenger\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1ERC721Bridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1StandardBridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"maximumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"minimumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismMintableERC20Factory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismPortal\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"overhead\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"resourceConfig\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"scalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"setBatcherHash\",\"inputs\":[{\"name\":\"_batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setEIP1559Params\",\"inputs\":[{\"name\":\"_denominator\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_elasticity\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfig\",\"inputs\":[{\"name\":\"_overhead\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_scalar\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfigEcotone\",\"inputs\":[{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasLimit\",\"inputs\":[{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setUnsafeBlockSigner\",\"inputs\":[{\"name\":\"_unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"startBlock\",\"inputs\":[],\"outputs\":[{\"name\":\"startBlock_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"unsafeBlockSigner\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"pure\"},{\"type\":\"event\",\"name\":\"ConfigUpdate\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint256\",\"indexed\":true,\"internalType\":\"uint256\"},{\"name\":\"updateType\",\"type\":\"uint8\",\"indexed\":true,\"internalType\":\"enumSystemConfig.UpdateType\"},{\"name\":\"data\",\"type\":\"bytes\",\"indexed\":false,\"internalType\":\"bytes\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false}]",
+	ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"BATCH_INBOX_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"DISPUTE_GAME_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_CROSS_DOMAIN_MESSENGER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_ERC_721_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_STANDARD_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_PORTAL_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"START_BLOCK_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"UNSAFE_BLOCK_SIGNER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"VERSION\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"basefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batchInbox\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batcherHash\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobbasefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"disputeGameFactory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Denominator\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Elasticity\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"feeAdmin\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingToken\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"decimals_\",\"type\":\"uint8\",\"internalType\":\"uint8\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenName\",\"inputs\":[],\"outputs\":[{\"name\":\"name_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenSymbol\",\"inputs\":[],\"outputs\":[{\"name\":\"symbol_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_roles\",\"type\":\"tuple\",\"internalType\":\"structSystemConfig.Roles\",\"components\":[{\"name\":\"owner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"feeAdmin\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"_config\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]},{\"name\":\"_batchInbox\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_addresses\",\"type\":\"tuple\",\"internalType\":\"structSystemConfig.Addresses\",\"components\":[{\"name\":\"l1CrossDomainMessenger\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1ERC721Bridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1StandardBridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"disputeGameFactory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismPortal\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismMintableERC20Factory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"gasPayingToken\",\"type\":\"address\",\"internalType\":\"address\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"isCustomGasToken\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1CrossDomainMessenger\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1ERC721Bridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1StandardBridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"maximumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"minimumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismMintableERC20Factory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismPortal\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"overhead\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"resourceConfig\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"scalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"setBatcherHash\",\"inputs\":[{\"name\":\"_batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setEIP1559Params\",\"inputs\":[{\"name\":\"_denominator\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_elasticity\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setFeeVaultConfig\",\"inputs\":[{\"name\":\"_type\",\"type\":\"uint8\",\"internalType\":\"enumTypes.ConfigType\"},{\"name\":\"_recipient\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_min\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_network\",\"type\":\"uint8\",\"internalType\":\"enumTypes.WithdrawalNetwork\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfig\",\"inputs\":[{\"name\":\"_overhead\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_scalar\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfigEcotone\",\"inputs\":[{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasLimit\",\"inputs\":[{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setUnsafeBlockSigner\",\"inputs\":[{\"name\":\"_unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"startBlock\",\"inputs\":[],\"outputs\":[{\"name\":\"startBlock_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"unsafeBlockSigner\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"pure\"},{\"type\":\"event\",\"name\":\"ConfigUpdate\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint256\",\"indexed\":true,\"internalType\":\"uint256\"},{\"name\":\"updateType\",\"type\":\"uint8\",\"indexed\":true,\"internalType\":\"enumSystemConfig.UpdateType\"},{\"name\":\"data\",\"type\":\"bytes\",\"indexed\":false,\"internalType\":\"bytes\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"UnsafeCast\",\"inputs\":[]}]",
+	Bin: "0x60806040523480156200001157600080fd5b506200005a6200004360017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a062000130565b60001b6000196200006a60201b6200119d1760201c565b620000646200006e565b62000156565b9055565b600054610100900460ff1615620000db5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b60005460ff90811610156200012e576000805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b6000828210156200015157634e487b7160e01b600052601160045260246000fd5b500390565b612fd880620001666000396000f3fe608060405234801561001057600080fd5b50600436106103155760003560e01c8063a7119869116101a7578063dac6e63a116100ee578063f2fde38b11610097578063f8c68de011610071578063f8c68de01461076f578063fd32aa0f14610777578063ffa1ad741461077f57600080fd5b8063f2fde38b1461073f578063f45e65d814610752578063f68016b71461075b57600080fd5b8063e81b2c6d116100c8578063e81b2c6d1461070e578063ec70751714610717578063f2b4e6171461073757600080fd5b8063dac6e63a146106f6578063e0e2016d146106fe578063e2a3285c1461070657600080fd5b8063c4e8ddfa11610150578063cc731b021161012a578063cc731b02146105aa578063d220a9e0146106de578063d8444715146106ee57600080fd5b8063c4e8ddfa14610577578063c9b26f611461057f578063c9ff2d161461059257600080fd5b8063be4be78311610181578063be4be78314610520578063bfb14fb714610533578063c0fd4b411461056457600080fd5b8063a7119869146104fd578063b40a817c14610505578063bc49ce5f1461051857600080fd5b806330a402c01161026b578063550fcdc9116102145780638da5cb5b116101ee5780638da5cb5b146104c4578063935f029e146104e25780639b7d7f0a146104f557600080fd5b8063550fcdc9146104ac5780635d73369c146104b4578063715018a6146104bc57600080fd5b80634add321d116102455780634add321d1461043b5780634f16540b1461044357806354fd4d501461046a57600080fd5b806330a402c0146103f55780634397dfef146103fd57806348cd4cb11461043357600080fd5b806318d13918116102cd57806321326849116102a757806321326849146103b757806321d7fde5146103cf57806322b4dded146103e257600080fd5b806318d139181461039257806319f5cea8146103a75780631fd19ee1146103af57600080fd5b80630a49cb03116102fe5780630a49cb03146103625780630ae14b1b1461036a5780630c18c1621461038957600080fd5b806306c926571461031a578063078f29cf14610335575b600080fd5b610322610787565b6040519081526020015b60405180910390f35b61033d6107b5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161032c565b61033d6107ee565b630bebc2005b60405167ffffffffffffffff909116815260200161032c565b61032260655481565b6103a56103a03660046128f3565b61081e565b005b610322610832565b61033d61085d565b6103bf610887565b604051901515815260200161032c565b6103a56103dd366004612929565b6108c6565b6103a56103f0366004612b4c565b6108dc565b61033d610d21565b610405610d4b565b6040805173ffffffffffffffffffffffffffffffffffffffff909316835260ff90911660208301520161032c565b610322610d5f565b610370610d8f565b6103227f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c0881565b60408051808201909152600c81527f322e332e302d626574612e36000000000000000000000000000000000000000060208201525b60405161032c9190612c93565b61049f610db5565b610322610dbf565b6103a5610dea565b60335473ffffffffffffffffffffffffffffffffffffffff1661033d565b6103a56104f0366004612ca6565b610dfe565b61033d610e10565b61033d610e40565b6103a5610513366004612cc8565b610e70565b610322610e81565b6103a561052e366004612ce3565b610eac565b60685461054f9068010000000000000000900463ffffffff1681565b60405163ffffffff909116815260200161032c565b6103a5610572366004612929565b610f80565b61033d610f92565b6103a561058d366004612d3c565b610fc2565b606a5461054f90640100000000900463ffffffff1681565b61066e6040805160c081018252600080825260208201819052918101829052606081018290526080810182905260a0810191909152506040805160c08101825260695463ffffffff8082168352640100000000820460ff9081166020850152650100000000008304169383019390935266010000000000008104831660608301526a0100000000000000000000810490921660808201526e0100000000000000000000000000009091046fffffffffffffffffffffffffffffffff1660a082015290565b60405161032c9190600060c08201905063ffffffff80845116835260ff602085015116602084015260ff6040850151166040840152806060850151166060840152806080850151166080840152506fffffffffffffffffffffffffffffffff60a08401511660a083015292915050565b606a5461054f9063ffffffff1681565b61049f610fd3565b61033d610fdd565b61032261100d565b610322611038565b61032260675481565b60685461054f906c01000000000000000000000000900463ffffffff1681565b61033d611063565b6103a561074d3660046128f3565b611093565b61032260665481565b6068546103709067ffffffffffffffff1681565b610322611147565b610322611172565b610322600081565b6107b260017fa04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320d612d84565b81565b60006107e96107e560017f9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6377612d84565b5490565b905090565b60006107e96107e560017f4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ad612d84565b6108266111a1565b61082f81611222565b50565b6107b260017f46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a8612d84565b60006107e97f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c085490565b600080610892610d4b565b5073ffffffffffffffffffffffffffffffffffffffff1673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee141592915050565b6108ce6111a1565b6108d882826112df565b5050565b600054610100900460ff16158080156108fc5750600054600160ff909116105b806109165750303b158015610916575060005460ff166001145b6109a7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084015b60405180910390fd5b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790558015610a0557600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b610a0d61141e565b8751610a1890611093565b610a2588606001516114bd565b610a2f87876112df565b610a38856114e5565b60408801517f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c085560208801517f5a12cb4aeab79fd7e76814330f3e0732946417b36fa088add63d298d3c0f7a3f55610ab9610ab460017f71ac12829d66ee73d8d95bff50b3589745ce57edae70a3fb111a2342464dc598612d84565b849055565b610af0610ae760017f4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ad612d84565b60808401519055565b610b27610b1e60017f52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa907612d84565b60608401519055565b610b5e610b5560017fa04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320d612d84565b60a08401519055565b610b95610b8c60017f383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580637612d84565b8351600461163b565b610bcf610bc360017f46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a8612d84565b6020840151600561163b565b610c09610bfd60017f9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6377612d84565b6040840151600661163b565b610c116116f2565b610c19611784565b610c268260c001516117ec565b610c2f84611ae0565b610c37610d8f565b67ffffffffffffffff168567ffffffffffffffff161015610cb4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f206c6f7700604482015260640161099e565b8015610d1757600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050505050565b60006107e97f5a12cb4aeab79fd7e76814330f3e0732946417b36fa088add63d298d3c0f7a3f5490565b600080610d56611f54565b90939092509050565b60006107e96107e560017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b6069546000906107e99063ffffffff6a0100000000000000000000820481169116612d9b565b60606107e9611fd1565b6107b260017f383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580637612d84565b610df26111a1565b610dfc6000612092565b565b610e066111a1565b6108d88282612109565b60006107e96107e560017fa04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320d612d84565b60006107e96107e560017f383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580637612d84565b610e786111a1565b61082f816114e5565b6107b260017f71ac12829d66ee73d8d95bff50b3589745ce57edae70a3fb111a2342464dc598612d84565b610eb4610d21565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610f6e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602960248201527f53797374656d436f6e6669673a2063616c6c6572206973206e6f74207468652060448201527f6665652061646d696e0000000000000000000000000000000000000000000000606482015260840161099e565b610f7a848484846121df565b50505050565b610f886111a1565b6108d88282612353565b60006107e96107e560017f46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a8612d84565b610fca6111a1565b61082f816114bd565b60606107e9612525565b60006107e96107e560017f71ac12829d66ee73d8d95bff50b3589745ce57edae70a3fb111a2342464dc598612d84565b6107b260017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b6107b260017f52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa907612d84565b60006107e96107e560017f52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa907612d84565b61109b6111a1565b73ffffffffffffffffffffffffffffffffffffffff811661113e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f6464726573730000000000000000000000000000000000000000000000000000606482015260840161099e565b61082f81612092565b6107b260017f9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6377612d84565b6107b260017f4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ad612d84565b9055565b60335473ffffffffffffffffffffffffffffffffffffffff163314610dfc576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161099e565b61124b7f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c08829055565b6040805173ffffffffffffffffffffffffffffffffffffffff8316602082015260009101604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052905060035b60007f1d2b0bda21d56b8bd12d4f94ebacffdfb35f5e226f84b461103bb8beab6353be836040516112d39190612c93565b60405180910390a35050565b606880547fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff166801000000000000000063ffffffff8581169182027fffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffffff16929092176c0100000000000000000000000092851692909202919091179091557f0100000000000000000000000000000000000000000000000000000000000000602083811b67ffffffff000000001690921717606681905560655460408051938401919091528201526000906060015b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052905060015b60007f1d2b0bda21d56b8bd12d4f94ebacffdfb35f5e226f84b461103bb8beab6353be836040516114119190612c93565b60405180910390a3505050565b600054610100900460ff166114b5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e67000000000000000000000000000000000000000000606482015260840161099e565b610dfc6125db565b60678190556040805160208082018490528251808303909101815290820190915260006112a2565b6114ed610d8f565b67ffffffffffffffff168167ffffffffffffffff16101561156a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f206c6f7700604482015260640161099e565b630bebc20067ffffffffffffffff821611156115e2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f2068696768604482015260640161099e565b606880547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001667ffffffffffffffff831690811790915560408051602080820193909352815180820390930183528101905260026112a2565b8183556116466107ee565b73ffffffffffffffffffffffffffffffffffffffff1663c0012163828460405160200161168f919073ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6040516020818303038152906040526040518363ffffffff1660e01b81526004016116bb929190612df6565b600060405180830381600087803b1580156116d557600080fd5b505af11580156116e9573d6000803e3d6000fd5b50505050505050565b6116fa6107ee565b73ffffffffffffffffffffffffffffffffffffffff1663c001216360074660405160200161172a91815260200190565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401611756929190612df6565b600060405180830381600087803b15801561177057600080fd5b505af1158015610f7a573d6000803e3d6000fd5b6117b26107e560017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b600003610dfc57610dfc6117e760017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b439055565b73ffffffffffffffffffffffffffffffffffffffff81161580159061183b575073ffffffffffffffffffffffffffffffffffffffff811673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee14155b801561184c575061184a610887565b155b1561082f57601260ff168173ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156118a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118c59190612e4e565b60ff1614611955576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f53797374656d436f6e6669673a2062616420646563696d616c73206f6620676160448201527f7320706179696e6720746f6b656e000000000000000000000000000000000000606482015260840161099e565b60006119f08273ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa1580156119a5573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526119eb9190810190612e6b565b61267b565b90506000611a428373ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b8152600401600060405180830381865afa1580156119a5573d6000803e3d6000fd5b9050611a51836012848461271e565b611a596107ee565b6040805173ffffffffffffffffffffffffffffffffffffffff86811660208301526012828401526060820186905260808083018690528351808403909101815260a08301938490527fc001216300000000000000000000000000000000000000000000000000000000909352929092169163c0012163916116bb916000919060a401612df6565b8060a001516fffffffffffffffffffffffffffffffff16816060015163ffffffff161115611b90576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f53797374656d436f6e6669673a206d696e206261736520666565206d7573742060448201527f6265206c657373207468616e206d617820626173650000000000000000000000606482015260840161099e565b6001816040015160ff1611611c27576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602f60248201527f53797374656d436f6e6669673a2064656e6f6d696e61746f72206d757374206260448201527f65206c6172676572207468616e20310000000000000000000000000000000000606482015260840161099e565b6068546080820151825167ffffffffffffffff90921691611c489190612f36565b63ffffffff161115611cb6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f206c6f7700604482015260640161099e565b6000816020015160ff1611611d4d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602f60248201527f53797374656d436f6e6669673a20656c6173746963697479206d756c7469706c60448201527f6965722063616e6e6f7420626520300000000000000000000000000000000000606482015260840161099e565b8051602082015163ffffffff82169160ff90911690611d6d908290612f55565b611d779190612f9f565b63ffffffff1614611e0a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603760248201527f53797374656d436f6e6669673a20707265636973696f6e206c6f73732077697460448201527f6820746172676574207265736f75726365206c696d6974000000000000000000606482015260840161099e565b805160698054602084015160408501516060860151608087015160a09097015163ffffffff9687167fffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000009095169490941764010000000060ff94851602177fffffffffffffffffffffffffffffffffffffffffffff0000000000ffffffffff166501000000000093909216929092027fffffffffffffffffffffffffffffffffffffffffffff00000000ffffffffffff1617660100000000000091851691909102177fffff0000000000000000000000000000000000000000ffffffffffffffffffff166a010000000000000000000093909416929092027fffff00000000000000000000000000000000ffffffffffffffffffffffffffff16929092176e0100000000000000000000000000006fffffffffffffffffffffffffffffffff90921691909102179055565b60008080611f866107e560017f04adb1412b2ddc16fcc0d4538d5c8f07cf9c83abecc6b41f6f69037b708fbcec612d84565b73ffffffffffffffffffffffffffffffffffffffff81169350905082611fc5575073eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee92601292509050565b60a081901c9150509091565b60606000611fdd611f54565b5090507fffffffffffffffffffffffff111111111111111111111111111111111111111273ffffffffffffffffffffffffffffffffffffffff82160161205657505060408051808201909152600381527f4554480000000000000000000000000000000000000000000000000000000000602082015290565b61208c6120876107e560017fa48b38a4b44951360fbdcbfaaeae5ed6ae92585412e9841b70ec72ed8cd05764612d84565b6127ea565b91505090565b6033805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b7fff000000000000000000000000000000000000000000000000000000000000008116156121b9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f53797374656d436f6e6669673a207363616c61722065786365656473206d617860448201527f2e00000000000000000000000000000000000000000000000000000000000000606482015260840161099e565b6065829055606681905560408051602081018490529081018290526000906060016113ad565b60018460098111156121f3576121f3612dc7565b14806122105750600284600981111561220e5761220e612dc7565b145b8061222c5750600384600981111561222a5761222a612dc7565b145b6122b8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f53797374656d436f6e6669673a20436f6e66696754797065206973206973206e60448201527f6f74206120466565205661756c7420436f6e6669672074797065000000000000606482015260840161099e565b6122c06107ee565b73ffffffffffffffffffffffffffffffffffffffff1663c0012163856122e786868661281e565b6040516020016122f991815260200190565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401612325929190612df6565b600060405180830381600087803b15801561233f57600080fd5b505af1158015610d17573d6000803e3d6000fd5b60018263ffffffff1610156123ea576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f53797374656d436f6e6669673a2064656e6f6d696e61746f72206d757374206260448201527f65203e3d20310000000000000000000000000000000000000000000000000000606482015260840161099e565b60018163ffffffff161015612481576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f53797374656d436f6e6669673a20656c6173746963697479206d75737420626560448201527f203e3d2031000000000000000000000000000000000000000000000000000000606482015260840161099e565b606a805463ffffffff83811664010000000081027fffffffffffffffffffffffffffffffffffffffffffffffff000000000000000090931691861691909117919091179091556040516000916124ee91602086811b67ffffffff0000000016909217910190815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052905060046113e0565b60606000612531611f54565b5090507fffffffffffffffffffffffff111111111111111111111111111111111111111273ffffffffffffffffffffffffffffffffffffffff8216016125aa57505060408051808201909152600581527f4574686572000000000000000000000000000000000000000000000000000000602082015290565b61208c6120876107e560017f657c3582c29b3176614e3a33ddd1ec48352696a04e92b3c0566d72010fa8863d612d84565b600054610100900460ff16612672576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e67000000000000000000000000000000000000000000606482015260840161099e565b610dfc33612092565b600060208251111561270f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603660248201527f476173506179696e67546f6b656e3a20737472696e672063616e6e6f7420626560448201527f2067726561746572207468616e20333220627974657300000000000000000000606482015260840161099e565b612718826128a1565b92915050565b61278461274c60017f04adb1412b2ddc16fcc0d4538d5c8f07cf9c83abecc6b41f6f69037b708fbcec612d84565b74ff000000000000000000000000000000000000000060a086901b1673ffffffffffffffffffffffffffffffffffffffff8716179055565b6127b76127b260017f657c3582c29b3176614e3a33ddd1ec48352696a04e92b3c0566d72010fa8863d612d84565b839055565b610f7a6127e560017fa48b38a4b44951360fbdcbfaaeae5ed6ae92585412e9841b70ec72ed8cd05764612d84565b829055565b60405160005b82811a15612800576001016127f0565b80825260208201838152600082820152505060408101604052919050565b60006affffffffffffffffffffff831115612865576040517fc4bd89a900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8373ffffffffffffffffffffffffffffffffffffffff1660a084901b60f884600181111561289557612895612dc7565b901b1717949350505050565b8051602181106128b95763ec92f9a36000526004601cfd5b9081015160209190910360031b1b90565b803573ffffffffffffffffffffffffffffffffffffffff811681146128ee57600080fd5b919050565b60006020828403121561290557600080fd5b61290e826128ca565b9392505050565b803563ffffffff811681146128ee57600080fd5b6000806040838503121561293c57600080fd5b61294583612915565b915061295360208401612915565b90509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040516080810167ffffffffffffffff811182821017156129ae576129ae61295c565b60405290565b803567ffffffffffffffff811681146128ee57600080fd5b60ff8116811461082f57600080fd5b600060c082840312156129ed57600080fd5b60405160c0810181811067ffffffffffffffff82111715612a1057612a1061295c565b604052905080612a1f83612915565b81526020830135612a2f816129cc565b60208201526040830135612a42816129cc565b6040820152612a5360608401612915565b6060820152612a6460808401612915565b608082015260a08301356fffffffffffffffffffffffffffffffff81168114612a8c57600080fd5b60a0919091015292915050565b600060e08284031215612aab57600080fd5b60405160e0810181811067ffffffffffffffff82111715612ace57612ace61295c565b604052905080612add836128ca565b8152612aeb602084016128ca565b6020820152612afc604084016128ca565b6040820152612b0d606084016128ca565b6060820152612b1e608084016128ca565b6080820152612b2f60a084016128ca565b60a0820152612b4060c084016128ca565b60c08201525092915050565b60008060008060008060008789036102a0811215612b6957600080fd5b6080811215612b7757600080fd5b50612b8061298b565b612b89896128ca565b8152612b9760208a016128ca565b6020820152612ba860408a016128ca565b6040820152606089810135908201529650612bc560808901612915565b9550612bd360a08901612915565b9450612be160c089016129b4565b9350612bf08960e08a016129db565b9250612bff6101a089016128ca565b9150612c0f896101c08a01612a99565b905092959891949750929550565b60005b83811015612c38578181015183820152602001612c20565b83811115610f7a5750506000910152565b60008151808452612c61816020860160208601612c1d565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60208152600061290e6020830184612c49565b60008060408385031215612cb957600080fd5b50508035926020909101359150565b600060208284031215612cda57600080fd5b61290e826129b4565b60008060008060808587031215612cf957600080fd5b8435600a8110612d0857600080fd5b9350612d16602086016128ca565b925060408501359150606085013560028110612d3157600080fd5b939692955090935050565b600060208284031215612d4e57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082821015612d9657612d96612d55565b500390565b600067ffffffffffffffff808316818516808303821115612dbe57612dbe612d55565b01949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b6000600a8410612e2f577f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b83825260406020830152612e466040830184612c49565b949350505050565b600060208284031215612e6057600080fd5b815161290e816129cc565b600060208284031215612e7d57600080fd5b815167ffffffffffffffff80821115612e9557600080fd5b818401915084601f830112612ea957600080fd5b815181811115612ebb57612ebb61295c565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908382118183101715612f0157612f0161295c565b81604052828152876020848701011115612f1a57600080fd5b612f2b836020830160208801612c1d565b979650505050505050565b600063ffffffff808316818516808303821115612dbe57612dbe612d55565b600063ffffffff80841680612f93577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b92169190910492915050565b600063ffffffff80831681851681830481118215151615612fc257612fc2612d55565b0294935050505056fea164736f6c634300080f000a",
 }
 
 // SystemConfigABI is the input ABI used to generate the binding from.
 // Deprecated: Use SystemConfigMetaData.ABI instead.
 var SystemConfigABI = SystemConfigMetaData.ABI
 
+// SystemConfigBin is the compiled bytecode used for deploying new contracts.
+// Deprecated: Use SystemConfigMetaData.Bin instead.
+var SystemConfigBin = SystemConfigMetaData.Bin
+
+// DeploySystemConfig deploys a new Ethereum contract, binding an instance of SystemConfig to it.
+func DeploySystemConfig(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *SystemConfig, error) {
+	parsed, err := SystemConfigMetaData.GetAbi()
+	if err != nil {
+		return common.Address{}, nil, nil, err
+	}
+	if parsed == nil {
+		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
+	}
+
+	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(SystemConfigBin), backend)
+	if err != nil {
+		return common.Address{}, nil, nil, err
+	}
+	return address, tx, &SystemConfig{SystemConfigCaller: SystemConfigCaller{contract: contract}, SystemConfigTransactor: SystemConfigTransactor{contract: contract}, SystemConfigFilterer: SystemConfigFilterer{contract: contract}}, nil
+}
+
 // SystemConfig is an auto generated Go binding around an Ethereum contract.
 type SystemConfig struct {
 	SystemConfigCaller     // Read-only binding to the contract
@@ -727,6 +757,37 @@ func (_SystemConfig *SystemConfigCallerSession) Eip1559Elasticity() (uint32, err
 	return _SystemConfig.Contract.Eip1559Elasticity(&_SystemConfig.CallOpts)
 }
 
+// FeeAdmin is a free data retrieval call binding the contract method 0x30a402c0.
+//
+// Solidity: function feeAdmin() view returns(address addr_)
+func (_SystemConfig *SystemConfigCaller) FeeAdmin(opts *bind.CallOpts) (common.Address, error) {
+	var out []interface{}
+	err := _SystemConfig.contract.Call(opts, &out, "feeAdmin")
+
+	if err != nil {
+		return *new(common.Address), err
+	}
+
+	out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address)
+
+	return out0, err
+
+}
+
+// FeeAdmin is a free data retrieval call binding the contract method 0x30a402c0.
+//
+// Solidity: function feeAdmin() view returns(address addr_)
+func (_SystemConfig *SystemConfigSession) FeeAdmin() (common.Address, error) {
+	return _SystemConfig.Contract.FeeAdmin(&_SystemConfig.CallOpts)
+}
+
+// FeeAdmin is a free data retrieval call binding the contract method 0x30a402c0.
+//
+// Solidity: function feeAdmin() view returns(address addr_)
+func (_SystemConfig *SystemConfigCallerSession) FeeAdmin() (common.Address, error) {
+	return _SystemConfig.Contract.FeeAdmin(&_SystemConfig.CallOpts)
+}
+
 // GasLimit is a free data retrieval call binding the contract method 0xf68016b7.
 //
 // Solidity: function gasLimit() view returns(uint64)
@@ -1330,25 +1391,25 @@ func (_SystemConfig *SystemConfigCallerSession) Version() (string, error) {
 	return _SystemConfig.Contract.Version(&_SystemConfig.CallOpts)
 }
 
-// Initialize is a paid mutator transaction binding the contract method 0xdb9040fa.
+// Initialize is a paid mutator transaction binding the contract method 0x22b4dded.
 //
-// Solidity: function initialize(address _owner, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, bytes32 _batcherHash, uint64 _gasLimit, address _unsafeBlockSigner, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
-func (_SystemConfig *SystemConfigTransactor) Initialize(opts *bind.TransactOpts, _owner common.Address, _basefeeScalar uint32, _blobbasefeeScalar uint32, _batcherHash [32]byte, _gasLimit uint64, _unsafeBlockSigner common.Address, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
-	return _SystemConfig.contract.Transact(opts, "initialize", _owner, _basefeeScalar, _blobbasefeeScalar, _batcherHash, _gasLimit, _unsafeBlockSigner, _config, _batchInbox, _addresses)
+// Solidity: function initialize((address,address,address,bytes32) _roles, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, uint64 _gasLimit, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
+func (_SystemConfig *SystemConfigTransactor) Initialize(opts *bind.TransactOpts, _roles SystemConfigRoles, _basefeeScalar uint32, _blobbasefeeScalar uint32, _gasLimit uint64, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
+	return _SystemConfig.contract.Transact(opts, "initialize", _roles, _basefeeScalar, _blobbasefeeScalar, _gasLimit, _config, _batchInbox, _addresses)
 }
 
-// Initialize is a paid mutator transaction binding the contract method 0xdb9040fa.
+// Initialize is a paid mutator transaction binding the contract method 0x22b4dded.
 //
-// Solidity: function initialize(address _owner, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, bytes32 _batcherHash, uint64 _gasLimit, address _unsafeBlockSigner, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
-func (_SystemConfig *SystemConfigSession) Initialize(_owner common.Address, _basefeeScalar uint32, _blobbasefeeScalar uint32, _batcherHash [32]byte, _gasLimit uint64, _unsafeBlockSigner common.Address, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
-	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _owner, _basefeeScalar, _blobbasefeeScalar, _batcherHash, _gasLimit, _unsafeBlockSigner, _config, _batchInbox, _addresses)
+// Solidity: function initialize((address,address,address,bytes32) _roles, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, uint64 _gasLimit, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
+func (_SystemConfig *SystemConfigSession) Initialize(_roles SystemConfigRoles, _basefeeScalar uint32, _blobbasefeeScalar uint32, _gasLimit uint64, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
+	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _roles, _basefeeScalar, _blobbasefeeScalar, _gasLimit, _config, _batchInbox, _addresses)
 }
 
-// Initialize is a paid mutator transaction binding the contract method 0xdb9040fa.
+// Initialize is a paid mutator transaction binding the contract method 0x22b4dded.
 //
-// Solidity: function initialize(address _owner, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, bytes32 _batcherHash, uint64 _gasLimit, address _unsafeBlockSigner, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
-func (_SystemConfig *SystemConfigTransactorSession) Initialize(_owner common.Address, _basefeeScalar uint32, _blobbasefeeScalar uint32, _batcherHash [32]byte, _gasLimit uint64, _unsafeBlockSigner common.Address, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
-	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _owner, _basefeeScalar, _blobbasefeeScalar, _batcherHash, _gasLimit, _unsafeBlockSigner, _config, _batchInbox, _addresses)
+// Solidity: function initialize((address,address,address,bytes32) _roles, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, uint64 _gasLimit, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
+func (_SystemConfig *SystemConfigTransactorSession) Initialize(_roles SystemConfigRoles, _basefeeScalar uint32, _blobbasefeeScalar uint32, _gasLimit uint64, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
+	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _roles, _basefeeScalar, _blobbasefeeScalar, _gasLimit, _config, _batchInbox, _addresses)
 }
 
 // RenounceOwnership is a paid mutator transaction binding the contract method 0x715018a6.
@@ -1414,6 +1475,27 @@ func (_SystemConfig *SystemConfigTransactorSession) SetEIP1559Params(_denominato
 	return _SystemConfig.Contract.SetEIP1559Params(&_SystemConfig.TransactOpts, _denominator, _elasticity)
 }
 
+// SetFeeVaultConfig is a paid mutator transaction binding the contract method 0xbe4be783.
+//
+// Solidity: function setFeeVaultConfig(uint8 _type, address _recipient, uint256 _min, uint8 _network) returns()
+func (_SystemConfig *SystemConfigTransactor) SetFeeVaultConfig(opts *bind.TransactOpts, _type uint8, _recipient common.Address, _min *big.Int, _network uint8) (*types.Transaction, error) {
+	return _SystemConfig.contract.Transact(opts, "setFeeVaultConfig", _type, _recipient, _min, _network)
+}
+
+// SetFeeVaultConfig is a paid mutator transaction binding the contract method 0xbe4be783.
+//
+// Solidity: function setFeeVaultConfig(uint8 _type, address _recipient, uint256 _min, uint8 _network) returns()
+func (_SystemConfig *SystemConfigSession) SetFeeVaultConfig(_type uint8, _recipient common.Address, _min *big.Int, _network uint8) (*types.Transaction, error) {
+	return _SystemConfig.Contract.SetFeeVaultConfig(&_SystemConfig.TransactOpts, _type, _recipient, _min, _network)
+}
+
+// SetFeeVaultConfig is a paid mutator transaction binding the contract method 0xbe4be783.
+//
+// Solidity: function setFeeVaultConfig(uint8 _type, address _recipient, uint256 _min, uint8 _network) returns()
+func (_SystemConfig *SystemConfigTransactorSession) SetFeeVaultConfig(_type uint8, _recipient common.Address, _min *big.Int, _network uint8) (*types.Transaction, error) {
+	return _SystemConfig.Contract.SetFeeVaultConfig(&_SystemConfig.TransactOpts, _type, _recipient, _min, _network)
+}
+
 // SetGasConfig is a paid mutator transaction binding the contract method 0x935f029e.
 //
 // Solidity: function setGasConfig(uint256 _overhead, uint256 _scalar) returns()
diff --git a/op-e2e/system/gastoken/gastoken_test.go b/op-e2e/system/gastoken/gastoken_test.go
index 7e03b19d3930..d83592f28b01 100644
--- a/op-e2e/system/gastoken/gastoken_test.go
+++ b/op-e2e/system/gastoken/gastoken_test.go
@@ -159,18 +159,21 @@ func setCustomGasToken(t *testing.T, cfg e2esys.SystemConfig, sys *e2esys.System
 	require.NoError(t, err)
 
 	// Get existing parameters from SystemConfigProxy contract
-	owner, err := systemConfig.Owner(&bind.CallOpts{})
+	roles := bindings.SystemConfigRoles{}
+	roles.Owner, err = systemConfig.Owner(&bind.CallOpts{})
+	require.NoError(t, err)
+	roles.FeeAdmin, err = systemConfig.FeeAdmin(&bind.CallOpts{})
+	require.NoError(t, err)
+	roles.UnsafeBlockSigner, err = systemConfig.UnsafeBlockSigner(&bind.CallOpts{})
+	require.NoError(t, err)
+	roles.BatcherHash, err = systemConfig.BatcherHash(&bind.CallOpts{})
 	require.NoError(t, err)
 	basefeeScalar, err := systemConfig.BasefeeScalar(&bind.CallOpts{})
 	require.NoError(t, err)
 	blobbasefeeScalar, err := systemConfig.BlobbasefeeScalar(&bind.CallOpts{})
 	require.NoError(t, err)
-	batcherHash, err := systemConfig.BatcherHash(&bind.CallOpts{})
-	require.NoError(t, err)
 	gasLimit, err := systemConfig.GasLimit(&bind.CallOpts{})
 	require.NoError(t, err)
-	unsafeBlockSigner, err := systemConfig.UnsafeBlockSigner(&bind.CallOpts{})
-	require.NoError(t, err)
 	resourceConfig, err := systemConfig.ResourceConfig(&bind.CallOpts{})
 	require.NoError(t, err)
 	batchInbox, err := systemConfig.BatchInbox(&bind.CallOpts{})
@@ -228,12 +231,10 @@ func setCustomGasToken(t *testing.T, cfg e2esys.SystemConfig, sys *e2esys.System
 	waitForTx(t, tx, err, l1Client)
 
 	// Reinitialise with existing initializer values but with custom gas token set
-	tx, err = systemConfig.Initialize(deployerOpts, owner,
+	tx, err = systemConfig.Initialize(deployerOpts, roles,
 		basefeeScalar,
 		blobbasefeeScalar,
-		batcherHash,
 		gasLimit,
-		unsafeBlockSigner,
 		resourceConfig,
 		batchInbox,
 		addresses)
diff --git a/packages/contracts-bedrock/.gas-snapshot b/packages/contracts-bedrock/.gas-snapshot
index 1b1a01905ba5..39eba667c79e 100644
--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
@@ -4,14 +4,14 @@ GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchm
 GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_benchmark() (gas: 5099)
 GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158531)
 GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369280)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967420)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564398)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076613)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467098)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512802)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72664)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 367239)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2965379)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 560245)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4072288)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 462746)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3508450)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 70492)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68422)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68986)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155610)
\ No newline at end of file
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68366)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68930)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155655)
\ No newline at end of file
diff --git a/packages/contracts-bedrock/deploy-config/devnetL1-template.json b/packages/contracts-bedrock/deploy-config/devnetL1-template.json
index 2f275f46c4f6..bec9c6631793 100644
--- a/packages/contracts-bedrock/deploy-config/devnetL1-template.json
+++ b/packages/contracts-bedrock/deploy-config/devnetL1-template.json
@@ -27,6 +27,7 @@
   "sequencerFeeVaultWithdrawalNetwork": 0,
   "proxyAdminOwner": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "finalSystemOwner": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
+  "systemConfigFeeAdmin": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "superchainConfigGuardian": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "finalizationPeriodSeconds": 2,
   "fundDevAccounts": true,
diff --git a/packages/contracts-bedrock/deploy-config/hardhat.json b/packages/contracts-bedrock/deploy-config/hardhat.json
index 965d403d4d82..9009f9157d3e 100644
--- a/packages/contracts-bedrock/deploy-config/hardhat.json
+++ b/packages/contracts-bedrock/deploy-config/hardhat.json
@@ -1,5 +1,6 @@
 {
   "finalSystemOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
+  "systemConfigFeeAdmin": "0x976EA74026E726554dB657fA54763abd0C3a0aa9",
   "superchainConfigGuardian": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
   "proxyAdminOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
   "l1StartingBlockTag": "earliest",
diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 59b16410f3a4..78c932ac7eea 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -76,7 +76,9 @@ runs = 256
 depth = 32
 
 [profile.ciheavy]
-fuzz = { runs = 20000 }
+# temp reduce fuzz runs for 1 pr
+# fuzz = { runs = 20000 }
+fuzz = { runs = 200 }
 
 [profile.ciheavy.invariant]
 runs = 128
diff --git a/packages/contracts-bedrock/scripts/Artifacts.s.sol b/packages/contracts-bedrock/scripts/Artifacts.s.sol
index 3ed021ea9dbb..c516d2cf55e9 100644
--- a/packages/contracts-bedrock/scripts/Artifacts.s.sol
+++ b/packages/contracts-bedrock/scripts/Artifacts.s.sol
@@ -47,7 +47,6 @@ abstract contract Artifacts {
     /// @notice Setup function. The arguments here
     function setUp() public virtual {
         deploymentOutfile = Config.deploymentOutfile();
-        console.log("Writing artifact to %s", deploymentOutfile);
         ForgeArtifacts.ensurePath(deploymentOutfile);
 
         uint256 chainId = Config.chainID();
@@ -183,7 +182,6 @@ abstract contract Artifacts {
     /// @param _name The name of the deployment.
     /// @param _deployed The address of the deployment.
     function save(string memory _name, address _deployed) public {
-        console.log("Saving %s: %s", _name, _deployed);
         if (bytes(_name).length == 0) {
             revert InvalidDeployment("EmptyName");
         }
diff --git a/packages/contracts-bedrock/scripts/L2Genesis.s.sol b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
index 207c59732146..098cb5e390f4 100644
--- a/packages/contracts-bedrock/scripts/L2Genesis.s.sol
+++ b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
@@ -8,27 +8,28 @@ import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 // Scripts
 import { Deployer } from "scripts/deploy/Deployer.sol";
 import { Config, OutputMode, OutputModeUtils, Fork, ForkUtils, LATEST_FORK } from "scripts/libraries/Config.sol";
+import { DeployConfig } from "scripts/deploy/DeployConfig.s.sol";
 import { Process } from "scripts/libraries/Process.sol";
 import { SetPreinstalls } from "scripts/SetPreinstalls.s.sol";
+
+// Contracts
+import { SequencerFeeVault } from "src/L2/SequencerFeeVault.sol";
+import { BaseFeeVault } from "src/L2/BaseFeeVault.sol";
+import { L1FeeVault } from "src/L2/L1FeeVault.sol";
+import { OptimismSuperchainERC20Beacon } from "src/L2/OptimismSuperchainERC20Beacon.sol";
+import { OptimismMintableERC721Factory } from "src/L2/OptimismMintableERC721Factory.sol";
+import { GovernanceToken } from "src/governance/GovernanceToken.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
+import { Constants } from "src/libraries/Constants.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
-import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
-import { IBaseFeeVault } from "src/L2/interfaces/IBaseFeeVault.sol";
-import { IL1FeeVault } from "src/L2/interfaces/IL1FeeVault.sol";
-import { IOptimismMintableERC721Factory } from "src/universal/interfaces/IOptimismMintableERC721Factory.sol";
 import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
-import { IL2StandardBridge } from "src/L2/interfaces/IL2StandardBridge.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
 import { IGasPriceOracle } from "src/L2/interfaces/IGasPriceOracle.sol";
 import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 
@@ -110,7 +111,12 @@ contract L2Genesis is Deployer {
     ///         Sets the precompiles, proxies, and the implementation accounts to be `vm.dumpState`
     ///         to generate a L2 genesis alloc.
     function runWithStateDump() public {
-        runWithOptions(Config.outputMode(), cfg.fork(), artifactDependencies());
+        runWithOptions({
+            _mode: Config.outputMode(),
+            _fork: Config.fork(),
+            _populateNetworkConfig: true,
+            _l1Dependencies: artifactDependencies()
+        });
     }
 
     /// @notice Alias for `runWithStateDump` so that no `--sig` needs to be specified.
@@ -120,45 +126,72 @@ contract L2Genesis is Deployer {
 
     /// @notice This is used by op-e2e to have a version of the L2 allocs for each upgrade.
     function runWithAllUpgrades() public {
-        runWithOptions(OutputMode.ALL, LATEST_FORK, artifactDependencies());
+        console.log("L2Genesis: runWithAllUpgrades");
+        runWithOptions({
+            _mode: OutputMode.ALL,
+            _fork: LATEST_FORK,
+            _populateNetworkConfig: true,
+            _l1Dependencies: artifactDependencies()
+        });
     }
 
     /// @notice This is used by new experimental interop deploy tooling.
     function runWithEnv() public {
         //  The setUp() is skipped (since we insert a custom DeployConfig, and do not use Artifacts)
         deployer = makeAddr("deployer");
-        runWithOptions(
-            OutputMode.NONE,
-            Config.fork(),
-            L1Dependencies({
+        runWithOptions({
+            _mode: OutputMode.NONE,
+            _fork: Config.fork(),
+            _populateNetworkConfig: false,
+            _l1Dependencies: L1Dependencies({
                 l1CrossDomainMessengerProxy: payable(vm.envAddress("L2GENESIS_L1CrossDomainMessengerProxy")),
                 l1StandardBridgeProxy: payable(vm.envAddress("L2GENESIS_L1StandardBridgeProxy")),
                 l1ERC721BridgeProxy: payable(vm.envAddress("L2GENESIS_L1ERC721BridgeProxy"))
             })
-        );
+        });
     }
 
     /// @notice This is used by foundry tests to enable the latest fork with the
     ///         given L1 dependencies.
     function runWithLatestLocal(L1Dependencies memory _l1Dependencies) public {
-        runWithOptions(OutputMode.NONE, LATEST_FORK, _l1Dependencies);
+        runWithOptions({
+            _mode: OutputMode.NONE,
+            _fork: LATEST_FORK,
+            _populateNetworkConfig: true,
+            _l1Dependencies: _l1Dependencies
+        });
     }
 
     /// @notice Build the L2 genesis.
-    function runWithOptions(OutputMode _mode, Fork _fork, L1Dependencies memory _l1Dependencies) public {
+    /// @param _mode The mode to run the script in.
+    /// @param _fork The fork to build the genesis for.
+    /// @param _populateNetworkConfig If true, the L1 Block contract will be populated with network specific
+    ///                                configuration. Otherwise, the standard genesis will be built.
+    function runWithOptions(
+        OutputMode _mode,
+        Fork _fork,
+        bool _populateNetworkConfig,
+        L1Dependencies memory _l1Dependencies
+    )
+        public
+    {
         console.log("L2Genesis: outputMode: %s, fork: %s", _mode.toString(), _fork.toString());
         vm.startPrank(deployer);
         vm.chainId(cfg.l2ChainID());
 
         dealEthToPrecompiles();
         setPredeployProxies();
-        setPredeployImplementations(_l1Dependencies);
+        setPredeployImplementations();
         setPreinstalls();
         if (cfg.fundDevAccounts()) {
             fundDevAccounts();
         }
         vm.stopPrank();
 
+        if (_populateNetworkConfig) {
+            _setNetworkConfig(_l1Dependencies, cfg);
+        }
+
         if (writeForkGenesisAllocs(_fork, Fork.DELTA, _mode)) {
             return;
         }
@@ -182,6 +215,59 @@ contract L2Genesis is Deployer {
         if (writeForkGenesisAllocs(_fork, Fork.HOLOCENE, _mode)) {
             return;
         }
+
+        if (writeForkGenesisAllocs(_fork, Fork.ISTHMUS, _mode)) {
+            return;
+        }
+    }
+
+    /// @notice Sets network-specific configuration in the L1Block contract
+    /// @param _l1Dependencies The L1 contract dependencies needed for configuration
+    function _setNetworkConfig(L1Dependencies memory _l1Dependencies, DeployConfig _config) internal {
+        console.log("L2Genesis: Modify the standard L2 genesis with network specific configuration");
+        vm.startPrank(Constants.DEPOSITOR_ACCOUNT);
+
+        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
+            Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS, abi.encode(_l1Dependencies.l1ERC721BridgeProxy)
+        );
+        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
+            Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS, abi.encode(_l1Dependencies.l1CrossDomainMessengerProxy)
+        );
+        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
+            Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS, abi.encode(_l1Dependencies.l1StandardBridgeProxy)
+        );
+
+        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
+            Types.ConfigType.REMOTE_CHAIN_ID, abi.encode(_config.l1ChainID())
+        );
+
+        bytes32 sequencerFeeVaultConfig = Encoding.encodeFeeVaultConfig({
+            _recipient: _config.sequencerFeeVaultRecipient(),
+            _amount: _config.sequencerFeeVaultMinimumWithdrawalAmount(),
+            _network: Types.WithdrawalNetwork(_config.sequencerFeeVaultWithdrawalNetwork())
+        });
+        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
+            Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG, abi.encode(sequencerFeeVaultConfig)
+        );
+
+        bytes32 baseFeeVaultConfig = Encoding.encodeFeeVaultConfig({
+            _recipient: _config.baseFeeVaultRecipient(),
+            _amount: _config.baseFeeVaultMinimumWithdrawalAmount(),
+            _network: Types.WithdrawalNetwork(_config.baseFeeVaultWithdrawalNetwork())
+        });
+        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
+            Types.ConfigType.BASE_FEE_VAULT_CONFIG, abi.encode(baseFeeVaultConfig)
+        );
+
+        bytes32 l1FeeVaultConfig = Encoding.encodeFeeVaultConfig({
+            _recipient: _config.l1FeeVaultRecipient(),
+            _amount: _config.l1FeeVaultMinimumWithdrawalAmount(),
+            _network: Types.WithdrawalNetwork(_config.l1FeeVaultWithdrawalNetwork())
+        });
+        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
+            Types.ConfigType.L1_FEE_VAULT_CONFIG, abi.encode(l1FeeVaultConfig)
+        );
+        vm.stopPrank();
     }
 
     function writeForkGenesisAllocs(Fork _latest, Fork _current, OutputMode _mode) internal returns (bool isLatest_) {
@@ -241,24 +327,20 @@ contract L2Genesis is Deployer {
     /// @notice Sets all the implementations for the predeploy proxies. For contracts without proxies,
     ///      sets the deployed bytecode at their expected predeploy address.
     ///      LEGACY_ERC20_ETH and L1_MESSAGE_SENDER are deprecated and are not set.
-    function setPredeployImplementations(L1Dependencies memory _l1Dependencies) internal {
-        console.log("Setting predeploy implementations with L1 contract dependencies:");
-        console.log("- L1CrossDomainMessengerProxy: %s", _l1Dependencies.l1CrossDomainMessengerProxy);
-        console.log("- L1StandardBridgeProxy: %s", _l1Dependencies.l1StandardBridgeProxy);
-        console.log("- L1ERC721BridgeProxy: %s", _l1Dependencies.l1ERC721BridgeProxy);
+    function setPredeployImplementations() internal {
         setLegacyMessagePasser(); // 0
         // 01: legacy, not used in OP-Stack
         setDeployerWhitelist(); // 2
         // 3,4,5: legacy, not used in OP-Stack.
         setWETH(); // 6: WETH (not behind a proxy)
-        setL2CrossDomainMessenger(_l1Dependencies.l1CrossDomainMessengerProxy); // 7
+        setL2CrossDomainMessenger(); // 7
         // 8,9,A,B,C,D,E: legacy, not used in OP-Stack.
         setGasPriceOracle(); // f
-        setL2StandardBridge(_l1Dependencies.l1StandardBridgeProxy); // 10
+        setL2StandardBridge(); // 10
         setSequencerFeeVault(); // 11
         setOptimismMintableERC20Factory(); // 12
         setL1BlockNumber(); // 13
-        setL2ERC721Bridge(_l1Dependencies.l1ERC721BridgeProxy); // 14
+        setL2ERC721Bridge(); // 14
         setL1Block(); // 15
         setL2ToL1MessagePasser(); // 16
         setOptimismMintableERC721Factory(); // 17
@@ -284,12 +366,9 @@ contract L2Genesis is Deployer {
         // Note the ProxyAdmin implementation itself is behind a proxy that owns itself.
         address impl = _setImplementationCode(Predeploys.PROXY_ADMIN);
 
-        bytes32 _ownerSlot = bytes32(0);
-
-        // there is no initialize() function, so we just set the storage manually.
-        vm.store(Predeploys.PROXY_ADMIN, _ownerSlot, bytes32(uint256(uint160(cfg.proxyAdminOwner()))));
         // update the proxy to not be uninitialized (although not standard initialize pattern)
-        vm.store(impl, _ownerSlot, bytes32(uint256(uint160(cfg.proxyAdminOwner()))));
+        bytes32 _ownerSlot = bytes32(0);
+        vm.store(impl, _ownerSlot, bytes32(uint256(0xdead)));
     }
 
     function setL2ToL1MessagePasser() public {
@@ -297,102 +376,40 @@ contract L2Genesis is Deployer {
     }
 
     /// @notice This predeploy is following the safety invariant #1.
-    function setL2CrossDomainMessenger(address payable _l1CrossDomainMessengerProxy) public {
-        address impl = _setImplementationCode(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
-
-        IL2CrossDomainMessenger(impl).initialize({ _l1CrossDomainMessenger: ICrossDomainMessenger(address(0)) });
-
-        IL2CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER).initialize({
-            _l1CrossDomainMessenger: ICrossDomainMessenger(_l1CrossDomainMessengerProxy)
-        });
+    function setL2CrossDomainMessenger() public {
+        _setImplementationCode(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
     }
 
     /// @notice This predeploy is following the safety invariant #1.
-    function setL2StandardBridge(address payable _l1StandardBridgeProxy) public {
-        address impl;
+    function setL2StandardBridge() public {
         if (cfg.useInterop()) {
             string memory cname = "L2StandardBridgeInterop";
-            impl = Predeploys.predeployToCodeNamespace(Predeploys.L2_STANDARD_BRIDGE);
+            address impl = Predeploys.predeployToCodeNamespace(Predeploys.L2_STANDARD_BRIDGE);
             console.log("Setting %s implementation at: %s", cname, impl);
             vm.etch(impl, vm.getDeployedCode(string.concat(cname, ".sol:", cname)));
         } else {
-            impl = _setImplementationCode(Predeploys.L2_STANDARD_BRIDGE);
+            _setImplementationCode(Predeploys.L2_STANDARD_BRIDGE);
         }
-
-        IL2StandardBridge(payable(impl)).initialize({ _otherBridge: IStandardBridge(payable(address(0))) });
-
-        IL2StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE)).initialize({
-            _otherBridge: IStandardBridge(_l1StandardBridgeProxy)
-        });
     }
 
     /// @notice This predeploy is following the safety invariant #1.
-    function setL2ERC721Bridge(address payable _l1ERC721BridgeProxy) public {
-        address impl = _setImplementationCode(Predeploys.L2_ERC721_BRIDGE);
-
-        IL2ERC721Bridge(impl).initialize({ _l1ERC721Bridge: payable(address(0)) });
-
-        IL2ERC721Bridge(Predeploys.L2_ERC721_BRIDGE).initialize({ _l1ERC721Bridge: payable(_l1ERC721BridgeProxy) });
+    function setL2ERC721Bridge() public {
+        _setImplementationCode(Predeploys.L2_ERC721_BRIDGE);
     }
 
     /// @notice This predeploy is following the safety invariant #2,
     function setSequencerFeeVault() public {
-        ISequencerFeeVault vault = ISequencerFeeVault(
-            DeployUtils.create1(
-                "SequencerFeeVault",
-                DeployUtils.encodeConstructor(
-                    abi.encodeCall(
-                        ISequencerFeeVault.__constructor__,
-                        (
-                            cfg.sequencerFeeVaultRecipient(),
-                            cfg.sequencerFeeVaultMinimumWithdrawalAmount(),
-                            Types.WithdrawalNetwork(cfg.sequencerFeeVaultWithdrawalNetwork())
-                        )
-                    )
-                )
-            )
-        );
-
-        address impl = Predeploys.predeployToCodeNamespace(Predeploys.SEQUENCER_FEE_WALLET);
-        console.log("Setting %s implementation at: %s", "SequencerFeeVault", impl);
-        vm.etch(impl, address(vault).code);
-
-        /// Reset so its not included state dump
-        vm.etch(address(vault), "");
-        vm.resetNonce(address(vault));
+        _setImplementationCode(Predeploys.SEQUENCER_FEE_WALLET);
     }
 
     /// @notice This predeploy is following the safety invariant #1.
     function setOptimismMintableERC20Factory() public {
-        address impl = _setImplementationCode(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
-
-        IOptimismMintableERC20Factory(impl).initialize({ _bridge: address(0) });
-
-        IOptimismMintableERC20Factory(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY).initialize({
-            _bridge: Predeploys.L2_STANDARD_BRIDGE
-        });
+        _setImplementationCode(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
     }
 
     /// @notice This predeploy is following the safety invariant #2,
     function setOptimismMintableERC721Factory() public {
-        IOptimismMintableERC721Factory factory = IOptimismMintableERC721Factory(
-            DeployUtils.create1(
-                "OptimismMintableERC721Factory",
-                DeployUtils.encodeConstructor(
-                    abi.encodeCall(
-                        IOptimismMintableERC721Factory.__constructor__, (Predeploys.L2_ERC721_BRIDGE, cfg.l1ChainID())
-                    )
-                )
-            )
-        );
-
-        address impl = Predeploys.predeployToCodeNamespace(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
-        console.log("Setting %s implementation at: %s", "OptimismMintableERC721Factory", impl);
-        vm.etch(impl, address(factory).code);
-
-        /// Reset so its not included state dump
-        vm.etch(address(factory), "");
-        vm.resetNonce(address(factory));
+        _setImplementationCode(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
     }
 
     /// @notice This predeploy is following the safety invariant #1.
@@ -439,56 +456,12 @@ contract L2Genesis is Deployer {
 
     /// @notice This predeploy is following the safety invariant #2.
     function setBaseFeeVault() public {
-        IBaseFeeVault vault = IBaseFeeVault(
-            DeployUtils.create1(
-                "BaseFeeVault",
-                DeployUtils.encodeConstructor(
-                    abi.encodeCall(
-                        IBaseFeeVault.__constructor__,
-                        (
-                            cfg.baseFeeVaultRecipient(),
-                            cfg.baseFeeVaultMinimumWithdrawalAmount(),
-                            Types.WithdrawalNetwork(cfg.baseFeeVaultWithdrawalNetwork())
-                        )
-                    )
-                )
-            )
-        );
-
-        address impl = Predeploys.predeployToCodeNamespace(Predeploys.BASE_FEE_VAULT);
-        console.log("Setting %s implementation at: %s", "BaseFeeVault", impl);
-        vm.etch(impl, address(vault).code);
-
-        /// Reset so its not included state dump
-        vm.etch(address(vault), "");
-        vm.resetNonce(address(vault));
+        _setImplementationCode(Predeploys.BASE_FEE_VAULT);
     }
 
     /// @notice This predeploy is following the safety invariant #2.
     function setL1FeeVault() public {
-        IL1FeeVault vault = IL1FeeVault(
-            DeployUtils.create1(
-                "L1FeeVault",
-                DeployUtils.encodeConstructor(
-                    abi.encodeCall(
-                        IL1FeeVault.__constructor__,
-                        (
-                            cfg.l1FeeVaultRecipient(),
-                            cfg.l1FeeVaultMinimumWithdrawalAmount(),
-                            Types.WithdrawalNetwork(cfg.l1FeeVaultWithdrawalNetwork())
-                        )
-                    )
-                )
-            )
-        );
-
-        address impl = Predeploys.predeployToCodeNamespace(Predeploys.L1_FEE_VAULT);
-        console.log("Setting %s implementation at: %s", "L1FeeVault", impl);
-        vm.etch(impl, address(vault).code);
-
-        /// Reset so its not included state dump
-        vm.etch(address(vault), "");
-        vm.resetNonce(address(vault));
+        _setImplementationCode(Predeploys.L1_FEE_VAULT);
     }
 
     /// @notice This predeploy is following the safety invariant #2.
diff --git a/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol b/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
index 25d67be3828c..e176a1d7c53e 100644
--- a/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
+++ b/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
@@ -13,6 +13,7 @@ import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Types } from "scripts/libraries/Types.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Interfaces
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
@@ -40,8 +41,7 @@ library ChainAssertions {
     function postDeployAssertions(
         Types.ContractSet memory _prox,
         DeployConfig _cfg,
-        uint256 _l2OutputOracleStartingTimestamp,
-        Vm _vm
+        uint256 _l2OutputOracleStartingTimestamp
     )
         internal
         view
@@ -52,7 +52,7 @@ library ChainAssertions {
         require(keccak256(abi.encode(rcfg)) == keccak256(abi.encode(dflt)));
 
         checkSystemConfig({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
-        checkL1CrossDomainMessenger({ _contracts: _prox, _vm: _vm, _isProxy: true });
+        checkL1CrossDomainMessenger({ _contracts: _prox, _isProxy: true });
         checkL1StandardBridge({ _contracts: _prox, _isProxy: true });
         checkL2OutputOracle({
             _contracts: _prox,
@@ -77,7 +77,7 @@ library ChainAssertions {
         );
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(config), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(config), _slot: 0, _offset: 0 });
 
         IResourceMetering.ResourceConfig memory resourceConfig = config.resourceConfig();
 
@@ -109,18 +109,18 @@ library ChainAssertions {
             require(config.optimismPortal() == _contracts.OptimismPortal, "CHECK-SCFG-200");
             require(config.optimismMintableERC20Factory() == _contracts.OptimismMintableERC20Factory, "CHECK-SCFG-210");
         } else {
-            require(config.owner() == address(0xdead), "CHECK-SCFG-220");
+            require(config.owner() == address(0), "CHECK-SCFG-220");
             require(config.overhead() == 0, "CHECK-SCFG-230");
-            require(config.scalar() == uint256(0x01) << 248, "CHECK-SCFG-240"); // version 1
+            require(config.scalar() == 0, "CHECK-SCFG-240");
             require(config.basefeeScalar() == 0, "CHECK-SCFG-250");
             require(config.blobbasefeeScalar() == 0, "CHECK-SCFG-260");
             require(config.batcherHash() == bytes32(0), "CHECK-SCFG-270");
-            require(config.gasLimit() == 1, "CHECK-SCFG-280");
+            require(config.gasLimit() == 0, "CHECK-SCFG-280");
             require(config.unsafeBlockSigner() == address(0), "CHECK-SCFG-290");
             // Check _config
-            require(resourceConfig.maxResourceLimit == 1, "CHECK-SCFG-300");
-            require(resourceConfig.elasticityMultiplier == 1, "CHECK-SCFG-310");
-            require(resourceConfig.baseFeeMaxChangeDenominator == 2, "CHECK-SCFG-320");
+            require(resourceConfig.maxResourceLimit == 0, "CHECK-SCFG-300");
+            require(resourceConfig.elasticityMultiplier == 0, "CHECK-SCFG-310");
+            require(resourceConfig.baseFeeMaxChangeDenominator == 0, "CHECK-SCFG-320");
             require(resourceConfig.systemTxMaxGas == 0, "CHECK-SCFG-330");
             require(resourceConfig.minimumBaseFee == 0, "CHECK-SCFG-340");
             require(resourceConfig.maximumBaseFee == 0, "CHECK-SCFG-350");
@@ -163,7 +163,7 @@ library ChainAssertions {
     }
 
     /// @notice Asserts that the L1CrossDomainMessenger is setup correctly
-    function checkL1CrossDomainMessenger(Types.ContractSet memory _contracts, Vm _vm, bool _isProxy) internal view {
+    function checkL1CrossDomainMessenger(Types.ContractSet memory _contracts, bool _isProxy) internal view {
         IL1CrossDomainMessenger messenger = IL1CrossDomainMessenger(_contracts.L1CrossDomainMessenger);
         console.log(
             "Running chain assertions on the L1CrossDomainMessenger %s at %s",
@@ -173,7 +173,7 @@ library ChainAssertions {
         require(address(messenger) != address(0), "CHECK-L1XDM-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(messenger), _slot: 0, _offset: 20 });
+        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 250, _offset: 0 });
 
         require(address(messenger.OTHER_MESSENGER()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "CHECK-L1XDM-20");
         require(address(messenger.otherMessenger()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "CHECK-L1XDM-30");
@@ -182,8 +182,6 @@ library ChainAssertions {
             require(address(messenger.PORTAL()) == _contracts.OptimismPortal, "CHECK-L1XDM-40");
             require(address(messenger.portal()) == _contracts.OptimismPortal, "CHECK-L1XDM-50");
             require(address(messenger.superchainConfig()) == _contracts.SuperchainConfig, "CHECK-L1XDM-60");
-            bytes32 xdmSenderSlot = _vm.load(address(messenger), bytes32(uint256(204)));
-            require(address(uint160(uint256(xdmSenderSlot))) == Constants.DEFAULT_L2_SENDER, "CHECK-L1XDM-70");
         } else {
             require(address(messenger.PORTAL()) == address(0), "CHECK-L1XDM-80");
             require(address(messenger.portal()) == address(0), "CHECK-L1XDM-90");
@@ -202,7 +200,7 @@ library ChainAssertions {
         require(address(bridge) != address(0), "CHECK-L1SB-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 49, _offset: 0 });
 
         if (_isProxy) {
             require(address(bridge.MESSENGER()) == _contracts.L1CrossDomainMessenger, "CHECK-L1SB-20");
@@ -237,7 +235,7 @@ library ChainAssertions {
         require(address(factory) != address(0), "CHECK-DG-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
 
         // The same check is made for both proxy and implementation
         require(factory.owner() == _expectedOwner, "CHECK-DG-20");
@@ -277,7 +275,7 @@ library ChainAssertions {
         require(address(weth) != address(0), "CHECK-DWETH-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(weth.owner() == _expectedOwner, "CHECK-DWETH-20");
@@ -308,7 +306,7 @@ library ChainAssertions {
         require(address(weth) != address(0), "CHECK-PDWETH-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(weth.owner() == _expectedOwner, "CHECK-PDWETH-20");
@@ -339,7 +337,7 @@ library ChainAssertions {
         require(address(oracle) != address(0), "CHECK-L2OO-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(oracle), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(oracle), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(oracle.SUBMISSION_INTERVAL() == _cfg.l2OutputOracleSubmissionInterval(), "CHECK-L2OO-20");
@@ -381,7 +379,7 @@ library ChainAssertions {
         require(address(factory) != address(0), "CHECK-MERC20F-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 51, _offset: 0 });
 
         if (_isProxy) {
             require(factory.BRIDGE() == _contracts.L1StandardBridge, "CHECK-MERC20F-10");
@@ -404,7 +402,7 @@ library ChainAssertions {
         require(address(bridge) != address(0), "CHECK-L1ERC721B-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge) });
 
         require(address(bridge.OTHER_BRIDGE()) == Predeploys.L2_ERC721_BRIDGE, "CHECK-L1ERC721B-10");
         require(address(bridge.otherBridge()) == Predeploys.L2_ERC721_BRIDGE, "CHECK-L1ERC721B-20");
@@ -431,7 +429,7 @@ library ChainAssertions {
         require(address(portal) != address(0), "CHECK-OP-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
 
         address guardian = _cfg.superchainConfigGuardian();
         if (guardian.code.length == 0) {
@@ -471,7 +469,7 @@ library ChainAssertions {
         require(address(portal) != address(0), "CHECK-OP2-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
 
         address guardian = _cfg.superchainConfigGuardian();
         if (guardian.code.length == 0) {
@@ -514,7 +512,7 @@ library ChainAssertions {
         require(address(versions) != address(0), "CHECK-PV-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(versions), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(versions), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(versions.owner() == _cfg.finalSystemOwner(), "CHECK-PV-20");
@@ -546,7 +544,7 @@ library ChainAssertions {
         require(address(superchainConfig) != address(0), "CHECK-SC-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(superchainConfig), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(superchainConfig), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(superchainConfig.guardian() == _cfg.superchainConfigGuardian(), "CHECK-SC-20");
@@ -568,7 +566,7 @@ library ChainAssertions {
         require(address(opcm) != address(0), "CHECK-OPCM-10");
 
         // Check that the contract is initialized
-        assertInitializedSlotIsSet({ _contractAddress: address(opcm), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(opcm), _slot: 0, _offset: 0 });
 
         // These values are immutable so are shared by the proxy and implementation
         require(address(opcm.superchainConfig()) == address(_contracts.SuperchainConfig), "CHECK-OPCM-30");
@@ -576,15 +574,4 @@ library ChainAssertions {
 
         // TODO: Add assertions for blueprints and setters?
     }
-
-    /// @dev Asserts that for a given contract the value of a storage slot at an offset is 1 or 0xff.
-    ///      A call to `initialize` will set it to 1 and a call to _disableInitializers will set it to 0xff.
-    function assertInitializedSlotIsSet(address _contractAddress, uint256 _slot, uint256 _offset) internal view {
-        bytes32 slotVal = vm.load(_contractAddress, bytes32(_slot));
-        uint8 val = uint8((uint256(slotVal) >> (_offset * 8)) & 0xFF);
-        require(
-            val == uint8(1) || val == uint8(0xff),
-            "ChainAssertions: storage value is not 1 or 0xff at the given slot and offset"
-        );
-    }
 }
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index d40c03987d53..ad3a53b159d5 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -155,7 +155,7 @@ contract Deploy is Deployer {
             DelayedWETH: getAddress("DelayedWETHProxy"),
             PermissionedDelayedWETH: getAddress("PermissionedDelayedWETHProxy"),
             AnchorStateRegistry: getAddress("AnchorStateRegistryProxy"),
-            OptimismMintableERC20Factory: getAddress("OptimismMintableERC20FactoryProxy"),
+            OptimismMintableERC20Factory: getAddress("L1OptimismMintableERC20FactoryProxy"),
             OptimismPortal: getAddress("OptimismPortalProxy"),
             OptimismPortal2: getAddress("OptimismPortalProxy"),
             SystemConfig: getAddress("SystemConfigProxy"),
@@ -176,7 +176,7 @@ contract Deploy is Deployer {
             DelayedWETH: getAddress("DelayedWETH"),
             PermissionedDelayedWETH: getAddress("PermissionedDelayedWETH"),
             AnchorStateRegistry: getAddress("AnchorStateRegistry"),
-            OptimismMintableERC20Factory: getAddress("OptimismMintableERC20Factory"),
+            OptimismMintableERC20Factory: getAddress("L1OptimismMintableERC20Factory"),
             OptimismPortal: getAddress("OptimismPortal"),
             OptimismPortal2: getAddress("OptimismPortal2"),
             SystemConfig: getAddress("SystemConfig"),
@@ -398,7 +398,9 @@ contract Deploy is Deployer {
         }
 
         save("L1CrossDomainMessenger", address(dio.l1CrossDomainMessengerImpl()));
+        // Save under both names for backwards compatibility
         save("OptimismMintableERC20Factory", address(dio.optimismMintableERC20FactoryImpl()));
+        save("L1OptimismMintableERC20Factory", address(dio.optimismMintableERC20FactoryImpl()));
         save("SystemConfig", address(dio.systemConfigImpl()));
         save("L1StandardBridge", address(dio.l1StandardBridgeImpl()));
         save("L1ERC721Bridge", address(dio.l1ERC721BridgeImpl()));
@@ -413,7 +415,7 @@ contract Deploy is Deployer {
         save("OPContractsManager", address(dio.opcmImpl()));
 
         Types.ContractSet memory contracts = _impls();
-        ChainAssertions.checkL1CrossDomainMessenger({ _contracts: contracts, _vm: vm, _isProxy: false });
+        ChainAssertions.checkL1CrossDomainMessenger({ _contracts: contracts, _isProxy: false });
         ChainAssertions.checkL1StandardBridge({ _contracts: contracts, _isProxy: false });
         ChainAssertions.checkL1ERC721Bridge({ _contracts: contracts, _isProxy: false });
         ChainAssertions.checkOptimismPortal2({ _contracts: contracts, _cfg: cfg, _isProxy: false });
@@ -456,7 +458,9 @@ contract Deploy is Deployer {
         save("AddressManager", address(deployOutput.addressManager));
         save("L1ERC721BridgeProxy", address(deployOutput.l1ERC721BridgeProxy));
         save("SystemConfigProxy", address(deployOutput.systemConfigProxy));
+        // Save under both names for backwards compatibility
         save("OptimismMintableERC20FactoryProxy", address(deployOutput.optimismMintableERC20FactoryProxy));
+        save("L1OptimismMintableERC20FactoryProxy", address(deployOutput.optimismMintableERC20FactoryProxy));
         save("L1StandardBridgeProxy", address(deployOutput.l1StandardBridgeProxy));
         save("L1CrossDomainMessengerProxy", address(deployOutput.l1CrossDomainMessengerProxy));
 
@@ -823,12 +827,15 @@ contract Deploy is Deployer {
             _data: abi.encodeCall(
                 ISystemConfig.initialize,
                 (
-                    cfg.finalSystemOwner(),
+                    ISystemConfig.Roles({
+                        owner: cfg.finalSystemOwner(),
+                        feeAdmin: cfg.systemConfigFeeAdmin(),
+                        unsafeBlockSigner: cfg.p2pSequencerAddress(),
+                        batcherHash: batcherHash
+                    }),
                     cfg.basefeeScalar(),
                     cfg.blobbasefeeScalar(),
-                    batcherHash,
                     uint64(cfg.l2GenesisBlockGasLimit()),
-                    cfg.p2pSequencerAddress(),
                     Constants.DEFAULT_RESOURCE_CONFIG(),
                     cfg.batchInboxAddress(),
                     ISystemConfig.Addresses({
@@ -837,7 +844,7 @@ contract Deploy is Deployer {
                         l1StandardBridge: mustGetAddress("L1StandardBridgeProxy"),
                         disputeGameFactory: mustGetAddress("DisputeGameFactoryProxy"),
                         optimismPortal: mustGetAddress("OptimismPortalProxy"),
-                        optimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy"),
+                        optimismMintableERC20Factory: mustGetAddress("L1OptimismMintableERC20FactoryProxy"),
                         gasPayingToken: customGasTokenAddress
                     })
                 )
@@ -1264,7 +1271,8 @@ contract Deploy is Deployer {
                 batcher: cfg.batchSenderAddress(),
                 unsafeBlockSigner: cfg.p2pSequencerAddress(),
                 proposer: cfg.l2OutputOracleProposer(),
-                challenger: cfg.l2OutputOracleChallenger()
+                challenger: cfg.l2OutputOracleChallenger(),
+                systemConfigFeeAdmin: cfg.systemConfigFeeAdmin()
             }),
             basefeeScalar: cfg.basefeeScalar(),
             blobBasefeeScalar: cfg.blobbasefeeScalar(),
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
index 69341dd3e874..a95346f093b5 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
@@ -86,6 +86,7 @@ contract DeployConfig is Script {
     uint256 public daResolveWindow;
     uint256 public daBondSize;
     uint256 public daResolverRefundPercentage;
+    address public systemConfigFeeAdmin;
 
     bool public useCustomGasToken;
     address public customGasTokenAddress;
@@ -101,6 +102,7 @@ contract DeployConfig is Script {
         }
 
         finalSystemOwner = stdJson.readAddress(_json, "$.finalSystemOwner");
+        systemConfigFeeAdmin = stdJson.readAddress(_json, "$.systemConfigFeeAdmin");
         superchainConfigGuardian = stdJson.readAddress(_json, "$.superchainConfigGuardian");
         l1ChainID = stdJson.readUint(_json, "$.l1ChainID");
         l2ChainID = stdJson.readUint(_json, "$.l2ChainID");
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
index c9048a07dfa3..40f9b79c5580 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
@@ -29,7 +29,8 @@ import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
 import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
+import { IL1OptimismMintableERC20Factory as IOptimismMintableERC20Factory } from
+    "src/L1/interfaces/IL1OptimismMintableERC20Factory.sol";
 
 import { OPContractsManagerInterop } from "src/L1/OPContractsManagerInterop.sol";
 import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
@@ -370,19 +371,19 @@ contract DeployImplementationsOutput is BaseDeployIO {
 
         DeployUtils.assertInitialized({ _contractAddress: address(systemConfig), _slot: 0, _offset: 0 });
 
-        require(systemConfig.owner() == address(0xdead), "SYSCON-10");
+        require(systemConfig.owner() == address(0), "SYSCON-10");
         require(systemConfig.overhead() == 0, "SYSCON-20");
-        require(systemConfig.scalar() == uint256(0x01) << 248, "SYSCON-30");
+        require(systemConfig.scalar() == 0, "SYSCON-30");
         require(systemConfig.basefeeScalar() == 0, "SYSCON-40");
         require(systemConfig.blobbasefeeScalar() == 0, "SYSCON-50");
         require(systemConfig.batcherHash() == bytes32(0), "SYSCON-60");
-        require(systemConfig.gasLimit() == 1, "SYSCON-70");
+        require(systemConfig.gasLimit() == 0, "SYSCON-70");
         require(systemConfig.unsafeBlockSigner() == address(0), "SYSCON-80");
 
         IResourceMetering.ResourceConfig memory resourceConfig = systemConfig.resourceConfig();
-        require(resourceConfig.maxResourceLimit == 1, "SYSCON-90");
-        require(resourceConfig.elasticityMultiplier == 1, "SYSCON-100");
-        require(resourceConfig.baseFeeMaxChangeDenominator == 2, "SYSCON-110");
+        require(resourceConfig.maxResourceLimit == 0, "SYSCON-90");
+        require(resourceConfig.elasticityMultiplier == 0, "SYSCON-100");
+        require(resourceConfig.baseFeeMaxChangeDenominator == 0, "SYSCON-110");
         require(resourceConfig.systemTxMaxGas == 0, "SYSCON-120");
         require(resourceConfig.minimumBaseFee == 0, "SYSCON-130");
         require(resourceConfig.maximumBaseFee == 0, "SYSCON-140");
@@ -400,7 +401,7 @@ contract DeployImplementationsOutput is BaseDeployIO {
     function assertValidL1CrossDomainMessengerImpl(DeployImplementationsInput) internal view {
         IL1CrossDomainMessenger messenger = l1CrossDomainMessengerImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 0, _offset: 20 });
+        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 250, _offset: 0 });
 
         require(address(messenger.OTHER_MESSENGER()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-10");
         require(address(messenger.otherMessenger()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-20");
@@ -408,14 +409,15 @@ contract DeployImplementationsOutput is BaseDeployIO {
         require(address(messenger.portal()) == address(0), "L1xDM-40");
         require(address(messenger.superchainConfig()) == address(0), "L1xDM-50");
 
-        bytes32 xdmSenderSlot = vm.load(address(messenger), bytes32(uint256(204)));
-        require(address(uint160(uint256(xdmSenderSlot))) == Constants.DEFAULT_L2_SENDER, "L1xDM-60");
+        // TODO: vm.expectRevert is not supported by op-chain-ops, so we can't check this yet.
+        // vm.expectRevert("CrossDomainMessenger: xDomainMessageSender is not set");
+        // messenger.xDomainMessageSender();
     }
 
     function assertValidL1ERC721BridgeImpl(DeployImplementationsInput) internal view {
         IL1ERC721Bridge bridge = l1ERC721BridgeImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge) });
 
         require(address(bridge.OTHER_BRIDGE()) == Predeploys.L2_ERC721_BRIDGE, "L721B-10");
         require(address(bridge.otherBridge()) == Predeploys.L2_ERC721_BRIDGE, "L721B-20");
@@ -427,7 +429,7 @@ contract DeployImplementationsOutput is BaseDeployIO {
     function assertValidL1StandardBridgeImpl(DeployImplementationsInput) internal view {
         IL1StandardBridge bridge = l1StandardBridgeImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 49, _offset: 0 });
 
         require(address(bridge.MESSENGER()) == address(0), "L1SB-10");
         require(address(bridge.messenger()) == address(0), "L1SB-20");
@@ -439,7 +441,7 @@ contract DeployImplementationsOutput is BaseDeployIO {
     function assertValidOptimismMintableERC20FactoryImpl(DeployImplementationsInput) internal view {
         IOptimismMintableERC20Factory factory = optimismMintableERC20FactoryImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 51, _offset: 0 });
 
         require(address(factory.BRIDGE()) == address(0), "MERC20F-10");
         require(address(factory.bridge()) == address(0), "MERC20F-20");
@@ -788,7 +790,7 @@ contract DeployImplementations is Script {
             vm.broadcast(msg.sender);
             impl = IOptimismMintableERC20Factory(
                 DeployUtils.create1({
-                    _name: "OptimismMintableERC20Factory",
+                    _name: "L1OptimismMintableERC20Factory",
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismMintableERC20Factory.__constructor__, ()))
                 })
             );
@@ -796,7 +798,7 @@ contract DeployImplementations is Script {
             revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
-        vm.label(address(impl), "OptimismMintableERC20FactoryImpl");
+        vm.label(address(impl), "L1OptimismMintableERC20FactoryImpl");
         _dio.set(_dio.optimismMintableERC20FactoryImpl.selector, address(impl));
     }
 
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
index 7a5d1f5cc6b2..247a0575f009 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
@@ -38,6 +38,7 @@ import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimis
 contract DeployOPChainInput is BaseDeployIO {
     address internal _opChainProxyAdminOwner;
     address internal _systemConfigOwner;
+    address internal _systemConfigFeeAdmin;
     address internal _batcher;
     address internal _unsafeBlockSigner;
     address internal _proposer;
@@ -64,6 +65,7 @@ contract DeployOPChainInput is BaseDeployIO {
         require(_addr != address(0), "DeployOPChainInput: cannot set zero address");
         if (_sel == this.opChainProxyAdminOwner.selector) _opChainProxyAdminOwner = _addr;
         else if (_sel == this.systemConfigOwner.selector) _systemConfigOwner = _addr;
+        else if (_sel == this.systemConfigFeeAdmin.selector) _systemConfigFeeAdmin = _addr;
         else if (_sel == this.batcher.selector) _batcher = _addr;
         else if (_sel == this.unsafeBlockSigner.selector) _unsafeBlockSigner = _addr;
         else if (_sel == this.proposer.selector) _proposer = _addr;
@@ -123,6 +125,11 @@ contract DeployOPChainInput is BaseDeployIO {
         return _systemConfigOwner;
     }
 
+    function systemConfigFeeAdmin() public view returns (address) {
+        require(_systemConfigFeeAdmin != address(0), "DeployOPChainInput: not set");
+        return _systemConfigFeeAdmin;
+    }
+
     function batcher() public view returns (address) {
         require(_batcher != address(0), "DeployOPChainInput: not set");
         return _batcher;
@@ -355,7 +362,8 @@ contract DeployOPChain is Script {
             batcher: _doi.batcher(),
             unsafeBlockSigner: _doi.unsafeBlockSigner(),
             proposer: _doi.proposer(),
-            challenger: _doi.challenger()
+            challenger: _doi.challenger(),
+            systemConfigFeeAdmin: _doi.systemConfigFeeAdmin()
         });
         OPContractsManager.DeployInput memory deployInput = OPContractsManager.DeployInput({
             roles: roles,
@@ -572,7 +580,7 @@ contract DeployOPChain is Script {
     function assertValidL1CrossDomainMessenger(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {
         IL1CrossDomainMessenger messenger = _doo.l1CrossDomainMessengerProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 0, _offset: 20 });
+        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 250, _offset: 0 });
 
         require(address(messenger.OTHER_MESSENGER()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-10");
         require(address(messenger.otherMessenger()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-20");
@@ -581,15 +589,16 @@ contract DeployOPChain is Script {
         require(address(messenger.portal()) == address(_doo.optimismPortalProxy()), "L1xDM-40");
         require(address(messenger.superchainConfig()) == address(_doi.opcmProxy().superchainConfig()), "L1xDM-50");
 
-        bytes32 xdmSenderSlot = vm.load(address(messenger), bytes32(uint256(204)));
-        require(address(uint160(uint256(xdmSenderSlot))) == Constants.DEFAULT_L2_SENDER, "L1xDM-60");
+        // TODO: vm.expectRevert is not supported by op-chain-ops, so we can't check this yet.
+        // vm.expectRevert("CrossDomainMessenger: xDomainMessageSender is not set");
+        // messenger.xDomainMessageSender();
     }
 
     function assertValidL1StandardBridge(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {
         IL1StandardBridge bridge = _doo.l1StandardBridgeProxy();
         IL1CrossDomainMessenger messenger = _doo.l1CrossDomainMessengerProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 49, _offset: 0 });
 
         require(address(bridge.MESSENGER()) == address(messenger), "L1SB-10");
         require(address(bridge.messenger()) == address(messenger), "L1SB-20");
@@ -601,7 +610,7 @@ contract DeployOPChain is Script {
     function assertValidOptimismMintableERC20Factory(DeployOPChainInput, DeployOPChainOutput _doo) internal {
         IOptimismMintableERC20Factory factory = _doo.optimismMintableERC20FactoryProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 51, _offset: 0 });
 
         require(factory.BRIDGE() == address(_doo.l1StandardBridgeProxy()), "MERC20F-10");
         require(factory.bridge() == address(_doo.l1StandardBridgeProxy()), "MERC20F-20");
@@ -610,7 +619,7 @@ contract DeployOPChain is Script {
     function assertValidL1ERC721Bridge(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {
         IL1ERC721Bridge bridge = _doo.l1ERC721BridgeProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge) });
 
         require(address(bridge.OTHER_BRIDGE()) == Predeploys.L2_ERC721_BRIDGE, "L721B-10");
         require(address(bridge.otherBridge()) == Predeploys.L2_ERC721_BRIDGE, "L721B-20");
diff --git a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
index 74492556e1b1..f2f39e660acd 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
@@ -359,6 +359,7 @@ contract DeploySuperchain is Script {
 
     function deployAndInitializeSuperchainConfig(DeploySuperchainInput _dsi, DeploySuperchainOutput _dso) public {
         address guardian = _dsi.guardian();
+        address upgrader = _dsi.superchainProxyAdminOwner();
         bool paused = _dsi.paused();
 
         IProxyAdmin superchainProxyAdmin = _dso.superchainProxyAdmin();
@@ -376,7 +377,7 @@ contract DeploySuperchain is Script {
         superchainProxyAdmin.upgradeAndCall(
             payable(address(superchainConfigProxy)),
             address(superchainConfigImpl),
-            abi.encodeCall(ISuperchainConfig.initialize, (guardian, paused))
+            abi.encodeCall(ISuperchainConfig.initialize, (guardian, upgrader, paused))
         );
         vm.stopBroadcast();
 
diff --git a/packages/contracts-bedrock/scripts/libraries/Config.sol b/packages/contracts-bedrock/scripts/libraries/Config.sol
index 18084761e807..4aca8bc31e3c 100644
--- a/packages/contracts-bedrock/scripts/libraries/Config.sol
+++ b/packages/contracts-bedrock/scripts/libraries/Config.sol
@@ -34,10 +34,11 @@ enum Fork {
     ECOTONE,
     FJORD,
     GRANITE,
-    HOLOCENE
+    HOLOCENE,
+    ISTHMUS
 }
 
-Fork constant LATEST_FORK = Fork.HOLOCENE;
+Fork constant LATEST_FORK = Fork.ISTHMUS;
 
 library ForkUtils {
     function toString(Fork _fork) internal pure returns (string memory) {
@@ -53,6 +54,8 @@ library ForkUtils {
             return "granite";
         } else if (_fork == Fork.HOLOCENE) {
             return "holocene";
+        } else if (_fork == Fork.ISTHMUS) {
+            return "isthmus";
         } else {
             return "unknown";
         }
@@ -168,6 +171,8 @@ library Config {
             return Fork.GRANITE;
         } else if (forkHash == keccak256(bytes("holocene"))) {
             return Fork.HOLOCENE;
+        } else if (forkHash == keccak256(bytes("isthmus"))) {
+            return Fork.ISTHMUS;
         } else {
             revert(string.concat("Config: unknown fork: ", forkStr));
         }
diff --git a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
index da9aea12a0ac..4197746ca436 100644
--- a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
+++ b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
@@ -351,6 +351,11 @@ library DeployUtils {
         }
     }
 
+    /// @notice The unstructured storage slot that is used for v5 openzeppelin initializable. Computed as:
+    ///         keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.Initializable")) - 1)) &
+    /// ~bytes32(uint256(0xff))
+    bytes32 internal constant INITIALIZABLE_STORAGE = 0xf0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00;
+
     /// @notice Asserts that for a given contract the value of a storage slot at an offset is 1 or
     ///         `type(uint8).max`. The value is set to 1 when a contract is initialized, and set to
     ///         `type(uint8).max` when `_disableInitializers` is called.
@@ -362,4 +367,9 @@ library DeployUtils {
             "DeployUtils: value at the given slot and offset does not indicate initialization"
         );
     }
+
+    /// @notice Asserts that the contract has been initialized, assuming that it is using openzeppelin v5 initializable.
+    function assertInitialized(address _contractAddress) internal view {
+        assertInitialized({ _contractAddress: _contractAddress, _slot: uint256(INITIALIZABLE_STORAGE), _offset: 0 });
+    }
 }
diff --git a/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol b/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
index 944206694d78..a646a7b6d02f 100644
--- a/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
+++ b/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
@@ -5,6 +5,7 @@ import { Vm } from "forge-std/Vm.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { LibString } from "@solady/utils/LibString.sol";
 import { Executables } from "scripts/libraries/Executables.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Process } from "scripts/libraries/Process.sol";
 
 /// @notice Contains information about a storage slot. Mirrors the layout of the storage
@@ -190,6 +191,19 @@ library ForgeArtifacts {
     function getInitializedSlot(string memory _contractName) internal returns (StorageSlot memory slot_) {
         string memory storageLayout = getStorageLayout(_contractName);
 
+        // Contracts that use oz v5 should be here
+        if (LibString.eq(_contractName, "L1ERC721Bridge")) {
+            StorageSlot memory slot = StorageSlot({
+                astId: 0,
+                _contract: _contractName,
+                label: "_initialized",
+                offset: 0,
+                slot: vm.toString(DeployUtils.INITIALIZABLE_STORAGE),
+                _type: "bool"
+            });
+            return slot;
+        }
+
         // FaultDisputeGame and PermissionedDisputeGame use a different name for the initialized storage slot.
         string memory slotName = "_initialized";
         string memory slotType = "t_uint8";
@@ -214,7 +228,10 @@ library ForgeArtifacts {
             slotType,
             "\")'"
         );
-        bytes memory rawSlot = vm.parseJson(string(Process.run(command)));
+
+        bytes memory result = Process.run(command);
+        require(result.length > 0, string.concat("ForgeArtifacts: ", _contractName, "is not initializable"));
+        bytes memory rawSlot = vm.parseJson(string(result));
         slot_ = abi.decode(rawSlot, (StorageSlot));
     }
 
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 1e14f5d286b5..0af4722ac9da 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -8,56 +8,60 @@
     "sourceCodeHash": "0x30e83a535ef27b2e900c831c4e1a4ec2750195350011c4fdacda1da9db2d167b"
   },
   "src/L1/L1CrossDomainMessenger.sol": {
-    "initCodeHash": "0x2e9cb3ceb5e55341b311f0666ef7655df4fafae75afdfbcd701cd9c9b2b017d5",
-    "sourceCodeHash": "0x848ec3774be17bcc8ba65a23d08e35e979b3f39f9d2ac8a810188f945c69c9ea"
+    "initCodeHash": "0x8d0351b1c13be9e53ba9d3c6174e0ef0ae5c37cfdf31da446533548f5c56553a",
+    "sourceCodeHash": "0x5b00fc7b2450c008cefb283779237f7402722182eb9e5210439d5a01359dc38f"
   },
   "src/L1/L1ERC721Bridge.sol": {
-    "initCodeHash": "0xb3bf093ea83a24574a6093bebf5b2aea707355ed8d6702b2b5eb292e75b6ae42",
-    "sourceCodeHash": "0x289de9f40898b6305deecc6b60cdf566aa6c6a1444f713c3a0af23ea7878207e"
+    "initCodeHash": "0x19542aad97e146219d4d3cdcfb29f8f1591815731c51216e8424e754556a21a0",
+    "sourceCodeHash": "0x71fc58927450aa7f6e97688e7a5ecbfadfa235a26523d4c540183647ccbf7fdf"
+  },
+  "src/L1/L1OptimismMintableERC20Factory.sol": {
+    "initCodeHash": "0xc6b0a84d485c8503bd1ce077fbfa5533ad1f6a001feab31d9c21948d02d47827",
+    "sourceCodeHash": "0x9432cd22e23347f4b397706b4eb28ee4eaba481f4914d2d685d77c413963326d"
   },
   "src/L1/L1StandardBridge.sol": {
-    "initCodeHash": "0x802f72745bb9a82dc049377bb9cf6b58f35aec388aeb957b28a5e14f28d91bc1",
-    "sourceCodeHash": "0x24b784645b065a5393a2115a078d67f91eb09afd5e70baf81daf975381f16155"
+    "initCodeHash": "0x0a17e22cb56c915bf1aaf3a61ac28de2dca4f2122ba57fe597a3dd612e245478",
+    "sourceCodeHash": "0xa706c8d55d1e34a86d42a113cd486ccb809a36ff956cf32fbcb839ca2cdfbf0b"
   },
   "src/L1/L2OutputOracle.sol": {
     "initCodeHash": "0x1182bfb87c4ab399b912ca7fe18cdbf4b24c414e078fb0a55bd3c44d442d3ed1",
     "sourceCodeHash": "0x4132ff37d267cb12224b75ea806c0aa7d25407b0d66ce526d7fcda8f7d223882"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0xd58cb3978affc5c1457cdd498ff8420c90aef804d4c3b62cf42ab2691986d6d2",
-    "sourceCodeHash": "0x7bfa6eff76176649fe600303cd60009a0f6e282cbaec55836b5ea1f8875cbeb5"
+    "initCodeHash": "0xa6e3fda99d87e69c3a2d2b1efb2f419cae75b1f2a0295548f5f2db84432dd9c4",
+    "sourceCodeHash": "0x647ec3500bca93169dd5384919c6787238da40ffd53fc5d1c3b7c61701a9d398"
   },
   "src/L1/OptimismPortal.sol": {
-    "initCodeHash": "0x152167cfa18635ae4918a6eb3371a599cfa084418c0a652799cdb48bfc0ee0cc",
-    "sourceCodeHash": "0xbe34b82900d02f71bb0949818eabe49531f7e0d8d8bae01f6dac4a296530d1aa"
+    "initCodeHash": "0x25c4212bac52f172b193cb3c36376074f239491d53c0d83c5081df7042cd02f8",
+    "sourceCodeHash": "0x6300532cb22fd9848bf54891c3a48003c7108470199a200d082b740c91e0a017"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0x218358b48f640b3fcb2d239f00dc1cd3b11517ad46c8e1efa44953d38da63540",
-    "sourceCodeHash": "0x66ac1212760db53a2bb1839e4cd17dc071d9273b8e6fb80646b79e91b3371c1a"
+    "initCodeHash": "0x8e6c808992ea90f28feb12338309ff512876163ed4409a1dca6184475ab4a136",
+    "sourceCodeHash": "0xedc1819877c3263c43a27c5077363691ce0839fa8e61b8d000a0ba9998bf1905"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x39f66ac74341ec235fbdd0d79546283210bd8ac35a2ab2c4bd36c9722ce18411",
-    "sourceCodeHash": "0xbb98144285b9530e336f957d10b20363b350876597e30fd34821940896a2bae8"
+    "initCodeHash": "0xcda63947d6fb33478b7bdc6f20a983061b3ff9d77a7c64a6b7141af08b79fd60",
+    "sourceCodeHash": "0x3731c4ac1c5784b92934d3f84d8eba70321b4c6b379a9349aa4c620da6c5a7d8"
   },
   "src/L1/ProtocolVersions.sol": {
     "initCodeHash": "0xefd4806e8737716d5d2022ca2e9e9fba0a0cb5714b026166b58e472222c7d15f",
     "sourceCodeHash": "0x15205131bf420aa6d03c558bb75dd49cd7439caed7ccdcbfd89c4170a48c94f5"
   },
   "src/L1/SuperchainConfig.sol": {
-    "initCodeHash": "0xfca12d9016c746e5c275b186e0ca40cfd65cf45a5665aab7589a669fea3abb47",
-    "sourceCodeHash": "0x39489a85bc3a5c8560f82d41b31bf7fe22f5b648f4ed538f61695a73092ea9eb"
+    "initCodeHash": "0x37b2cabf25e5717ec9961bdb084b3a35ffd403c867361b106ea5e47345bc7ba9",
+    "sourceCodeHash": "0xbd02a2297b9088c29070bf910ec306dd31d8d185007afaaf7743435493b0ede6"
   },
   "src/L1/SystemConfig.sol": {
-    "initCodeHash": "0x429058f75d97fa7a7d0166b59830909bc722324feefc40f2b41419d6335d3f37",
-    "sourceCodeHash": "0x5ca776041a4ddc0d28ec55db7012d669481cd4601b0e71dbd3493a67b8a7e5a5"
+    "initCodeHash": "0xc2961b2de5e12fc7f8079bb462ee9ca605940ab6072b531b5fa173dd3d3af407",
+    "sourceCodeHash": "0xa699d0715f3016f3acb3e3971d8560c280340a0c87e8a0a07ab80160e612c196"
   },
   "src/L1/SystemConfigInterop.sol": {
-    "initCodeHash": "0x277a61dcabed81a15739a8e9ed50615252bcc687cebea852e00191d0a1fbe11f",
-    "sourceCodeHash": "0x38361a4f70a19e1b7819e933932a0c9fd2bcebaaebcbc7942f5c00dfaa2c28df"
+    "initCodeHash": "0x2f5b58ef3db81ee004e69069d231de7c108920105edafad5e0fcf8a897201d5d",
+    "sourceCodeHash": "0x5c996568f655a7467e9de456b39eed7dbfde46d53a609f56b7369940fef0e1ea"
   },
   "src/L2/BaseFeeVault.sol": {
-    "initCodeHash": "0xbf49824cf37e201181484a8a423fcad8f504dc925921a2b28e83398197858dec",
-    "sourceCodeHash": "0x983e8e248c61e362ba6a01dd2e217a535c9bb828dc0b4421f5f27e0577f2e14c"
+    "initCodeHash": "0x2eded104b7c98ea055dbd02a19ed967f5341ba169056425522ef2b3ce4b3300e",
+    "sourceCodeHash": "0x8428d0a173d3d58327aebc5585f1a62e3929ed56324a224e15b88bd1bca31348"
   },
   "src/L2/CrossL2Inbox.sol": {
     "initCodeHash": "0x31ecaebf368ab3333e80c6dc004b3c9f9a31f813c3138ab388bb3eead9f1b4ee",
@@ -68,60 +72,68 @@
     "sourceCodeHash": "0x0b6afdc52d1ae88d9e4bbb5dc00920e7a6bd1e9d6595bfdbae64874190f39df0"
   },
   "src/L2/GasPriceOracle.sol": {
-    "initCodeHash": "0x7e8c2b42e10187ad649c0bf70c5688c2a4af3c412bacaec87d63c3f93ae4cfef",
-    "sourceCodeHash": "0xa12ce15ded3cca681b2fc9facaebbb45d740dd6f9c9496333c1c46689c9a2d99"
+    "initCodeHash": "0x83d50e3b34cd1b4de32f1cced28796b07aefc526cc17ceb1903ad55f4abc90b7",
+    "sourceCodeHash": "0x64109614b3813b0f6003bcfada1bdbdba733c623aa7b935b9e51753f1c60ed6a"
   },
   "src/L2/L1Block.sol": {
-    "initCodeHash": "0xa919d2aa76a7ecdfd076e2b1dbece499cc85706075f16eb6fa7b1a0fa7b38c1b",
-    "sourceCodeHash": "0x692cfcbc06dba6328f6e5c6b500741df04e4bdf730b2069aeb5d168355ea7b6f"
+    "initCodeHash": "0xdd942ad49044ca92b46f39f5035995628c2c8b10c1060c0a59b65cdc20176832",
+    "sourceCodeHash": "0x4c6be03e3eddc17810a65e475c1c7dc1e5a15fe4c1c6d9b8ab17b3323d06e405"
   },
   "src/L2/L1BlockInterop.sol": {
-    "initCodeHash": "0x62e9cc59daaf72066ac20597a666db33e9a7b3f7be71a3d47ea4841a9aca9d07",
-    "sourceCodeHash": "0xe57627347366d74029a0d24f0b45d7b9cf82b81c94681d0f633d5e5c37c8de4a"
+    "initCodeHash": "0xfab767c50aff6bd9d232605c7016afaee34e36647142ea952fea57c98b860c2e",
+    "sourceCodeHash": "0xc220f197eb6aec98554fc72f68f95578a20f201a4780cada28832d21ae4d816b"
   },
   "src/L2/L1FeeVault.sol": {
-    "initCodeHash": "0xbf49824cf37e201181484a8a423fcad8f504dc925921a2b28e83398197858dec",
-    "sourceCodeHash": "0xc7cda130f2bb3648e04d5a480082aa1789e16456c1280954d822b05d30100b2d"
+    "initCodeHash": "0xffd78f3c10c018ec77c3ede7599f76ad23433cc1f18794e47eb73ed5f3460dda",
+    "sourceCodeHash": "0x52cec09ff02282b9e7adef9f770cbc1f31682d41aece1749ba7b4ff14528eb1b"
   },
   "src/L2/L2CrossDomainMessenger.sol": {
-    "initCodeHash": "0xc496495496b96ea0eaf417c5e56b295836c12db3e6aafe2e607563e7a50b5b65",
-    "sourceCodeHash": "0x56edf0f36366326a92722ae3c7502bce3d80b2ee5e354181dc09ba801437a488"
+    "initCodeHash": "0x9d478585dbebd5bf03e4d7a735bc5f64006e2ff99d62fc08c2202c5483005d5a",
+    "sourceCodeHash": "0x0726b306b41eaf326e19f0d6d1c8a9dbdc8efb2baa449e8fca5954a7b31f79c7"
   },
   "src/L2/L2ERC721Bridge.sol": {
-    "initCodeHash": "0xaed0528e8b81817a0c3b41513c02e7fd678f58e34b98f02ea33d5a770a064c2f",
-    "sourceCodeHash": "0xf8569c75b801f38f8a5a41e94e90f159ddc5f5412804b26e3e564755a50631b8"
+    "initCodeHash": "0xc83703c9b18f7e4dcdbaf327894e36bf1edfbd39f9e55c5546f2f2deedf7689f",
+    "sourceCodeHash": "0x69e4394ac1cabc4c2cbf64988fc234f47c0750af720875ed2dbd339b752f6b87"
+  },
+  "src/L2/L2OptimismMintableERC20Factory.sol": {
+    "initCodeHash": "0xb4411155cd6bf9ce710cbce80aaf7a5c8d4b509cfb3b6eca1ff1bcb9eee76013",
+    "sourceCodeHash": "0xb2330d5ef6c7eecc14745d5a2122daa105f2630f811548c203e5bca4a91787ec"
   },
   "src/L2/L2StandardBridge.sol": {
-    "initCodeHash": "0xcb4aa19f0cd43a35cb5c65f26c3cfd7c41f1d1e5bcc15aef6096d385df7272c9",
-    "sourceCodeHash": "0x89771b53b7f6e64d943afb2a4bf15395efcf20d5302b76a18e52fa7cce8cdc56"
+    "initCodeHash": "0xf6a2658d9fbda6959cff4af0ae3891534fdfdc2685c6f7210bb124ba6553d5a3",
+    "sourceCodeHash": "0x909e93976c2d9b419a52ce131d86aad5de9c0e8fe6bf1d5afc7257c1d9524871"
   },
   "src/L2/L2StandardBridgeInterop.sol": {
-    "initCodeHash": "0xc4eaece28d2cfca3c51247c3cce320a167a83c7fd13aea5736549d2b25e0b139",
-    "sourceCodeHash": "0x9e80044adf5f83c30b520ee153b75be5a152081c9e1271e7e618ecfccd1fb4ac"
+    "initCodeHash": "0x26c04ae665855e91fc12e995bc9436b63415068da90d694f4a9f070db80027b2",
+    "sourceCodeHash": "0x0ca6d8900a02c213acca44c8cb56df816fa1bebd6903a9ea6d4c21525c936c12"
   },
   "src/L2/L2ToL1MessagePasser.sol": {
     "initCodeHash": "0x13fe3729beb9ed966c97bef09acb9fe5043fe651d453145073d05f2567fa988d",
     "sourceCodeHash": "0xd08a2e6514dbd44e16aa312a1b27b2841a9eab5622cbd05a39c30f543fad673c"
   },
   "src/L2/L2ToL2CrossDomainMessenger.sol": {
-    "initCodeHash": "0x2a1a1ee4f47175ce661ee8e4e50cfa879b082dcb5278b1d66ddda00ed77bb744",
-    "sourceCodeHash": "0xa76133db7f449ae742f9ba988ad86ccb5672475f61298b9fefe411b63b63e9f6"
+    "initCodeHash": "0x8db6e86984e2501a4281765a9eaeafc0fe1d15c7bb802bbc15d5221a907be526",
+    "sourceCodeHash": "0x00e6d19b377aad27dfc8bf759dbc052fcc708d17e2a56453988ccc97e838399d"
+  },
+  "src/L2/OptimismMintableERC721Factory.sol": {
+    "initCodeHash": "0xc66a3211c520beb0e3da3ce78c0f307bf4397365f147e45d31650d15678e42b2",
+    "sourceCodeHash": "0x35b725198c3780182408ccc76dc877b29659508592befde437754c69af7d7b5f"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0x5bc5824030ecdb531e1f615d207cb73cdaa702e198769445d0ddbe717271eba9",
-    "sourceCodeHash": "0x0819c9411a155dca592d19b60c4176954202e4fe5d632a4ffbf88d465461252c"
+    "initCodeHash": "0x529f3756a365a8f225d7debdd15c474c1338c8973bb65a1aad98f85753f74722",
+    "sourceCodeHash": "0xf68baaee0a09ea51d5a4e821df79976c0914369ebc8e5fd27bbbf89072254fc8"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
-    "initCodeHash": "0x23dba3ceb9e58646695c306996c9e15251ac79acc6339c1a93d10a4c79da6dab",
-    "sourceCodeHash": "0xf4379e49665823c877f5732f35068435ce06e2394fce6910a5e113d16cdc9f95"
+    "initCodeHash": "0xb032e99f5c205c8b474da89887e350277cdd05b99ee28374b97bfae18ef7a72c",
+    "sourceCodeHash": "0xe8753177e8491152eb3ecbed42d5232ae545091a116f23d104a4f9621711fbda"
   },
   "src/L2/OptimismSuperchainERC20Factory.sol": {
-    "initCodeHash": "0x18a362c57f08b611db98dfde96121385e938f995c84e3547c1c03fd49f9db2fd",
-    "sourceCodeHash": "0x450cd89d0aae7bbc85ff57a14a6d3468c24c6743f25943f6d895d34b1456c456"
+    "initCodeHash": "0xe6a098346699c3df248050fc3301197661d391f8e4849a93f00afeac17cae317",
+    "sourceCodeHash": "0x1e8380bdce27292f805ddc85fec0db5bc60fbe3fd9e0bcbd146c103062ed459a"
   },
   "src/L2/SequencerFeeVault.sol": {
-    "initCodeHash": "0xcaadbf08057b5d47f7704257e9385a29e42a7a08c818646d109c5952d3d35218",
-    "sourceCodeHash": "0x05bbc6039e5a9ff38987e7b9b89c69e2ee8aa4b7ca20dd002ea1bbd3d70f27f3"
+    "initCodeHash": "0x4f0017a0b906cb949ebb5931cebe00130109a4e9bb453d77b470982de5b996fb",
+    "sourceCodeHash": "0x8d71ff1b7d5c758ff15137c0ab1411e4abe8d91bc4fab28c981a767f6323b426"
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -132,12 +144,12 @@
     "sourceCodeHash": "0x617aa994f659c5d8ebd54128d994f86f5b175ceca095b024b8524a7898e8ae62"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0x5aef986a7c9c102b1e9b3068e2a2b66adce0a71dd5f39e03694622bf494f8d97",
-    "sourceCodeHash": "0xa62101a23b860e97f393027c898082a1c73d50679eceb6c6793844af29702359"
+    "initCodeHash": "0xb74ce648b49e3b7885a3252ff32aeb71e8cb515558f516c0dd61f1cf22028edc",
+    "sourceCodeHash": "0x095de6eeb2cd06937b3fe014392048bc494cb5ca7a4a5fd5519141a80eae3a76"
   },
   "src/L2/WETH.sol": {
-    "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
-    "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
+    "initCodeHash": "0x480d4f8dbec1b0d3211bccbbdfb69796f3e90c784f724b1bbfd4703b0aafdeba",
+    "sourceCodeHash": "0x59a210accdd484cf00e63042cde4687e1c87ef9dbafa5fe2e081dee8e6563621"
   },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0xa3cbf121bad13c00227ea4fef128853d9a86b7ec9158de894f99b58d38d7630a",
@@ -215,17 +227,9 @@
     "initCodeHash": "0x9cd677275b175812f1d5f90a127dbf7b3592714fd842a7a0de3988d716ca3eac",
     "sourceCodeHash": "0x5611d8082f68af566554d7f09640b4b1f0e3efee4da1372b68fc7fc538a35ac7"
   },
-  "src/universal/OptimismMintableERC20Factory.sol": {
-    "initCodeHash": "0x03ad07bd7f89a29f1850fa8b5d377daf0e1d5aef6cb458a127df520549e8e8e6",
-    "sourceCodeHash": "0xdb6ec93782a4a217475195507740794a4f5553b9032e7ba31dc48b81f579a940"
-  },
   "src/universal/OptimismMintableERC721.sol": {
-    "initCodeHash": "0x8aa309f2676d5267b6c9e411f88dc6e4badce414b8d66b330df3f60e9836380e",
-    "sourceCodeHash": "0x03bf7ad4d2b751bdead9930fc8f89b8e55d40dd4b2f5670fd339e87ae81f8b49"
-  },
-  "src/universal/OptimismMintableERC721Factory.sol": {
-    "initCodeHash": "0x5ea977ba35558c3b75bebe28900548c763d205e40d6cf7660292b8e96bf3aea8",
-    "sourceCodeHash": "0x063ca3a0a2e3c592173af6157e383b5aaeff752000f98648a5c71260bb26590a"
+    "initCodeHash": "0x406ff004414b60852afe6ee6783ac03157ebcbe7e4787740a94576594fdfe912",
+    "sourceCodeHash": "0x8b4292d7556907b597d9fd3ccd5bcd8b8d61bf8e32c5a7a33d4de2557414c830"
   },
   "src/universal/StorageSetter.sol": {
     "initCodeHash": "0x21b3059e9b13b330f76d02b61f61dcfa3abf3517a0b56afa0895c4b8291740bf",
diff --git a/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json b/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
index b745bcb8184c..80ccfb99162a 100644
--- a/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
@@ -1,25 +1,4 @@
 [
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_minWithdrawalAmount",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "_withdrawalNetwork",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -56,7 +35,30 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "",
+        "name": "withdrawalNetwork_",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "config",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "recipient_",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount_",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "withdrawalNetwork_",
         "type": "uint8"
       }
     ],
@@ -128,7 +130,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "network_",
+        "name": "withdrawalNetwork_",
         "type": "uint8"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json b/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json b/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1Block.json b/packages/contracts-bedrock/snapshots/abi/L1Block.json
index 020c9e942c75..d477c46ddad5 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1Block.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1Block.json
@@ -121,6 +121,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "enum Types.ConfigType",
+        "name": "_type",
+        "type": "uint8"
+      }
+    ],
+    "name": "getConfig",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "data_",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "hash",
@@ -147,6 +166,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "isIsthmus",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "l1FeeOverhead",
@@ -199,6 +231,24 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "enum Types.ConfigType",
+        "name": "_type",
+        "type": "uint8"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_value",
+        "type": "bytes"
+      }
+    ],
+    "name": "setConfig",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -227,6 +277,13 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "setIsthmus",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -343,5 +400,10 @@
     "inputs": [],
     "name": "NotDepositor",
     "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "UnsafeCast",
+    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json b/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json
index ab089f0cec55..35ce78e5f5fd 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json
@@ -141,6 +141,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "enum Types.ConfigType",
+        "name": "_type",
+        "type": "uint8"
+      }
+    ],
+    "name": "getConfig",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "data_",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "hash",
@@ -199,6 +218,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "isIsthmus",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "l1FeeOverhead",
@@ -254,7 +286,7 @@
   {
     "inputs": [
       {
-        "internalType": "enum ConfigType",
+        "internalType": "enum Types.ConfigType",
         "name": "_type",
         "type": "uint8"
       },
@@ -297,6 +329,13 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "setIsthmus",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -471,5 +510,10 @@
     "inputs": [],
     "name": "NotDepositor",
     "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "UnsafeCast",
+    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
index 22a4353cc656..fb4798a3d662 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
@@ -223,7 +223,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
diff --git a/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json b/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
index 33cd5b0a850b..0c6ccbd23684 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
@@ -209,7 +209,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
@@ -342,12 +342,22 @@
     "inputs": [
       {
         "indexed": false,
-        "internalType": "uint8",
+        "internalType": "uint64",
         "name": "version",
-        "type": "uint8"
+        "type": "uint64"
       }
     ],
     "name": "Initialized",
     "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidInitialization",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotInitializing",
+    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json b/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
index b745bcb8184c..80ccfb99162a 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
@@ -1,25 +1,4 @@
 [
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_minWithdrawalAmount",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "_withdrawalNetwork",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -56,7 +35,30 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "",
+        "name": "withdrawalNetwork_",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "config",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "recipient_",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount_",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "withdrawalNetwork_",
         "type": "uint8"
       }
     ],
@@ -128,7 +130,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "network_",
+        "name": "withdrawalNetwork_",
         "type": "uint8"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/abi/L1OptimismMintableERC20Factory.json
similarity index 100%
rename from packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20Factory.json
rename to packages/contracts-bedrock/snapshots/abi/L1OptimismMintableERC20Factory.json
diff --git a/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json b/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
index 45480499fe9f..d79fbe616a57 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
@@ -26,7 +26,7 @@
     "name": "OTHER_BRIDGE",
     "outputs": [
       {
-        "internalType": "contract StandardBridge",
+        "internalType": "contract IStandardBridge",
         "name": "",
         "type": "address"
       }
@@ -447,7 +447,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
@@ -468,12 +468,12 @@
     "name": "otherBridge",
     "outputs": [
       {
-        "internalType": "contract StandardBridge",
+        "internalType": "contract IStandardBridge",
         "name": "",
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
diff --git a/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
index 717bbb6eb6f4..c9959ad9e49f 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
@@ -1,9 +1,4 @@
 [
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "inputs": [],
     "name": "MESSAGE_VERSION",
@@ -164,19 +159,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "contract CrossDomainMessenger",
-        "name": "_l1CrossDomainMessenger",
-        "type": "address"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "l1CrossDomainMessenger",
@@ -348,19 +330,6 @@
     "name": "FailedRelayedMessage",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json b/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
index e9578ad9726c..8b3af6fcc3eb 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
@@ -1,9 +1,4 @@
 [
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "inputs": [],
     "name": "MESSENGER",
@@ -139,19 +134,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_l1ERC721Bridge",
-        "type": "address"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "messenger",
@@ -162,7 +144,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
@@ -289,18 +271,5 @@
     ],
     "name": "ERC721BridgeInitiated",
     "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json
new file mode 100644
index 000000000000..0a5fddb96906
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json
@@ -0,0 +1,196 @@
+[
+  {
+    "inputs": [],
+    "name": "BRIDGE",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "bridge",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_remoteToken",
+        "type": "address"
+      },
+      {
+        "internalType": "string",
+        "name": "_name",
+        "type": "string"
+      },
+      {
+        "internalType": "string",
+        "name": "_symbol",
+        "type": "string"
+      }
+    ],
+    "name": "createOptimismMintableERC20",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_remoteToken",
+        "type": "address"
+      },
+      {
+        "internalType": "string",
+        "name": "_name",
+        "type": "string"
+      },
+      {
+        "internalType": "string",
+        "name": "_symbol",
+        "type": "string"
+      },
+      {
+        "internalType": "uint8",
+        "name": "_decimals",
+        "type": "uint8"
+      }
+    ],
+    "name": "createOptimismMintableERC20WithDecimals",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_remoteToken",
+        "type": "address"
+      },
+      {
+        "internalType": "string",
+        "name": "_name",
+        "type": "string"
+      },
+      {
+        "internalType": "string",
+        "name": "_symbol",
+        "type": "string"
+      }
+    ],
+    "name": "createStandardL2Token",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "deployments",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "version",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "localToken",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "remoteToken",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "deployer",
+        "type": "address"
+      }
+    ],
+    "name": "OptimismMintableERC20Created",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "remoteToken",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "localToken",
+        "type": "address"
+      }
+    ],
+    "name": "StandardL2TokenCreated",
+    "type": "event"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json b/packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json
new file mode 100644
index 000000000000..8dbba1e08992
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json
@@ -0,0 +1,300 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [],
+    "name": "addressManager",
+    "outputs": [
+      {
+        "internalType": "contract IAddressManager",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "_proxy",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_newAdmin",
+        "type": "address"
+      }
+    ],
+    "name": "changeProxyAdmin",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "_proxy",
+        "type": "address"
+      }
+    ],
+    "name": "getProxyAdmin",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_proxy",
+        "type": "address"
+      }
+    ],
+    "name": "getProxyImplementation",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "implementationName",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "isUpgrading",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "proxyType",
+    "outputs": [
+      {
+        "internalType": "enum ProxyAdmin.ProxyType",
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "string",
+        "name": "_name",
+        "type": "string"
+      },
+      {
+        "internalType": "address",
+        "name": "_address",
+        "type": "address"
+      }
+    ],
+    "name": "setAddress",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "contract IAddressManager",
+        "name": "_address",
+        "type": "address"
+      }
+    ],
+    "name": "setAddressManager",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_address",
+        "type": "address"
+      },
+      {
+        "internalType": "string",
+        "name": "_name",
+        "type": "string"
+      }
+    ],
+    "name": "setImplementationName",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_address",
+        "type": "address"
+      },
+      {
+        "internalType": "enum ProxyAdmin.ProxyType",
+        "name": "_type",
+        "type": "uint8"
+      }
+    ],
+    "name": "setProxyType",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bool",
+        "name": "_upgrading",
+        "type": "bool"
+      }
+    ],
+    "name": "setUpgrading",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "_proxy",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_implementation",
+        "type": "address"
+      }
+    ],
+    "name": "upgrade",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "_proxy",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_implementation",
+        "type": "address"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_data",
+        "type": "bytes"
+      }
+    ],
+    "name": "upgradeAndCall",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "previousOwner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json b/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
index e562034818d5..44ecfa34094c 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
@@ -1,9 +1,4 @@
 [
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -26,7 +21,7 @@
     "name": "OTHER_BRIDGE",
     "outputs": [
       {
-        "internalType": "contract StandardBridge",
+        "internalType": "contract IStandardBridge",
         "name": "",
         "type": "address"
       }
@@ -236,19 +231,6 @@
     "stateMutability": "payable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "contract StandardBridge",
-        "name": "_otherBridge",
-        "type": "address"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "l1TokenBridge",
@@ -272,7 +254,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
@@ -280,7 +262,7 @@
     "name": "otherBridge",
     "outputs": [
       {
-        "internalType": "contract StandardBridge",
+        "internalType": "contract IStandardBridge",
         "name": "",
         "type": "address"
       }
@@ -566,19 +548,6 @@
     "name": "ETHBridgeInitiated",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json b/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json
index b2dc8dddd050..1d5f7aacfc7b 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json
@@ -21,7 +21,7 @@
     "name": "OTHER_BRIDGE",
     "outputs": [
       {
-        "internalType": "contract StandardBridge",
+        "internalType": "contract IStandardBridge",
         "name": "",
         "type": "address"
       }
@@ -254,19 +254,6 @@
     "stateMutability": "payable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "contract StandardBridge",
-        "name": "_otherBridge",
-        "type": "address"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "l1TokenBridge",
@@ -290,7 +277,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
@@ -298,7 +285,7 @@
     "name": "otherBridge",
     "outputs": [
       {
-        "internalType": "contract StandardBridge",
+        "internalType": "contract IStandardBridge",
         "name": "",
         "type": "address"
       }
@@ -615,19 +602,6 @@
     "name": "ETHBridgeInitiated",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
index 7c478feb235d..7c858ca892ee 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
@@ -137,6 +137,11 @@
                 "internalType": "address",
                 "name": "challenger",
                 "type": "address"
+              },
+              {
+                "internalType": "address",
+                "name": "systemConfigFeeAdmin",
+                "type": "address"
               }
             ],
             "internalType": "struct OPContractsManager.Roles",
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
index 7c478feb235d..7c858ca892ee 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
@@ -137,6 +137,11 @@
                 "internalType": "address",
                 "name": "challenger",
                 "type": "address"
+              },
+              {
+                "internalType": "address",
+                "name": "systemConfigFeeAdmin",
+                "type": "address"
               }
             ],
             "internalType": "struct OPContractsManager.Roles",
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
index 35250255a9ba..58e3271abc92 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
@@ -2,7 +2,7 @@
   {
     "inputs": [
       {
-        "internalType": "address",
+        "internalType": "contract IL2ERC721Bridge",
         "name": "_bridge",
         "type": "address"
       },
@@ -35,7 +35,7 @@
     "name": "BRIDGE",
     "outputs": [
       {
-        "internalType": "address",
+        "internalType": "contract IL2ERC721Bridge",
         "name": "",
         "type": "address"
       }
@@ -124,7 +124,7 @@
     "name": "bridge",
     "outputs": [
       {
-        "internalType": "address",
+        "internalType": "contract IL2ERC721Bridge",
         "name": "",
         "type": "address"
       }
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
index e6ecac1d9381..0137a7bb20ae 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
@@ -1,31 +1,15 @@
 [
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_bridge",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_remoteChainId",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "inputs": [],
     "name": "BRIDGE",
     "outputs": [
       {
-        "internalType": "address",
+        "internalType": "contract IL2ERC721Bridge",
         "name": "",
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
@@ -46,12 +30,12 @@
     "name": "bridge",
     "outputs": [
       {
-        "internalType": "address",
+        "internalType": "contract IL2ERC721Bridge",
         "name": "",
         "type": "address"
       }
     ],
-    "stateMutability": "view",
+    "stateMutability": "pure",
     "type": "function"
   },
   {
@@ -104,7 +88,7 @@
   },
   {
     "inputs": [],
-    "name": "remoteChainID",
+    "name": "remoteChainId",
     "outputs": [
       {
         "internalType": "uint256",
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json b/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
index 7ccee328a984..ed8ec82591ed 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
@@ -413,27 +413,17 @@
   {
     "inputs": [
       {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint8",
-        "name": "_decimals",
+        "internalType": "enum Types.ConfigType",
+        "name": "_type",
         "type": "uint8"
       },
       {
-        "internalType": "bytes32",
-        "name": "_name",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_symbol",
-        "type": "bytes32"
+        "internalType": "bytes",
+        "name": "_value",
+        "type": "bytes"
       }
     ],
-    "name": "setGasPayingToken",
+    "name": "setConfig",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json b/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json
index 2f52ed573d37..b4bd5efa8df3 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json
@@ -605,27 +605,17 @@
   {
     "inputs": [
       {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint8",
-        "name": "_decimals",
+        "internalType": "enum Types.ConfigType",
+        "name": "_type",
         "type": "uint8"
       },
       {
-        "internalType": "bytes32",
-        "name": "_name",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_symbol",
-        "type": "bytes32"
+        "internalType": "bytes",
+        "name": "_value",
+        "type": "bytes"
       }
     ],
-    "name": "setGasPayingToken",
+    "name": "setConfig",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -669,6 +659,24 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "_gasLimit",
+        "type": "uint32"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_calldata",
+        "type": "bytes"
+      }
+    ],
+    "name": "upgrade",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json b/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json
index 5b9f72b9446c..b4bd5efa8df3 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json
@@ -605,7 +605,7 @@
   {
     "inputs": [
       {
-        "internalType": "enum ConfigType",
+        "internalType": "enum Types.ConfigType",
         "name": "_type",
         "type": "uint8"
       },
@@ -620,34 +620,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_token",
-        "type": "address"
-      },
-      {
-        "internalType": "uint8",
-        "name": "_decimals",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_name",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_symbol",
-        "type": "bytes32"
-      }
-    ],
-    "name": "setGasPayingToken",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -687,6 +659,24 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "_gasLimit",
+        "type": "uint32"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_calldata",
+        "type": "bytes"
+      }
+    ],
+    "name": "upgrade",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json b/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
index 700e7d7b9810..6412128462e0 100644
--- a/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
@@ -1,25 +1,4 @@
 [
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_minWithdrawalAmount",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "_withdrawalNetwork",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -56,7 +35,30 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "",
+        "name": "withdrawalNetwork_",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "config",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "recipient_",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount_",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "withdrawalNetwork_",
         "type": "uint8"
       }
     ],
@@ -69,7 +71,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "recipient_",
         "type": "address"
       }
     ],
@@ -141,7 +143,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "network_",
+        "name": "withdrawalNetwork_",
         "type": "uint8"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json b/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
index 0304f507eb50..e61f005d9aa2 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
@@ -30,6 +30,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "UPGRADER_SLOT",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "guardian",
@@ -50,6 +63,11 @@
         "name": "_guardian",
         "type": "address"
       },
+      {
+        "internalType": "address",
+        "name": "_upgrader",
+        "type": "address"
+      },
       {
         "internalType": "bool",
         "name": "_paused",
@@ -94,6 +112,19 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "upgrader",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "upgrader_",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/abi/SystemConfig.json b/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
index b7e18556fa2c..7f086dfad600 100644
--- a/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
+++ b/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
@@ -225,6 +225,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "feeAdmin",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "addr_",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "gasLimit",
@@ -285,9 +298,31 @@
   {
     "inputs": [
       {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
+        "components": [
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "feeAdmin",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "unsafeBlockSigner",
+            "type": "address"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "batcherHash",
+            "type": "bytes32"
+          }
+        ],
+        "internalType": "struct SystemConfig.Roles",
+        "name": "_roles",
+        "type": "tuple"
       },
       {
         "internalType": "uint32",
@@ -299,21 +334,11 @@
         "name": "_blobbasefeeScalar",
         "type": "uint32"
       },
-      {
-        "internalType": "bytes32",
-        "name": "_batcherHash",
-        "type": "bytes32"
-      },
       {
         "internalType": "uint64",
         "name": "_gasLimit",
         "type": "uint64"
       },
-      {
-        "internalType": "address",
-        "name": "_unsafeBlockSigner",
-        "type": "address"
-      },
       {
         "components": [
           {
@@ -630,6 +655,34 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "enum Types.ConfigType",
+        "name": "_type",
+        "type": "uint8"
+      },
+      {
+        "internalType": "address",
+        "name": "_recipient",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_min",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "_network",
+        "type": "uint8"
+      }
+    ],
+    "name": "setFeeVaultConfig",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -800,5 +853,10 @@
     ],
     "name": "OwnershipTransferred",
     "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "UnsafeCast",
+    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json b/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json
index a459af15801b..a0fc03aa0b3b 100644
--- a/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json
@@ -246,6 +246,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "feeAdmin",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "addr_",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "gasLimit",
@@ -306,9 +319,31 @@
   {
     "inputs": [
       {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
+        "components": [
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "feeAdmin",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "unsafeBlockSigner",
+            "type": "address"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "batcherHash",
+            "type": "bytes32"
+          }
+        ],
+        "internalType": "struct SystemConfig.Roles",
+        "name": "_roles",
+        "type": "tuple"
       },
       {
         "internalType": "uint32",
@@ -320,21 +355,11 @@
         "name": "_blobbasefeeScalar",
         "type": "uint32"
       },
-      {
-        "internalType": "bytes32",
-        "name": "_batcherHash",
-        "type": "bytes32"
-      },
       {
         "internalType": "uint64",
         "name": "_gasLimit",
         "type": "uint64"
       },
-      {
-        "internalType": "address",
-        "name": "_unsafeBlockSigner",
-        "type": "address"
-      },
       {
         "components": [
           {
@@ -418,11 +443,6 @@
         "internalType": "struct SystemConfig.Addresses",
         "name": "_addresses",
         "type": "tuple"
-      },
-      {
-        "internalType": "address",
-        "name": "_dependencyManager",
-        "type": "address"
       }
     ],
     "name": "initialize",
@@ -433,9 +453,31 @@
   {
     "inputs": [
       {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
+        "components": [
+          {
+            "internalType": "address",
+            "name": "owner",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "feeAdmin",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "unsafeBlockSigner",
+            "type": "address"
+          },
+          {
+            "internalType": "bytes32",
+            "name": "batcherHash",
+            "type": "bytes32"
+          }
+        ],
+        "internalType": "struct SystemConfig.Roles",
+        "name": "_roles",
+        "type": "tuple"
       },
       {
         "internalType": "uint32",
@@ -447,21 +489,11 @@
         "name": "_blobbasefeeScalar",
         "type": "uint32"
       },
-      {
-        "internalType": "bytes32",
-        "name": "_batcherHash",
-        "type": "bytes32"
-      },
       {
         "internalType": "uint64",
         "name": "_gasLimit",
         "type": "uint64"
       },
-      {
-        "internalType": "address",
-        "name": "_unsafeBlockSigner",
-        "type": "address"
-      },
       {
         "components": [
           {
@@ -545,6 +577,11 @@
         "internalType": "struct SystemConfig.Addresses",
         "name": "_addresses",
         "type": "tuple"
+      },
+      {
+        "internalType": "address",
+        "name": "_dependencyManager",
+        "type": "address"
       }
     ],
     "name": "initialize",
@@ -791,6 +828,34 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "enum Types.ConfigType",
+        "name": "_type",
+        "type": "uint8"
+      },
+      {
+        "internalType": "address",
+        "name": "_recipient",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_min",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "_network",
+        "type": "uint8"
+      }
+    ],
+    "name": "setFeeVaultConfig",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -961,5 +1026,10 @@
     ],
     "name": "OwnershipTransferred",
     "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "UnsafeCast",
+    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json b/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json
deleted file mode 100644
index 9bc33d142741..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "bytes": "20",
-    "label": "spacer_0_0_20",
-    "offset": 0,
-    "slot": "0",
-    "type": "address"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json b/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json
deleted file mode 100644
index ff157f517694..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json
+++ /dev/null
@@ -1,65 +0,0 @@
-[
-  {
-    "bytes": "1600",
-    "label": "spacer_1_0_1600",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint256[50]"
-  },
-  {
-    "bytes": "20",
-    "label": "spacer_51_0_20",
-    "offset": 0,
-    "slot": "50",
-    "type": "address"
-  },
-  {
-    "bytes": "1568",
-    "label": "spacer_52_0_1568",
-    "offset": 0,
-    "slot": "51",
-    "type": "uint256[49]"
-  },
-  {
-    "bytes": "1",
-    "label": "spacer_101_0_1",
-    "offset": 0,
-    "slot": "100",
-    "type": "bool"
-  },
-  {
-    "bytes": "1568",
-    "label": "spacer_102_0_1568",
-    "offset": 0,
-    "slot": "101",
-    "type": "uint256[49]"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_151_0_32",
-    "offset": 0,
-    "slot": "150",
-    "type": "uint256"
-  },
-  {
-    "bytes": "1568",
-    "label": "spacer_152_0_1568",
-    "offset": 0,
-    "slot": "151",
-    "type": "uint256[49]"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_201_0_32",
-    "offset": 0,
-    "slot": "200",
-    "type": "mapping(bytes32 => bool)"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_202_0_32",
-    "offset": 0,
-    "slot": "201",
-    "type": "mapping(bytes32 => bool)"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json b/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
index 2928d2147b5c..be59f51e2f9a 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
@@ -75,5 +75,12 @@
     "offset": 0,
     "slot": "7",
     "type": "uint256"
+  },
+  {
+    "bytes": "1",
+    "label": "isIsthmus",
+    "offset": 0,
+    "slot": "8",
+    "type": "bool"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json b/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json
index 14ee2ff9609a..39a149f0d6e2 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json
@@ -76,11 +76,18 @@
     "slot": "7",
     "type": "uint256"
   },
+  {
+    "bytes": "1",
+    "label": "isIsthmus",
+    "offset": 0,
+    "slot": "8",
+    "type": "bool"
+  },
   {
     "bytes": "64",
     "label": "dependencySet",
     "offset": 0,
-    "slot": "8",
+    "slot": "9",
     "type": "struct EnumerableSet.UintSet"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
index c68ec541baba..ec29a4be2bfe 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
@@ -7,18 +7,11 @@
     "type": "address"
   },
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "12",
+    "label": "spacer_0_20_12",
     "offset": 20,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 21,
-    "slot": "0",
-    "type": "bool"
+    "type": "bytes12"
   },
   {
     "bytes": "1600",
@@ -92,10 +85,10 @@
   },
   {
     "bytes": "20",
-    "label": "xDomainMsgSender",
+    "label": "spacer_204_0_20",
     "offset": 0,
     "slot": "204",
-    "type": "address"
+    "type": "bytes20"
   },
   {
     "bytes": "30",
@@ -113,17 +106,52 @@
   },
   {
     "bytes": "20",
-    "label": "otherMessenger",
+    "label": "spacer_207_0_20",
     "offset": 0,
     "slot": "207",
-    "type": "contract CrossDomainMessenger"
+    "type": "address"
   },
   {
-    "bytes": "1376",
-    "label": "__gap",
+    "bytes": "20",
+    "label": "xDomainMsgSender",
     "offset": 0,
     "slot": "208",
-    "type": "uint256[43]"
+    "type": "address"
+  },
+  {
+    "bytes": "12",
+    "label": "spacer_208_20_12",
+    "offset": 20,
+    "slot": "208",
+    "type": "bytes12"
+  },
+  {
+    "bytes": "1312",
+    "label": "__gap",
+    "offset": 0,
+    "slot": "209",
+    "type": "uint256[41]"
+  },
+  {
+    "bytes": "1",
+    "label": "_initialized",
+    "offset": 0,
+    "slot": "250",
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "250",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_250_2_30",
+    "offset": 2,
+    "slot": "250",
+    "type": "bytes30"
   },
   {
     "bytes": "20",
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
index 2c14ad25904b..cea792454f7b 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
@@ -1,38 +1,24 @@
 [
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "32",
+    "label": "spacer_0_0_32",
     "offset": 0,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "30",
-    "label": "spacer_0_2_30",
-    "offset": 2,
-    "slot": "0",
-    "type": "bytes30"
+    "type": "bytes32"
   },
   {
     "bytes": "20",
-    "label": "messenger",
+    "label": "spacer_1_0_20",
     "offset": 0,
     "slot": "1",
-    "type": "contract ICrossDomainMessenger"
+    "type": "address"
   },
   {
     "bytes": "20",
-    "label": "otherBridge",
+    "label": "spacer_2_0_20",
     "offset": 0,
     "slot": "2",
-    "type": "contract ERC721Bridge"
+    "type": "address"
   },
   {
     "bytes": "1472",
@@ -54,5 +40,12 @@
     "offset": 0,
     "slot": "50",
     "type": "contract ISuperchainConfig"
+  },
+  {
+    "bytes": "20",
+    "label": "crossDomainMessenger",
+    "offset": 0,
+    "slot": "51",
+    "type": "contract ICrossDomainMessenger"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/storageLayout/L1OptimismMintableERC20Factory.json
similarity index 64%
rename from packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json
rename to packages/contracts-bedrock/snapshots/storageLayout/L1OptimismMintableERC20Factory.json
index 94c133d105d2..5bcde5813268 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1OptimismMintableERC20Factory.json
@@ -1,31 +1,17 @@
 [
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "32",
+    "label": "spacer_0_0_32",
     "offset": 0,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
+    "type": "bytes32"
   },
   {
-    "bytes": "30",
-    "label": "spacer_0_2_30",
-    "offset": 2,
-    "slot": "0",
-    "type": "bytes30"
-  },
-  {
-    "bytes": "20",
-    "label": "bridge",
+    "bytes": "32",
+    "label": "spacer_1_0_32",
     "offset": 0,
     "slot": "1",
-    "type": "address"
+    "type": "bytes32"
   },
   {
     "bytes": "32",
@@ -40,5 +26,33 @@
     "offset": 0,
     "slot": "3",
     "type": "uint256[48]"
+  },
+  {
+    "bytes": "1",
+    "label": "_initialized",
+    "offset": 0,
+    "slot": "51",
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "51",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_51_2_30",
+    "offset": 2,
+    "slot": "51",
+    "type": "bytes30"
+  },
+  {
+    "bytes": "20",
+    "label": "standardBridge",
+    "offset": 0,
+    "slot": "52",
+    "type": "address"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
index 5562a214e4fe..99875ccd2c6c 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
@@ -1,24 +1,10 @@
 [
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "32",
+    "label": "spacer_0_0_32",
     "offset": 0,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "30",
-    "label": "spacer_0_2_30",
-    "offset": 2,
-    "slot": "0",
-    "type": "bytes30"
+    "type": "bytes32"
   },
   {
     "bytes": "20",
@@ -36,24 +22,45 @@
   },
   {
     "bytes": "20",
-    "label": "messenger",
+    "label": "spacer_3_0_20",
     "offset": 0,
     "slot": "3",
-    "type": "contract ICrossDomainMessenger"
+    "type": "address"
   },
   {
     "bytes": "20",
-    "label": "otherBridge",
+    "label": "spacer_4_0_20",
     "offset": 0,
     "slot": "4",
-    "type": "contract StandardBridge"
+    "type": "address"
   },
   {
-    "bytes": "1440",
+    "bytes": "1408",
     "label": "__gap",
     "offset": 0,
     "slot": "5",
-    "type": "uint256[45]"
+    "type": "uint256[44]"
+  },
+  {
+    "bytes": "1",
+    "label": "_initialized",
+    "offset": 0,
+    "slot": "49",
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "49",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_49_2_30",
+    "offset": 2,
+    "slot": "49",
+    "type": "bytes30"
   },
   {
     "bytes": "20",
@@ -68,5 +75,12 @@
     "offset": 0,
     "slot": "51",
     "type": "contract ISystemConfig"
+  },
+  {
+    "bytes": "20",
+    "label": "crossDomainMessenger",
+    "offset": 0,
+    "slot": "52",
+    "type": "contract ICrossDomainMessenger"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
index dec784b5a32e..beae81a1fe17 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
@@ -7,18 +7,11 @@
     "type": "address"
   },
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "12",
+    "label": "spacer_0_20_12",
     "offset": 20,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 21,
-    "slot": "0",
-    "type": "bool"
+    "type": "bytes12"
   },
   {
     "bytes": "1600",
@@ -92,10 +85,10 @@
   },
   {
     "bytes": "20",
-    "label": "xDomainMsgSender",
+    "label": "spacer_204_0_20",
     "offset": 0,
     "slot": "204",
-    "type": "address"
+    "type": "bytes20"
   },
   {
     "bytes": "30",
@@ -113,16 +106,30 @@
   },
   {
     "bytes": "20",
-    "label": "otherMessenger",
+    "label": "spacer_207_0_20",
     "offset": 0,
     "slot": "207",
-    "type": "contract CrossDomainMessenger"
+    "type": "address"
   },
   {
-    "bytes": "1376",
-    "label": "__gap",
+    "bytes": "20",
+    "label": "xDomainMsgSender",
     "offset": 0,
     "slot": "208",
-    "type": "uint256[43]"
+    "type": "address"
+  },
+  {
+    "bytes": "12",
+    "label": "spacer_208_20_12",
+    "offset": 20,
+    "slot": "208",
+    "type": "bytes12"
+  },
+  {
+    "bytes": "1312",
+    "label": "__gap",
+    "offset": 0,
+    "slot": "209",
+    "type": "uint256[41]"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
index 546b37ba6398..ad9709095c33 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
@@ -1,38 +1,24 @@
 [
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "32",
+    "label": "spacer_0_0_32",
     "offset": 0,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "30",
-    "label": "spacer_0_2_30",
-    "offset": 2,
-    "slot": "0",
-    "type": "bytes30"
+    "type": "bytes32"
   },
   {
     "bytes": "20",
-    "label": "messenger",
+    "label": "spacer_1_0_20",
     "offset": 0,
     "slot": "1",
-    "type": "contract ICrossDomainMessenger"
+    "type": "address"
   },
   {
     "bytes": "20",
-    "label": "otherBridge",
+    "label": "spacer_2_0_20",
     "offset": 0,
     "slot": "2",
-    "type": "contract ERC721Bridge"
+    "type": "address"
   },
   {
     "bytes": "1472",
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json
new file mode 100644
index 000000000000..75e6d15b1f7d
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json
@@ -0,0 +1,30 @@
+[
+  {
+    "bytes": "32",
+    "label": "spacer_0_0_32",
+    "offset": 0,
+    "slot": "0",
+    "type": "bytes32"
+  },
+  {
+    "bytes": "32",
+    "label": "spacer_1_0_32",
+    "offset": 0,
+    "slot": "1",
+    "type": "bytes32"
+  },
+  {
+    "bytes": "32",
+    "label": "deployments",
+    "offset": 0,
+    "slot": "2",
+    "type": "mapping(address => address)"
+  },
+  {
+    "bytes": "1536",
+    "label": "__gap",
+    "offset": 0,
+    "slot": "3",
+    "type": "uint256[48]"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json b/packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json
new file mode 100644
index 000000000000..a0b6f46bf85e
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json
@@ -0,0 +1,37 @@
+[
+  {
+    "bytes": "20",
+    "label": "_owner",
+    "offset": 0,
+    "slot": "0",
+    "type": "address"
+  },
+  {
+    "bytes": "32",
+    "label": "proxyType",
+    "offset": 0,
+    "slot": "1",
+    "type": "mapping(address => enum ProxyAdmin.ProxyType)"
+  },
+  {
+    "bytes": "32",
+    "label": "implementationName",
+    "offset": 0,
+    "slot": "2",
+    "type": "mapping(address => string)"
+  },
+  {
+    "bytes": "20",
+    "label": "addressManager",
+    "offset": 0,
+    "slot": "3",
+    "type": "contract IAddressManager"
+  },
+  {
+    "bytes": "1",
+    "label": "upgrading",
+    "offset": 20,
+    "slot": "3",
+    "type": "bool"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
index c6ccc0fc2e03..bda39d85dc77 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
@@ -1,24 +1,10 @@
 [
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "32",
+    "label": "spacer_0_0_32",
     "offset": 0,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "30",
-    "label": "spacer_0_2_30",
-    "offset": 2,
-    "slot": "0",
-    "type": "bytes30"
+    "type": "bytes32"
   },
   {
     "bytes": "20",
@@ -36,23 +22,23 @@
   },
   {
     "bytes": "20",
-    "label": "messenger",
+    "label": "spacer_3_0_20",
     "offset": 0,
     "slot": "3",
-    "type": "contract ICrossDomainMessenger"
+    "type": "address"
   },
   {
     "bytes": "20",
-    "label": "otherBridge",
+    "label": "spacer_4_0_20",
     "offset": 0,
     "slot": "4",
-    "type": "contract StandardBridge"
+    "type": "address"
   },
   {
-    "bytes": "1440",
+    "bytes": "1408",
     "label": "__gap",
     "offset": 0,
     "slot": "5",
-    "type": "uint256[45]"
+    "type": "uint256[44]"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json
index c6ccc0fc2e03..bda39d85dc77 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json
@@ -1,24 +1,10 @@
 [
   {
-    "bytes": "1",
-    "label": "_initialized",
+    "bytes": "32",
+    "label": "spacer_0_0_32",
     "offset": 0,
     "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "30",
-    "label": "spacer_0_2_30",
-    "offset": 2,
-    "slot": "0",
-    "type": "bytes30"
+    "type": "bytes32"
   },
   {
     "bytes": "20",
@@ -36,23 +22,23 @@
   },
   {
     "bytes": "20",
-    "label": "messenger",
+    "label": "spacer_3_0_20",
     "offset": 0,
     "slot": "3",
-    "type": "contract ICrossDomainMessenger"
+    "type": "address"
   },
   {
     "bytes": "20",
-    "label": "otherBridge",
+    "label": "spacer_4_0_20",
     "offset": 0,
     "slot": "4",
-    "type": "contract StandardBridge"
+    "type": "address"
   },
   {
-    "bytes": "1440",
+    "bytes": "1408",
     "label": "__gap",
     "offset": 0,
     "slot": "5",
-    "type": "uint256[45]"
+    "type": "uint256[44]"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
index 27be4a7332fa..f5a249bfda65 100644
--- a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
+import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -18,7 +19,10 @@ import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 /// @notice The L1CrossDomainMessenger is a message passing interface between L1 and L2 responsible
 ///         for sending and receiving data on the L1 side. Users are encouraged to use this
 ///         interface instead of interacting with lower-level contracts directly.
-contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
+contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver, Initializable {
+    /// @notice Spacer to give the initializer a full slot, to avoid offsetting the superchainConfig slot.
+    bytes30 private spacer_250_2_30;
+
     /// @notice Contract of the SuperchainConfig.
     ISuperchainConfig public superchainConfig;
 
@@ -30,16 +34,12 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
     ISystemConfig public systemConfig;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.4.1-beta.2
-    string public constant version = "2.4.1-beta.2";
+    /// @custom:semver 2.4.1-beta.3
+    string public constant version = "2.4.1-beta.3";
 
     /// @notice Constructs the L1CrossDomainMessenger contract.
     constructor() CrossDomainMessenger() {
-        initialize({
-            _superchainConfig: ISuperchainConfig(address(0)),
-            _portal: IOptimismPortal(payable(address(0))),
-            _systemConfig: ISystemConfig(address(0))
-        });
+        _disableInitializers();
     }
 
     /// @notice Initializes the contract.
@@ -57,7 +57,12 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
         superchainConfig = _superchainConfig;
         portal = _portal;
         systemConfig = _systemConfig;
-        __CrossDomainMessenger_init({ _otherMessenger: CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) });
+    }
+
+    /// @notice Getter function for the other messenger.
+    /// @return Contract of the messenger on the other network.
+    function otherMessenger() public pure override returns (CrossDomainMessenger) {
+        return CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
     }
 
     /// @inheritdoc CrossDomainMessenger
@@ -86,7 +91,7 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
 
     /// @inheritdoc CrossDomainMessenger
     function _isOtherMessenger() internal view override returns (bool) {
-        return msg.sender == address(portal) && portal.l2Sender() == address(otherMessenger);
+        return msg.sender == address(portal) && portal.l2Sender() == address(otherMessenger());
     }
 
     /// @inheritdoc CrossDomainMessenger
diff --git a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
index bd9b31c1e589..f66c46c67d71 100644
--- a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity 0.8.25;
 
 // Contracts
 import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
+import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -19,7 +20,7 @@ import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
 /// @notice The L1 ERC721 bridge is a contract which works together with the L2 ERC721 bridge to
 ///         make it possible to transfer ERC721 tokens from Ethereum to Optimism. This contract
 ///         acts as an escrow for ERC721 tokens deposited into L2.
-contract L1ERC721Bridge is ERC721Bridge, ISemver {
+contract L1ERC721Bridge is ERC721Bridge, Initializable, ISemver {
     /// @notice Mapping of L1 token to L2 token to ID to boolean, indicating if the given L1 token
     ///         by ID was deposited for a given L2 token.
     mapping(address => mapping(address => mapping(uint256 => bool))) public deposits;
@@ -27,13 +28,16 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
     /// @notice Address of the SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
 
+    /// @notice Contract of the CrossDomainMessenger on this chain.
+    ICrossDomainMessenger internal crossDomainMessenger;
+
     /// @notice Semantic version.
-    /// @custom:semver 2.2.0-beta.1
-    string public constant version = "2.2.0-beta.1";
+    /// @custom:semver 2.1.1-beta.3
+    string public constant version = "2.1.1-beta.3";
 
     /// @notice Constructs the L1ERC721Bridge contract.
     constructor() ERC721Bridge() {
-        initialize({ _messenger: ICrossDomainMessenger(address(0)), _superchainConfig: ISuperchainConfig(address(0)) });
+        _disableInitializers();
     }
 
     /// @notice Initializes the contract.
@@ -41,7 +45,19 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
     /// @param _superchainConfig Contract of the SuperchainConfig contract on this network.
     function initialize(ICrossDomainMessenger _messenger, ISuperchainConfig _superchainConfig) public initializer {
         superchainConfig = _superchainConfig;
-        __ERC721Bridge_init({ _messenger: _messenger, _otherBridge: ERC721Bridge(payable(Predeploys.L2_ERC721_BRIDGE)) });
+        crossDomainMessenger = _messenger;
+    }
+
+    /// @notice Getter function for the CrossDomainMessenger contract on this chain.
+    /// @return Contract of the CrossDomainMessenger on this chain.
+    function messenger() public view override returns (ICrossDomainMessenger) {
+        return ICrossDomainMessenger(crossDomainMessenger);
+    }
+
+    /// @notice Getter function for the other bridge.
+    /// @return Contract of the bridge on the other network.
+    function otherBridge() public pure override returns (ERC721Bridge) {
+        return ERC721Bridge(payable(Predeploys.L2_ERC721_BRIDGE));
     }
 
     /// @inheritdoc ERC721Bridge
@@ -116,7 +132,7 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
         IERC721(_localToken).transferFrom({ from: _from, to: address(this), tokenId: _tokenId });
 
         // Send calldata into L2
-        messenger.sendMessage({ _target: address(otherBridge), _message: message, _minGasLimit: _minGasLimit });
+        messenger().sendMessage({ _target: address(otherBridge()), _message: message, _minGasLimit: _minGasLimit });
         emit ERC721BridgeInitiated(_localToken, _remoteToken, _from, _to, _tokenId, _extraData);
     }
 }
diff --git a/packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol
new file mode 100644
index 000000000000..8d70325597bc
--- /dev/null
+++ b/packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";
+import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+
+/// @custom:proxied true
+/// @title L1OptimismMintableERC20Factory
+/// @notice Allows users to create L1 tokens that represent L2 native tokens.
+contract L1OptimismMintableERC20Factory is OptimismMintableERC20Factory, Initializable {
+    /// @custom:semver 1.3.1-beta.5
+    /// @notice Semantic version.
+    ///         The semver MUST be bumped any time that there is a change in
+    ///         the OptimismMintableERC20 token contract since this contract
+    ///         is responsible for deploying OptimismMintableERC20 contracts.
+    string public constant version = "1.3.1-beta.5";
+
+    /// @custom:spacer
+    /// @notice Spacer to fill the remainder of the _initialized slot, preventing the standardBridge
+    ///         address from being packed with it.
+    bytes30 private spacer_51_2_30;
+
+    /// @notice Address of the bridge on this domain.
+    address internal standardBridge;
+
+    constructor() {
+        _disableInitializers();
+    }
+
+    /// @notice Initializes the contract.
+    /// @param _bridge Contract of the bridge on this domain.
+    function initialize(address _bridge) public initializer {
+        standardBridge = _bridge;
+    }
+
+    /// @notice Getter function for the bridge contract.
+    /// @return Contract of the bridge on this domain.
+    function bridge() public view virtual override returns (address) {
+        return standardBridge;
+    }
+}
diff --git a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
index 54cc833fe673..f49f29864a93 100644
--- a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
@@ -3,15 +3,16 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { StandardBridge } from "src/universal/StandardBridge.sol";
-
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 /// @custom:proxied true
 /// @title L1StandardBridge
@@ -23,7 +24,7 @@ import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 ///         NOTE: this contract is not intended to support all variations of ERC20 tokens. Examples
 ///         of some token types that may not be properly supported by this contract include, but are
 ///         not limited to: tokens with transfer fees, rebasing tokens, and tokens with blocklists.
-contract L1StandardBridge is StandardBridge, ISemver {
+contract L1StandardBridge is StandardBridge, ISemver, Initializable {
     /// @custom:legacy
     /// @notice Emitted whenever a deposit of ETH from L1 into L2 is initiated.
     /// @param from      Address of the depositor.
@@ -75,8 +76,13 @@ contract L1StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 2.2.1-beta.2
-    string public constant version = "2.2.1-beta.2";
+    /// @custom:semver 2.2.1-beta.3
+    string public constant version = "2.2.1-beta.3";
+
+    /// @custom:spacer
+    /// @notice Spacer to fill the remainder of the _initialized slot, preventing the superchainConfig
+    ///         address from being packed with it.
+    bytes30 private spacer_49_2_30;
 
     /// @notice Address of the SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
@@ -84,13 +90,12 @@ contract L1StandardBridge is StandardBridge, ISemver {
     /// @notice Address of the SystemConfig contract.
     ISystemConfig public systemConfig;
 
+    /// @notice Contract for the CrossDomainMessenger on this network.
+    ICrossDomainMessenger internal crossDomainMessenger;
+
     /// @notice Constructs the L1StandardBridge contract.
     constructor() StandardBridge() {
-        initialize({
-            _messenger: ICrossDomainMessenger(address(0)),
-            _superchainConfig: ISuperchainConfig(address(0)),
-            _systemConfig: ISystemConfig(address(0))
-        });
+        _disableInitializers();
     }
 
     /// @notice Initializer.
@@ -106,10 +111,19 @@ contract L1StandardBridge is StandardBridge, ISemver {
     {
         superchainConfig = _superchainConfig;
         systemConfig = _systemConfig;
-        __StandardBridge_init({
-            _messenger: _messenger,
-            _otherBridge: StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE))
-        });
+        crossDomainMessenger = _messenger;
+    }
+
+    /// @notice Returns the contract of the bridge on the other chain.
+    /// @return Contract of the bridge on the other chain.
+    function otherBridge() public pure override returns (IStandardBridge) {
+        return IStandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE));
+    }
+
+    /// @notice Getter function for the messenger contract.
+    /// @return Contract of the messenger on this domain.
+    function messenger() public view override returns (ICrossDomainMessenger) {
+        return ICrossDomainMessenger(crossDomainMessenger);
     }
 
     /// @inheritdoc StandardBridge
@@ -241,8 +255,8 @@ contract L1StandardBridge is StandardBridge, ISemver {
     /// @custom:legacy
     /// @notice Retrieves the access of the corresponding L2 bridge contract.
     /// @return Address of the corresponding L2 bridge contract.
-    function l2TokenBridge() external view returns (address) {
-        return address(otherBridge);
+    function l2TokenBridge() external pure returns (address) {
+        return address(otherBridge());
     }
 
     /// @notice Internal function for initiating an ETH deposit.
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
index 4bf52ff228a1..721c7649ed0a 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -46,6 +46,7 @@ contract OPContractsManager is ISemver, Initializable {
         address unsafeBlockSigner;
         address proposer;
         address challenger;
+        address systemConfigFeeAdmin;
     }
 
     /// @notice The full set of inputs to deploy a new OP Stack chain.
@@ -129,8 +130,8 @@ contract OPContractsManager is ISemver, Initializable {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.0.0-beta.20
-    string public constant version = "1.0.0-beta.20";
+    /// @custom:semver 1.0.0-beta.21
+    string public constant version = "1.0.0-beta.21";
 
     /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
     /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
@@ -254,7 +255,7 @@ contract OPContractsManager is ISemver, Initializable {
         output.systemConfigProxy =
             ISystemConfig(deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "SystemConfig"));
         output.optimismMintableERC20FactoryProxy = IOptimismMintableERC20Factory(
-            deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "OptimismMintableERC20Factory")
+            deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "L1OptimismMintableERC20Factory")
         );
         output.disputeGameFactoryProxy =
             IDisputeGameFactory(deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "DisputeGameFactory"));
@@ -468,12 +469,15 @@ contract OPContractsManager is ISemver, Initializable {
 
             return abi.encodeWithSelector(
                 _selector,
-                _input.roles.systemConfigOwner,
+                ISystemConfig.Roles({
+                    owner: _input.roles.systemConfigOwner,
+                    feeAdmin: _input.roles.systemConfigFeeAdmin,
+                    unsafeBlockSigner: _input.roles.unsafeBlockSigner,
+                    batcherHash: bytes32(uint256(uint160(_input.roles.batcher)))
+                }),
                 _input.basefeeScalar,
                 _input.blobBasefeeScalar,
-                bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
                 _input.gasLimit,
-                _input.roles.unsafeBlockSigner,
                 referenceResourceConfig,
                 chainIdToBatchInboxAddress(_input.l2ChainId),
                 opChainAddrs
@@ -487,12 +491,15 @@ contract OPContractsManager is ISemver, Initializable {
 
             return abi.encodeWithSelector(
                 _selector,
-                _input.roles.systemConfigOwner,
+                ISystemConfig.Roles({
+                    owner: _input.roles.systemConfigOwner,
+                    feeAdmin: _input.roles.systemConfigFeeAdmin,
+                    unsafeBlockSigner: _input.roles.unsafeBlockSigner,
+                    batcherHash: bytes32(uint256(uint160(_input.roles.batcher)))
+                }),
                 _input.basefeeScalar,
                 _input.blobBasefeeScalar,
-                bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
                 _input.gasLimit,
-                _input.roles.unsafeBlockSigner,
                 referenceResourceConfig,
                 chainIdToBatchInboxAddress(_input.l2ChainId),
                 opChainAddrs
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
index 19de5537b41c..a237dc1162f0 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
@@ -41,12 +41,15 @@ contract OPContractsManagerInterop is OPContractsManager {
 
         return abi.encodeWithSelector(
             _selector,
-            _input.roles.systemConfigOwner,
+            ISystemConfig.Roles({
+                owner: _input.roles.systemConfigOwner,
+                feeAdmin: _input.roles.systemConfigFeeAdmin,
+                unsafeBlockSigner: _input.roles.unsafeBlockSigner,
+                batcherHash: bytes32(uint256(uint160(_input.roles.batcher)))
+            }),
             _input.basefeeScalar,
             _input.blobBasefeeScalar,
-            bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
             _input.gasLimit,
-            _input.roles.unsafeBlockSigner,
             referenceResourceConfig,
             chainIdToBatchInboxAddress(_input.l2ChainId),
             opChainAddrs,
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal.sol b/packages/contracts-bedrock/src/L1/OptimismPortal.sol
index 2f9f53787581..d097d2e22d12 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortal.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortal.sol
@@ -146,9 +146,9 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 2.8.1-beta.4
+    /// @custom:semver 2.8.1-beta.5
     function version() public pure virtual returns (string memory) {
-        return "2.8.1-beta.4";
+        return "2.8.1-beta.5";
     }
 
     /// @notice Constructs the OptimismPortal contract.
@@ -584,17 +584,17 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
         emit TransactionDeposited(from, _to, DEPOSIT_VERSION, opaqueData);
     }
 
-    /// @notice Sets the gas paying token for the L2 system. This token is used as the
-    ///         L2 native asset. Only the SystemConfig contract can call this function.
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external {
+    /// @notice Sets static configuration options for the L2 system.
+    /// @param _type  Type of configuration to set.
+    /// @param _value Encoded value of the configuration.
+    function setConfig(Types.ConfigType _type, bytes memory _value) external {
         if (msg.sender != address(systemConfig)) revert Unauthorized();
 
         // Set L2 deposit gas as used without paying burning gas. Ensures that deposits cannot use too much L2 gas.
-        // This value must be large enough to cover the cost of calling `L1Block.setGasPayingToken`.
+        // This value must be large enough to cover the cost of calling `L1Block.setConfig`.
         useGas(SYSTEM_DEPOSIT_GAS_LIMIT);
 
-        // Emit the special deposit transaction directly that sets the gas paying
-        // token in the L1Block predeploy contract.
+        // Emit the special deposit transaction directly that sets the config in the L1Block predeploy contract.
         emit TransactionDeposited(
             Constants.DEPOSITOR_ACCOUNT,
             Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -604,7 +604,7 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
                 uint256(0), // value
                 uint64(SYSTEM_DEPOSIT_GAS_LIMIT), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
+                abi.encodeCall(IL1Block.setConfig, (_type, _value))
             )
         );
     }
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
index 985711ed18e5..951e2bea4a18 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
@@ -183,9 +183,9 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 3.11.0-beta.6
+    /// @custom:semver 3.11.0-beta.7
     function version() public pure virtual returns (string memory) {
-        return "3.11.0-beta.6";
+        return "3.11.0-beta.7";
     }
 
     /// @notice Constructs the OptimismPortal contract.
@@ -605,17 +605,17 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
         emit TransactionDeposited(from, _to, DEPOSIT_VERSION, opaqueData);
     }
 
-    /// @notice Sets the gas paying token for the L2 system. This token is used as the
-    ///         L2 native asset. Only the SystemConfig contract can call this function.
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external {
+    /// @notice Sets static configuration options for the L2 system.
+    /// @param _type  Type of configuration to set.
+    /// @param _value Encoded value of the configuration.
+    function setConfig(Types.ConfigType _type, bytes memory _value) external {
         if (msg.sender != address(systemConfig)) revert Unauthorized();
 
         // Set L2 deposit gas as used without paying burning gas. Ensures that deposits cannot use too much L2 gas.
-        // This value must be large enough to cover the cost of calling `L1Block.setGasPayingToken`.
+        // This value must be large enough to cover the cost of calling `L1Block.setConfig`.
         useGas(SYSTEM_DEPOSIT_GAS_LIMIT);
 
-        // Emit the special deposit transaction directly that sets the gas paying
-        // token in the L1Block predeploy contract.
+        // Emit the special deposit transaction directly that sets the config in the L1Block predeploy contract.
         emit TransactionDeposited(
             Constants.DEPOSITOR_ACCOUNT,
             Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -625,7 +625,30 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
                 uint256(0), // value
                 uint64(SYSTEM_DEPOSIT_GAS_LIMIT), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
+                abi.encodeCall(IL1Block.setConfig, (_type, _value))
+            )
+        );
+    }
+
+    /// @notice Calls the L2ProxyAdmin as the DEPOSITOR_ACCOUNT. This function can be used
+    ///         to upgrade the predeploys on L2. Only callable by the upgrader role on the
+    ///         SuperchainConfig.
+    function upgrade(uint32 _gasLimit, bytes memory _calldata) external {
+        if (msg.sender != superchainConfig.upgrader()) revert Unauthorized();
+
+        useGas(_gasLimit);
+
+        // Emit the special deposit transaction which calls to the L2 Proxy Admin
+        emit TransactionDeposited(
+            Constants.DEPOSITOR_ACCOUNT,
+            Predeploys.PROXY_ADMIN,
+            DEPOSIT_VERSION,
+            abi.encodePacked(
+                uint256(0), // mint
+                uint256(0), // value
+                uint64(_gasLimit), // gasLimit
+                false, // isCreation,
+                _calldata // data
             )
         );
     }
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
index 4c238c415d34..be23f4eec56d 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
@@ -3,12 +3,6 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { OptimismPortal2 } from "src/L1/OptimismPortal2.sol";
-import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
-
-// Libraries
-import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Constants } from "src/libraries/Constants.sol";
-import { Unauthorized } from "src/libraries/PortalErrors.sol";
 
 /// @custom:proxied true
 /// @title OptimismPortalInterop
@@ -23,33 +17,8 @@ contract OptimismPortalInterop is OptimismPortal2 {
         OptimismPortal2(_proofMaturityDelaySeconds, _disputeGameFinalityDelaySeconds)
     { }
 
-    /// @custom:semver +interop-beta.2
+    /// @custom:semver +interop-beta.3
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.2");
-    }
-
-    /// @notice Sets static configuration options for the L2 system.
-    /// @param _type  Type of configuration to set.
-    /// @param _value Encoded value of the configuration.
-    function setConfig(ConfigType _type, bytes memory _value) external {
-        if (msg.sender != address(systemConfig)) revert Unauthorized();
-
-        // Set L2 deposit gas as used without paying burning gas. Ensures that deposits cannot use too much L2 gas.
-        // This value must be large enough to cover the cost of calling `L1Block.setConfig`.
-        useGas(SYSTEM_DEPOSIT_GAS_LIMIT);
-
-        // Emit the special deposit transaction directly that sets the config in the L1Block predeploy contract.
-        emit TransactionDeposited(
-            Constants.DEPOSITOR_ACCOUNT,
-            Predeploys.L1_BLOCK_ATTRIBUTES,
-            DEPOSIT_VERSION,
-            abi.encodePacked(
-                uint256(0), // mint
-                uint256(0), // value
-                uint64(SYSTEM_DEPOSIT_GAS_LIMIT), // gasLimit
-                false, // isCreation,
-                abi.encodeCall(L1BlockInterop.setConfig, (_type, _value))
-            )
-        );
+        return string.concat(super.version(), "+interop-beta.3");
     }
 }
diff --git a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
index 51b13936c81b..1701bcff165b 100644
--- a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
@@ -12,8 +12,10 @@ import { Storage } from "src/libraries/Storage.sol";
 contract SuperchainConfig is Initializable, ISemver {
     /// @notice Enum representing different types of updates.
     /// @custom:value GUARDIAN            Represents an update to the guardian.
+    /// @custom:value UPGRADER            Represents an update to the upgrader.
     enum UpdateType {
-        GUARDIAN
+        GUARDIAN,
+        UPGRADER
     }
 
     /// @notice Whether or not the Superchain is paused.
@@ -23,6 +25,10 @@ contract SuperchainConfig is Initializable, ISemver {
     ///         It can only be modified by an upgrade.
     bytes32 public constant GUARDIAN_SLOT = bytes32(uint256(keccak256("superchainConfig.guardian")) - 1);
 
+    /// @notice The address of the upgrader, which can faciliate upgrades of L2 predeploys.
+    /// .       It can only be modified by an upgrade.
+    bytes32 public constant UPGRADER_SLOT = bytes32(uint256(keccak256("superchainConfig.upgrader")) - 1);
+
     /// @notice Emitted when the pause is triggered.
     /// @param identifier A string helping to identify provenance of the pause transaction.
     event Paused(string identifier);
@@ -36,19 +42,20 @@ contract SuperchainConfig is Initializable, ISemver {
     event ConfigUpdate(UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.1
-    string public constant version = "1.1.1-beta.1";
+    /// @custom:semver 1.1.1-beta.2
+    string public constant version = "1.1.1-beta.2";
 
     /// @notice Constructs the SuperchainConfig contract.
     constructor() {
-        initialize({ _guardian: address(0), _paused: false });
+        _disableInitializers();
     }
 
     /// @notice Initializer.
     /// @param _guardian    Address of the guardian, can pause the OptimismPortal.
     /// @param _paused      Initial paused status.
-    function initialize(address _guardian, bool _paused) public initializer {
+    function initialize(address _guardian, address _upgrader, bool _paused) public initializer {
         _setGuardian(_guardian);
+        _setUpgrader(_upgrader);
         if (_paused) {
             _pause("Initializer paused");
         }
@@ -59,6 +66,11 @@ contract SuperchainConfig is Initializable, ISemver {
         guardian_ = Storage.getAddress(GUARDIAN_SLOT);
     }
 
+    /// @notice Getter for the upgrader address.
+    function upgrader() public view returns (address upgrader_) {
+        upgrader_ = Storage.getAddress(UPGRADER_SLOT);
+    }
+
     /// @notice Getter for the current paused status.
     function paused() public view returns (bool paused_) {
         paused_ = Storage.getBool(PAUSED_SLOT);
@@ -92,4 +104,12 @@ contract SuperchainConfig is Initializable, ISemver {
         Storage.setAddress(GUARDIAN_SLOT, _guardian);
         emit ConfigUpdate(UpdateType.GUARDIAN, abi.encode(_guardian));
     }
+
+    /// @notice Sets the upgrader address. This is only callable during initialization, so an upgrade
+    ///         will be required to change the upgrader.
+    /// @param _upgrader The new upgrader address.
+    function _setUpgrader(address _upgrader) internal {
+        Storage.setAddress(UPGRADER_SLOT, _upgrader);
+        emit ConfigUpdate(UpdateType.UPGRADER, abi.encode(_upgrader));
+    }
 }
diff --git a/packages/contracts-bedrock/src/L1/SystemConfig.sol b/packages/contracts-bedrock/src/L1/SystemConfig.sol
index afb9525403c7..f4b724b8d27e 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfig.sol
@@ -4,15 +4,18 @@ pragma solidity 0.8.15;
 // Contracts
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { StaticConfig } from "src/libraries/StaticConfig.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
 
 // Libraries
 import { Storage } from "src/libraries/Storage.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
+import { IOptimismPortal2 as IOptimismPortal } from "src/L1/interfaces/IOptimismPortal2.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 
 /// @custom:proxied true
@@ -48,6 +51,18 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         address gasPayingToken;
     }
 
+    /// @notice Struct representing the roles of the system.
+    /// @notice The owner (chain operator) of the system.
+    /// @notice The fee admin of the system.
+    /// @notice The unsafe block signer of the system.
+    /// @notice The batcher hash of the system.
+    struct Roles {
+        address owner;
+        address feeAdmin;
+        address unsafeBlockSigner;
+        bytes32 batcherHash;
+    }
+
     /// @notice Version identifier, used for upgrades.
     uint256 public constant VERSION = 0;
 
@@ -61,6 +76,9 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     ///         but it is better to be safe than sorry.
     bytes32 public constant UNSAFE_BLOCK_SIGNER_SLOT = keccak256("systemconfig.unsafeblocksigner");
 
+    /// @notice Storage slot that the feeAdmin address is stored at.
+    bytes32 internal constant FEE_ADMIN_SLOT = keccak256("systemconfig.feeadmin");
+
     /// @notice Storage slot that the L1CrossDomainMessenger address is stored at.
     bytes32 public constant L1_CROSS_DOMAIN_MESSENGER_SLOT =
         bytes32(uint256(keccak256("systemconfig.l1crossdomainmessenger")) - 1);
@@ -137,9 +155,9 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 2.3.0-beta.5
+    /// @custom:semver 2.3.0-beta.6
     function version() public pure virtual returns (string memory) {
-        return "2.3.0-beta.5";
+        return "2.3.0-beta.6";
     }
 
     /// @notice Constructs the SystemConfig contract. Cannot set
@@ -147,55 +165,28 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     ///         implementation, so set it to `address(0xdEaD)`
     /// @dev    START_BLOCK_SLOT is set to type(uint256).max here so that it will be a dead value
     ///         in the singleton and is skipped by initialize when setting the start block.
+    ///         _disableInitializers is called to prevent the need to make calls during the constructor
+    ///         if initialize is called directly.
     constructor() {
         Storage.setUint(START_BLOCK_SLOT, type(uint256).max);
-        initialize({
-            _owner: address(0xdEaD),
-            _basefeeScalar: 0,
-            _blobbasefeeScalar: 0,
-            _batcherHash: bytes32(0),
-            _gasLimit: 1,
-            _unsafeBlockSigner: address(0),
-            _config: IResourceMetering.ResourceConfig({
-                maxResourceLimit: 1,
-                elasticityMultiplier: 1,
-                baseFeeMaxChangeDenominator: 2,
-                minimumBaseFee: 0,
-                systemTxMaxGas: 0,
-                maximumBaseFee: 0
-            }),
-            _batchInbox: address(0),
-            _addresses: SystemConfig.Addresses({
-                l1CrossDomainMessenger: address(0),
-                l1ERC721Bridge: address(0),
-                l1StandardBridge: address(0),
-                disputeGameFactory: address(0),
-                optimismPortal: address(0),
-                optimismMintableERC20Factory: address(0),
-                gasPayingToken: address(0)
-            })
-        });
+        _disableInitializers();
     }
 
     /// @notice Initializer.
     ///         The resource config must be set before the require check.
-    /// @param _owner             Initial owner of the contract.
+    /// @param _roles             Initial roles.
     /// @param _basefeeScalar     Initial basefee scalar value.
     /// @param _blobbasefeeScalar Initial blobbasefee scalar value.
-    /// @param _batcherHash       Initial batcher hash.
     /// @param _gasLimit          Initial gas limit.
-    /// @param _unsafeBlockSigner Initial unsafe block signer address.
     /// @param _config            Initial ResourceConfig.
     /// @param _batchInbox        Batch inbox address. An identifier for the op-node to find
     ///                           canonical data.
     /// @param _addresses         Set of L1 contract addresses. These should be the proxies.
     function initialize(
-        address _owner,
+        Roles memory _roles,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
-        bytes32 _batcherHash,
         uint64 _gasLimit,
-        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         SystemConfig.Addresses memory _addresses
@@ -204,29 +195,58 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         initializer
     {
         __Ownable_init();
-        transferOwnership(_owner);
+        transferOwnership(_roles.owner);
 
         // These are set in ascending order of their UpdateTypes.
-        _setBatcherHash(_batcherHash);
+        _setBatcherHash(_roles.batcherHash);
         _setGasConfigEcotone({ _basefeeScalar: _basefeeScalar, _blobbasefeeScalar: _blobbasefeeScalar });
         _setGasLimit(_gasLimit);
 
-        Storage.setAddress(UNSAFE_BLOCK_SIGNER_SLOT, _unsafeBlockSigner);
+        Storage.setAddress(UNSAFE_BLOCK_SIGNER_SLOT, _roles.unsafeBlockSigner);
+        Storage.setAddress(FEE_ADMIN_SLOT, _roles.feeAdmin);
         Storage.setAddress(BATCH_INBOX_SLOT, _batchInbox);
-        Storage.setAddress(L1_CROSS_DOMAIN_MESSENGER_SLOT, _addresses.l1CrossDomainMessenger);
-        Storage.setAddress(L1_ERC_721_BRIDGE_SLOT, _addresses.l1ERC721Bridge);
-        Storage.setAddress(L1_STANDARD_BRIDGE_SLOT, _addresses.l1StandardBridge);
-        Storage.setAddress(DISPUTE_GAME_FACTORY_SLOT, _addresses.disputeGameFactory);
+
         Storage.setAddress(OPTIMISM_PORTAL_SLOT, _addresses.optimismPortal);
+        Storage.setAddress(DISPUTE_GAME_FACTORY_SLOT, _addresses.disputeGameFactory);
         Storage.setAddress(OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT, _addresses.optimismMintableERC20Factory);
 
-        _setStartBlock();
         _setGasPayingToken(_addresses.gasPayingToken);
+        _setAddress(
+            L1_CROSS_DOMAIN_MESSENGER_SLOT,
+            _addresses.l1CrossDomainMessenger,
+            Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS
+        );
+        _setAddress(L1_ERC_721_BRIDGE_SLOT, _addresses.l1ERC721Bridge, Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS);
+        _setAddress(L1_STANDARD_BRIDGE_SLOT, _addresses.l1StandardBridge, Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS);
+
+        _setRemoteChainId();
+        _setStartBlock();
+
+        // TODO: set fee vault config calls
 
         _setResourceConfig(_config);
         require(_gasLimit >= minimumGasLimit(), "SystemConfig: gas limit too low");
     }
 
+    /// @notice Internal setter for L1 system addresses that need to be legible from within L2.
+    /// @param _slot The local storage slot that the address should be stored in.
+    /// @param _addr The address of the L1 based system address.
+    /// @param _type The ConfigType that represents what the address is.
+    function _setAddress(bytes32 _slot, address _addr, Types.ConfigType _type) internal {
+        Storage.setAddress(_slot, _addr);
+        IOptimismPortal(payable(optimismPortal())).setConfig({ _type: _type, _value: abi.encode(_addr) });
+    }
+
+    /// @notice Internal setter for the base chain's chain id. This allows for the
+    ///         base chain's chain id to be legible from within the parent chain.
+    ///         In the case of an L2, this would be the L1 chain id.
+    function _setRemoteChainId() internal {
+        IOptimismPortal(payable(optimismPortal())).setConfig({
+            _type: Types.ConfigType.REMOTE_CHAIN_ID,
+            _value: abi.encode(block.chainid)
+        });
+    }
+
     /// @notice Returns the minimum L2 gas limit that can be safely set for the system to
     ///         operate. The L2 gas limit must be larger than or equal to the amount of
     ///         gas that is allocated for deposits per block plus the amount of gas that
@@ -253,6 +273,12 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         addr_ = Storage.getAddress(UNSAFE_BLOCK_SIGNER_SLOT);
     }
 
+    /// @notice High level getter for the fee admin address.
+    /// @return addr_ Address of the fee admin.
+    function feeAdmin() public view returns (address addr_) {
+        addr_ = Storage.getAddress(FEE_ADMIN_SLOT);
+    }
+
     /// @notice Getter for the L1CrossDomainMessenger address.
     function l1CrossDomainMessenger() external view returns (address addr_) {
         addr_ = Storage.getAddress(L1_CROSS_DOMAIN_MESSENGER_SLOT);
@@ -320,7 +346,7 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     ///         to set the token address. This prevents the token address from being changed
     ///         and makes it explicitly opt-in to use custom gas token.
     /// @param _token Address of the gas paying token.
-    function _setGasPayingToken(address _token) internal virtual {
+    function _setGasPayingToken(address _token) internal {
         if (_token != address(0) && _token != Constants.ETHER && !isCustomGasToken()) {
             require(
                 ERC20(_token).decimals() == GAS_PAYING_TOKEN_DECIMALS, "SystemConfig: bad decimals of gas paying token"
@@ -328,14 +354,17 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
             bytes32 name = GasPayingToken.sanitize(ERC20(_token).name());
             bytes32 symbol = GasPayingToken.sanitize(ERC20(_token).symbol());
 
-            // Set the gas paying token in storage and in the OptimismPortal.
+            // Set the gas paying token in storage and call the OptimismPortal.
             GasPayingToken.set({ _token: _token, _decimals: GAS_PAYING_TOKEN_DECIMALS, _name: name, _symbol: symbol });
-            IOptimismPortal(payable(optimismPortal())).setGasPayingToken({
-                _token: _token,
-                _decimals: GAS_PAYING_TOKEN_DECIMALS,
-                _name: name,
-                _symbol: symbol
-            });
+            IOptimismPortal(payable(optimismPortal())).setConfig(
+                Types.ConfigType.GAS_PAYING_TOKEN,
+                StaticConfig.encodeSetGasPayingToken({
+                    _token: _token,
+                    _decimals: GAS_PAYING_TOKEN_DECIMALS,
+                    _name: name,
+                    _symbol: symbol
+                })
+            );
         }
     }
 
@@ -416,6 +445,47 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         _setGasLimit(_gasLimit);
     }
 
+    /// @notice Setter for the FeeVault predeploy configuration.
+    /// @param _type The FeeVault type.
+    /// @param _recipient Address that should receive the funds.
+    /// @param _min Minimum withdrawal amount allowed to be processed.
+    /// @param _network The network in which the fees should be withdrawn to.
+    function setFeeVaultConfig(
+        Types.ConfigType _type,
+        address _recipient,
+        uint256 _min,
+        Types.WithdrawalNetwork _network
+    )
+        external
+    {
+        require(msg.sender == feeAdmin(), "SystemConfig: caller is not the fee admin");
+        _setFeeVaultConfig(_type, _recipient, _min, _network);
+    }
+
+    /// @notice Internal function for setting the FeeVault config by type.
+    /// @param _type The FeeVault type
+    /// @param _recipient Address that should receive the funds.
+    /// @param _min Minimum withdrawal amount allowed to be processed.
+    /// @param _network The network in which the fees should be withdrawn to.
+    function _setFeeVaultConfig(
+        Types.ConfigType _type,
+        address _recipient,
+        uint256 _min,
+        Types.WithdrawalNetwork _network
+    )
+        internal
+    {
+        require(
+            _type == Types.ConfigType.BASE_FEE_VAULT_CONFIG || _type == Types.ConfigType.L1_FEE_VAULT_CONFIG
+                || _type == Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG,
+            "SystemConfig: ConfigType is is not a Fee Vault Config type"
+        );
+        IOptimismPortal(payable(optimismPortal())).setConfig({
+            _type: _type,
+            _value: abi.encode(Encoding.encodeFeeVaultConfig(_recipient, _min, _network))
+        });
+    }
+
     /// @notice Internal function for updating the L2 gas limit.
     /// @param _gasLimit New gas limit.
     function _setGasLimit(uint64 _gasLimit) internal {
@@ -492,6 +562,9 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
             "SystemConfig: precision loss with target resource limit"
         );
 
+        // TODO: maxResourceLimit must be large enough to handle the SystemConfig.initialize
+        //       call
+
         _resourceConfig = _config;
     }
 }
diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
index 032109286596..755c279fc8ac 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
@@ -2,16 +2,13 @@
 pragma solidity 0.8.15;
 
 // Contracts
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IOptimismPortalInterop as IOptimismPortal } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { SystemConfig } from "src/L1/SystemConfig.sol";
-import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Libraries
-import { Constants } from "src/libraries/Constants.sol";
-import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { Storage } from "src/libraries/Storage.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
@@ -28,24 +25,20 @@ contract SystemConfigInterop is SystemConfig {
         0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c;
 
     /// @notice Initializer.
-    /// @param _owner             Initial owner of the contract.
+    /// @param _roles             Initial roles.
     /// @param _basefeeScalar     Initial basefee scalar value.
     /// @param _blobbasefeeScalar Initial blobbasefee scalar value.
-    /// @param _batcherHash       Initial batcher hash.
     /// @param _gasLimit          Initial gas limit.
-    /// @param _unsafeBlockSigner Initial unsafe block signer address.
     /// @param _config            Initial ResourceConfig.
     /// @param _batchInbox        Batch inbox address. An identifier for the op-node to find
     ///                           canonical data.
     /// @param _addresses         Set of L1 contract addresses. These should be the proxies.
     /// @param _dependencyManager The addressed allowed to add/remove from the dependency set
     function initialize(
-        address _owner,
+        SystemConfig.Roles memory _roles,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
-        bytes32 _batcherHash,
         uint64 _gasLimit,
-        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         SystemConfig.Addresses memory _addresses,
@@ -55,12 +48,10 @@ contract SystemConfigInterop is SystemConfig {
     {
         // This method has an initializer modifier, and will revert if already initialized.
         initialize({
-            _owner: _owner,
+            _roles: _roles,
             _basefeeScalar: _basefeeScalar,
             _blobbasefeeScalar: _blobbasefeeScalar,
-            _batcherHash: _batcherHash,
             _gasLimit: _gasLimit,
-            _unsafeBlockSigner: _unsafeBlockSigner,
             _config: _config,
             _batchInbox: _batchInbox,
             _addresses: _addresses
@@ -68,38 +59,9 @@ contract SystemConfigInterop is SystemConfig {
         Storage.setAddress(DEPENDENCY_MANAGER_SLOT, _dependencyManager);
     }
 
-    /// @custom:semver +interop-beta.3
+    /// @custom:semver +interop-beta.4
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.3");
-    }
-
-    /// @notice Internal setter for the gas paying token address, includes validation.
-    ///         The token must not already be set and must be non zero and not the ether address
-    ///         to set the token address. This prevents the token address from being changed
-    ///         and makes it explicitly opt-in to use custom gas token. Additionally,
-    ///         OptimismPortal's address must be non zero, since otherwise the call to set the
-    ///         config for the gas paying token to OptimismPortal will fail.
-    /// @param _token Address of the gas paying token.
-    function _setGasPayingToken(address _token) internal override {
-        if (_token != address(0) && _token != Constants.ETHER && !isCustomGasToken()) {
-            require(
-                ERC20(_token).decimals() == GAS_PAYING_TOKEN_DECIMALS, "SystemConfig: bad decimals of gas paying token"
-            );
-            bytes32 name = GasPayingToken.sanitize(ERC20(_token).name());
-            bytes32 symbol = GasPayingToken.sanitize(ERC20(_token).symbol());
-
-            // Set the gas paying token in storage and in the OptimismPortal.
-            GasPayingToken.set({ _token: _token, _decimals: GAS_PAYING_TOKEN_DECIMALS, _name: name, _symbol: symbol });
-            IOptimismPortal(payable(optimismPortal())).setConfig(
-                ConfigType.SET_GAS_PAYING_TOKEN,
-                StaticConfig.encodeSetGasPayingToken({
-                    _token: _token,
-                    _decimals: GAS_PAYING_TOKEN_DECIMALS,
-                    _name: name,
-                    _symbol: symbol
-                })
-            );
-        }
+        return string.concat(super.version(), "+interop-beta.4");
     }
 
     /// @notice Adds a chain to the interop dependency set. Can only be called by the dependency manager.
@@ -107,7 +69,7 @@ contract SystemConfigInterop is SystemConfig {
     function addDependency(uint256 _chainId) external {
         require(msg.sender == dependencyManager(), "SystemConfig: caller is not the dependency manager");
         IOptimismPortal(payable(optimismPortal())).setConfig(
-            ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId)
+            Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId)
         );
     }
 
@@ -116,7 +78,7 @@ contract SystemConfigInterop is SystemConfig {
     function removeDependency(uint256 _chainId) external {
         require(msg.sender == dependencyManager(), "SystemConfig: caller is not the dependency manager");
         IOptimismPortal(payable(optimismPortal())).setConfig(
-            ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId)
+            Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId)
         );
     }
 
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
index 8a6de84e2c9d..eb3d0250af2f 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
@@ -7,6 +7,8 @@ import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 
 interface IL1CrossDomainMessenger is ICrossDomainMessenger {
+    event Initialized(uint8 version);
+
     function PORTAL() external view returns (IOptimismPortal);
     function initialize(
         ISuperchainConfig _superchainConfig,
@@ -14,6 +16,8 @@ interface IL1CrossDomainMessenger is ICrossDomainMessenger {
         ISystemConfig _systemConfig
     )
         external;
+    function OTHER_MESSENGER() external view returns (ICrossDomainMessenger);
+    function otherMessenger() external pure returns (ICrossDomainMessenger);
     function portal() external view returns (IOptimismPortal);
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
index 51356bc8d346..ec111614a523 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
@@ -6,6 +6,11 @@ import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMess
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 
 interface IL1ERC721Bridge is IERC721Bridge {
+    error InvalidInitialization();
+    error NotInitializing();
+
+    event Initialized(uint64 version);
+
     function bridgeERC721(
         address _localToken,
         address _remoteToken,
@@ -34,6 +39,7 @@ interface IL1ERC721Bridge is IERC721Bridge {
     )
         external;
     function initialize(ICrossDomainMessenger _messenger, ISuperchainConfig _superchainConfig) external;
+    function otherBridge() external pure returns (IERC721Bridge);
     function paused() external view returns (bool);
     function superchainConfig() external view returns (ISuperchainConfig);
     function version() external view returns (string memory);
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol
new file mode 100644
index 000000000000..7ac1d3175d40
--- /dev/null
+++ b/packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+interface IL1OptimismMintableERC20Factory {
+    event Initialized(uint8 version);
+    event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
+    event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
+
+    function BRIDGE() external view returns (address);
+    function bridge() external view returns (address);
+    function createOptimismMintableERC20(
+        address _remoteToken,
+        string memory _name,
+        string memory _symbol
+    )
+        external
+        returns (address);
+    function createOptimismMintableERC20WithDecimals(
+        address _remoteToken,
+        string memory _name,
+        string memory _symbol,
+        uint8 _decimals
+    )
+        external
+        returns (address);
+    function createStandardL2Token(
+        address _remoteToken,
+        string memory _name,
+        string memory _symbol
+    )
+        external
+        returns (address);
+    function deployments(address) external view returns (address);
+    function initialize(address _bridge) external;
+    function version() external view returns (string memory);
+
+    function __constructor__() external;
+}
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
index 816436cf1084..53419cdd59d5 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
@@ -25,6 +25,7 @@ interface IL1StandardBridge is IStandardBridge {
     );
     event ETHDepositInitiated(address indexed from, address indexed to, uint256 amount, bytes extraData);
     event ETHWithdrawalFinalized(address indexed from, address indexed to, uint256 amount, bytes extraData);
+    event Initialized(uint8 version);
 
     function depositERC20(
         address _l1Token,
@@ -68,7 +69,9 @@ interface IL1StandardBridge is IStandardBridge {
         ISystemConfig _systemConfig
     )
         external;
-    function l2TokenBridge() external view returns (address);
+    function l2TokenBridge() external pure returns (address);
+    function OTHER_BRIDGE() external view returns (IStandardBridge);
+    function otherBridge() external pure returns (IStandardBridge);
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
     function version() external view returns (string memory);
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
index b9035a6e5143..69f9fb9e16c6 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
@@ -5,6 +5,7 @@ import { Types } from "src/libraries/Types.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
+import { Types } from "src/libraries/Types.sol";
 
 interface IOptimismPortal {
     error BadTarget();
@@ -78,9 +79,9 @@ interface IOptimismPortal {
         external
         view
         returns (bytes32 outputRoot, uint128 timestamp, uint128 l2OutputIndex); // nosemgrep
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
+    function setConfig(Types.ConfigType _type, bytes memory _value) external;
     function version() external pure returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
index 91f09d714314..51395720f283 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
@@ -7,6 +7,7 @@ import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { Types } from "src/libraries/Types.sol";
 
 interface IOptimismPortal2 {
     error AlreadyFinalized();
@@ -108,11 +109,12 @@ interface IOptimismPortal2 {
         returns (IDisputeGame disputeGameProxy, uint64 timestamp); // nosemgrep
     function respectedGameType() external view returns (GameType);
     function respectedGameTypeUpdatedAt() external view returns (uint64);
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function setRespectedGameType(GameType _gameType) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
     function version() external pure returns (string memory);
+    function setConfig(Types.ConfigType _type, bytes memory _value) external;
+    function upgrade(uint32 _gasLimit, bytes memory _calldata) external;
 
     function __constructor__(uint256 _proofMaturityDelaySeconds, uint256 _disputeGameFinalityDelaySeconds) external;
 }
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
index 521c7232e125..7a66caecbdb7 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
@@ -7,7 +7,6 @@ import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 interface IOptimismPortalInterop {
     error AlreadyFinalized();
@@ -109,11 +108,11 @@ interface IOptimismPortalInterop {
         returns (IDisputeGame disputeGameProxy, uint64 timestamp); // nosemgrep
     function respectedGameType() external view returns (GameType);
     function respectedGameTypeUpdatedAt() external view returns (uint64);
-    function setConfig(ConfigType _type, bytes memory _value) external;
-    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
+    function setConfig(Types.ConfigType _type, bytes memory _value) external;
     function setRespectedGameType(GameType _gameType) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
+    function upgrade(uint32 _gasLimit, bytes memory _calldata) external;
     function version() external pure returns (string memory);
 
     function __constructor__(uint256 _proofMaturityDelaySeconds, uint256 _disputeGameFinalityDelaySeconds) external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol b/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol
index dc83893958b0..88f9a7cffae9 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol
@@ -13,8 +13,10 @@ interface ISuperchainConfig {
 
     function GUARDIAN_SLOT() external view returns (bytes32);
     function PAUSED_SLOT() external view returns (bytes32);
+    function UPGRADER_SLOT() external view returns (bytes32);
     function guardian() external view returns (address guardian_);
-    function initialize(address _guardian, bool _paused) external;
+    function upgrader() external view returns (address upgrader_);
+    function initialize(address _guardian, address _upgrader, bool _paused) external;
     function pause(string memory _identifier) external;
     function paused() external view returns (bool paused_);
     function unpause() external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
index 8959c00b744a..5b68bd7fd099 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
@@ -2,9 +2,12 @@
 pragma solidity ^0.8.0;
 
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { Types } from "src/libraries/Types.sol";
 
 /// @notice This interface corresponds to the Custom Gas Token version of the SystemConfig contract.
 interface ISystemConfig {
+    error UnsafeCast();
+
     enum UpdateType {
         BATCHER,
         FEE_SCALARS,
@@ -23,6 +26,13 @@ interface ISystemConfig {
         address gasPayingToken;
     }
 
+    struct Roles {
+        address owner;
+        address feeAdmin;
+        address unsafeBlockSigner;
+        bytes32 batcherHash;
+    }
+
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
     event Initialized(uint8 version);
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
@@ -49,12 +59,10 @@ interface ISystemConfig {
     function gasPayingTokenName() external view returns (string memory name_);
     function gasPayingTokenSymbol() external view returns (string memory symbol_);
     function initialize(
-        address _owner,
+        Roles memory _roles,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
-        bytes32 _batcherHash,
         uint64 _gasLimit,
-        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         Addresses memory _addresses
@@ -70,10 +78,18 @@ interface ISystemConfig {
     function optimismPortal() external view returns (address addr_);
     function overhead() external view returns (uint256);
     function owner() external view returns (address);
+    function feeAdmin() external view returns (address addr_);
     function renounceOwnership() external;
     function resourceConfig() external view returns (IResourceMetering.ResourceConfig memory);
     function scalar() external view returns (uint256);
     function setBatcherHash(bytes32 _batcherHash) external;
+    function setFeeVaultConfig(
+        Types.ConfigType _type,
+        address _recipient,
+        uint256 _min,
+        Types.WithdrawalNetwork _network
+    )
+        external;
     function setGasConfig(uint256 _overhead, uint256 _scalar) external;
     function setGasConfigEcotone(uint32 _basefeeScalar, uint32 _blobbasefeeScalar) external;
     function setGasLimit(uint64 _gasLimit) external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
index e11d17c9f7bd..65eccead56e7 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
@@ -40,6 +40,7 @@ interface ISystemConfigInterop {
     function optimismPortal() external view returns (address addr_);
     function overhead() external view returns (uint256);
     function owner() external view returns (address);
+    function feeAdmin() external view returns (address);
     function renounceOwnership() external;
     function resourceConfig() external view returns (IResourceMetering.ResourceConfig memory);
     function scalar() external view returns (uint256);
@@ -57,12 +58,10 @@ interface ISystemConfigInterop {
     function removeDependency(uint256 _chainId) external;
     function dependencyManager() external view returns (address);
     function initialize(
-        address _owner,
+        ISystemConfig.Roles memory _roles,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
-        bytes32 _batcherHash,
         uint64 _gasLimit,
-        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         ISystemConfig.Addresses memory _addresses,
diff --git a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
index 2fd33b9290bf..29710b9eece6 100644
--- a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { FeeVault } from "src/L2/FeeVault.sol";
-
 import { Types } from "src/libraries/Types.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000019
@@ -12,18 +12,20 @@ import { Types } from "src/libraries/Types.sol";
 /// @notice The BaseFeeVault accumulates the base fee that is paid by transactions.
 contract BaseFeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.3
-    string public constant version = "1.5.0-beta.3";
+    /// @custom:semver 1.5.0-beta.4
+    string public constant version = "1.5.0-beta.4";
 
-    /// @notice Constructs the BaseFeeVault contract.
-    /// @param _recipient           Wallet that will receive the fees.
-    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
-    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
-    constructor(
-        address _recipient,
-        uint256 _minWithdrawalAmount,
-        Types.WithdrawalNetwork _withdrawalNetwork
-    )
-        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
-    { }
+    /// @notice Returns the FeeVault config
+    /// @return recipient_           Wallet that will receive the fees.
+    /// @return amount_              Minimum balance for withdrawals.
+    /// @return withdrawalNetwork_   Network which the recipient will receive fees on.
+    function config()
+        public
+        view
+        override
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_)
+    {
+        bytes memory data = L1_BLOCK().getConfig(Types.ConfigType.BASE_FEE_VAULT_CONFIG);
+        (recipient_, amount_, withdrawalNetwork_) = Encoding.decodeFeeVaultConfig(abi.decode(data, (bytes32)));
+    }
 }
diff --git a/packages/contracts-bedrock/src/L2/FeeVault.sol b/packages/contracts-bedrock/src/L2/FeeVault.sol
index 856985d7827b..3d2ecfd6e1a3 100644
--- a/packages/contracts-bedrock/src/L2/FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/FeeVault.sol
@@ -4,6 +4,7 @@ pragma solidity 0.8.15;
 // Libraries
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 
 // Interfaces
 import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
@@ -15,27 +16,15 @@ import { Types } from "src/libraries/Types.sol";
 /// @notice The FeeVault contract contains the basic logic for the various different vault contracts
 ///         used to hold fee revenue generated by the L2 system.
 abstract contract FeeVault {
-    /// @notice Minimum balance before a withdrawal can be triggered.
-    ///         Use the `minWithdrawalAmount()` getter as this is deprecated
-    ///         and is subject to be removed in the future.
-    /// @custom:legacy
-    uint256 public immutable MIN_WITHDRAWAL_AMOUNT;
-
-    /// @notice Account that will receive the fees. Can be located on L1 or L2.
-    ///         Use the `recipient()` getter as this is deprecated
-    ///         and is subject to be removed in the future.
-    /// @custom:legacy
-    address public immutable RECIPIENT;
-
-    /// @notice Network which the recipient will receive fees on.
-    ///         Use the `withdrawalNetwork()` getter as this is deprecated
-    ///         and is subject to be removed in the future.
-    /// @custom:legacy
-    Types.WithdrawalNetwork public immutable WITHDRAWAL_NETWORK;
-
     /// @notice The minimum gas limit for the FeeVault withdrawal transaction.
     uint32 internal constant WITHDRAWAL_MIN_GAS = 400_000;
 
+    /// @notice Internal getter function for the L1Block contract.
+    /// @return Contract of the L1Block on this domain.
+    function L1_BLOCK() internal pure returns (IL1Block) {
+        return IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
+    }
+
     /// @notice Total amount of wei processed by the contract.
     uint256 public totalProcessed;
 
@@ -56,52 +45,76 @@ abstract contract FeeVault {
     /// @param withdrawalNetwork Network which the to address will receive funds on.
     event Withdrawal(uint256 value, address to, address from, Types.WithdrawalNetwork withdrawalNetwork);
 
-    /// @param _recipient           Wallet that will receive the fees.
-    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
-    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
-    constructor(address _recipient, uint256 _minWithdrawalAmount, Types.WithdrawalNetwork _withdrawalNetwork) {
-        RECIPIENT = _recipient;
-        MIN_WITHDRAWAL_AMOUNT = _minWithdrawalAmount;
-        WITHDRAWAL_NETWORK = _withdrawalNetwork;
-    }
-
     /// @notice Allow the contract to receive ETH.
     receive() external payable { }
 
+    /// @notice Returns the configuration of the FeeVault.
+    function config()
+        public
+        view
+        virtual
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
+
     /// @notice Minimum balance before a withdrawal can be triggered.
-    function minWithdrawalAmount() public view returns (uint256 amount_) {
-        amount_ = MIN_WITHDRAWAL_AMOUNT;
+    function minWithdrawalAmount() public view virtual returns (uint256 amount_) {
+        (, amount_,) = config();
+    }
+
+    /// @notice Minimum balance before a withdrawal can be triggered.
+    ///         Use the `minWithdrawalAmount()` getter as this is deprecated
+    ///         and is subject to be removed in the future.
+    /// @custom:legacy true
+    function MIN_WITHDRAWAL_AMOUNT() public view returns (uint256) {
+        return minWithdrawalAmount();
     }
 
     /// @notice Account that will receive the fees. Can be located on L1 or L2.
-    function recipient() public view returns (address recipient_) {
-        recipient_ = RECIPIENT;
+    function recipient() public view virtual returns (address recipient_) {
+        (recipient_,,) = config();
+    }
+
+    /// @notice Account that will receive the fees. Can be located on L1 or L2.
+    ///         Use the `recipient()` getter as this is deprecated
+    ///         and is subject to be removed in the future.
+    /// @custom:legacy
+    function RECIPIENT() public view returns (address) {
+        return recipient();
     }
 
     /// @notice Network which the recipient will receive fees on.
-    function withdrawalNetwork() public view returns (Types.WithdrawalNetwork network_) {
-        network_ = WITHDRAWAL_NETWORK;
+    function withdrawalNetwork() public view returns (Types.WithdrawalNetwork withdrawalNetwork_) {
+        (,, withdrawalNetwork_) = config();
+    }
+
+    /// @notice Network which the recipient will receive fees on.
+    ///         Use the `withdrawalNetwork()` getter as this is deprecated
+    ///         and is subject to be removed in the future.
+    /// @custom:legacy
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_) {
+        withdrawalNetwork_ = withdrawalNetwork();
     }
 
     /// @notice Triggers a withdrawal of funds to the fee wallet on L1 or L2.
     function withdraw() external {
+        (address withdrawalRecipient, uint256 withdrawalAmount, Types.WithdrawalNetwork network) = config();
+
         require(
-            address(this).balance >= MIN_WITHDRAWAL_AMOUNT,
+            address(this).balance >= withdrawalAmount,
             "FeeVault: withdrawal amount must be greater than minimum withdrawal amount"
         );
 
         uint256 value = address(this).balance;
         totalProcessed += value;
 
-        emit Withdrawal(value, RECIPIENT, msg.sender);
-        emit Withdrawal(value, RECIPIENT, msg.sender, WITHDRAWAL_NETWORK);
+        emit Withdrawal(value, withdrawalRecipient, msg.sender);
+        emit Withdrawal(value, withdrawalRecipient, msg.sender, network);
 
-        if (WITHDRAWAL_NETWORK == Types.WithdrawalNetwork.L2) {
-            bool success = SafeCall.send(RECIPIENT, value);
+        if (network == Types.WithdrawalNetwork.L2) {
+            bool success = SafeCall.send(withdrawalRecipient, value);
             require(success, "FeeVault: failed to send ETH to L2 fee recipient");
         } else {
             IL2ToL1MessagePasser(payable(Predeploys.L2_TO_L1_MESSAGE_PASSER)).initiateWithdrawal{ value: value }({
-                _target: RECIPIENT,
+                _target: withdrawalRecipient,
                 _gasLimit: WITHDRAWAL_MIN_GAS,
                 _data: hex""
             });
diff --git a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
index 45f14fe173d0..8b3b71f7c19f 100644
--- a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
+++ b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
@@ -29,8 +29,8 @@ contract GasPriceOracle is ISemver {
     uint256 public constant DECIMALS = 6;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.3
-    string public constant version = "1.3.1-beta.3";
+    /// @custom:semver 1.3.1-beta.4
+    string public constant version = "1.3.1-beta.4";
 
     /// @notice This is the intercept value for the linear regression used to estimate the final size of the
     ///         compressed transaction.
diff --git a/packages/contracts-bedrock/src/L2/L1Block.sol b/packages/contracts-bedrock/src/L2/L1Block.sol
index 0b2ffd2c5782..5a1646bca285 100644
--- a/packages/contracts-bedrock/src/L2/L1Block.sol
+++ b/packages/contracts-bedrock/src/L2/L1Block.sol
@@ -3,7 +3,17 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { Constants } from "src/libraries/Constants.sol";
+import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
+import { IFeeVault, Types as ITypes } from "src/L2/interfaces/IFeeVault.sol";
+import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
+import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
+import { IOptimismMintableERC721Factory } from "src/L2/interfaces/IOptimismMintableERC721Factory.sol";
+import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
+import { Storage } from "src/libraries/Storage.sol";
+import { Types } from "src/libraries/Types.sol";
 import { NotDepositor } from "src/libraries/L1BlockErrors.sol";
 
 /// @custom:proxied true
@@ -17,6 +27,31 @@ contract L1Block is ISemver, IGasToken {
     /// @notice Event emitted when the gas paying token is set.
     event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
 
+    /// @notice Storage slot for the base fee vault configuration
+    bytes32 internal constant BASE_FEE_VAULT_CONFIG_SLOT = bytes32(uint256(keccak256("opstack.basefeevaultconfig")) - 1);
+
+    /// @notice Storage slot for the L1 fee vault configuration
+    bytes32 internal constant L1_FEE_VAULT_CONFIG_SLOT = bytes32(uint256(keccak256("opstack.l1feevaultconfig")) - 1);
+
+    /// @notice Storage slot for the sequencer fee vault configuration
+    bytes32 internal constant SEQUENCER_FEE_VAULT_CONFIG_SLOT =
+        bytes32(uint256(keccak256("opstack.sequencerfeevaultconfig")) - 1);
+
+    /// @notice Storage slot for the L1 cross domain messenger address
+    bytes32 internal constant L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT =
+        bytes32(uint256(keccak256("opstack.l1crossdomainmessengeraddress")) - 1);
+
+    /// @notice Storage slot for the L1 ERC721 bridge address
+    bytes32 internal constant L1_ERC_721_BRIDGE_ADDRESS_SLOT =
+        bytes32(uint256(keccak256("opstack.l1erc721bridgeaddress")) - 1);
+
+    /// @notice Storage slot for the L1 standard bridge address
+    bytes32 internal constant L1_STANDARD_BRIDGE_ADDRESS_SLOT =
+        bytes32(uint256(keccak256("opstack.l1standardbridgeaddress")) - 1);
+
+    /// @notice Storage slot for the remote chain ID
+    bytes32 internal constant REMOTE_CHAIN_ID_SLOT = bytes32(uint256(keccak256("opstack.remotechainid")) - 1);
+
     /// @notice Address of the special depositor account.
     function DEPOSITOR_ACCOUNT() public pure returns (address addr_) {
         addr_ = Constants.DEPOSITOR_ACCOUNT;
@@ -57,9 +92,12 @@ contract L1Block is ISemver, IGasToken {
     /// @notice The latest L1 blob base fee.
     uint256 public blobBaseFee;
 
-    /// @custom:semver 1.5.1-beta.3
+    /// @notice Indicates whether the network has gone through the Isthmus upgrade.
+    bool public isIsthmus;
+
+    /// @custom:semver 1.5.1-beta.4
     function version() public pure virtual returns (string memory) {
-        return "1.5.1-beta.3";
+        return "1.5.1-beta.4";
     }
 
     /// @notice Returns the gas paying token, its decimals, name and symbol.
@@ -168,14 +206,117 @@ contract L1Block is ISemver, IGasToken {
         }
     }
 
+    /// @notice Sets static configuration options for the L2 system. Can only be called by the special
+    ///         depositor account.
+    /// @param _type  The type of configuration to set.
+    /// @param _value The encoded value with which to set the configuration.
+    function setConfig(Types.ConfigType _type, bytes calldata _value) public virtual {
+        if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
+
+        if (_type == Types.ConfigType.GAS_PAYING_TOKEN) {
+            (address token, uint8 decimals, bytes32 name, bytes32 symbol) = StaticConfig.decodeSetGasPayingToken(_value);
+            GasPayingToken.set({ _token: token, _decimals: decimals, _name: name, _symbol: symbol });
+            emit GasPayingTokenSet({ token: token, decimals: decimals, name: name, symbol: symbol });
+        } else if (_type == Types.ConfigType.BASE_FEE_VAULT_CONFIG) {
+            Storage.setBytes32(BASE_FEE_VAULT_CONFIG_SLOT, abi.decode(_value, (bytes32)));
+        } else if (_type == Types.ConfigType.L1_FEE_VAULT_CONFIG) {
+            Storage.setBytes32(L1_FEE_VAULT_CONFIG_SLOT, abi.decode(_value, (bytes32)));
+        } else if (_type == Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS) {
+            Storage.setAddress(L1_ERC_721_BRIDGE_ADDRESS_SLOT, abi.decode(_value, (address)));
+        } else if (_type == Types.ConfigType.REMOTE_CHAIN_ID) {
+            Storage.setUint(REMOTE_CHAIN_ID_SLOT, abi.decode(_value, (uint256)));
+        } else if (_type == Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS) {
+            Storage.setAddress(L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT, abi.decode(_value, (address)));
+        } else if (_type == Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS) {
+            Storage.setAddress(L1_STANDARD_BRIDGE_ADDRESS_SLOT, abi.decode(_value, (address)));
+        } else if (_type == Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG) {
+            Storage.setBytes32(SEQUENCER_FEE_VAULT_CONFIG_SLOT, abi.decode(_value, (bytes32)));
+        }
+    }
+
+    /// @notice Returns the configuration value for the given type. All configuration related storage values in
+    ///         the L2 contracts, should be stored in this contract.
+    /// @param _type The type of configuration to get.
+    /// @return data_ The encoded configuration value.
+    function getConfig(Types.ConfigType _type) public view virtual returns (bytes memory data_) {
+        if (_type == Types.ConfigType.GAS_PAYING_TOKEN) {
+            (address addr, uint8 decimals) = gasPayingToken();
+            data_ = abi.encode(
+                addr,
+                decimals,
+                GasPayingToken.sanitize(gasPayingTokenName()),
+                GasPayingToken.sanitize(gasPayingTokenSymbol())
+            );
+        } else if (_type == Types.ConfigType.BASE_FEE_VAULT_CONFIG) {
+            data_ = abi.encode(Storage.getBytes32(BASE_FEE_VAULT_CONFIG_SLOT));
+        } else if (_type == Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS) {
+            data_ = abi.encode(Storage.getAddress(L1_ERC_721_BRIDGE_ADDRESS_SLOT));
+        } else if (_type == Types.ConfigType.REMOTE_CHAIN_ID) {
+            data_ = abi.encode(Storage.getUint(REMOTE_CHAIN_ID_SLOT));
+        } else if (_type == Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS) {
+            data_ = abi.encode(Storage.getAddress(L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT));
+        } else if (_type == Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS) {
+            data_ = abi.encode(Storage.getAddress(L1_STANDARD_BRIDGE_ADDRESS_SLOT));
+        } else if (_type == Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG) {
+            data_ = abi.encode(Storage.getBytes32(SEQUENCER_FEE_VAULT_CONFIG_SLOT));
+        } else if (_type == Types.ConfigType.L1_FEE_VAULT_CONFIG) {
+            data_ = abi.encode(Storage.getBytes32(L1_FEE_VAULT_CONFIG_SLOT));
+        }
+    }
+
     /// @notice Sets the gas paying token for the L2 system. Can only be called by the special
-    ///         depositor account. This function is not called on every L2 block but instead
-    ///         only called by specially crafted L1 deposit transactions.
+    ///         depositor account, initiated by a deposit transaction from L1.
+    ///         This is a legacy setter that exists to give compabilitity with the legacy SystemConfig.
+    ///         Custom gas token can now be set using `setConfig`. This can be removed in the future.
     function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external {
         if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
 
         GasPayingToken.set({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol });
-
         emit GasPayingTokenSet({ token: _token, decimals: _decimals, name: _name, symbol: _symbol });
     }
+
+    /// @notice Sets the L1 block values for an Isthmus upgraded chain.
+    ///         This function is intended to be called only once, and only on existing chains which are undergoing
+    ///         the Isthmus upgrade. Chains deployed with the Isthmus upgrade activated will have the values set here
+    ///         already populated by the L2 Genesis generation process.
+    ///         In the case of an existing chain underoing the Isthmus upgrade, the expectation is that
+    ///         The upgrade flow will use the following series of Network upgrade automation transactions:
+    ///         1. Deploy a new `L1BlockImpl` contract.
+    ///         2. Upgrade only the `L1Block` contract to the new implementation by
+    ///            calling `L2ProxyAdmin.upgrade(address(L1BlockProxy), address(L1BlockImpl))`.
+    ///         3. Call `L1Block.setIsthmus()` to pull the values from L2 contracts.
+    ///         4. Upgrades the remainder of the L2 contracts via `L2ProxyAdmin.upgrade()`.
+    function setIsthmus() external {
+        if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
+        require(isIsthmus == false, "L1Block: Isthmus already active");
+        isIsthmus = true;
+
+        Storage.setBytes32(BASE_FEE_VAULT_CONFIG_SLOT, _migrateFeeVaultConfig(Predeploys.BASE_FEE_VAULT));
+        Storage.setBytes32(L1_FEE_VAULT_CONFIG_SLOT, _migrateFeeVaultConfig(Predeploys.L1_FEE_VAULT));
+        Storage.setBytes32(SEQUENCER_FEE_VAULT_CONFIG_SLOT, _migrateFeeVaultConfig(Predeploys.SEQUENCER_FEE_WALLET));
+
+        Storage.setAddress(
+            L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT,
+            address(ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER).otherMessenger())
+        );
+        Storage.setAddress(
+            L1_STANDARD_BRIDGE_ADDRESS_SLOT,
+            address(IStandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE)).otherBridge())
+        );
+        Storage.setAddress(
+            L1_ERC_721_BRIDGE_ADDRESS_SLOT, address(IERC721Bridge(Predeploys.L2_ERC721_BRIDGE).otherBridge())
+        );
+        Storage.setUint(
+            REMOTE_CHAIN_ID_SLOT,
+            IOptimismMintableERC721Factory(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY).remoteChainId()
+        );
+    }
+
+    /// @notice Helper function for migrating deploy config.
+    function _migrateFeeVaultConfig(address _addr) internal view returns (bytes32) {
+        address recipient = IFeeVault(payable(_addr)).recipient();
+        uint256 amount = IFeeVault(payable(_addr)).minWithdrawalAmount();
+        ITypes.WithdrawalNetwork network = IFeeVault(payable(_addr)).withdrawalNetwork();
+        return Encoding.encodeFeeVaultConfig(recipient, amount, Types.WithdrawalNetwork(uint8(network)));
+    }
 }
diff --git a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
index 2cf6bd96c7d4..650799383528 100644
--- a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
@@ -6,9 +6,9 @@ import { L1Block } from "src/L2/L1Block.sol";
 
 // Libraries
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
-import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Types } from "src/libraries/Types.sol";
 import {
     NotDepositor,
     NotCrossL2Inbox,
@@ -18,16 +18,6 @@ import {
     CantRemovedDependency
 } from "src/libraries/L1BlockErrors.sol";
 
-/// @notice Enum representing different types of configurations that can be set on L1BlockInterop.
-/// @custom:value SET_GAS_PAYING_TOKEN  Represents the config type for setting the gas paying token.
-/// @custom:value ADD_DEPENDENCY        Represents the config type for adding a chain to the interop dependency set.
-/// @custom:value REMOVE_DEPENDENCY     Represents the config type for removing a chain from the interop dependency set.
-enum ConfigType {
-    SET_GAS_PAYING_TOKEN,
-    ADD_DEPENDENCY,
-    REMOVE_DEPENDENCY
-}
-
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000015
 /// @title L1BlockInterop
@@ -49,9 +39,9 @@ contract L1BlockInterop is L1Block {
     /// keccak256(abi.encode(uint256(keccak256("l1Block.identifier.isDeposit")) - 1)) & ~bytes32(uint256(0xff))
     uint256 internal constant IS_DEPOSIT_SLOT = 0x921bd3a089295c6e5540e8fba8195448d253efd6f2e3e495b499b627dc36a300;
 
-    /// @custom:semver +interop-beta.1
+    /// @custom:semver +interop-beta.2
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.1");
+        return string.concat(super.version(), "+interop-beta.2");
     }
 
     /// @notice Returns whether the call was triggered from a a deposit or not.
@@ -104,28 +94,16 @@ contract L1BlockInterop is L1Block {
     ///         depositor account.
     /// @param _type  The type of configuration to set.
     /// @param _value The encoded value with which to set the configuration.
-    function setConfig(ConfigType _type, bytes calldata _value) external {
-        if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
+    function setConfig(Types.ConfigType _type, bytes calldata _value) public override {
+        super.setConfig(_type, _value);
 
-        if (_type == ConfigType.SET_GAS_PAYING_TOKEN) {
-            _setGasPayingToken(_value);
-        } else if (_type == ConfigType.ADD_DEPENDENCY) {
+        if (_type == Types.ConfigType.ADD_DEPENDENCY) {
             _addDependency(_value);
-        } else if (_type == ConfigType.REMOVE_DEPENDENCY) {
+        } else if (_type == Types.ConfigType.REMOVE_DEPENDENCY) {
             _removeDependency(_value);
         }
     }
 
-    /// @notice Internal method to set the gas paying token.
-    /// @param _value The encoded value with which to set the gas paying token.
-    function _setGasPayingToken(bytes calldata _value) internal {
-        (address token, uint8 decimals, bytes32 name, bytes32 symbol) = StaticConfig.decodeSetGasPayingToken(_value);
-
-        GasPayingToken.set({ _token: token, _decimals: decimals, _name: name, _symbol: symbol });
-
-        emit GasPayingTokenSet({ token: token, decimals: decimals, name: name, symbol: symbol });
-    }
-
     /// @notice Internal method to add a dependency to the interop dependency set.
     /// @param _value The encoded value with which to add the dependency.
     function _addDependency(bytes calldata _value) internal {
diff --git a/packages/contracts-bedrock/src/L2/L1FeeVault.sol b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
index c80c40b98493..62c04faf3024 100644
--- a/packages/contracts-bedrock/src/L2/L1FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { FeeVault } from "src/L2/FeeVault.sol";
-
 import { Types } from "src/libraries/Types.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x420000000000000000000000000000000000001A
@@ -12,18 +12,20 @@ import { Types } from "src/libraries/Types.sol";
 /// @notice The L1FeeVault accumulates the L1 portion of the transaction fees.
 contract L1FeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.3
-    string public constant version = "1.5.0-beta.3";
+    /// @custom:semver 1.5.0-beta.4
+    string public constant version = "1.5.0-beta.4";
 
-    /// @notice Constructs the L1FeeVault contract.
-    /// @param _recipient           Wallet that will receive the fees.
-    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
-    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
-    constructor(
-        address _recipient,
-        uint256 _minWithdrawalAmount,
-        Types.WithdrawalNetwork _withdrawalNetwork
-    )
-        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
-    { }
+    /// @notice Returns the FeeVault config
+    /// @return recipient_           Wallet that will receive the fees.
+    /// @return amount_              Minimum balance for withdrawals.
+    /// @return withdrawalNetwork_   Network which the recipient will receive fees on.
+    function config()
+        public
+        view
+        override
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_)
+    {
+        bytes memory data = L1_BLOCK().getConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG);
+        (recipient_, amount_, withdrawalNetwork_) = Encoding.decodeFeeVaultConfig(abi.decode(data, (bytes32)));
+    }
 }
diff --git a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
index 2461e46d2cf5..d4b19e35f97b 100644
--- a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
@@ -7,6 +7,7 @@ import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
 // Libraries
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -20,26 +21,22 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 ///         L2 on the L2 side. Users are generally encouraged to use this contract instead of lower
 ///         level message passing contracts.
 contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
-    /// @custom:semver 2.1.1-beta.4
-    string public constant version = "2.1.1-beta.4";
-
-    /// @notice Constructs the L2CrossDomainMessenger contract.
-    constructor() CrossDomainMessenger() {
-        initialize({ _l1CrossDomainMessenger: CrossDomainMessenger(address(0)) });
-    }
-
-    /// @notice Initializer.
-    /// @param _l1CrossDomainMessenger L1CrossDomainMessenger contract on the other network.
-    function initialize(CrossDomainMessenger _l1CrossDomainMessenger) public initializer {
-        __CrossDomainMessenger_init({ _otherMessenger: _l1CrossDomainMessenger });
+    /// @custom:semver 2.1.1-beta.5
+    string public constant version = "2.1.1-beta.5";
+
+    /// @notice Getter for the remote chain's messenger.
+    function otherMessenger() public view override returns (CrossDomainMessenger) {
+        bytes memory data =
+            IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS);
+        return CrossDomainMessenger(abi.decode(data, (address)));
     }
 
-    /// @notice Getter for the remote messenger.
+    /// @notice Legay getter for the remote chain's messenger.
     ///         Public getter is legacy and will be removed in the future. Use `otherMessenger()` instead.
     /// @return L1CrossDomainMessenger contract.
     /// @custom:legacy
     function l1CrossDomainMessenger() public view returns (CrossDomainMessenger) {
-        return otherMessenger;
+        return otherMessenger();
     }
 
     /// @inheritdoc CrossDomainMessenger
@@ -56,7 +53,7 @@ contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
 
     /// @inheritdoc CrossDomainMessenger
     function _isOtherMessenger() internal view override returns (bool) {
-        return AddressAliasHelper.undoL1ToL2Alias(msg.sender) == address(otherMessenger);
+        return AddressAliasHelper.undoL1ToL2Alias(msg.sender) == address(otherMessenger());
     }
 
     /// @inheritdoc CrossDomainMessenger
diff --git a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
index 85c6856e629d..9536696491ba 100644
--- a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity 0.8.25;
 
 // Contracts
 import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
@@ -7,11 +7,13 @@ import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
 // Libraries
 import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
 import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @custom:proxied true
@@ -26,21 +28,21 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 ///         wait for the one-week challenge period to elapse before their Optimism-native NFT
 ///         can be refunded on L2.
 contract L2ERC721Bridge is ERC721Bridge, ISemver {
-    /// @custom:semver 1.8.0-beta.2
-    string public constant version = "1.8.0-beta.2";
+    /// @custom:semver 1.8.0-beta.3
+    string public constant version = "1.8.0-beta.3";
 
-    /// @notice Constructs the L2ERC721Bridge contract.
-    constructor() ERC721Bridge() {
-        initialize({ _l1ERC721Bridge: payable(address(0)) });
+    /// @notice Getter function for the messenger contract.
+    /// @return Address of the messenger on this domain.
+    function messenger() public pure override returns (ICrossDomainMessenger) {
+        return ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
     }
 
-    /// @notice Initializes the contract.
-    /// @param _l1ERC721Bridge Address of the ERC721 bridge contract on the other network.
-    function initialize(address payable _l1ERC721Bridge) public initializer {
-        __ERC721Bridge_init({
-            _messenger: ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER),
-            _otherBridge: ERC721Bridge(_l1ERC721Bridge)
-        });
+    /// @notice Getter function for the other bridge.
+    /// @return Address of the bridge on the other network.
+    function otherBridge() public view override returns (ERC721Bridge) {
+        bytes memory data =
+            IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS);
+        return ERC721Bridge(abi.decode(data, (address)));
     }
 
     /// @notice Completes an ERC721 bridge from the other domain and sends the ERC721 token to the
@@ -123,7 +125,7 @@ contract L2ERC721Bridge is ERC721Bridge, ISemver {
 
         // Send message to L1 bridge
         // slither-disable-next-line reentrancy-events
-        messenger.sendMessage({ _target: address(otherBridge), _message: message, _minGasLimit: _minGasLimit });
+        messenger().sendMessage({ _target: address(otherBridge()), _message: message, _minGasLimit: _minGasLimit });
 
         // slither-disable-next-line reentrancy-events
         emit ERC721BridgeInitiated(_localToken, remoteToken, _from, _to, _tokenId, _extraData);
diff --git a/packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol
new file mode 100644
index 000000000000..dbec47a6d246
--- /dev/null
+++ b/packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";
+import { Predeploys } from "src/libraries/Predeploys.sol";
+
+/// @custom:proxied true
+/// @custom:predeployed 0x4200000000000000000000000000000000000012
+/// @title L2OptimismMintableERC20Factory
+/// @notice L2OptimismMintableERC20Factory is a factory contract that generates OptimismMintableERC20
+///         contracts on the network it's deployed to. Simplifies the deployment process for users
+///         who may be less familiar with deploying smart contracts. Designed to be backwards
+///         compatible with the older StandardL2ERC20Factory contract.
+contract L2OptimismMintableERC20Factory is OptimismMintableERC20Factory {
+    /// @custom:semver 1.3.1-beta.5
+    /// @notice Semantic version.
+    ///         The semver MUST be bumped any time that there is a change in
+    ///         the OptimismMintableERC20 token contract since this contract
+    ///         is responsible for deploying OptimismMintableERC20 contracts.
+    string public constant version = "1.3.1-beta.5";
+
+    function bridge() public view virtual override returns (address) {
+        return Predeploys.L2_STANDARD_BRIDGE;
+    }
+}
diff --git a/packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol b/packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol
new file mode 100644
index 000000000000..38178fd51dd2
--- /dev/null
+++ b/packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { ProxyAdmin } from "src/universal/ProxyAdmin.sol";
+import { Constants } from "src/libraries/Constants.sol";
+
+/// @custom:proxied true
+/// @custom:predeploy
+/// @title L2ProxyAdmin
+contract L2ProxyAdmin is ProxyAdmin {
+    constructor() ProxyAdmin(Constants.DEPOSITOR_ACCOUNT) { }
+
+    /// @notice The owner of the L2ProxyAdmin is the `DEPOSITOR_ACCOUNT`.
+    function owner() public pure override returns (address) {
+        return Constants.DEPOSITOR_ACCOUNT;
+    }
+}
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
index 63bda3209fbb..81b9f825f36a 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
@@ -3,10 +3,12 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { StandardBridge } from "src/universal/StandardBridge.sol";
+import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -58,23 +60,21 @@ contract L2StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.11.1-beta.3
+    /// @custom:semver 1.11.1-beta.4
     function version() public pure virtual returns (string memory) {
-        return "1.11.1-beta.3";
+        return "1.11.1-beta.4";
     }
 
-    /// @notice Constructs the L2StandardBridge contract.
-    constructor() StandardBridge() {
-        initialize({ _otherBridge: StandardBridge(payable(address(0))) });
+    /// @notice Returns the corresponding L1 StandardBridge contract.
+    function otherBridge() public view override returns (IStandardBridge) {
+        bytes memory data =
+            IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS);
+        return IStandardBridge(abi.decode(data, (address)));
     }
 
-    /// @notice Initializer.
-    /// @param _otherBridge Contract for the corresponding bridge on the other chain.
-    function initialize(StandardBridge _otherBridge) public initializer {
-        __StandardBridge_init({
-            _messenger: ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER),
-            _otherBridge: _otherBridge
-        });
+    /// @notice Returns the cross domain messenger.
+    function messenger() public pure override returns (ICrossDomainMessenger) {
+        return ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
     }
 
     /// @notice Allows EOAs to bridge ETH by sending directly to the bridge.
@@ -146,7 +146,7 @@ contract L2StandardBridge is StandardBridge, ISemver {
     /// @notice Retrieves the access of the corresponding L1 bridge contract.
     /// @return Address of the corresponding L1 bridge contract.
     function l1TokenBridge() external view returns (address) {
-        return address(otherBridge);
+        return address(otherBridge());
     }
 
     /// @custom:legacy
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
index e17ef29dd964..622d92187238 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
@@ -40,9 +40,9 @@ contract L2StandardBridgeInterop is L2StandardBridge {
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
     /// @notice Semantic version.
-    /// @custom:semver +interop-beta.2
+    /// @custom:semver +interop-beta.3
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.2");
+        return string.concat(super.version(), "+interop-beta.3");
     }
 
     /// @notice Converts `amount` of `from` token to `to` token.
diff --git a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
index 6b1d7327dbc0..7a6342dc07e3 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
@@ -65,8 +65,8 @@ contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
     uint16 public constant messageVersion = uint16(0);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.10
-    string public constant version = "1.0.0-beta.10";
+    /// @custom:semver 1.0.0-beta.11
+    string public constant version = "1.0.0-beta.11";
 
     /// @notice Mapping of message hashes to boolean receipt values. Note that a message will only be present in this
     ///         mapping if it has successfully been relayed on this chain, and can therefore not be relayed again.
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol b/packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
similarity index 51%
rename from packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
rename to packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
index 7350e0fae0de..a6818a83c9e6 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
@@ -2,19 +2,18 @@
 pragma solidity 0.8.15;
 
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
+import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Types } from "src/libraries/Types.sol";
 
 /// @title OptimismMintableERC721Factory
 /// @notice Factory contract for creating OptimismMintableERC721 contracts.
+///         This contract could in theory live on both L1 and L2 but it is not widely
+///         used and is therefore set up to work on L2. This could be abstracted in the
+///         future to be deployable on L1 as well.
 contract OptimismMintableERC721Factory is ISemver {
-    /// @custom:legacy true
-    /// @notice Address of the ERC721 bridge on this network.
-    address public immutable BRIDGE;
-
-    /// @custom:legacy true
-    /// @notice Chain ID for the remote network.
-    uint256 public immutable REMOTE_CHAIN_ID;
-
     /// @notice Tracks addresses created by this factory.
     mapping(address => bool) public isOptimismMintableERC721;
 
@@ -25,27 +24,34 @@ contract OptimismMintableERC721Factory is ISemver {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     /// @notice Semantic version.
+    ///     The semver MUST be bumped any time that there is a change in
+    ///     the OptimismMintableERC721 token contract since this contract
+    ///     is responsible for deploying OptimismMintableERC721 contracts.
     /// @custom:semver 1.4.1-beta.4
     string public constant version = "1.4.1-beta.4";
 
-    /// @notice The semver MUST be bumped any time that there is a change in
-    ///         the OptimismMintableERC721 token contract since this contract
-    ///         is responsible for deploying OptimismMintableERC721 contracts.
-    /// @param _bridge Address of the ERC721 bridge on this network.
-    /// @param _remoteChainId Chain ID for the remote network.
-    constructor(address _bridge, uint256 _remoteChainId) {
-        BRIDGE = _bridge;
-        REMOTE_CHAIN_ID = _remoteChainId;
+    /// @notice Returns the remote chain id
+    function REMOTE_CHAIN_ID() external view returns (uint256) {
+        return remoteChainId();
+    }
+
+    /// @notice Getter function for the remote chain id.
+    function remoteChainId() public view returns (uint256) {
+        bytes memory data = IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.REMOTE_CHAIN_ID);
+        return abi.decode(data, (uint256));
     }
 
-    /// @notice Address of the ERC721 bridge on this network.
-    function bridge() external view returns (address) {
-        return BRIDGE;
+    /// @notice Getter function for the bridge contract.
+    ///         Public getter is legacy and will be removed in the future. Use `bridge()` instead.
+    /// @return Bridge contract on this domain.
+    /// @custom:legacy
+    function BRIDGE() external pure returns (IL2ERC721Bridge) {
+        return bridge();
     }
 
-    /// @notice Chain ID for the remote network.
-    function remoteChainID() external view returns (uint256) {
-        return REMOTE_CHAIN_ID;
+    /// @notice Returns the ERC721 bridge contract.
+    function bridge() public pure returns (IL2ERC721Bridge) {
+        return IL2ERC721Bridge(Predeploys.L2_ERC721_BRIDGE);
     }
 
     /// @notice Creates an instance of the standard ERC721.
@@ -64,7 +70,7 @@ contract OptimismMintableERC721Factory is ISemver {
 
         bytes32 salt = keccak256(abi.encode(_remoteToken, _name, _symbol));
         address localToken =
-            address(new OptimismMintableERC721{ salt: salt }(BRIDGE, REMOTE_CHAIN_ID, _remoteToken, _name, _symbol));
+            address(new OptimismMintableERC721{ salt: salt }(bridge(), remoteChainId(), _remoteToken, _name, _symbol));
 
         isOptimismMintableERC721[localToken] = true;
         emit OptimismMintableERC721Created(localToken, _remoteToken, msg.sender);
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
index c323d8b7577b..86f73f1d6f95 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
@@ -58,8 +58,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.9
-    string public constant override version = "1.0.0-beta.9";
+    /// @custom:semver 1.0.0-beta.10
+    string public constant override version = "1.0.0-beta.10";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
index e2b3dc437b0f..6f79097b16e9 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
@@ -11,8 +11,8 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 /// @notice OptimismSuperchainERC20Beacon is the beacon proxy for the OptimismSuperchainERC20 implementation.
 contract OptimismSuperchainERC20Beacon is IBeacon, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.2
-    string public constant version = "1.0.0-beta.2";
+    /// @custom:semver 1.0.0-beta.3
+    string public constant version = "1.0.0-beta.3";
 
     /// @inheritdoc IBeacon
     function implementation() external pure override returns (address) {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
index 454e3b455d62..505bfdc37291 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
@@ -22,8 +22,8 @@ contract OptimismSuperchainERC20Factory is ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.4
-    string public constant version = "1.0.0-beta.4";
+    /// @custom:semver 1.0.0-beta.5
+    string public constant version = "1.0.0-beta.5";
 
     /// @notice Mapping of the deployed OptimismSuperchainERC20 to the remote token address.
     ///         This is used to keep track of the token deployments.
diff --git a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
index 69a78219e5bd..965948e42e5f 100644
--- a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { FeeVault } from "src/L2/FeeVault.sol";
-
 import { Types } from "src/libraries/Types.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000011
@@ -12,25 +12,27 @@ import { Types } from "src/libraries/Types.sol";
 /// @notice The SequencerFeeVault is the contract that holds any fees paid to the Sequencer during
 ///         transaction processing and block production.
 contract SequencerFeeVault is FeeVault, ISemver {
-    /// @custom:semver 1.5.0-beta.3
-    string public constant version = "1.5.0-beta.3";
+    /// @custom:semver 1.5.0-beta.4
+    string public constant version = "1.5.0-beta.4";
 
-    /// @notice Constructs the SequencerFeeVault contract.
-    /// @param _recipient           Wallet that will receive the fees.
-    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
-    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
-    constructor(
-        address _recipient,
-        uint256 _minWithdrawalAmount,
-        Types.WithdrawalNetwork _withdrawalNetwork
-    )
-        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
-    { }
+    /// @notice Returns the FeeVault config
+    /// @return recipient_           Wallet that will receive the fees.
+    /// @return amount_              Minimum balance for withdrawals.
+    /// @return withdrawalNetwork_   Network which the recipient will receive fees on.
+    function config()
+        public
+        view
+        override
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_)
+    {
+        bytes memory data = L1_BLOCK().getConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG);
+        (recipient_, amount_, withdrawalNetwork_) = Encoding.decodeFeeVaultConfig(abi.decode(data, (bytes32)));
+    }
 
     /// @custom:legacy
     /// @notice Legacy getter for the recipient address.
-    /// @return The recipient address.
-    function l1FeeWallet() public view returns (address) {
-        return RECIPIENT;
+    /// @return recipient_ The recipient address.
+    function l1FeeWallet() public view returns (address recipient_) {
+        recipient_ = recipient();
     }
 }
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index 29e179eba82c..14d62c02952b 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -24,8 +24,8 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 ///         do not use a custom gas token.
 contract SuperchainWETH is WETH98, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.10
-    string public constant version = "1.0.0-beta.10";
+    /// @custom:semver 1.0.0-beta.11
+    string public constant version = "1.0.0-beta.11";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
diff --git a/packages/contracts-bedrock/src/L2/WETH.sol b/packages/contracts-bedrock/src/L2/WETH.sol
index dacd62c36de9..8580b99e9522 100644
--- a/packages/contracts-bedrock/src/L2/WETH.sol
+++ b/packages/contracts-bedrock/src/L2/WETH.sol
@@ -14,8 +14,8 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 /// @title WETH contract that reads the name and symbol from the L1Block contract.
 ///        Allows for nice rendering of token names for chains using custom gas token.
 contract WETH is WETH98, ISemver {
-    /// @custom:semver 1.1.0-beta.3
-    string public constant version = "1.1.0-beta.3";
+    /// @custom:semver 1.1.0-beta.4
+    string public constant version = "1.1.0-beta.4";
 
     /// @notice Returns the name of the wrapped native asset. Will be "Wrapped Ether"
     ///         if the native asset is Ether.
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol
index 7ce731f2e631..a195a2428093 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol
@@ -11,19 +11,17 @@ interface IBaseFeeVault {
 
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
-
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function config()
+        external
+        view
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
     function version() external view returns (string memory);
 
-    function __constructor__(
-        address _recipient,
-        uint256 _minWithdrawalAmount,
-        Types.WithdrawalNetwork _withdrawalNetwork
-    )
-        external;
+    function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol
index 3b4cd0209f13..f970bf61c347 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol
@@ -16,12 +16,16 @@ interface IFeeVault {
 
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function config()
+        external
+        view
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
 
     function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol b/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol
index a43b3c7c3963..2b0a016b3571 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol
@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import { Types } from "src/libraries/Types.sol";
+
 interface IL1Block {
     error NotDepositor();
+    error UnsafeCast();
 
     event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
 
@@ -17,11 +20,15 @@ interface IL1Block {
     function gasPayingTokenSymbol() external view returns (string memory symbol_);
     function hash() external view returns (bytes32);
     function isCustomGasToken() external view returns (bool);
+    function isIsthmus() external view returns (bool);
     function l1FeeOverhead() external view returns (uint256);
     function l1FeeScalar() external view returns (uint256);
     function number() external view returns (uint64);
     function sequenceNumber() external view returns (uint64);
+    function setConfig(Types.ConfigType _type, bytes memory _value) external;
+    function getConfig(Types.ConfigType _type) external view returns (bytes memory data_);
     function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
+    function setIsthmus() external;
     function setL1BlockValues(
         uint64 _number,
         uint64 _timestamp,
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol b/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol
index dd72e3fa6f89..bf3be29c0714 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol
@@ -1,11 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-enum ConfigType {
-    SET_GAS_PAYING_TOKEN,
-    ADD_DEPENDENCY,
-    REMOVE_DEPENDENCY
-}
+import { Types } from "src/libraries/Types.sol";
 
 interface IL1BlockInterop {
     error AlreadyDependency();
@@ -14,6 +10,7 @@ interface IL1BlockInterop {
     error NotCrossL2Inbox();
     error NotDependency();
     error NotDepositor();
+    error UnsafeCast();
 
     event DependencyAdded(uint256 indexed chainId);
     event DependencyRemoved(uint256 indexed chainId);
@@ -30,16 +27,19 @@ interface IL1BlockInterop {
     function gasPayingToken() external view returns (address addr_, uint8 decimals_);
     function gasPayingTokenName() external view returns (string memory name_);
     function gasPayingTokenSymbol() external view returns (string memory symbol_);
+    function getConfig(Types.ConfigType _type) external view returns (bytes memory data_);
     function hash() external view returns (bytes32);
     function isCustomGasToken() external view returns (bool);
     function isDeposit() external view returns (bool isDeposit_);
+    function isIsthmus() external view returns (bool);
     function isInDependencySet(uint256 _chainId) external view returns (bool);
     function l1FeeOverhead() external view returns (uint256);
     function l1FeeScalar() external view returns (uint256);
     function number() external view returns (uint64);
     function sequenceNumber() external view returns (uint64);
-    function setConfig(ConfigType _type, bytes memory _value) external;
+    function setConfig(Types.ConfigType _type, bytes memory _value) external;
     function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
+    function setIsthmus() external;
     function setL1BlockValues(
         uint64 _number,
         uint64 _timestamp,
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol
index eb695a7e9a58..7f1362a034ab 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol
@@ -9,21 +9,20 @@ interface IL1FeeVault {
 
     receive() external payable;
 
+    function config()
+        external
+        view
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
 
     function version() external view returns (string memory);
 
-    function __constructor__(
-        address _recipient,
-        uint256 _minWithdrawalAmount,
-        Types.WithdrawalNetwork _withdrawalNetwork
-    )
-        external;
+    function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
index 1cb49f674ec0..60f241d55723 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
@@ -5,8 +5,9 @@ import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMess
 
 interface IL2CrossDomainMessenger is ICrossDomainMessenger {
     function MESSAGE_VERSION() external view returns (uint16);
-    function initialize(ICrossDomainMessenger _l1CrossDomainMessenger) external;
     function l1CrossDomainMessenger() external view returns (ICrossDomainMessenger);
+    function OTHER_MESSENGER() external view returns (ICrossDomainMessenger);
+    function otherMessenger() external view returns (ICrossDomainMessenger);
     function version() external view returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
index a760ce1d803c..6d3c1c1a4d60 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
+import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 
 interface IL2ERC721Bridge is IERC721Bridge {
     function finalizeBridgeERC721(
@@ -13,7 +14,7 @@ interface IL2ERC721Bridge is IERC721Bridge {
         bytes memory _extraData
     )
         external;
-    function initialize(address payable _l1ERC721Bridge) external;
+    function messenger() external pure returns (ICrossDomainMessenger);
     function version() external view returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol
new file mode 100644
index 000000000000..298465021ac6
--- /dev/null
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+interface IL2OptimismMintableERC20Factory {
+    event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
+    event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
+
+    function BRIDGE() external view returns (address);
+    function bridge() external view returns (address);
+    function createOptimismMintableERC20(
+        address _remoteToken,
+        string memory _name,
+        string memory _symbol
+    )
+        external
+        returns (address);
+    function createOptimismMintableERC20WithDecimals(
+        address _remoteToken,
+        string memory _name,
+        string memory _symbol,
+        uint8 _decimals
+    )
+        external
+        returns (address);
+    function createStandardL2Token(
+        address _remoteToken,
+        string memory _name,
+        string memory _symbol
+    )
+        external
+        returns (address);
+    function deployments(address) external view returns (address);
+    function version() external view returns (string memory);
+
+    function __constructor__() external;
+}
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
index 9f9ce1a85621..3526ae5a49de 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 
 interface IL2StandardBridge is IStandardBridge {
     event DepositFinalized(
@@ -23,8 +24,13 @@ interface IL2StandardBridge is IStandardBridge {
 
     receive() external payable;
 
-    function initialize(IStandardBridge _otherBridge) external;
     function l1TokenBridge() external view returns (address);
+    function MESSENGER() external view returns (ICrossDomainMessenger);
+    function messenger() external pure returns (ICrossDomainMessenger);
+
+    function OTHER_BRIDGE() external view returns (IStandardBridge);
+    function otherBridge() external view returns (IStandardBridge);
+
     function version() external pure returns (string memory);
     function withdraw(
         address _l2Token,
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
index 6b60f5e4f9b2..aaed62e14f0a 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
@@ -31,8 +31,6 @@ interface IL2StandardBridgeInterop is IStandardBridge {
         bytes extraData
     );
 
-    function MESSENGER() external view returns (ICrossDomainMessenger);
-    function OTHER_BRIDGE() external view returns (IStandardBridge);
     function bridgeERC20(
         address _localToken,
         address _remoteToken,
@@ -63,11 +61,15 @@ interface IL2StandardBridgeInterop is IStandardBridge {
     )
         external;
     function finalizeBridgeETH(address _from, address _to, uint256 _amount, bytes memory _extraData) external payable;
-    function messenger() external view returns (ICrossDomainMessenger);
+
+    function MESSENGER() external view returns (ICrossDomainMessenger);
+    function messenger() external pure returns (ICrossDomainMessenger);
+
+    function OTHER_BRIDGE() external view returns (IStandardBridge);
     function otherBridge() external view returns (IStandardBridge);
+
     function paused() external view returns (bool);
 
-    function initialize(IStandardBridge _otherBridge) external;
     function l1TokenBridge() external view returns (address);
     function withdraw(
         address _l2Token,
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol b/packages/contracts-bedrock/src/L2/interfaces/IOptimismMintableERC721Factory.sol
similarity index 66%
rename from packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol
rename to packages/contracts-bedrock/src/L2/interfaces/IOptimismMintableERC721Factory.sol
index be3e8ad05425..013c0b73c1a6 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IOptimismMintableERC721Factory.sol
@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
+
 interface IOptimismMintableERC721Factory {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
-    function BRIDGE() external view returns (address);
-    function REMOTE_CHAIN_ID() external view returns (uint256);
-    function bridge() external view returns (address);
+    function BRIDGE() external pure returns (IL2ERC721Bridge);
+    function bridge() external pure returns (IL2ERC721Bridge);
     function createOptimismMintableERC721(
         address _remoteToken,
         string memory _name,
@@ -15,8 +16,9 @@ interface IOptimismMintableERC721Factory {
         external
         returns (address);
     function isOptimismMintableERC721(address) external view returns (bool);
-    function remoteChainID() external view returns (uint256);
+    function REMOTE_CHAIN_ID() external view returns (uint256);
+    function remoteChainId() external view returns (uint256);
     function version() external view returns (string memory);
 
-    function __constructor__(address _bridge, uint256 _remoteChainId) external;
+    function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol
index e4ae46413eff..f6201268134a 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol
@@ -11,20 +11,18 @@ interface ISequencerFeeVault {
 
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
 
     function version() external view returns (string memory);
-    function l1FeeWallet() external view returns (address);
-
-    function __constructor__(
-        address _recipient,
-        uint256 _minWithdrawalAmount,
-        Types.WithdrawalNetwork _withdrawalNetwork
-    )
-        external;
+    function l1FeeWallet() external view returns (address recipient_);
+    function config()
+        external
+        view
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
+    function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/libraries/Encoding.sol b/packages/contracts-bedrock/src/libraries/Encoding.sol
index 84d5f732f5f6..9d8ffe7b76fb 100644
--- a/packages/contracts-bedrock/src/libraries/Encoding.sol
+++ b/packages/contracts-bedrock/src/libraries/Encoding.sol
@@ -8,6 +8,9 @@ import { RLPWriter } from "src/libraries/rlp/RLPWriter.sol";
 /// @title Encoding
 /// @notice Encoding handles Optimism's various different encoding schemes.
 library Encoding {
+    /// @notice Error to be used when an unsafe cast is attempted.
+    error UnsafeCast();
+
     /// @notice RLP encodes the L2 transaction that would be generated when a given deposit is sent
     ///         to the L2 system. Useful for searching for a deposit in the L2 system. The
     ///         transaction is prefixed with 0x7e to identify its EIP-2718 type.
@@ -136,6 +139,39 @@ library Encoding {
         return (nonce, version);
     }
 
+    /// @notice Encodes a fee vault configuration.
+    /// @param _recipient Address of the recipient of the fee vault.
+    /// @param _amount    Amount of the fee vault.
+    /// @param _network   Network of the fee vault.
+    /// @return Encoded fee vault configuration.
+    function encodeFeeVaultConfig(
+        address _recipient,
+        uint256 _amount,
+        Types.WithdrawalNetwork _network
+    )
+        internal
+        pure
+        returns (bytes32)
+    {
+        if (_amount > type(uint88).max) revert UnsafeCast();
+        return bytes32(uint256(_network) << 248 | _amount << 160 | uint256(uint160(_recipient)));
+    }
+
+    /// @notice Decodes a fee vault configuration.
+    /// @param _data Encoded fee vault configuration.
+    /// @return recipient_ Recipient of the fee vault.
+    /// @return amount_ Amount of the fee vault.
+    /// @return network_ Network of the fee vault.
+    function decodeFeeVaultConfig(bytes32 _data)
+        internal
+        pure
+        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork network_)
+    {
+        recipient_ = address(uint160(uint256(_data) & uint256(type(uint160).max)));
+        amount_ = (uint256(_data) & uint256(type(uint88).max) << 160) >> 160;
+        network_ = Types.WithdrawalNetwork(uint8(uint256(_data >> 248)));
+    }
+
     /// @notice Returns an appropriately encoded call to L1Block.setL1BlockValuesEcotone
     /// @param _baseFeeScalar       L1 base fee Scalar
     /// @param _blobBaseFeeScalar   L1 blob base fee Scalar
diff --git a/packages/contracts-bedrock/src/libraries/Predeploys.sol b/packages/contracts-bedrock/src/libraries/Predeploys.sol
index 30cad3b1f854..7a6b30100b5a 100644
--- a/packages/contracts-bedrock/src/libraries/Predeploys.sol
+++ b/packages/contracts-bedrock/src/libraries/Predeploys.sol
@@ -119,13 +119,13 @@ library Predeploys {
         if (_addr == GAS_PRICE_ORACLE) return "GasPriceOracle";
         if (_addr == L2_STANDARD_BRIDGE) return "L2StandardBridge";
         if (_addr == SEQUENCER_FEE_WALLET) return "SequencerFeeVault";
-        if (_addr == OPTIMISM_MINTABLE_ERC20_FACTORY) return "OptimismMintableERC20Factory";
+        if (_addr == OPTIMISM_MINTABLE_ERC20_FACTORY) return "L2OptimismMintableERC20Factory";
         if (_addr == L1_BLOCK_NUMBER) return "L1BlockNumber";
         if (_addr == L2_ERC721_BRIDGE) return "L2ERC721Bridge";
         if (_addr == L1_BLOCK_ATTRIBUTES) return "L1Block";
         if (_addr == L2_TO_L1_MESSAGE_PASSER) return "L2ToL1MessagePasser";
         if (_addr == OPTIMISM_MINTABLE_ERC721_FACTORY) return "OptimismMintableERC721Factory";
-        if (_addr == PROXY_ADMIN) return "ProxyAdmin";
+        if (_addr == PROXY_ADMIN) return "L2ProxyAdmin";
         if (_addr == BASE_FEE_VAULT) return "BaseFeeVault";
         if (_addr == L1_FEE_VAULT) return "L1FeeVault";
         if (_addr == SCHEMA_REGISTRY) return "SchemaRegistry";
diff --git a/packages/contracts-bedrock/src/libraries/StaticConfig.sol b/packages/contracts-bedrock/src/libraries/StaticConfig.sol
index ffaa0b4e5535..9c16205e281d 100644
--- a/packages/contracts-bedrock/src/libraries/StaticConfig.sol
+++ b/packages/contracts-bedrock/src/libraries/StaticConfig.sol
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import { Types } from "src/libraries/Types.sol";
+
 /// @title StaticConfig
 /// @notice Library for encoding and decoding static configuration data.
 library StaticConfig {
@@ -57,4 +59,60 @@ library StaticConfig {
     function decodeRemoveDependency(bytes memory _data) internal pure returns (uint256) {
         return abi.decode(_data, (uint256));
     }
+
+    /// @notice Encodes the static configuration data for setting a fee vault config.
+    /// @param _recipient Address of the recipient of the fee vault.
+    /// @param _min Minimum withdrawal amount allowed to be processed.
+    /// @param _network The network in which the fees should be withdrawn to.
+    /// @return Encoded static configuration data.
+    function encodeSetFeeVaultConfig(
+        address _recipient,
+        uint256 _min,
+        Types.WithdrawalNetwork _network
+    )
+        internal
+        pure
+        returns (bytes memory)
+    {
+        return abi.encode(_recipient, _min, _network);
+    }
+
+    /// @notice Decodes the static configuration data for setting a fee vault config.
+    /// @param _data Encoded static configuration data.
+    /// @return Decoded fee vault config data (recipient, min, network).
+    function decodeSetFeeVaultConfig(bytes memory _data)
+        internal
+        pure
+        returns (address, uint256, Types.WithdrawalNetwork)
+    {
+        return abi.decode(_data, (address, uint256, Types.WithdrawalNetwork));
+    }
+
+    /// @notice Encodes the static configuration data for setting an address.
+    /// @param _address Address to set.
+    /// @return Encoded static configuration data.
+    function encodeSetAddress(address _address) internal pure returns (bytes memory) {
+        return abi.encode(_address);
+    }
+
+    /// @notice Decodes the static configuration data for setting an address.
+    /// @param _data Encoded static configuration data.
+    /// @return Decoded address.
+    function decodeSetAddress(bytes memory _data) internal pure returns (address) {
+        return abi.decode(_data, (address));
+    }
+
+    /// @notice Encodes the static configuration data for setting a remote chain ID.
+    /// @param _chainId Chain ID of the remote chain.
+    /// @return Encoded static configuration data.
+    function encodeSetRemoteChainId(uint256 _chainId) internal pure returns (bytes memory) {
+        return abi.encode(_chainId);
+    }
+
+    /// @notice Decodes the static configuration data for setting a remote chain ID.
+    /// @param _data Encoded static configuration data.
+    /// @return Decoded chain ID of the remote chain.
+    function decodeSetRemoteChainId(bytes memory _data) internal pure returns (uint256) {
+        return abi.decode(_data, (uint256));
+    }
 }
diff --git a/packages/contracts-bedrock/src/libraries/Types.sol b/packages/contracts-bedrock/src/libraries/Types.sol
index 7e9a65654bc1..ea1513df3693 100644
--- a/packages/contracts-bedrock/src/libraries/Types.sol
+++ b/packages/contracts-bedrock/src/libraries/Types.sol
@@ -75,4 +75,29 @@ library Types {
         L1,
         L2
     }
+
+    /// @notice Enum representing different types of configurations that can be set on L1BlockIsthmus.
+    /// @custom:value GAS_PAYING_TOKEN  Config type for the gas paying token.
+    /// @custom:value BASE_FEE_VAULT_CONFIG Config type for the base fee vault config.
+    /// @custom:value L1_FEE_VAULT_CONFIG Config type for the L1 fee vault config.
+    /// @custom:value SEQUENCER_FEE_VAULT_CONFIG Config type for the sequencer fee vault config.
+    /// @custom:value L1_CROSS_DOMAIN_MESSENGER_ADDRESS Config type for the L1 Cross Domain Messenger address.
+    /// @custom:value L1_ERC_721_BRIDGE_ADDRESS Config type for the L1 ERC721 Bridge address.
+    /// @custom:value L1_STANDARD_BRIDGE_ADDRESS Config type for the L1 Standard Bridge address.
+    /// @custom:value REMOTE_CHAIN_ID Config type for the remote chain ID.
+    /// @custom:value ADD_DEPENDENCY        Config type for adding a chain to the interop dependency set.
+    /// @custom:value REMOVE_DEPENDENCY     Config type for removing a chain from the interop dependency
+    /// set.
+    enum ConfigType {
+        GAS_PAYING_TOKEN,
+        BASE_FEE_VAULT_CONFIG,
+        L1_FEE_VAULT_CONFIG,
+        SEQUENCER_FEE_VAULT_CONFIG,
+        L1_CROSS_DOMAIN_MESSENGER_ADDRESS,
+        L1_ERC_721_BRIDGE_ADDRESS,
+        L1_STANDARD_BRIDGE_ADDRESS,
+        REMOTE_CHAIN_ID,
+        ADD_DEPENDENCY,
+        REMOVE_DEPENDENCY
+    }
 }
diff --git a/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol b/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
index 66c724d3eba9..cf1ba049d428 100644
--- a/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
@@ -1,30 +1,27 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 /// @custom:legacy
-/// @title CrossDomainMessengerLegacySpacer0
+/// @title CrossDomainMessengerLegacySpacer
 /// @notice Contract only exists to add a spacer to the CrossDomainMessenger where the
-///         libAddressManager variable used to exist. Must be the first contract in the inheritance
-///         tree of the CrossDomainMessenger.
-contract CrossDomainMessengerLegacySpacer0 {
+///         libAddressManager variable, PausableUpgradable and OwnableUpgradeable
+///         variables used to exist.
+abstract contract CrossDomainMessengerLegacySpacer {
     /// @custom:legacy
     /// @custom:spacer libAddressManager
     /// @notice Spacer for backwards compatibility.
     address private spacer_0_0_20;
-}
 
-/// @custom:legacy
-/// @title CrossDomainMessengerLegacySpacer1
-/// @notice Contract only exists to add a spacer to the CrossDomainMessenger where the
-///         PausableUpgradable and OwnableUpgradeable variables used to exist. Must be
-///         the third contract in the inheritance tree of the CrossDomainMessenger.
-contract CrossDomainMessengerLegacySpacer1 {
+    /// @custom:legacy
+    /// @custom:spacer initializer
+    /// @notice Spacer for backwards compatibility.
+    bytes12 private spacer_0_20_12;
+
     /// @custom:legacy
     /// @custom:spacer ContextUpgradable's __gap
     /// @notice Spacer for backwards compatibility. Comes from OpenZeppelin
@@ -34,7 +31,7 @@ contract CrossDomainMessengerLegacySpacer1 {
     /// @custom:legacy
     /// @custom:spacer OwnableUpgradeable's _owner
     /// @notice Spacer for backwards compatibility.
-    ///         Come from OpenZeppelin OwnableUpgradeable.
+    ///         Comes from OpenZeppelin OwnableUpgradeable.
     address private spacer_51_0_20;
 
     /// @custom:legacy
@@ -84,11 +81,7 @@ contract CrossDomainMessengerLegacySpacer1 {
 ///         chain it's deployed on. Currently only designed for message passing between two paired
 ///         chains and does not support one-to-many interactions.
 ///         Any changes to this contract MUST result in a semver bump for contracts that inherit it.
-abstract contract CrossDomainMessenger is
-    CrossDomainMessengerLegacySpacer0,
-    Initializable,
-    CrossDomainMessengerLegacySpacer1
-{
+abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
     /// @notice Current message version identifier.
     uint16 public constant MESSAGE_VERSION = 1;
 
@@ -119,11 +112,12 @@ abstract contract CrossDomainMessenger is
     ///         can therefore not be relayed again.
     mapping(bytes32 => bool) public successfulMessages;
 
-    /// @notice Address of the sender of the currently executing message on the other chain. If the
-    ///         value of this variable is the default value (0x00000000...dead) then no message is
-    ///         currently being executed. Use the xDomainMessageSender getter which will throw an
-    ///         error if this is the case.
-    address internal xDomainMsgSender;
+    /// @custom:legacy
+    /// @custom:spacer xDomainMsgSender
+    /// @notice Spacer for backwards compatibility. The storage slot was migrated when the
+    ///         initializer pattern was moved away from in the base contract to remove the
+    ///         need to set `Constants.DEFAULT_L2_SENDER` into storage during a call to `initialize`.
+    bytes20 internal spacer_204_0_20;
 
     /// @notice Nonce for the next message to be sent, without the message version applied. Use the
     ///         messageNonce getter which will insert the message version into the nonce to give you
@@ -135,14 +129,23 @@ abstract contract CrossDomainMessenger is
     ///         successfully executed on the first attempt.
     mapping(bytes32 => bool) public failedMessages;
 
-    /// @notice CrossDomainMessenger contract on the other chain.
-    /// @custom:network-specific
-    CrossDomainMessenger public otherMessenger;
+    /// @custom:legacy
+    /// @custom:spacer CrossDomainMessenger
+    /// @notice Spacer for backwards compatibility.
+    address private spacer_207_0_20;
+
+    /// @notice Address of the sender of the currently executing message on the other chain. If the
+    ///         value of this variable is address(0) then no message is currently being executed.
+    ///         Use the xDomainMessageSender getter which will throw an error if this is the case.
+    address private xDomainMsgSender;
+
+    /// @notice Spacer to ensure that there is no collision with the xDomainMsgSender slot.
+    bytes12 private spacer_208_20_12;
 
     /// @notice Reserve extra slots in the storage layout for future upgrades.
-    ///         A gap size of 43 was chosen here, so that the first slot used in a child contract
+    ///         A gap size of 40 was chosen here, so that the first slot used in a child contract
     ///         would be 1 plus a multiple of 50.
-    uint256[43] private __gap;
+    uint256[41] private __gap;
 
     /// @notice Emitted whenever a message is sent to the other chain.
     /// @param target       Address of the recipient of the message.
@@ -183,7 +186,7 @@ abstract contract CrossDomainMessenger is
         // guarantee the property that the call to the target contract will always have at least
         // the minimum gas limit specified by the user.
         _sendMessage({
-            _to: address(otherMessenger),
+            _to: address(otherMessenger()),
             _gasLimit: baseGas(_message, _minGasLimit),
             _value: msg.value,
             _data: abi.encodeWithSelector(
@@ -266,7 +269,7 @@ abstract contract CrossDomainMessenger is
         // is being re-entered. This marks the message as failed to allow it to be replayed.
         if (
             !SafeCall.hasMinGas(_minGasLimit, RELAY_RESERVED_GAS + RELAY_GAS_CHECK_BUFFER)
-                || xDomainMsgSender != Constants.DEFAULT_L2_SENDER
+                || getCrossDomainMessageSender() != Constants.DEFAULT_L2_SENDER
         ) {
             failedMessages[versionedHash] = true;
             emit FailedRelayedMessage(versionedHash);
@@ -283,9 +286,9 @@ abstract contract CrossDomainMessenger is
             return;
         }
 
-        xDomainMsgSender = _sender;
+        setCrossDomainMessageSender(_sender);
         bool success = SafeCall.call(_target, gasleft() - RELAY_RESERVED_GAS, _value, _message);
-        xDomainMsgSender = Constants.DEFAULT_L2_SENDER;
+        setCrossDomainMessageSender(address(0));
 
         if (success) {
             // This check is identical to one above, but it ensures that the same message cannot be relayed
@@ -308,24 +311,40 @@ abstract contract CrossDomainMessenger is
         }
     }
 
+    /// @notice Retrieves the address of the contract or wallet that initiated the currently
+    ///         executing message on the other chain.
+    /// @return Address of the sender of the currently executing message on the other chain.
+    function getCrossDomainMessageSender() internal view returns (address) {
+        if (xDomainMsgSender == address(0)) return Constants.DEFAULT_L2_SENDER;
+        return xDomainMsgSender;
+    }
+
+    /// @notice Setter function for the cross-domain message sender.
+    /// @param _address Address of the sender of the currently executing message on the other chain.
+    function setCrossDomainMessageSender(address _address) internal {
+        xDomainMsgSender = _address;
+    }
+
     /// @notice Retrieves the address of the contract or wallet that initiated the currently
     ///         executing message on the other chain. Will throw an error if there is no message
     ///         currently being executed. Allows the recipient of a call to see who triggered it.
     /// @return Address of the sender of the currently executing message on the other chain.
     function xDomainMessageSender() external view returns (address) {
-        require(
-            xDomainMsgSender != Constants.DEFAULT_L2_SENDER, "CrossDomainMessenger: xDomainMessageSender is not set"
-        );
-
-        return xDomainMsgSender;
+        address sender = getCrossDomainMessageSender();
+        require(sender != Constants.DEFAULT_L2_SENDER, "CrossDomainMessenger: xDomainMessageSender is not set");
+        return sender;
     }
 
+    /// @notice Returns the contract of the other messenger on this chain.
+    /// @return Contract of the other messenger on this chain.
+    function otherMessenger() public view virtual returns (CrossDomainMessenger);
+
     /// @notice Retrieves the address of the paired CrossDomainMessenger contract on the other chain
     ///         Public getter is legacy and will be removed in the future. Use `otherMessenger()` instead.
     /// @return CrossDomainMessenger contract on the other chain.
     /// @custom:legacy
     function OTHER_MESSENGER() public view returns (CrossDomainMessenger) {
-        return otherMessenger;
+        return otherMessenger();
     }
 
     /// @notice Retrieves the next message nonce. Message version will be added to the upper two
@@ -371,19 +390,6 @@ abstract contract CrossDomainMessenger is
         return token != Constants.ETHER;
     }
 
-    /// @notice Initializer.
-    /// @param _otherMessenger CrossDomainMessenger contract on the other chain.
-    function __CrossDomainMessenger_init(CrossDomainMessenger _otherMessenger) internal onlyInitializing {
-        // We only want to set the xDomainMsgSender to the default value if it hasn't been initialized yet,
-        // meaning that this is a fresh contract deployment.
-        // This prevents resetting the xDomainMsgSender to the default value during an upgrade, which would enable
-        // a reentrant withdrawal to sandwhich the upgrade replay a withdrawal twice.
-        if (xDomainMsgSender == address(0)) {
-            xDomainMsgSender = Constants.DEFAULT_L2_SENDER;
-        }
-        otherMessenger = _otherMessenger;
-    }
-
     /// @notice Sends a low-level message to the other messenger. Needs to be implemented by child
     ///         contracts because the logic for this depends on the network where the messenger is
     ///         being deployed.
diff --git a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
index 52217fab713c..60edc5a55b57 100644
--- a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
@@ -1,24 +1,25 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity 0.8.25;
 
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 /// @title ERC721Bridge
 /// @notice ERC721Bridge is a base contract for the L1 and L2 ERC721 bridges.
-abstract contract ERC721Bridge is Initializable {
+abstract contract ERC721Bridge {
     /// @custom:spacer ERC721Bridge's initializer slot spacing
-    /// @notice Spacer to avoid packing into the initializer slot
-    bytes30 private spacer_0_2_30;
+    /// @notice Spacer for legacy initializable slot
+    bytes32 private spacer_0_0_32;
 
-    /// @notice Messenger contract on this domain.
-    /// @custom:network-specific
-    ICrossDomainMessenger public messenger;
+    /// @custom:legacy
+    /// @custom:spacer messenger
+    /// @notice Spacer for backwards compatibility.
+    address private spacer_1_0_20;
 
-    /// @notice Contract of the bridge on the other network.
-    /// @custom:network-specific
-    ERC721Bridge public otherBridge;
+    /// @custom:legacy
+    /// @custom:spacer otherBridge
+    /// @notice Spacer for backwards compatibility.
+    address private spacer_2_0_20;
 
     /// @notice Reserve extra slots (to a total of 50) in the storage layout for future upgrades.
     uint256[46] private __gap;
@@ -57,41 +58,37 @@ abstract contract ERC721Bridge is Initializable {
 
     /// @notice Ensures that the caller is a cross-chain message from the other bridge.
     modifier onlyOtherBridge() {
+        ICrossDomainMessenger crossDomainMessenger = messenger();
         require(
-            msg.sender == address(messenger) && messenger.xDomainMessageSender() == address(otherBridge),
+            msg.sender == address(crossDomainMessenger)
+                && crossDomainMessenger.xDomainMessageSender() == address(otherBridge()),
             "ERC721Bridge: function can only be called from the other bridge"
         );
         _;
     }
 
-    /// @notice Initializer.
-    /// @param _messenger   Contract of the CrossDomainMessenger on this network.
-    /// @param _otherBridge Contract of the ERC721 bridge on the other network.
-    function __ERC721Bridge_init(
-        ICrossDomainMessenger _messenger,
-        ERC721Bridge _otherBridge
-    )
-        internal
-        onlyInitializing
-    {
-        messenger = _messenger;
-        otherBridge = _otherBridge;
-    }
+    /// @notice Getter function for the messenger contract.
+    /// @return Messenger contract on this domain.
+    function messenger() public view virtual returns (ICrossDomainMessenger);
 
     /// @notice Legacy getter for messenger contract.
     ///         Public getter is legacy and will be removed in the future. Use `messenger` instead.
     /// @return Messenger contract on this domain.
     /// @custom:legacy
     function MESSENGER() external view returns (ICrossDomainMessenger) {
-        return messenger;
+        return messenger();
     }
 
+    /// @notice Getter function for the other bridge.
+    /// @return Contract of the bridge on the other network.
+    function otherBridge() public view virtual returns (ERC721Bridge);
+
     /// @notice Legacy getter for other bridge address.
     ///         Public getter is legacy and will be removed in the future. Use `otherBridge` instead.
     /// @return Contract of the bridge on the other network.
     /// @custom:legacy
     function OTHER_BRIDGE() external view returns (ERC721Bridge) {
-        return otherBridge;
+        return otherBridge();
     }
 
     /// @notice This function should return true if the contract is paused.
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
index d7a9cd3372cd..788ef2b2f546 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
@@ -3,24 +3,21 @@ pragma solidity 0.8.15;
 
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
 
-/// @custom:proxied true
-/// @custom:predeployed 0x4200000000000000000000000000000000000012
 /// @title OptimismMintableERC20Factory
-/// @notice OptimismMintableERC20Factory is a factory contract that generates OptimismMintableERC20
-///         contracts on the network it's deployed to. Simplifies the deployment process for users
-///         who may be less familiar with deploying smart contracts. Designed to be backwards
-///         compatible with the older StandardL2ERC20Factory contract.
-contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20Factory {
+/// @notice OptimismMintableERC20Factory is an abstract factory contract that generates OptimismMintableERC20
+///         contracts on the network it's deployed to. It should be inherited by a child contract that
+///         implements the `bridge` getter function.
+///         Any changes to this contract MUST result in a semver bump for contracts that inherit it.
+abstract contract OptimismMintableERC20Factory is ISemver, IOptimismERC20Factory {
     /// @custom:spacer OptimismMintableERC20Factory's initializer slot spacing
     /// @notice Spacer to avoid packing into the initializer slot
-    bytes30 private spacer_0_2_30;
+    bytes32 private spacer_0_0_32;
 
-    /// @notice Address of the StandardBridge on this chain.
-    /// @custom:network-specific
-    address public bridge;
+    /// @custom:spacer bridge
+    /// @notice Spacer to avoid packing into the initializer slot
+    bytes32 private spacer_1_0_32;
 
     /// @notice Mapping of local token address to remote token address.
     ///         This is used to keep track of the token deployments.
@@ -44,30 +41,14 @@ contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20F
     /// @param deployer    Address of the account that deployed the token.
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
 
-    /// @notice The semver MUST be bumped any time that there is a change in
-    ///         the OptimismMintableERC20 token contract since this contract
-    ///         is responsible for deploying OptimismMintableERC20 contracts.
-    /// @notice Semantic version.
-    /// @custom:semver 1.10.1-beta.4
-    string public constant version = "1.10.1-beta.4";
-
-    /// @notice Constructs the OptimismMintableERC20Factory contract.
-    constructor() {
-        initialize({ _bridge: address(0) });
-    }
-
-    /// @notice Initializes the contract.
-    /// @param _bridge Address of the StandardBridge on this chain.
-    function initialize(address _bridge) public initializer {
-        bridge = _bridge;
-    }
+    function bridge() public view virtual returns (address);
 
     /// @notice Getter function for the address of the StandardBridge on this chain.
     ///         Public getter is legacy and will be removed in the future. Use `bridge` instead.
     /// @return Address of the StandardBridge on this chain.
     /// @custom:legacy
     function BRIDGE() external view returns (address) {
-        return bridge;
+        return bridge();
     }
 
     /// @custom:legacy
@@ -124,7 +105,7 @@ contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20F
         bytes32 salt = keccak256(abi.encode(_remoteToken, _name, _symbol, _decimals));
 
         address localToken =
-            address(new OptimismMintableERC20{ salt: salt }(bridge, _remoteToken, _name, _symbol, _decimals));
+            address(new OptimismMintableERC20{ salt: salt }(bridge(), _remoteToken, _name, _symbol, _decimals));
 
         deployments[localToken] = _remoteToken;
 
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
index 9dd05e10d1fe..692e8546b923 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
@@ -5,6 +5,7 @@ import { ERC721Enumerable } from "@openzeppelin/contracts/token/ERC721/extension
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
+import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @title OptimismMintableERC721
@@ -29,20 +30,20 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     address public immutable REMOTE_TOKEN;
 
     /// @notice Address of the ERC721 bridge on this network.
-    address public immutable BRIDGE;
+    IL2ERC721Bridge public immutable BRIDGE;
 
     /// @notice Base token URI for this token.
     string public baseTokenURI;
 
     /// @notice Modifier that prevents callers other than the bridge from calling the function.
     modifier onlyBridge() {
-        require(msg.sender == BRIDGE, "OptimismMintableERC721: only bridge can call this function");
+        require(msg.sender == address(BRIDGE), "OptimismMintableERC721: only bridge can call this function");
         _;
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.3
-    string public constant version = "1.3.1-beta.3";
+    /// @custom:semver 1.3.1-beta.4
+    string public constant version = "1.3.1-beta.4";
 
     /// @param _bridge        Address of the bridge on this network.
     /// @param _remoteChainId Chain ID where the remote token is deployed.
@@ -50,7 +51,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     /// @param _name          ERC721 name.
     /// @param _symbol        ERC721 symbol.
     constructor(
-        address _bridge,
+        IL2ERC721Bridge _bridge,
         uint256 _remoteChainId,
         address _remoteToken,
         string memory _name,
@@ -58,7 +59,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     )
         ERC721(_name, _symbol)
     {
-        require(_bridge != address(0), "OptimismMintableERC721: bridge cannot be address(0)");
+        require(address(_bridge) != address(0), "OptimismMintableERC721: bridge cannot be address(0)");
         require(_remoteChainId != 0, "OptimismMintableERC721: remote chain id cannot be zero");
         require(_remoteToken != address(0), "OptimismMintableERC721: remote token cannot be address(0)");
 
@@ -90,8 +91,8 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     }
 
     /// @notice Address of the ERC721 bridge on this network.
-    function bridge() external view returns (address) {
-        return BRIDGE;
+    function bridge() external view returns (IL2ERC721Bridge) {
+        return IL2ERC721Bridge(BRIDGE);
     }
 
     /// @notice Mints some token ID for a user, checking first that contract recipients
diff --git a/packages/contracts-bedrock/src/universal/StandardBridge.sol b/packages/contracts-bedrock/src/universal/StandardBridge.sol
index 57af2247a65a..42b891c169fb 100644
--- a/packages/contracts-bedrock/src/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/StandardBridge.sol
@@ -9,8 +9,8 @@ import { SafeCall } from "src/libraries/SafeCall.sol";
 import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
 import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 /// @custom:upgradeable
@@ -18,16 +18,16 @@ import { Constants } from "src/libraries/Constants.sol";
 /// @notice StandardBridge is a base contract for the L1 and L2 standard ERC20 bridges. It handles
 ///         the core bridging logic, including escrowing tokens that are native to the local chain
 ///         and minting/burning tokens that are native to the remote chain.
-abstract contract StandardBridge is Initializable {
+abstract contract StandardBridge {
     using SafeERC20 for IERC20;
 
     /// @notice The L2 gas limit set when eth is depoisited using the receive() function.
     uint32 internal constant RECEIVE_DEFAULT_GAS_LIMIT = 200_000;
 
     /// @custom:legacy
-    /// @custom:spacer messenger
+    /// @custom:spacer messenger + initializable
     /// @notice Spacer for backwards compatibility.
-    bytes30 private spacer_0_2_30;
+    bytes32 private spacer_0_0_32;
 
     /// @custom:legacy
     /// @custom:spacer l2TokenBridge
@@ -37,18 +37,20 @@ abstract contract StandardBridge is Initializable {
     /// @notice Mapping that stores deposits for a given pair of local and remote tokens.
     mapping(address => mapping(address => uint256)) public deposits;
 
-    /// @notice Messenger contract on this domain.
-    /// @custom:network-specific
-    ICrossDomainMessenger public messenger;
+    /// @custom:legacy
+    /// @custom:spacer messenger
+    /// @notice Spacer for backwards compatibility.
+    address private spacer_3_0_20;
 
-    /// @notice Corresponding bridge on the other domain.
-    /// @custom:network-specific
-    StandardBridge public otherBridge;
+    /// @custom:legacy
+    /// @custom:spacer otherBridge
+    /// @notice Spacer for backwards compatibility.
+    address private spacer_4_0_20;
 
     /// @notice Reserve extra slots (to a total of 50) in the storage layout for future upgrades.
-    ///         A gap size of 45 was chosen here, so that the first slot used in a child contract
-    ///         would be a multiple of 50.
-    uint256[45] private __gap;
+    ///         The gap size was previously 45, but is now 44, allowing for the initializer slot to be
+    ///         included in the L1StandardBridge contract without breaking its storage layout.
+    uint256[44] private __gap;
 
     /// @notice Emitted when an ETH bridge is initiated to the other chain.
     /// @param from      Address of the sender.
@@ -106,27 +108,15 @@ abstract contract StandardBridge is Initializable {
 
     /// @notice Ensures that the caller is a cross-chain message from the other bridge.
     modifier onlyOtherBridge() {
+        ICrossDomainMessenger crossDomainMessenger = messenger();
         require(
-            msg.sender == address(messenger) && messenger.xDomainMessageSender() == address(otherBridge),
+            msg.sender == address(crossDomainMessenger)
+                && crossDomainMessenger.xDomainMessageSender() == address(otherBridge()),
             "StandardBridge: function can only be called from the other bridge"
         );
         _;
     }
 
-    /// @notice Initializer.
-    /// @param _messenger   Contract for CrossDomainMessenger on this network.
-    /// @param _otherBridge Contract for the other StandardBridge contract.
-    function __StandardBridge_init(
-        ICrossDomainMessenger _messenger,
-        StandardBridge _otherBridge
-    )
-        internal
-        onlyInitializing
-    {
-        messenger = _messenger;
-        otherBridge = _otherBridge;
-    }
-
     /// @notice Allows EOAs to bridge ETH by sending directly to the bridge.
     ///         Must be implemented by contracts that inherit.
     receive() external payable virtual;
@@ -140,20 +130,28 @@ abstract contract StandardBridge is Initializable {
         return token != Constants.ETHER;
     }
 
+    /// @notice Returns the contract of the CrossDomainMessenger on this chain.
+    /// @return Contract of the CrossDomainMessenger on this chain.
+    function messenger() public view virtual returns (ICrossDomainMessenger);
+
     /// @notice Getter for messenger contract.
     ///         Public getter is legacy and will be removed in the future. Use `messenger` instead.
     /// @return Contract of the messenger on this domain.
     /// @custom:legacy
     function MESSENGER() external view returns (ICrossDomainMessenger) {
-        return messenger;
+        return messenger();
     }
 
+    /// @notice Returns the contract of the bridge on the other chain.
+    /// @return Contract of the bridge on the other chain.
+    function otherBridge() public view virtual returns (IStandardBridge);
+
     /// @notice Getter for the other bridge contract.
     ///         Public getter is legacy and will be removed in the future. Use `otherBridge` instead.
     /// @return Contract of the bridge on the other network.
     /// @custom:legacy
-    function OTHER_BRIDGE() external view returns (StandardBridge) {
-        return otherBridge;
+    function OTHER_BRIDGE() external view returns (IStandardBridge) {
+        return otherBridge();
     }
 
     /// @notice This function should return true if the contract is paused.
@@ -256,7 +254,7 @@ abstract contract StandardBridge is Initializable {
         require(isCustomGasToken() == false, "StandardBridge: cannot bridge ETH with custom gas token");
         require(msg.value == _amount, "StandardBridge: amount sent does not match amount required");
         require(_to != address(this), "StandardBridge: cannot send to self");
-        require(_to != address(messenger), "StandardBridge: cannot send to messenger");
+        require(_to != address(messenger()), "StandardBridge: cannot send to messenger");
 
         // Emit the correct events. By default this will be _amount, but child
         // contracts may override this function in order to emit legacy events as well.
@@ -329,8 +327,8 @@ abstract contract StandardBridge is Initializable {
         // contracts may override this function in order to emit legacy events as well.
         _emitETHBridgeInitiated(_from, _to, _amount, _extraData);
 
-        messenger.sendMessage{ value: _amount }({
-            _target: address(otherBridge),
+        messenger().sendMessage{ value: _amount }({
+            _target: address(otherBridge()),
             _message: abi.encodeWithSelector(this.finalizeBridgeETH.selector, _from, _to, _amount, _extraData),
             _minGasLimit: _minGasLimit
         });
@@ -374,8 +372,8 @@ abstract contract StandardBridge is Initializable {
         // contracts may override this function in order to emit legacy events as well.
         _emitERC20BridgeInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
 
-        messenger.sendMessage({
-            _target: address(otherBridge),
+        messenger().sendMessage({
+            _target: address(otherBridge()),
             _message: abi.encodeWithSelector(
                 this.finalizeBridgeERC20.selector,
                 // Because this call will be executed on the remote chain, we reverse the order of
diff --git a/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol b/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol
index 256b09fa56ef..479e8a6ba273 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.0;
 
 interface ICrossDomainMessenger {
     event FailedRelayedMessage(bytes32 indexed msgHash);
-    event Initialized(uint8 version);
     event RelayedMessage(bytes32 indexed msgHash);
     event SentMessage(address indexed target, address sender, bytes message, uint256 messageNonce, uint256 gasLimit);
     event SentMessageExtension1(address indexed sender, uint256 value);
@@ -13,6 +12,7 @@ interface ICrossDomainMessenger {
     function MIN_GAS_DYNAMIC_OVERHEAD_DENOMINATOR() external view returns (uint64);
     function MIN_GAS_DYNAMIC_OVERHEAD_NUMERATOR() external view returns (uint64);
     function OTHER_MESSENGER() external view returns (ICrossDomainMessenger);
+    function otherMessenger() external view returns (ICrossDomainMessenger);
     function RELAY_CALL_OVERHEAD() external view returns (uint64);
     function RELAY_CONSTANT_OVERHEAD() external view returns (uint64);
     function RELAY_GAS_CHECK_BUFFER() external view returns (uint64);
@@ -20,7 +20,6 @@ interface ICrossDomainMessenger {
     function baseGas(bytes memory _message, uint32 _minGasLimit) external pure returns (uint64);
     function failedMessages(bytes32) external view returns (bool);
     function messageNonce() external view returns (uint256);
-    function otherMessenger() external view returns (ICrossDomainMessenger);
     function paused() external view returns (bool);
     function relayMessage(
         uint256 _nonce,
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol b/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
index 3c97958c1033..fb1f0021aa05 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
@@ -20,7 +20,6 @@ interface IERC721Bridge {
         uint256 tokenId,
         bytes extraData
     );
-    event Initialized(uint8 version);
 
     function MESSENGER() external view returns (ICrossDomainMessenger);
     function OTHER_BRIDGE() external view returns (IERC721Bridge);
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol
index 91f6eba6c175..36978feece9e 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol
@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 interface IOptimismMintableERC20Factory {
-    event Initialized(uint8 version);
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
     event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
 
@@ -31,7 +30,6 @@ interface IOptimismMintableERC20Factory {
         external
         returns (address);
     function deployments(address) external view returns (address);
-    function initialize(address _bridge) external;
     function version() external view returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
index 7d745ad8436e..f678e1338dc5 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
@@ -1,12 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
+
 /// @title IOptimismMintableERC721
 /// @notice Interface for contracts that are compatible with the OptimismMintableERC721 standard.
 ///         Tokens that follow this standard can be easily transferred across the ERC721 bridge.
 interface IOptimismMintableERC721 {
     function __constructor__(
-        address _bridge,
+        IL2ERC721Bridge _bridge,
         uint256 _remoteChainId,
         address _remoteToken,
         string memory _name,
@@ -64,11 +66,13 @@ interface IOptimismMintableERC721 {
 
     function REMOTE_TOKEN() external view returns (address);
 
-    function BRIDGE() external view returns (address);
+    /// @notice Address of the ERC721 bridge on this network.
+    function BRIDGE() external view returns (IL2ERC721Bridge);
 
     function remoteChainId() external view returns (uint256);
 
     function remoteToken() external view returns (address);
 
-    function bridge() external view returns (address);
+    /// @notice Address of the ERC721 bridge on this network.
+    function bridge() external view returns (IL2ERC721Bridge);
 }
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol b/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
index 406a172c0737..3fdc09df503b 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
@@ -22,12 +22,10 @@ interface IStandardBridge {
     );
     event ETHBridgeFinalized(address indexed from, address indexed to, uint256 amount, bytes extraData);
     event ETHBridgeInitiated(address indexed from, address indexed to, uint256 amount, bytes extraData);
-    event Initialized(uint8 version);
 
     receive() external payable;
 
     function MESSENGER() external view returns (ICrossDomainMessenger);
-    function OTHER_BRIDGE() external view returns (IStandardBridge);
     function bridgeERC20(
         address _localToken,
         address _remoteToken,
@@ -60,6 +58,7 @@ interface IStandardBridge {
     function finalizeBridgeETH(address _from, address _to, uint256 _amount, bytes memory _extraData) external payable;
     function messenger() external view returns (ICrossDomainMessenger);
     function otherBridge() external view returns (IStandardBridge);
+    function OTHER_BRIDGE() external view returns (IStandardBridge);
     function paused() external view returns (bool);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
index 5b2260fce992..232142e9070c 100644
--- a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
+++ b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
@@ -70,7 +70,8 @@ contract OPContractsManager_Deploy_Test is DeployOPChain_TestBase {
                 batcher: _doi.batcher(),
                 unsafeBlockSigner: _doi.unsafeBlockSigner(),
                 proposer: _doi.proposer(),
-                challenger: _doi.challenger()
+                challenger: _doi.challenger(),
+                systemConfigFeeAdmin: msg.sender
             }),
             basefeeScalar: _doi.basefeeScalar(),
             blobBasefeeScalar: _doi.blobBaseFeeScalar(),
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index 028fc7587043..41c85e463f99 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -19,6 +19,7 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
+import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Interfaces
@@ -67,6 +68,7 @@ contract OptimismPortal_Test is CommonTest {
         assertEq(optimismPortal.paused(), false);
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = optimismPortal.params();
         assertEq(prevBaseFee, 1 gwei);
+        // someplace upstream there is a deposit tx
         assertEq(prevBoughtGas, 0);
         assertEq(prevBlockNum, uint64(block.number));
     }
@@ -457,6 +459,7 @@ contract OptimismPortal_Test is CommonTest {
     )
         external
     {
+        bytes memory data = StaticConfig.encodeSetGasPayingToken(_token, _decimals, _name, _symbol);
         vm.expectEmit(address(optimismPortal));
         emit TransactionDeposited(
             0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
@@ -467,12 +470,12 @@ contract OptimismPortal_Test is CommonTest {
                 uint256(0), // value
                 uint64(200_000), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
+                abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
             )
         );
 
         vm.prank(address(systemConfig));
-        optimismPortal.setGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol });
+        optimismPortal.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
     }
 
     /// @notice Ensures that the deposit event is correct for the `setGasPayingToken`
@@ -491,10 +494,13 @@ contract OptimismPortal_Test is CommonTest {
         bytes32 name = GasPayingToken.sanitize(_name);
         bytes32 symbol = GasPayingToken.sanitize(_symbol);
 
+        bytes memory data =
+            StaticConfig.encodeSetGasPayingToken({ _token: _token, _decimals: 18, _name: name, _symbol: symbol });
+
         vm.recordLogs();
 
         vm.prank(address(systemConfig));
-        optimismPortal.setGasPayingToken({ _token: _token, _decimals: 18, _name: name, _symbol: symbol });
+        optimismPortal.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
 
         vm.prank(Constants.DEPOSITOR_ACCOUNT, Constants.DEPOSITOR_ACCOUNT);
         optimismPortal.depositTransaction({
@@ -502,7 +508,7 @@ contract OptimismPortal_Test is CommonTest {
             _value: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(IL1Block.setGasPayingToken, (_token, 18, name, symbol))
+            _data: abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
         });
 
         VmSafe.Log[] memory logs = vm.getRecordedLogs();
@@ -525,7 +531,7 @@ contract OptimismPortal_Test is CommonTest {
         vm.assume(_caller != address(systemConfig));
         vm.prank(_caller);
         vm.expectRevert(Unauthorized.selector);
-        optimismPortal.setGasPayingToken({ _token: address(0), _decimals: 0, _name: "", _symbol: "" });
+        optimismPortal.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, hex"");
     }
 
     /// @dev Tests that `depositERC20Transaction` reverts when the gas paying token is ether.
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index 8cc56937bd33..a400c3e5de32 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -19,6 +19,7 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
+import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import "src/dispute/lib/Types.sol";
 import "src/libraries/PortalErrors.sol";
 
@@ -308,6 +309,13 @@ contract OptimismPortal2_Test is CommonTest {
     )
         external
     {
+        bytes memory data = StaticConfig.encodeSetGasPayingToken({
+            _token: _token,
+            _decimals: _decimals,
+            _name: _name,
+            _symbol: _symbol
+        });
+
         vm.expectEmit(address(optimismPortal2));
         emit TransactionDeposited(
             0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
@@ -318,12 +326,12 @@ contract OptimismPortal2_Test is CommonTest {
                 uint256(0), // value
                 uint64(200_000), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
+                abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
             )
         );
 
         vm.prank(address(systemConfig));
-        optimismPortal2.setGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol });
+        optimismPortal2.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
     }
 
     /// @notice Ensures that the deposit event is correct for the `setGasPayingToken`
@@ -342,10 +350,12 @@ contract OptimismPortal2_Test is CommonTest {
         bytes32 name = GasPayingToken.sanitize(_name);
         bytes32 symbol = GasPayingToken.sanitize(_symbol);
 
+        bytes memory data = StaticConfig.encodeSetGasPayingToken(_token, 18, name, symbol);
+
         vm.recordLogs();
 
         vm.prank(address(systemConfig));
-        optimismPortal2.setGasPayingToken({ _token: _token, _decimals: 18, _name: name, _symbol: symbol });
+        optimismPortal2.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
 
         vm.prank(Constants.DEPOSITOR_ACCOUNT, Constants.DEPOSITOR_ACCOUNT);
         optimismPortal2.depositTransaction({
@@ -353,7 +363,70 @@ contract OptimismPortal2_Test is CommonTest {
             _value: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(IL1Block.setGasPayingToken, (_token, 18, name, symbol))
+            _data: abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
+        });
+
+        VmSafe.Log[] memory logs = vm.getRecordedLogs();
+        assertEq(logs.length, 2);
+
+        VmSafe.Log memory systemPath = logs[0];
+        VmSafe.Log memory userPath = logs[1];
+
+        assertEq(systemPath.topics.length, 4);
+        assertEq(systemPath.topics.length, userPath.topics.length);
+        assertEq(systemPath.topics[0], userPath.topics[0]);
+        assertEq(systemPath.topics[1], userPath.topics[1]);
+        assertEq(systemPath.topics[2], userPath.topics[2]);
+        assertEq(systemPath.topics[3], userPath.topics[3]);
+        assertEq(systemPath.data, userPath.data);
+    }
+
+    /// @dev Tests that the upgrade function succeeds.
+    function testFuzz_upgrade_succeeds(uint32 _gasLimit, bytes memory _calldata) external {
+        address upgrader = superchainConfig.upgrader();
+
+        vm.expectEmit(address(optimismPortal2));
+        emit TransactionDeposited(
+            0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
+            Predeploys.PROXY_ADMIN,
+            0,
+            abi.encodePacked(
+                uint256(0), // mint
+                uint256(0), // value
+                uint64(_gasLimit), // gasLimit
+                false, // isCreation,
+                _calldata
+            )
+        );
+
+        vm.prank(upgrader);
+        optimismPortal2.upgrade(_gasLimit, _calldata);
+    }
+
+    /// @notice Ensures that the deposit event is correct for the `setGasPayingToken`
+    ///         code path that manually emits a deposit transaction outside of the
+    ///         `depositTransaction` function. This is a simple differential test.
+    function test_upgrade_correctEvent_succeeds(uint32 _gasLimit, bytes memory _calldata) external {
+        vm.assume(_calldata.length <= 120_000);
+        IResourceMetering.ResourceConfig memory rcfg = systemConfig.resourceConfig();
+        _gasLimit =
+            uint32(bound(_gasLimit, optimismPortal2.minimumGasLimit(uint32(_calldata.length)), rcfg.maxResourceLimit));
+
+        vm.recordLogs();
+
+        vm.prank(superchainConfig.upgrader());
+        optimismPortal2.upgrade(_gasLimit, _calldata);
+
+        // Advance the block to ensure that the deposit transaction is processed in the next block, so that we
+        // aren't limited by the resource limit consumed by the previous call.
+        vm.roll(block.number + 1);
+        vm.prank(Constants.DEPOSITOR_ACCOUNT, Constants.DEPOSITOR_ACCOUNT);
+        optimismPortal2.depositTransaction({
+            _to: Predeploys.PROXY_ADMIN,
+            _value: 0,
+            _gasLimit: uint64(_gasLimit),
+            _isCreation: false,
+            _data: _calldata
         });
 
         VmSafe.Log[] memory logs = vm.getRecordedLogs();
@@ -371,12 +444,41 @@ contract OptimismPortal2_Test is CommonTest {
         assertEq(systemPath.data, userPath.data);
     }
 
-    /// @dev Tests that the gas paying token cannot be set by a non-system config.
-    function test_setGasPayingToken_notSystemConfig_fails(address _caller) external {
+    /// @dev Tests that any config type can be set by the system config.
+    function testFuzz_setConfig_succeeds(uint8 _configType, bytes calldata _value) public {
+        // Ensure that _configType is within the range of the ConfigType enum
+        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
+
+        vm.expectEmit(address(optimismPortal2));
+        emitTransactionDeposited({
+            _from: Constants.DEPOSITOR_ACCOUNT,
+            _to: Predeploys.L1_BLOCK_ATTRIBUTES,
+            _value: 0,
+            _mint: 0,
+            _gasLimit: 200_000,
+            _isCreation: false,
+            _data: abi.encodeCall(IL1Block.setConfig, (Types.ConfigType(_configType), _value))
+        });
+
+        vm.prank(address(optimismPortal2.systemConfig()));
+        optimismPortal2.setConfig(Types.ConfigType(_configType), _value);
+    }
+
+    /// @dev Tests that the gas paying token cannot be set by a non-system config for any config type.
+    function testFuzz_setConfig_notSystemConfig_fails(
+        address _caller,
+        uint8 _configType,
+        bytes calldata _value
+    )
+        external
+    {
+        // Ensure that _configType is within the range of the ConfigType enum
+        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
+
         vm.assume(_caller != address(systemConfig));
         vm.prank(_caller);
         vm.expectRevert(Unauthorized.selector);
-        optimismPortal2.setGasPayingToken({ _token: address(0), _decimals: 0, _name: "", _symbol: "" });
+        optimismPortal2.setConfig(Types.ConfigType(_configType), _value);
     }
 
     /// @dev Tests that `depositERC20Transaction` reverts when the gas paying token is ether.
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
index bc9a980276aa..a8e0344359ed 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
@@ -7,12 +7,13 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 // Libraries
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Types } from "src/libraries/Types.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Target contract dependencies
 import "src/libraries/PortalErrors.sol";
 import { OptimismPortalInterop } from "src/L1/OptimismPortalInterop.sol";
-import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
+import { L1BlockInterop } from "src/L2/L1BlockInterop.sol";
 
 // Interfaces
 import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
@@ -25,31 +26,11 @@ contract OptimismPortalInterop_Test is CommonTest {
         super.setUp();
     }
 
-    /// @dev Tests that the config for the gas paying token can be set.
-    function testFuzz_setConfig_gasPayingToken_succeeds(bytes calldata _value) public {
-        vm.expectEmit(address(optimismPortal));
-        emitTransactionDeposited({
-            _from: Constants.DEPOSITOR_ACCOUNT,
-            _to: Predeploys.L1_BLOCK_ATTRIBUTES,
-            _value: 0,
-            _mint: 0,
-            _gasLimit: 200_000,
-            _isCreation: false,
-            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.SET_GAS_PAYING_TOKEN, _value))
-        });
-
-        vm.prank(address(_optimismPortalInterop().systemConfig()));
-        _optimismPortalInterop().setConfig(ConfigType.SET_GAS_PAYING_TOKEN, _value);
-    }
-
-    /// @dev Tests that setting the gas paying token config as not the system config reverts.
-    function testFuzz_setConfig_gasPayingToken_notSystemConfig_reverts(bytes calldata _value) public {
-        vm.expectRevert(Unauthorized.selector);
-        _optimismPortalInterop().setConfig(ConfigType.SET_GAS_PAYING_TOKEN, _value);
-    }
+    /// @dev Tests that any config type can be set by the system config.
+    function testFuzz_setConfig_succeeds(uint8 _configType, bytes calldata _value) public {
+        // Ensure that _configType is within the range of the ConfigType enum
+        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
 
-    /// @dev Tests that the config for adding a dependency can be set.
-    function testFuzz_setConfig_addDependency_succeeds(bytes calldata _value) public {
         vm.expectEmit(address(optimismPortal));
         emitTransactionDeposited({
             _from: Constants.DEPOSITOR_ACCOUNT,
@@ -58,40 +39,28 @@ contract OptimismPortalInterop_Test is CommonTest {
             _mint: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.ADD_DEPENDENCY, _value))
+            _data: abi.encodeCall(L1BlockInterop.setConfig, (Types.ConfigType(_configType), _value))
         });
 
         vm.prank(address(_optimismPortalInterop().systemConfig()));
-        _optimismPortalInterop().setConfig(ConfigType.ADD_DEPENDENCY, _value);
+        _optimismPortalInterop().setConfig(Types.ConfigType(_configType), _value);
     }
 
-    /// @dev Tests that setting the add dependency config as not the system config reverts.
-    function testFuzz_setConfig_addDependency_notSystemConfig_reverts(bytes calldata _value) public {
-        vm.expectRevert(Unauthorized.selector);
-        _optimismPortalInterop().setConfig(ConfigType.ADD_DEPENDENCY, _value);
-    }
-
-    /// @dev Tests that the config for removing a dependency can be set.
-    function testFuzz_setConfig_removeDependency_succeeds(bytes calldata _value) public {
-        vm.expectEmit(address(optimismPortal));
-        emitTransactionDeposited({
-            _from: Constants.DEPOSITOR_ACCOUNT,
-            _to: Predeploys.L1_BLOCK_ATTRIBUTES,
-            _value: 0,
-            _mint: 0,
-            _gasLimit: 200_000,
-            _isCreation: false,
-            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.REMOVE_DEPENDENCY, _value))
-        });
-
-        vm.prank(address(_optimismPortalInterop().systemConfig()));
-        _optimismPortalInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, _value);
-    }
+    /// @dev Tests that setting any config type as not the system config reverts.
+    function testFuzz_setConfig_notSystemConfig_reverts(
+        address _caller,
+        uint8 _configType,
+        bytes calldata _value
+    )
+        external
+    {
+        // Ensure that _configType is within the range of the ConfigType enum
+        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
 
-    /// @dev Tests that setting the remove dependency config as not the system config reverts.
-    function testFuzz_setConfig_removeDependency_notSystemConfig_reverts(bytes calldata _value) public {
+        vm.assume(_caller != address(_optimismPortalInterop().systemConfig()));
+        vm.prank(_caller);
         vm.expectRevert(Unauthorized.selector);
-        _optimismPortalInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, _value);
+        _optimismPortalInterop().setConfig(Types.ConfigType(_configType), _value);
     }
 
     /// @dev Returns the OptimismPortalInterop instance.
diff --git a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
index 2772ec0c2a3c..b7a76cb664bd 100644
--- a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
@@ -13,9 +13,10 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract SuperchainConfig_Init_Test is CommonTest {
     /// @dev Tests that initialization sets the correct values. These are defined in CommonTest.sol.
-    function test_initialize_unpaused_succeeds() external view {
+    function test_initialize_succeeds() external view {
         assertFalse(superchainConfig.paused());
         assertEq(superchainConfig.guardian(), deploy.cfg().superchainConfigGuardian());
+        assertEq(superchainConfig.upgrader(), deploy.cfg().finalSystemOwner());
     }
 
     /// @dev Tests that it can be intialized as paused.
@@ -36,11 +37,15 @@ contract SuperchainConfig_Init_Test is CommonTest {
         vm.startPrank(alice);
         newProxy.upgradeToAndCall(
             address(newImpl),
-            abi.encodeCall(ISuperchainConfig.initialize, (deploy.cfg().superchainConfigGuardian(), true))
+            abi.encodeCall(
+                ISuperchainConfig.initialize,
+                (deploy.cfg().superchainConfigGuardian(), deploy.cfg().finalSystemOwner(), true)
+            )
         );
 
         assertTrue(ISuperchainConfig(address(newProxy)).paused());
         assertEq(ISuperchainConfig(address(newProxy)).guardian(), deploy.cfg().superchainConfigGuardian());
+        assertEq(ISuperchainConfig(address(newProxy)).upgrader(), deploy.cfg().finalSystemOwner());
     }
 }
 
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index dff0852fb40d..f2a605bfcd33 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
+import { VmSafe } from "forge-std/Vm.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
@@ -11,6 +12,10 @@ import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
+import { StaticConfig } from "src/libraries/StaticConfig.sol";
+import { Types } from "src/libraries/Types.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
+import { Bytes } from "src/libraries/Bytes.sol";
 
 // Interfaces
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
@@ -48,18 +53,18 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
     /// @dev Tests that constructor sets the correct values.
     function test_constructor_succeeds() external view {
         ISystemConfig impl = ISystemConfig(systemConfigImpl);
-        assertEq(impl.owner(), address(0xdEaD));
+        assertEq(impl.owner(), address(0));
         assertEq(impl.overhead(), 0);
-        assertEq(impl.scalar(), uint256(0x01) << 248);
+        assertEq(impl.scalar(), 0);
         assertEq(impl.batcherHash(), bytes32(0));
-        assertEq(impl.gasLimit(), 1);
+        assertEq(impl.gasLimit(), 0);
         assertEq(impl.unsafeBlockSigner(), address(0));
         assertEq(impl.basefeeScalar(), 0);
         assertEq(impl.blobbasefeeScalar(), 0);
         IResourceMetering.ResourceConfig memory actual = impl.resourceConfig();
-        assertEq(actual.maxResourceLimit, 1);
-        assertEq(actual.elasticityMultiplier, 1);
-        assertEq(actual.baseFeeMaxChangeDenominator, 2);
+        assertEq(actual.maxResourceLimit, 0);
+        assertEq(actual.elasticityMultiplier, 0);
+        assertEq(actual.baseFeeMaxChangeDenominator, 0);
         assertEq(actual.minimumBaseFee, 0);
         assertEq(actual.systemTxMaxGas, 0);
         assertEq(actual.maximumBaseFee, 0);
@@ -78,6 +83,7 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
         assertEq(decimals, 18);
     }
 
+    // TODO: add a reinit test to ensure calls are made to the Portal.
     /// @dev Tests that initialization sets the correct values.
     function test_initialize_succeeds() external view {
         assertEq(systemConfig.owner(), owner);
@@ -113,6 +119,54 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
         assertEq(token, Constants.ETHER);
         assertEq(decimals, 18);
     }
+
+    /// @dev Tests that the gas usage of `initialize` does not exceed the max resource limit.
+    function test_initialize_gasUsage() external {
+        // Wipe out the initialized slot so the proxy can be initialized again
+        vm.store(address(systemConfig), bytes32(0), bytes32(0));
+
+        vm.recordLogs();
+        systemConfig.initialize({
+            _roles: ISystemConfig.Roles({
+                owner: alice,
+                feeAdmin: bob,
+                unsafeBlockSigner: address(1),
+                batcherHash: bytes32(hex"abcd")
+            }),
+            _basefeeScalar: basefeeScalar,
+            _blobbasefeeScalar: blobbasefeeScalar,
+            _gasLimit: gasLimit,
+            _config: Constants.DEFAULT_RESOURCE_CONFIG(),
+            _batchInbox: address(0),
+            _addresses: ISystemConfig.Addresses({
+                l1CrossDomainMessenger: address(0),
+                l1ERC721Bridge: address(0),
+                l1StandardBridge: address(0),
+                disputeGameFactory: address(0),
+                optimismPortal: address(optimismPortal),
+                optimismMintableERC20Factory: address(0),
+                gasPayingToken: Constants.ETHER
+            })
+        });
+
+        VmSafe.Log[] memory logs = vm.getRecordedLogs();
+        uint64 totalGasUsed = 0;
+        for (uint256 i = 0; i < logs.length; i++) {
+            if (logs[i].topics[0] == keccak256("TransactionDeposited(address,address,uint256,bytes)")) {
+                // The first 32 bytes of the Data will give us the offset of the opaqueData,
+                // The next 32 bytes indicate the length of the opaqueData content.
+                // The remaining data is the opaqueData which is tightly packed. There are two
+                // uint256 values before the gasLimit, so we'll start at 4x32 = 128.
+                uint256 start = 128;
+                uint64 gasUsed = uint64(bytes8(Bytes.slice(logs[i].data, start, 8)));
+                // Assert that the expected SYSTEM_DEPOSIT_GAS_LIMIT gas limit is used for the
+                // detected events.
+                assertEq(gasUsed, 200_000);
+                totalGasUsed += gasUsed;
+            }
+        }
+        assertLe(totalGasUsed, Constants.DEFAULT_RESOURCE_CONFIG().maxResourceLimit);
+    }
 }
 
 contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
@@ -128,12 +182,15 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
 
         vm.expectRevert("SystemConfig: gas limit too low");
         systemConfig.initialize({
-            _owner: alice,
+            _roles: ISystemConfig.Roles({
+                owner: alice,
+                feeAdmin: bob,
+                unsafeBlockSigner: address(1),
+                batcherHash: bytes32(hex"abcd")
+            }),
             _basefeeScalar: basefeeScalar,
             _blobbasefeeScalar: blobbasefeeScalar,
-            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: minimumGasLimit - 1,
-            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -141,7 +198,7 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(0),
+                optimismPortal: address(optimismPortal),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: Constants.ETHER
             })
@@ -158,12 +215,15 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
         // Initialize and check that StartBlock updates to current block number
         vm.prank(systemConfig.owner());
         systemConfig.initialize({
-            _owner: alice,
+            _roles: ISystemConfig.Roles({
+                owner: alice,
+                feeAdmin: bob,
+                unsafeBlockSigner: address(1),
+                batcherHash: bytes32(hex"abcd")
+            }),
             _basefeeScalar: basefeeScalar,
             _blobbasefeeScalar: blobbasefeeScalar,
-            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: gasLimit,
-            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -171,7 +231,7 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(0),
+                optimismPortal: address(optimismPortal),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: Constants.ETHER
             })
@@ -189,12 +249,15 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
         // Initialize and check that StartBlock doesn't update
         vm.prank(systemConfig.owner());
         systemConfig.initialize({
-            _owner: alice,
+            _roles: ISystemConfig.Roles({
+                owner: alice,
+                feeAdmin: bob,
+                unsafeBlockSigner: address(1),
+                batcherHash: bytes32(hex"abcd")
+            }),
             _basefeeScalar: basefeeScalar,
             _blobbasefeeScalar: blobbasefeeScalar,
-            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: gasLimit,
-            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -202,7 +265,7 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(0),
+                optimismPortal: address(optimismPortal),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: Constants.ETHER
             })
@@ -284,12 +347,15 @@ contract SystemConfig_Init_ResourceConfig is SystemConfig_Init {
 
         vm.expectRevert(bytes(revertMessage));
         systemConfig.initialize({
-            _owner: address(0xdEaD),
+            _roles: ISystemConfig.Roles({
+                owner: address(0xdEaD),
+                feeAdmin: address(0xdEaD),
+                unsafeBlockSigner: address(1),
+                batcherHash: bytes32(0)
+            }),
             _basefeeScalar: 0,
             _blobbasefeeScalar: 0,
-            _batcherHash: bytes32(0),
             _gasLimit: gasLimit,
-            _unsafeBlockSigner: address(0),
             _config: config,
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -297,7 +363,7 @@ contract SystemConfig_Init_ResourceConfig is SystemConfig_Init {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(0),
+                optimismPortal: address(optimismPortal),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: address(0)
             })
@@ -323,12 +389,15 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
         vm.store(address(systemConfig), GasPayingToken.GAS_PAYING_TOKEN_SYMBOL_SLOT, bytes32(0));
 
         systemConfig.initialize({
-            _owner: alice,
+            _roles: ISystemConfig.Roles({
+                owner: alice,
+                feeAdmin: bob,
+                unsafeBlockSigner: address(1),
+                batcherHash: bytes32(hex"abcd")
+            }),
             _basefeeScalar: 2100,
             _blobbasefeeScalar: 1000000,
-            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: 30_000_000,
-            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -341,6 +410,13 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
                 gasPayingToken: _gasPayingToken
             })
         });
+
+        vm.roll(block.number + 1);
+        // Reset the OptimismPortal resource config gas used
+        bytes32 slot = vm.load(address(optimismPortal), bytes32(uint256(1)));
+        vm.store(
+            address(optimismPortal), bytes32(uint256(1)), bytes32(uint256(slot) & ~(uint256(type(uint64).max) << 64))
+        );
     }
 
     /// @dev Tests that initialization sets the correct values and getters work.
@@ -451,9 +527,15 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
 
     /// @dev Tests that initialization works with OptimismPortal.
     function test_initialize_customGasTokenCall_succeeds() external {
+        bytes memory data = StaticConfig.encodeSetGasPayingToken({
+            _token: address(token),
+            _decimals: 18,
+            _name: bytes32("Silly"),
+            _symbol: bytes32("SIL")
+        });
+
         vm.expectCall(
-            address(optimismPortal),
-            abi.encodeCall(optimismPortal.setGasPayingToken, (address(token), 18, bytes32("Silly"), bytes32("SIL")))
+            address(optimismPortal), abi.encodeCall(optimismPortal.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
         );
 
         vm.expectEmit(address(optimismPortal));
@@ -466,7 +548,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
                 uint256(0), // value
                 uint64(200_000), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setGasPayingToken, (address(token), 18, bytes32("Silly"), bytes32("SIL")))
+                abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
             )
         );
 
@@ -527,6 +609,26 @@ contract SystemConfig_Setters_TestFail is SystemConfig_Init {
         systemConfig.setGasLimit(maximumGasLimit + 1);
     }
 
+    /// @dev Tests that `setFeeVaultConfig` reverts if the config type is not a fee vault config.
+    function testFuzz_setFeeVaultConfig_badType_reverts(uint8 _type) external {
+        // Ensure that _type is a valid ConfigType, but not a fee vault type.
+        _type = uint8(bound(uint256(_type), 0, uint256(uint8(type(Types.ConfigType).max))));
+        vm.assume(_type == 0 || _type > 3);
+
+        vm.prank(systemConfig.feeAdmin());
+        vm.expectRevert("SystemConfig: ConfigType is is not a Fee Vault Config type");
+        systemConfig.setFeeVaultConfig(Types.ConfigType(_type), address(0), 0, Types.WithdrawalNetwork.L1);
+    }
+
+    /// @dev Tests that `setFeeVaultConfig` reverts if the caller is not authorized.
+    function testFuzz_setFeeVaultConfig_badAuth_reverts(address _caller) external {
+        vm.assume(_caller != systemConfig.feeAdmin());
+        vm.expectRevert("SystemConfig: caller is not the fee admin");
+
+        vm.prank(_caller);
+        systemConfig.setFeeVaultConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG, _caller, 0, Types.WithdrawalNetwork.L1);
+    }
+
     /// @dev Tests that `setEIP1559Params` reverts if the caller is not the owner.
     function test_setEIP1559Params_notOwner_reverts(uint32 _denominator, uint32 _elasticity) external {
         vm.expectRevert("Ownable: caller is not the owner");
@@ -615,6 +717,42 @@ contract SystemConfig_Setters_Test is SystemConfig_Init {
         assertEq(systemConfig.unsafeBlockSigner(), newUnsafeSigner);
     }
 
+    /// @dev Tests that `setFeeVaultConfig` emits the expected event in the OptimismPortal
+    function testFuzz_setFeeVaultConfig_succeeds(
+        uint8 _vaultConfig,
+        address _recipient,
+        uint256 _min,
+        uint8 _network
+    )
+        external
+    {
+        vm.assume(_min <= type(uint88).max);
+        // Bound the _vaultConfig to one of the 3 enum entries associated with Fee Vault Config.
+        Types.ConfigType feeType = Types.ConfigType(uint8(bound(_vaultConfig, 1, 3)));
+        // Bound the _network to one of the 2 enum entries associated with Withdrawal Network.
+        Types.WithdrawalNetwork withdrawalNetwork = Types.WithdrawalNetwork(uint8(bound(_network, 0, 1)));
+
+        bytes memory value = abi.encode(Encoding.encodeFeeVaultConfig(_recipient, _min, withdrawalNetwork));
+
+        address feeAdmin = systemConfig.feeAdmin();
+        vm.expectEmit(address(optimismPortal2));
+        emit TransactionDeposited(
+            0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
+            Predeploys.L1_BLOCK_ATTRIBUTES,
+            0,
+            abi.encodePacked(
+                uint256(0), // mint
+                uint256(0), // value
+                uint64(200_000), // gasLimit
+                false, // isCreation,
+                abi.encodeCall(IL1Block.setConfig, (feeType, value))
+            )
+        );
+
+        vm.prank(feeAdmin);
+        systemConfig.setFeeVaultConfig(feeType, _recipient, _min, withdrawalNetwork);
+    }
+
     /// @dev Tests that `setEIP1559Params` updates the EIP1559 parameters successfully.
     function testFuzz_setEIP1559Params_succeeds(uint32 _denominator, uint32 _elasticity) external {
         vm.assume(_denominator > 1);
@@ -631,3 +769,5 @@ contract SystemConfig_Setters_Test is SystemConfig_Init {
         assertEq(systemConfig.eip1559Elasticity(), _elasticity);
     }
 }
+
+// TODO: GasBenchmarks for initialize
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index 426dba30c72a..f10d175b0d5c 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -6,12 +6,12 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Libraries
 import { Constants } from "src/libraries/Constants.sol";
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
@@ -50,7 +50,7 @@ contract SystemConfigInterop_Test is CommonTest {
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
                 (
-                    ConfigType.SET_GAS_PAYING_TOKEN,
+                    Types.ConfigType.GAS_PAYING_TOKEN,
                     StaticConfig.encodeSetGasPayingToken({
                         _token: _token,
                         _decimals: 18,
@@ -70,7 +70,7 @@ contract SystemConfigInterop_Test is CommonTest {
             address(optimismPortal),
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
-                (ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId))
+                (Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId))
             )
         );
 
@@ -92,7 +92,7 @@ contract SystemConfigInterop_Test is CommonTest {
             address(optimismPortal),
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
-                (ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId))
+                (Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId))
             )
         );
 
@@ -117,12 +117,15 @@ contract SystemConfigInterop_Test is CommonTest {
         vm.store(address(systemConfig), GasPayingToken.GAS_PAYING_TOKEN_SYMBOL_SLOT, bytes32(0));
 
         systemConfig.initialize({
-            _owner: alice,
+            _roles: ISystemConfig.Roles({
+                owner: alice,
+                feeAdmin: bob,
+                unsafeBlockSigner: address(1),
+                batcherHash: bytes32(hex"abcd")
+            }),
             _basefeeScalar: 2100,
             _blobbasefeeScalar: 1000000,
-            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: 30_000_000,
-            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
diff --git a/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol b/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
index bf63a700c098..520adc77c55b 100644
--- a/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
@@ -8,7 +8,7 @@ import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Test the implementations of the FeeVault
-contract FeeVault_Test is Bridge_Initializer {
+contract BaseFeeVault_Test is Bridge_Initializer {
     /// @dev Tests that the constructor sets the correct values.
     function test_constructor_baseFeeVault_succeeds() external view {
         assertEq(baseFeeVault.RECIPIENT(), deploy.cfg().baseFeeVaultRecipient());
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
index a80f633fede2..c317519c5dbd 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
@@ -7,7 +7,6 @@ import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
-import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
 
 // Target contract dependencies
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
@@ -39,18 +38,6 @@ contract CrossDomainOwnable2_Test is Bridge_Initializer {
         setter.set(1);
     }
 
-    /// @dev Tests that the `onlyOwner` modifier reverts when not called by the owner.
-    function test_onlyOwner_notOwner_reverts() external {
-        // set the xDomainMsgSender storage slot
-        bytes32 key = bytes32(uint256(204));
-        bytes32 value = Bytes32AddressLib.fillLast12Bytes(address(alice));
-        vm.store(address(l2CrossDomainMessenger), key, value);
-
-        vm.prank(address(l2CrossDomainMessenger));
-        vm.expectRevert("CrossDomainOwnable2: caller is not the owner");
-        setter.set(1);
-    }
-
     /// @dev Tests that the `onlyOwner` modifier causes the relayed message to fail.
     function test_onlyOwner_notOwner2_reverts() external {
         uint240 nonce = 0;
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
index 968910478198..6c86ccb50b11 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
@@ -71,7 +71,7 @@ contract CrossDomainOwnable3_Test is Bridge_Initializer {
         setter.transferOwnership({ _owner: alice, _isLocal: false });
 
         // set the xDomainMsgSender storage slot
-        bytes32 key = bytes32(uint256(204));
+        bytes32 key = bytes32(uint256(208));
         bytes32 value = Bytes32AddressLib.fillLast12Bytes(bob);
         vm.store(address(l2CrossDomainMessenger), key, value);
 
diff --git a/packages/contracts-bedrock/test/L2/FeeVault.t.sol b/packages/contracts-bedrock/test/L2/FeeVault.t.sol
new file mode 100644
index 000000000000..bf63a700c098
--- /dev/null
+++ b/packages/contracts-bedrock/test/L2/FeeVault.t.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+// Testing utilities
+import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+
+// Libraries
+import { Types } from "src/libraries/Types.sol";
+
+// Test the implementations of the FeeVault
+contract FeeVault_Test is Bridge_Initializer {
+    /// @dev Tests that the constructor sets the correct values.
+    function test_constructor_baseFeeVault_succeeds() external view {
+        assertEq(baseFeeVault.RECIPIENT(), deploy.cfg().baseFeeVaultRecipient());
+        assertEq(baseFeeVault.recipient(), deploy.cfg().baseFeeVaultRecipient());
+        assertEq(baseFeeVault.MIN_WITHDRAWAL_AMOUNT(), deploy.cfg().baseFeeVaultMinimumWithdrawalAmount());
+        assertEq(baseFeeVault.minWithdrawalAmount(), deploy.cfg().baseFeeVaultMinimumWithdrawalAmount());
+        assertEq(uint8(baseFeeVault.WITHDRAWAL_NETWORK()), uint8(Types.WithdrawalNetwork.L1));
+        assertEq(uint8(baseFeeVault.withdrawalNetwork()), uint8(Types.WithdrawalNetwork.L1));
+    }
+}
diff --git a/packages/contracts-bedrock/test/L2/L1Block.t.sol b/packages/contracts-bedrock/test/L2/L1Block.t.sol
index 762553a2ff2f..58fc6e08ea4e 100644
--- a/packages/contracts-bedrock/test/L2/L1Block.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1Block.t.sol
@@ -6,8 +6,11 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Encoding } from "src/libraries/Encoding.sol";
+import { Types } from "src/libraries/Types.sol";
+import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import "src/libraries/L1BlockErrors.sol";
+import { LibString } from "lib/solady/src/utils/LibString.sol";
 
 contract L1BlockTest is CommonTest {
     address depositor;
@@ -165,6 +168,148 @@ contract L1BlockEcotone_Test is L1BlockTest {
     }
 }
 
+contract L1BlockIsthmus_Test is L1BlockTest {
+    /// @dev Tests that `setIsthmus` succeeds if sender address is the depositor
+    function test_setIsthmus_isDepositor_succeeds() external {
+        vm.prank(depositor);
+        l1Block.setIsthmus();
+        assertTrue(l1Block.isIsthmus());
+
+        bytes memory baseFeeVaultConfig = l1Block.getConfig(Types.ConfigType.BASE_FEE_VAULT_CONFIG);
+        (address recipient, uint256 min, Types.WithdrawalNetwork network) =
+            Encoding.decodeFeeVaultConfig(bytes32(baseFeeVaultConfig));
+        assertEq(recipient, deploy.cfg().baseFeeVaultRecipient());
+        assertEq(min, deploy.cfg().baseFeeVaultMinimumWithdrawalAmount());
+        assertEq(uint8(network), uint8(deploy.cfg().baseFeeVaultWithdrawalNetwork()));
+
+        bytes memory sequencerFeeVaultConfig = l1Block.getConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG);
+        (recipient, min, network) = Encoding.decodeFeeVaultConfig(bytes32(sequencerFeeVaultConfig));
+        assertEq(recipient, deploy.cfg().sequencerFeeVaultRecipient());
+        assertEq(min, deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount());
+        assertEq(uint8(network), uint8(deploy.cfg().sequencerFeeVaultWithdrawalNetwork()));
+
+        bytes memory l1FeeVaultConfig = l1Block.getConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG);
+        (recipient, min, network) = Encoding.decodeFeeVaultConfig(bytes32(l1FeeVaultConfig));
+        assertEq(recipient, deploy.cfg().l1FeeVaultRecipient());
+        assertEq(min, deploy.cfg().l1FeeVaultMinimumWithdrawalAmount());
+        assertEq(uint8(network), uint8(deploy.cfg().l1FeeVaultWithdrawalNetwork()));
+
+        assertEq(
+            abi.decode(l1Block.getConfig(Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS), (address)),
+            address(l1ERC721Bridge)
+        );
+        assertEq(
+            abi.decode(l1Block.getConfig(Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS), (address)),
+            address(l1CrossDomainMessenger)
+        );
+        assertEq(
+            abi.decode(l1Block.getConfig(Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS), (address)),
+            address(l1StandardBridge)
+        );
+        assertEq(abi.decode(l1Block.getConfig(Types.ConfigType.REMOTE_CHAIN_ID), (uint256)), deploy.cfg().l1ChainID());
+    }
+
+    /// @dev Tests that `setIsthmus` reverts if sender address is not the depositor
+    function test_setIsthmus_notDepositor_reverts() external {
+        vm.expectRevert(NotDepositor.selector);
+        l1Block.setIsthmus();
+    }
+}
+
+contract L1BlockConfig_Test is L1BlockTest {
+    /// @notice Ensures that `setConfig` always reverts when called, across all possible config types.
+    ///         Use a magic number of 10 since solidity doesn't offer a good way to know the nubmer
+    ///         of enum elements.
+    function test_setConfig_onlyDepositor_reverts(address _caller, uint8 _type) external {
+        vm.assume(_caller != Constants.DEPOSITOR_ACCOUNT);
+        vm.assume(_type < 10); // the number of defined config types
+        vm.expectRevert(NotDepositor.selector);
+        vm.prank(_caller);
+        l1Block.setConfig(Types.ConfigType(_type), hex"");
+    }
+
+    function test_getConfigRoundtripGasPayingToken_succeeds(
+        address _token,
+        uint8 _decimals,
+        bytes32 _name,
+        bytes32 _symbol
+    )
+        external
+    {
+        _name = LibString.normalizeSmallString(_name);
+        _symbol = LibString.normalizeSmallString(_symbol);
+        // Both the 0 address and the ether address are prevented from being set by
+        // `_setGasPayingToken` in `SystemConfig.sol`
+        vm.assume(_token != address(0) && _token != Constants.ETHER);
+        vm.prank(Constants.DEPOSITOR_ACCOUNT);
+        l1Block.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, abi.encode(_token, _decimals, _name, _symbol));
+        bytes memory data = l1Block.getConfig(Types.ConfigType.GAS_PAYING_TOKEN);
+        (address token, uint8 decimals, bytes32 name, bytes32 symbol) =
+            abi.decode(data, (address, uint8, bytes32, bytes32));
+        assertEq(token, _token);
+        assertEq(decimals, _decimals);
+
+        assertEq(name, _name);
+        assertEq(symbol, _symbol);
+    }
+
+    /// @notice Tests roundtrip setConfig/getConfig for base fee vault config
+    function test_getConfigRoundtripBaseFeeVault_succeeds(bytes32 _config) external {
+        _getConfigRoundTrip(_config, Types.ConfigType.BASE_FEE_VAULT_CONFIG);
+    }
+
+    /// @notice Tests roundtrip setConfig/getConfig for L1 fee vault config
+    function test_getConfigRoundtripL1FeeVault_succeeds(bytes32 _config) external {
+        _getConfigRoundTrip(_config, Types.ConfigType.L1_FEE_VAULT_CONFIG);
+    }
+
+    /// @notice Tests roundtrip setConfig/getConfig for sequencer fee vault config
+    function test_getConfigRoundtripSequencerFeeVault_succeeds(bytes32 _config) external {
+        _getConfigRoundTrip(_config, Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG);
+    }
+
+    /// @notice Internal function for logic on round trip testing fee vault config
+    function _getConfigRoundTrip(bytes32 _config, Types.ConfigType _type) internal {
+        vm.prank(Constants.DEPOSITOR_ACCOUNT);
+        l1Block.setConfig(_type, abi.encode(_config));
+        bytes memory data = l1Block.getConfig(_type);
+        bytes32 config = abi.decode(data, (bytes32));
+        assertEq(config, _config);
+    }
+
+    function test_getConfigRoundtripL1CrossDomainMessenger_succeeds(address _addr) external {
+        _getConfigRoundTrip(_addr, Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS);
+    }
+
+    function test_getConfigRoundtripL1ERC721Bridge_succeeds(address _addr) external {
+        _getConfigRoundTrip(_addr, Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS);
+    }
+
+    function test_getConfigRoundtripL1StandardBridge_succeeds(address _addr) external {
+        _getConfigRoundTrip(_addr, Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS);
+    }
+
+    function _getConfigRoundTrip(address _addr, Types.ConfigType _type) internal {
+        vm.prank(Constants.DEPOSITOR_ACCOUNT);
+        l1Block.setConfig(_type, abi.encode(_addr));
+        bytes memory data = l1Block.getConfig(_type);
+        address addr = abi.decode(data, (address));
+        assertEq(addr, _addr);
+    }
+
+    function test_getConfigRoundtripRemoteChainId_succeeds(uint256 _value) external {
+        _getConfigRoundTrip(_value, Types.ConfigType.REMOTE_CHAIN_ID);
+    }
+
+    function _getConfigRoundTrip(uint256 _value, Types.ConfigType _type) internal {
+        vm.prank(Constants.DEPOSITOR_ACCOUNT);
+        l1Block.setConfig(_type, abi.encode(_value));
+        bytes memory data = l1Block.getConfig(_type);
+        uint256 value = abi.decode(data, (uint256));
+        assertEq(value, _value);
+    }
+}
+
 contract L1BlockCustomGasToken_Test is L1BlockTest {
     function testFuzz_setGasPayingToken_succeeds(
         address _token,
diff --git a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
index 6f0ef2188b8c..fca80975141c 100644
--- a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
@@ -6,9 +6,10 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Target contract dependencies
-import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
+import { L1BlockInterop } from "src/L2/L1BlockInterop.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import "src/libraries/L1BlockErrors.sol";
 
@@ -34,7 +35,7 @@ contract L1BlockInteropTest is CommonTest {
     function testFuzz_isInDependencySet_succeeds(uint256 _chainId) public prankDepositor {
         vm.assume(_chainId != block.chainid);
 
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
 
         assertTrue(_l1BlockInterop().isInDependencySet(_chainId));
     }
@@ -70,7 +71,7 @@ contract L1BlockInteropTest is CommonTest {
 
         for (uint256 i = 0; i < _dependencySetSize; i++) {
             if (i == block.chainid) continue;
-            _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
+            _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
             uniqueCount++;
         }
 
@@ -98,7 +99,7 @@ contract L1BlockInteropTest is CommonTest {
         emit GasPayingTokenSet({ token: _token, decimals: _decimals, name: _name, symbol: _symbol });
 
         _l1BlockInterop().setConfig(
-            ConfigType.SET_GAS_PAYING_TOKEN,
+            Types.ConfigType.GAS_PAYING_TOKEN,
             StaticConfig.encodeSetGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol })
         );
     }
@@ -116,7 +117,7 @@ contract L1BlockInteropTest is CommonTest {
 
         vm.expectRevert(NotDepositor.selector);
         _l1BlockInterop().setConfig(
-            ConfigType.SET_GAS_PAYING_TOKEN,
+            Types.ConfigType.GAS_PAYING_TOKEN,
             StaticConfig.encodeSetGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol })
         );
     }
@@ -128,41 +129,41 @@ contract L1BlockInteropTest is CommonTest {
         vm.expectEmit(address(l1Block));
         emit DependencyAdded(_chainId);
 
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
     }
 
     /// @dev Tests that adding a dependency reverts if it's the chain's chain id
     function test_setConfig_addDependency_chainChainId_reverts() public prankDepositor {
         vm.expectRevert(AlreadyDependency.selector);
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(block.chainid));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(block.chainid));
     }
 
     /// @dev Tests that adding a dependency already in the set reverts
     function test_setConfig_addDependency_alreadyDependency_reverts(uint256 _chainId) public prankDepositor {
         vm.assume(_chainId != block.chainid);
 
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
 
         vm.expectRevert(AlreadyDependency.selector);
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
     }
 
     /// @dev Tests that setting the add dependency config as not the depositor reverts.
     function testFuzz_setConfig_addDependency_notDepositor_reverts(uint256 _chainId) public {
         vm.expectRevert(NotDepositor.selector);
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
     }
 
     /// @dev Tests that setting the add dependency config when the dependency set size is too large reverts.
     function test_setConfig_addDependency_dependencySetSizeTooLarge_reverts() public prankDepositor {
         for (uint256 i = 0; i < type(uint8).max; i++) {
-            _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
+            _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
         }
 
         assertEq(_l1BlockInterop().dependencySetSize(), type(uint8).max);
 
         vm.expectRevert(DependencySetSizeTooLarge.selector);
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(1));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(1));
     }
 
     /// @dev Tests that the config for removing a dependency can be set.
@@ -170,24 +171,26 @@ contract L1BlockInteropTest is CommonTest {
         vm.assume(_chainId != block.chainid);
 
         // Add the chain ID to the dependency set before removing it
-        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
 
         vm.expectEmit(address(l1Block));
         emit DependencyRemoved(_chainId);
 
-        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
     }
 
     /// @dev Tests that setting the remove dependency config as not the depositor reverts.
     function testFuzz_setConfig_removeDependency_notDepositor_reverts(uint256 _chainId) public {
         vm.expectRevert(NotDepositor.selector);
-        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
     }
 
     /// @dev Tests that setting the remove dependency config for the chain's chain ID reverts.
     function test_setConfig_removeDependency_chainChainId_reverts() public prankDepositor {
         vm.expectRevert(CantRemovedDependency.selector);
-        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(block.chainid));
+        _l1BlockInterop().setConfig(
+            Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(block.chainid)
+        );
     }
 
     /// @dev Tests that setting the remove dependency config for a chain ID that is not in the dependency set reverts.
@@ -195,7 +198,7 @@ contract L1BlockInteropTest is CommonTest {
         vm.assume(_chainId != block.chainid);
 
         vm.expectRevert(NotDependency.selector);
-        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
+        _l1BlockInterop().setConfig(Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
     }
 
     /// @dev Returns the L1BlockInterop instance.
diff --git a/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol b/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
index 03a3e7e5ad9b..825ee77e5c1f 100644
--- a/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
@@ -8,7 +8,7 @@ import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Test the implementations of the FeeVault
-contract FeeVault_Test is Bridge_Initializer {
+contract L1FeeVault_Test is Bridge_Initializer {
     /// @dev Tests that the constructor sets the correct values.
     function test_constructor_l1FeeVault_succeeds() external view {
         assertEq(l1FeeVault.RECIPIENT(), deploy.cfg().l1FeeVaultRecipient());
diff --git a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
index 1dc5749d6d54..bd6ee0cd28b6 100644
--- a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
@@ -21,12 +21,14 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     address recipient = address(0xabbaacdc);
 
     /// @dev Tests that the implementation is initialized correctly.
+    ///      The implementation returns the actual address rather than `address(0)`
+    ///      because the contract calls L1Block for the result.
     function test_constructor_succeeds() external view {
         IL2CrossDomainMessenger impl =
             IL2CrossDomainMessenger(EIP1967Helper.getImplementation(deploy.mustGetAddress("L2CrossDomainMessenger")));
-        assertEq(address(impl.OTHER_MESSENGER()), address(0));
-        assertEq(address(impl.otherMessenger()), address(0));
-        assertEq(address(impl.l1CrossDomainMessenger()), address(0));
+        assertEq(address(impl.OTHER_MESSENGER()), address(l1CrossDomainMessenger));
+        assertEq(address(impl.otherMessenger()), address(l1CrossDomainMessenger));
+        assertEq(address(impl.l1CrossDomainMessenger()), address(l1CrossDomainMessenger));
     }
 
     /// @dev Tests that the proxy is initialized correctly.
diff --git a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
index 58179cb93207..54993d666a4f 100644
--- a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
@@ -22,7 +22,7 @@ contract TestERC721 is ERC721 {
 
 contract TestMintableERC721 is OptimismMintableERC721 {
     constructor(
-        address _bridge,
+        IL2ERC721Bridge _bridge,
         address _remoteToken
     )
         OptimismMintableERC721(_bridge, 1, _remoteToken, "Test", "TST")
@@ -61,7 +61,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
         super.setUp();
 
         remoteToken = new TestERC721();
-        localToken = new TestMintableERC721(address(l2ERC721Bridge), address(remoteToken));
+        localToken = new TestMintableERC721(l2ERC721Bridge, address(remoteToken));
 
         // Mint alice a token.
         localToken.mint(alice, tokenId);
diff --git a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
index 57b22e628eba..827849826836 100644
--- a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
@@ -191,7 +191,7 @@ contract L2GenesisTest is Test {
         // 16 prefunded dev accounts are excluded
         assertEq(expected, getJSONKeyCount(_path), "key count check");
 
-        // 3 slots: implementation, owner, admin
-        assertEq(3, getStorageKeysCount(_path, Predeploys.PROXY_ADMIN), "proxy admin storage check");
+        // 2 slots: implementation, admin
+        assertEq(2, getStorageKeysCount(_path, Predeploys.PROXY_ADMIN), "proxy admin storage check");
     }
 }
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
index d703ec95f64e..f4fadb06dd31 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
@@ -28,12 +28,12 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     function test_constructor_succeeds() external view {
         IL2StandardBridge impl =
             IL2StandardBridge(payable(EIP1967Helper.getImplementation(deploy.mustGetAddress("L2StandardBridge"))));
-        // The implementation contract is initialized with a 0 L1 bridge address,
+        // The implementation contract calls out to L1Block to get the otherBridge
         // but the L2 cross-domain-messenger is always set to the predeploy address for both proxy and implementation.
-        assertEq(address(impl.MESSENGER()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor zero check MESSENGER");
-        assertEq(address(impl.messenger()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor zero check messenger");
-        assertEq(address(impl.OTHER_BRIDGE()), address(0), "constructor zero check OTHER_BRIDGE");
-        assertEq(address(impl.otherBridge()), address(0), "constructor zero check otherBridge");
+        assertEq(address(impl.MESSENGER()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor check MESSENGER");
+        assertEq(address(impl.messenger()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor check messenger");
+        assertEq(address(impl.OTHER_BRIDGE()), address(l1StandardBridge), "constructor check OTHER_BRIDGE");
+        assertEq(address(impl.otherBridge()), address(l1StandardBridge), "constructor check otherBridge");
     }
 
     /// @dev Tests that the bridge is initialized correctly.
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol b/packages/contracts-bedrock/test/L2/OptimismMintableERC721Factory.t.sol
similarity index 89%
rename from packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
rename to packages/contracts-bedrock/test/L2/OptimismMintableERC721Factory.t.sol
index ef9019eafa04..f5256cb73cbb 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismMintableERC721Factory.t.sol
@@ -4,16 +4,15 @@ pragma solidity 0.8.15;
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
-import { OptimismMintableERC721Factory } from "src/universal/OptimismMintableERC721Factory.sol";
 
 contract OptimismMintableERC721Factory_Test is Bridge_Initializer {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     function test_constructor_succeeds() external view {
-        assertEq(l2OptimismMintableERC721Factory.BRIDGE(), address(l2ERC721Bridge));
-        assertEq(l2OptimismMintableERC721Factory.bridge(), address(l2ERC721Bridge));
+        assertEq(address(l2OptimismMintableERC721Factory.BRIDGE()), address(l2ERC721Bridge));
+        assertEq(address(l2OptimismMintableERC721Factory.bridge()), address(l2ERC721Bridge));
         assertEq(l2OptimismMintableERC721Factory.REMOTE_CHAIN_ID(), deploy.cfg().l1ChainID());
-        assertEq(l2OptimismMintableERC721Factory.remoteChainID(), deploy.cfg().l1ChainID());
+        assertEq(l2OptimismMintableERC721Factory.remoteChainId(), deploy.cfg().l1ChainID());
     }
 
     function test_createOptimismMintableERC721_succeeds() external {
@@ -40,7 +39,7 @@ contract OptimismMintableERC721Factory_Test is Bridge_Initializer {
         assertEq(created.name(), "L2Token");
         assertEq(created.symbol(), "L2T");
         assertEq(created.REMOTE_TOKEN(), remote);
-        assertEq(created.BRIDGE(), address(l2ERC721Bridge));
+        assertEq(address(created.BRIDGE()), address(l2ERC721Bridge));
         assertEq(created.REMOTE_CHAIN_ID(), deploy.cfg().l1ChainID());
     }
 
diff --git a/packages/contracts-bedrock/test/L2/Predeploys.t.sol b/packages/contracts-bedrock/test/L2/Predeploys.t.sol
index 27e3d75b2fdc..38e8ff74be69 100644
--- a/packages/contracts-bedrock/test/L2/Predeploys.t.sol
+++ b/packages/contracts-bedrock/test/L2/Predeploys.t.sol
@@ -21,10 +21,9 @@ contract PredeploysBaseTest is CommonTest {
         return _addr == Predeploys.L1_MESSAGE_SENDER;
     }
 
-    /// @dev Returns true if the predeploy is initializable.
-    function _isInitializable(address _addr) internal pure returns (bool) {
-        return _addr == Predeploys.L2_CROSS_DOMAIN_MESSENGER || _addr == Predeploys.L2_STANDARD_BRIDGE
-            || _addr == Predeploys.L2_ERC721_BRIDGE || _addr == Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY;
+    /// @dev No predeploys should ever be initializable.
+    function _isInitializable(address) internal pure returns (bool) {
+        return false;
     }
 
     /// @dev Returns true if the predeploy uses immutables.
@@ -49,7 +48,7 @@ contract PredeploysBaseTest is CommonTest {
         );
     }
 
-    function _test_predeploys(bool _useInterop) internal {
+    function _test_predeploys(bool _useInterop) internal view {
         uint256 count = 2048;
         uint160 prefix = uint160(0x420) << 148;
 
@@ -104,10 +103,6 @@ contract PredeploysBaseTest is CommonTest {
                 // can't check bytecode if it's modified with immutables in genesis.
                 assertEq(implAddr.code, supposedCode, "proxy implementation contract should match contract source");
             }
-
-            if (_isInitializable(addr)) {
-                assertEq(l2Genesis.loadInitializedSlot(cname), uint8(1));
-            }
         }
     }
 }
@@ -115,7 +110,7 @@ contract PredeploysBaseTest is CommonTest {
 contract PredeploysTest is PredeploysBaseTest {
     /// @dev Tests that the predeploy addresses are set correctly. They have code
     ///      and the proxied accounts have the correct admin.
-    function test_predeploys_succeeds() external {
+    function test_predeploys_succeeds() external view {
         _test_predeploys(false);
     }
 }
@@ -129,7 +124,7 @@ contract PredeploysInteropTest is PredeploysBaseTest {
 
     /// @dev Tests that the predeploy addresses are set correctly. They have code
     ///      and the proxied accounts have the correct admin. Using interop.
-    function test_predeploys_succeeds() external {
+    function test_predeploys_succeeds() external view {
         _test_predeploys(true);
     }
 }
diff --git a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
index ca8c3806b38b..9ba232dcf0b3 100644
--- a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
@@ -4,33 +4,29 @@ pragma solidity 0.8.15;
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Reverter } from "test/mocks/Callers.sol";
-import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
-
-// Contracts
-import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Types } from "src/libraries/Types.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
+import { Constants } from "src/libraries/Constants.sol";
 
 contract SequencerFeeVault_Test is CommonTest {
-    address recipient;
-
-    /// @dev Sets up the test suite.
     function setUp() public override {
         super.setUp();
-        recipient = deploy.cfg().sequencerFeeVaultRecipient();
+        assertEq(uint8(deploy.cfg().sequencerFeeVaultWithdrawalNetwork()), uint8(Types.WithdrawalNetwork.L1));
     }
 
-    /// @dev Tests that the l1 fee wallet is correct.
+    /// @dev Tests that the sequencer fee wallet is correct.
     function test_constructor_succeeds() external view {
+        address recipient = deploy.cfg().sequencerFeeVaultRecipient();
+        uint256 amount = deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount();
         assertEq(sequencerFeeVault.l1FeeWallet(), recipient);
         assertEq(sequencerFeeVault.RECIPIENT(), recipient);
         assertEq(sequencerFeeVault.recipient(), recipient);
-        assertEq(sequencerFeeVault.MIN_WITHDRAWAL_AMOUNT(), deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount());
-        assertEq(sequencerFeeVault.minWithdrawalAmount(), deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount());
+        assertEq(sequencerFeeVault.MIN_WITHDRAWAL_AMOUNT(), amount);
+        assertEq(sequencerFeeVault.minWithdrawalAmount(), amount);
         assertEq(uint8(sequencerFeeVault.WITHDRAWAL_NETWORK()), uint8(Types.WithdrawalNetwork.L1));
         assertEq(uint8(sequencerFeeVault.withdrawalNetwork()), uint8(Types.WithdrawalNetwork.L1));
     }
@@ -63,6 +59,8 @@ contract SequencerFeeVault_Test is CommonTest {
         // No ether has been withdrawn yet
         assertEq(sequencerFeeVault.totalProcessed(), 0);
 
+        address recipient = deploy.cfg().sequencerFeeVaultRecipient();
+
         vm.expectEmit(address(Predeploys.SEQUENCER_FEE_WALLET));
         emit Withdrawal(address(sequencerFeeVault).balance, recipient, address(this));
         vm.expectEmit(address(Predeploys.SEQUENCER_FEE_WALLET));
@@ -102,34 +100,31 @@ contract SequencerFeeVault_Test is CommonTest {
 }
 
 contract SequencerFeeVault_L2Withdrawal_Test is CommonTest {
-    /// @dev a cache for the config fee recipient
-    address recipient;
-
     /// @dev Sets up the test suite.
     function setUp() public override {
         super.setUp();
 
-        // Alter the deployment to use WithdrawalNetwork.L2
-        vm.etch(
-            EIP1967Helper.getImplementation(Predeploys.SEQUENCER_FEE_WALLET),
-            address(
-                DeployUtils.create1({
-                    _name: "SequencerFeeVault",
-                    _args: DeployUtils.encodeConstructor(
-                        abi.encodeCall(
-                            ISequencerFeeVault.__constructor__,
-                            (
-                                deploy.cfg().sequencerFeeVaultRecipient(),
-                                deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
-                                Types.WithdrawalNetwork.L2
-                            )
-                        )
-                    )
-                })
-            ).code
-        );
+        // Explicitly use L2 withdrawal network
+        bytes32 sequencerFeeVaultConfig = Encoding.encodeFeeVaultConfig({
+            _recipient: deploy.cfg().sequencerFeeVaultRecipient(),
+            _amount: deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
+            _network: Types.WithdrawalNetwork.L2
+        });
+        vm.prank(Constants.DEPOSITOR_ACCOUNT);
+        l1Block.setConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG, abi.encode(sequencerFeeVaultConfig));
+    }
 
-        recipient = deploy.cfg().sequencerFeeVaultRecipient();
+    /// @dev Tests that the sequencer fee wallet is correct.
+    function test_constructor_succeeds() external view {
+        address recipient = deploy.cfg().sequencerFeeVaultRecipient();
+        uint256 amount = deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount();
+        assertEq(sequencerFeeVault.l1FeeWallet(), recipient);
+        assertEq(sequencerFeeVault.RECIPIENT(), recipient);
+        assertEq(sequencerFeeVault.recipient(), recipient);
+        assertEq(sequencerFeeVault.MIN_WITHDRAWAL_AMOUNT(), amount);
+        assertEq(sequencerFeeVault.minWithdrawalAmount(), amount);
+        assertEq(uint8(sequencerFeeVault.WITHDRAWAL_NETWORK()), uint8(Types.WithdrawalNetwork.L2));
+        assertEq(uint8(sequencerFeeVault.withdrawalNetwork()), uint8(Types.WithdrawalNetwork.L2));
     }
 
     /// @dev Tests that `withdraw` successfully initiates a withdrawal to L2.
@@ -148,14 +143,14 @@ contract SequencerFeeVault_L2Withdrawal_Test is CommonTest {
         );
 
         // The entire vault's balance is withdrawn
-        vm.expectCall(recipient, address(sequencerFeeVault).balance, bytes(""));
+        vm.expectCall(sequencerFeeVault.RECIPIENT(), address(sequencerFeeVault).balance, bytes(""));
 
         sequencerFeeVault.withdraw();
 
         // The withdrawal was successful
         assertEq(sequencerFeeVault.totalProcessed(), amount);
         assertEq(address(sequencerFeeVault).balance, 0);
-        assertEq(recipient.balance, amount);
+        assertEq(sequencerFeeVault.recipient().balance, amount);
     }
 
     /// @dev Tests that `withdraw` fails if the Recipient reverts. This also serves to simulate
@@ -171,7 +166,7 @@ contract SequencerFeeVault_L2Withdrawal_Test is CommonTest {
         vm.etch(sequencerFeeVault.RECIPIENT(), type(Reverter).runtimeCode);
 
         // The entire vault's balance is withdrawn
-        vm.expectCall(recipient, address(sequencerFeeVault).balance, bytes(""));
+        vm.expectCall(sequencerFeeVault.recipient(), address(sequencerFeeVault).balance, bytes(""));
         vm.expectRevert("FeeVault: failed to send ETH to L2 fee recipient");
         sequencerFeeVault.withdraw();
         assertEq(sequencerFeeVault.totalProcessed(), 0);
diff --git a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
index 5b0b300abda0..31700f3a7529 100644
--- a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
@@ -7,6 +7,12 @@ import { IProxy } from "src/universal/interfaces/IProxy.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
+contract ConfigSetter {
+    function setConfig(uint8, bytes calldata) external {
+        // noop
+    }
+}
+
 contract SystemConfig_GasLimitBoundaries_Invariant is Test {
     ISystemConfig public config;
 
@@ -23,6 +29,7 @@ contract SystemConfig_GasLimitBoundaries_Invariant is Test {
                 _args: DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfig.__constructor__, ()))
             })
         );
+        ConfigSetter setter = new ConfigSetter();
 
         vm.prank(msg.sender);
         proxy.upgradeToAndCall(
@@ -30,12 +37,15 @@ contract SystemConfig_GasLimitBoundaries_Invariant is Test {
             abi.encodeCall(
                 configImpl.initialize,
                 (
-                    address(0xbeef), // owner
+                    ISystemConfig.Roles({
+                        owner: address(0xbeef),
+                        feeAdmin: address(0xbeef),
+                        unsafeBlockSigner: address(1),
+                        batcherHash: bytes32(hex"abcd")
+                    }),
                     2100, // overhead
                     1000000, // scalar
-                    bytes32(hex"abcd"), // batcher hash
                     30_000_000, // gas limit
-                    address(1), // unsafe block signer
                     Constants.DEFAULT_RESOURCE_CONFIG(),
                     address(0), // _batchInbox
                     ISystemConfig.Addresses({ // _addrs
@@ -43,7 +53,7 @@ contract SystemConfig_GasLimitBoundaries_Invariant is Test {
                         l1ERC721Bridge: address(0),
                         l1StandardBridge: address(0),
                         disputeGameFactory: address(0),
-                        optimismPortal: address(0),
+                        optimismPortal: address(setter),
                         optimismMintableERC20Factory: address(0),
                         gasPayingToken: Constants.ETHER
                     })
diff --git a/packages/contracts-bedrock/test/libraries/Encoding.t.sol b/packages/contracts-bedrock/test/libraries/Encoding.t.sol
index a301fdd97b3a..11df7eeae17e 100644
--- a/packages/contracts-bedrock/test/libraries/Encoding.t.sol
+++ b/packages/contracts-bedrock/test/libraries/Encoding.t.sol
@@ -93,4 +93,15 @@ contract Encoding_Test is CommonTest {
 
         assertEq(txn, _txn);
     }
+
+    // using a bool simulates the 2 enum values that exist
+    function testFuzz_encodeFeeVaultConfig_succeeds(address _recipient, uint88 _amount, bool _network) public pure {
+        Types.WithdrawalNetwork _withdrawalNetwork = _network ? Types.WithdrawalNetwork.L1 : Types.WithdrawalNetwork.L2;
+        bytes32 encoded = Encoding.encodeFeeVaultConfig(_recipient, uint256(_amount), _withdrawalNetwork);
+        (address recipient, uint256 amount, Types.WithdrawalNetwork withdrawalNetwork) =
+            Encoding.decodeFeeVaultConfig(encoded);
+        assertEq(_recipient, recipient, "bad recipient");
+        assertEq(uint256(_amount), amount, "bad amount");
+        assertEq(uint256(withdrawalNetwork), uint256(withdrawalNetwork), "bad network");
+    }
 }
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
index 54e0e456def3..6f1f59c9fe96 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
@@ -35,6 +35,7 @@ contract DeployOPChainInput_Test is Test {
     // Define defaults.
     address opChainProxyAdminOwner = makeAddr("opChainProxyAdminOwner");
     address systemConfigOwner = makeAddr("systemConfigOwner");
+    address systemConfigFeeAdmin = makeAddr("systemConfigFeeAdmin");
     address batcher = makeAddr("batcher");
     address unsafeBlockSigner = makeAddr("unsafeBlockSigner");
     address proposer = makeAddr("proposer");
@@ -52,6 +53,7 @@ contract DeployOPChainInput_Test is Test {
     function test_set_succeeds() public {
         doi.set(doi.opChainProxyAdminOwner.selector, opChainProxyAdminOwner);
         doi.set(doi.systemConfigOwner.selector, systemConfigOwner);
+        doi.set(doi.systemConfigFeeAdmin.selector, systemConfigFeeAdmin);
         doi.set(doi.batcher.selector, batcher);
         doi.set(doi.unsafeBlockSigner.selector, unsafeBlockSigner);
         doi.set(doi.proposer.selector, proposer);
@@ -67,6 +69,7 @@ contract DeployOPChainInput_Test is Test {
         // Compare the default inputs to the getter methods.
         assertEq(opChainProxyAdminOwner, doi.opChainProxyAdminOwner(), "200");
         assertEq(systemConfigOwner, doi.systemConfigOwner(), "300");
+        assertEq(systemConfigFeeAdmin, doi.systemConfigFeeAdmin(), "310");
         assertEq(batcher, doi.batcher(), "400");
         assertEq(unsafeBlockSigner, doi.unsafeBlockSigner(), "500");
         assertEq(proposer, doi.proposer(), "600");
@@ -87,6 +90,9 @@ contract DeployOPChainInput_Test is Test {
         vm.expectRevert(expectedErr);
         doi.systemConfigOwner();
 
+        vm.expectRevert(expectedErr);
+        doi.systemConfigFeeAdmin();
+
         vm.expectRevert(expectedErr);
         doi.batcher();
 
@@ -330,6 +336,7 @@ contract DeployOPChain_TestBase is Test {
     // `opcm` is set during `setUp` since it is an output of the previous step.
     address opChainProxyAdminOwner = makeAddr("defaultOPChainProxyAdminOwner");
     address systemConfigOwner = makeAddr("defaultSystemConfigOwner");
+    address systemConfigFeeAdmin = makeAddr("defaultSystemConfigFeeAdmin");
     address batcher = makeAddr("defaultBatcher");
     address unsafeBlockSigner = makeAddr("defaultUnsafeBlockSigner");
     address proposer = makeAddr("defaultProposer");
@@ -430,13 +437,14 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
     function testFuzz_run_memory_succeed(bytes32 _seed) public {
         opChainProxyAdminOwner = address(uint160(uint256(hash(_seed, 0))));
         systemConfigOwner = address(uint160(uint256(hash(_seed, 1))));
-        batcher = address(uint160(uint256(hash(_seed, 2))));
-        unsafeBlockSigner = address(uint160(uint256(hash(_seed, 3))));
-        proposer = address(uint160(uint256(hash(_seed, 4))));
-        challenger = address(uint160(uint256(hash(_seed, 5))));
-        basefeeScalar = uint32(uint256(hash(_seed, 6)));
-        blobBaseFeeScalar = uint32(uint256(hash(_seed, 7)));
-        l2ChainId = uint256(hash(_seed, 8));
+        systemConfigFeeAdmin = address(uint160(uint256(hash(_seed, 2))));
+        batcher = address(uint160(uint256(hash(_seed, 3))));
+        unsafeBlockSigner = address(uint160(uint256(hash(_seed, 4))));
+        proposer = address(uint160(uint256(hash(_seed, 5))));
+        challenger = address(uint160(uint256(hash(_seed, 6))));
+        basefeeScalar = uint32(uint256(hash(_seed, 7)));
+        blobBaseFeeScalar = uint32(uint256(hash(_seed, 8)));
+        l2ChainId = uint256(hash(_seed, 9));
 
         // Set the initial anchor states. The typical usage we expect is to pass in one root per game type.
         uint256 cannonBlock = uint256(hash(_seed, 9));
@@ -459,6 +467,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
 
         doi.set(doi.opChainProxyAdminOwner.selector, opChainProxyAdminOwner);
         doi.set(doi.systemConfigOwner.selector, systemConfigOwner);
+        doi.set(doi.systemConfigFeeAdmin.selector, systemConfigFeeAdmin);
         doi.set(doi.batcher.selector, batcher);
         doi.set(doi.unsafeBlockSigner.selector, unsafeBlockSigner);
         doi.set(doi.proposer.selector, proposer);
@@ -483,6 +492,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         // Assert that individual input fields were properly set based on the inputs.
         assertEq(opChainProxyAdminOwner, doi.opChainProxyAdminOwner(), "100");
         assertEq(systemConfigOwner, doi.systemConfigOwner(), "200");
+        assertEq(systemConfigFeeAdmin, doi.systemConfigFeeAdmin(), "210");
         assertEq(batcher, doi.batcher(), "300");
         assertEq(unsafeBlockSigner, doi.unsafeBlockSigner(), "400");
         assertEq(proposer, doi.proposer(), "500");
@@ -502,6 +512,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         // Assert inputs were properly passed through to the contract initializers.
         assertEq(address(doo.opChainProxyAdmin().owner()), opChainProxyAdminOwner, "2100");
         assertEq(address(doo.systemConfigProxy().owner()), systemConfigOwner, "2200");
+        assertEq(address(doo.systemConfigProxy().feeAdmin()), systemConfigFeeAdmin, "2210");
         address batcherActual = address(uint160(uint256(doo.systemConfigProxy().batcherHash())));
         assertEq(batcherActual, batcher, "2300");
         assertEq(address(doo.systemConfigProxy().unsafeBlockSigner()), unsafeBlockSigner, "2400");
@@ -552,6 +563,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
     function setDOI() internal {
         doi.set(doi.opChainProxyAdminOwner.selector, opChainProxyAdminOwner);
         doi.set(doi.systemConfigOwner.selector, systemConfigOwner);
+        doi.set(doi.systemConfigFeeAdmin.selector, systemConfigFeeAdmin);
         doi.set(doi.batcher.selector, batcher);
         doi.set(doi.unsafeBlockSigner.selector, unsafeBlockSigner);
         doi.set(doi.proposer.selector, proposer);
diff --git a/packages/contracts-bedrock/test/setup/Setup.sol b/packages/contracts-bedrock/test/setup/Setup.sol
index ef2b654b2410..e324aec5f3b5 100644
--- a/packages/contracts-bedrock/test/setup/Setup.sol
+++ b/packages/contracts-bedrock/test/setup/Setup.sol
@@ -15,6 +15,9 @@ import { OutputMode, Fork, ForkUtils } from "scripts/libraries/Config.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
+import { Constants } from "src/libraries/Constants.sol";
+import { Encoding } from "src/libraries/Encoding.sol";
+import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
@@ -27,7 +30,7 @@ import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityC
 import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IOptimismMintableERC721Factory } from "src/universal/interfaces/IOptimismMintableERC721Factory.sol";
+import { IOptimismMintableERC721Factory } from "src/L2/interfaces/IOptimismMintableERC721Factory.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
@@ -35,7 +38,8 @@ import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMesseng
 import { IL2StandardBridgeInterop } from "src/L2/interfaces/IL2StandardBridgeInterop.sol";
 import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
 import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
+import { IL1OptimismMintableERC20Factory } from "src/L1/interfaces/IL1OptimismMintableERC20Factory.sol";
+import { IL2OptimismMintableERC20Factory } from "src/L2/interfaces/IL2OptimismMintableERC20Factory.sol";
 import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
 import { IOptimismSuperchainERC20Factory } from "src/L2/interfaces/IOptimismSuperchainERC20Factory.sol";
 import { IBaseFeeVault } from "src/L2/interfaces/IBaseFeeVault.sol";
@@ -83,7 +87,7 @@ contract Setup {
     IL1CrossDomainMessenger l1CrossDomainMessenger;
     IAddressManager addressManager;
     IL1ERC721Bridge l1ERC721Bridge;
-    IOptimismMintableERC20Factory l1OptimismMintableERC20Factory;
+    IL1OptimismMintableERC20Factory l1OptimismMintableERC20Factory;
     IProtocolVersions protocolVersions;
     ISuperchainConfig superchainConfig;
     IDataAvailabilityChallenge dataAvailabilityChallenge;
@@ -93,8 +97,8 @@ contract Setup {
         IL2CrossDomainMessenger(payable(Predeploys.L2_CROSS_DOMAIN_MESSENGER));
     IL2StandardBridgeInterop l2StandardBridge = IL2StandardBridgeInterop(payable(Predeploys.L2_STANDARD_BRIDGE));
     IL2ToL1MessagePasser l2ToL1MessagePasser = IL2ToL1MessagePasser(payable(Predeploys.L2_TO_L1_MESSAGE_PASSER));
-    IOptimismMintableERC20Factory l2OptimismMintableERC20Factory =
-        IOptimismMintableERC20Factory(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
+    IL2OptimismMintableERC20Factory l2OptimismMintableERC20Factory =
+        IL2OptimismMintableERC20Factory(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
     IL2ERC721Bridge l2ERC721Bridge = IL2ERC721Bridge(Predeploys.L2_ERC721_BRIDGE);
     IOptimismMintableERC721Factory l2OptimismMintableERC721Factory =
         IOptimismMintableERC721Factory(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
@@ -154,7 +158,7 @@ contract Setup {
         addressManager = IAddressManager(deploy.mustGetAddress("AddressManager"));
         l1ERC721Bridge = IL1ERC721Bridge(deploy.mustGetAddress("L1ERC721BridgeProxy"));
         l1OptimismMintableERC20Factory =
-            IOptimismMintableERC20Factory(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"));
+            IL1OptimismMintableERC20Factory(deploy.mustGetAddress("L1OptimismMintableERC20FactoryProxy"));
         protocolVersions = IProtocolVersions(deploy.mustGetAddress("ProtocolVersionsProxy"));
         superchainConfig = ISuperchainConfig(deploy.mustGetAddress("SuperchainConfigProxy"));
         anchorStateRegistry = IAnchorStateRegistry(deploy.mustGetAddress("AnchorStateRegistryProxy"));
@@ -174,8 +178,8 @@ contract Setup {
         vm.label(address(addressManager), "AddressManager");
         vm.label(address(l1ERC721Bridge), "L1ERC721Bridge");
         vm.label(deploy.mustGetAddress("L1ERC721BridgeProxy"), "L1ERC721BridgeProxy");
-        vm.label(address(l1OptimismMintableERC20Factory), "OptimismMintableERC20Factory");
-        vm.label(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"), "OptimismMintableERC20FactoryProxy");
+        vm.label(address(l1OptimismMintableERC20Factory), "L1OptimismMintableERC20Factory");
+        vm.label(deploy.mustGetAddress("L1OptimismMintableERC20FactoryProxy"), "L1OptimismMintableERC20FactoryProxy");
         vm.label(address(protocolVersions), "ProtocolVersions");
         vm.label(deploy.mustGetAddress("ProtocolVersionsProxy"), "ProtocolVersionsProxy");
         vm.label(address(superchainConfig), "SuperchainConfig");
@@ -200,15 +204,16 @@ contract Setup {
     /// @dev Sets up the L2 contracts. Depends on `L1()` being called first.
     function L2() public {
         console.log("Setup: creating L2 genesis with fork %s", l2Fork.toString());
-        l2Genesis.runWithOptions(
-            OutputMode.NONE,
-            l2Fork,
-            L1Dependencies({
+        l2Genesis.runWithOptions({
+            _mode: OutputMode.NONE,
+            _fork: l2Fork,
+            _populateNetworkConfig: false,
+            _l1Dependencies: L1Dependencies({
                 l1CrossDomainMessengerProxy: payable(address(l1CrossDomainMessenger)),
                 l1StandardBridgeProxy: payable(address(l1StandardBridge)),
                 l1ERC721BridgeProxy: payable(address(l1ERC721Bridge))
             })
-        );
+        });
 
         // Set the governance token's owner to be the final system owner
         address finalSystemOwner = deploy.cfg().finalSystemOwner();
@@ -216,8 +221,46 @@ contract Setup {
         governanceToken.transferOwnership(finalSystemOwner);
         vm.stopPrank();
 
+        // These calls by the depositor account simulate the SystemConfig setting the
+        // network specific configuration into L2. Ideally there is a library that automatically
+        // translates TransactionDeposited and ConfigUpdate events into the appropriate calls
+        vm.startPrank(Constants.DEPOSITOR_ACCOUNT);
+        l1Block.setConfig(Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS, abi.encode(l1ERC721Bridge));
+        l1Block.setConfig(Types.ConfigType.REMOTE_CHAIN_ID, abi.encode(deploy.cfg().l1ChainID()));
+        l1Block.setConfig(Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS, abi.encode(l1CrossDomainMessenger));
+        l1Block.setConfig(Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS, abi.encode(l1StandardBridge));
+
+        bytes32 sequencerFeeVaultConfig = Encoding.encodeFeeVaultConfig({
+            _recipient: deploy.cfg().sequencerFeeVaultRecipient(),
+            _amount: deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
+            _network: Types.WithdrawalNetwork(deploy.cfg().sequencerFeeVaultWithdrawalNetwork())
+        });
+        l1Block.setConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG, abi.encode(sequencerFeeVaultConfig));
+
+        bytes32 baseFeeVaultConfig = Encoding.encodeFeeVaultConfig({
+            _recipient: deploy.cfg().baseFeeVaultRecipient(),
+            _amount: deploy.cfg().baseFeeVaultMinimumWithdrawalAmount(),
+            _network: Types.WithdrawalNetwork(deploy.cfg().baseFeeVaultWithdrawalNetwork())
+        });
+        l1Block.setConfig(Types.ConfigType.BASE_FEE_VAULT_CONFIG, abi.encode(baseFeeVaultConfig));
+
+        bytes32 l1FeeVaultConfig = Encoding.encodeFeeVaultConfig({
+            _recipient: deploy.cfg().l1FeeVaultRecipient(),
+            _amount: deploy.cfg().l1FeeVaultMinimumWithdrawalAmount(),
+            _network: Types.WithdrawalNetwork(deploy.cfg().l1FeeVaultWithdrawalNetwork())
+        });
+        l1Block.setConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG, abi.encode(l1FeeVaultConfig));
+        vm.stopPrank();
+
+        // Reset the ResourceConfig gas used to 0
+        bytes32 slot = vm.load(address(optimismPortal), bytes32(uint256(1)));
+        slot = bytes32(uint256(slot) & ~(uint256(type(uint64).max) << 128));
+        vm.store(address(optimismPortal), bytes32(uint256(1)), slot);
+        vm.store(address(optimismPortal2), bytes32(uint256(1)), slot);
+
         // L2 predeploys
         labelPredeploy(Predeploys.L2_STANDARD_BRIDGE);
+        labelPredeploy(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
         labelPredeploy(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
         labelPredeploy(Predeploys.L2_TO_L1_MESSAGE_PASSER);
         labelPredeploy(Predeploys.SEQUENCER_FEE_WALLET);
@@ -232,6 +275,7 @@ contract Setup {
         labelPredeploy(Predeploys.EAS);
         labelPredeploy(Predeploys.SCHEMA_REGISTRY);
         labelPredeploy(Predeploys.WETH);
+        labelPredeploy(Predeploys.L2_ERC721_BRIDGE);
         labelPredeploy(Predeploys.SUPERCHAIN_WETH);
         labelPredeploy(Predeploys.ETH_LIQUIDITY);
         labelPredeploy(Predeploys.OPTIMISM_SUPERCHAIN_ERC20_FACTORY);
@@ -259,7 +303,11 @@ contract Setup {
     }
 
     function labelPredeploy(address _addr) internal {
-        vm.label(_addr, Predeploys.getName(_addr));
+        string memory name = Predeploys.getName(_addr);
+        vm.label(_addr, name);
+        if (!Predeploys.notProxied(_addr)) {
+            vm.label(Predeploys.predeployToCodeNamespace(_addr), string.concat(name, "Implementation"));
+        }
     }
 
     function labelPreinstall(address _addr) internal {
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
index d146b050f387..6b382eab117f 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
@@ -12,19 +12,11 @@ import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC2
 
 // Interfaces
 import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
 
 contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
     event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
 
-    /// @notice Tests that the constructor is initialized correctly.
-    function test_constructor_succeeds() external {
-        IOptimismMintableERC20Factory impl = IOptimismMintableERC20Factory(address(new OptimismMintableERC20Factory()));
-        assertEq(address(impl.BRIDGE()), address(0));
-        assertEq(address(impl.bridge()), address(0));
-    }
-
     /// @notice Tests that the proxy is initialized correctly.
     function test_initialize_succeeds() external view {
         assertEq(address(l1OptimismMintableERC20Factory.BRIDGE()), address(l1StandardBridge));
@@ -33,7 +25,7 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
 
     /// @notice Tests that the upgrade is successful.
     function test_upgrading_succeeds() external {
-        IProxy proxy = IProxy(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"));
+        IProxy proxy = IProxy(deploy.mustGetAddress("L1OptimismMintableERC20FactoryProxy"));
         // Check an unused slot before upgrading.
         bytes32 slot21Before = vm.load(address(l1OptimismMintableERC20Factory), bytes32(uint256(21)));
         assertEq(bytes32(0), slot21Before);
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
index daea00064cf4..989699987219 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
@@ -23,7 +23,7 @@ contract OptimismMintableERC721_Test is Bridge_Initializer {
 
         // Set up the token pair.
         L1NFT = new ERC721("L1NFT", "L1T");
-        L2NFT = new OptimismMintableERC721(address(l2ERC721Bridge), 1, address(L1NFT), "L2NFT", "L2T");
+        L2NFT = new OptimismMintableERC721(l2ERC721Bridge, 1, address(L1NFT), "L2NFT", "L2T");
 
         // Label the addresses for nice traces.
         vm.label(address(L1NFT), "L1ERC721Token");
@@ -34,10 +34,10 @@ contract OptimismMintableERC721_Test is Bridge_Initializer {
         assertEq(L2NFT.name(), "L2NFT");
         assertEq(L2NFT.symbol(), "L2T");
         assertEq(L2NFT.remoteToken(), address(L1NFT));
-        assertEq(L2NFT.bridge(), address(l2ERC721Bridge));
+        assertEq(address(L2NFT.bridge()), address(l2ERC721Bridge));
         assertEq(L2NFT.remoteChainId(), 1);
         assertEq(L2NFT.REMOTE_TOKEN(), address(L1NFT));
-        assertEq(L2NFT.BRIDGE(), address(l2ERC721Bridge));
+        assertEq(address(L2NFT.BRIDGE()), address(l2ERC721Bridge));
         assertEq(L2NFT.REMOTE_CHAIN_ID(), 1);
     }
 
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index 9c22e178a5f4..ea53608a7a8e 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -14,7 +14,6 @@ import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 // Interfaces
 import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
@@ -42,7 +41,8 @@ contract Specification_Test is CommonTest {
         DELAYEDWETHOWNER,
         COUNCILSAFE,
         COUNCILSAFEOWNER,
-        DEPENDENCYMANAGER
+        DEPENDENCYMANAGER,
+        FEEADMIN
     }
 
     /// @notice Represents the specification of a function.
@@ -276,7 +276,7 @@ contract Specification_Test is CommonTest {
             _name: "OptimismPortal",
             _sel: _getSel("depositERC20Transaction(address,uint256,uint256,uint64,bool,bytes)")
         });
-        _addSpec({ _name: "OptimismPortal", _sel: _getSel("setGasPayingToken(address,uint8,bytes32,bytes32)") });
+        _addSpec({ _name: "OptimismPortal", _sel: _getSel("setConfig(uint8,bytes)") });
 
         // OptimismPortalInterop
         _addSpec({
@@ -335,12 +335,8 @@ contract Specification_Test is CommonTest {
             _name: "OptimismPortalInterop",
             _sel: _getSel("depositERC20Transaction(address,uint256,uint256,uint64,bool,bytes)")
         });
-        _addSpec({ _name: "OptimismPortalInterop", _sel: _getSel("setGasPayingToken(address,uint8,bytes32,bytes32)") });
-        _addSpec({
-            _name: "OptimismPortalInterop",
-            _sel: IOptimismPortalInterop.setConfig.selector,
-            _auth: Role.SYSTEMCONFIGOWNER
-        });
+        _addSpec({ _name: "OptimismPortalInterop", _sel: _getSel("upgrade(uint32,bytes)"), _auth: Role.FEEADMIN });
+        _addSpec({ _name: "OptimismPortalInterop", _sel: _getSel("setConfig(uint8,bytes)") });
 
         // OptimismPortal2
         _addSpec({ _name: "OptimismPortal2", _sel: _getSel("depositTransaction(address,uint256,uint64,bool,bytes)") });
@@ -387,7 +383,27 @@ contract Specification_Test is CommonTest {
             _name: "OptimismPortal2",
             _sel: _getSel("depositERC20Transaction(address,uint256,uint256,uint64,bool,bytes)")
         });
-        _addSpec({ _name: "OptimismPortal2", _sel: _getSel("setGasPayingToken(address,uint8,bytes32,bytes32)") });
+        _addSpec({ _name: "OptimismPortal2", _sel: _getSel("upgrade(uint32,bytes)"), _auth: Role.FEEADMIN });
+        _addSpec({ _name: "OptimismPortal2", _sel: _getSel("setConfig(uint8,bytes)") });
+
+        // L1OptimismMintableERC20Factory
+        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("BRIDGE()") });
+        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("bridge()") });
+        _addSpec({
+            _name: "L1OptimismMintableERC20Factory",
+            _sel: _getSel("createOptimismMintableERC20(address,string,string)")
+        });
+        _addSpec({
+            _name: "L1OptimismMintableERC20Factory",
+            _sel: _getSel("createOptimismMintableERC20WithDecimals(address,string,string,uint8)")
+        });
+        _addSpec({
+            _name: "L1OptimismMintableERC20Factory",
+            _sel: _getSel("createStandardL2Token(address,string,string)")
+        });
+        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("deployments(address)") });
+        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("version()") });
+        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("initialize(address)") });
 
         // ProtocolVersions
         _addSpec({ _name: "ProtocolVersions", _sel: _getSel("RECOMMENDED_SLOT()") });
@@ -418,11 +434,13 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("GUARDIAN_SLOT()") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("PAUSED_SLOT()") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("guardian()") });
-        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("initialize(address,bool)") });
+        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("initialize(address,address,bool)") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("pause(string)"), _auth: Role.GUARDIAN });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("paused()") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("unpause()"), _auth: Role.GUARDIAN });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("version()") });
+        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("UPGRADER_SLOT()") });
+        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("upgrader()") });
 
         // SystemConfig
         _addSpec({ _name: "SystemConfig", _sel: _getSel("UNSAFE_BLOCK_SIGNER_SLOT()") });
@@ -436,6 +454,7 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SystemConfig", _sel: ISystemConfig.minimumGasLimit.selector });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("overhead()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("owner()") });
+        _addSpec({ _name: "SystemConfig", _sel: _getSel("feeAdmin()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("renounceOwnership()"), _auth: Role.SYSTEMCONFIGOWNER });
         _addSpec({ _name: "SystemConfig", _sel: ISystemConfig.resourceConfig.selector });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("scalar()") });
@@ -478,6 +497,7 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SystemConfig", _sel: _getSel("basefeeScalar()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("blobbasefeeScalar()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("maximumGasLimit()") });
+        _addSpec({ _name: "SystemConfig", _sel: _getSel("setFeeVaultConfig(uint8,address,uint256,uint8)") });
 
         // SystemConfigInterop
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("UNSAFE_BLOCK_SIGNER_SLOT()") });
@@ -489,8 +509,15 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("eip1559Elasticity()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.initialize.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.minimumGasLimit.selector });
+        _addSpec({
+            _name: "SystemConfigInterop",
+            _sel: _getSel(
+                "initialize((address,address,address,bytes32),uint32,uint32,uint64,(uint32,uint8,uint8,uint32,uint32,uint128),address,(address,address,address,address,address,address,address),address)"
+            )
+        });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("overhead()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("owner()") });
+        _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("feeAdmin()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("renounceOwnership()"), _auth: Role.SYSTEMCONFIGOWNER });
         _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.resourceConfig.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("scalar()") });
@@ -560,12 +587,7 @@ contract Specification_Test is CommonTest {
             _auth: Role.DEPENDENCYMANAGER
         });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("dependencyManager()") });
-        _addSpec({
-            _name: "SystemConfigInterop",
-            _sel: _getSel(
-                "initialize(address,uint32,uint32,bytes32,uint64,address,(uint32,uint8,uint8,uint32,uint32,uint128),address,(address,address,address,address,address,address,address),address)"
-            )
-        });
+        _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("setFeeVaultConfig(uint8,address,uint256,uint8)") });
 
         // ProxyAdmin
         _addSpec({ _name: "ProxyAdmin", _sel: _getSel("addressManager()") });
diff --git a/packages/contracts-bedrock/test/universal/StandardBridge.t.sol b/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
index be7f8a51107c..22146147f129 100644
--- a/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
@@ -2,10 +2,12 @@
 pragma solidity 0.8.15;
 
 import { StandardBridge } from "src/universal/StandardBridge.sol";
+import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { OptimismMintableERC20, ILegacyMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { Constants } from "src/libraries/Constants.sol";
+import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 
 /// @title StandardBridgeTester
 /// @notice Simple wrapper around the StandardBridge contract that exposes
@@ -21,6 +23,14 @@ contract StandardBridgeTester is StandardBridge {
         return _isCorrectTokenPair(_mintableToken, _otherToken);
     }
 
+    function otherBridge() public pure override returns (IStandardBridge) {
+        return IStandardBridge(payable(address(0)));
+    }
+
+    function messenger() public pure override returns (ICrossDomainMessenger) {
+        return ICrossDomainMessenger(address(0));
+    }
+
     function gasPayingToken() internal pure override returns (address, uint8) {
         return (Constants.ETHER, 18);
     }
diff --git a/packages/contracts-bedrock/test/vendor/Initializable.t.sol b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
index 5c17987c471d..331b141bd124 100644
--- a/packages/contracts-bedrock/test/vendor/Initializable.t.sol
+++ b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
@@ -28,6 +28,10 @@ import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistr
 ///      deepest contract in the inheritance chain for setting up the system contracts.
 ///      For each L1 contract both the implementation and the proxy are tested.
 contract Initializer_Test is Bridge_Initializer {
+    /// @notice Error used by openzeppelin v5 initializable.
+    ///         The contract is already initialized.
+    error InvalidInitialization();
+
     /// @notice Contains the address of an `Initializable` contract and the calldata
     ///         used to initialize it.
     struct InitializeableContract {
@@ -57,7 +61,7 @@ contract Initializer_Test is Bridge_Initializer {
             InitializeableContract({
                 name: "SuperchainConfig",
                 target: deploy.mustGetAddress("SuperchainConfig"),
-                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), false))
+                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), address(0), false))
             })
         );
         // SuperchainConfigProxy
@@ -65,7 +69,7 @@ contract Initializer_Test is Bridge_Initializer {
             InitializeableContract({
                 name: "SuperchainConfigProxy",
                 target: address(superchainConfig),
-                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), false))
+                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), address(0), false))
             })
         );
         // L1CrossDomainMessengerImpl
@@ -176,12 +180,15 @@ contract Initializer_Test is Bridge_Initializer {
                 initCalldata: abi.encodeCall(
                     systemConfig.initialize,
                     (
-                        address(0xdead),
+                        ISystemConfig.Roles({
+                            owner: address(0xdead),
+                            feeAdmin: address(0xdead),
+                            unsafeBlockSigner: address(0),
+                            batcherHash: bytes32(0)
+                        }),
                         0,
                         0,
-                        bytes32(0),
                         1,
-                        address(0),
                         IResourceMetering.ResourceConfig({
                             maxResourceLimit: 1,
                             elasticityMultiplier: 1,
@@ -212,12 +219,15 @@ contract Initializer_Test is Bridge_Initializer {
                 initCalldata: abi.encodeCall(
                     systemConfig.initialize,
                     (
-                        address(0xdead),
+                        ISystemConfig.Roles({
+                            owner: address(0xdead),
+                            feeAdmin: address(0xdead),
+                            unsafeBlockSigner: address(0),
+                            batcherHash: bytes32(0)
+                        }),
                         0,
                         0,
-                        bytes32(0),
                         1,
-                        address(0),
                         IResourceMetering.ResourceConfig({
                             maxResourceLimit: 1,
                             elasticityMultiplier: 1,
@@ -260,14 +270,6 @@ contract Initializer_Test is Bridge_Initializer {
                 )
             })
         );
-        // L2CrossDomainMessenger
-        contracts.push(
-            InitializeableContract({
-                name: "L2CrossDomainMessenger",
-                target: address(l2CrossDomainMessenger),
-                initCalldata: abi.encodeCall(l2CrossDomainMessenger.initialize, (l1CrossDomainMessenger))
-            })
-        );
         // L1StandardBridgeImpl
         contracts.push(
             InitializeableContract({
@@ -288,22 +290,6 @@ contract Initializer_Test is Bridge_Initializer {
                 )
             })
         );
-        // L2StandardBridge
-        contracts.push(
-            InitializeableContract({
-                name: "L2StandardBridge",
-                target: address(l2StandardBridge),
-                initCalldata: abi.encodeCall(l2StandardBridge.initialize, (l1StandardBridge))
-            })
-        );
-        // L2StandardBridgeInterop
-        contracts.push(
-            InitializeableContract({
-                name: "L2StandardBridgeInterop",
-                target: address(l2StandardBridge),
-                initCalldata: abi.encodeCall(l2StandardBridge.initialize, (l1StandardBridge))
-            })
-        );
         // L1ERC721BridgeImpl
         contracts.push(
             InitializeableContract({
@@ -320,26 +306,18 @@ contract Initializer_Test is Bridge_Initializer {
                 initCalldata: abi.encodeCall(l1ERC721Bridge.initialize, (l1CrossDomainMessenger, superchainConfig))
             })
         );
-        // L2ERC721Bridge
-        contracts.push(
-            InitializeableContract({
-                name: "L2ERC721Bridge",
-                target: address(l2ERC721Bridge),
-                initCalldata: abi.encodeCall(l2ERC721Bridge.initialize, (payable(address(l1ERC721Bridge))))
-            })
-        );
-        // OptimismMintableERC20FactoryImpl
+        // L1OptimismMintableERC20FactoryImpl
         contracts.push(
             InitializeableContract({
-                name: "OptimismMintableERC20Factory",
+                name: "L1OptimismMintableERC20Factory",
                 target: deploy.mustGetAddress("OptimismMintableERC20Factory"),
                 initCalldata: abi.encodeCall(l1OptimismMintableERC20Factory.initialize, (address(l1StandardBridge)))
             })
         );
-        // OptimismMintableERC20FactoryProxy
+        // L1OptimismMintableERC20FactoryProxy
         contracts.push(
             InitializeableContract({
-                name: "OptimismMintableERC20FactoryProxy",
+                name: "L1OptimismMintableERC20FactoryProxy",
                 target: address(l1OptimismMintableERC20Factory),
                 initCalldata: abi.encodeCall(l1OptimismMintableERC20Factory.initialize, (address(l1StandardBridge)))
             })
@@ -487,7 +465,7 @@ contract Initializer_Test is Bridge_Initializer {
             // Then, attempt to re-initialize the contract. This should fail.
             (bool success, bytes memory returnData) = _contract.target.call(_contract.initCalldata);
             assertFalse(success);
-            assertEq(_extractErrorString(returnData), "Initializable: contract is already initialized");
+            assertErrorString(returnData);
         }
     }
 
@@ -509,10 +487,12 @@ contract Initializer_Test is Bridge_Initializer {
         real_ = bytes(nicknames[_name]).length > 0 ? nicknames[_name] : _name;
     }
 
-    /// @dev Extracts the revert string from returndata encoded in the form of `Error(string)`.
-    function _extractErrorString(bytes memory _returnData) internal pure returns (string memory error_) {
-        // The first 4 bytes of the return data should be the selector for `Error(string)`. If not, revert.
-        if (bytes4(_returnData) == 0x08c379a0) {
+    /// @dev Asserts the expected revert from the returndata
+    function assertErrorString(bytes memory _returnData) internal pure returns (string memory error_) {
+        if (bytes4(_returnData) == InvalidInitialization.selector) {
+            // do nothing as this is the correct 4byte returndata
+        } else if (bytes4(_returnData) == 0x08c379a0) {
+            // The first 4 bytes of the return data should be the selector for `Error(string)`. If not, revert.
             // Extract the error string from the returndata. The error string is located 68 bytes after
             // the pointer to `returnData`.
             //
@@ -523,6 +503,7 @@ contract Initializer_Test is Bridge_Initializer {
             assembly {
                 error_ := add(_returnData, 0x44)
             }
+            assertEq(error_, "Initializable: contract is already initialized");
         } else {
             revert("Initializer_Test: Invalid returndata format. Expected `Error(string)`");
         }

From 5c54f884a4ad0b0a180044858dc595518464e684 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Thu, 7 Nov 2024 11:53:07 -0600
Subject: [PATCH 148/451] interop: Fix AtLeastAsSafe ; Geth Mempool Filter E2E
 Test (#12823)

* interop: Geth Mempool Filter E2E Test

* use latest op-geth rc

* fix AtLeastAsSafe

* fix test
---
 go.mod                                  |  2 +-
 go.sum                                  |  4 +-
 op-e2e/interop/interop_test.go          | 53 +++++++++++++++++++------
 op-e2e/interop/supersystem.go           | 22 ++++++++--
 op-supervisor/supervisor/types/types.go | 28 ++++++++-----
 5 files changed, 80 insertions(+), 29 deletions(-)

diff --git a/go.mod b/go.mod
index 0cf83e382d24..d077cf6a8bb0 100644
--- a/go.mod
+++ b/go.mod
@@ -250,7 +250,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101411.1-rc.5
+replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101411.1-rc.6
 
 //replace github.com/ethereum/go-ethereum => ../go-ethereum
 
diff --git a/go.sum b/go.sum
index 3819b1e73fae..d9f532807675 100644
--- a/go.sum
+++ b/go.sum
@@ -187,8 +187,8 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.1-rc.5 h1:LDSP85xTczjDYMBK0mOF5mzpZifLGz1TTW/6NgQsytc=
-github.com/ethereum-optimism/op-geth v1.101411.1-rc.5/go.mod h1:7S4pp8KHBmEmKkRjL1BPOc6jY9hW+64YeMUjR3RVLw4=
+github.com/ethereum-optimism/op-geth v1.101411.1-rc.6 h1:VvUBIVFbnU9486CWHa9Js5XYY3o6OsdQcI8gE3XjCDE=
+github.com/ethereum-optimism/op-geth v1.101411.1-rc.6/go.mod h1:7S4pp8KHBmEmKkRjL1BPOc6jY9hW+64YeMUjR3RVLw4=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac h1:hCIrLuOPV3FJfMDvXeOhCC3uQNvFoMIIlkT2mN2cfeg=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac/go.mod h1:XaVXL9jg8BcyOeugECgIUGa9Y3DjYJj71RHmb5qon6M=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
diff --git a/op-e2e/interop/interop_test.go b/op-e2e/interop/interop_test.go
index 65efa9b84209..302413dd98ed 100644
--- a/op-e2e/interop/interop_test.go
+++ b/op-e2e/interop/interop_test.go
@@ -20,12 +20,13 @@ import (
 	"github.com/ethereum-optimism/optimism/op-chain-ops/interopgen"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/helpers"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	gethCore "github.com/ethereum/go-ethereum/core"
 	gethTypes "github.com/ethereum/go-ethereum/core/types"
 )
 
 // setupAndRun is a helper function that sets up a SuperSystem
 // which contains two L2 Chains, and two users on each chain.
-func setupAndRun(t *testing.T, fn func(*testing.T, SuperSystem)) {
+func setupAndRun(t *testing.T, config SuperSystemConfig, fn func(*testing.T, SuperSystem)) {
 	recipe := interopgen.InteropDevRecipe{
 		L1ChainID:        900100,
 		L2ChainIDs:       []uint64{900200, 900201},
@@ -38,7 +39,7 @@ func setupAndRun(t *testing.T, fn func(*testing.T, SuperSystem)) {
 
 	// create a super system from the recipe
 	// and get the L2 IDs for use in the test
-	s2 := NewSuperSystem(t, &recipe, worldResources)
+	s2 := NewSuperSystem(t, &recipe, worldResources, config)
 
 	// create two users on all L2 chains
 	s2.AddUser("Alice")
@@ -98,13 +99,16 @@ func TestInterop_IsolatedChains(t *testing.T) {
 		expectedBalance, _ = big.NewInt(0).SetString("10000000000000000000000000", 10)
 		require.Equal(t, expectedBalance, bobBalance)
 	}
-	setupAndRun(t, test)
+	config := SuperSystemConfig{
+		mempoolFiltering: false,
+	}
+	setupAndRun(t, config, test)
 }
 
-// TestInteropTrivial_EmitLogs tests a simple interop scenario
+// TestInterop_EmitLogs tests a simple interop scenario
 // Chains A and B exist, but no messages are sent between them.
 // A contract is deployed on each chain, and logs are emitted repeatedly.
-func TestInteropTrivial_EmitLogs(t *testing.T) {
+func TestInterop_EmitLogs(t *testing.T) {
 	test := func(t *testing.T, s2 SuperSystem) {
 		ids := s2.L2IDs()
 		chainA := ids[0]
@@ -195,7 +199,10 @@ func TestInteropTrivial_EmitLogs(t *testing.T) {
 			requireMessage(chainB, log, types.CrossSafe, nil)
 		}
 	}
-	setupAndRun(t, test)
+	config := SuperSystemConfig{
+		mempoolFiltering: false,
+	}
+	setupAndRun(t, config, test)
 }
 
 func TestInteropBlockBuilding(t *testing.T) {
@@ -271,11 +278,17 @@ func TestInteropBlockBuilding(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
 			defer cancel()
 			// Send an executing message, but with different payload.
-			// We expect the miner to be unable to include this tx, and confirmation to thus time out.
-			_, err := s2.ExecuteMessage(ctx, chainB, "Alice", identifier, bobAddr, invalidPayload)
-			require.NotNil(t, err)
-			require.ErrorIs(t, err, ctx.Err())
-			require.ErrorIs(t, ctx.Err(), context.DeadlineExceeded)
+			if s2.(*interopE2ESystem).config.mempoolFiltering {
+				// We expect the traqnsaction to be filtered out by the mempool if mempool filtering is enabled.
+				// ExecuteMessage the ErrTxFilteredOut error is checked when sending the tx.
+				_, err := s2.ExecuteMessage(ctx, chainB, "Alice", identifier, bobAddr, invalidPayload, gethCore.ErrTxFilteredOut)
+				require.ErrorContains(t, err, gethCore.ErrTxFilteredOut.Error())
+			} else {
+				// We expect the miner to be unable to include this tx, and confirmation to thus time out, if mempool filtering is disabled.
+				_, err := s2.ExecuteMessage(ctx, chainB, "Alice", identifier, bobAddr, invalidPayload, nil)
+				require.ErrorIs(t, err, ctx.Err())
+				require.ErrorIs(t, ctx.Err(), context.DeadlineExceeded)
+			}
 		}
 
 		t.Log("Testing valid message now")
@@ -284,11 +297,25 @@ func TestInteropBlockBuilding(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
 			defer cancel()
 			// Send an executing message with the correct identifier / payload
-			rec, err := s2.ExecuteMessage(ctx, chainB, "Alice", identifier, bobAddr, msgPayload)
+			rec, err := s2.ExecuteMessage(ctx, chainB, "Alice", identifier, bobAddr, msgPayload, nil)
 			require.NoError(t, err, "expecting tx to be confirmed")
 			t.Logf("confirmed executing msg in block %s", rec.BlockNumber)
 		}
 		t.Log("Done")
 	}
-	setupAndRun(t, test)
+
+	t.Run("without mempool filtering", func(t *testing.T) {
+		config := SuperSystemConfig{
+			mempoolFiltering: false,
+		}
+		setupAndRun(t, config, test)
+	})
+
+	t.Run("with mempool filtering", func(t *testing.T) {
+		config := SuperSystemConfig{
+			mempoolFiltering: true,
+		}
+		// run again with mempool filtering to observe the behavior of the mempool filter
+		setupAndRun(t, config, test)
+	})
 }
diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index f18c7475073e..de7e25bb9c7b 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -114,14 +114,18 @@ type SuperSystem interface {
 		msgIdentifier supervisortypes.Identifier,
 		target common.Address,
 		message []byte,
+		expectedError error,
 	) (*types.Receipt, error)
 	// Access a contract on a network by name
 	Contract(network string, contractName string) interface{}
 }
+type SuperSystemConfig struct {
+	mempoolFiltering bool
+}
 
 // NewSuperSystem creates a new SuperSystem from a recipe. It creates an interopE2ESystem.
-func NewSuperSystem(t *testing.T, recipe *interopgen.InteropDevRecipe, w worldResourcePaths) SuperSystem {
-	s2 := &interopE2ESystem{recipe: recipe}
+func NewSuperSystem(t *testing.T, recipe *interopgen.InteropDevRecipe, w worldResourcePaths, config SuperSystemConfig) SuperSystem {
+	s2 := &interopE2ESystem{recipe: recipe, config: &config}
 	s2.prepare(t, w)
 	return s2
 }
@@ -144,6 +148,7 @@ type interopE2ESystem struct {
 	l2GethClients   map[string]*ethclient.Client
 	supervisor      *supervisor.SupervisorService
 	superClient     *sources.SupervisorClient
+	config          *SuperSystemConfig
 }
 
 // l2Set is a set of resources for an L2 chain
@@ -263,6 +268,7 @@ func (s *interopE2ESystem) newGethForL2(id string, l2Out *interopgen.L2Output) *
 	l2Geth, err := geth.InitL2(name, l2Out.Genesis, jwtPath,
 		func(ethCfg *ethconfig.Config, nodeCfg *gn.Config) error {
 			ethCfg.InteropMessageRPC = s.supervisor.RPC()
+			ethCfg.InteropMempoolFiltering = s.config.mempoolFiltering
 			return nil
 		})
 	require.NoError(s.t, err)
@@ -721,6 +727,10 @@ func (s *interopE2ESystem) SendL2Tx(
 		newApply)
 }
 
+// ExecuteMessage calls the CrossL2Inbox executeMessage function
+// it uses the L2's chain ID, username key, and geth client.
+// expectedError represents the error returned by `ExecuteMessage` if it is expected.
+// the returned err is related to `WaitMined`
 func (s *interopE2ESystem) ExecuteMessage(
 	ctx context.Context,
 	id string,
@@ -728,6 +738,7 @@ func (s *interopE2ESystem) ExecuteMessage(
 	msgIdentifier supervisortypes.Identifier,
 	target common.Address,
 	message []byte,
+	expectedError error,
 ) (*types.Receipt, error) {
 	secret := s.UserKey(id, sender)
 	auth, err := bind.NewKeyedTransactorWithChainID(&secret, s.l2s[id].chainID)
@@ -746,7 +757,12 @@ func (s *interopE2ESystem) ExecuteMessage(
 		ChainId:     msgIdentifier.ChainID.ToBig(),
 	}
 	tx, err := contract.InboxTransactor.ExecuteMessage(auth, identifier, target, message)
-	require.NoError(s.t, err)
+	if expectedError != nil {
+		require.ErrorContains(s.t, err, expectedError.Error())
+		return nil, err
+	} else {
+		require.NoError(s.t, err)
+	}
 	s.logger.Info("Executing message", "tx", tx.Hash(), "to", tx.To(), "target", target, "data", hexutil.Bytes(tx.Data()))
 	return bind.WaitMined(ctx, s.L2GethClient(id), tx)
 }
diff --git a/op-supervisor/supervisor/types/types.go b/op-supervisor/supervisor/types/types.go
index 381d1fc3cbda..8f2b32bb227a 100644
--- a/op-supervisor/supervisor/types/types.go
+++ b/op-supervisor/supervisor/types/types.go
@@ -131,19 +131,27 @@ func (lvl *SafetyLevel) UnmarshalText(text []byte) error {
 }
 
 // AtLeastAsSafe returns true if the receiver is at least as safe as the other SafetyLevel.
+// Safety levels are assumed to graduate from LocalUnsafe to LocalSafe to CrossUnsafe to CrossSafe, with Finalized as the strongest.
 func (lvl *SafetyLevel) AtLeastAsSafe(min SafetyLevel) bool {
-	switch min {
-	case Invalid:
-		return true
-	case CrossUnsafe:
-		return *lvl != Invalid
-	case CrossSafe:
-		return *lvl == CrossSafe || *lvl == Finalized
-	case Finalized:
-		return *lvl == Finalized
-	default:
+	relativeSafety := map[SafetyLevel]int{
+		Invalid:     0,
+		LocalUnsafe: 1,
+		LocalSafe:   2,
+		CrossUnsafe: 3,
+		CrossSafe:   4,
+		Finalized:   5,
+	}
+	// if either level is not recognized, return false
+	_, ok := relativeSafety[*lvl]
+	if !ok {
+		return false
+	}
+	_, ok = relativeSafety[min]
+	if !ok {
 		return false
 	}
+	// compare the relative safety levels to determine if the receiver is at least as safe as the other
+	return relativeSafety[*lvl] >= relativeSafety[min]
 }
 
 const (

From 63b4af701c94b0c923a51a02ae8f31b43f22b557 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 8 Nov 2024 01:48:35 +0700
Subject: [PATCH 149/451] op-supervisor: do not return zeroed included-in block
 (#12842)

* op-supervisor: do not return zeroed included-in block

* op-supervisor: fix tests, implement review suggestion
---
 .../supervisor/backend/cross/worker.go        |  2 +-
 .../supervisor/backend/db/logs/db.go          |  9 ++++----
 .../supervisor/backend/db/logs/db_test.go     | 22 ++++++++++++++-----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/op-supervisor/supervisor/backend/cross/worker.go b/op-supervisor/supervisor/backend/cross/worker.go
index a555a5f11b13..689b89829e4b 100644
--- a/op-supervisor/supervisor/backend/cross/worker.go
+++ b/op-supervisor/supervisor/backend/cross/worker.go
@@ -71,7 +71,7 @@ func (s *Worker) worker() {
 				return
 			}
 			if errors.Is(err, types.ErrFuture) {
-				s.log.Debug("Worker awaits more data", "err", err)
+				s.log.Debug("Worker awaits additional blocks", "err", err)
 			} else {
 				s.log.Warn("Failed to process work", "err", err)
 			}
diff --git a/op-supervisor/supervisor/backend/db/logs/db.go b/op-supervisor/supervisor/backend/db/logs/db.go
index 5509c5e61df8..64e61c6bebf7 100644
--- a/op-supervisor/supervisor/backend/db/logs/db.go
+++ b/op-supervisor/supervisor/backend/db/logs/db.go
@@ -280,6 +280,11 @@ func (db *DB) Contains(blockNum uint64, logIdx uint32, logHash common.Hash) (typ
 	defer db.rwLock.RUnlock()
 	db.log.Trace("Checking for log", "blockNum", blockNum, "logIdx", logIdx, "hash", logHash)
 
+	// Hot-path: check if we have the block
+	if db.lastEntryContext.hasCompleteBlock() && db.lastEntryContext.blockNum < blockNum {
+		return types.BlockSeal{}, types.ErrFuture
+	}
+
 	evtHash, iter, err := db.findLogInfo(blockNum, logIdx)
 	if err != nil {
 		return types.BlockSeal{}, err // may be ErrConflict if the block does not have as many logs
@@ -306,10 +311,6 @@ func (db *DB) Contains(blockNum uint64, logIdx uint32, logHash common.Hash) (typ
 	if err == nil {
 		panic("expected iterator to stop with error")
 	}
-	if errors.Is(err, types.ErrFuture) {
-		// Log is known, but as part of an unsealed block.
-		return types.BlockSeal{}, nil
-	}
 	if errors.Is(err, types.ErrStop) {
 		h, n, _ := iter.SealedBlock()
 		timestamp, _ := iter.SealedTimestamp()
diff --git a/op-supervisor/supervisor/backend/db/logs/db_test.go b/op-supervisor/supervisor/backend/db/logs/db_test.go
index 9e7e9c51a68f..5e7c22c89939 100644
--- a/op-supervisor/supervisor/backend/db/logs/db_test.go
+++ b/op-supervisor/supervisor/backend/db/logs/db_test.go
@@ -582,6 +582,8 @@ func TestAddDependentLog(t *testing.T) {
 				require.NoError(t, db.lastEntryContext.forceBlock(bl15, 5000))
 				err := db.AddLog(createHash(1), bl15, 0, &execMsg)
 				require.NoError(t, err)
+				bl16 := eth.BlockID{Hash: createHash(16), Number: 16}
+				require.NoError(t, db.SealBlock(bl15.Hash, bl16, 5002))
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				requireContains(t, db, 16, 0, createHash(1), execMsg)
@@ -602,6 +604,8 @@ func TestAddDependentLog(t *testing.T) {
 				require.Equal(t, m.entryCount, int64(searchCheckpointFrequency+2))
 				err := db.AddLog(createHash(1), bl16, 0, &execMsg)
 				require.NoError(t, err)
+				bl17 := eth.BlockID{Hash: createHash(17), Number: 17}
+				require.NoError(t, db.SealBlock(bl16.Hash, bl17, 5002))
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				requireContains(t, db, 16, 0, createHash(9))
@@ -632,6 +636,8 @@ func TestAddDependentLog(t *testing.T) {
 				// 260 = executing message check
 				require.Equal(t, int64(261), m.entryCount)
 				db.debugTip()
+				bl16 := eth.BlockID{Hash: createHash(16), Number: 16}
+				require.NoError(t, db.SealBlock(bl15.Hash, bl16, 5001))
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				requireContains(t, db, 16, 251, createHash(9))
@@ -661,6 +667,8 @@ func TestAddDependentLog(t *testing.T) {
 				// 260 = executing message check
 				db.debugTip()
 				require.Equal(t, int64(261), m.entryCount)
+				bl16 := eth.BlockID{Hash: createHash(16), Number: 16}
+				require.NoError(t, db.SealBlock(bl15.Hash, bl16, 5001))
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
 				requireContains(t, db, 16, 252, createHash(9))
@@ -689,8 +697,8 @@ func TestContains(t *testing.T) {
 			requireContains(t, db, 51, 0, createHash(1))
 			requireContains(t, db, 51, 1, createHash(3))
 			requireContains(t, db, 51, 2, createHash(2))
-			requireContains(t, db, 53, 0, createHash(1))
-			requireContains(t, db, 53, 1, createHash(3))
+			requireFuture(t, db, 53, 0, createHash(1))
+			requireFuture(t, db, 53, 1, createHash(3))
 
 			// 52 was sealed as empty
 			requireConflicts(t, db, 52, 0, createHash(1))
@@ -1039,7 +1047,7 @@ func TestRewind(t *testing.T) {
 				requireContains(t, db, 51, 1, createHash(2))
 				requireContains(t, db, 52, 0, createHash(3))
 				// Still have the pending log of unsealed block if the rewind to unknown sealed block fails
-				requireContains(t, db, 53, 0, createHash(4))
+				requireFuture(t, db, 53, 0, createHash(4))
 			})
 	})
 
@@ -1055,8 +1063,9 @@ func TestRewind(t *testing.T) {
 				require.ErrorIs(t, db.Rewind(25), types.ErrSkipped)
 			},
 			func(t *testing.T, db *DB, m *stubMetrics) {
-				requireContains(t, db, 51, 0, createHash(1))
-				requireContains(t, db, 51, 0, createHash(1))
+				// block 51 is not sealed yet
+				requireFuture(t, db, 51, 0, createHash(1))
+				requireFuture(t, db, 51, 0, createHash(1))
 			})
 	})
 
@@ -1189,7 +1198,8 @@ func TestRewind(t *testing.T) {
 				// try to add a log to 17, on top of 16
 				err = db.AddLog(createHash(42), bl16, 0, nil)
 				require.NoError(t, err)
-				requireContains(t, db, 17, 0, createHash(42))
+				// not sealed yet
+				requireFuture(t, db, 17, 0, createHash(42))
 			})
 	})
 }

From 0ff55ddee70efc2d6a5695f92cb877ca947eb94a Mon Sep 17 00:00:00 2001
From: Zach Howard <zach@oplabs.co>
Date: Thu, 7 Nov 2024 14:03:44 -0500
Subject: [PATCH 150/451] op-conductor: adds miner_setMaxDASize to conductor
 execution proxy (#12869)

---
 op-conductor/conductor/service.go          |  5 +++
 op-conductor/rpc/api.go                    | 13 +++++--
 op-conductor/rpc/excecution_miner_proxy.go | 40 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 op-conductor/rpc/excecution_miner_proxy.go

diff --git a/op-conductor/conductor/service.go b/op-conductor/conductor/service.go
index 565096a9b45b..89656fd727aa 100644
--- a/op-conductor/conductor/service.go
+++ b/op-conductor/conductor/service.go
@@ -247,6 +247,11 @@ func (oc *OpConductor) initRPCServer(ctx context.Context) error {
 			Namespace: conductorrpc.ExecutionRPCNamespace,
 			Service:   executionProxy,
 		})
+		execMinerProxy := conductorrpc.NewExecutionMinerProxyBackend(oc.log, oc, execClient)
+		server.AddAPI(rpc.API{
+			Namespace: conductorrpc.ExecutionMinerRPCNamespace,
+			Service:   execMinerProxy,
+		})
 
 		nodeClient, err := dial.DialRollupClientWithTimeout(ctx, 1*time.Minute, oc.log, oc.cfg.NodeRPC)
 		if err != nil {
diff --git a/op-conductor/rpc/api.go b/op-conductor/rpc/api.go
index eafec9ac304b..a8b62e3b74fd 100644
--- a/op-conductor/rpc/api.go
+++ b/op-conductor/rpc/api.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum-optimism/optimism/op-conductor/consensus"
@@ -61,13 +62,19 @@ type API interface {
 	CommitUnsafePayload(ctx context.Context, payload *eth.ExecutionPayloadEnvelope) error
 }
 
-// ExecutionProxyAPI defines the methods proxied to the execution rpc backend
+// ExecutionProxyAPI defines the methods proxied to the execution 'eth_' rpc backend
 // This should include all methods that are called by op-batcher or op-proposer
 type ExecutionProxyAPI interface {
 	GetBlockByNumber(ctx context.Context, number rpc.BlockNumber, fullTx bool) (map[string]interface{}, error)
 }
 
-// NodeProxyAPI defines the methods proxied to the node rpc backend
+// ExecutionMinerProxyAPI defines the methods proxied to the execution 'miner_' rpc backend
+// This should include all methods that are called by op-batcher or op-proposer
+type ExecutionMinerProxyAPI interface {
+	SetMaxDASize(ctx context.Context, maxTxSize hexutil.Big, maxBlockSize hexutil.Big) bool
+}
+
+// NodeProxyAPI defines the methods proxied to the node 'optimism_' rpc backend
 // This should include all methods that are called by op-batcher or op-proposer
 type NodeProxyAPI interface {
 	OutputAtBlock(ctx context.Context, blockNumString string) (*eth.OutputResponse, error)
@@ -75,7 +82,7 @@ type NodeProxyAPI interface {
 	RollupConfig(ctx context.Context) (*rollup.Config, error)
 }
 
-// NodeProxyAPI defines the methods proxied to the node rpc backend
+// NodeAdminProxyAPI defines the methods proxied to the node 'admin_' rpc backend
 // This should include all methods that are called by op-batcher or op-proposer
 type NodeAdminProxyAPI interface {
 	SequencerActive(ctx context.Context) (bool, error)
diff --git a/op-conductor/rpc/excecution_miner_proxy.go b/op-conductor/rpc/excecution_miner_proxy.go
new file mode 100644
index 000000000000..9594e790b322
--- /dev/null
+++ b/op-conductor/rpc/excecution_miner_proxy.go
@@ -0,0 +1,40 @@
+package rpc
+
+import (
+	"context"
+
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+var ExecutionMinerRPCNamespace = "miner"
+
+// ExecutionMinerProxyBackend implements an execution rpc proxy with a leadership check before each call.
+type ExecutionMinerProxyBackend struct {
+	log    log.Logger
+	con    conductor
+	client *ethclient.Client
+}
+
+var _ ExecutionMinerProxyAPI = (*ExecutionMinerProxyBackend)(nil)
+
+func NewExecutionMinerProxyBackend(log log.Logger, con conductor, client *ethclient.Client) *ExecutionMinerProxyBackend {
+	return &ExecutionMinerProxyBackend{
+		log:    log,
+		con:    con,
+		client: client,
+	}
+}
+
+func (api *ExecutionMinerProxyBackend) SetMaxDASize(ctx context.Context, maxTxSize hexutil.Big, maxBlockSize hexutil.Big) bool {
+	var result bool
+	if !api.con.Leader(ctx) {
+		return false
+	}
+	err := api.client.Client().Call(&result, "miner_setMaxDASize", maxTxSize, maxBlockSize)
+	if err != nil {
+		return false
+	}
+	return result
+}

From fd1e0622075e7f193547315cd2b96a8adc22da56 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Thu, 7 Nov 2024 15:09:32 -0500
Subject: [PATCH 151/451] Revert "feat: Isthmus Contracts (#12746)"git 
 (#12870)

* Revert "feat: Isthmus Contracts (#12746)"

This reverts commit dad1087728ceb3021ff2c02b8e153cfc65ea7810.

* temporarily reduce heavy fuzz runs
---
 .semgrep/rules/sol-rules.yaml                 |   4 +-
 .semgrep/tests/sol-rules.t.sol                |   6 -
 bedrock-devnet/devnet/__init__.py             |   2 +-
 op-chain-ops/devkeys/devkeys.go               |   4 -
 op-chain-ops/genesis/config.go                |   3 -
 .../testdata/test-deploy-config-full.json     |   1 -
 op-chain-ops/interopgen/configs.go            |   9 +-
 op-chain-ops/interopgen/deploy.go             |  40 ++-
 op-chain-ops/interopgen/recipe.go             |  13 +-
 .../deployer/integration_test/apply_test.go   | 116 +++----
 op-deployer/pkg/deployer/opcm/opchain.go      |   6 +-
 op-deployer/pkg/deployer/pipeline/opchain.go  |   2 +-
 op-deployer/pkg/deployer/state/intent.go      |   6 -
 op-deployer/pkg/deployer/testutil/env.go      |  22 +-
 op-e2e/bindings/systemconfig.go               | 108 +------
 op-e2e/system/gastoken/gastoken_test.go       |  17 +-
 packages/contracts-bedrock/.gas-snapshot      |  20 +-
 .../deploy-config/devnetL1-template.json      |   1 -
 .../deploy-config/hardhat.json                |   1 -
 packages/contracts-bedrock/foundry.toml       |   2 +-
 .../contracts-bedrock/scripts/Artifacts.s.sol |   2 +
 .../contracts-bedrock/scripts/L2Genesis.s.sol | 275 ++++++++--------
 .../scripts/deploy/ChainAssertions.sol        |  61 ++--
 .../scripts/deploy/Deploy.s.sol               |  24 +-
 .../scripts/deploy/DeployConfig.s.sol         |   2 -
 .../deploy/DeployImplementations.s.sol        |  32 +-
 .../scripts/deploy/DeployOPChain.s.sol        |  23 +-
 .../scripts/deploy/DeploySuperchain.s.sol     |   3 +-
 .../scripts/libraries/Config.sol              |   9 +-
 .../scripts/libraries/DeployUtils.sol         |  10 -
 .../scripts/libraries/ForgeArtifacts.sol      |  19 +-
 packages/contracts-bedrock/semver-lock.json   | 128 ++++----
 .../snapshots/abi/BaseFeeVault.json           |  48 ++-
 .../CrossDomainMessengerLegacySpacer0.json    |   1 +
 .../CrossDomainMessengerLegacySpacer1.json    |   1 +
 .../snapshots/abi/L1Block.json                |  62 ----
 .../snapshots/abi/L1BlockInterop.json         |  46 +--
 .../snapshots/abi/L1CrossDomainMessenger.json |   2 +-
 .../snapshots/abi/L1ERC721Bridge.json         |  16 +-
 .../snapshots/abi/L1FeeVault.json             |  48 ++-
 .../snapshots/abi/L1StandardBridge.json       |   8 +-
 .../snapshots/abi/L2CrossDomainMessenger.json |  31 ++
 .../snapshots/abi/L2ERC721Bridge.json         |  33 +-
 .../abi/L2OptimismMintableERC20Factory.json   | 196 ------------
 .../snapshots/abi/L2ProxyAdmin.json           | 300 ------------------
 .../snapshots/abi/L2StandardBridge.json       |  37 ++-
 .../abi/L2StandardBridgeInterop.json          |  32 +-
 .../snapshots/abi/OPContractsManager.json     |   5 -
 .../abi/OPContractsManagerInterop.json        |   5 -
 ...json => OptimismMintableERC20Factory.json} |   0
 .../snapshots/abi/OptimismMintableERC721.json |   6 +-
 .../abi/OptimismMintableERC721Factory.json    |  26 +-
 .../snapshots/abi/OptimismPortal.json         |  22 +-
 .../snapshots/abi/OptimismPortal2.json        |  40 +--
 .../snapshots/abi/OptimismPortalInterop.json  |  48 +--
 .../snapshots/abi/SequencerFeeVault.json      |  50 ++-
 .../snapshots/abi/SuperchainConfig.json       |  31 --
 .../snapshots/abi/SystemConfig.json           |  84 +----
 .../snapshots/abi/SystemConfigInterop.json    | 132 ++------
 .../CrossDomainMessengerLegacySpacer0.json    |   9 +
 .../CrossDomainMessengerLegacySpacer1.json    |  65 ++++
 .../snapshots/storageLayout/L1Block.json      |   7 -
 .../storageLayout/L1BlockInterop.json         |   9 +-
 .../storageLayout/L1CrossDomainMessenger.json |  62 +---
 .../storageLayout/L1ERC721Bridge.json         |  35 +-
 .../storageLayout/L1StandardBridge.json       |  60 ++--
 .../storageLayout/L2CrossDomainMessenger.json |  41 +--
 .../storageLayout/L2ERC721Bridge.json         |  28 +-
 .../L2OptimismMintableERC20Factory.json       |  30 --
 .../snapshots/storageLayout/L2ProxyAdmin.json |  37 ---
 .../storageLayout/L2StandardBridge.json       |  32 +-
 .../L2StandardBridgeInterop.json              |  32 +-
 ...json => OptimismMintableERC20Factory.json} |  54 ++--
 .../src/L1/L1CrossDomainMessenger.sol         |  25 +-
 .../src/L1/L1ERC721Bridge.sol                 |  30 +-
 .../src/L1/L1OptimismMintableERC20Factory.sol |  41 ---
 .../src/L1/L1StandardBridge.sol               |  44 +--
 .../src/L1/OPContractsManager.sol             |  25 +-
 .../src/L1/OPContractsManagerInterop.sol      |   9 +-
 .../src/L1/OptimismPortal.sol                 |  18 +-
 .../src/L1/OptimismPortal2.sol                |  41 +--
 .../src/L1/OptimismPortalInterop.sol          |  35 +-
 .../src/L1/SuperchainConfig.sol               |  30 +-
 .../contracts-bedrock/src/L1/SystemConfig.sol | 175 +++-------
 .../src/L1/SystemConfigInterop.sol            |  54 +++-
 .../L1/interfaces/IL1CrossDomainMessenger.sol |   4 -
 .../src/L1/interfaces/IL1ERC721Bridge.sol     |   6 -
 .../IL1OptimismMintableERC20Factory.sol       |  38 ---
 .../src/L1/interfaces/IL1StandardBridge.sol   |   5 +-
 .../src/L1/interfaces/IOptimismPortal.sol     |   3 +-
 .../src/L1/interfaces/IOptimismPortal2.sol    |   4 +-
 .../L1/interfaces/IOptimismPortalInterop.sol  |   5 +-
 .../src/L1/interfaces/ISuperchainConfig.sol   |   4 +-
 .../src/L1/interfaces/ISystemConfig.sol       |  22 +-
 .../L1/interfaces/ISystemConfigInterop.sol    |   5 +-
 .../contracts-bedrock/src/L2/BaseFeeVault.sol |  30 +-
 .../contracts-bedrock/src/L2/FeeVault.sol     |  91 +++---
 .../src/L2/GasPriceOracle.sol                 |   4 +-
 packages/contracts-bedrock/src/L2/L1Block.sol | 151 +--------
 .../src/L2/L1BlockInterop.sol                 |  36 ++-
 .../contracts-bedrock/src/L2/L1FeeVault.sol   |  30 +-
 .../src/L2/L2CrossDomainMessenger.sol         |  27 +-
 .../src/L2/L2ERC721Bridge.sol                 |  30 +-
 .../src/L2/L2OptimismMintableERC20Factory.sol |  25 --
 .../contracts-bedrock/src/L2/L2ProxyAdmin.sol |  17 -
 .../src/L2/L2StandardBridge.sol               |  26 +-
 .../src/L2/L2StandardBridgeInterop.sol        |   4 +-
 .../src/L2/L2ToL2CrossDomainMessenger.sol     |   4 +-
 .../src/L2/OptimismSuperchainERC20.sol        |   4 +-
 .../src/L2/OptimismSuperchainERC20Beacon.sol  |   4 +-
 .../src/L2/OptimismSuperchainERC20Factory.sol |   4 +-
 .../src/L2/SequencerFeeVault.sol              |  36 +--
 .../src/L2/SuperchainWETH.sol                 |   4 +-
 packages/contracts-bedrock/src/L2/WETH.sol    |   4 +-
 .../src/L2/interfaces/IBaseFeeVault.sol       |  16 +-
 .../src/L2/interfaces/IFeeVault.sol           |   8 +-
 .../src/L2/interfaces/IL1Block.sol            |   7 -
 .../src/L2/interfaces/IL1BlockInterop.sol     |  12 +-
 .../src/L2/interfaces/IL1FeeVault.sol         |  15 +-
 .../L2/interfaces/IL2CrossDomainMessenger.sol |   3 +-
 .../src/L2/interfaces/IL2ERC721Bridge.sol     |   3 +-
 .../IL2OptimismMintableERC20Factory.sol       |  36 ---
 .../src/L2/interfaces/IL2StandardBridge.sol   |   8 +-
 .../interfaces/IL2StandardBridgeInterop.sol   |  10 +-
 .../src/L2/interfaces/ISequencerFeeVault.sol  |  18 +-
 .../src/libraries/Encoding.sol                |  36 ---
 .../src/libraries/Predeploys.sol              |   4 +-
 .../src/libraries/StaticConfig.sol            |  58 ----
 .../contracts-bedrock/src/libraries/Types.sol |  25 --
 .../src/universal/CrossDomainMessenger.sol    | 108 +++----
 .../src/universal/ERC721Bridge.sol            |  51 +--
 .../OptimismMintableERC20Factory.sol          |  43 ++-
 .../src/universal/OptimismMintableERC721.sol  |  17 +-
 .../OptimismMintableERC721Factory.sol         |  52 ++-
 .../src/universal/StandardBridge.sol          |  70 ++--
 .../interfaces/ICrossDomainMessenger.sol      |   3 +-
 .../universal/interfaces/IERC721Bridge.sol    |   1 +
 .../IOptimismMintableERC20Factory.sol         |   2 +
 .../interfaces/IOptimismMintableERC721.sol    |  10 +-
 .../IOptimismMintableERC721Factory.sol        |  12 +-
 .../universal/interfaces/IStandardBridge.sol  |   3 +-
 .../test/L1/OPContractsManager.t.sol          |   3 +-
 .../test/L1/OptimismPortal.t.sol              |  16 +-
 .../test/L1/OptimismPortal2.t.sol             | 116 +------
 .../test/L1/OptimismPortalInterop.t.sol       |  73 +++--
 .../test/L1/SuperchainConfig.t.sol            |   9 +-
 .../test/L1/SystemConfig.t.sol                | 196 ++----------
 .../test/L1/SystemConfigInterop.t.sol         |  17 +-
 .../test/L2/BaseFeeVault.t.sol                |   2 +-
 .../test/L2/CrossDomainOwnable2.t.sol         |  13 +
 .../test/L2/CrossDomainOwnable3.t.sol         |   2 +-
 .../contracts-bedrock/test/L2/FeeVault.t.sol  |  21 --
 .../contracts-bedrock/test/L2/L1Block.t.sol   | 145 ---------
 .../test/L2/L1BlockInterop.t.sol              |  37 +--
 .../test/L2/L1FeeVault.t.sol                  |   2 +-
 .../test/L2/L2CrossDomainMessenger.t.sol      |   8 +-
 .../test/L2/L2ERC721Bridge.t.sol              |   4 +-
 .../contracts-bedrock/test/L2/L2Genesis.t.sol |   4 +-
 .../test/L2/L2StandardBridge.t.sol            |  10 +-
 .../test/L2/Predeploys.t.sol                  |  17 +-
 .../test/L2/SequencerFeeVault.t.sol           |  71 +++--
 .../test/invariants/SystemConfig.t.sol        |  18 +-
 .../test/libraries/Encoding.t.sol             |  11 -
 .../test/opcm/DeployOPChain.t.sol             |  26 +-
 .../contracts-bedrock/test/setup/Setup.sol    |  76 +----
 .../OptimismMintableERC20Factory.t.sol        |  10 +-
 .../universal/OptimismMintableERC721.t.sol    |   6 +-
 .../OptimismMintableERC721Factory.t.sol       |   9 +-
 .../test/universal/Specs.t.sol                |  56 +---
 .../test/universal/StandardBridge.t.sol       |  10 -
 .../test/vendor/Initializable.t.sol           |  79 +++--
 171 files changed, 1903 insertions(+), 3731 deletions(-)
 create mode 100644 packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json
 create mode 100644 packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json
 rename packages/contracts-bedrock/snapshots/abi/{L1OptimismMintableERC20Factory.json => OptimismMintableERC20Factory.json} (100%)
 create mode 100644 packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json
 create mode 100644 packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json
 rename packages/contracts-bedrock/snapshots/storageLayout/{L1OptimismMintableERC20Factory.json => OptimismMintableERC20Factory.json} (64%)
 delete mode 100644 packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol
 delete mode 100644 packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol
 delete mode 100644 packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol
 delete mode 100644 packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol
 delete mode 100644 packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol
 rename packages/contracts-bedrock/src/{L2 => universal}/OptimismMintableERC721Factory.sol (51%)
 rename packages/contracts-bedrock/src/{L2 => universal}/interfaces/IOptimismMintableERC721Factory.sol (66%)
 delete mode 100644 packages/contracts-bedrock/test/L2/FeeVault.t.sol
 rename packages/contracts-bedrock/test/{L2 => universal}/OptimismMintableERC721Factory.t.sol (89%)

diff --git a/.semgrep/rules/sol-rules.yaml b/.semgrep/rules/sol-rules.yaml
index e801bd9be25f..e0d83414c4bd 100644
--- a/.semgrep/rules/sol-rules.yaml
+++ b/.semgrep/rules/sol-rules.yaml
@@ -131,7 +131,7 @@ rules:
       - pattern-not: require($ERR);
       - focus-metavariable: $ERR
       - pattern-not-regex: \"(\w+:\s[^"]+)\"
-      - pattern-not-regex: string\.concat\(\"(\w+:\s)\"[^)]+\)
+      - pattern-not-regex: string\.concat\(\"(\w+:\s[^"]+)\"\,[^"]+\)
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
     paths:
@@ -152,7 +152,7 @@ rules:
       - pattern-not: revert $ERR(...);
       - focus-metavariable: $MSG
       - pattern-not-regex: \"(\w+:\s[^"]+)\"
-      - pattern-not-regex: string\.concat\(\"(\w+:\s)\"[^)]+\)
+      - pattern-not-regex: string\.concat\(\"(\w+:\s[^"]+)\"\,[^"]+\)
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
       - pattern-not-regex: \"([a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+-[a-zA-Z0-9\s]+)\"
     paths:
diff --git a/.semgrep/tests/sol-rules.t.sol b/.semgrep/tests/sol-rules.t.sol
index be4816dc3931..3b4329f7e388 100644
--- a/.semgrep/tests/sol-rules.t.sol
+++ b/.semgrep/tests/sol-rules.t.sol
@@ -497,9 +497,6 @@ contract SemgrepTest__sol_style_malformed_require {
             )
         );
 
-        // ok: sol-style-malformed-require
-        require(result.length > 0, string.concat("ForgeArtifacts: ", _contractName, "is not initializable"));
-
         // ruleid: sol-style-malformed-require
         require(cond, "MyContract: ");
 
@@ -544,9 +541,6 @@ contract SemgrepTest__sol_style_malformed_revert {
             )
         );
 
-        // ok: sol-style-malformed-revert
-        revert(string.concat("ForgeArtifacts: ", _contractName, "is not initializable"));
-
         // ruleid: sol-style-malformed-revert
         revert("MyContract: ");
 
diff --git a/bedrock-devnet/devnet/__init__.py b/bedrock-devnet/devnet/__init__.py
index 7bf5c6a2595c..70243dc790c8 100644
--- a/bedrock-devnet/devnet/__init__.py
+++ b/bedrock-devnet/devnet/__init__.py
@@ -24,7 +24,7 @@
 log = logging.getLogger()
 
 # Global constants
-FORKS = ["delta", "ecotone", "fjord", "granite", "holocene", "isthmus"]
+FORKS = ["delta", "ecotone", "fjord", "granite", "holocene"]
 
 # Global environment variables
 DEVNET_NO_BUILD = os.getenv('DEVNET_NO_BUILD') == "true"
diff --git a/op-chain-ops/devkeys/devkeys.go b/op-chain-ops/devkeys/devkeys.go
index 1eb011b07eaa..fdb151e4e6fc 100644
--- a/op-chain-ops/devkeys/devkeys.go
+++ b/op-chain-ops/devkeys/devkeys.go
@@ -158,8 +158,6 @@ const (
 	SequencerFeeVaultRecipientRole ChainOperatorRole = 9
 	// SystemConfigOwner is the key that can make SystemConfig changes.
 	SystemConfigOwner ChainOperatorRole = 10
-	// SystemConfigFeeAdmin is the key that can make SystemConfigFee changes.
-	SystemConfigFeeAdmin ChainOperatorRole = 11
 )
 
 func (role ChainOperatorRole) String() string {
@@ -186,8 +184,6 @@ func (role ChainOperatorRole) String() string {
 		return "sequencer-fee-vault-recipient"
 	case SystemConfigOwner:
 		return "system-config-owner"
-	case SystemConfigFeeAdmin:
-		return "system-config-fee-admin"
 	default:
 		return fmt.Sprintf("unknown-operator-%d", uint64(role))
 	}
diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
index 8446241a9417..7ed0a6e2f682 100644
--- a/op-chain-ops/genesis/config.go
+++ b/op-chain-ops/genesis/config.go
@@ -286,9 +286,6 @@ type OperatorDeployConfig struct {
 	// BatchSenderAddress represents the initial sequencer account that authorizes batches.
 	// Transactions sent from this account to the batch inbox address are considered valid.
 	BatchSenderAddress common.Address `json:"batchSenderAddress"`
-
-	// SystemConfigfeeAdmin is the address of the account that has the ability to set the fee parameters.
-	SystemConfigfeeAdmin common.Address `json:"systemConfigFeeAdmin"`
 }
 
 var _ ConfigChecker = (*OperatorDeployConfig)(nil)
diff --git a/op-chain-ops/genesis/testdata/test-deploy-config-full.json b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
index da1e346c407b..814fff245b0d 100644
--- a/op-chain-ops/genesis/testdata/test-deploy-config-full.json
+++ b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
@@ -22,7 +22,6 @@
   "l1GenesisBlockGasLimit": "0x1c9c380",
   "l1GenesisBlockDifficulty": "0x1",
   "finalSystemOwner": "0xbcd4042de499d14e55001ccbb24a551f3b954096",
-  "systemConfigFeeAdmin": "0xbcd4042de499d14e55001ccbb24a551f3b954096",
   "superchainConfigGuardian": "0x0000000000000000000000000000000000000112",
   "finalizationPeriodSeconds": 2,
   "l1GenesisBlockMixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
diff --git a/op-chain-ops/interopgen/configs.go b/op-chain-ops/interopgen/configs.go
index e3fca23a629e..942588a9929c 100644
--- a/op-chain-ops/interopgen/configs.go
+++ b/op-chain-ops/interopgen/configs.go
@@ -71,11 +71,10 @@ func (c *SuperchainConfig) Check(log log.Logger) error {
 }
 
 type L2Config struct {
-	Deployer             common.Address // account used to deploy contracts to L2
-	Proposer             common.Address
-	Challenger           common.Address
-	SystemConfigOwner    common.Address
-	SystemConfigFeeAdmin common.Address
+	Deployer          common.Address // account used to deploy contracts to L2
+	Proposer          common.Address
+	Challenger        common.Address
+	SystemConfigOwner common.Address
 	genesis.L2InitializationConfig
 	Prefund                 map[common.Address]*big.Int
 	SaltMixer               string
diff --git a/op-chain-ops/interopgen/deploy.go b/op-chain-ops/interopgen/deploy.go
index 10f361b643ac..476406821ea5 100644
--- a/op-chain-ops/interopgen/deploy.go
+++ b/op-chain-ops/interopgen/deploy.go
@@ -200,27 +200,25 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 
 	l1Host.SetTxOrigin(cfg.Deployer)
 
-	output, err := opcm.DeployOPChainIsthmus(l1Host, opcm.DeployOPChainInputIsthmus{
-		DeployOPChainInputV160: opcm.DeployOPChainInputV160{
-			OpChainProxyAdminOwner:  cfg.ProxyAdminOwner,
-			SystemConfigOwner:       cfg.SystemConfigOwner,
-			Batcher:                 cfg.BatchSenderAddress,
-			UnsafeBlockSigner:       cfg.P2PSequencerAddress,
-			Proposer:                cfg.Proposer,
-			Challenger:              cfg.Challenger,
-			BasefeeScalar:           cfg.GasPriceOracleBaseFeeScalar,
-			BlobBaseFeeScalar:       cfg.GasPriceOracleBlobBaseFeeScalar,
-			L2ChainId:               new(big.Int).SetUint64(cfg.L2ChainID),
-			OpcmProxy:               superDeployment.OpcmProxy,
-			SaltMixer:               cfg.SaltMixer,
-			GasLimit:                cfg.GasLimit,
-			DisputeGameType:         cfg.DisputeGameType,
-			DisputeAbsolutePrestate: cfg.DisputeAbsolutePrestate,
-			DisputeMaxGameDepth:     cfg.DisputeMaxGameDepth,
-			DisputeSplitDepth:       cfg.DisputeSplitDepth,
-			DisputeClockExtension:   cfg.DisputeClockExtension,
-			DisputeMaxClockDuration: cfg.DisputeMaxClockDuration},
-		SystemConfigFeeAdmin: cfg.SystemConfigFeeAdmin,
+	output, err := opcm.DeployOPChainV160(l1Host, opcm.DeployOPChainInputV160{
+		OpChainProxyAdminOwner:  cfg.ProxyAdminOwner,
+		SystemConfigOwner:       cfg.SystemConfigOwner,
+		Batcher:                 cfg.BatchSenderAddress,
+		UnsafeBlockSigner:       cfg.P2PSequencerAddress,
+		Proposer:                cfg.Proposer,
+		Challenger:              cfg.Challenger,
+		BasefeeScalar:           cfg.GasPriceOracleBaseFeeScalar,
+		BlobBaseFeeScalar:       cfg.GasPriceOracleBlobBaseFeeScalar,
+		L2ChainId:               new(big.Int).SetUint64(cfg.L2ChainID),
+		OpcmProxy:               superDeployment.OpcmProxy,
+		SaltMixer:               cfg.SaltMixer,
+		GasLimit:                cfg.GasLimit,
+		DisputeGameType:         cfg.DisputeGameType,
+		DisputeAbsolutePrestate: cfg.DisputeAbsolutePrestate,
+		DisputeMaxGameDepth:     cfg.DisputeMaxGameDepth,
+		DisputeSplitDepth:       cfg.DisputeSplitDepth,
+		DisputeClockExtension:   cfg.DisputeClockExtension,
+		DisputeMaxClockDuration: cfg.DisputeMaxClockDuration,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy L2 OP chain: %w", err)
diff --git a/op-chain-ops/interopgen/recipe.go b/op-chain-ops/interopgen/recipe.go
index 06bcf8bfca03..8983ee72da8e 100644
--- a/op-chain-ops/interopgen/recipe.go
+++ b/op-chain-ops/interopgen/recipe.go
@@ -178,17 +178,12 @@ func InteropL2DevConfig(l1ChainID, l2ChainID uint64, addrs devkeys.Addresses) (*
 	if err != nil {
 		return nil, err
 	}
-	systemConfigFeeAdmin, err := addrs.Address(chainOps(devkeys.SystemConfigFeeAdmin))
-	if err != nil {
-		return nil, err
-	}
 
 	l2Cfg := &L2Config{
-		Deployer:             deployer,
-		Proposer:             proposer,
-		Challenger:           challenger,
-		SystemConfigOwner:    systemConfigOwner,
-		SystemConfigFeeAdmin: systemConfigFeeAdmin,
+		Deployer:          deployer,
+		Proposer:          proposer,
+		Challenger:        challenger,
+		SystemConfigOwner: systemConfigOwner,
 		L2InitializationConfig: genesis.L2InitializationConfig{
 			DevDeployConfig: genesis.DevDeployConfig{
 				FundDevAccounts: true,
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 919b717cc055..fa59c49dc8ac 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
-	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/inspect"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 
@@ -126,7 +125,7 @@ func TestEndToEndApply(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr, localArtifactsFactory, localArtifactsFactory)
+	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	cg := ethClientCodeGetter(ctx, l1Client)
 
@@ -146,7 +145,7 @@ func TestEndToEndApply(t *testing.T) {
 	t.Run("subsequent chain", func(t *testing.T) {
 		// create a new environment with wiped state to ensure we can continue using the
 		// state from the previous deployment
-		env, bundle, _ = createEnv(t, lgr, l1Client, bcaster, deployerAddr, localArtifactsFactory, localArtifactsFactory)
+		env, bundle, _ = createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 		intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID2))
 
 		require.NoError(t, deployer.ApplyPipeline(
@@ -208,17 +207,7 @@ func TestApplyExistingOPCM(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	// use the l2 contracts here because the v1.7.0 contracts are compatible with the v1.6.0
-	// contracts and createEnv uses the same artifacts for both L1/L2 in the bundle.
-	env, bundle, _ := createEnv(
-		t,
-		lgr,
-		l1Client,
-		bcaster,
-		deployerAddr,
-		taggedArtifactsFactory(standard.DefaultL1ContractsTag),
-		taggedArtifactsFactory(standard.DefaultL2ContractsTag),
-	)
+	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 
 	intent, st := newIntent(
 		t,
@@ -390,8 +379,7 @@ func TestProofParamOverrides(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := checkImmutable(t, allocs, tt.address, tt.caster(t, intent.GlobalDeployOverrides[tt.name]))
-			require.NoError(t, err)
+			checkImmutable(t, allocs, tt.address, tt.caster(t, intent.GlobalDeployOverrides[tt.name]))
 		})
 	}
 }
@@ -415,9 +403,9 @@ func TestInteropDeployment(t *testing.T) {
 
 	chainState := st.Chains[0]
 	depManagerSlot := common.HexToHash("0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c")
-	require.NoError(t, checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot))
-	systemConfigOwnerHash := common.BytesToHash(intent.Chains[0].Roles.SystemConfigOwner.Bytes())
-	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, systemConfigOwnerHash)
+	checkImmutable(t, st.L1StateDump.Data.Accounts, st.ImplementationsDeployment.SystemConfigImplAddress, depManagerSlot)
+	proxyAdminOwnerHash := common.BytesToHash(intent.Chains[0].Roles.SystemConfigOwner.Bytes())
+	checkStorageSlot(t, st.L1StateDump.Data.Accounts, chainState.SystemConfigProxyAddress, depManagerSlot, proxyAdminOwnerHash)
 }
 
 func TestAltDADeployment(t *testing.T) {
@@ -524,7 +512,7 @@ func TestInvalidL2Genesis(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr, localArtifactsFactory, localArtifactsFactory)
+			env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
 			intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 			intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 			intent.DeploymentStrategy = state.DeploymentStrategyGenesis
@@ -558,42 +546,27 @@ func setupGenesisChain(t *testing.T) (*pipeline.Env, pipeline.ArtifactsBundle, *
 
 	loc, _ := testutil.LocalArtifacts(t)
 
-	env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr, localArtifactsFactory, localArtifactsFactory)
+	env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
 	return env, bundle, intent, st
 }
 
-type artifactsFactory func(t *testing.T) (*artifacts.Locator, foundry.StatDirFs)
-
-func localArtifactsFactory(t *testing.T) (*artifacts.Locator, foundry.StatDirFs) {
-	return testutil.LocalArtifacts(t)
-}
-
-func taggedArtifactsFactory(tag string) artifactsFactory {
-	return func(t *testing.T) (*artifacts.Locator, foundry.StatDirFs) {
-		return testutil.ArtifactsFromURL(t, fmt.Sprintf("tag://%s", tag))
-	}
-}
-
 func createEnv(
 	t *testing.T,
 	lgr log.Logger,
 	l1Client *ethclient.Client,
 	bcaster broadcaster.Broadcaster,
 	deployerAddr common.Address,
-	l1Factory artifactsFactory,
-	l2Factory artifactsFactory,
 ) (*pipeline.Env, pipeline.ArtifactsBundle, *script.Host) {
-	_, l1AFS := l1Factory(t)
-	_, l2AFS := l2Factory(t)
+	_, artifactsFS := testutil.LocalArtifacts(t)
 
 	host, err := env.DefaultScriptHost(
 		bcaster,
 		lgr,
 		deployerAddr,
-		l1AFS,
+		artifactsFS,
 		0,
 	)
 	require.NoError(t, err)
@@ -608,8 +581,8 @@ func createEnv(
 	}
 
 	bundle := pipeline.ArtifactsBundle{
-		L1: l1AFS,
-		L2: l2AFS,
+		L1: artifactsFS,
+		L2: artifactsFS,
 	}
 
 	return env, bundle, host
@@ -659,14 +632,13 @@ func newChainIntent(t *testing.T, dk *devkeys.MnemonicDevKeys, l1ChainID *big.In
 		Eip1559Denominator:         50,
 		Eip1559Elasticity:          6,
 		Roles: state.ChainRoles{
-			L1ProxyAdminOwner:    addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
-			L2ProxyAdminOwner:    addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
-			SystemConfigOwner:    addrFor(t, dk, devkeys.SystemConfigOwner.Key(l1ChainID)),
-			SystemConfigFeeAdmin: addrFor(t, dk, devkeys.SystemConfigFeeAdmin.Key(l1ChainID)),
-			UnsafeBlockSigner:    addrFor(t, dk, devkeys.SequencerP2PRole.Key(l1ChainID)),
-			Batcher:              addrFor(t, dk, devkeys.BatcherRole.Key(l1ChainID)),
-			Proposer:             addrFor(t, dk, devkeys.ProposerRole.Key(l1ChainID)),
-			Challenger:           addrFor(t, dk, devkeys.ChallengerRole.Key(l1ChainID)),
+			L1ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
+			L2ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
+			SystemConfigOwner: addrFor(t, dk, devkeys.SystemConfigOwner.Key(l1ChainID)),
+			UnsafeBlockSigner: addrFor(t, dk, devkeys.SequencerP2PRole.Key(l1ChainID)),
+			Batcher:           addrFor(t, dk, devkeys.BatcherRole.Key(l1ChainID)),
+			Proposer:          addrFor(t, dk, devkeys.ProposerRole.Key(l1ChainID)),
+			Challenger:        addrFor(t, dk, devkeys.ChallengerRole.Key(l1ChainID)),
 		},
 	}
 }
@@ -767,20 +739,17 @@ func validateOPChainDeployment(t *testing.T, cg codeGetter, st *state.State, int
 		alloc := chainState.Allocs.Data.Accounts
 
 		chainIntent := intent.Chains[i]
-
-		// First try to read the owner from the bytecode, which is the situation with the
-		// Isthmus L2ProxyAdmin (on this commit).
-		if err := checkImmutableBehindProxy(t, alloc, predeploys.ProxyAdminAddr, common.HexToAddress("0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001")); err != nil {
-			t.Logf("Warning: Failed to check immutable behind proxy for L2ProxyAdmin, falling back to <=v1.6.0 storage check")
-			// If the bytecode check fails, fall back to reading the owner from storage.
-			// Note however that the L2ProxyAdmin owner address here (0xe59a881b2626f948f56f509f180c32428585629a) comes from the chainIntent,
-			// and does not actually match the `owner()` of the L2ProxyAdmin contract deployed on Sepolia (0x2FC3ffc903729a0f03966b917003800B145F67F3).
-			// It seems the L2 state is locally constructed rather than pulled from an L2 RPC.
-			var L2ProxyAdminOwner common.Hash
-			L2ProxyAdminOwner.SetBytes(chainIntent.Roles.L2ProxyAdminOwner.Bytes())
-			checkStorageSlot(t, alloc, predeploys.ProxyAdminAddr, common.Hash{}, L2ProxyAdminOwner)
-		}
-
+		checkImmutableBehindProxy(t, alloc, predeploys.BaseFeeVaultAddr, chainIntent.BaseFeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.L1FeeVaultAddr, chainIntent.L1FeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.SequencerFeeVaultAddr, chainIntent.SequencerFeeVaultRecipient)
+		checkImmutableBehindProxy(t, alloc, predeploys.OptimismMintableERC721FactoryAddr, common.BigToHash(new(big.Int).SetUint64(intent.L1ChainID)))
+
+		// ownership slots
+		var addrAsSlot common.Hash
+		addrAsSlot.SetBytes(chainIntent.Roles.L1ProxyAdminOwner.Bytes())
+		// slot 0
+		ownerSlot := common.Hash{}
+		checkStorageSlot(t, alloc, predeploys.ProxyAdminAddr, ownerSlot, addrAsSlot)
 		var defaultGovOwner common.Hash
 		defaultGovOwner.SetBytes(common.HexToAddress("0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAdDEad").Bytes())
 		checkStorageSlot(t, alloc, predeploys.GovernanceTokenAddr, common.Hash{31: 0x0a}, defaultGovOwner)
@@ -801,23 +770,20 @@ type bytesMarshaler interface {
 	Bytes() []byte
 }
 
-func checkImmutableBehindProxy(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) error {
+func checkImmutableBehindProxy(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, thing bytesMarshaler) {
 	implementationAddress := getEIP1967ImplementationAddress(t, allocations, proxyContract)
-	return checkImmutable(t, allocations, implementationAddress, thing)
+	checkImmutable(t, allocations, implementationAddress, thing)
 }
 
-func checkImmutable(t *testing.T, allocations types.GenesisAlloc, implementationAddress common.Address, thing bytesMarshaler) error {
+func checkImmutable(t *testing.T, allocations types.GenesisAlloc, implementationAddress common.Address, thing bytesMarshaler) {
 	account, ok := allocations[implementationAddress]
-	if !ok {
-		return fmt.Errorf("%s not found in allocations", implementationAddress)
-	}
-	if len(account.Code) == 0 {
-		return fmt.Errorf("%s should have code", implementationAddress)
-	}
-	if !bytes.Contains(account.Code, thing.Bytes()) {
-		return fmt.Errorf("%s code should contain %s immutable", implementationAddress, hex.EncodeToString(thing.Bytes()))
-	}
-	return nil
+	require.True(t, ok, "%s not found in allocations", implementationAddress)
+	require.NotEmpty(t, account.Code, "%s should have code", implementationAddress)
+	require.True(
+		t,
+		bytes.Contains(account.Code, thing.Bytes()),
+		"%s code should contain %s immutable", implementationAddress, hex.EncodeToString(thing.Bytes()),
+	)
 }
 
 func checkStorageSlot(t *testing.T, allocs types.GenesisAlloc, address common.Address, slot common.Hash, expected common.Hash) {
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index c8c803d72d4f..537765ce5154 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -59,7 +59,7 @@ type opcmDeployInputV160 struct {
 
 type opcmRolesIsthmus struct {
 	opcmRolesBase
-	SystemConfigFeeAdmin common.Address
+	FeeAdmin common.Address
 }
 
 type opcmDeployInputIsthmus struct {
@@ -135,8 +135,8 @@ func DeployOPChainInputIsthmusDeployCalldata(input DeployOPChainInputIsthmus) an
 	v160Data := DeployOPChainInputV160DeployCalldata(input.DeployOPChainInputV160).(opcmDeployInputV160)
 	return opcmDeployInputIsthmus{
 		Roles: opcmRolesIsthmus{
-			opcmRolesBase:        v160Data.Roles,
-			SystemConfigFeeAdmin: input.SystemConfigFeeAdmin,
+			opcmRolesBase: v160Data.Roles,
+			FeeAdmin:      input.SystemConfigFeeAdmin,
 		},
 		opcmDeployInputBase: v160Data.opcmDeployInputBase,
 	}
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index 72e4703e0503..59e5d214cf4f 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -276,7 +276,7 @@ func makeDCIIsthmus(intent *state.Intent, thisIntent *state.ChainIntent, chainID
 
 	return opcm.DeployOPChainInputIsthmus{
 		DeployOPChainInputV160: dci,
-		SystemConfigFeeAdmin:   thisIntent.Roles.SystemConfigFeeAdmin,
+		SystemConfigFeeAdmin:   common.Address{'D', 'E', 'A', 'D'},
 	}, nil
 }
 
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index 2459ddbec528..860944666e9e 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -176,8 +176,6 @@ type ChainRoles struct {
 
 	SystemConfigOwner common.Address `json:"systemConfigOwner" toml:"systemConfigOwner"`
 
-	SystemConfigFeeAdmin common.Address `json:"systemConfigFeeAdmin" toml:"systemConfigFeeAdmin"`
-
 	UnsafeBlockSigner common.Address `json:"unsafeBlockSigner" toml:"unsafeBlockSigner"`
 
 	Batcher common.Address `json:"batcher" toml:"batcher"`
@@ -201,10 +199,6 @@ func (c *ChainIntent) Check() error {
 		c.Roles.SystemConfigOwner = c.Roles.L1ProxyAdminOwner
 	}
 
-	if c.Roles.SystemConfigFeeAdmin == emptyAddress {
-		return fmt.Errorf("systemConfigFeeAdmin must be set")
-	}
-
 	if c.Roles.L2ProxyAdminOwner == emptyAddress {
 		return fmt.Errorf("l2ProxyAdminOwner must be set")
 	}
diff --git a/op-deployer/pkg/deployer/testutil/env.go b/op-deployer/pkg/deployer/testutil/env.go
index a1731fb34b35..6b289c4503b7 100644
--- a/op-deployer/pkg/deployer/testutil/env.go
+++ b/op-deployer/pkg/deployer/testutil/env.go
@@ -3,35 +3,31 @@ package testutil
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"path"
 	"runtime"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-service/testlog"
-	"github.com/ethereum/go-ethereum/log"
-
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	op_service "github.com/ethereum-optimism/optimism/op-service"
 	"github.com/stretchr/testify/require"
 )
 
-func LocalArtifacts(t *testing.T) (*artifacts.Locator, foundry.StatDirFs) {
+func LocalArtifacts(t *testing.T) (*artifacts2.Locator, foundry.StatDirFs) {
 	_, testFilename, _, ok := runtime.Caller(0)
 	require.Truef(t, ok, "failed to get test filename")
 	monorepoDir, err := op_service.FindMonorepoRoot(testFilename)
 	require.NoError(t, err)
 	artifactsDir := path.Join(monorepoDir, "packages", "contracts-bedrock", "forge-artifacts")
-	return ArtifactsFromURL(t, fmt.Sprintf("file://%s", artifactsDir))
-}
-
-func ArtifactsFromURL(t *testing.T, artifactsURLStr string) (*artifacts.Locator, foundry.StatDirFs) {
-	loc := new(artifacts.Locator)
-	require.NoError(t, loc.UnmarshalText([]byte(artifactsURLStr)))
+	artifactsURL, err := url.Parse(fmt.Sprintf("file://%s", artifactsDir))
+	require.NoError(t, err)
+	loc := &artifacts2.Locator{
+		URL: artifactsURL,
+	}
 
-	progressor := artifacts.LogProgressor(testlog.Logger(t, log.LevelInfo))
-	artifactsFS, cleanupArtifacts, err := artifacts.Download(context.Background(), loc, progressor)
+	artifactsFS, cleanupArtifacts, err := artifacts2.Download(context.Background(), loc, artifacts2.NoopDownloadProgressor)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = cleanupArtifacts()
diff --git a/op-e2e/bindings/systemconfig.go b/op-e2e/bindings/systemconfig.go
index 9b845fa5e19e..a6ff5ce1480e 100644
--- a/op-e2e/bindings/systemconfig.go
+++ b/op-e2e/bindings/systemconfig.go
@@ -49,45 +49,15 @@ type SystemConfigAddresses struct {
 	GasPayingToken               common.Address
 }
 
-// SystemConfigRoles is an auto generated low-level Go binding around an user-defined struct.
-type SystemConfigRoles struct {
-	Owner             common.Address
-	FeeAdmin          common.Address
-	UnsafeBlockSigner common.Address
-	BatcherHash       [32]byte
-}
-
 // SystemConfigMetaData contains all meta data concerning the SystemConfig contract.
 var SystemConfigMetaData = &bind.MetaData{
-	ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"BATCH_INBOX_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"DISPUTE_GAME_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_CROSS_DOMAIN_MESSENGER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_ERC_721_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_STANDARD_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_PORTAL_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"START_BLOCK_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"UNSAFE_BLOCK_SIGNER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"VERSION\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"basefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batchInbox\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batcherHash\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobbasefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"disputeGameFactory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Denominator\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Elasticity\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"feeAdmin\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingToken\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"decimals_\",\"type\":\"uint8\",\"internalType\":\"uint8\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenName\",\"inputs\":[],\"outputs\":[{\"name\":\"name_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenSymbol\",\"inputs\":[],\"outputs\":[{\"name\":\"symbol_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_roles\",\"type\":\"tuple\",\"internalType\":\"structSystemConfig.Roles\",\"components\":[{\"name\":\"owner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"feeAdmin\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}]},{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"_config\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]},{\"name\":\"_batchInbox\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_addresses\",\"type\":\"tuple\",\"internalType\":\"structSystemConfig.Addresses\",\"components\":[{\"name\":\"l1CrossDomainMessenger\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1ERC721Bridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1StandardBridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"disputeGameFactory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismPortal\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismMintableERC20Factory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"gasPayingToken\",\"type\":\"address\",\"internalType\":\"address\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"isCustomGasToken\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1CrossDomainMessenger\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1ERC721Bridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1StandardBridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"maximumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"minimumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismMintableERC20Factory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismPortal\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"overhead\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"resourceConfig\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"scalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"setBatcherHash\",\"inputs\":[{\"name\":\"_batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setEIP1559Params\",\"inputs\":[{\"name\":\"_denominator\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_elasticity\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setFeeVaultConfig\",\"inputs\":[{\"name\":\"_type\",\"type\":\"uint8\",\"internalType\":\"enumTypes.ConfigType\"},{\"name\":\"_recipient\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_min\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_network\",\"type\":\"uint8\",\"internalType\":\"enumTypes.WithdrawalNetwork\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfig\",\"inputs\":[{\"name\":\"_overhead\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_scalar\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfigEcotone\",\"inputs\":[{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasLimit\",\"inputs\":[{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setUnsafeBlockSigner\",\"inputs\":[{\"name\":\"_unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"startBlock\",\"inputs\":[],\"outputs\":[{\"name\":\"startBlock_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"unsafeBlockSigner\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"pure\"},{\"type\":\"event\",\"name\":\"ConfigUpdate\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint256\",\"indexed\":true,\"internalType\":\"uint256\"},{\"name\":\"updateType\",\"type\":\"uint8\",\"indexed\":true,\"internalType\":\"enumSystemConfig.UpdateType\"},{\"name\":\"data\",\"type\":\"bytes\",\"indexed\":false,\"internalType\":\"bytes\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"UnsafeCast\",\"inputs\":[]}]",
-	Bin: "0x60806040523480156200001157600080fd5b506200005a6200004360017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a062000130565b60001b6000196200006a60201b6200119d1760201c565b620000646200006e565b62000156565b9055565b600054610100900460ff1615620000db5760405162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b606482015260840160405180910390fd5b60005460ff90811610156200012e576000805460ff191660ff9081179091556040519081527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b565b6000828210156200015157634e487b7160e01b600052601160045260246000fd5b500390565b612fd880620001666000396000f3fe608060405234801561001057600080fd5b50600436106103155760003560e01c8063a7119869116101a7578063dac6e63a116100ee578063f2fde38b11610097578063f8c68de011610071578063f8c68de01461076f578063fd32aa0f14610777578063ffa1ad741461077f57600080fd5b8063f2fde38b1461073f578063f45e65d814610752578063f68016b71461075b57600080fd5b8063e81b2c6d116100c8578063e81b2c6d1461070e578063ec70751714610717578063f2b4e6171461073757600080fd5b8063dac6e63a146106f6578063e0e2016d146106fe578063e2a3285c1461070657600080fd5b8063c4e8ddfa11610150578063cc731b021161012a578063cc731b02146105aa578063d220a9e0146106de578063d8444715146106ee57600080fd5b8063c4e8ddfa14610577578063c9b26f611461057f578063c9ff2d161461059257600080fd5b8063be4be78311610181578063be4be78314610520578063bfb14fb714610533578063c0fd4b411461056457600080fd5b8063a7119869146104fd578063b40a817c14610505578063bc49ce5f1461051857600080fd5b806330a402c01161026b578063550fcdc9116102145780638da5cb5b116101ee5780638da5cb5b146104c4578063935f029e146104e25780639b7d7f0a146104f557600080fd5b8063550fcdc9146104ac5780635d73369c146104b4578063715018a6146104bc57600080fd5b80634add321d116102455780634add321d1461043b5780634f16540b1461044357806354fd4d501461046a57600080fd5b806330a402c0146103f55780634397dfef146103fd57806348cd4cb11461043357600080fd5b806318d13918116102cd57806321326849116102a757806321326849146103b757806321d7fde5146103cf57806322b4dded146103e257600080fd5b806318d139181461039257806319f5cea8146103a75780631fd19ee1146103af57600080fd5b80630a49cb03116102fe5780630a49cb03146103625780630ae14b1b1461036a5780630c18c1621461038957600080fd5b806306c926571461031a578063078f29cf14610335575b600080fd5b610322610787565b6040519081526020015b60405180910390f35b61033d6107b5565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161032c565b61033d6107ee565b630bebc2005b60405167ffffffffffffffff909116815260200161032c565b61032260655481565b6103a56103a03660046128f3565b61081e565b005b610322610832565b61033d61085d565b6103bf610887565b604051901515815260200161032c565b6103a56103dd366004612929565b6108c6565b6103a56103f0366004612b4c565b6108dc565b61033d610d21565b610405610d4b565b6040805173ffffffffffffffffffffffffffffffffffffffff909316835260ff90911660208301520161032c565b610322610d5f565b610370610d8f565b6103227f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c0881565b60408051808201909152600c81527f322e332e302d626574612e36000000000000000000000000000000000000000060208201525b60405161032c9190612c93565b61049f610db5565b610322610dbf565b6103a5610dea565b60335473ffffffffffffffffffffffffffffffffffffffff1661033d565b6103a56104f0366004612ca6565b610dfe565b61033d610e10565b61033d610e40565b6103a5610513366004612cc8565b610e70565b610322610e81565b6103a561052e366004612ce3565b610eac565b60685461054f9068010000000000000000900463ffffffff1681565b60405163ffffffff909116815260200161032c565b6103a5610572366004612929565b610f80565b61033d610f92565b6103a561058d366004612d3c565b610fc2565b606a5461054f90640100000000900463ffffffff1681565b61066e6040805160c081018252600080825260208201819052918101829052606081018290526080810182905260a0810191909152506040805160c08101825260695463ffffffff8082168352640100000000820460ff9081166020850152650100000000008304169383019390935266010000000000008104831660608301526a0100000000000000000000810490921660808201526e0100000000000000000000000000009091046fffffffffffffffffffffffffffffffff1660a082015290565b60405161032c9190600060c08201905063ffffffff80845116835260ff602085015116602084015260ff6040850151166040840152806060850151166060840152806080850151166080840152506fffffffffffffffffffffffffffffffff60a08401511660a083015292915050565b606a5461054f9063ffffffff1681565b61049f610fd3565b61033d610fdd565b61032261100d565b610322611038565b61032260675481565b60685461054f906c01000000000000000000000000900463ffffffff1681565b61033d611063565b6103a561074d3660046128f3565b611093565b61032260665481565b6068546103709067ffffffffffffffff1681565b610322611147565b610322611172565b610322600081565b6107b260017fa04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320d612d84565b81565b60006107e96107e560017f9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6377612d84565b5490565b905090565b60006107e96107e560017f4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ad612d84565b6108266111a1565b61082f81611222565b50565b6107b260017f46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a8612d84565b60006107e97f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c085490565b600080610892610d4b565b5073ffffffffffffffffffffffffffffffffffffffff1673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee141592915050565b6108ce6111a1565b6108d882826112df565b5050565b600054610100900460ff16158080156108fc5750600054600160ff909116105b806109165750303b158015610916575060005460ff166001145b6109a7576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201527f647920696e697469616c697a656400000000000000000000000000000000000060648201526084015b60405180910390fd5b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660011790558015610a0557600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff166101001790555b610a0d61141e565b8751610a1890611093565b610a2588606001516114bd565b610a2f87876112df565b610a38856114e5565b60408801517f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c085560208801517f5a12cb4aeab79fd7e76814330f3e0732946417b36fa088add63d298d3c0f7a3f55610ab9610ab460017f71ac12829d66ee73d8d95bff50b3589745ce57edae70a3fb111a2342464dc598612d84565b849055565b610af0610ae760017f4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ad612d84565b60808401519055565b610b27610b1e60017f52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa907612d84565b60608401519055565b610b5e610b5560017fa04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320d612d84565b60a08401519055565b610b95610b8c60017f383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580637612d84565b8351600461163b565b610bcf610bc360017f46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a8612d84565b6020840151600561163b565b610c09610bfd60017f9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6377612d84565b6040840151600661163b565b610c116116f2565b610c19611784565b610c268260c001516117ec565b610c2f84611ae0565b610c37610d8f565b67ffffffffffffffff168567ffffffffffffffff161015610cb4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f206c6f7700604482015260640161099e565b8015610d1757600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b5050505050505050565b60006107e97f5a12cb4aeab79fd7e76814330f3e0732946417b36fa088add63d298d3c0f7a3f5490565b600080610d56611f54565b90939092509050565b60006107e96107e560017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b6069546000906107e99063ffffffff6a0100000000000000000000820481169116612d9b565b60606107e9611fd1565b6107b260017f383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580637612d84565b610df26111a1565b610dfc6000612092565b565b610e066111a1565b6108d88282612109565b60006107e96107e560017fa04c5bb938ca6fc46d95553abf0a76345ce3e722a30bf4f74928b8e7d852320d612d84565b60006107e96107e560017f383f291819e6d54073bc9a648251d97421076bdd101933c0c022219ce9580637612d84565b610e786111a1565b61082f816114e5565b6107b260017f71ac12829d66ee73d8d95bff50b3589745ce57edae70a3fb111a2342464dc598612d84565b610eb4610d21565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610f6e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602960248201527f53797374656d436f6e6669673a2063616c6c6572206973206e6f74207468652060448201527f6665652061646d696e0000000000000000000000000000000000000000000000606482015260840161099e565b610f7a848484846121df565b50505050565b610f886111a1565b6108d88282612353565b60006107e96107e560017f46adcbebc6be8ce551740c29c47c8798210f23f7f4086c41752944352568d5a8612d84565b610fca6111a1565b61082f816114bd565b60606107e9612525565b60006107e96107e560017f71ac12829d66ee73d8d95bff50b3589745ce57edae70a3fb111a2342464dc598612d84565b6107b260017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b6107b260017f52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa907612d84565b60006107e96107e560017f52322a25d9f59ea17656545543306b7aef62bc0cc53a0e65ccfa0c75b97aa907612d84565b61109b6111a1565b73ffffffffffffffffffffffffffffffffffffffff811661113e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f6464726573730000000000000000000000000000000000000000000000000000606482015260840161099e565b61082f81612092565b6107b260017f9904ba90dde5696cda05c9e0dab5cbaa0fea005ace4d11218a02ac668dad6377612d84565b6107b260017f4b6c74f9e688cb39801f2112c14a8c57232a3fc5202e1444126d4bce86eb19ad612d84565b9055565b60335473ffffffffffffffffffffffffffffffffffffffff163314610dfc576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572604482015260640161099e565b61124b7f65a7ed542fb37fe237fdfbdd70b31598523fe5b32879e307bae27a0bd9581c08829055565b6040805173ffffffffffffffffffffffffffffffffffffffff8316602082015260009101604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052905060035b60007f1d2b0bda21d56b8bd12d4f94ebacffdfb35f5e226f84b461103bb8beab6353be836040516112d39190612c93565b60405180910390a35050565b606880547fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff166801000000000000000063ffffffff8581169182027fffffffffffffffffffffffffffffffff00000000ffffffffffffffffffffffff16929092176c0100000000000000000000000092851692909202919091179091557f0100000000000000000000000000000000000000000000000000000000000000602083811b67ffffffff000000001690921717606681905560655460408051938401919091528201526000906060015b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052905060015b60007f1d2b0bda21d56b8bd12d4f94ebacffdfb35f5e226f84b461103bb8beab6353be836040516114119190612c93565b60405180910390a3505050565b600054610100900460ff166114b5576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e67000000000000000000000000000000000000000000606482015260840161099e565b610dfc6125db565b60678190556040805160208082018490528251808303909101815290820190915260006112a2565b6114ed610d8f565b67ffffffffffffffff168167ffffffffffffffff16101561156a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f206c6f7700604482015260640161099e565b630bebc20067ffffffffffffffff821611156115e2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820181905260248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f2068696768604482015260640161099e565b606880547fffffffffffffffffffffffffffffffffffffffffffffffff00000000000000001667ffffffffffffffff831690811790915560408051602080820193909352815180820390930183528101905260026112a2565b8183556116466107ee565b73ffffffffffffffffffffffffffffffffffffffff1663c0012163828460405160200161168f919073ffffffffffffffffffffffffffffffffffffffff91909116815260200190565b6040516020818303038152906040526040518363ffffffff1660e01b81526004016116bb929190612df6565b600060405180830381600087803b1580156116d557600080fd5b505af11580156116e9573d6000803e3d6000fd5b50505050505050565b6116fa6107ee565b73ffffffffffffffffffffffffffffffffffffffff1663c001216360074660405160200161172a91815260200190565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401611756929190612df6565b600060405180830381600087803b15801561177057600080fd5b505af1158015610f7a573d6000803e3d6000fd5b6117b26107e560017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b600003610dfc57610dfc6117e760017fa11ee3ab75b40e88a0105e935d17cd36c8faee0138320d776c411291bdbbb1a0612d84565b439055565b73ffffffffffffffffffffffffffffffffffffffff81161580159061183b575073ffffffffffffffffffffffffffffffffffffffff811673eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee14155b801561184c575061184a610887565b155b1561082f57601260ff168173ffffffffffffffffffffffffffffffffffffffff1663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156118a1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118c59190612e4e565b60ff1614611955576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602e60248201527f53797374656d436f6e6669673a2062616420646563696d616c73206f6620676160448201527f7320706179696e6720746f6b656e000000000000000000000000000000000000606482015260840161099e565b60006119f08273ffffffffffffffffffffffffffffffffffffffff166306fdde036040518163ffffffff1660e01b8152600401600060405180830381865afa1580156119a5573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526119eb9190810190612e6b565b61267b565b90506000611a428373ffffffffffffffffffffffffffffffffffffffff166395d89b416040518163ffffffff1660e01b8152600401600060405180830381865afa1580156119a5573d6000803e3d6000fd5b9050611a51836012848461271e565b611a596107ee565b6040805173ffffffffffffffffffffffffffffffffffffffff86811660208301526012828401526060820186905260808083018690528351808403909101815260a08301938490527fc001216300000000000000000000000000000000000000000000000000000000909352929092169163c0012163916116bb916000919060a401612df6565b8060a001516fffffffffffffffffffffffffffffffff16816060015163ffffffff161115611b90576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603560248201527f53797374656d436f6e6669673a206d696e206261736520666565206d7573742060448201527f6265206c657373207468616e206d617820626173650000000000000000000000606482015260840161099e565b6001816040015160ff1611611c27576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602f60248201527f53797374656d436f6e6669673a2064656e6f6d696e61746f72206d757374206260448201527f65206c6172676572207468616e20310000000000000000000000000000000000606482015260840161099e565b6068546080820151825167ffffffffffffffff90921691611c489190612f36565b63ffffffff161115611cb6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f53797374656d436f6e6669673a20676173206c696d697420746f6f206c6f7700604482015260640161099e565b6000816020015160ff1611611d4d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602f60248201527f53797374656d436f6e6669673a20656c6173746963697479206d756c7469706c60448201527f6965722063616e6e6f7420626520300000000000000000000000000000000000606482015260840161099e565b8051602082015163ffffffff82169160ff90911690611d6d908290612f55565b611d779190612f9f565b63ffffffff1614611e0a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603760248201527f53797374656d436f6e6669673a20707265636973696f6e206c6f73732077697460448201527f6820746172676574207265736f75726365206c696d6974000000000000000000606482015260840161099e565b805160698054602084015160408501516060860151608087015160a09097015163ffffffff9687167fffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000009095169490941764010000000060ff94851602177fffffffffffffffffffffffffffffffffffffffffffff0000000000ffffffffff166501000000000093909216929092027fffffffffffffffffffffffffffffffffffffffffffff00000000ffffffffffff1617660100000000000091851691909102177fffff0000000000000000000000000000000000000000ffffffffffffffffffff166a010000000000000000000093909416929092027fffff00000000000000000000000000000000ffffffffffffffffffffffffffff16929092176e0100000000000000000000000000006fffffffffffffffffffffffffffffffff90921691909102179055565b60008080611f866107e560017f04adb1412b2ddc16fcc0d4538d5c8f07cf9c83abecc6b41f6f69037b708fbcec612d84565b73ffffffffffffffffffffffffffffffffffffffff81169350905082611fc5575073eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee92601292509050565b60a081901c9150509091565b60606000611fdd611f54565b5090507fffffffffffffffffffffffff111111111111111111111111111111111111111273ffffffffffffffffffffffffffffffffffffffff82160161205657505060408051808201909152600381527f4554480000000000000000000000000000000000000000000000000000000000602082015290565b61208c6120876107e560017fa48b38a4b44951360fbdcbfaaeae5ed6ae92585412e9841b70ec72ed8cd05764612d84565b6127ea565b91505090565b6033805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b7fff000000000000000000000000000000000000000000000000000000000000008116156121b9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f53797374656d436f6e6669673a207363616c61722065786365656473206d617860448201527f2e00000000000000000000000000000000000000000000000000000000000000606482015260840161099e565b6065829055606681905560408051602081018490529081018290526000906060016113ad565b60018460098111156121f3576121f3612dc7565b14806122105750600284600981111561220e5761220e612dc7565b145b8061222c5750600384600981111561222a5761222a612dc7565b145b6122b8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603a60248201527f53797374656d436f6e6669673a20436f6e66696754797065206973206973206e60448201527f6f74206120466565205661756c7420436f6e6669672074797065000000000000606482015260840161099e565b6122c06107ee565b73ffffffffffffffffffffffffffffffffffffffff1663c0012163856122e786868661281e565b6040516020016122f991815260200190565b6040516020818303038152906040526040518363ffffffff1660e01b8152600401612325929190612df6565b600060405180830381600087803b15801561233f57600080fd5b505af1158015610d17573d6000803e3d6000fd5b60018263ffffffff1610156123ea576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f53797374656d436f6e6669673a2064656e6f6d696e61746f72206d757374206260448201527f65203e3d20310000000000000000000000000000000000000000000000000000606482015260840161099e565b60018163ffffffff161015612481576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602560248201527f53797374656d436f6e6669673a20656c6173746963697479206d75737420626560448201527f203e3d2031000000000000000000000000000000000000000000000000000000606482015260840161099e565b606a805463ffffffff83811664010000000081027fffffffffffffffffffffffffffffffffffffffffffffffff000000000000000090931691861691909117919091179091556040516000916124ee91602086811b67ffffffff0000000016909217910190815260200190565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0818403018152919052905060046113e0565b60606000612531611f54565b5090507fffffffffffffffffffffffff111111111111111111111111111111111111111273ffffffffffffffffffffffffffffffffffffffff8216016125aa57505060408051808201909152600581527f4574686572000000000000000000000000000000000000000000000000000000602082015290565b61208c6120876107e560017f657c3582c29b3176614e3a33ddd1ec48352696a04e92b3c0566d72010fa8863d612d84565b600054610100900460ff16612672576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602b60248201527f496e697469616c697a61626c653a20636f6e7472616374206973206e6f74206960448201527f6e697469616c697a696e67000000000000000000000000000000000000000000606482015260840161099e565b610dfc33612092565b600060208251111561270f576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603660248201527f476173506179696e67546f6b656e3a20737472696e672063616e6e6f7420626560448201527f2067726561746572207468616e20333220627974657300000000000000000000606482015260840161099e565b612718826128a1565b92915050565b61278461274c60017f04adb1412b2ddc16fcc0d4538d5c8f07cf9c83abecc6b41f6f69037b708fbcec612d84565b74ff000000000000000000000000000000000000000060a086901b1673ffffffffffffffffffffffffffffffffffffffff8716179055565b6127b76127b260017f657c3582c29b3176614e3a33ddd1ec48352696a04e92b3c0566d72010fa8863d612d84565b839055565b610f7a6127e560017fa48b38a4b44951360fbdcbfaaeae5ed6ae92585412e9841b70ec72ed8cd05764612d84565b829055565b60405160005b82811a15612800576001016127f0565b80825260208201838152600082820152505060408101604052919050565b60006affffffffffffffffffffff831115612865576040517fc4bd89a900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8373ffffffffffffffffffffffffffffffffffffffff1660a084901b60f884600181111561289557612895612dc7565b901b1717949350505050565b8051602181106128b95763ec92f9a36000526004601cfd5b9081015160209190910360031b1b90565b803573ffffffffffffffffffffffffffffffffffffffff811681146128ee57600080fd5b919050565b60006020828403121561290557600080fd5b61290e826128ca565b9392505050565b803563ffffffff811681146128ee57600080fd5b6000806040838503121561293c57600080fd5b61294583612915565b915061295360208401612915565b90509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040516080810167ffffffffffffffff811182821017156129ae576129ae61295c565b60405290565b803567ffffffffffffffff811681146128ee57600080fd5b60ff8116811461082f57600080fd5b600060c082840312156129ed57600080fd5b60405160c0810181811067ffffffffffffffff82111715612a1057612a1061295c565b604052905080612a1f83612915565b81526020830135612a2f816129cc565b60208201526040830135612a42816129cc565b6040820152612a5360608401612915565b6060820152612a6460808401612915565b608082015260a08301356fffffffffffffffffffffffffffffffff81168114612a8c57600080fd5b60a0919091015292915050565b600060e08284031215612aab57600080fd5b60405160e0810181811067ffffffffffffffff82111715612ace57612ace61295c565b604052905080612add836128ca565b8152612aeb602084016128ca565b6020820152612afc604084016128ca565b6040820152612b0d606084016128ca565b6060820152612b1e608084016128ca565b6080820152612b2f60a084016128ca565b60a0820152612b4060c084016128ca565b60c08201525092915050565b60008060008060008060008789036102a0811215612b6957600080fd5b6080811215612b7757600080fd5b50612b8061298b565b612b89896128ca565b8152612b9760208a016128ca565b6020820152612ba860408a016128ca565b6040820152606089810135908201529650612bc560808901612915565b9550612bd360a08901612915565b9450612be160c089016129b4565b9350612bf08960e08a016129db565b9250612bff6101a089016128ca565b9150612c0f896101c08a01612a99565b905092959891949750929550565b60005b83811015612c38578181015183820152602001612c20565b83811115610f7a5750506000910152565b60008151808452612c61816020860160208601612c1d565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60208152600061290e6020830184612c49565b60008060408385031215612cb957600080fd5b50508035926020909101359150565b600060208284031215612cda57600080fd5b61290e826129b4565b60008060008060808587031215612cf957600080fd5b8435600a8110612d0857600080fd5b9350612d16602086016128ca565b925060408501359150606085013560028110612d3157600080fd5b939692955090935050565b600060208284031215612d4e57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600082821015612d9657612d96612d55565b500390565b600067ffffffffffffffff808316818516808303821115612dbe57612dbe612d55565b01949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b6000600a8410612e2f577f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b83825260406020830152612e466040830184612c49565b949350505050565b600060208284031215612e6057600080fd5b815161290e816129cc565b600060208284031215612e7d57600080fd5b815167ffffffffffffffff80821115612e9557600080fd5b818401915084601f830112612ea957600080fd5b815181811115612ebb57612ebb61295c565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908382118183101715612f0157612f0161295c565b81604052828152876020848701011115612f1a57600080fd5b612f2b836020830160208801612c1d565b979650505050505050565b600063ffffffff808316818516808303821115612dbe57612dbe612d55565b600063ffffffff80841680612f93577f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b92169190910492915050565b600063ffffffff80831681851681830481118215151615612fc257612fc2612d55565b0294935050505056fea164736f6c634300080f000a",
+	ABI: "[{\"type\":\"constructor\",\"inputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"BATCH_INBOX_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"DISPUTE_GAME_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_CROSS_DOMAIN_MESSENGER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_ERC_721_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"L1_STANDARD_BRIDGE_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"OPTIMISM_PORTAL_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"START_BLOCK_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"UNSAFE_BLOCK_SIGNER_SLOT\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"VERSION\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"basefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batchInbox\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"batcherHash\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"blobbasefeeScalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"disputeGameFactory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Denominator\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"eip1559Elasticity\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingToken\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"decimals_\",\"type\":\"uint8\",\"internalType\":\"uint8\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenName\",\"inputs\":[],\"outputs\":[{\"name\":\"name_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"gasPayingTokenSymbol\",\"inputs\":[],\"outputs\":[{\"name\":\"symbol_\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"initialize\",\"inputs\":[{\"name\":\"_owner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"},{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"},{\"name\":\"_unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_config\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]},{\"name\":\"_batchInbox\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"_addresses\",\"type\":\"tuple\",\"internalType\":\"structSystemConfig.Addresses\",\"components\":[{\"name\":\"l1CrossDomainMessenger\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1ERC721Bridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"l1StandardBridge\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"disputeGameFactory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismPortal\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"optimismMintableERC20Factory\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"gasPayingToken\",\"type\":\"address\",\"internalType\":\"address\"}]}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"isCustomGasToken\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"bool\",\"internalType\":\"bool\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1CrossDomainMessenger\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1ERC721Bridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"l1StandardBridge\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"maximumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"pure\"},{\"type\":\"function\",\"name\":\"minimumGasLimit\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismMintableERC20Factory\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"optimismPortal\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"overhead\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"owner\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"renounceOwnership\",\"inputs\":[],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"resourceConfig\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"tuple\",\"internalType\":\"structIResourceMetering.ResourceConfig\",\"components\":[{\"name\":\"maxResourceLimit\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"elasticityMultiplier\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"baseFeeMaxChangeDenominator\",\"type\":\"uint8\",\"internalType\":\"uint8\"},{\"name\":\"minimumBaseFee\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"systemTxMaxGas\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"maximumBaseFee\",\"type\":\"uint128\",\"internalType\":\"uint128\"}]}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"scalar\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"setBatcherHash\",\"inputs\":[{\"name\":\"_batcherHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setEIP1559Params\",\"inputs\":[{\"name\":\"_denominator\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_elasticity\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfig\",\"inputs\":[{\"name\":\"_overhead\",\"type\":\"uint256\",\"internalType\":\"uint256\"},{\"name\":\"_scalar\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasConfigEcotone\",\"inputs\":[{\"name\":\"_basefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"},{\"name\":\"_blobbasefeeScalar\",\"type\":\"uint32\",\"internalType\":\"uint32\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setGasLimit\",\"inputs\":[{\"name\":\"_gasLimit\",\"type\":\"uint64\",\"internalType\":\"uint64\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"setUnsafeBlockSigner\",\"inputs\":[{\"name\":\"_unsafeBlockSigner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"startBlock\",\"inputs\":[],\"outputs\":[{\"name\":\"startBlock_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"transferOwnership\",\"inputs\":[{\"name\":\"newOwner\",\"type\":\"address\",\"internalType\":\"address\"}],\"outputs\":[],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"unsafeBlockSigner\",\"inputs\":[],\"outputs\":[{\"name\":\"addr_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"pure\"},{\"type\":\"event\",\"name\":\"ConfigUpdate\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint256\",\"indexed\":true,\"internalType\":\"uint256\"},{\"name\":\"updateType\",\"type\":\"uint8\",\"indexed\":true,\"internalType\":\"enumSystemConfig.UpdateType\"},{\"name\":\"data\",\"type\":\"bytes\",\"indexed\":false,\"internalType\":\"bytes\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initialized\",\"inputs\":[{\"name\":\"version\",\"type\":\"uint8\",\"indexed\":false,\"internalType\":\"uint8\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"OwnershipTransferred\",\"inputs\":[{\"name\":\"previousOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"},{\"name\":\"newOwner\",\"type\":\"address\",\"indexed\":true,\"internalType\":\"address\"}],\"anonymous\":false}]",
 }
 
 // SystemConfigABI is the input ABI used to generate the binding from.
 // Deprecated: Use SystemConfigMetaData.ABI instead.
 var SystemConfigABI = SystemConfigMetaData.ABI
 
-// SystemConfigBin is the compiled bytecode used for deploying new contracts.
-// Deprecated: Use SystemConfigMetaData.Bin instead.
-var SystemConfigBin = SystemConfigMetaData.Bin
-
-// DeploySystemConfig deploys a new Ethereum contract, binding an instance of SystemConfig to it.
-func DeploySystemConfig(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *SystemConfig, error) {
-	parsed, err := SystemConfigMetaData.GetAbi()
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	if parsed == nil {
-		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
-	}
-
-	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(SystemConfigBin), backend)
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	return address, tx, &SystemConfig{SystemConfigCaller: SystemConfigCaller{contract: contract}, SystemConfigTransactor: SystemConfigTransactor{contract: contract}, SystemConfigFilterer: SystemConfigFilterer{contract: contract}}, nil
-}
-
 // SystemConfig is an auto generated Go binding around an Ethereum contract.
 type SystemConfig struct {
 	SystemConfigCaller     // Read-only binding to the contract
@@ -757,37 +727,6 @@ func (_SystemConfig *SystemConfigCallerSession) Eip1559Elasticity() (uint32, err
 	return _SystemConfig.Contract.Eip1559Elasticity(&_SystemConfig.CallOpts)
 }
 
-// FeeAdmin is a free data retrieval call binding the contract method 0x30a402c0.
-//
-// Solidity: function feeAdmin() view returns(address addr_)
-func (_SystemConfig *SystemConfigCaller) FeeAdmin(opts *bind.CallOpts) (common.Address, error) {
-	var out []interface{}
-	err := _SystemConfig.contract.Call(opts, &out, "feeAdmin")
-
-	if err != nil {
-		return *new(common.Address), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(common.Address)).(*common.Address)
-
-	return out0, err
-
-}
-
-// FeeAdmin is a free data retrieval call binding the contract method 0x30a402c0.
-//
-// Solidity: function feeAdmin() view returns(address addr_)
-func (_SystemConfig *SystemConfigSession) FeeAdmin() (common.Address, error) {
-	return _SystemConfig.Contract.FeeAdmin(&_SystemConfig.CallOpts)
-}
-
-// FeeAdmin is a free data retrieval call binding the contract method 0x30a402c0.
-//
-// Solidity: function feeAdmin() view returns(address addr_)
-func (_SystemConfig *SystemConfigCallerSession) FeeAdmin() (common.Address, error) {
-	return _SystemConfig.Contract.FeeAdmin(&_SystemConfig.CallOpts)
-}
-
 // GasLimit is a free data retrieval call binding the contract method 0xf68016b7.
 //
 // Solidity: function gasLimit() view returns(uint64)
@@ -1391,25 +1330,25 @@ func (_SystemConfig *SystemConfigCallerSession) Version() (string, error) {
 	return _SystemConfig.Contract.Version(&_SystemConfig.CallOpts)
 }
 
-// Initialize is a paid mutator transaction binding the contract method 0x22b4dded.
+// Initialize is a paid mutator transaction binding the contract method 0xdb9040fa.
 //
-// Solidity: function initialize((address,address,address,bytes32) _roles, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, uint64 _gasLimit, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
-func (_SystemConfig *SystemConfigTransactor) Initialize(opts *bind.TransactOpts, _roles SystemConfigRoles, _basefeeScalar uint32, _blobbasefeeScalar uint32, _gasLimit uint64, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
-	return _SystemConfig.contract.Transact(opts, "initialize", _roles, _basefeeScalar, _blobbasefeeScalar, _gasLimit, _config, _batchInbox, _addresses)
+// Solidity: function initialize(address _owner, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, bytes32 _batcherHash, uint64 _gasLimit, address _unsafeBlockSigner, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
+func (_SystemConfig *SystemConfigTransactor) Initialize(opts *bind.TransactOpts, _owner common.Address, _basefeeScalar uint32, _blobbasefeeScalar uint32, _batcherHash [32]byte, _gasLimit uint64, _unsafeBlockSigner common.Address, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
+	return _SystemConfig.contract.Transact(opts, "initialize", _owner, _basefeeScalar, _blobbasefeeScalar, _batcherHash, _gasLimit, _unsafeBlockSigner, _config, _batchInbox, _addresses)
 }
 
-// Initialize is a paid mutator transaction binding the contract method 0x22b4dded.
+// Initialize is a paid mutator transaction binding the contract method 0xdb9040fa.
 //
-// Solidity: function initialize((address,address,address,bytes32) _roles, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, uint64 _gasLimit, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
-func (_SystemConfig *SystemConfigSession) Initialize(_roles SystemConfigRoles, _basefeeScalar uint32, _blobbasefeeScalar uint32, _gasLimit uint64, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
-	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _roles, _basefeeScalar, _blobbasefeeScalar, _gasLimit, _config, _batchInbox, _addresses)
+// Solidity: function initialize(address _owner, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, bytes32 _batcherHash, uint64 _gasLimit, address _unsafeBlockSigner, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
+func (_SystemConfig *SystemConfigSession) Initialize(_owner common.Address, _basefeeScalar uint32, _blobbasefeeScalar uint32, _batcherHash [32]byte, _gasLimit uint64, _unsafeBlockSigner common.Address, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
+	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _owner, _basefeeScalar, _blobbasefeeScalar, _batcherHash, _gasLimit, _unsafeBlockSigner, _config, _batchInbox, _addresses)
 }
 
-// Initialize is a paid mutator transaction binding the contract method 0x22b4dded.
+// Initialize is a paid mutator transaction binding the contract method 0xdb9040fa.
 //
-// Solidity: function initialize((address,address,address,bytes32) _roles, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, uint64 _gasLimit, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
-func (_SystemConfig *SystemConfigTransactorSession) Initialize(_roles SystemConfigRoles, _basefeeScalar uint32, _blobbasefeeScalar uint32, _gasLimit uint64, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
-	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _roles, _basefeeScalar, _blobbasefeeScalar, _gasLimit, _config, _batchInbox, _addresses)
+// Solidity: function initialize(address _owner, uint32 _basefeeScalar, uint32 _blobbasefeeScalar, bytes32 _batcherHash, uint64 _gasLimit, address _unsafeBlockSigner, (uint32,uint8,uint8,uint32,uint32,uint128) _config, address _batchInbox, (address,address,address,address,address,address,address) _addresses) returns()
+func (_SystemConfig *SystemConfigTransactorSession) Initialize(_owner common.Address, _basefeeScalar uint32, _blobbasefeeScalar uint32, _batcherHash [32]byte, _gasLimit uint64, _unsafeBlockSigner common.Address, _config IResourceMeteringResourceConfig, _batchInbox common.Address, _addresses SystemConfigAddresses) (*types.Transaction, error) {
+	return _SystemConfig.Contract.Initialize(&_SystemConfig.TransactOpts, _owner, _basefeeScalar, _blobbasefeeScalar, _batcherHash, _gasLimit, _unsafeBlockSigner, _config, _batchInbox, _addresses)
 }
 
 // RenounceOwnership is a paid mutator transaction binding the contract method 0x715018a6.
@@ -1475,27 +1414,6 @@ func (_SystemConfig *SystemConfigTransactorSession) SetEIP1559Params(_denominato
 	return _SystemConfig.Contract.SetEIP1559Params(&_SystemConfig.TransactOpts, _denominator, _elasticity)
 }
 
-// SetFeeVaultConfig is a paid mutator transaction binding the contract method 0xbe4be783.
-//
-// Solidity: function setFeeVaultConfig(uint8 _type, address _recipient, uint256 _min, uint8 _network) returns()
-func (_SystemConfig *SystemConfigTransactor) SetFeeVaultConfig(opts *bind.TransactOpts, _type uint8, _recipient common.Address, _min *big.Int, _network uint8) (*types.Transaction, error) {
-	return _SystemConfig.contract.Transact(opts, "setFeeVaultConfig", _type, _recipient, _min, _network)
-}
-
-// SetFeeVaultConfig is a paid mutator transaction binding the contract method 0xbe4be783.
-//
-// Solidity: function setFeeVaultConfig(uint8 _type, address _recipient, uint256 _min, uint8 _network) returns()
-func (_SystemConfig *SystemConfigSession) SetFeeVaultConfig(_type uint8, _recipient common.Address, _min *big.Int, _network uint8) (*types.Transaction, error) {
-	return _SystemConfig.Contract.SetFeeVaultConfig(&_SystemConfig.TransactOpts, _type, _recipient, _min, _network)
-}
-
-// SetFeeVaultConfig is a paid mutator transaction binding the contract method 0xbe4be783.
-//
-// Solidity: function setFeeVaultConfig(uint8 _type, address _recipient, uint256 _min, uint8 _network) returns()
-func (_SystemConfig *SystemConfigTransactorSession) SetFeeVaultConfig(_type uint8, _recipient common.Address, _min *big.Int, _network uint8) (*types.Transaction, error) {
-	return _SystemConfig.Contract.SetFeeVaultConfig(&_SystemConfig.TransactOpts, _type, _recipient, _min, _network)
-}
-
 // SetGasConfig is a paid mutator transaction binding the contract method 0x935f029e.
 //
 // Solidity: function setGasConfig(uint256 _overhead, uint256 _scalar) returns()
diff --git a/op-e2e/system/gastoken/gastoken_test.go b/op-e2e/system/gastoken/gastoken_test.go
index d83592f28b01..7e03b19d3930 100644
--- a/op-e2e/system/gastoken/gastoken_test.go
+++ b/op-e2e/system/gastoken/gastoken_test.go
@@ -159,21 +159,18 @@ func setCustomGasToken(t *testing.T, cfg e2esys.SystemConfig, sys *e2esys.System
 	require.NoError(t, err)
 
 	// Get existing parameters from SystemConfigProxy contract
-	roles := bindings.SystemConfigRoles{}
-	roles.Owner, err = systemConfig.Owner(&bind.CallOpts{})
-	require.NoError(t, err)
-	roles.FeeAdmin, err = systemConfig.FeeAdmin(&bind.CallOpts{})
-	require.NoError(t, err)
-	roles.UnsafeBlockSigner, err = systemConfig.UnsafeBlockSigner(&bind.CallOpts{})
-	require.NoError(t, err)
-	roles.BatcherHash, err = systemConfig.BatcherHash(&bind.CallOpts{})
+	owner, err := systemConfig.Owner(&bind.CallOpts{})
 	require.NoError(t, err)
 	basefeeScalar, err := systemConfig.BasefeeScalar(&bind.CallOpts{})
 	require.NoError(t, err)
 	blobbasefeeScalar, err := systemConfig.BlobbasefeeScalar(&bind.CallOpts{})
 	require.NoError(t, err)
+	batcherHash, err := systemConfig.BatcherHash(&bind.CallOpts{})
+	require.NoError(t, err)
 	gasLimit, err := systemConfig.GasLimit(&bind.CallOpts{})
 	require.NoError(t, err)
+	unsafeBlockSigner, err := systemConfig.UnsafeBlockSigner(&bind.CallOpts{})
+	require.NoError(t, err)
 	resourceConfig, err := systemConfig.ResourceConfig(&bind.CallOpts{})
 	require.NoError(t, err)
 	batchInbox, err := systemConfig.BatchInbox(&bind.CallOpts{})
@@ -231,10 +228,12 @@ func setCustomGasToken(t *testing.T, cfg e2esys.SystemConfig, sys *e2esys.System
 	waitForTx(t, tx, err, l1Client)
 
 	// Reinitialise with existing initializer values but with custom gas token set
-	tx, err = systemConfig.Initialize(deployerOpts, roles,
+	tx, err = systemConfig.Initialize(deployerOpts, owner,
 		basefeeScalar,
 		blobbasefeeScalar,
+		batcherHash,
 		gasLimit,
+		unsafeBlockSigner,
 		resourceConfig,
 		batchInbox,
 		addresses)
diff --git a/packages/contracts-bedrock/.gas-snapshot b/packages/contracts-bedrock/.gas-snapshot
index 39eba667c79e..1b1a01905ba5 100644
--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
@@ -4,14 +4,14 @@ GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchm
 GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_benchmark() (gas: 5099)
 GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158531)
 GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 367239)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2965379)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 560245)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4072288)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 462746)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3508450)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 70492)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369280)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967420)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564398)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076613)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467098)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512802)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72664)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68366)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68930)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155655)
\ No newline at end of file
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68422)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68986)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155610)
\ No newline at end of file
diff --git a/packages/contracts-bedrock/deploy-config/devnetL1-template.json b/packages/contracts-bedrock/deploy-config/devnetL1-template.json
index bec9c6631793..2f275f46c4f6 100644
--- a/packages/contracts-bedrock/deploy-config/devnetL1-template.json
+++ b/packages/contracts-bedrock/deploy-config/devnetL1-template.json
@@ -27,7 +27,6 @@
   "sequencerFeeVaultWithdrawalNetwork": 0,
   "proxyAdminOwner": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "finalSystemOwner": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
-  "systemConfigFeeAdmin": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "superchainConfigGuardian": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "finalizationPeriodSeconds": 2,
   "fundDevAccounts": true,
diff --git a/packages/contracts-bedrock/deploy-config/hardhat.json b/packages/contracts-bedrock/deploy-config/hardhat.json
index 9009f9157d3e..965d403d4d82 100644
--- a/packages/contracts-bedrock/deploy-config/hardhat.json
+++ b/packages/contracts-bedrock/deploy-config/hardhat.json
@@ -1,6 +1,5 @@
 {
   "finalSystemOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
-  "systemConfigFeeAdmin": "0x976EA74026E726554dB657fA54763abd0C3a0aa9",
   "superchainConfigGuardian": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
   "proxyAdminOwner": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
   "l1StartingBlockTag": "earliest",
diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 78c932ac7eea..b2ea03b86538 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -76,8 +76,8 @@ runs = 256
 depth = 32
 
 [profile.ciheavy]
-# temp reduce fuzz runs for 1 pr
 # fuzz = { runs = 20000 }
+# temporary reduce fuzz runs to unblock CI
 fuzz = { runs = 200 }
 
 [profile.ciheavy.invariant]
diff --git a/packages/contracts-bedrock/scripts/Artifacts.s.sol b/packages/contracts-bedrock/scripts/Artifacts.s.sol
index c516d2cf55e9..3ed021ea9dbb 100644
--- a/packages/contracts-bedrock/scripts/Artifacts.s.sol
+++ b/packages/contracts-bedrock/scripts/Artifacts.s.sol
@@ -47,6 +47,7 @@ abstract contract Artifacts {
     /// @notice Setup function. The arguments here
     function setUp() public virtual {
         deploymentOutfile = Config.deploymentOutfile();
+        console.log("Writing artifact to %s", deploymentOutfile);
         ForgeArtifacts.ensurePath(deploymentOutfile);
 
         uint256 chainId = Config.chainID();
@@ -182,6 +183,7 @@ abstract contract Artifacts {
     /// @param _name The name of the deployment.
     /// @param _deployed The address of the deployment.
     function save(string memory _name, address _deployed) public {
+        console.log("Saving %s: %s", _name, _deployed);
         if (bytes(_name).length == 0) {
             revert InvalidDeployment("EmptyName");
         }
diff --git a/packages/contracts-bedrock/scripts/L2Genesis.s.sol b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
index 098cb5e390f4..207c59732146 100644
--- a/packages/contracts-bedrock/scripts/L2Genesis.s.sol
+++ b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
@@ -8,28 +8,27 @@ import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 // Scripts
 import { Deployer } from "scripts/deploy/Deployer.sol";
 import { Config, OutputMode, OutputModeUtils, Fork, ForkUtils, LATEST_FORK } from "scripts/libraries/Config.sol";
-import { DeployConfig } from "scripts/deploy/DeployConfig.s.sol";
 import { Process } from "scripts/libraries/Process.sol";
 import { SetPreinstalls } from "scripts/SetPreinstalls.s.sol";
-
-// Contracts
-import { SequencerFeeVault } from "src/L2/SequencerFeeVault.sol";
-import { BaseFeeVault } from "src/L2/BaseFeeVault.sol";
-import { L1FeeVault } from "src/L2/L1FeeVault.sol";
-import { OptimismSuperchainERC20Beacon } from "src/L2/OptimismSuperchainERC20Beacon.sol";
-import { OptimismMintableERC721Factory } from "src/L2/OptimismMintableERC721Factory.sol";
-import { GovernanceToken } from "src/governance/GovernanceToken.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
-import { Constants } from "src/libraries/Constants.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
+import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
+import { IBaseFeeVault } from "src/L2/interfaces/IBaseFeeVault.sol";
+import { IL1FeeVault } from "src/L2/interfaces/IL1FeeVault.sol";
+import { IOptimismMintableERC721Factory } from "src/universal/interfaces/IOptimismMintableERC721Factory.sol";
 import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
+import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
+import { IL2StandardBridge } from "src/L2/interfaces/IL2StandardBridge.sol";
+import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
+import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
 import { IGasPriceOracle } from "src/L2/interfaces/IGasPriceOracle.sol";
 import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 
@@ -111,12 +110,7 @@ contract L2Genesis is Deployer {
     ///         Sets the precompiles, proxies, and the implementation accounts to be `vm.dumpState`
     ///         to generate a L2 genesis alloc.
     function runWithStateDump() public {
-        runWithOptions({
-            _mode: Config.outputMode(),
-            _fork: Config.fork(),
-            _populateNetworkConfig: true,
-            _l1Dependencies: artifactDependencies()
-        });
+        runWithOptions(Config.outputMode(), cfg.fork(), artifactDependencies());
     }
 
     /// @notice Alias for `runWithStateDump` so that no `--sig` needs to be specified.
@@ -126,72 +120,45 @@ contract L2Genesis is Deployer {
 
     /// @notice This is used by op-e2e to have a version of the L2 allocs for each upgrade.
     function runWithAllUpgrades() public {
-        console.log("L2Genesis: runWithAllUpgrades");
-        runWithOptions({
-            _mode: OutputMode.ALL,
-            _fork: LATEST_FORK,
-            _populateNetworkConfig: true,
-            _l1Dependencies: artifactDependencies()
-        });
+        runWithOptions(OutputMode.ALL, LATEST_FORK, artifactDependencies());
     }
 
     /// @notice This is used by new experimental interop deploy tooling.
     function runWithEnv() public {
         //  The setUp() is skipped (since we insert a custom DeployConfig, and do not use Artifacts)
         deployer = makeAddr("deployer");
-        runWithOptions({
-            _mode: OutputMode.NONE,
-            _fork: Config.fork(),
-            _populateNetworkConfig: false,
-            _l1Dependencies: L1Dependencies({
+        runWithOptions(
+            OutputMode.NONE,
+            Config.fork(),
+            L1Dependencies({
                 l1CrossDomainMessengerProxy: payable(vm.envAddress("L2GENESIS_L1CrossDomainMessengerProxy")),
                 l1StandardBridgeProxy: payable(vm.envAddress("L2GENESIS_L1StandardBridgeProxy")),
                 l1ERC721BridgeProxy: payable(vm.envAddress("L2GENESIS_L1ERC721BridgeProxy"))
             })
-        });
+        );
     }
 
     /// @notice This is used by foundry tests to enable the latest fork with the
     ///         given L1 dependencies.
     function runWithLatestLocal(L1Dependencies memory _l1Dependencies) public {
-        runWithOptions({
-            _mode: OutputMode.NONE,
-            _fork: LATEST_FORK,
-            _populateNetworkConfig: true,
-            _l1Dependencies: _l1Dependencies
-        });
+        runWithOptions(OutputMode.NONE, LATEST_FORK, _l1Dependencies);
     }
 
     /// @notice Build the L2 genesis.
-    /// @param _mode The mode to run the script in.
-    /// @param _fork The fork to build the genesis for.
-    /// @param _populateNetworkConfig If true, the L1 Block contract will be populated with network specific
-    ///                                configuration. Otherwise, the standard genesis will be built.
-    function runWithOptions(
-        OutputMode _mode,
-        Fork _fork,
-        bool _populateNetworkConfig,
-        L1Dependencies memory _l1Dependencies
-    )
-        public
-    {
+    function runWithOptions(OutputMode _mode, Fork _fork, L1Dependencies memory _l1Dependencies) public {
         console.log("L2Genesis: outputMode: %s, fork: %s", _mode.toString(), _fork.toString());
         vm.startPrank(deployer);
         vm.chainId(cfg.l2ChainID());
 
         dealEthToPrecompiles();
         setPredeployProxies();
-        setPredeployImplementations();
+        setPredeployImplementations(_l1Dependencies);
         setPreinstalls();
         if (cfg.fundDevAccounts()) {
             fundDevAccounts();
         }
         vm.stopPrank();
 
-        if (_populateNetworkConfig) {
-            _setNetworkConfig(_l1Dependencies, cfg);
-        }
-
         if (writeForkGenesisAllocs(_fork, Fork.DELTA, _mode)) {
             return;
         }
@@ -215,59 +182,6 @@ contract L2Genesis is Deployer {
         if (writeForkGenesisAllocs(_fork, Fork.HOLOCENE, _mode)) {
             return;
         }
-
-        if (writeForkGenesisAllocs(_fork, Fork.ISTHMUS, _mode)) {
-            return;
-        }
-    }
-
-    /// @notice Sets network-specific configuration in the L1Block contract
-    /// @param _l1Dependencies The L1 contract dependencies needed for configuration
-    function _setNetworkConfig(L1Dependencies memory _l1Dependencies, DeployConfig _config) internal {
-        console.log("L2Genesis: Modify the standard L2 genesis with network specific configuration");
-        vm.startPrank(Constants.DEPOSITOR_ACCOUNT);
-
-        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
-            Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS, abi.encode(_l1Dependencies.l1ERC721BridgeProxy)
-        );
-        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
-            Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS, abi.encode(_l1Dependencies.l1CrossDomainMessengerProxy)
-        );
-        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
-            Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS, abi.encode(_l1Dependencies.l1StandardBridgeProxy)
-        );
-
-        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
-            Types.ConfigType.REMOTE_CHAIN_ID, abi.encode(_config.l1ChainID())
-        );
-
-        bytes32 sequencerFeeVaultConfig = Encoding.encodeFeeVaultConfig({
-            _recipient: _config.sequencerFeeVaultRecipient(),
-            _amount: _config.sequencerFeeVaultMinimumWithdrawalAmount(),
-            _network: Types.WithdrawalNetwork(_config.sequencerFeeVaultWithdrawalNetwork())
-        });
-        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
-            Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG, abi.encode(sequencerFeeVaultConfig)
-        );
-
-        bytes32 baseFeeVaultConfig = Encoding.encodeFeeVaultConfig({
-            _recipient: _config.baseFeeVaultRecipient(),
-            _amount: _config.baseFeeVaultMinimumWithdrawalAmount(),
-            _network: Types.WithdrawalNetwork(_config.baseFeeVaultWithdrawalNetwork())
-        });
-        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
-            Types.ConfigType.BASE_FEE_VAULT_CONFIG, abi.encode(baseFeeVaultConfig)
-        );
-
-        bytes32 l1FeeVaultConfig = Encoding.encodeFeeVaultConfig({
-            _recipient: _config.l1FeeVaultRecipient(),
-            _amount: _config.l1FeeVaultMinimumWithdrawalAmount(),
-            _network: Types.WithdrawalNetwork(_config.l1FeeVaultWithdrawalNetwork())
-        });
-        IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).setConfig(
-            Types.ConfigType.L1_FEE_VAULT_CONFIG, abi.encode(l1FeeVaultConfig)
-        );
-        vm.stopPrank();
     }
 
     function writeForkGenesisAllocs(Fork _latest, Fork _current, OutputMode _mode) internal returns (bool isLatest_) {
@@ -327,20 +241,24 @@ contract L2Genesis is Deployer {
     /// @notice Sets all the implementations for the predeploy proxies. For contracts without proxies,
     ///      sets the deployed bytecode at their expected predeploy address.
     ///      LEGACY_ERC20_ETH and L1_MESSAGE_SENDER are deprecated and are not set.
-    function setPredeployImplementations() internal {
+    function setPredeployImplementations(L1Dependencies memory _l1Dependencies) internal {
+        console.log("Setting predeploy implementations with L1 contract dependencies:");
+        console.log("- L1CrossDomainMessengerProxy: %s", _l1Dependencies.l1CrossDomainMessengerProxy);
+        console.log("- L1StandardBridgeProxy: %s", _l1Dependencies.l1StandardBridgeProxy);
+        console.log("- L1ERC721BridgeProxy: %s", _l1Dependencies.l1ERC721BridgeProxy);
         setLegacyMessagePasser(); // 0
         // 01: legacy, not used in OP-Stack
         setDeployerWhitelist(); // 2
         // 3,4,5: legacy, not used in OP-Stack.
         setWETH(); // 6: WETH (not behind a proxy)
-        setL2CrossDomainMessenger(); // 7
+        setL2CrossDomainMessenger(_l1Dependencies.l1CrossDomainMessengerProxy); // 7
         // 8,9,A,B,C,D,E: legacy, not used in OP-Stack.
         setGasPriceOracle(); // f
-        setL2StandardBridge(); // 10
+        setL2StandardBridge(_l1Dependencies.l1StandardBridgeProxy); // 10
         setSequencerFeeVault(); // 11
         setOptimismMintableERC20Factory(); // 12
         setL1BlockNumber(); // 13
-        setL2ERC721Bridge(); // 14
+        setL2ERC721Bridge(_l1Dependencies.l1ERC721BridgeProxy); // 14
         setL1Block(); // 15
         setL2ToL1MessagePasser(); // 16
         setOptimismMintableERC721Factory(); // 17
@@ -366,9 +284,12 @@ contract L2Genesis is Deployer {
         // Note the ProxyAdmin implementation itself is behind a proxy that owns itself.
         address impl = _setImplementationCode(Predeploys.PROXY_ADMIN);
 
-        // update the proxy to not be uninitialized (although not standard initialize pattern)
         bytes32 _ownerSlot = bytes32(0);
-        vm.store(impl, _ownerSlot, bytes32(uint256(0xdead)));
+
+        // there is no initialize() function, so we just set the storage manually.
+        vm.store(Predeploys.PROXY_ADMIN, _ownerSlot, bytes32(uint256(uint160(cfg.proxyAdminOwner()))));
+        // update the proxy to not be uninitialized (although not standard initialize pattern)
+        vm.store(impl, _ownerSlot, bytes32(uint256(uint160(cfg.proxyAdminOwner()))));
     }
 
     function setL2ToL1MessagePasser() public {
@@ -376,40 +297,102 @@ contract L2Genesis is Deployer {
     }
 
     /// @notice This predeploy is following the safety invariant #1.
-    function setL2CrossDomainMessenger() public {
-        _setImplementationCode(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
+    function setL2CrossDomainMessenger(address payable _l1CrossDomainMessengerProxy) public {
+        address impl = _setImplementationCode(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
+
+        IL2CrossDomainMessenger(impl).initialize({ _l1CrossDomainMessenger: ICrossDomainMessenger(address(0)) });
+
+        IL2CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER).initialize({
+            _l1CrossDomainMessenger: ICrossDomainMessenger(_l1CrossDomainMessengerProxy)
+        });
     }
 
     /// @notice This predeploy is following the safety invariant #1.
-    function setL2StandardBridge() public {
+    function setL2StandardBridge(address payable _l1StandardBridgeProxy) public {
+        address impl;
         if (cfg.useInterop()) {
             string memory cname = "L2StandardBridgeInterop";
-            address impl = Predeploys.predeployToCodeNamespace(Predeploys.L2_STANDARD_BRIDGE);
+            impl = Predeploys.predeployToCodeNamespace(Predeploys.L2_STANDARD_BRIDGE);
             console.log("Setting %s implementation at: %s", cname, impl);
             vm.etch(impl, vm.getDeployedCode(string.concat(cname, ".sol:", cname)));
         } else {
-            _setImplementationCode(Predeploys.L2_STANDARD_BRIDGE);
+            impl = _setImplementationCode(Predeploys.L2_STANDARD_BRIDGE);
         }
+
+        IL2StandardBridge(payable(impl)).initialize({ _otherBridge: IStandardBridge(payable(address(0))) });
+
+        IL2StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE)).initialize({
+            _otherBridge: IStandardBridge(_l1StandardBridgeProxy)
+        });
     }
 
     /// @notice This predeploy is following the safety invariant #1.
-    function setL2ERC721Bridge() public {
-        _setImplementationCode(Predeploys.L2_ERC721_BRIDGE);
+    function setL2ERC721Bridge(address payable _l1ERC721BridgeProxy) public {
+        address impl = _setImplementationCode(Predeploys.L2_ERC721_BRIDGE);
+
+        IL2ERC721Bridge(impl).initialize({ _l1ERC721Bridge: payable(address(0)) });
+
+        IL2ERC721Bridge(Predeploys.L2_ERC721_BRIDGE).initialize({ _l1ERC721Bridge: payable(_l1ERC721BridgeProxy) });
     }
 
     /// @notice This predeploy is following the safety invariant #2,
     function setSequencerFeeVault() public {
-        _setImplementationCode(Predeploys.SEQUENCER_FEE_WALLET);
+        ISequencerFeeVault vault = ISequencerFeeVault(
+            DeployUtils.create1(
+                "SequencerFeeVault",
+                DeployUtils.encodeConstructor(
+                    abi.encodeCall(
+                        ISequencerFeeVault.__constructor__,
+                        (
+                            cfg.sequencerFeeVaultRecipient(),
+                            cfg.sequencerFeeVaultMinimumWithdrawalAmount(),
+                            Types.WithdrawalNetwork(cfg.sequencerFeeVaultWithdrawalNetwork())
+                        )
+                    )
+                )
+            )
+        );
+
+        address impl = Predeploys.predeployToCodeNamespace(Predeploys.SEQUENCER_FEE_WALLET);
+        console.log("Setting %s implementation at: %s", "SequencerFeeVault", impl);
+        vm.etch(impl, address(vault).code);
+
+        /// Reset so its not included state dump
+        vm.etch(address(vault), "");
+        vm.resetNonce(address(vault));
     }
 
     /// @notice This predeploy is following the safety invariant #1.
     function setOptimismMintableERC20Factory() public {
-        _setImplementationCode(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
+        address impl = _setImplementationCode(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
+
+        IOptimismMintableERC20Factory(impl).initialize({ _bridge: address(0) });
+
+        IOptimismMintableERC20Factory(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY).initialize({
+            _bridge: Predeploys.L2_STANDARD_BRIDGE
+        });
     }
 
     /// @notice This predeploy is following the safety invariant #2,
     function setOptimismMintableERC721Factory() public {
-        _setImplementationCode(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
+        IOptimismMintableERC721Factory factory = IOptimismMintableERC721Factory(
+            DeployUtils.create1(
+                "OptimismMintableERC721Factory",
+                DeployUtils.encodeConstructor(
+                    abi.encodeCall(
+                        IOptimismMintableERC721Factory.__constructor__, (Predeploys.L2_ERC721_BRIDGE, cfg.l1ChainID())
+                    )
+                )
+            )
+        );
+
+        address impl = Predeploys.predeployToCodeNamespace(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
+        console.log("Setting %s implementation at: %s", "OptimismMintableERC721Factory", impl);
+        vm.etch(impl, address(factory).code);
+
+        /// Reset so its not included state dump
+        vm.etch(address(factory), "");
+        vm.resetNonce(address(factory));
     }
 
     /// @notice This predeploy is following the safety invariant #1.
@@ -456,12 +439,56 @@ contract L2Genesis is Deployer {
 
     /// @notice This predeploy is following the safety invariant #2.
     function setBaseFeeVault() public {
-        _setImplementationCode(Predeploys.BASE_FEE_VAULT);
+        IBaseFeeVault vault = IBaseFeeVault(
+            DeployUtils.create1(
+                "BaseFeeVault",
+                DeployUtils.encodeConstructor(
+                    abi.encodeCall(
+                        IBaseFeeVault.__constructor__,
+                        (
+                            cfg.baseFeeVaultRecipient(),
+                            cfg.baseFeeVaultMinimumWithdrawalAmount(),
+                            Types.WithdrawalNetwork(cfg.baseFeeVaultWithdrawalNetwork())
+                        )
+                    )
+                )
+            )
+        );
+
+        address impl = Predeploys.predeployToCodeNamespace(Predeploys.BASE_FEE_VAULT);
+        console.log("Setting %s implementation at: %s", "BaseFeeVault", impl);
+        vm.etch(impl, address(vault).code);
+
+        /// Reset so its not included state dump
+        vm.etch(address(vault), "");
+        vm.resetNonce(address(vault));
     }
 
     /// @notice This predeploy is following the safety invariant #2.
     function setL1FeeVault() public {
-        _setImplementationCode(Predeploys.L1_FEE_VAULT);
+        IL1FeeVault vault = IL1FeeVault(
+            DeployUtils.create1(
+                "L1FeeVault",
+                DeployUtils.encodeConstructor(
+                    abi.encodeCall(
+                        IL1FeeVault.__constructor__,
+                        (
+                            cfg.l1FeeVaultRecipient(),
+                            cfg.l1FeeVaultMinimumWithdrawalAmount(),
+                            Types.WithdrawalNetwork(cfg.l1FeeVaultWithdrawalNetwork())
+                        )
+                    )
+                )
+            )
+        );
+
+        address impl = Predeploys.predeployToCodeNamespace(Predeploys.L1_FEE_VAULT);
+        console.log("Setting %s implementation at: %s", "L1FeeVault", impl);
+        vm.etch(impl, address(vault).code);
+
+        /// Reset so its not included state dump
+        vm.etch(address(vault), "");
+        vm.resetNonce(address(vault));
     }
 
     /// @notice This predeploy is following the safety invariant #2.
diff --git a/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol b/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
index e176a1d7c53e..25d67be3828c 100644
--- a/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
+++ b/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
@@ -13,7 +13,6 @@ import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Types } from "scripts/libraries/Types.sol";
-import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Interfaces
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
@@ -41,7 +40,8 @@ library ChainAssertions {
     function postDeployAssertions(
         Types.ContractSet memory _prox,
         DeployConfig _cfg,
-        uint256 _l2OutputOracleStartingTimestamp
+        uint256 _l2OutputOracleStartingTimestamp,
+        Vm _vm
     )
         internal
         view
@@ -52,7 +52,7 @@ library ChainAssertions {
         require(keccak256(abi.encode(rcfg)) == keccak256(abi.encode(dflt)));
 
         checkSystemConfig({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
-        checkL1CrossDomainMessenger({ _contracts: _prox, _isProxy: true });
+        checkL1CrossDomainMessenger({ _contracts: _prox, _vm: _vm, _isProxy: true });
         checkL1StandardBridge({ _contracts: _prox, _isProxy: true });
         checkL2OutputOracle({
             _contracts: _prox,
@@ -77,7 +77,7 @@ library ChainAssertions {
         );
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(config), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(config), _slot: 0, _offset: 0 });
 
         IResourceMetering.ResourceConfig memory resourceConfig = config.resourceConfig();
 
@@ -109,18 +109,18 @@ library ChainAssertions {
             require(config.optimismPortal() == _contracts.OptimismPortal, "CHECK-SCFG-200");
             require(config.optimismMintableERC20Factory() == _contracts.OptimismMintableERC20Factory, "CHECK-SCFG-210");
         } else {
-            require(config.owner() == address(0), "CHECK-SCFG-220");
+            require(config.owner() == address(0xdead), "CHECK-SCFG-220");
             require(config.overhead() == 0, "CHECK-SCFG-230");
-            require(config.scalar() == 0, "CHECK-SCFG-240");
+            require(config.scalar() == uint256(0x01) << 248, "CHECK-SCFG-240"); // version 1
             require(config.basefeeScalar() == 0, "CHECK-SCFG-250");
             require(config.blobbasefeeScalar() == 0, "CHECK-SCFG-260");
             require(config.batcherHash() == bytes32(0), "CHECK-SCFG-270");
-            require(config.gasLimit() == 0, "CHECK-SCFG-280");
+            require(config.gasLimit() == 1, "CHECK-SCFG-280");
             require(config.unsafeBlockSigner() == address(0), "CHECK-SCFG-290");
             // Check _config
-            require(resourceConfig.maxResourceLimit == 0, "CHECK-SCFG-300");
-            require(resourceConfig.elasticityMultiplier == 0, "CHECK-SCFG-310");
-            require(resourceConfig.baseFeeMaxChangeDenominator == 0, "CHECK-SCFG-320");
+            require(resourceConfig.maxResourceLimit == 1, "CHECK-SCFG-300");
+            require(resourceConfig.elasticityMultiplier == 1, "CHECK-SCFG-310");
+            require(resourceConfig.baseFeeMaxChangeDenominator == 2, "CHECK-SCFG-320");
             require(resourceConfig.systemTxMaxGas == 0, "CHECK-SCFG-330");
             require(resourceConfig.minimumBaseFee == 0, "CHECK-SCFG-340");
             require(resourceConfig.maximumBaseFee == 0, "CHECK-SCFG-350");
@@ -163,7 +163,7 @@ library ChainAssertions {
     }
 
     /// @notice Asserts that the L1CrossDomainMessenger is setup correctly
-    function checkL1CrossDomainMessenger(Types.ContractSet memory _contracts, bool _isProxy) internal view {
+    function checkL1CrossDomainMessenger(Types.ContractSet memory _contracts, Vm _vm, bool _isProxy) internal view {
         IL1CrossDomainMessenger messenger = IL1CrossDomainMessenger(_contracts.L1CrossDomainMessenger);
         console.log(
             "Running chain assertions on the L1CrossDomainMessenger %s at %s",
@@ -173,7 +173,7 @@ library ChainAssertions {
         require(address(messenger) != address(0), "CHECK-L1XDM-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 250, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(messenger), _slot: 0, _offset: 20 });
 
         require(address(messenger.OTHER_MESSENGER()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "CHECK-L1XDM-20");
         require(address(messenger.otherMessenger()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "CHECK-L1XDM-30");
@@ -182,6 +182,8 @@ library ChainAssertions {
             require(address(messenger.PORTAL()) == _contracts.OptimismPortal, "CHECK-L1XDM-40");
             require(address(messenger.portal()) == _contracts.OptimismPortal, "CHECK-L1XDM-50");
             require(address(messenger.superchainConfig()) == _contracts.SuperchainConfig, "CHECK-L1XDM-60");
+            bytes32 xdmSenderSlot = _vm.load(address(messenger), bytes32(uint256(204)));
+            require(address(uint160(uint256(xdmSenderSlot))) == Constants.DEFAULT_L2_SENDER, "CHECK-L1XDM-70");
         } else {
             require(address(messenger.PORTAL()) == address(0), "CHECK-L1XDM-80");
             require(address(messenger.portal()) == address(0), "CHECK-L1XDM-90");
@@ -200,7 +202,7 @@ library ChainAssertions {
         require(address(bridge) != address(0), "CHECK-L1SB-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 49, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(address(bridge.MESSENGER()) == _contracts.L1CrossDomainMessenger, "CHECK-L1SB-20");
@@ -235,7 +237,7 @@ library ChainAssertions {
         require(address(factory) != address(0), "CHECK-DG-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
 
         // The same check is made for both proxy and implementation
         require(factory.owner() == _expectedOwner, "CHECK-DG-20");
@@ -275,7 +277,7 @@ library ChainAssertions {
         require(address(weth) != address(0), "CHECK-DWETH-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(weth.owner() == _expectedOwner, "CHECK-DWETH-20");
@@ -306,7 +308,7 @@ library ChainAssertions {
         require(address(weth) != address(0), "CHECK-PDWETH-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(weth), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(weth.owner() == _expectedOwner, "CHECK-PDWETH-20");
@@ -337,7 +339,7 @@ library ChainAssertions {
         require(address(oracle) != address(0), "CHECK-L2OO-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(oracle), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(oracle), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(oracle.SUBMISSION_INTERVAL() == _cfg.l2OutputOracleSubmissionInterval(), "CHECK-L2OO-20");
@@ -379,7 +381,7 @@ library ChainAssertions {
         require(address(factory) != address(0), "CHECK-MERC20F-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 51, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(factory.BRIDGE() == _contracts.L1StandardBridge, "CHECK-MERC20F-10");
@@ -402,7 +404,7 @@ library ChainAssertions {
         require(address(bridge) != address(0), "CHECK-L1ERC721B-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge) });
+        assertInitializedSlotIsSet({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
 
         require(address(bridge.OTHER_BRIDGE()) == Predeploys.L2_ERC721_BRIDGE, "CHECK-L1ERC721B-10");
         require(address(bridge.otherBridge()) == Predeploys.L2_ERC721_BRIDGE, "CHECK-L1ERC721B-20");
@@ -429,7 +431,7 @@ library ChainAssertions {
         require(address(portal) != address(0), "CHECK-OP-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
 
         address guardian = _cfg.superchainConfigGuardian();
         if (guardian.code.length == 0) {
@@ -469,7 +471,7 @@ library ChainAssertions {
         require(address(portal) != address(0), "CHECK-OP2-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(portal), _slot: 0, _offset: 0 });
 
         address guardian = _cfg.superchainConfigGuardian();
         if (guardian.code.length == 0) {
@@ -512,7 +514,7 @@ library ChainAssertions {
         require(address(versions) != address(0), "CHECK-PV-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(versions), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(versions), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(versions.owner() == _cfg.finalSystemOwner(), "CHECK-PV-20");
@@ -544,7 +546,7 @@ library ChainAssertions {
         require(address(superchainConfig) != address(0), "CHECK-SC-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(superchainConfig), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(superchainConfig), _slot: 0, _offset: 0 });
 
         if (_isProxy) {
             require(superchainConfig.guardian() == _cfg.superchainConfigGuardian(), "CHECK-SC-20");
@@ -566,7 +568,7 @@ library ChainAssertions {
         require(address(opcm) != address(0), "CHECK-OPCM-10");
 
         // Check that the contract is initialized
-        DeployUtils.assertInitialized({ _contractAddress: address(opcm), _slot: 0, _offset: 0 });
+        assertInitializedSlotIsSet({ _contractAddress: address(opcm), _slot: 0, _offset: 0 });
 
         // These values are immutable so are shared by the proxy and implementation
         require(address(opcm.superchainConfig()) == address(_contracts.SuperchainConfig), "CHECK-OPCM-30");
@@ -574,4 +576,15 @@ library ChainAssertions {
 
         // TODO: Add assertions for blueprints and setters?
     }
+
+    /// @dev Asserts that for a given contract the value of a storage slot at an offset is 1 or 0xff.
+    ///      A call to `initialize` will set it to 1 and a call to _disableInitializers will set it to 0xff.
+    function assertInitializedSlotIsSet(address _contractAddress, uint256 _slot, uint256 _offset) internal view {
+        bytes32 slotVal = vm.load(_contractAddress, bytes32(_slot));
+        uint8 val = uint8((uint256(slotVal) >> (_offset * 8)) & 0xFF);
+        require(
+            val == uint8(1) || val == uint8(0xff),
+            "ChainAssertions: storage value is not 1 or 0xff at the given slot and offset"
+        );
+    }
 }
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index ad3a53b159d5..d40c03987d53 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -155,7 +155,7 @@ contract Deploy is Deployer {
             DelayedWETH: getAddress("DelayedWETHProxy"),
             PermissionedDelayedWETH: getAddress("PermissionedDelayedWETHProxy"),
             AnchorStateRegistry: getAddress("AnchorStateRegistryProxy"),
-            OptimismMintableERC20Factory: getAddress("L1OptimismMintableERC20FactoryProxy"),
+            OptimismMintableERC20Factory: getAddress("OptimismMintableERC20FactoryProxy"),
             OptimismPortal: getAddress("OptimismPortalProxy"),
             OptimismPortal2: getAddress("OptimismPortalProxy"),
             SystemConfig: getAddress("SystemConfigProxy"),
@@ -176,7 +176,7 @@ contract Deploy is Deployer {
             DelayedWETH: getAddress("DelayedWETH"),
             PermissionedDelayedWETH: getAddress("PermissionedDelayedWETH"),
             AnchorStateRegistry: getAddress("AnchorStateRegistry"),
-            OptimismMintableERC20Factory: getAddress("L1OptimismMintableERC20Factory"),
+            OptimismMintableERC20Factory: getAddress("OptimismMintableERC20Factory"),
             OptimismPortal: getAddress("OptimismPortal"),
             OptimismPortal2: getAddress("OptimismPortal2"),
             SystemConfig: getAddress("SystemConfig"),
@@ -398,9 +398,7 @@ contract Deploy is Deployer {
         }
 
         save("L1CrossDomainMessenger", address(dio.l1CrossDomainMessengerImpl()));
-        // Save under both names for backwards compatibility
         save("OptimismMintableERC20Factory", address(dio.optimismMintableERC20FactoryImpl()));
-        save("L1OptimismMintableERC20Factory", address(dio.optimismMintableERC20FactoryImpl()));
         save("SystemConfig", address(dio.systemConfigImpl()));
         save("L1StandardBridge", address(dio.l1StandardBridgeImpl()));
         save("L1ERC721Bridge", address(dio.l1ERC721BridgeImpl()));
@@ -415,7 +413,7 @@ contract Deploy is Deployer {
         save("OPContractsManager", address(dio.opcmImpl()));
 
         Types.ContractSet memory contracts = _impls();
-        ChainAssertions.checkL1CrossDomainMessenger({ _contracts: contracts, _isProxy: false });
+        ChainAssertions.checkL1CrossDomainMessenger({ _contracts: contracts, _vm: vm, _isProxy: false });
         ChainAssertions.checkL1StandardBridge({ _contracts: contracts, _isProxy: false });
         ChainAssertions.checkL1ERC721Bridge({ _contracts: contracts, _isProxy: false });
         ChainAssertions.checkOptimismPortal2({ _contracts: contracts, _cfg: cfg, _isProxy: false });
@@ -458,9 +456,7 @@ contract Deploy is Deployer {
         save("AddressManager", address(deployOutput.addressManager));
         save("L1ERC721BridgeProxy", address(deployOutput.l1ERC721BridgeProxy));
         save("SystemConfigProxy", address(deployOutput.systemConfigProxy));
-        // Save under both names for backwards compatibility
         save("OptimismMintableERC20FactoryProxy", address(deployOutput.optimismMintableERC20FactoryProxy));
-        save("L1OptimismMintableERC20FactoryProxy", address(deployOutput.optimismMintableERC20FactoryProxy));
         save("L1StandardBridgeProxy", address(deployOutput.l1StandardBridgeProxy));
         save("L1CrossDomainMessengerProxy", address(deployOutput.l1CrossDomainMessengerProxy));
 
@@ -827,15 +823,12 @@ contract Deploy is Deployer {
             _data: abi.encodeCall(
                 ISystemConfig.initialize,
                 (
-                    ISystemConfig.Roles({
-                        owner: cfg.finalSystemOwner(),
-                        feeAdmin: cfg.systemConfigFeeAdmin(),
-                        unsafeBlockSigner: cfg.p2pSequencerAddress(),
-                        batcherHash: batcherHash
-                    }),
+                    cfg.finalSystemOwner(),
                     cfg.basefeeScalar(),
                     cfg.blobbasefeeScalar(),
+                    batcherHash,
                     uint64(cfg.l2GenesisBlockGasLimit()),
+                    cfg.p2pSequencerAddress(),
                     Constants.DEFAULT_RESOURCE_CONFIG(),
                     cfg.batchInboxAddress(),
                     ISystemConfig.Addresses({
@@ -844,7 +837,7 @@ contract Deploy is Deployer {
                         l1StandardBridge: mustGetAddress("L1StandardBridgeProxy"),
                         disputeGameFactory: mustGetAddress("DisputeGameFactoryProxy"),
                         optimismPortal: mustGetAddress("OptimismPortalProxy"),
-                        optimismMintableERC20Factory: mustGetAddress("L1OptimismMintableERC20FactoryProxy"),
+                        optimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy"),
                         gasPayingToken: customGasTokenAddress
                     })
                 )
@@ -1271,8 +1264,7 @@ contract Deploy is Deployer {
                 batcher: cfg.batchSenderAddress(),
                 unsafeBlockSigner: cfg.p2pSequencerAddress(),
                 proposer: cfg.l2OutputOracleProposer(),
-                challenger: cfg.l2OutputOracleChallenger(),
-                systemConfigFeeAdmin: cfg.systemConfigFeeAdmin()
+                challenger: cfg.l2OutputOracleChallenger()
             }),
             basefeeScalar: cfg.basefeeScalar(),
             blobBasefeeScalar: cfg.blobbasefeeScalar(),
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
index a95346f093b5..69341dd3e874 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
@@ -86,7 +86,6 @@ contract DeployConfig is Script {
     uint256 public daResolveWindow;
     uint256 public daBondSize;
     uint256 public daResolverRefundPercentage;
-    address public systemConfigFeeAdmin;
 
     bool public useCustomGasToken;
     address public customGasTokenAddress;
@@ -102,7 +101,6 @@ contract DeployConfig is Script {
         }
 
         finalSystemOwner = stdJson.readAddress(_json, "$.finalSystemOwner");
-        systemConfigFeeAdmin = stdJson.readAddress(_json, "$.systemConfigFeeAdmin");
         superchainConfigGuardian = stdJson.readAddress(_json, "$.superchainConfigGuardian");
         l1ChainID = stdJson.readUint(_json, "$.l1ChainID");
         l2ChainID = stdJson.readUint(_json, "$.l2ChainID");
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
index 40f9b79c5580..c9048a07dfa3 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
@@ -29,8 +29,7 @@ import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
 import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IL1OptimismMintableERC20Factory as IOptimismMintableERC20Factory } from
-    "src/L1/interfaces/IL1OptimismMintableERC20Factory.sol";
+import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
 
 import { OPContractsManagerInterop } from "src/L1/OPContractsManagerInterop.sol";
 import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
@@ -371,19 +370,19 @@ contract DeployImplementationsOutput is BaseDeployIO {
 
         DeployUtils.assertInitialized({ _contractAddress: address(systemConfig), _slot: 0, _offset: 0 });
 
-        require(systemConfig.owner() == address(0), "SYSCON-10");
+        require(systemConfig.owner() == address(0xdead), "SYSCON-10");
         require(systemConfig.overhead() == 0, "SYSCON-20");
-        require(systemConfig.scalar() == 0, "SYSCON-30");
+        require(systemConfig.scalar() == uint256(0x01) << 248, "SYSCON-30");
         require(systemConfig.basefeeScalar() == 0, "SYSCON-40");
         require(systemConfig.blobbasefeeScalar() == 0, "SYSCON-50");
         require(systemConfig.batcherHash() == bytes32(0), "SYSCON-60");
-        require(systemConfig.gasLimit() == 0, "SYSCON-70");
+        require(systemConfig.gasLimit() == 1, "SYSCON-70");
         require(systemConfig.unsafeBlockSigner() == address(0), "SYSCON-80");
 
         IResourceMetering.ResourceConfig memory resourceConfig = systemConfig.resourceConfig();
-        require(resourceConfig.maxResourceLimit == 0, "SYSCON-90");
-        require(resourceConfig.elasticityMultiplier == 0, "SYSCON-100");
-        require(resourceConfig.baseFeeMaxChangeDenominator == 0, "SYSCON-110");
+        require(resourceConfig.maxResourceLimit == 1, "SYSCON-90");
+        require(resourceConfig.elasticityMultiplier == 1, "SYSCON-100");
+        require(resourceConfig.baseFeeMaxChangeDenominator == 2, "SYSCON-110");
         require(resourceConfig.systemTxMaxGas == 0, "SYSCON-120");
         require(resourceConfig.minimumBaseFee == 0, "SYSCON-130");
         require(resourceConfig.maximumBaseFee == 0, "SYSCON-140");
@@ -401,7 +400,7 @@ contract DeployImplementationsOutput is BaseDeployIO {
     function assertValidL1CrossDomainMessengerImpl(DeployImplementationsInput) internal view {
         IL1CrossDomainMessenger messenger = l1CrossDomainMessengerImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 250, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 0, _offset: 20 });
 
         require(address(messenger.OTHER_MESSENGER()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-10");
         require(address(messenger.otherMessenger()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-20");
@@ -409,15 +408,14 @@ contract DeployImplementationsOutput is BaseDeployIO {
         require(address(messenger.portal()) == address(0), "L1xDM-40");
         require(address(messenger.superchainConfig()) == address(0), "L1xDM-50");
 
-        // TODO: vm.expectRevert is not supported by op-chain-ops, so we can't check this yet.
-        // vm.expectRevert("CrossDomainMessenger: xDomainMessageSender is not set");
-        // messenger.xDomainMessageSender();
+        bytes32 xdmSenderSlot = vm.load(address(messenger), bytes32(uint256(204)));
+        require(address(uint160(uint256(xdmSenderSlot))) == Constants.DEFAULT_L2_SENDER, "L1xDM-60");
     }
 
     function assertValidL1ERC721BridgeImpl(DeployImplementationsInput) internal view {
         IL1ERC721Bridge bridge = l1ERC721BridgeImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge) });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
 
         require(address(bridge.OTHER_BRIDGE()) == Predeploys.L2_ERC721_BRIDGE, "L721B-10");
         require(address(bridge.otherBridge()) == Predeploys.L2_ERC721_BRIDGE, "L721B-20");
@@ -429,7 +427,7 @@ contract DeployImplementationsOutput is BaseDeployIO {
     function assertValidL1StandardBridgeImpl(DeployImplementationsInput) internal view {
         IL1StandardBridge bridge = l1StandardBridgeImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 49, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
 
         require(address(bridge.MESSENGER()) == address(0), "L1SB-10");
         require(address(bridge.messenger()) == address(0), "L1SB-20");
@@ -441,7 +439,7 @@ contract DeployImplementationsOutput is BaseDeployIO {
     function assertValidOptimismMintableERC20FactoryImpl(DeployImplementationsInput) internal view {
         IOptimismMintableERC20Factory factory = optimismMintableERC20FactoryImpl();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 51, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
 
         require(address(factory.BRIDGE()) == address(0), "MERC20F-10");
         require(address(factory.bridge()) == address(0), "MERC20F-20");
@@ -790,7 +788,7 @@ contract DeployImplementations is Script {
             vm.broadcast(msg.sender);
             impl = IOptimismMintableERC20Factory(
                 DeployUtils.create1({
-                    _name: "L1OptimismMintableERC20Factory",
+                    _name: "OptimismMintableERC20Factory",
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismMintableERC20Factory.__constructor__, ()))
                 })
             );
@@ -798,7 +796,7 @@ contract DeployImplementations is Script {
             revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
-        vm.label(address(impl), "L1OptimismMintableERC20FactoryImpl");
+        vm.label(address(impl), "OptimismMintableERC20FactoryImpl");
         _dio.set(_dio.optimismMintableERC20FactoryImpl.selector, address(impl));
     }
 
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
index 247a0575f009..7a5d1f5cc6b2 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
@@ -38,7 +38,6 @@ import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimis
 contract DeployOPChainInput is BaseDeployIO {
     address internal _opChainProxyAdminOwner;
     address internal _systemConfigOwner;
-    address internal _systemConfigFeeAdmin;
     address internal _batcher;
     address internal _unsafeBlockSigner;
     address internal _proposer;
@@ -65,7 +64,6 @@ contract DeployOPChainInput is BaseDeployIO {
         require(_addr != address(0), "DeployOPChainInput: cannot set zero address");
         if (_sel == this.opChainProxyAdminOwner.selector) _opChainProxyAdminOwner = _addr;
         else if (_sel == this.systemConfigOwner.selector) _systemConfigOwner = _addr;
-        else if (_sel == this.systemConfigFeeAdmin.selector) _systemConfigFeeAdmin = _addr;
         else if (_sel == this.batcher.selector) _batcher = _addr;
         else if (_sel == this.unsafeBlockSigner.selector) _unsafeBlockSigner = _addr;
         else if (_sel == this.proposer.selector) _proposer = _addr;
@@ -125,11 +123,6 @@ contract DeployOPChainInput is BaseDeployIO {
         return _systemConfigOwner;
     }
 
-    function systemConfigFeeAdmin() public view returns (address) {
-        require(_systemConfigFeeAdmin != address(0), "DeployOPChainInput: not set");
-        return _systemConfigFeeAdmin;
-    }
-
     function batcher() public view returns (address) {
         require(_batcher != address(0), "DeployOPChainInput: not set");
         return _batcher;
@@ -362,8 +355,7 @@ contract DeployOPChain is Script {
             batcher: _doi.batcher(),
             unsafeBlockSigner: _doi.unsafeBlockSigner(),
             proposer: _doi.proposer(),
-            challenger: _doi.challenger(),
-            systemConfigFeeAdmin: _doi.systemConfigFeeAdmin()
+            challenger: _doi.challenger()
         });
         OPContractsManager.DeployInput memory deployInput = OPContractsManager.DeployInput({
             roles: roles,
@@ -580,7 +572,7 @@ contract DeployOPChain is Script {
     function assertValidL1CrossDomainMessenger(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {
         IL1CrossDomainMessenger messenger = _doo.l1CrossDomainMessengerProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 250, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(messenger), _slot: 0, _offset: 20 });
 
         require(address(messenger.OTHER_MESSENGER()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-10");
         require(address(messenger.otherMessenger()) == Predeploys.L2_CROSS_DOMAIN_MESSENGER, "L1xDM-20");
@@ -589,16 +581,15 @@ contract DeployOPChain is Script {
         require(address(messenger.portal()) == address(_doo.optimismPortalProxy()), "L1xDM-40");
         require(address(messenger.superchainConfig()) == address(_doi.opcmProxy().superchainConfig()), "L1xDM-50");
 
-        // TODO: vm.expectRevert is not supported by op-chain-ops, so we can't check this yet.
-        // vm.expectRevert("CrossDomainMessenger: xDomainMessageSender is not set");
-        // messenger.xDomainMessageSender();
+        bytes32 xdmSenderSlot = vm.load(address(messenger), bytes32(uint256(204)));
+        require(address(uint160(uint256(xdmSenderSlot))) == Constants.DEFAULT_L2_SENDER, "L1xDM-60");
     }
 
     function assertValidL1StandardBridge(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {
         IL1StandardBridge bridge = _doo.l1StandardBridgeProxy();
         IL1CrossDomainMessenger messenger = _doo.l1CrossDomainMessengerProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 49, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
 
         require(address(bridge.MESSENGER()) == address(messenger), "L1SB-10");
         require(address(bridge.messenger()) == address(messenger), "L1SB-20");
@@ -610,7 +601,7 @@ contract DeployOPChain is Script {
     function assertValidOptimismMintableERC20Factory(DeployOPChainInput, DeployOPChainOutput _doo) internal {
         IOptimismMintableERC20Factory factory = _doo.optimismMintableERC20FactoryProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 51, _offset: 0 });
+        DeployUtils.assertInitialized({ _contractAddress: address(factory), _slot: 0, _offset: 0 });
 
         require(factory.BRIDGE() == address(_doo.l1StandardBridgeProxy()), "MERC20F-10");
         require(factory.bridge() == address(_doo.l1StandardBridgeProxy()), "MERC20F-20");
@@ -619,7 +610,7 @@ contract DeployOPChain is Script {
     function assertValidL1ERC721Bridge(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {
         IL1ERC721Bridge bridge = _doo.l1ERC721BridgeProxy();
 
-        DeployUtils.assertInitialized({ _contractAddress: address(bridge) });
+        DeployUtils.assertInitialized({ _contractAddress: address(bridge), _slot: 0, _offset: 0 });
 
         require(address(bridge.OTHER_BRIDGE()) == Predeploys.L2_ERC721_BRIDGE, "L721B-10");
         require(address(bridge.otherBridge()) == Predeploys.L2_ERC721_BRIDGE, "L721B-20");
diff --git a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
index f2f39e660acd..74492556e1b1 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
@@ -359,7 +359,6 @@ contract DeploySuperchain is Script {
 
     function deployAndInitializeSuperchainConfig(DeploySuperchainInput _dsi, DeploySuperchainOutput _dso) public {
         address guardian = _dsi.guardian();
-        address upgrader = _dsi.superchainProxyAdminOwner();
         bool paused = _dsi.paused();
 
         IProxyAdmin superchainProxyAdmin = _dso.superchainProxyAdmin();
@@ -377,7 +376,7 @@ contract DeploySuperchain is Script {
         superchainProxyAdmin.upgradeAndCall(
             payable(address(superchainConfigProxy)),
             address(superchainConfigImpl),
-            abi.encodeCall(ISuperchainConfig.initialize, (guardian, upgrader, paused))
+            abi.encodeCall(ISuperchainConfig.initialize, (guardian, paused))
         );
         vm.stopBroadcast();
 
diff --git a/packages/contracts-bedrock/scripts/libraries/Config.sol b/packages/contracts-bedrock/scripts/libraries/Config.sol
index 4aca8bc31e3c..18084761e807 100644
--- a/packages/contracts-bedrock/scripts/libraries/Config.sol
+++ b/packages/contracts-bedrock/scripts/libraries/Config.sol
@@ -34,11 +34,10 @@ enum Fork {
     ECOTONE,
     FJORD,
     GRANITE,
-    HOLOCENE,
-    ISTHMUS
+    HOLOCENE
 }
 
-Fork constant LATEST_FORK = Fork.ISTHMUS;
+Fork constant LATEST_FORK = Fork.HOLOCENE;
 
 library ForkUtils {
     function toString(Fork _fork) internal pure returns (string memory) {
@@ -54,8 +53,6 @@ library ForkUtils {
             return "granite";
         } else if (_fork == Fork.HOLOCENE) {
             return "holocene";
-        } else if (_fork == Fork.ISTHMUS) {
-            return "isthmus";
         } else {
             return "unknown";
         }
@@ -171,8 +168,6 @@ library Config {
             return Fork.GRANITE;
         } else if (forkHash == keccak256(bytes("holocene"))) {
             return Fork.HOLOCENE;
-        } else if (forkHash == keccak256(bytes("isthmus"))) {
-            return Fork.ISTHMUS;
         } else {
             revert(string.concat("Config: unknown fork: ", forkStr));
         }
diff --git a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
index 4197746ca436..da9aea12a0ac 100644
--- a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
+++ b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
@@ -351,11 +351,6 @@ library DeployUtils {
         }
     }
 
-    /// @notice The unstructured storage slot that is used for v5 openzeppelin initializable. Computed as:
-    ///         keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.Initializable")) - 1)) &
-    /// ~bytes32(uint256(0xff))
-    bytes32 internal constant INITIALIZABLE_STORAGE = 0xf0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a00;
-
     /// @notice Asserts that for a given contract the value of a storage slot at an offset is 1 or
     ///         `type(uint8).max`. The value is set to 1 when a contract is initialized, and set to
     ///         `type(uint8).max` when `_disableInitializers` is called.
@@ -367,9 +362,4 @@ library DeployUtils {
             "DeployUtils: value at the given slot and offset does not indicate initialization"
         );
     }
-
-    /// @notice Asserts that the contract has been initialized, assuming that it is using openzeppelin v5 initializable.
-    function assertInitialized(address _contractAddress) internal view {
-        assertInitialized({ _contractAddress: _contractAddress, _slot: uint256(INITIALIZABLE_STORAGE), _offset: 0 });
-    }
 }
diff --git a/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol b/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
index a646a7b6d02f..944206694d78 100644
--- a/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
+++ b/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
@@ -5,7 +5,6 @@ import { Vm } from "forge-std/Vm.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { LibString } from "@solady/utils/LibString.sol";
 import { Executables } from "scripts/libraries/Executables.sol";
-import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Process } from "scripts/libraries/Process.sol";
 
 /// @notice Contains information about a storage slot. Mirrors the layout of the storage
@@ -191,19 +190,6 @@ library ForgeArtifacts {
     function getInitializedSlot(string memory _contractName) internal returns (StorageSlot memory slot_) {
         string memory storageLayout = getStorageLayout(_contractName);
 
-        // Contracts that use oz v5 should be here
-        if (LibString.eq(_contractName, "L1ERC721Bridge")) {
-            StorageSlot memory slot = StorageSlot({
-                astId: 0,
-                _contract: _contractName,
-                label: "_initialized",
-                offset: 0,
-                slot: vm.toString(DeployUtils.INITIALIZABLE_STORAGE),
-                _type: "bool"
-            });
-            return slot;
-        }
-
         // FaultDisputeGame and PermissionedDisputeGame use a different name for the initialized storage slot.
         string memory slotName = "_initialized";
         string memory slotType = "t_uint8";
@@ -228,10 +214,7 @@ library ForgeArtifacts {
             slotType,
             "\")'"
         );
-
-        bytes memory result = Process.run(command);
-        require(result.length > 0, string.concat("ForgeArtifacts: ", _contractName, "is not initializable"));
-        bytes memory rawSlot = vm.parseJson(string(result));
+        bytes memory rawSlot = vm.parseJson(string(Process.run(command)));
         slot_ = abi.decode(rawSlot, (StorageSlot));
     }
 
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 0af4722ac9da..1e14f5d286b5 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -8,60 +8,56 @@
     "sourceCodeHash": "0x30e83a535ef27b2e900c831c4e1a4ec2750195350011c4fdacda1da9db2d167b"
   },
   "src/L1/L1CrossDomainMessenger.sol": {
-    "initCodeHash": "0x8d0351b1c13be9e53ba9d3c6174e0ef0ae5c37cfdf31da446533548f5c56553a",
-    "sourceCodeHash": "0x5b00fc7b2450c008cefb283779237f7402722182eb9e5210439d5a01359dc38f"
+    "initCodeHash": "0x2e9cb3ceb5e55341b311f0666ef7655df4fafae75afdfbcd701cd9c9b2b017d5",
+    "sourceCodeHash": "0x848ec3774be17bcc8ba65a23d08e35e979b3f39f9d2ac8a810188f945c69c9ea"
   },
   "src/L1/L1ERC721Bridge.sol": {
-    "initCodeHash": "0x19542aad97e146219d4d3cdcfb29f8f1591815731c51216e8424e754556a21a0",
-    "sourceCodeHash": "0x71fc58927450aa7f6e97688e7a5ecbfadfa235a26523d4c540183647ccbf7fdf"
-  },
-  "src/L1/L1OptimismMintableERC20Factory.sol": {
-    "initCodeHash": "0xc6b0a84d485c8503bd1ce077fbfa5533ad1f6a001feab31d9c21948d02d47827",
-    "sourceCodeHash": "0x9432cd22e23347f4b397706b4eb28ee4eaba481f4914d2d685d77c413963326d"
+    "initCodeHash": "0xb3bf093ea83a24574a6093bebf5b2aea707355ed8d6702b2b5eb292e75b6ae42",
+    "sourceCodeHash": "0x289de9f40898b6305deecc6b60cdf566aa6c6a1444f713c3a0af23ea7878207e"
   },
   "src/L1/L1StandardBridge.sol": {
-    "initCodeHash": "0x0a17e22cb56c915bf1aaf3a61ac28de2dca4f2122ba57fe597a3dd612e245478",
-    "sourceCodeHash": "0xa706c8d55d1e34a86d42a113cd486ccb809a36ff956cf32fbcb839ca2cdfbf0b"
+    "initCodeHash": "0x802f72745bb9a82dc049377bb9cf6b58f35aec388aeb957b28a5e14f28d91bc1",
+    "sourceCodeHash": "0x24b784645b065a5393a2115a078d67f91eb09afd5e70baf81daf975381f16155"
   },
   "src/L1/L2OutputOracle.sol": {
     "initCodeHash": "0x1182bfb87c4ab399b912ca7fe18cdbf4b24c414e078fb0a55bd3c44d442d3ed1",
     "sourceCodeHash": "0x4132ff37d267cb12224b75ea806c0aa7d25407b0d66ce526d7fcda8f7d223882"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0xa6e3fda99d87e69c3a2d2b1efb2f419cae75b1f2a0295548f5f2db84432dd9c4",
-    "sourceCodeHash": "0x647ec3500bca93169dd5384919c6787238da40ffd53fc5d1c3b7c61701a9d398"
+    "initCodeHash": "0xd58cb3978affc5c1457cdd498ff8420c90aef804d4c3b62cf42ab2691986d6d2",
+    "sourceCodeHash": "0x7bfa6eff76176649fe600303cd60009a0f6e282cbaec55836b5ea1f8875cbeb5"
   },
   "src/L1/OptimismPortal.sol": {
-    "initCodeHash": "0x25c4212bac52f172b193cb3c36376074f239491d53c0d83c5081df7042cd02f8",
-    "sourceCodeHash": "0x6300532cb22fd9848bf54891c3a48003c7108470199a200d082b740c91e0a017"
+    "initCodeHash": "0x152167cfa18635ae4918a6eb3371a599cfa084418c0a652799cdb48bfc0ee0cc",
+    "sourceCodeHash": "0xbe34b82900d02f71bb0949818eabe49531f7e0d8d8bae01f6dac4a296530d1aa"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0x8e6c808992ea90f28feb12338309ff512876163ed4409a1dca6184475ab4a136",
-    "sourceCodeHash": "0xedc1819877c3263c43a27c5077363691ce0839fa8e61b8d000a0ba9998bf1905"
+    "initCodeHash": "0x218358b48f640b3fcb2d239f00dc1cd3b11517ad46c8e1efa44953d38da63540",
+    "sourceCodeHash": "0x66ac1212760db53a2bb1839e4cd17dc071d9273b8e6fb80646b79e91b3371c1a"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0xcda63947d6fb33478b7bdc6f20a983061b3ff9d77a7c64a6b7141af08b79fd60",
-    "sourceCodeHash": "0x3731c4ac1c5784b92934d3f84d8eba70321b4c6b379a9349aa4c620da6c5a7d8"
+    "initCodeHash": "0x39f66ac74341ec235fbdd0d79546283210bd8ac35a2ab2c4bd36c9722ce18411",
+    "sourceCodeHash": "0xbb98144285b9530e336f957d10b20363b350876597e30fd34821940896a2bae8"
   },
   "src/L1/ProtocolVersions.sol": {
     "initCodeHash": "0xefd4806e8737716d5d2022ca2e9e9fba0a0cb5714b026166b58e472222c7d15f",
     "sourceCodeHash": "0x15205131bf420aa6d03c558bb75dd49cd7439caed7ccdcbfd89c4170a48c94f5"
   },
   "src/L1/SuperchainConfig.sol": {
-    "initCodeHash": "0x37b2cabf25e5717ec9961bdb084b3a35ffd403c867361b106ea5e47345bc7ba9",
-    "sourceCodeHash": "0xbd02a2297b9088c29070bf910ec306dd31d8d185007afaaf7743435493b0ede6"
+    "initCodeHash": "0xfca12d9016c746e5c275b186e0ca40cfd65cf45a5665aab7589a669fea3abb47",
+    "sourceCodeHash": "0x39489a85bc3a5c8560f82d41b31bf7fe22f5b648f4ed538f61695a73092ea9eb"
   },
   "src/L1/SystemConfig.sol": {
-    "initCodeHash": "0xc2961b2de5e12fc7f8079bb462ee9ca605940ab6072b531b5fa173dd3d3af407",
-    "sourceCodeHash": "0xa699d0715f3016f3acb3e3971d8560c280340a0c87e8a0a07ab80160e612c196"
+    "initCodeHash": "0x429058f75d97fa7a7d0166b59830909bc722324feefc40f2b41419d6335d3f37",
+    "sourceCodeHash": "0x5ca776041a4ddc0d28ec55db7012d669481cd4601b0e71dbd3493a67b8a7e5a5"
   },
   "src/L1/SystemConfigInterop.sol": {
-    "initCodeHash": "0x2f5b58ef3db81ee004e69069d231de7c108920105edafad5e0fcf8a897201d5d",
-    "sourceCodeHash": "0x5c996568f655a7467e9de456b39eed7dbfde46d53a609f56b7369940fef0e1ea"
+    "initCodeHash": "0x277a61dcabed81a15739a8e9ed50615252bcc687cebea852e00191d0a1fbe11f",
+    "sourceCodeHash": "0x38361a4f70a19e1b7819e933932a0c9fd2bcebaaebcbc7942f5c00dfaa2c28df"
   },
   "src/L2/BaseFeeVault.sol": {
-    "initCodeHash": "0x2eded104b7c98ea055dbd02a19ed967f5341ba169056425522ef2b3ce4b3300e",
-    "sourceCodeHash": "0x8428d0a173d3d58327aebc5585f1a62e3929ed56324a224e15b88bd1bca31348"
+    "initCodeHash": "0xbf49824cf37e201181484a8a423fcad8f504dc925921a2b28e83398197858dec",
+    "sourceCodeHash": "0x983e8e248c61e362ba6a01dd2e217a535c9bb828dc0b4421f5f27e0577f2e14c"
   },
   "src/L2/CrossL2Inbox.sol": {
     "initCodeHash": "0x31ecaebf368ab3333e80c6dc004b3c9f9a31f813c3138ab388bb3eead9f1b4ee",
@@ -72,68 +68,60 @@
     "sourceCodeHash": "0x0b6afdc52d1ae88d9e4bbb5dc00920e7a6bd1e9d6595bfdbae64874190f39df0"
   },
   "src/L2/GasPriceOracle.sol": {
-    "initCodeHash": "0x83d50e3b34cd1b4de32f1cced28796b07aefc526cc17ceb1903ad55f4abc90b7",
-    "sourceCodeHash": "0x64109614b3813b0f6003bcfada1bdbdba733c623aa7b935b9e51753f1c60ed6a"
+    "initCodeHash": "0x7e8c2b42e10187ad649c0bf70c5688c2a4af3c412bacaec87d63c3f93ae4cfef",
+    "sourceCodeHash": "0xa12ce15ded3cca681b2fc9facaebbb45d740dd6f9c9496333c1c46689c9a2d99"
   },
   "src/L2/L1Block.sol": {
-    "initCodeHash": "0xdd942ad49044ca92b46f39f5035995628c2c8b10c1060c0a59b65cdc20176832",
-    "sourceCodeHash": "0x4c6be03e3eddc17810a65e475c1c7dc1e5a15fe4c1c6d9b8ab17b3323d06e405"
+    "initCodeHash": "0xa919d2aa76a7ecdfd076e2b1dbece499cc85706075f16eb6fa7b1a0fa7b38c1b",
+    "sourceCodeHash": "0x692cfcbc06dba6328f6e5c6b500741df04e4bdf730b2069aeb5d168355ea7b6f"
   },
   "src/L2/L1BlockInterop.sol": {
-    "initCodeHash": "0xfab767c50aff6bd9d232605c7016afaee34e36647142ea952fea57c98b860c2e",
-    "sourceCodeHash": "0xc220f197eb6aec98554fc72f68f95578a20f201a4780cada28832d21ae4d816b"
+    "initCodeHash": "0x62e9cc59daaf72066ac20597a666db33e9a7b3f7be71a3d47ea4841a9aca9d07",
+    "sourceCodeHash": "0xe57627347366d74029a0d24f0b45d7b9cf82b81c94681d0f633d5e5c37c8de4a"
   },
   "src/L2/L1FeeVault.sol": {
-    "initCodeHash": "0xffd78f3c10c018ec77c3ede7599f76ad23433cc1f18794e47eb73ed5f3460dda",
-    "sourceCodeHash": "0x52cec09ff02282b9e7adef9f770cbc1f31682d41aece1749ba7b4ff14528eb1b"
+    "initCodeHash": "0xbf49824cf37e201181484a8a423fcad8f504dc925921a2b28e83398197858dec",
+    "sourceCodeHash": "0xc7cda130f2bb3648e04d5a480082aa1789e16456c1280954d822b05d30100b2d"
   },
   "src/L2/L2CrossDomainMessenger.sol": {
-    "initCodeHash": "0x9d478585dbebd5bf03e4d7a735bc5f64006e2ff99d62fc08c2202c5483005d5a",
-    "sourceCodeHash": "0x0726b306b41eaf326e19f0d6d1c8a9dbdc8efb2baa449e8fca5954a7b31f79c7"
+    "initCodeHash": "0xc496495496b96ea0eaf417c5e56b295836c12db3e6aafe2e607563e7a50b5b65",
+    "sourceCodeHash": "0x56edf0f36366326a92722ae3c7502bce3d80b2ee5e354181dc09ba801437a488"
   },
   "src/L2/L2ERC721Bridge.sol": {
-    "initCodeHash": "0xc83703c9b18f7e4dcdbaf327894e36bf1edfbd39f9e55c5546f2f2deedf7689f",
-    "sourceCodeHash": "0x69e4394ac1cabc4c2cbf64988fc234f47c0750af720875ed2dbd339b752f6b87"
-  },
-  "src/L2/L2OptimismMintableERC20Factory.sol": {
-    "initCodeHash": "0xb4411155cd6bf9ce710cbce80aaf7a5c8d4b509cfb3b6eca1ff1bcb9eee76013",
-    "sourceCodeHash": "0xb2330d5ef6c7eecc14745d5a2122daa105f2630f811548c203e5bca4a91787ec"
+    "initCodeHash": "0xaed0528e8b81817a0c3b41513c02e7fd678f58e34b98f02ea33d5a770a064c2f",
+    "sourceCodeHash": "0xf8569c75b801f38f8a5a41e94e90f159ddc5f5412804b26e3e564755a50631b8"
   },
   "src/L2/L2StandardBridge.sol": {
-    "initCodeHash": "0xf6a2658d9fbda6959cff4af0ae3891534fdfdc2685c6f7210bb124ba6553d5a3",
-    "sourceCodeHash": "0x909e93976c2d9b419a52ce131d86aad5de9c0e8fe6bf1d5afc7257c1d9524871"
+    "initCodeHash": "0xcb4aa19f0cd43a35cb5c65f26c3cfd7c41f1d1e5bcc15aef6096d385df7272c9",
+    "sourceCodeHash": "0x89771b53b7f6e64d943afb2a4bf15395efcf20d5302b76a18e52fa7cce8cdc56"
   },
   "src/L2/L2StandardBridgeInterop.sol": {
-    "initCodeHash": "0x26c04ae665855e91fc12e995bc9436b63415068da90d694f4a9f070db80027b2",
-    "sourceCodeHash": "0x0ca6d8900a02c213acca44c8cb56df816fa1bebd6903a9ea6d4c21525c936c12"
+    "initCodeHash": "0xc4eaece28d2cfca3c51247c3cce320a167a83c7fd13aea5736549d2b25e0b139",
+    "sourceCodeHash": "0x9e80044adf5f83c30b520ee153b75be5a152081c9e1271e7e618ecfccd1fb4ac"
   },
   "src/L2/L2ToL1MessagePasser.sol": {
     "initCodeHash": "0x13fe3729beb9ed966c97bef09acb9fe5043fe651d453145073d05f2567fa988d",
     "sourceCodeHash": "0xd08a2e6514dbd44e16aa312a1b27b2841a9eab5622cbd05a39c30f543fad673c"
   },
   "src/L2/L2ToL2CrossDomainMessenger.sol": {
-    "initCodeHash": "0x8db6e86984e2501a4281765a9eaeafc0fe1d15c7bb802bbc15d5221a907be526",
-    "sourceCodeHash": "0x00e6d19b377aad27dfc8bf759dbc052fcc708d17e2a56453988ccc97e838399d"
-  },
-  "src/L2/OptimismMintableERC721Factory.sol": {
-    "initCodeHash": "0xc66a3211c520beb0e3da3ce78c0f307bf4397365f147e45d31650d15678e42b2",
-    "sourceCodeHash": "0x35b725198c3780182408ccc76dc877b29659508592befde437754c69af7d7b5f"
+    "initCodeHash": "0x2a1a1ee4f47175ce661ee8e4e50cfa879b082dcb5278b1d66ddda00ed77bb744",
+    "sourceCodeHash": "0xa76133db7f449ae742f9ba988ad86ccb5672475f61298b9fefe411b63b63e9f6"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0x529f3756a365a8f225d7debdd15c474c1338c8973bb65a1aad98f85753f74722",
-    "sourceCodeHash": "0xf68baaee0a09ea51d5a4e821df79976c0914369ebc8e5fd27bbbf89072254fc8"
+    "initCodeHash": "0x5bc5824030ecdb531e1f615d207cb73cdaa702e198769445d0ddbe717271eba9",
+    "sourceCodeHash": "0x0819c9411a155dca592d19b60c4176954202e4fe5d632a4ffbf88d465461252c"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
-    "initCodeHash": "0xb032e99f5c205c8b474da89887e350277cdd05b99ee28374b97bfae18ef7a72c",
-    "sourceCodeHash": "0xe8753177e8491152eb3ecbed42d5232ae545091a116f23d104a4f9621711fbda"
+    "initCodeHash": "0x23dba3ceb9e58646695c306996c9e15251ac79acc6339c1a93d10a4c79da6dab",
+    "sourceCodeHash": "0xf4379e49665823c877f5732f35068435ce06e2394fce6910a5e113d16cdc9f95"
   },
   "src/L2/OptimismSuperchainERC20Factory.sol": {
-    "initCodeHash": "0xe6a098346699c3df248050fc3301197661d391f8e4849a93f00afeac17cae317",
-    "sourceCodeHash": "0x1e8380bdce27292f805ddc85fec0db5bc60fbe3fd9e0bcbd146c103062ed459a"
+    "initCodeHash": "0x18a362c57f08b611db98dfde96121385e938f995c84e3547c1c03fd49f9db2fd",
+    "sourceCodeHash": "0x450cd89d0aae7bbc85ff57a14a6d3468c24c6743f25943f6d895d34b1456c456"
   },
   "src/L2/SequencerFeeVault.sol": {
-    "initCodeHash": "0x4f0017a0b906cb949ebb5931cebe00130109a4e9bb453d77b470982de5b996fb",
-    "sourceCodeHash": "0x8d71ff1b7d5c758ff15137c0ab1411e4abe8d91bc4fab28c981a767f6323b426"
+    "initCodeHash": "0xcaadbf08057b5d47f7704257e9385a29e42a7a08c818646d109c5952d3d35218",
+    "sourceCodeHash": "0x05bbc6039e5a9ff38987e7b9b89c69e2ee8aa4b7ca20dd002ea1bbd3d70f27f3"
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
@@ -144,12 +132,12 @@
     "sourceCodeHash": "0x617aa994f659c5d8ebd54128d994f86f5b175ceca095b024b8524a7898e8ae62"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0xb74ce648b49e3b7885a3252ff32aeb71e8cb515558f516c0dd61f1cf22028edc",
-    "sourceCodeHash": "0x095de6eeb2cd06937b3fe014392048bc494cb5ca7a4a5fd5519141a80eae3a76"
+    "initCodeHash": "0x5aef986a7c9c102b1e9b3068e2a2b66adce0a71dd5f39e03694622bf494f8d97",
+    "sourceCodeHash": "0xa62101a23b860e97f393027c898082a1c73d50679eceb6c6793844af29702359"
   },
   "src/L2/WETH.sol": {
-    "initCodeHash": "0x480d4f8dbec1b0d3211bccbbdfb69796f3e90c784f724b1bbfd4703b0aafdeba",
-    "sourceCodeHash": "0x59a210accdd484cf00e63042cde4687e1c87ef9dbafa5fe2e081dee8e6563621"
+    "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
+    "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0xa3cbf121bad13c00227ea4fef128853d9a86b7ec9158de894f99b58d38d7630a",
@@ -227,9 +215,17 @@
     "initCodeHash": "0x9cd677275b175812f1d5f90a127dbf7b3592714fd842a7a0de3988d716ca3eac",
     "sourceCodeHash": "0x5611d8082f68af566554d7f09640b4b1f0e3efee4da1372b68fc7fc538a35ac7"
   },
+  "src/universal/OptimismMintableERC20Factory.sol": {
+    "initCodeHash": "0x03ad07bd7f89a29f1850fa8b5d377daf0e1d5aef6cb458a127df520549e8e8e6",
+    "sourceCodeHash": "0xdb6ec93782a4a217475195507740794a4f5553b9032e7ba31dc48b81f579a940"
+  },
   "src/universal/OptimismMintableERC721.sol": {
-    "initCodeHash": "0x406ff004414b60852afe6ee6783ac03157ebcbe7e4787740a94576594fdfe912",
-    "sourceCodeHash": "0x8b4292d7556907b597d9fd3ccd5bcd8b8d61bf8e32c5a7a33d4de2557414c830"
+    "initCodeHash": "0x8aa309f2676d5267b6c9e411f88dc6e4badce414b8d66b330df3f60e9836380e",
+    "sourceCodeHash": "0x03bf7ad4d2b751bdead9930fc8f89b8e55d40dd4b2f5670fd339e87ae81f8b49"
+  },
+  "src/universal/OptimismMintableERC721Factory.sol": {
+    "initCodeHash": "0x5ea977ba35558c3b75bebe28900548c763d205e40d6cf7660292b8e96bf3aea8",
+    "sourceCodeHash": "0x063ca3a0a2e3c592173af6157e383b5aaeff752000f98648a5c71260bb26590a"
   },
   "src/universal/StorageSetter.sol": {
     "initCodeHash": "0x21b3059e9b13b330f76d02b61f61dcfa3abf3517a0b56afa0895c4b8291740bf",
diff --git a/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json b/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
index 80ccfb99162a..b745bcb8184c 100644
--- a/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
@@ -1,4 +1,25 @@
 [
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_recipient",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_minWithdrawalAmount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "_withdrawalNetwork",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -35,30 +56,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "config",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "recipient_",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount_",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
+        "name": "",
         "type": "uint8"
       }
     ],
@@ -130,7 +128,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
+        "name": "network_",
         "type": "uint8"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json b/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json
new file mode 100644
index 000000000000..0637a088a01e
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer0.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json b/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json
new file mode 100644
index 000000000000..0637a088a01e
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/abi/CrossDomainMessengerLegacySpacer1.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1Block.json b/packages/contracts-bedrock/snapshots/abi/L1Block.json
index d477c46ddad5..020c9e942c75 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1Block.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1Block.json
@@ -121,25 +121,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "enum Types.ConfigType",
-        "name": "_type",
-        "type": "uint8"
-      }
-    ],
-    "name": "getConfig",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "data_",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "hash",
@@ -166,19 +147,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "isIsthmus",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "l1FeeOverhead",
@@ -231,24 +199,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "enum Types.ConfigType",
-        "name": "_type",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_value",
-        "type": "bytes"
-      }
-    ],
-    "name": "setConfig",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -277,13 +227,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "setIsthmus",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -400,10 +343,5 @@
     "inputs": [],
     "name": "NotDepositor",
     "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "UnsafeCast",
-    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json b/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json
index 35ce78e5f5fd..ab089f0cec55 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1BlockInterop.json
@@ -141,25 +141,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "enum Types.ConfigType",
-        "name": "_type",
-        "type": "uint8"
-      }
-    ],
-    "name": "getConfig",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "data_",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "hash",
@@ -218,19 +199,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "isIsthmus",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "l1FeeOverhead",
@@ -286,7 +254,7 @@
   {
     "inputs": [
       {
-        "internalType": "enum Types.ConfigType",
+        "internalType": "enum ConfigType",
         "name": "_type",
         "type": "uint8"
       },
@@ -329,13 +297,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "setIsthmus",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -510,10 +471,5 @@
     "inputs": [],
     "name": "NotDepositor",
     "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "UnsafeCast",
-    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
index fb4798a3d662..22a4353cc656 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
@@ -223,7 +223,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
diff --git a/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json b/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
index 0c6ccbd23684..33cd5b0a850b 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
@@ -209,7 +209,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -342,22 +342,12 @@
     "inputs": [
       {
         "indexed": false,
-        "internalType": "uint64",
+        "internalType": "uint8",
         "name": "version",
-        "type": "uint64"
+        "type": "uint8"
       }
     ],
     "name": "Initialized",
     "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "InvalidInitialization",
-    "type": "error"
-  },
-  {
-    "inputs": [],
-    "name": "NotInitializing",
-    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json b/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
index 80ccfb99162a..b745bcb8184c 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
@@ -1,4 +1,25 @@
 [
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_recipient",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_minWithdrawalAmount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "_withdrawalNetwork",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -35,30 +56,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "config",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "recipient_",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount_",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
+        "name": "",
         "type": "uint8"
       }
     ],
@@ -130,7 +128,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
+        "name": "network_",
         "type": "uint8"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json b/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
index d79fbe616a57..45480499fe9f 100644
--- a/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
@@ -26,7 +26,7 @@
     "name": "OTHER_BRIDGE",
     "outputs": [
       {
-        "internalType": "contract IStandardBridge",
+        "internalType": "contract StandardBridge",
         "name": "",
         "type": "address"
       }
@@ -447,7 +447,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -468,12 +468,12 @@
     "name": "otherBridge",
     "outputs": [
       {
-        "internalType": "contract IStandardBridge",
+        "internalType": "contract StandardBridge",
         "name": "",
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
diff --git a/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
index c9959ad9e49f..717bbb6eb6f4 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
@@ -1,4 +1,9 @@
 [
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "inputs": [],
     "name": "MESSAGE_VERSION",
@@ -159,6 +164,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "contract CrossDomainMessenger",
+        "name": "_l1CrossDomainMessenger",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "l1CrossDomainMessenger",
@@ -330,6 +348,19 @@
     "name": "FailedRelayedMessage",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json b/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
index 8b3af6fcc3eb..e9578ad9726c 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
@@ -1,4 +1,9 @@
 [
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "inputs": [],
     "name": "MESSENGER",
@@ -134,6 +139,19 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "_l1ERC721Bridge",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "messenger",
@@ -144,7 +162,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -271,5 +289,18 @@
     ],
     "name": "ERC721BridgeInitiated",
     "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json
deleted file mode 100644
index 0a5fddb96906..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/L2OptimismMintableERC20Factory.json
+++ /dev/null
@@ -1,196 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "BRIDGE",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "bridge",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_remoteToken",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_symbol",
-        "type": "string"
-      }
-    ],
-    "name": "createOptimismMintableERC20",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_remoteToken",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_symbol",
-        "type": "string"
-      },
-      {
-        "internalType": "uint8",
-        "name": "_decimals",
-        "type": "uint8"
-      }
-    ],
-    "name": "createOptimismMintableERC20WithDecimals",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_remoteToken",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_symbol",
-        "type": "string"
-      }
-    ],
-    "name": "createStandardL2Token",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "deployments",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "localToken",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "remoteToken",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "deployer",
-        "type": "address"
-      }
-    ],
-    "name": "OptimismMintableERC20Created",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "remoteToken",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "localToken",
-        "type": "address"
-      }
-    ],
-    "name": "StandardL2TokenCreated",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json b/packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json
deleted file mode 100644
index 8dbba1e08992..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/L2ProxyAdmin.json
+++ /dev/null
@@ -1,300 +0,0 @@
-[
-  {
-    "inputs": [],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "addressManager",
-    "outputs": [
-      {
-        "internalType": "contract IAddressManager",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_proxy",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_newAdmin",
-        "type": "address"
-      }
-    ],
-    "name": "changeProxyAdmin",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_proxy",
-        "type": "address"
-      }
-    ],
-    "name": "getProxyAdmin",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_proxy",
-        "type": "address"
-      }
-    ],
-    "name": "getProxyImplementation",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "implementationName",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "isUpgrading",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "proxyType",
-    "outputs": [
-      {
-        "internalType": "enum ProxyAdmin.ProxyType",
-        "name": "",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "setAddress",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IAddressManager",
-        "name": "_address",
-        "type": "address"
-      }
-    ],
-    "name": "setAddressManager",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      }
-    ],
-    "name": "setImplementationName",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_address",
-        "type": "address"
-      },
-      {
-        "internalType": "enum ProxyAdmin.ProxyType",
-        "name": "_type",
-        "type": "uint8"
-      }
-    ],
-    "name": "setProxyType",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bool",
-        "name": "_upgrading",
-        "type": "bool"
-      }
-    ],
-    "name": "setUpgrading",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_proxy",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_implementation",
-        "type": "address"
-      }
-    ],
-    "name": "upgrade",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address payable",
-        "name": "_proxy",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_implementation",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_data",
-        "type": "bytes"
-      }
-    ],
-    "name": "upgradeAndCall",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json b/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
index 44ecfa34094c..e562034818d5 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
@@ -1,4 +1,9 @@
 [
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -21,7 +26,7 @@
     "name": "OTHER_BRIDGE",
     "outputs": [
       {
-        "internalType": "contract IStandardBridge",
+        "internalType": "contract StandardBridge",
         "name": "",
         "type": "address"
       }
@@ -231,6 +236,19 @@
     "stateMutability": "payable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "contract StandardBridge",
+        "name": "_otherBridge",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "l1TokenBridge",
@@ -254,7 +272,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -262,7 +280,7 @@
     "name": "otherBridge",
     "outputs": [
       {
-        "internalType": "contract IStandardBridge",
+        "internalType": "contract StandardBridge",
         "name": "",
         "type": "address"
       }
@@ -548,6 +566,19 @@
     "name": "ETHBridgeInitiated",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json b/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json
index 1d5f7aacfc7b..b2dc8dddd050 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2StandardBridgeInterop.json
@@ -21,7 +21,7 @@
     "name": "OTHER_BRIDGE",
     "outputs": [
       {
-        "internalType": "contract IStandardBridge",
+        "internalType": "contract StandardBridge",
         "name": "",
         "type": "address"
       }
@@ -254,6 +254,19 @@
     "stateMutability": "payable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "contract StandardBridge",
+        "name": "_otherBridge",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "l1TokenBridge",
@@ -277,7 +290,7 @@
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -285,7 +298,7 @@
     "name": "otherBridge",
     "outputs": [
       {
-        "internalType": "contract IStandardBridge",
+        "internalType": "contract StandardBridge",
         "name": "",
         "type": "address"
       }
@@ -602,6 +615,19 @@
     "name": "ETHBridgeInitiated",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
index 7c858ca892ee..7c478feb235d 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
@@ -137,11 +137,6 @@
                 "internalType": "address",
                 "name": "challenger",
                 "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "systemConfigFeeAdmin",
-                "type": "address"
               }
             ],
             "internalType": "struct OPContractsManager.Roles",
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
index 7c858ca892ee..7c478feb235d 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
@@ -137,11 +137,6 @@
                 "internalType": "address",
                 "name": "challenger",
                 "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "systemConfigFeeAdmin",
-                "type": "address"
               }
             ],
             "internalType": "struct OPContractsManager.Roles",
diff --git a/packages/contracts-bedrock/snapshots/abi/L1OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20Factory.json
similarity index 100%
rename from packages/contracts-bedrock/snapshots/abi/L1OptimismMintableERC20Factory.json
rename to packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20Factory.json
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
index 58e3271abc92..35250255a9ba 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
@@ -2,7 +2,7 @@
   {
     "inputs": [
       {
-        "internalType": "contract IL2ERC721Bridge",
+        "internalType": "address",
         "name": "_bridge",
         "type": "address"
       },
@@ -35,7 +35,7 @@
     "name": "BRIDGE",
     "outputs": [
       {
-        "internalType": "contract IL2ERC721Bridge",
+        "internalType": "address",
         "name": "",
         "type": "address"
       }
@@ -124,7 +124,7 @@
     "name": "bridge",
     "outputs": [
       {
-        "internalType": "contract IL2ERC721Bridge",
+        "internalType": "address",
         "name": "",
         "type": "address"
       }
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
index 0137a7bb20ae..e6ecac1d9381 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
@@ -1,15 +1,31 @@
 [
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_bridge",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_remoteChainId",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "inputs": [],
     "name": "BRIDGE",
     "outputs": [
       {
-        "internalType": "contract IL2ERC721Bridge",
+        "internalType": "address",
         "name": "",
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -30,12 +46,12 @@
     "name": "bridge",
     "outputs": [
       {
-        "internalType": "contract IL2ERC721Bridge",
+        "internalType": "address",
         "name": "",
         "type": "address"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -88,7 +104,7 @@
   },
   {
     "inputs": [],
-    "name": "remoteChainId",
+    "name": "remoteChainID",
     "outputs": [
       {
         "internalType": "uint256",
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json b/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
index ed8ec82591ed..7ccee328a984 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
@@ -413,17 +413,27 @@
   {
     "inputs": [
       {
-        "internalType": "enum Types.ConfigType",
-        "name": "_type",
+        "internalType": "address",
+        "name": "_token",
+        "type": "address"
+      },
+      {
+        "internalType": "uint8",
+        "name": "_decimals",
         "type": "uint8"
       },
       {
-        "internalType": "bytes",
-        "name": "_value",
-        "type": "bytes"
+        "internalType": "bytes32",
+        "name": "_name",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "_symbol",
+        "type": "bytes32"
       }
     ],
-    "name": "setConfig",
+    "name": "setGasPayingToken",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json b/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json
index b4bd5efa8df3..2f52ed573d37 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismPortal2.json
@@ -605,17 +605,27 @@
   {
     "inputs": [
       {
-        "internalType": "enum Types.ConfigType",
-        "name": "_type",
+        "internalType": "address",
+        "name": "_token",
+        "type": "address"
+      },
+      {
+        "internalType": "uint8",
+        "name": "_decimals",
         "type": "uint8"
       },
       {
-        "internalType": "bytes",
-        "name": "_value",
-        "type": "bytes"
+        "internalType": "bytes32",
+        "name": "_name",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "_symbol",
+        "type": "bytes32"
       }
     ],
-    "name": "setConfig",
+    "name": "setGasPayingToken",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -659,24 +669,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "_gasLimit",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_calldata",
-        "type": "bytes"
-      }
-    ],
-    "name": "upgrade",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json b/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json
index b4bd5efa8df3..5b9f72b9446c 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismPortalInterop.json
@@ -605,7 +605,7 @@
   {
     "inputs": [
       {
-        "internalType": "enum Types.ConfigType",
+        "internalType": "enum ConfigType",
         "name": "_type",
         "type": "uint8"
       },
@@ -620,6 +620,34 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_token",
+        "type": "address"
+      },
+      {
+        "internalType": "uint8",
+        "name": "_decimals",
+        "type": "uint8"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "_name",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "_symbol",
+        "type": "bytes32"
+      }
+    ],
+    "name": "setGasPayingToken",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -659,24 +687,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint32",
-        "name": "_gasLimit",
-        "type": "uint32"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_calldata",
-        "type": "bytes"
-      }
-    ],
-    "name": "upgrade",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json b/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
index 6412128462e0..700e7d7b9810 100644
--- a/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
@@ -1,4 +1,25 @@
 [
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_recipient",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_minWithdrawalAmount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "enum Types.WithdrawalNetwork",
+        "name": "_withdrawalNetwork",
+        "type": "uint8"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
   {
     "stateMutability": "payable",
     "type": "receive"
@@ -35,30 +56,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
-        "type": "uint8"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "config",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "recipient_",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount_",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
+        "name": "",
         "type": "uint8"
       }
     ],
@@ -71,7 +69,7 @@
     "outputs": [
       {
         "internalType": "address",
-        "name": "recipient_",
+        "name": "",
         "type": "address"
       }
     ],
@@ -143,7 +141,7 @@
     "outputs": [
       {
         "internalType": "enum Types.WithdrawalNetwork",
-        "name": "withdrawalNetwork_",
+        "name": "network_",
         "type": "uint8"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json b/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
index e61f005d9aa2..0304f507eb50 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
@@ -30,19 +30,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "UPGRADER_SLOT",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "guardian",
@@ -63,11 +50,6 @@
         "name": "_guardian",
         "type": "address"
       },
-      {
-        "internalType": "address",
-        "name": "_upgrader",
-        "type": "address"
-      },
       {
         "internalType": "bool",
         "name": "_paused",
@@ -112,19 +94,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "upgrader",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "upgrader_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/abi/SystemConfig.json b/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
index 7f086dfad600..b7e18556fa2c 100644
--- a/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
+++ b/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
@@ -225,19 +225,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "feeAdmin",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "addr_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "gasLimit",
@@ -298,31 +285,9 @@
   {
     "inputs": [
       {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "owner",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "feeAdmin",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "unsafeBlockSigner",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "batcherHash",
-            "type": "bytes32"
-          }
-        ],
-        "internalType": "struct SystemConfig.Roles",
-        "name": "_roles",
-        "type": "tuple"
+        "internalType": "address",
+        "name": "_owner",
+        "type": "address"
       },
       {
         "internalType": "uint32",
@@ -334,11 +299,21 @@
         "name": "_blobbasefeeScalar",
         "type": "uint32"
       },
+      {
+        "internalType": "bytes32",
+        "name": "_batcherHash",
+        "type": "bytes32"
+      },
       {
         "internalType": "uint64",
         "name": "_gasLimit",
         "type": "uint64"
       },
+      {
+        "internalType": "address",
+        "name": "_unsafeBlockSigner",
+        "type": "address"
+      },
       {
         "components": [
           {
@@ -655,34 +630,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "enum Types.ConfigType",
-        "name": "_type",
-        "type": "uint8"
-      },
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_min",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "_network",
-        "type": "uint8"
-      }
-    ],
-    "name": "setFeeVaultConfig",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -853,10 +800,5 @@
     ],
     "name": "OwnershipTransferred",
     "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "UnsafeCast",
-    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json b/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json
index a0fc03aa0b3b..a459af15801b 100644
--- a/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/SystemConfigInterop.json
@@ -246,19 +246,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [],
-    "name": "feeAdmin",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "addr_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "gasLimit",
@@ -319,31 +306,9 @@
   {
     "inputs": [
       {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "owner",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "feeAdmin",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "unsafeBlockSigner",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "batcherHash",
-            "type": "bytes32"
-          }
-        ],
-        "internalType": "struct SystemConfig.Roles",
-        "name": "_roles",
-        "type": "tuple"
+        "internalType": "address",
+        "name": "_owner",
+        "type": "address"
       },
       {
         "internalType": "uint32",
@@ -355,11 +320,21 @@
         "name": "_blobbasefeeScalar",
         "type": "uint32"
       },
+      {
+        "internalType": "bytes32",
+        "name": "_batcherHash",
+        "type": "bytes32"
+      },
       {
         "internalType": "uint64",
         "name": "_gasLimit",
         "type": "uint64"
       },
+      {
+        "internalType": "address",
+        "name": "_unsafeBlockSigner",
+        "type": "address"
+      },
       {
         "components": [
           {
@@ -443,6 +418,11 @@
         "internalType": "struct SystemConfig.Addresses",
         "name": "_addresses",
         "type": "tuple"
+      },
+      {
+        "internalType": "address",
+        "name": "_dependencyManager",
+        "type": "address"
       }
     ],
     "name": "initialize",
@@ -453,31 +433,9 @@
   {
     "inputs": [
       {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "owner",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "feeAdmin",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "unsafeBlockSigner",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "batcherHash",
-            "type": "bytes32"
-          }
-        ],
-        "internalType": "struct SystemConfig.Roles",
-        "name": "_roles",
-        "type": "tuple"
+        "internalType": "address",
+        "name": "_owner",
+        "type": "address"
       },
       {
         "internalType": "uint32",
@@ -489,11 +447,21 @@
         "name": "_blobbasefeeScalar",
         "type": "uint32"
       },
+      {
+        "internalType": "bytes32",
+        "name": "_batcherHash",
+        "type": "bytes32"
+      },
       {
         "internalType": "uint64",
         "name": "_gasLimit",
         "type": "uint64"
       },
+      {
+        "internalType": "address",
+        "name": "_unsafeBlockSigner",
+        "type": "address"
+      },
       {
         "components": [
           {
@@ -577,11 +545,6 @@
         "internalType": "struct SystemConfig.Addresses",
         "name": "_addresses",
         "type": "tuple"
-      },
-      {
-        "internalType": "address",
-        "name": "_dependencyManager",
-        "type": "address"
       }
     ],
     "name": "initialize",
@@ -828,34 +791,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "enum Types.ConfigType",
-        "name": "_type",
-        "type": "uint8"
-      },
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_min",
-        "type": "uint256"
-      },
-      {
-        "internalType": "enum Types.WithdrawalNetwork",
-        "name": "_network",
-        "type": "uint8"
-      }
-    ],
-    "name": "setFeeVaultConfig",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -1026,10 +961,5 @@
     ],
     "name": "OwnershipTransferred",
     "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "UnsafeCast",
-    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json b/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json
new file mode 100644
index 000000000000..9bc33d142741
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer0.json
@@ -0,0 +1,9 @@
+[
+  {
+    "bytes": "20",
+    "label": "spacer_0_0_20",
+    "offset": 0,
+    "slot": "0",
+    "type": "address"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json b/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json
new file mode 100644
index 000000000000..ff157f517694
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/storageLayout/CrossDomainMessengerLegacySpacer1.json
@@ -0,0 +1,65 @@
+[
+  {
+    "bytes": "1600",
+    "label": "spacer_1_0_1600",
+    "offset": 0,
+    "slot": "0",
+    "type": "uint256[50]"
+  },
+  {
+    "bytes": "20",
+    "label": "spacer_51_0_20",
+    "offset": 0,
+    "slot": "50",
+    "type": "address"
+  },
+  {
+    "bytes": "1568",
+    "label": "spacer_52_0_1568",
+    "offset": 0,
+    "slot": "51",
+    "type": "uint256[49]"
+  },
+  {
+    "bytes": "1",
+    "label": "spacer_101_0_1",
+    "offset": 0,
+    "slot": "100",
+    "type": "bool"
+  },
+  {
+    "bytes": "1568",
+    "label": "spacer_102_0_1568",
+    "offset": 0,
+    "slot": "101",
+    "type": "uint256[49]"
+  },
+  {
+    "bytes": "32",
+    "label": "spacer_151_0_32",
+    "offset": 0,
+    "slot": "150",
+    "type": "uint256"
+  },
+  {
+    "bytes": "1568",
+    "label": "spacer_152_0_1568",
+    "offset": 0,
+    "slot": "151",
+    "type": "uint256[49]"
+  },
+  {
+    "bytes": "32",
+    "label": "spacer_201_0_32",
+    "offset": 0,
+    "slot": "200",
+    "type": "mapping(bytes32 => bool)"
+  },
+  {
+    "bytes": "32",
+    "label": "spacer_202_0_32",
+    "offset": 0,
+    "slot": "201",
+    "type": "mapping(bytes32 => bool)"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json b/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
index be59f51e2f9a..2928d2147b5c 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
@@ -75,12 +75,5 @@
     "offset": 0,
     "slot": "7",
     "type": "uint256"
-  },
-  {
-    "bytes": "1",
-    "label": "isIsthmus",
-    "offset": 0,
-    "slot": "8",
-    "type": "bool"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json b/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json
index 39a149f0d6e2..14ee2ff9609a 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1BlockInterop.json
@@ -76,18 +76,11 @@
     "slot": "7",
     "type": "uint256"
   },
-  {
-    "bytes": "1",
-    "label": "isIsthmus",
-    "offset": 0,
-    "slot": "8",
-    "type": "bool"
-  },
   {
     "bytes": "64",
     "label": "dependencySet",
     "offset": 0,
-    "slot": "9",
+    "slot": "8",
     "type": "struct EnumerableSet.UintSet"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
index ec29a4be2bfe..c68ec541baba 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
@@ -7,11 +7,18 @@
     "type": "address"
   },
   {
-    "bytes": "12",
-    "label": "spacer_0_20_12",
+    "bytes": "1",
+    "label": "_initialized",
     "offset": 20,
     "slot": "0",
-    "type": "bytes12"
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 21,
+    "slot": "0",
+    "type": "bool"
   },
   {
     "bytes": "1600",
@@ -85,10 +92,10 @@
   },
   {
     "bytes": "20",
-    "label": "spacer_204_0_20",
+    "label": "xDomainMsgSender",
     "offset": 0,
     "slot": "204",
-    "type": "bytes20"
+    "type": "address"
   },
   {
     "bytes": "30",
@@ -106,52 +113,17 @@
   },
   {
     "bytes": "20",
-    "label": "spacer_207_0_20",
+    "label": "otherMessenger",
     "offset": 0,
     "slot": "207",
-    "type": "address"
-  },
-  {
-    "bytes": "20",
-    "label": "xDomainMsgSender",
-    "offset": 0,
-    "slot": "208",
-    "type": "address"
+    "type": "contract CrossDomainMessenger"
   },
   {
-    "bytes": "12",
-    "label": "spacer_208_20_12",
-    "offset": 20,
-    "slot": "208",
-    "type": "bytes12"
-  },
-  {
-    "bytes": "1312",
+    "bytes": "1376",
     "label": "__gap",
     "offset": 0,
-    "slot": "209",
-    "type": "uint256[41]"
-  },
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "250",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "250",
-    "type": "bool"
-  },
-  {
-    "bytes": "30",
-    "label": "spacer_250_2_30",
-    "offset": 2,
-    "slot": "250",
-    "type": "bytes30"
+    "slot": "208",
+    "type": "uint256[43]"
   },
   {
     "bytes": "20",
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
index cea792454f7b..2c14ad25904b 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
@@ -1,24 +1,38 @@
 [
   {
-    "bytes": "32",
-    "label": "spacer_0_0_32",
+    "bytes": "1",
+    "label": "_initialized",
     "offset": 0,
     "slot": "0",
-    "type": "bytes32"
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "0",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_0_2_30",
+    "offset": 2,
+    "slot": "0",
+    "type": "bytes30"
   },
   {
     "bytes": "20",
-    "label": "spacer_1_0_20",
+    "label": "messenger",
     "offset": 0,
     "slot": "1",
-    "type": "address"
+    "type": "contract ICrossDomainMessenger"
   },
   {
     "bytes": "20",
-    "label": "spacer_2_0_20",
+    "label": "otherBridge",
     "offset": 0,
     "slot": "2",
-    "type": "address"
+    "type": "contract ERC721Bridge"
   },
   {
     "bytes": "1472",
@@ -40,12 +54,5 @@
     "offset": 0,
     "slot": "50",
     "type": "contract ISuperchainConfig"
-  },
-  {
-    "bytes": "20",
-    "label": "crossDomainMessenger",
-    "offset": 0,
-    "slot": "51",
-    "type": "contract ICrossDomainMessenger"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
index 99875ccd2c6c..5562a214e4fe 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
@@ -1,10 +1,24 @@
 [
   {
-    "bytes": "32",
-    "label": "spacer_0_0_32",
+    "bytes": "1",
+    "label": "_initialized",
     "offset": 0,
     "slot": "0",
-    "type": "bytes32"
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "0",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_0_2_30",
+    "offset": 2,
+    "slot": "0",
+    "type": "bytes30"
   },
   {
     "bytes": "20",
@@ -22,45 +36,24 @@
   },
   {
     "bytes": "20",
-    "label": "spacer_3_0_20",
+    "label": "messenger",
     "offset": 0,
     "slot": "3",
-    "type": "address"
+    "type": "contract ICrossDomainMessenger"
   },
   {
     "bytes": "20",
-    "label": "spacer_4_0_20",
+    "label": "otherBridge",
     "offset": 0,
     "slot": "4",
-    "type": "address"
+    "type": "contract StandardBridge"
   },
   {
-    "bytes": "1408",
+    "bytes": "1440",
     "label": "__gap",
     "offset": 0,
     "slot": "5",
-    "type": "uint256[44]"
-  },
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "49",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "49",
-    "type": "bool"
-  },
-  {
-    "bytes": "30",
-    "label": "spacer_49_2_30",
-    "offset": 2,
-    "slot": "49",
-    "type": "bytes30"
+    "type": "uint256[45]"
   },
   {
     "bytes": "20",
@@ -75,12 +68,5 @@
     "offset": 0,
     "slot": "51",
     "type": "contract ISystemConfig"
-  },
-  {
-    "bytes": "20",
-    "label": "crossDomainMessenger",
-    "offset": 0,
-    "slot": "52",
-    "type": "contract ICrossDomainMessenger"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
index beae81a1fe17..dec784b5a32e 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
@@ -7,11 +7,18 @@
     "type": "address"
   },
   {
-    "bytes": "12",
-    "label": "spacer_0_20_12",
+    "bytes": "1",
+    "label": "_initialized",
     "offset": 20,
     "slot": "0",
-    "type": "bytes12"
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 21,
+    "slot": "0",
+    "type": "bool"
   },
   {
     "bytes": "1600",
@@ -85,10 +92,10 @@
   },
   {
     "bytes": "20",
-    "label": "spacer_204_0_20",
+    "label": "xDomainMsgSender",
     "offset": 0,
     "slot": "204",
-    "type": "bytes20"
+    "type": "address"
   },
   {
     "bytes": "30",
@@ -106,30 +113,16 @@
   },
   {
     "bytes": "20",
-    "label": "spacer_207_0_20",
+    "label": "otherMessenger",
     "offset": 0,
     "slot": "207",
-    "type": "address"
+    "type": "contract CrossDomainMessenger"
   },
   {
-    "bytes": "20",
-    "label": "xDomainMsgSender",
-    "offset": 0,
-    "slot": "208",
-    "type": "address"
-  },
-  {
-    "bytes": "12",
-    "label": "spacer_208_20_12",
-    "offset": 20,
-    "slot": "208",
-    "type": "bytes12"
-  },
-  {
-    "bytes": "1312",
+    "bytes": "1376",
     "label": "__gap",
     "offset": 0,
-    "slot": "209",
-    "type": "uint256[41]"
+    "slot": "208",
+    "type": "uint256[43]"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
index ad9709095c33..546b37ba6398 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
@@ -1,24 +1,38 @@
 [
   {
-    "bytes": "32",
-    "label": "spacer_0_0_32",
+    "bytes": "1",
+    "label": "_initialized",
     "offset": 0,
     "slot": "0",
-    "type": "bytes32"
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "0",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_0_2_30",
+    "offset": 2,
+    "slot": "0",
+    "type": "bytes30"
   },
   {
     "bytes": "20",
-    "label": "spacer_1_0_20",
+    "label": "messenger",
     "offset": 0,
     "slot": "1",
-    "type": "address"
+    "type": "contract ICrossDomainMessenger"
   },
   {
     "bytes": "20",
-    "label": "spacer_2_0_20",
+    "label": "otherBridge",
     "offset": 0,
     "slot": "2",
-    "type": "address"
+    "type": "contract ERC721Bridge"
   },
   {
     "bytes": "1472",
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json
deleted file mode 100644
index 75e6d15b1f7d..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2OptimismMintableERC20Factory.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "bytes": "32",
-    "label": "spacer_0_0_32",
-    "offset": 0,
-    "slot": "0",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_1_0_32",
-    "offset": 0,
-    "slot": "1",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "deployments",
-    "offset": 0,
-    "slot": "2",
-    "type": "mapping(address => address)"
-  },
-  {
-    "bytes": "1536",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "3",
-    "type": "uint256[48]"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json b/packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json
deleted file mode 100644
index a0b6f46bf85e..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2ProxyAdmin.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
-  {
-    "bytes": "20",
-    "label": "_owner",
-    "offset": 0,
-    "slot": "0",
-    "type": "address"
-  },
-  {
-    "bytes": "32",
-    "label": "proxyType",
-    "offset": 0,
-    "slot": "1",
-    "type": "mapping(address => enum ProxyAdmin.ProxyType)"
-  },
-  {
-    "bytes": "32",
-    "label": "implementationName",
-    "offset": 0,
-    "slot": "2",
-    "type": "mapping(address => string)"
-  },
-  {
-    "bytes": "20",
-    "label": "addressManager",
-    "offset": 0,
-    "slot": "3",
-    "type": "contract IAddressManager"
-  },
-  {
-    "bytes": "1",
-    "label": "upgrading",
-    "offset": 20,
-    "slot": "3",
-    "type": "bool"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
index bda39d85dc77..c6ccc0fc2e03 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
@@ -1,10 +1,24 @@
 [
   {
-    "bytes": "32",
-    "label": "spacer_0_0_32",
+    "bytes": "1",
+    "label": "_initialized",
     "offset": 0,
     "slot": "0",
-    "type": "bytes32"
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "0",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_0_2_30",
+    "offset": 2,
+    "slot": "0",
+    "type": "bytes30"
   },
   {
     "bytes": "20",
@@ -22,23 +36,23 @@
   },
   {
     "bytes": "20",
-    "label": "spacer_3_0_20",
+    "label": "messenger",
     "offset": 0,
     "slot": "3",
-    "type": "address"
+    "type": "contract ICrossDomainMessenger"
   },
   {
     "bytes": "20",
-    "label": "spacer_4_0_20",
+    "label": "otherBridge",
     "offset": 0,
     "slot": "4",
-    "type": "address"
+    "type": "contract StandardBridge"
   },
   {
-    "bytes": "1408",
+    "bytes": "1440",
     "label": "__gap",
     "offset": 0,
     "slot": "5",
-    "type": "uint256[44]"
+    "type": "uint256[45]"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json
index bda39d85dc77..c6ccc0fc2e03 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridgeInterop.json
@@ -1,10 +1,24 @@
 [
   {
-    "bytes": "32",
-    "label": "spacer_0_0_32",
+    "bytes": "1",
+    "label": "_initialized",
     "offset": 0,
     "slot": "0",
-    "type": "bytes32"
+    "type": "uint8"
+  },
+  {
+    "bytes": "1",
+    "label": "_initializing",
+    "offset": 1,
+    "slot": "0",
+    "type": "bool"
+  },
+  {
+    "bytes": "30",
+    "label": "spacer_0_2_30",
+    "offset": 2,
+    "slot": "0",
+    "type": "bytes30"
   },
   {
     "bytes": "20",
@@ -22,23 +36,23 @@
   },
   {
     "bytes": "20",
-    "label": "spacer_3_0_20",
+    "label": "messenger",
     "offset": 0,
     "slot": "3",
-    "type": "address"
+    "type": "contract ICrossDomainMessenger"
   },
   {
     "bytes": "20",
-    "label": "spacer_4_0_20",
+    "label": "otherBridge",
     "offset": 0,
     "slot": "4",
-    "type": "address"
+    "type": "contract StandardBridge"
   },
   {
-    "bytes": "1408",
+    "bytes": "1440",
     "label": "__gap",
     "offset": 0,
     "slot": "5",
-    "type": "uint256[44]"
+    "type": "uint256[45]"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/L1OptimismMintableERC20Factory.json b/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json
similarity index 64%
rename from packages/contracts-bedrock/snapshots/storageLayout/L1OptimismMintableERC20Factory.json
rename to packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json
index 5bcde5813268..94c133d105d2 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1OptimismMintableERC20Factory.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json
@@ -1,58 +1,44 @@
 [
-  {
-    "bytes": "32",
-    "label": "spacer_0_0_32",
-    "offset": 0,
-    "slot": "0",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "spacer_1_0_32",
-    "offset": 0,
-    "slot": "1",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "deployments",
-    "offset": 0,
-    "slot": "2",
-    "type": "mapping(address => address)"
-  },
-  {
-    "bytes": "1536",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "3",
-    "type": "uint256[48]"
-  },
   {
     "bytes": "1",
     "label": "_initialized",
     "offset": 0,
-    "slot": "51",
+    "slot": "0",
     "type": "uint8"
   },
   {
     "bytes": "1",
     "label": "_initializing",
     "offset": 1,
-    "slot": "51",
+    "slot": "0",
     "type": "bool"
   },
   {
     "bytes": "30",
-    "label": "spacer_51_2_30",
+    "label": "spacer_0_2_30",
     "offset": 2,
-    "slot": "51",
+    "slot": "0",
     "type": "bytes30"
   },
   {
     "bytes": "20",
-    "label": "standardBridge",
+    "label": "bridge",
     "offset": 0,
-    "slot": "52",
+    "slot": "1",
     "type": "address"
+  },
+  {
+    "bytes": "32",
+    "label": "deployments",
+    "offset": 0,
+    "slot": "2",
+    "type": "mapping(address => address)"
+  },
+  {
+    "bytes": "1536",
+    "label": "__gap",
+    "offset": 0,
+    "slot": "3",
+    "type": "uint256[48]"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
index f5a249bfda65..27be4a7332fa 100644
--- a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
@@ -3,7 +3,6 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
-import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -19,10 +18,7 @@ import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 /// @notice The L1CrossDomainMessenger is a message passing interface between L1 and L2 responsible
 ///         for sending and receiving data on the L1 side. Users are encouraged to use this
 ///         interface instead of interacting with lower-level contracts directly.
-contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver, Initializable {
-    /// @notice Spacer to give the initializer a full slot, to avoid offsetting the superchainConfig slot.
-    bytes30 private spacer_250_2_30;
-
+contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
     /// @notice Contract of the SuperchainConfig.
     ISuperchainConfig public superchainConfig;
 
@@ -34,12 +30,16 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver, Initializable
     ISystemConfig public systemConfig;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.4.1-beta.3
-    string public constant version = "2.4.1-beta.3";
+    /// @custom:semver 2.4.1-beta.2
+    string public constant version = "2.4.1-beta.2";
 
     /// @notice Constructs the L1CrossDomainMessenger contract.
     constructor() CrossDomainMessenger() {
-        _disableInitializers();
+        initialize({
+            _superchainConfig: ISuperchainConfig(address(0)),
+            _portal: IOptimismPortal(payable(address(0))),
+            _systemConfig: ISystemConfig(address(0))
+        });
     }
 
     /// @notice Initializes the contract.
@@ -57,12 +57,7 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver, Initializable
         superchainConfig = _superchainConfig;
         portal = _portal;
         systemConfig = _systemConfig;
-    }
-
-    /// @notice Getter function for the other messenger.
-    /// @return Contract of the messenger on the other network.
-    function otherMessenger() public pure override returns (CrossDomainMessenger) {
-        return CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
+        __CrossDomainMessenger_init({ _otherMessenger: CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) });
     }
 
     /// @inheritdoc CrossDomainMessenger
@@ -91,7 +86,7 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver, Initializable
 
     /// @inheritdoc CrossDomainMessenger
     function _isOtherMessenger() internal view override returns (bool) {
-        return msg.sender == address(portal) && portal.l2Sender() == address(otherMessenger());
+        return msg.sender == address(portal) && portal.l2Sender() == address(otherMessenger);
     }
 
     /// @inheritdoc CrossDomainMessenger
diff --git a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
index f66c46c67d71..bd9b31c1e589 100644
--- a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.25;
+pragma solidity 0.8.15;
 
 // Contracts
 import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
-import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -20,7 +19,7 @@ import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
 /// @notice The L1 ERC721 bridge is a contract which works together with the L2 ERC721 bridge to
 ///         make it possible to transfer ERC721 tokens from Ethereum to Optimism. This contract
 ///         acts as an escrow for ERC721 tokens deposited into L2.
-contract L1ERC721Bridge is ERC721Bridge, Initializable, ISemver {
+contract L1ERC721Bridge is ERC721Bridge, ISemver {
     /// @notice Mapping of L1 token to L2 token to ID to boolean, indicating if the given L1 token
     ///         by ID was deposited for a given L2 token.
     mapping(address => mapping(address => mapping(uint256 => bool))) public deposits;
@@ -28,16 +27,13 @@ contract L1ERC721Bridge is ERC721Bridge, Initializable, ISemver {
     /// @notice Address of the SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
 
-    /// @notice Contract of the CrossDomainMessenger on this chain.
-    ICrossDomainMessenger internal crossDomainMessenger;
-
     /// @notice Semantic version.
-    /// @custom:semver 2.1.1-beta.3
-    string public constant version = "2.1.1-beta.3";
+    /// @custom:semver 2.2.0-beta.1
+    string public constant version = "2.2.0-beta.1";
 
     /// @notice Constructs the L1ERC721Bridge contract.
     constructor() ERC721Bridge() {
-        _disableInitializers();
+        initialize({ _messenger: ICrossDomainMessenger(address(0)), _superchainConfig: ISuperchainConfig(address(0)) });
     }
 
     /// @notice Initializes the contract.
@@ -45,19 +41,7 @@ contract L1ERC721Bridge is ERC721Bridge, Initializable, ISemver {
     /// @param _superchainConfig Contract of the SuperchainConfig contract on this network.
     function initialize(ICrossDomainMessenger _messenger, ISuperchainConfig _superchainConfig) public initializer {
         superchainConfig = _superchainConfig;
-        crossDomainMessenger = _messenger;
-    }
-
-    /// @notice Getter function for the CrossDomainMessenger contract on this chain.
-    /// @return Contract of the CrossDomainMessenger on this chain.
-    function messenger() public view override returns (ICrossDomainMessenger) {
-        return ICrossDomainMessenger(crossDomainMessenger);
-    }
-
-    /// @notice Getter function for the other bridge.
-    /// @return Contract of the bridge on the other network.
-    function otherBridge() public pure override returns (ERC721Bridge) {
-        return ERC721Bridge(payable(Predeploys.L2_ERC721_BRIDGE));
+        __ERC721Bridge_init({ _messenger: _messenger, _otherBridge: ERC721Bridge(payable(Predeploys.L2_ERC721_BRIDGE)) });
     }
 
     /// @inheritdoc ERC721Bridge
@@ -132,7 +116,7 @@ contract L1ERC721Bridge is ERC721Bridge, Initializable, ISemver {
         IERC721(_localToken).transferFrom({ from: _from, to: address(this), tokenId: _tokenId });
 
         // Send calldata into L2
-        messenger().sendMessage({ _target: address(otherBridge()), _message: message, _minGasLimit: _minGasLimit });
+        messenger.sendMessage({ _target: address(otherBridge), _message: message, _minGasLimit: _minGasLimit });
         emit ERC721BridgeInitiated(_localToken, _remoteToken, _from, _to, _tokenId, _extraData);
     }
 }
diff --git a/packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol
deleted file mode 100644
index 8d70325597bc..000000000000
--- a/packages/contracts-bedrock/src/L1/L1OptimismMintableERC20Factory.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-
-/// @custom:proxied true
-/// @title L1OptimismMintableERC20Factory
-/// @notice Allows users to create L1 tokens that represent L2 native tokens.
-contract L1OptimismMintableERC20Factory is OptimismMintableERC20Factory, Initializable {
-    /// @custom:semver 1.3.1-beta.5
-    /// @notice Semantic version.
-    ///         The semver MUST be bumped any time that there is a change in
-    ///         the OptimismMintableERC20 token contract since this contract
-    ///         is responsible for deploying OptimismMintableERC20 contracts.
-    string public constant version = "1.3.1-beta.5";
-
-    /// @custom:spacer
-    /// @notice Spacer to fill the remainder of the _initialized slot, preventing the standardBridge
-    ///         address from being packed with it.
-    bytes30 private spacer_51_2_30;
-
-    /// @notice Address of the bridge on this domain.
-    address internal standardBridge;
-
-    constructor() {
-        _disableInitializers();
-    }
-
-    /// @notice Initializes the contract.
-    /// @param _bridge Contract of the bridge on this domain.
-    function initialize(address _bridge) public initializer {
-        standardBridge = _bridge;
-    }
-
-    /// @notice Getter function for the bridge contract.
-    /// @return Contract of the bridge on this domain.
-    function bridge() public view virtual override returns (address) {
-        return standardBridge;
-    }
-}
diff --git a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
index f49f29864a93..54cc833fe673 100644
--- a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
@@ -3,16 +3,15 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { StandardBridge } from "src/universal/StandardBridge.sol";
+
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 /// @custom:proxied true
 /// @title L1StandardBridge
@@ -24,7 +23,7 @@ import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable
 ///         NOTE: this contract is not intended to support all variations of ERC20 tokens. Examples
 ///         of some token types that may not be properly supported by this contract include, but are
 ///         not limited to: tokens with transfer fees, rebasing tokens, and tokens with blocklists.
-contract L1StandardBridge is StandardBridge, ISemver, Initializable {
+contract L1StandardBridge is StandardBridge, ISemver {
     /// @custom:legacy
     /// @notice Emitted whenever a deposit of ETH from L1 into L2 is initiated.
     /// @param from      Address of the depositor.
@@ -76,13 +75,8 @@ contract L1StandardBridge is StandardBridge, ISemver, Initializable {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 2.2.1-beta.3
-    string public constant version = "2.2.1-beta.3";
-
-    /// @custom:spacer
-    /// @notice Spacer to fill the remainder of the _initialized slot, preventing the superchainConfig
-    ///         address from being packed with it.
-    bytes30 private spacer_49_2_30;
+    /// @custom:semver 2.2.1-beta.2
+    string public constant version = "2.2.1-beta.2";
 
     /// @notice Address of the SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
@@ -90,12 +84,13 @@ contract L1StandardBridge is StandardBridge, ISemver, Initializable {
     /// @notice Address of the SystemConfig contract.
     ISystemConfig public systemConfig;
 
-    /// @notice Contract for the CrossDomainMessenger on this network.
-    ICrossDomainMessenger internal crossDomainMessenger;
-
     /// @notice Constructs the L1StandardBridge contract.
     constructor() StandardBridge() {
-        _disableInitializers();
+        initialize({
+            _messenger: ICrossDomainMessenger(address(0)),
+            _superchainConfig: ISuperchainConfig(address(0)),
+            _systemConfig: ISystemConfig(address(0))
+        });
     }
 
     /// @notice Initializer.
@@ -111,19 +106,10 @@ contract L1StandardBridge is StandardBridge, ISemver, Initializable {
     {
         superchainConfig = _superchainConfig;
         systemConfig = _systemConfig;
-        crossDomainMessenger = _messenger;
-    }
-
-    /// @notice Returns the contract of the bridge on the other chain.
-    /// @return Contract of the bridge on the other chain.
-    function otherBridge() public pure override returns (IStandardBridge) {
-        return IStandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE));
-    }
-
-    /// @notice Getter function for the messenger contract.
-    /// @return Contract of the messenger on this domain.
-    function messenger() public view override returns (ICrossDomainMessenger) {
-        return ICrossDomainMessenger(crossDomainMessenger);
+        __StandardBridge_init({
+            _messenger: _messenger,
+            _otherBridge: StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE))
+        });
     }
 
     /// @inheritdoc StandardBridge
@@ -255,8 +241,8 @@ contract L1StandardBridge is StandardBridge, ISemver, Initializable {
     /// @custom:legacy
     /// @notice Retrieves the access of the corresponding L2 bridge contract.
     /// @return Address of the corresponding L2 bridge contract.
-    function l2TokenBridge() external pure returns (address) {
-        return address(otherBridge());
+    function l2TokenBridge() external view returns (address) {
+        return address(otherBridge);
     }
 
     /// @notice Internal function for initiating an ETH deposit.
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
index 721c7649ed0a..4bf52ff228a1 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -46,7 +46,6 @@ contract OPContractsManager is ISemver, Initializable {
         address unsafeBlockSigner;
         address proposer;
         address challenger;
-        address systemConfigFeeAdmin;
     }
 
     /// @notice The full set of inputs to deploy a new OP Stack chain.
@@ -130,8 +129,8 @@ contract OPContractsManager is ISemver, Initializable {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.0.0-beta.21
-    string public constant version = "1.0.0-beta.21";
+    /// @custom:semver 1.0.0-beta.20
+    string public constant version = "1.0.0-beta.20";
 
     /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
     /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
@@ -255,7 +254,7 @@ contract OPContractsManager is ISemver, Initializable {
         output.systemConfigProxy =
             ISystemConfig(deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "SystemConfig"));
         output.optimismMintableERC20FactoryProxy = IOptimismMintableERC20Factory(
-            deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "L1OptimismMintableERC20Factory")
+            deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "OptimismMintableERC20Factory")
         );
         output.disputeGameFactoryProxy =
             IDisputeGameFactory(deployProxy(l2ChainId, output.opChainProxyAdmin, saltMixer, "DisputeGameFactory"));
@@ -469,15 +468,12 @@ contract OPContractsManager is ISemver, Initializable {
 
             return abi.encodeWithSelector(
                 _selector,
-                ISystemConfig.Roles({
-                    owner: _input.roles.systemConfigOwner,
-                    feeAdmin: _input.roles.systemConfigFeeAdmin,
-                    unsafeBlockSigner: _input.roles.unsafeBlockSigner,
-                    batcherHash: bytes32(uint256(uint160(_input.roles.batcher)))
-                }),
+                _input.roles.systemConfigOwner,
                 _input.basefeeScalar,
                 _input.blobBasefeeScalar,
+                bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
                 _input.gasLimit,
+                _input.roles.unsafeBlockSigner,
                 referenceResourceConfig,
                 chainIdToBatchInboxAddress(_input.l2ChainId),
                 opChainAddrs
@@ -491,15 +487,12 @@ contract OPContractsManager is ISemver, Initializable {
 
             return abi.encodeWithSelector(
                 _selector,
-                ISystemConfig.Roles({
-                    owner: _input.roles.systemConfigOwner,
-                    feeAdmin: _input.roles.systemConfigFeeAdmin,
-                    unsafeBlockSigner: _input.roles.unsafeBlockSigner,
-                    batcherHash: bytes32(uint256(uint160(_input.roles.batcher)))
-                }),
+                _input.roles.systemConfigOwner,
                 _input.basefeeScalar,
                 _input.blobBasefeeScalar,
+                bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
                 _input.gasLimit,
+                _input.roles.unsafeBlockSigner,
                 referenceResourceConfig,
                 chainIdToBatchInboxAddress(_input.l2ChainId),
                 opChainAddrs
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
index a237dc1162f0..19de5537b41c 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
@@ -41,15 +41,12 @@ contract OPContractsManagerInterop is OPContractsManager {
 
         return abi.encodeWithSelector(
             _selector,
-            ISystemConfig.Roles({
-                owner: _input.roles.systemConfigOwner,
-                feeAdmin: _input.roles.systemConfigFeeAdmin,
-                unsafeBlockSigner: _input.roles.unsafeBlockSigner,
-                batcherHash: bytes32(uint256(uint160(_input.roles.batcher)))
-            }),
+            _input.roles.systemConfigOwner,
             _input.basefeeScalar,
             _input.blobBasefeeScalar,
+            bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
             _input.gasLimit,
+            _input.roles.unsafeBlockSigner,
             referenceResourceConfig,
             chainIdToBatchInboxAddress(_input.l2ChainId),
             opChainAddrs,
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal.sol b/packages/contracts-bedrock/src/L1/OptimismPortal.sol
index d097d2e22d12..2f9f53787581 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortal.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortal.sol
@@ -146,9 +146,9 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 2.8.1-beta.5
+    /// @custom:semver 2.8.1-beta.4
     function version() public pure virtual returns (string memory) {
-        return "2.8.1-beta.5";
+        return "2.8.1-beta.4";
     }
 
     /// @notice Constructs the OptimismPortal contract.
@@ -584,17 +584,17 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
         emit TransactionDeposited(from, _to, DEPOSIT_VERSION, opaqueData);
     }
 
-    /// @notice Sets static configuration options for the L2 system.
-    /// @param _type  Type of configuration to set.
-    /// @param _value Encoded value of the configuration.
-    function setConfig(Types.ConfigType _type, bytes memory _value) external {
+    /// @notice Sets the gas paying token for the L2 system. This token is used as the
+    ///         L2 native asset. Only the SystemConfig contract can call this function.
+    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external {
         if (msg.sender != address(systemConfig)) revert Unauthorized();
 
         // Set L2 deposit gas as used without paying burning gas. Ensures that deposits cannot use too much L2 gas.
-        // This value must be large enough to cover the cost of calling `L1Block.setConfig`.
+        // This value must be large enough to cover the cost of calling `L1Block.setGasPayingToken`.
         useGas(SYSTEM_DEPOSIT_GAS_LIMIT);
 
-        // Emit the special deposit transaction directly that sets the config in the L1Block predeploy contract.
+        // Emit the special deposit transaction directly that sets the gas paying
+        // token in the L1Block predeploy contract.
         emit TransactionDeposited(
             Constants.DEPOSITOR_ACCOUNT,
             Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -604,7 +604,7 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
                 uint256(0), // value
                 uint64(SYSTEM_DEPOSIT_GAS_LIMIT), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setConfig, (_type, _value))
+                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
             )
         );
     }
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
index 951e2bea4a18..985711ed18e5 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
@@ -183,9 +183,9 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 3.11.0-beta.7
+    /// @custom:semver 3.11.0-beta.6
     function version() public pure virtual returns (string memory) {
-        return "3.11.0-beta.7";
+        return "3.11.0-beta.6";
     }
 
     /// @notice Constructs the OptimismPortal contract.
@@ -605,17 +605,17 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
         emit TransactionDeposited(from, _to, DEPOSIT_VERSION, opaqueData);
     }
 
-    /// @notice Sets static configuration options for the L2 system.
-    /// @param _type  Type of configuration to set.
-    /// @param _value Encoded value of the configuration.
-    function setConfig(Types.ConfigType _type, bytes memory _value) external {
+    /// @notice Sets the gas paying token for the L2 system. This token is used as the
+    ///         L2 native asset. Only the SystemConfig contract can call this function.
+    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external {
         if (msg.sender != address(systemConfig)) revert Unauthorized();
 
         // Set L2 deposit gas as used without paying burning gas. Ensures that deposits cannot use too much L2 gas.
-        // This value must be large enough to cover the cost of calling `L1Block.setConfig`.
+        // This value must be large enough to cover the cost of calling `L1Block.setGasPayingToken`.
         useGas(SYSTEM_DEPOSIT_GAS_LIMIT);
 
-        // Emit the special deposit transaction directly that sets the config in the L1Block predeploy contract.
+        // Emit the special deposit transaction directly that sets the gas paying
+        // token in the L1Block predeploy contract.
         emit TransactionDeposited(
             Constants.DEPOSITOR_ACCOUNT,
             Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -625,30 +625,7 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
                 uint256(0), // value
                 uint64(SYSTEM_DEPOSIT_GAS_LIMIT), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setConfig, (_type, _value))
-            )
-        );
-    }
-
-    /// @notice Calls the L2ProxyAdmin as the DEPOSITOR_ACCOUNT. This function can be used
-    ///         to upgrade the predeploys on L2. Only callable by the upgrader role on the
-    ///         SuperchainConfig.
-    function upgrade(uint32 _gasLimit, bytes memory _calldata) external {
-        if (msg.sender != superchainConfig.upgrader()) revert Unauthorized();
-
-        useGas(_gasLimit);
-
-        // Emit the special deposit transaction which calls to the L2 Proxy Admin
-        emit TransactionDeposited(
-            Constants.DEPOSITOR_ACCOUNT,
-            Predeploys.PROXY_ADMIN,
-            DEPOSIT_VERSION,
-            abi.encodePacked(
-                uint256(0), // mint
-                uint256(0), // value
-                uint64(_gasLimit), // gasLimit
-                false, // isCreation,
-                _calldata // data
+                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
             )
         );
     }
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
index be23f4eec56d..4c238c415d34 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
@@ -3,6 +3,12 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { OptimismPortal2 } from "src/L1/OptimismPortal2.sol";
+import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
+
+// Libraries
+import { Predeploys } from "src/libraries/Predeploys.sol";
+import { Constants } from "src/libraries/Constants.sol";
+import { Unauthorized } from "src/libraries/PortalErrors.sol";
 
 /// @custom:proxied true
 /// @title OptimismPortalInterop
@@ -17,8 +23,33 @@ contract OptimismPortalInterop is OptimismPortal2 {
         OptimismPortal2(_proofMaturityDelaySeconds, _disputeGameFinalityDelaySeconds)
     { }
 
-    /// @custom:semver +interop-beta.3
+    /// @custom:semver +interop-beta.2
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.3");
+        return string.concat(super.version(), "+interop-beta.2");
+    }
+
+    /// @notice Sets static configuration options for the L2 system.
+    /// @param _type  Type of configuration to set.
+    /// @param _value Encoded value of the configuration.
+    function setConfig(ConfigType _type, bytes memory _value) external {
+        if (msg.sender != address(systemConfig)) revert Unauthorized();
+
+        // Set L2 deposit gas as used without paying burning gas. Ensures that deposits cannot use too much L2 gas.
+        // This value must be large enough to cover the cost of calling `L1Block.setConfig`.
+        useGas(SYSTEM_DEPOSIT_GAS_LIMIT);
+
+        // Emit the special deposit transaction directly that sets the config in the L1Block predeploy contract.
+        emit TransactionDeposited(
+            Constants.DEPOSITOR_ACCOUNT,
+            Predeploys.L1_BLOCK_ATTRIBUTES,
+            DEPOSIT_VERSION,
+            abi.encodePacked(
+                uint256(0), // mint
+                uint256(0), // value
+                uint64(SYSTEM_DEPOSIT_GAS_LIMIT), // gasLimit
+                false, // isCreation,
+                abi.encodeCall(L1BlockInterop.setConfig, (_type, _value))
+            )
+        );
     }
 }
diff --git a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
index 1701bcff165b..51b13936c81b 100644
--- a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
@@ -12,10 +12,8 @@ import { Storage } from "src/libraries/Storage.sol";
 contract SuperchainConfig is Initializable, ISemver {
     /// @notice Enum representing different types of updates.
     /// @custom:value GUARDIAN            Represents an update to the guardian.
-    /// @custom:value UPGRADER            Represents an update to the upgrader.
     enum UpdateType {
-        GUARDIAN,
-        UPGRADER
+        GUARDIAN
     }
 
     /// @notice Whether or not the Superchain is paused.
@@ -25,10 +23,6 @@ contract SuperchainConfig is Initializable, ISemver {
     ///         It can only be modified by an upgrade.
     bytes32 public constant GUARDIAN_SLOT = bytes32(uint256(keccak256("superchainConfig.guardian")) - 1);
 
-    /// @notice The address of the upgrader, which can faciliate upgrades of L2 predeploys.
-    /// .       It can only be modified by an upgrade.
-    bytes32 public constant UPGRADER_SLOT = bytes32(uint256(keccak256("superchainConfig.upgrader")) - 1);
-
     /// @notice Emitted when the pause is triggered.
     /// @param identifier A string helping to identify provenance of the pause transaction.
     event Paused(string identifier);
@@ -42,20 +36,19 @@ contract SuperchainConfig is Initializable, ISemver {
     event ConfigUpdate(UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.2
-    string public constant version = "1.1.1-beta.2";
+    /// @custom:semver 1.1.1-beta.1
+    string public constant version = "1.1.1-beta.1";
 
     /// @notice Constructs the SuperchainConfig contract.
     constructor() {
-        _disableInitializers();
+        initialize({ _guardian: address(0), _paused: false });
     }
 
     /// @notice Initializer.
     /// @param _guardian    Address of the guardian, can pause the OptimismPortal.
     /// @param _paused      Initial paused status.
-    function initialize(address _guardian, address _upgrader, bool _paused) public initializer {
+    function initialize(address _guardian, bool _paused) public initializer {
         _setGuardian(_guardian);
-        _setUpgrader(_upgrader);
         if (_paused) {
             _pause("Initializer paused");
         }
@@ -66,11 +59,6 @@ contract SuperchainConfig is Initializable, ISemver {
         guardian_ = Storage.getAddress(GUARDIAN_SLOT);
     }
 
-    /// @notice Getter for the upgrader address.
-    function upgrader() public view returns (address upgrader_) {
-        upgrader_ = Storage.getAddress(UPGRADER_SLOT);
-    }
-
     /// @notice Getter for the current paused status.
     function paused() public view returns (bool paused_) {
         paused_ = Storage.getBool(PAUSED_SLOT);
@@ -104,12 +92,4 @@ contract SuperchainConfig is Initializable, ISemver {
         Storage.setAddress(GUARDIAN_SLOT, _guardian);
         emit ConfigUpdate(UpdateType.GUARDIAN, abi.encode(_guardian));
     }
-
-    /// @notice Sets the upgrader address. This is only callable during initialization, so an upgrade
-    ///         will be required to change the upgrader.
-    /// @param _upgrader The new upgrader address.
-    function _setUpgrader(address _upgrader) internal {
-        Storage.setAddress(UPGRADER_SLOT, _upgrader);
-        emit ConfigUpdate(UpdateType.UPGRADER, abi.encode(_upgrader));
-    }
 }
diff --git a/packages/contracts-bedrock/src/L1/SystemConfig.sol b/packages/contracts-bedrock/src/L1/SystemConfig.sol
index f4b724b8d27e..afb9525403c7 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfig.sol
@@ -4,18 +4,15 @@ pragma solidity 0.8.15;
 // Contracts
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { StaticConfig } from "src/libraries/StaticConfig.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
 
 // Libraries
 import { Storage } from "src/libraries/Storage.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IOptimismPortal2 as IOptimismPortal } from "src/L1/interfaces/IOptimismPortal2.sol";
+import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 
 /// @custom:proxied true
@@ -51,18 +48,6 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         address gasPayingToken;
     }
 
-    /// @notice Struct representing the roles of the system.
-    /// @notice The owner (chain operator) of the system.
-    /// @notice The fee admin of the system.
-    /// @notice The unsafe block signer of the system.
-    /// @notice The batcher hash of the system.
-    struct Roles {
-        address owner;
-        address feeAdmin;
-        address unsafeBlockSigner;
-        bytes32 batcherHash;
-    }
-
     /// @notice Version identifier, used for upgrades.
     uint256 public constant VERSION = 0;
 
@@ -76,9 +61,6 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     ///         but it is better to be safe than sorry.
     bytes32 public constant UNSAFE_BLOCK_SIGNER_SLOT = keccak256("systemconfig.unsafeblocksigner");
 
-    /// @notice Storage slot that the feeAdmin address is stored at.
-    bytes32 internal constant FEE_ADMIN_SLOT = keccak256("systemconfig.feeadmin");
-
     /// @notice Storage slot that the L1CrossDomainMessenger address is stored at.
     bytes32 public constant L1_CROSS_DOMAIN_MESSENGER_SLOT =
         bytes32(uint256(keccak256("systemconfig.l1crossdomainmessenger")) - 1);
@@ -155,9 +137,9 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 2.3.0-beta.6
+    /// @custom:semver 2.3.0-beta.5
     function version() public pure virtual returns (string memory) {
-        return "2.3.0-beta.6";
+        return "2.3.0-beta.5";
     }
 
     /// @notice Constructs the SystemConfig contract. Cannot set
@@ -165,28 +147,55 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     ///         implementation, so set it to `address(0xdEaD)`
     /// @dev    START_BLOCK_SLOT is set to type(uint256).max here so that it will be a dead value
     ///         in the singleton and is skipped by initialize when setting the start block.
-    ///         _disableInitializers is called to prevent the need to make calls during the constructor
-    ///         if initialize is called directly.
     constructor() {
         Storage.setUint(START_BLOCK_SLOT, type(uint256).max);
-        _disableInitializers();
+        initialize({
+            _owner: address(0xdEaD),
+            _basefeeScalar: 0,
+            _blobbasefeeScalar: 0,
+            _batcherHash: bytes32(0),
+            _gasLimit: 1,
+            _unsafeBlockSigner: address(0),
+            _config: IResourceMetering.ResourceConfig({
+                maxResourceLimit: 1,
+                elasticityMultiplier: 1,
+                baseFeeMaxChangeDenominator: 2,
+                minimumBaseFee: 0,
+                systemTxMaxGas: 0,
+                maximumBaseFee: 0
+            }),
+            _batchInbox: address(0),
+            _addresses: SystemConfig.Addresses({
+                l1CrossDomainMessenger: address(0),
+                l1ERC721Bridge: address(0),
+                l1StandardBridge: address(0),
+                disputeGameFactory: address(0),
+                optimismPortal: address(0),
+                optimismMintableERC20Factory: address(0),
+                gasPayingToken: address(0)
+            })
+        });
     }
 
     /// @notice Initializer.
     ///         The resource config must be set before the require check.
-    /// @param _roles             Initial roles.
+    /// @param _owner             Initial owner of the contract.
     /// @param _basefeeScalar     Initial basefee scalar value.
     /// @param _blobbasefeeScalar Initial blobbasefee scalar value.
+    /// @param _batcherHash       Initial batcher hash.
     /// @param _gasLimit          Initial gas limit.
+    /// @param _unsafeBlockSigner Initial unsafe block signer address.
     /// @param _config            Initial ResourceConfig.
     /// @param _batchInbox        Batch inbox address. An identifier for the op-node to find
     ///                           canonical data.
     /// @param _addresses         Set of L1 contract addresses. These should be the proxies.
     function initialize(
-        Roles memory _roles,
+        address _owner,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
+        bytes32 _batcherHash,
         uint64 _gasLimit,
+        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         SystemConfig.Addresses memory _addresses
@@ -195,58 +204,29 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         initializer
     {
         __Ownable_init();
-        transferOwnership(_roles.owner);
+        transferOwnership(_owner);
 
         // These are set in ascending order of their UpdateTypes.
-        _setBatcherHash(_roles.batcherHash);
+        _setBatcherHash(_batcherHash);
         _setGasConfigEcotone({ _basefeeScalar: _basefeeScalar, _blobbasefeeScalar: _blobbasefeeScalar });
         _setGasLimit(_gasLimit);
 
-        Storage.setAddress(UNSAFE_BLOCK_SIGNER_SLOT, _roles.unsafeBlockSigner);
-        Storage.setAddress(FEE_ADMIN_SLOT, _roles.feeAdmin);
+        Storage.setAddress(UNSAFE_BLOCK_SIGNER_SLOT, _unsafeBlockSigner);
         Storage.setAddress(BATCH_INBOX_SLOT, _batchInbox);
-
-        Storage.setAddress(OPTIMISM_PORTAL_SLOT, _addresses.optimismPortal);
+        Storage.setAddress(L1_CROSS_DOMAIN_MESSENGER_SLOT, _addresses.l1CrossDomainMessenger);
+        Storage.setAddress(L1_ERC_721_BRIDGE_SLOT, _addresses.l1ERC721Bridge);
+        Storage.setAddress(L1_STANDARD_BRIDGE_SLOT, _addresses.l1StandardBridge);
         Storage.setAddress(DISPUTE_GAME_FACTORY_SLOT, _addresses.disputeGameFactory);
+        Storage.setAddress(OPTIMISM_PORTAL_SLOT, _addresses.optimismPortal);
         Storage.setAddress(OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT, _addresses.optimismMintableERC20Factory);
 
-        _setGasPayingToken(_addresses.gasPayingToken);
-        _setAddress(
-            L1_CROSS_DOMAIN_MESSENGER_SLOT,
-            _addresses.l1CrossDomainMessenger,
-            Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS
-        );
-        _setAddress(L1_ERC_721_BRIDGE_SLOT, _addresses.l1ERC721Bridge, Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS);
-        _setAddress(L1_STANDARD_BRIDGE_SLOT, _addresses.l1StandardBridge, Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS);
-
-        _setRemoteChainId();
         _setStartBlock();
-
-        // TODO: set fee vault config calls
+        _setGasPayingToken(_addresses.gasPayingToken);
 
         _setResourceConfig(_config);
         require(_gasLimit >= minimumGasLimit(), "SystemConfig: gas limit too low");
     }
 
-    /// @notice Internal setter for L1 system addresses that need to be legible from within L2.
-    /// @param _slot The local storage slot that the address should be stored in.
-    /// @param _addr The address of the L1 based system address.
-    /// @param _type The ConfigType that represents what the address is.
-    function _setAddress(bytes32 _slot, address _addr, Types.ConfigType _type) internal {
-        Storage.setAddress(_slot, _addr);
-        IOptimismPortal(payable(optimismPortal())).setConfig({ _type: _type, _value: abi.encode(_addr) });
-    }
-
-    /// @notice Internal setter for the base chain's chain id. This allows for the
-    ///         base chain's chain id to be legible from within the parent chain.
-    ///         In the case of an L2, this would be the L1 chain id.
-    function _setRemoteChainId() internal {
-        IOptimismPortal(payable(optimismPortal())).setConfig({
-            _type: Types.ConfigType.REMOTE_CHAIN_ID,
-            _value: abi.encode(block.chainid)
-        });
-    }
-
     /// @notice Returns the minimum L2 gas limit that can be safely set for the system to
     ///         operate. The L2 gas limit must be larger than or equal to the amount of
     ///         gas that is allocated for deposits per block plus the amount of gas that
@@ -273,12 +253,6 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         addr_ = Storage.getAddress(UNSAFE_BLOCK_SIGNER_SLOT);
     }
 
-    /// @notice High level getter for the fee admin address.
-    /// @return addr_ Address of the fee admin.
-    function feeAdmin() public view returns (address addr_) {
-        addr_ = Storage.getAddress(FEE_ADMIN_SLOT);
-    }
-
     /// @notice Getter for the L1CrossDomainMessenger address.
     function l1CrossDomainMessenger() external view returns (address addr_) {
         addr_ = Storage.getAddress(L1_CROSS_DOMAIN_MESSENGER_SLOT);
@@ -346,7 +320,7 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     ///         to set the token address. This prevents the token address from being changed
     ///         and makes it explicitly opt-in to use custom gas token.
     /// @param _token Address of the gas paying token.
-    function _setGasPayingToken(address _token) internal {
+    function _setGasPayingToken(address _token) internal virtual {
         if (_token != address(0) && _token != Constants.ETHER && !isCustomGasToken()) {
             require(
                 ERC20(_token).decimals() == GAS_PAYING_TOKEN_DECIMALS, "SystemConfig: bad decimals of gas paying token"
@@ -354,17 +328,14 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
             bytes32 name = GasPayingToken.sanitize(ERC20(_token).name());
             bytes32 symbol = GasPayingToken.sanitize(ERC20(_token).symbol());
 
-            // Set the gas paying token in storage and call the OptimismPortal.
+            // Set the gas paying token in storage and in the OptimismPortal.
             GasPayingToken.set({ _token: _token, _decimals: GAS_PAYING_TOKEN_DECIMALS, _name: name, _symbol: symbol });
-            IOptimismPortal(payable(optimismPortal())).setConfig(
-                Types.ConfigType.GAS_PAYING_TOKEN,
-                StaticConfig.encodeSetGasPayingToken({
-                    _token: _token,
-                    _decimals: GAS_PAYING_TOKEN_DECIMALS,
-                    _name: name,
-                    _symbol: symbol
-                })
-            );
+            IOptimismPortal(payable(optimismPortal())).setGasPayingToken({
+                _token: _token,
+                _decimals: GAS_PAYING_TOKEN_DECIMALS,
+                _name: name,
+                _symbol: symbol
+            });
         }
     }
 
@@ -445,47 +416,6 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         _setGasLimit(_gasLimit);
     }
 
-    /// @notice Setter for the FeeVault predeploy configuration.
-    /// @param _type The FeeVault type.
-    /// @param _recipient Address that should receive the funds.
-    /// @param _min Minimum withdrawal amount allowed to be processed.
-    /// @param _network The network in which the fees should be withdrawn to.
-    function setFeeVaultConfig(
-        Types.ConfigType _type,
-        address _recipient,
-        uint256 _min,
-        Types.WithdrawalNetwork _network
-    )
-        external
-    {
-        require(msg.sender == feeAdmin(), "SystemConfig: caller is not the fee admin");
-        _setFeeVaultConfig(_type, _recipient, _min, _network);
-    }
-
-    /// @notice Internal function for setting the FeeVault config by type.
-    /// @param _type The FeeVault type
-    /// @param _recipient Address that should receive the funds.
-    /// @param _min Minimum withdrawal amount allowed to be processed.
-    /// @param _network The network in which the fees should be withdrawn to.
-    function _setFeeVaultConfig(
-        Types.ConfigType _type,
-        address _recipient,
-        uint256 _min,
-        Types.WithdrawalNetwork _network
-    )
-        internal
-    {
-        require(
-            _type == Types.ConfigType.BASE_FEE_VAULT_CONFIG || _type == Types.ConfigType.L1_FEE_VAULT_CONFIG
-                || _type == Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG,
-            "SystemConfig: ConfigType is is not a Fee Vault Config type"
-        );
-        IOptimismPortal(payable(optimismPortal())).setConfig({
-            _type: _type,
-            _value: abi.encode(Encoding.encodeFeeVaultConfig(_recipient, _min, _network))
-        });
-    }
-
     /// @notice Internal function for updating the L2 gas limit.
     /// @param _gasLimit New gas limit.
     function _setGasLimit(uint64 _gasLimit) internal {
@@ -562,9 +492,6 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
             "SystemConfig: precision loss with target resource limit"
         );
 
-        // TODO: maxResourceLimit must be large enough to handle the SystemConfig.initialize
-        //       call
-
         _resourceConfig = _config;
     }
 }
diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
index 755c279fc8ac..032109286596 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
@@ -2,13 +2,16 @@
 pragma solidity 0.8.15;
 
 // Contracts
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IOptimismPortalInterop as IOptimismPortal } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { SystemConfig } from "src/L1/SystemConfig.sol";
+import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Libraries
+import { Constants } from "src/libraries/Constants.sol";
+import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { Storage } from "src/libraries/Storage.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
@@ -25,20 +28,24 @@ contract SystemConfigInterop is SystemConfig {
         0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c;
 
     /// @notice Initializer.
-    /// @param _roles             Initial roles.
+    /// @param _owner             Initial owner of the contract.
     /// @param _basefeeScalar     Initial basefee scalar value.
     /// @param _blobbasefeeScalar Initial blobbasefee scalar value.
+    /// @param _batcherHash       Initial batcher hash.
     /// @param _gasLimit          Initial gas limit.
+    /// @param _unsafeBlockSigner Initial unsafe block signer address.
     /// @param _config            Initial ResourceConfig.
     /// @param _batchInbox        Batch inbox address. An identifier for the op-node to find
     ///                           canonical data.
     /// @param _addresses         Set of L1 contract addresses. These should be the proxies.
     /// @param _dependencyManager The addressed allowed to add/remove from the dependency set
     function initialize(
-        SystemConfig.Roles memory _roles,
+        address _owner,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
+        bytes32 _batcherHash,
         uint64 _gasLimit,
+        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         SystemConfig.Addresses memory _addresses,
@@ -48,10 +55,12 @@ contract SystemConfigInterop is SystemConfig {
     {
         // This method has an initializer modifier, and will revert if already initialized.
         initialize({
-            _roles: _roles,
+            _owner: _owner,
             _basefeeScalar: _basefeeScalar,
             _blobbasefeeScalar: _blobbasefeeScalar,
+            _batcherHash: _batcherHash,
             _gasLimit: _gasLimit,
+            _unsafeBlockSigner: _unsafeBlockSigner,
             _config: _config,
             _batchInbox: _batchInbox,
             _addresses: _addresses
@@ -59,9 +68,38 @@ contract SystemConfigInterop is SystemConfig {
         Storage.setAddress(DEPENDENCY_MANAGER_SLOT, _dependencyManager);
     }
 
-    /// @custom:semver +interop-beta.4
+    /// @custom:semver +interop-beta.3
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.4");
+        return string.concat(super.version(), "+interop-beta.3");
+    }
+
+    /// @notice Internal setter for the gas paying token address, includes validation.
+    ///         The token must not already be set and must be non zero and not the ether address
+    ///         to set the token address. This prevents the token address from being changed
+    ///         and makes it explicitly opt-in to use custom gas token. Additionally,
+    ///         OptimismPortal's address must be non zero, since otherwise the call to set the
+    ///         config for the gas paying token to OptimismPortal will fail.
+    /// @param _token Address of the gas paying token.
+    function _setGasPayingToken(address _token) internal override {
+        if (_token != address(0) && _token != Constants.ETHER && !isCustomGasToken()) {
+            require(
+                ERC20(_token).decimals() == GAS_PAYING_TOKEN_DECIMALS, "SystemConfig: bad decimals of gas paying token"
+            );
+            bytes32 name = GasPayingToken.sanitize(ERC20(_token).name());
+            bytes32 symbol = GasPayingToken.sanitize(ERC20(_token).symbol());
+
+            // Set the gas paying token in storage and in the OptimismPortal.
+            GasPayingToken.set({ _token: _token, _decimals: GAS_PAYING_TOKEN_DECIMALS, _name: name, _symbol: symbol });
+            IOptimismPortal(payable(optimismPortal())).setConfig(
+                ConfigType.SET_GAS_PAYING_TOKEN,
+                StaticConfig.encodeSetGasPayingToken({
+                    _token: _token,
+                    _decimals: GAS_PAYING_TOKEN_DECIMALS,
+                    _name: name,
+                    _symbol: symbol
+                })
+            );
+        }
     }
 
     /// @notice Adds a chain to the interop dependency set. Can only be called by the dependency manager.
@@ -69,7 +107,7 @@ contract SystemConfigInterop is SystemConfig {
     function addDependency(uint256 _chainId) external {
         require(msg.sender == dependencyManager(), "SystemConfig: caller is not the dependency manager");
         IOptimismPortal(payable(optimismPortal())).setConfig(
-            Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId)
+            ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId)
         );
     }
 
@@ -78,7 +116,7 @@ contract SystemConfigInterop is SystemConfig {
     function removeDependency(uint256 _chainId) external {
         require(msg.sender == dependencyManager(), "SystemConfig: caller is not the dependency manager");
         IOptimismPortal(payable(optimismPortal())).setConfig(
-            Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId)
+            ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId)
         );
     }
 
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
index eb3d0250af2f..8a6de84e2c9d 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
@@ -7,8 +7,6 @@ import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 
 interface IL1CrossDomainMessenger is ICrossDomainMessenger {
-    event Initialized(uint8 version);
-
     function PORTAL() external view returns (IOptimismPortal);
     function initialize(
         ISuperchainConfig _superchainConfig,
@@ -16,8 +14,6 @@ interface IL1CrossDomainMessenger is ICrossDomainMessenger {
         ISystemConfig _systemConfig
     )
         external;
-    function OTHER_MESSENGER() external view returns (ICrossDomainMessenger);
-    function otherMessenger() external pure returns (ICrossDomainMessenger);
     function portal() external view returns (IOptimismPortal);
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
index ec111614a523..51356bc8d346 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
@@ -6,11 +6,6 @@ import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMess
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 
 interface IL1ERC721Bridge is IERC721Bridge {
-    error InvalidInitialization();
-    error NotInitializing();
-
-    event Initialized(uint64 version);
-
     function bridgeERC721(
         address _localToken,
         address _remoteToken,
@@ -39,7 +34,6 @@ interface IL1ERC721Bridge is IERC721Bridge {
     )
         external;
     function initialize(ICrossDomainMessenger _messenger, ISuperchainConfig _superchainConfig) external;
-    function otherBridge() external pure returns (IERC721Bridge);
     function paused() external view returns (bool);
     function superchainConfig() external view returns (ISuperchainConfig);
     function version() external view returns (string memory);
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol
deleted file mode 100644
index 7ac1d3175d40..000000000000
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1OptimismMintableERC20Factory.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-interface IL1OptimismMintableERC20Factory {
-    event Initialized(uint8 version);
-    event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
-    event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
-
-    function BRIDGE() external view returns (address);
-    function bridge() external view returns (address);
-    function createOptimismMintableERC20(
-        address _remoteToken,
-        string memory _name,
-        string memory _symbol
-    )
-        external
-        returns (address);
-    function createOptimismMintableERC20WithDecimals(
-        address _remoteToken,
-        string memory _name,
-        string memory _symbol,
-        uint8 _decimals
-    )
-        external
-        returns (address);
-    function createStandardL2Token(
-        address _remoteToken,
-        string memory _name,
-        string memory _symbol
-    )
-        external
-        returns (address);
-    function deployments(address) external view returns (address);
-    function initialize(address _bridge) external;
-    function version() external view returns (string memory);
-
-    function __constructor__() external;
-}
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol b/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
index 53419cdd59d5..816436cf1084 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
@@ -25,7 +25,6 @@ interface IL1StandardBridge is IStandardBridge {
     );
     event ETHDepositInitiated(address indexed from, address indexed to, uint256 amount, bytes extraData);
     event ETHWithdrawalFinalized(address indexed from, address indexed to, uint256 amount, bytes extraData);
-    event Initialized(uint8 version);
 
     function depositERC20(
         address _l1Token,
@@ -69,9 +68,7 @@ interface IL1StandardBridge is IStandardBridge {
         ISystemConfig _systemConfig
     )
         external;
-    function l2TokenBridge() external pure returns (address);
-    function OTHER_BRIDGE() external view returns (IStandardBridge);
-    function otherBridge() external pure returns (IStandardBridge);
+    function l2TokenBridge() external view returns (address);
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
     function version() external view returns (string memory);
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
index 69f9fb9e16c6..b9035a6e5143 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
@@ -5,7 +5,6 @@ import { Types } from "src/libraries/Types.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
-import { Types } from "src/libraries/Types.sol";
 
 interface IOptimismPortal {
     error BadTarget();
@@ -79,9 +78,9 @@ interface IOptimismPortal {
         external
         view
         returns (bytes32 outputRoot, uint128 timestamp, uint128 l2OutputIndex); // nosemgrep
+    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
-    function setConfig(Types.ConfigType _type, bytes memory _value) external;
     function version() external pure returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
index 51395720f283..91f09d714314 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
@@ -7,7 +7,6 @@ import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { Types } from "src/libraries/Types.sol";
 
 interface IOptimismPortal2 {
     error AlreadyFinalized();
@@ -109,12 +108,11 @@ interface IOptimismPortal2 {
         returns (IDisputeGame disputeGameProxy, uint64 timestamp); // nosemgrep
     function respectedGameType() external view returns (GameType);
     function respectedGameTypeUpdatedAt() external view returns (uint64);
+    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function setRespectedGameType(GameType _gameType) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
     function version() external pure returns (string memory);
-    function setConfig(Types.ConfigType _type, bytes memory _value) external;
-    function upgrade(uint32 _gasLimit, bytes memory _calldata) external;
 
     function __constructor__(uint256 _proofMaturityDelaySeconds, uint256 _disputeGameFinalityDelaySeconds) external;
 }
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
index 7a66caecbdb7..521c7232e125 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
@@ -7,6 +7,7 @@ import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 interface IOptimismPortalInterop {
     error AlreadyFinalized();
@@ -108,11 +109,11 @@ interface IOptimismPortalInterop {
         returns (IDisputeGame disputeGameProxy, uint64 timestamp); // nosemgrep
     function respectedGameType() external view returns (GameType);
     function respectedGameTypeUpdatedAt() external view returns (uint64);
-    function setConfig(Types.ConfigType _type, bytes memory _value) external;
+    function setConfig(ConfigType _type, bytes memory _value) external;
+    function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
     function setRespectedGameType(GameType _gameType) external;
     function superchainConfig() external view returns (ISuperchainConfig);
     function systemConfig() external view returns (ISystemConfig);
-    function upgrade(uint32 _gasLimit, bytes memory _calldata) external;
     function version() external pure returns (string memory);
 
     function __constructor__(uint256 _proofMaturityDelaySeconds, uint256 _disputeGameFinalityDelaySeconds) external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol b/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol
index 88f9a7cffae9..dc83893958b0 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol
@@ -13,10 +13,8 @@ interface ISuperchainConfig {
 
     function GUARDIAN_SLOT() external view returns (bytes32);
     function PAUSED_SLOT() external view returns (bytes32);
-    function UPGRADER_SLOT() external view returns (bytes32);
     function guardian() external view returns (address guardian_);
-    function upgrader() external view returns (address upgrader_);
-    function initialize(address _guardian, address _upgrader, bool _paused) external;
+    function initialize(address _guardian, bool _paused) external;
     function pause(string memory _identifier) external;
     function paused() external view returns (bool paused_);
     function unpause() external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
index 5b68bd7fd099..8959c00b744a 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
@@ -2,12 +2,9 @@
 pragma solidity ^0.8.0;
 
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { Types } from "src/libraries/Types.sol";
 
 /// @notice This interface corresponds to the Custom Gas Token version of the SystemConfig contract.
 interface ISystemConfig {
-    error UnsafeCast();
-
     enum UpdateType {
         BATCHER,
         FEE_SCALARS,
@@ -26,13 +23,6 @@ interface ISystemConfig {
         address gasPayingToken;
     }
 
-    struct Roles {
-        address owner;
-        address feeAdmin;
-        address unsafeBlockSigner;
-        bytes32 batcherHash;
-    }
-
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
     event Initialized(uint8 version);
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
@@ -59,10 +49,12 @@ interface ISystemConfig {
     function gasPayingTokenName() external view returns (string memory name_);
     function gasPayingTokenSymbol() external view returns (string memory symbol_);
     function initialize(
-        Roles memory _roles,
+        address _owner,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
+        bytes32 _batcherHash,
         uint64 _gasLimit,
+        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         Addresses memory _addresses
@@ -78,18 +70,10 @@ interface ISystemConfig {
     function optimismPortal() external view returns (address addr_);
     function overhead() external view returns (uint256);
     function owner() external view returns (address);
-    function feeAdmin() external view returns (address addr_);
     function renounceOwnership() external;
     function resourceConfig() external view returns (IResourceMetering.ResourceConfig memory);
     function scalar() external view returns (uint256);
     function setBatcherHash(bytes32 _batcherHash) external;
-    function setFeeVaultConfig(
-        Types.ConfigType _type,
-        address _recipient,
-        uint256 _min,
-        Types.WithdrawalNetwork _network
-    )
-        external;
     function setGasConfig(uint256 _overhead, uint256 _scalar) external;
     function setGasConfigEcotone(uint32 _basefeeScalar, uint32 _blobbasefeeScalar) external;
     function setGasLimit(uint64 _gasLimit) external;
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
index 65eccead56e7..e11d17c9f7bd 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
@@ -40,7 +40,6 @@ interface ISystemConfigInterop {
     function optimismPortal() external view returns (address addr_);
     function overhead() external view returns (uint256);
     function owner() external view returns (address);
-    function feeAdmin() external view returns (address);
     function renounceOwnership() external;
     function resourceConfig() external view returns (IResourceMetering.ResourceConfig memory);
     function scalar() external view returns (uint256);
@@ -58,10 +57,12 @@ interface ISystemConfigInterop {
     function removeDependency(uint256 _chainId) external;
     function dependencyManager() external view returns (address);
     function initialize(
-        ISystemConfig.Roles memory _roles,
+        address _owner,
         uint32 _basefeeScalar,
         uint32 _blobbasefeeScalar,
+        bytes32 _batcherHash,
         uint64 _gasLimit,
+        address _unsafeBlockSigner,
         IResourceMetering.ResourceConfig memory _config,
         address _batchInbox,
         ISystemConfig.Addresses memory _addresses,
diff --git a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
index 29710b9eece6..2fd33b9290bf 100644
--- a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { FeeVault } from "src/L2/FeeVault.sol";
+
 import { Types } from "src/libraries/Types.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000019
@@ -12,20 +12,18 @@ import { Encoding } from "src/libraries/Encoding.sol";
 /// @notice The BaseFeeVault accumulates the base fee that is paid by transactions.
 contract BaseFeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.4
-    string public constant version = "1.5.0-beta.4";
+    /// @custom:semver 1.5.0-beta.3
+    string public constant version = "1.5.0-beta.3";
 
-    /// @notice Returns the FeeVault config
-    /// @return recipient_           Wallet that will receive the fees.
-    /// @return amount_              Minimum balance for withdrawals.
-    /// @return withdrawalNetwork_   Network which the recipient will receive fees on.
-    function config()
-        public
-        view
-        override
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_)
-    {
-        bytes memory data = L1_BLOCK().getConfig(Types.ConfigType.BASE_FEE_VAULT_CONFIG);
-        (recipient_, amount_, withdrawalNetwork_) = Encoding.decodeFeeVaultConfig(abi.decode(data, (bytes32)));
-    }
+    /// @notice Constructs the BaseFeeVault contract.
+    /// @param _recipient           Wallet that will receive the fees.
+    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
+    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
+    constructor(
+        address _recipient,
+        uint256 _minWithdrawalAmount,
+        Types.WithdrawalNetwork _withdrawalNetwork
+    )
+        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
+    { }
 }
diff --git a/packages/contracts-bedrock/src/L2/FeeVault.sol b/packages/contracts-bedrock/src/L2/FeeVault.sol
index 3d2ecfd6e1a3..856985d7827b 100644
--- a/packages/contracts-bedrock/src/L2/FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/FeeVault.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.15;
 // Libraries
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 
 // Interfaces
 import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
@@ -16,15 +15,27 @@ import { Types } from "src/libraries/Types.sol";
 /// @notice The FeeVault contract contains the basic logic for the various different vault contracts
 ///         used to hold fee revenue generated by the L2 system.
 abstract contract FeeVault {
+    /// @notice Minimum balance before a withdrawal can be triggered.
+    ///         Use the `minWithdrawalAmount()` getter as this is deprecated
+    ///         and is subject to be removed in the future.
+    /// @custom:legacy
+    uint256 public immutable MIN_WITHDRAWAL_AMOUNT;
+
+    /// @notice Account that will receive the fees. Can be located on L1 or L2.
+    ///         Use the `recipient()` getter as this is deprecated
+    ///         and is subject to be removed in the future.
+    /// @custom:legacy
+    address public immutable RECIPIENT;
+
+    /// @notice Network which the recipient will receive fees on.
+    ///         Use the `withdrawalNetwork()` getter as this is deprecated
+    ///         and is subject to be removed in the future.
+    /// @custom:legacy
+    Types.WithdrawalNetwork public immutable WITHDRAWAL_NETWORK;
+
     /// @notice The minimum gas limit for the FeeVault withdrawal transaction.
     uint32 internal constant WITHDRAWAL_MIN_GAS = 400_000;
 
-    /// @notice Internal getter function for the L1Block contract.
-    /// @return Contract of the L1Block on this domain.
-    function L1_BLOCK() internal pure returns (IL1Block) {
-        return IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
-    }
-
     /// @notice Total amount of wei processed by the contract.
     uint256 public totalProcessed;
 
@@ -45,76 +56,52 @@ abstract contract FeeVault {
     /// @param withdrawalNetwork Network which the to address will receive funds on.
     event Withdrawal(uint256 value, address to, address from, Types.WithdrawalNetwork withdrawalNetwork);
 
+    /// @param _recipient           Wallet that will receive the fees.
+    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
+    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
+    constructor(address _recipient, uint256 _minWithdrawalAmount, Types.WithdrawalNetwork _withdrawalNetwork) {
+        RECIPIENT = _recipient;
+        MIN_WITHDRAWAL_AMOUNT = _minWithdrawalAmount;
+        WITHDRAWAL_NETWORK = _withdrawalNetwork;
+    }
+
     /// @notice Allow the contract to receive ETH.
     receive() external payable { }
 
-    /// @notice Returns the configuration of the FeeVault.
-    function config()
-        public
-        view
-        virtual
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
-
     /// @notice Minimum balance before a withdrawal can be triggered.
-    function minWithdrawalAmount() public view virtual returns (uint256 amount_) {
-        (, amount_,) = config();
-    }
-
-    /// @notice Minimum balance before a withdrawal can be triggered.
-    ///         Use the `minWithdrawalAmount()` getter as this is deprecated
-    ///         and is subject to be removed in the future.
-    /// @custom:legacy true
-    function MIN_WITHDRAWAL_AMOUNT() public view returns (uint256) {
-        return minWithdrawalAmount();
+    function minWithdrawalAmount() public view returns (uint256 amount_) {
+        amount_ = MIN_WITHDRAWAL_AMOUNT;
     }
 
     /// @notice Account that will receive the fees. Can be located on L1 or L2.
-    function recipient() public view virtual returns (address recipient_) {
-        (recipient_,,) = config();
-    }
-
-    /// @notice Account that will receive the fees. Can be located on L1 or L2.
-    ///         Use the `recipient()` getter as this is deprecated
-    ///         and is subject to be removed in the future.
-    /// @custom:legacy
-    function RECIPIENT() public view returns (address) {
-        return recipient();
+    function recipient() public view returns (address recipient_) {
+        recipient_ = RECIPIENT;
     }
 
     /// @notice Network which the recipient will receive fees on.
-    function withdrawalNetwork() public view returns (Types.WithdrawalNetwork withdrawalNetwork_) {
-        (,, withdrawalNetwork_) = config();
-    }
-
-    /// @notice Network which the recipient will receive fees on.
-    ///         Use the `withdrawalNetwork()` getter as this is deprecated
-    ///         and is subject to be removed in the future.
-    /// @custom:legacy
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_) {
-        withdrawalNetwork_ = withdrawalNetwork();
+    function withdrawalNetwork() public view returns (Types.WithdrawalNetwork network_) {
+        network_ = WITHDRAWAL_NETWORK;
     }
 
     /// @notice Triggers a withdrawal of funds to the fee wallet on L1 or L2.
     function withdraw() external {
-        (address withdrawalRecipient, uint256 withdrawalAmount, Types.WithdrawalNetwork network) = config();
-
         require(
-            address(this).balance >= withdrawalAmount,
+            address(this).balance >= MIN_WITHDRAWAL_AMOUNT,
             "FeeVault: withdrawal amount must be greater than minimum withdrawal amount"
         );
 
         uint256 value = address(this).balance;
         totalProcessed += value;
 
-        emit Withdrawal(value, withdrawalRecipient, msg.sender);
-        emit Withdrawal(value, withdrawalRecipient, msg.sender, network);
+        emit Withdrawal(value, RECIPIENT, msg.sender);
+        emit Withdrawal(value, RECIPIENT, msg.sender, WITHDRAWAL_NETWORK);
 
-        if (network == Types.WithdrawalNetwork.L2) {
-            bool success = SafeCall.send(withdrawalRecipient, value);
+        if (WITHDRAWAL_NETWORK == Types.WithdrawalNetwork.L2) {
+            bool success = SafeCall.send(RECIPIENT, value);
             require(success, "FeeVault: failed to send ETH to L2 fee recipient");
         } else {
             IL2ToL1MessagePasser(payable(Predeploys.L2_TO_L1_MESSAGE_PASSER)).initiateWithdrawal{ value: value }({
-                _target: withdrawalRecipient,
+                _target: RECIPIENT,
                 _gasLimit: WITHDRAWAL_MIN_GAS,
                 _data: hex""
             });
diff --git a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
index 8b3b71f7c19f..45f14fe173d0 100644
--- a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
+++ b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
@@ -29,8 +29,8 @@ contract GasPriceOracle is ISemver {
     uint256 public constant DECIMALS = 6;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.4
-    string public constant version = "1.3.1-beta.4";
+    /// @custom:semver 1.3.1-beta.3
+    string public constant version = "1.3.1-beta.3";
 
     /// @notice This is the intercept value for the linear regression used to estimate the final size of the
     ///         compressed transaction.
diff --git a/packages/contracts-bedrock/src/L2/L1Block.sol b/packages/contracts-bedrock/src/L2/L1Block.sol
index 5a1646bca285..0b2ffd2c5782 100644
--- a/packages/contracts-bedrock/src/L2/L1Block.sol
+++ b/packages/contracts-bedrock/src/L2/L1Block.sol
@@ -3,17 +3,7 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { Constants } from "src/libraries/Constants.sol";
-import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
-import { IFeeVault, Types as ITypes } from "src/L2/interfaces/IFeeVault.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
-import { IOptimismMintableERC721Factory } from "src/L2/interfaces/IOptimismMintableERC721Factory.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
-import { Storage } from "src/libraries/Storage.sol";
-import { Types } from "src/libraries/Types.sol";
 import { NotDepositor } from "src/libraries/L1BlockErrors.sol";
 
 /// @custom:proxied true
@@ -27,31 +17,6 @@ contract L1Block is ISemver, IGasToken {
     /// @notice Event emitted when the gas paying token is set.
     event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
 
-    /// @notice Storage slot for the base fee vault configuration
-    bytes32 internal constant BASE_FEE_VAULT_CONFIG_SLOT = bytes32(uint256(keccak256("opstack.basefeevaultconfig")) - 1);
-
-    /// @notice Storage slot for the L1 fee vault configuration
-    bytes32 internal constant L1_FEE_VAULT_CONFIG_SLOT = bytes32(uint256(keccak256("opstack.l1feevaultconfig")) - 1);
-
-    /// @notice Storage slot for the sequencer fee vault configuration
-    bytes32 internal constant SEQUENCER_FEE_VAULT_CONFIG_SLOT =
-        bytes32(uint256(keccak256("opstack.sequencerfeevaultconfig")) - 1);
-
-    /// @notice Storage slot for the L1 cross domain messenger address
-    bytes32 internal constant L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT =
-        bytes32(uint256(keccak256("opstack.l1crossdomainmessengeraddress")) - 1);
-
-    /// @notice Storage slot for the L1 ERC721 bridge address
-    bytes32 internal constant L1_ERC_721_BRIDGE_ADDRESS_SLOT =
-        bytes32(uint256(keccak256("opstack.l1erc721bridgeaddress")) - 1);
-
-    /// @notice Storage slot for the L1 standard bridge address
-    bytes32 internal constant L1_STANDARD_BRIDGE_ADDRESS_SLOT =
-        bytes32(uint256(keccak256("opstack.l1standardbridgeaddress")) - 1);
-
-    /// @notice Storage slot for the remote chain ID
-    bytes32 internal constant REMOTE_CHAIN_ID_SLOT = bytes32(uint256(keccak256("opstack.remotechainid")) - 1);
-
     /// @notice Address of the special depositor account.
     function DEPOSITOR_ACCOUNT() public pure returns (address addr_) {
         addr_ = Constants.DEPOSITOR_ACCOUNT;
@@ -92,12 +57,9 @@ contract L1Block is ISemver, IGasToken {
     /// @notice The latest L1 blob base fee.
     uint256 public blobBaseFee;
 
-    /// @notice Indicates whether the network has gone through the Isthmus upgrade.
-    bool public isIsthmus;
-
-    /// @custom:semver 1.5.1-beta.4
+    /// @custom:semver 1.5.1-beta.3
     function version() public pure virtual returns (string memory) {
-        return "1.5.1-beta.4";
+        return "1.5.1-beta.3";
     }
 
     /// @notice Returns the gas paying token, its decimals, name and symbol.
@@ -206,117 +168,14 @@ contract L1Block is ISemver, IGasToken {
         }
     }
 
-    /// @notice Sets static configuration options for the L2 system. Can only be called by the special
-    ///         depositor account.
-    /// @param _type  The type of configuration to set.
-    /// @param _value The encoded value with which to set the configuration.
-    function setConfig(Types.ConfigType _type, bytes calldata _value) public virtual {
-        if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
-
-        if (_type == Types.ConfigType.GAS_PAYING_TOKEN) {
-            (address token, uint8 decimals, bytes32 name, bytes32 symbol) = StaticConfig.decodeSetGasPayingToken(_value);
-            GasPayingToken.set({ _token: token, _decimals: decimals, _name: name, _symbol: symbol });
-            emit GasPayingTokenSet({ token: token, decimals: decimals, name: name, symbol: symbol });
-        } else if (_type == Types.ConfigType.BASE_FEE_VAULT_CONFIG) {
-            Storage.setBytes32(BASE_FEE_VAULT_CONFIG_SLOT, abi.decode(_value, (bytes32)));
-        } else if (_type == Types.ConfigType.L1_FEE_VAULT_CONFIG) {
-            Storage.setBytes32(L1_FEE_VAULT_CONFIG_SLOT, abi.decode(_value, (bytes32)));
-        } else if (_type == Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS) {
-            Storage.setAddress(L1_ERC_721_BRIDGE_ADDRESS_SLOT, abi.decode(_value, (address)));
-        } else if (_type == Types.ConfigType.REMOTE_CHAIN_ID) {
-            Storage.setUint(REMOTE_CHAIN_ID_SLOT, abi.decode(_value, (uint256)));
-        } else if (_type == Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS) {
-            Storage.setAddress(L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT, abi.decode(_value, (address)));
-        } else if (_type == Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS) {
-            Storage.setAddress(L1_STANDARD_BRIDGE_ADDRESS_SLOT, abi.decode(_value, (address)));
-        } else if (_type == Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG) {
-            Storage.setBytes32(SEQUENCER_FEE_VAULT_CONFIG_SLOT, abi.decode(_value, (bytes32)));
-        }
-    }
-
-    /// @notice Returns the configuration value for the given type. All configuration related storage values in
-    ///         the L2 contracts, should be stored in this contract.
-    /// @param _type The type of configuration to get.
-    /// @return data_ The encoded configuration value.
-    function getConfig(Types.ConfigType _type) public view virtual returns (bytes memory data_) {
-        if (_type == Types.ConfigType.GAS_PAYING_TOKEN) {
-            (address addr, uint8 decimals) = gasPayingToken();
-            data_ = abi.encode(
-                addr,
-                decimals,
-                GasPayingToken.sanitize(gasPayingTokenName()),
-                GasPayingToken.sanitize(gasPayingTokenSymbol())
-            );
-        } else if (_type == Types.ConfigType.BASE_FEE_VAULT_CONFIG) {
-            data_ = abi.encode(Storage.getBytes32(BASE_FEE_VAULT_CONFIG_SLOT));
-        } else if (_type == Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS) {
-            data_ = abi.encode(Storage.getAddress(L1_ERC_721_BRIDGE_ADDRESS_SLOT));
-        } else if (_type == Types.ConfigType.REMOTE_CHAIN_ID) {
-            data_ = abi.encode(Storage.getUint(REMOTE_CHAIN_ID_SLOT));
-        } else if (_type == Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS) {
-            data_ = abi.encode(Storage.getAddress(L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT));
-        } else if (_type == Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS) {
-            data_ = abi.encode(Storage.getAddress(L1_STANDARD_BRIDGE_ADDRESS_SLOT));
-        } else if (_type == Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG) {
-            data_ = abi.encode(Storage.getBytes32(SEQUENCER_FEE_VAULT_CONFIG_SLOT));
-        } else if (_type == Types.ConfigType.L1_FEE_VAULT_CONFIG) {
-            data_ = abi.encode(Storage.getBytes32(L1_FEE_VAULT_CONFIG_SLOT));
-        }
-    }
-
     /// @notice Sets the gas paying token for the L2 system. Can only be called by the special
-    ///         depositor account, initiated by a deposit transaction from L1.
-    ///         This is a legacy setter that exists to give compabilitity with the legacy SystemConfig.
-    ///         Custom gas token can now be set using `setConfig`. This can be removed in the future.
+    ///         depositor account. This function is not called on every L2 block but instead
+    ///         only called by specially crafted L1 deposit transactions.
     function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external {
         if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
 
         GasPayingToken.set({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol });
-        emit GasPayingTokenSet({ token: _token, decimals: _decimals, name: _name, symbol: _symbol });
-    }
 
-    /// @notice Sets the L1 block values for an Isthmus upgraded chain.
-    ///         This function is intended to be called only once, and only on existing chains which are undergoing
-    ///         the Isthmus upgrade. Chains deployed with the Isthmus upgrade activated will have the values set here
-    ///         already populated by the L2 Genesis generation process.
-    ///         In the case of an existing chain underoing the Isthmus upgrade, the expectation is that
-    ///         The upgrade flow will use the following series of Network upgrade automation transactions:
-    ///         1. Deploy a new `L1BlockImpl` contract.
-    ///         2. Upgrade only the `L1Block` contract to the new implementation by
-    ///            calling `L2ProxyAdmin.upgrade(address(L1BlockProxy), address(L1BlockImpl))`.
-    ///         3. Call `L1Block.setIsthmus()` to pull the values from L2 contracts.
-    ///         4. Upgrades the remainder of the L2 contracts via `L2ProxyAdmin.upgrade()`.
-    function setIsthmus() external {
-        if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
-        require(isIsthmus == false, "L1Block: Isthmus already active");
-        isIsthmus = true;
-
-        Storage.setBytes32(BASE_FEE_VAULT_CONFIG_SLOT, _migrateFeeVaultConfig(Predeploys.BASE_FEE_VAULT));
-        Storage.setBytes32(L1_FEE_VAULT_CONFIG_SLOT, _migrateFeeVaultConfig(Predeploys.L1_FEE_VAULT));
-        Storage.setBytes32(SEQUENCER_FEE_VAULT_CONFIG_SLOT, _migrateFeeVaultConfig(Predeploys.SEQUENCER_FEE_WALLET));
-
-        Storage.setAddress(
-            L1_CROSS_DOMAIN_MESSENGER_ADDRESS_SLOT,
-            address(ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER).otherMessenger())
-        );
-        Storage.setAddress(
-            L1_STANDARD_BRIDGE_ADDRESS_SLOT,
-            address(IStandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE)).otherBridge())
-        );
-        Storage.setAddress(
-            L1_ERC_721_BRIDGE_ADDRESS_SLOT, address(IERC721Bridge(Predeploys.L2_ERC721_BRIDGE).otherBridge())
-        );
-        Storage.setUint(
-            REMOTE_CHAIN_ID_SLOT,
-            IOptimismMintableERC721Factory(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY).remoteChainId()
-        );
-    }
-
-    /// @notice Helper function for migrating deploy config.
-    function _migrateFeeVaultConfig(address _addr) internal view returns (bytes32) {
-        address recipient = IFeeVault(payable(_addr)).recipient();
-        uint256 amount = IFeeVault(payable(_addr)).minWithdrawalAmount();
-        ITypes.WithdrawalNetwork network = IFeeVault(payable(_addr)).withdrawalNetwork();
-        return Encoding.encodeFeeVaultConfig(recipient, amount, Types.WithdrawalNetwork(uint8(network)));
+        emit GasPayingTokenSet({ token: _token, decimals: _decimals, name: _name, symbol: _symbol });
     }
 }
diff --git a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
index 650799383528..2cf6bd96c7d4 100644
--- a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
@@ -6,9 +6,9 @@ import { L1Block } from "src/L2/L1Block.sol";
 
 // Libraries
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Types } from "src/libraries/Types.sol";
 import {
     NotDepositor,
     NotCrossL2Inbox,
@@ -18,6 +18,16 @@ import {
     CantRemovedDependency
 } from "src/libraries/L1BlockErrors.sol";
 
+/// @notice Enum representing different types of configurations that can be set on L1BlockInterop.
+/// @custom:value SET_GAS_PAYING_TOKEN  Represents the config type for setting the gas paying token.
+/// @custom:value ADD_DEPENDENCY        Represents the config type for adding a chain to the interop dependency set.
+/// @custom:value REMOVE_DEPENDENCY     Represents the config type for removing a chain from the interop dependency set.
+enum ConfigType {
+    SET_GAS_PAYING_TOKEN,
+    ADD_DEPENDENCY,
+    REMOVE_DEPENDENCY
+}
+
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000015
 /// @title L1BlockInterop
@@ -39,9 +49,9 @@ contract L1BlockInterop is L1Block {
     /// keccak256(abi.encode(uint256(keccak256("l1Block.identifier.isDeposit")) - 1)) & ~bytes32(uint256(0xff))
     uint256 internal constant IS_DEPOSIT_SLOT = 0x921bd3a089295c6e5540e8fba8195448d253efd6f2e3e495b499b627dc36a300;
 
-    /// @custom:semver +interop-beta.2
+    /// @custom:semver +interop-beta.1
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.2");
+        return string.concat(super.version(), "+interop-beta.1");
     }
 
     /// @notice Returns whether the call was triggered from a a deposit or not.
@@ -94,16 +104,28 @@ contract L1BlockInterop is L1Block {
     ///         depositor account.
     /// @param _type  The type of configuration to set.
     /// @param _value The encoded value with which to set the configuration.
-    function setConfig(Types.ConfigType _type, bytes calldata _value) public override {
-        super.setConfig(_type, _value);
+    function setConfig(ConfigType _type, bytes calldata _value) external {
+        if (msg.sender != DEPOSITOR_ACCOUNT()) revert NotDepositor();
 
-        if (_type == Types.ConfigType.ADD_DEPENDENCY) {
+        if (_type == ConfigType.SET_GAS_PAYING_TOKEN) {
+            _setGasPayingToken(_value);
+        } else if (_type == ConfigType.ADD_DEPENDENCY) {
             _addDependency(_value);
-        } else if (_type == Types.ConfigType.REMOVE_DEPENDENCY) {
+        } else if (_type == ConfigType.REMOVE_DEPENDENCY) {
             _removeDependency(_value);
         }
     }
 
+    /// @notice Internal method to set the gas paying token.
+    /// @param _value The encoded value with which to set the gas paying token.
+    function _setGasPayingToken(bytes calldata _value) internal {
+        (address token, uint8 decimals, bytes32 name, bytes32 symbol) = StaticConfig.decodeSetGasPayingToken(_value);
+
+        GasPayingToken.set({ _token: token, _decimals: decimals, _name: name, _symbol: symbol });
+
+        emit GasPayingTokenSet({ token: token, decimals: decimals, name: name, symbol: symbol });
+    }
+
     /// @notice Internal method to add a dependency to the interop dependency set.
     /// @param _value The encoded value with which to add the dependency.
     function _addDependency(bytes calldata _value) internal {
diff --git a/packages/contracts-bedrock/src/L2/L1FeeVault.sol b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
index 62c04faf3024..c80c40b98493 100644
--- a/packages/contracts-bedrock/src/L2/L1FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { FeeVault } from "src/L2/FeeVault.sol";
+
 import { Types } from "src/libraries/Types.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x420000000000000000000000000000000000001A
@@ -12,20 +12,18 @@ import { Encoding } from "src/libraries/Encoding.sol";
 /// @notice The L1FeeVault accumulates the L1 portion of the transaction fees.
 contract L1FeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.4
-    string public constant version = "1.5.0-beta.4";
+    /// @custom:semver 1.5.0-beta.3
+    string public constant version = "1.5.0-beta.3";
 
-    /// @notice Returns the FeeVault config
-    /// @return recipient_           Wallet that will receive the fees.
-    /// @return amount_              Minimum balance for withdrawals.
-    /// @return withdrawalNetwork_   Network which the recipient will receive fees on.
-    function config()
-        public
-        view
-        override
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_)
-    {
-        bytes memory data = L1_BLOCK().getConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG);
-        (recipient_, amount_, withdrawalNetwork_) = Encoding.decodeFeeVaultConfig(abi.decode(data, (bytes32)));
-    }
+    /// @notice Constructs the L1FeeVault contract.
+    /// @param _recipient           Wallet that will receive the fees.
+    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
+    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
+    constructor(
+        address _recipient,
+        uint256 _minWithdrawalAmount,
+        Types.WithdrawalNetwork _withdrawalNetwork
+    )
+        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
+    { }
 }
diff --git a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
index d4b19e35f97b..2461e46d2cf5 100644
--- a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
@@ -7,7 +7,6 @@ import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
 // Libraries
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -21,22 +20,26 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 ///         L2 on the L2 side. Users are generally encouraged to use this contract instead of lower
 ///         level message passing contracts.
 contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
-    /// @custom:semver 2.1.1-beta.5
-    string public constant version = "2.1.1-beta.5";
-
-    /// @notice Getter for the remote chain's messenger.
-    function otherMessenger() public view override returns (CrossDomainMessenger) {
-        bytes memory data =
-            IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS);
-        return CrossDomainMessenger(abi.decode(data, (address)));
+    /// @custom:semver 2.1.1-beta.4
+    string public constant version = "2.1.1-beta.4";
+
+    /// @notice Constructs the L2CrossDomainMessenger contract.
+    constructor() CrossDomainMessenger() {
+        initialize({ _l1CrossDomainMessenger: CrossDomainMessenger(address(0)) });
+    }
+
+    /// @notice Initializer.
+    /// @param _l1CrossDomainMessenger L1CrossDomainMessenger contract on the other network.
+    function initialize(CrossDomainMessenger _l1CrossDomainMessenger) public initializer {
+        __CrossDomainMessenger_init({ _otherMessenger: _l1CrossDomainMessenger });
     }
 
-    /// @notice Legay getter for the remote chain's messenger.
+    /// @notice Getter for the remote messenger.
     ///         Public getter is legacy and will be removed in the future. Use `otherMessenger()` instead.
     /// @return L1CrossDomainMessenger contract.
     /// @custom:legacy
     function l1CrossDomainMessenger() public view returns (CrossDomainMessenger) {
-        return otherMessenger();
+        return otherMessenger;
     }
 
     /// @inheritdoc CrossDomainMessenger
@@ -53,7 +56,7 @@ contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
 
     /// @inheritdoc CrossDomainMessenger
     function _isOtherMessenger() internal view override returns (bool) {
-        return AddressAliasHelper.undoL1ToL2Alias(msg.sender) == address(otherMessenger());
+        return AddressAliasHelper.undoL1ToL2Alias(msg.sender) == address(otherMessenger);
     }
 
     /// @inheritdoc CrossDomainMessenger
diff --git a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
index 9536696491ba..85c6856e629d 100644
--- a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.25;
+pragma solidity 0.8.15;
 
 // Contracts
 import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
@@ -7,13 +7,11 @@ import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
 // Libraries
 import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
 import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @custom:proxied true
@@ -28,21 +26,21 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 ///         wait for the one-week challenge period to elapse before their Optimism-native NFT
 ///         can be refunded on L2.
 contract L2ERC721Bridge is ERC721Bridge, ISemver {
-    /// @custom:semver 1.8.0-beta.3
-    string public constant version = "1.8.0-beta.3";
+    /// @custom:semver 1.8.0-beta.2
+    string public constant version = "1.8.0-beta.2";
 
-    /// @notice Getter function for the messenger contract.
-    /// @return Address of the messenger on this domain.
-    function messenger() public pure override returns (ICrossDomainMessenger) {
-        return ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
+    /// @notice Constructs the L2ERC721Bridge contract.
+    constructor() ERC721Bridge() {
+        initialize({ _l1ERC721Bridge: payable(address(0)) });
     }
 
-    /// @notice Getter function for the other bridge.
-    /// @return Address of the bridge on the other network.
-    function otherBridge() public view override returns (ERC721Bridge) {
-        bytes memory data =
-            IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS);
-        return ERC721Bridge(abi.decode(data, (address)));
+    /// @notice Initializes the contract.
+    /// @param _l1ERC721Bridge Address of the ERC721 bridge contract on the other network.
+    function initialize(address payable _l1ERC721Bridge) public initializer {
+        __ERC721Bridge_init({
+            _messenger: ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER),
+            _otherBridge: ERC721Bridge(_l1ERC721Bridge)
+        });
     }
 
     /// @notice Completes an ERC721 bridge from the other domain and sends the ERC721 token to the
@@ -125,7 +123,7 @@ contract L2ERC721Bridge is ERC721Bridge, ISemver {
 
         // Send message to L1 bridge
         // slither-disable-next-line reentrancy-events
-        messenger().sendMessage({ _target: address(otherBridge()), _message: message, _minGasLimit: _minGasLimit });
+        messenger.sendMessage({ _target: address(otherBridge), _message: message, _minGasLimit: _minGasLimit });
 
         // slither-disable-next-line reentrancy-events
         emit ERC721BridgeInitiated(_localToken, remoteToken, _from, _to, _tokenId, _extraData);
diff --git a/packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol
deleted file mode 100644
index dbec47a6d246..000000000000
--- a/packages/contracts-bedrock/src/L2/L2OptimismMintableERC20Factory.sol
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
-
-/// @custom:proxied true
-/// @custom:predeployed 0x4200000000000000000000000000000000000012
-/// @title L2OptimismMintableERC20Factory
-/// @notice L2OptimismMintableERC20Factory is a factory contract that generates OptimismMintableERC20
-///         contracts on the network it's deployed to. Simplifies the deployment process for users
-///         who may be less familiar with deploying smart contracts. Designed to be backwards
-///         compatible with the older StandardL2ERC20Factory contract.
-contract L2OptimismMintableERC20Factory is OptimismMintableERC20Factory {
-    /// @custom:semver 1.3.1-beta.5
-    /// @notice Semantic version.
-    ///         The semver MUST be bumped any time that there is a change in
-    ///         the OptimismMintableERC20 token contract since this contract
-    ///         is responsible for deploying OptimismMintableERC20 contracts.
-    string public constant version = "1.3.1-beta.5";
-
-    function bridge() public view virtual override returns (address) {
-        return Predeploys.L2_STANDARD_BRIDGE;
-    }
-}
diff --git a/packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol b/packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol
deleted file mode 100644
index 38178fd51dd2..000000000000
--- a/packages/contracts-bedrock/src/L2/L2ProxyAdmin.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { ProxyAdmin } from "src/universal/ProxyAdmin.sol";
-import { Constants } from "src/libraries/Constants.sol";
-
-/// @custom:proxied true
-/// @custom:predeploy
-/// @title L2ProxyAdmin
-contract L2ProxyAdmin is ProxyAdmin {
-    constructor() ProxyAdmin(Constants.DEPOSITOR_ACCOUNT) { }
-
-    /// @notice The owner of the L2ProxyAdmin is the `DEPOSITOR_ACCOUNT`.
-    function owner() public pure override returns (address) {
-        return Constants.DEPOSITOR_ACCOUNT;
-    }
-}
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
index 81b9f825f36a..63bda3209fbb 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
@@ -3,12 +3,10 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { StandardBridge } from "src/universal/StandardBridge.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
@@ -60,21 +58,23 @@ contract L2StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.11.1-beta.4
+    /// @custom:semver 1.11.1-beta.3
     function version() public pure virtual returns (string memory) {
-        return "1.11.1-beta.4";
+        return "1.11.1-beta.3";
     }
 
-    /// @notice Returns the corresponding L1 StandardBridge contract.
-    function otherBridge() public view override returns (IStandardBridge) {
-        bytes memory data =
-            IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS);
-        return IStandardBridge(abi.decode(data, (address)));
+    /// @notice Constructs the L2StandardBridge contract.
+    constructor() StandardBridge() {
+        initialize({ _otherBridge: StandardBridge(payable(address(0))) });
     }
 
-    /// @notice Returns the cross domain messenger.
-    function messenger() public pure override returns (ICrossDomainMessenger) {
-        return ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
+    /// @notice Initializer.
+    /// @param _otherBridge Contract for the corresponding bridge on the other chain.
+    function initialize(StandardBridge _otherBridge) public initializer {
+        __StandardBridge_init({
+            _messenger: ICrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER),
+            _otherBridge: _otherBridge
+        });
     }
 
     /// @notice Allows EOAs to bridge ETH by sending directly to the bridge.
@@ -146,7 +146,7 @@ contract L2StandardBridge is StandardBridge, ISemver {
     /// @notice Retrieves the access of the corresponding L1 bridge contract.
     /// @return Address of the corresponding L1 bridge contract.
     function l1TokenBridge() external view returns (address) {
-        return address(otherBridge());
+        return address(otherBridge);
     }
 
     /// @custom:legacy
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
index 622d92187238..e17ef29dd964 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
@@ -40,9 +40,9 @@ contract L2StandardBridgeInterop is L2StandardBridge {
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
     /// @notice Semantic version.
-    /// @custom:semver +interop-beta.3
+    /// @custom:semver +interop-beta.2
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.3");
+        return string.concat(super.version(), "+interop-beta.2");
     }
 
     /// @notice Converts `amount` of `from` token to `to` token.
diff --git a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
index 7a6342dc07e3..6b1d7327dbc0 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
@@ -65,8 +65,8 @@ contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
     uint16 public constant messageVersion = uint16(0);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.11
-    string public constant version = "1.0.0-beta.11";
+    /// @custom:semver 1.0.0-beta.10
+    string public constant version = "1.0.0-beta.10";
 
     /// @notice Mapping of message hashes to boolean receipt values. Note that a message will only be present in this
     ///         mapping if it has successfully been relayed on this chain, and can therefore not be relayed again.
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
index 86f73f1d6f95..c323d8b7577b 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
@@ -58,8 +58,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.10
-    string public constant override version = "1.0.0-beta.10";
+    /// @custom:semver 1.0.0-beta.9
+    string public constant override version = "1.0.0-beta.9";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
index 6f79097b16e9..e2b3dc437b0f 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
@@ -11,8 +11,8 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 /// @notice OptimismSuperchainERC20Beacon is the beacon proxy for the OptimismSuperchainERC20 implementation.
 contract OptimismSuperchainERC20Beacon is IBeacon, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.3
-    string public constant version = "1.0.0-beta.3";
+    /// @custom:semver 1.0.0-beta.2
+    string public constant version = "1.0.0-beta.2";
 
     /// @inheritdoc IBeacon
     function implementation() external pure override returns (address) {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
index 505bfdc37291..454e3b455d62 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
@@ -22,8 +22,8 @@ contract OptimismSuperchainERC20Factory is ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.5
-    string public constant version = "1.0.0-beta.5";
+    /// @custom:semver 1.0.0-beta.4
+    string public constant version = "1.0.0-beta.4";
 
     /// @notice Mapping of the deployed OptimismSuperchainERC20 to the remote token address.
     ///         This is used to keep track of the token deployments.
diff --git a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
index 965948e42e5f..69a78219e5bd 100644
--- a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { FeeVault } from "src/L2/FeeVault.sol";
+
 import { Types } from "src/libraries/Types.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000011
@@ -12,27 +12,25 @@ import { Encoding } from "src/libraries/Encoding.sol";
 /// @notice The SequencerFeeVault is the contract that holds any fees paid to the Sequencer during
 ///         transaction processing and block production.
 contract SequencerFeeVault is FeeVault, ISemver {
-    /// @custom:semver 1.5.0-beta.4
-    string public constant version = "1.5.0-beta.4";
+    /// @custom:semver 1.5.0-beta.3
+    string public constant version = "1.5.0-beta.3";
 
-    /// @notice Returns the FeeVault config
-    /// @return recipient_           Wallet that will receive the fees.
-    /// @return amount_              Minimum balance for withdrawals.
-    /// @return withdrawalNetwork_   Network which the recipient will receive fees on.
-    function config()
-        public
-        view
-        override
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_)
-    {
-        bytes memory data = L1_BLOCK().getConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG);
-        (recipient_, amount_, withdrawalNetwork_) = Encoding.decodeFeeVaultConfig(abi.decode(data, (bytes32)));
-    }
+    /// @notice Constructs the SequencerFeeVault contract.
+    /// @param _recipient           Wallet that will receive the fees.
+    /// @param _minWithdrawalAmount Minimum balance for withdrawals.
+    /// @param _withdrawalNetwork   Network which the recipient will receive fees on.
+    constructor(
+        address _recipient,
+        uint256 _minWithdrawalAmount,
+        Types.WithdrawalNetwork _withdrawalNetwork
+    )
+        FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
+    { }
 
     /// @custom:legacy
     /// @notice Legacy getter for the recipient address.
-    /// @return recipient_ The recipient address.
-    function l1FeeWallet() public view returns (address recipient_) {
-        recipient_ = recipient();
+    /// @return The recipient address.
+    function l1FeeWallet() public view returns (address) {
+        return RECIPIENT;
     }
 }
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index 14d62c02952b..29e179eba82c 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -24,8 +24,8 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 ///         do not use a custom gas token.
 contract SuperchainWETH is WETH98, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.11
-    string public constant version = "1.0.0-beta.11";
+    /// @custom:semver 1.0.0-beta.10
+    string public constant version = "1.0.0-beta.10";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
diff --git a/packages/contracts-bedrock/src/L2/WETH.sol b/packages/contracts-bedrock/src/L2/WETH.sol
index 8580b99e9522..dacd62c36de9 100644
--- a/packages/contracts-bedrock/src/L2/WETH.sol
+++ b/packages/contracts-bedrock/src/L2/WETH.sol
@@ -14,8 +14,8 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 /// @title WETH contract that reads the name and symbol from the L1Block contract.
 ///        Allows for nice rendering of token names for chains using custom gas token.
 contract WETH is WETH98, ISemver {
-    /// @custom:semver 1.1.0-beta.4
-    string public constant version = "1.1.0-beta.4";
+    /// @custom:semver 1.1.0-beta.3
+    string public constant version = "1.1.0-beta.3";
 
     /// @notice Returns the name of the wrapped native asset. Will be "Wrapped Ether"
     ///         if the native asset is Ether.
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol
index a195a2428093..7ce731f2e631 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol
@@ -11,17 +11,19 @@ interface IBaseFeeVault {
 
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
-    function config()
-        external
-        view
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
+
     function version() external view returns (string memory);
 
-    function __constructor__() external;
+    function __constructor__(
+        address _recipient,
+        uint256 _minWithdrawalAmount,
+        Types.WithdrawalNetwork _withdrawalNetwork
+    )
+        external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol
index f970bf61c347..3b4cd0209f13 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol
@@ -16,16 +16,12 @@ interface IFeeVault {
 
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
-    function config()
-        external
-        view
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
 
     function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol b/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol
index 2b0a016b3571..a43b3c7c3963 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol
@@ -1,11 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Types } from "src/libraries/Types.sol";
-
 interface IL1Block {
     error NotDepositor();
-    error UnsafeCast();
 
     event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
 
@@ -20,15 +17,11 @@ interface IL1Block {
     function gasPayingTokenSymbol() external view returns (string memory symbol_);
     function hash() external view returns (bytes32);
     function isCustomGasToken() external view returns (bool);
-    function isIsthmus() external view returns (bool);
     function l1FeeOverhead() external view returns (uint256);
     function l1FeeScalar() external view returns (uint256);
     function number() external view returns (uint64);
     function sequenceNumber() external view returns (uint64);
-    function setConfig(Types.ConfigType _type, bytes memory _value) external;
-    function getConfig(Types.ConfigType _type) external view returns (bytes memory data_);
     function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
-    function setIsthmus() external;
     function setL1BlockValues(
         uint64 _number,
         uint64 _timestamp,
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol b/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol
index bf3be29c0714..dd72e3fa6f89 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol
@@ -1,7 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Types } from "src/libraries/Types.sol";
+enum ConfigType {
+    SET_GAS_PAYING_TOKEN,
+    ADD_DEPENDENCY,
+    REMOVE_DEPENDENCY
+}
 
 interface IL1BlockInterop {
     error AlreadyDependency();
@@ -10,7 +14,6 @@ interface IL1BlockInterop {
     error NotCrossL2Inbox();
     error NotDependency();
     error NotDepositor();
-    error UnsafeCast();
 
     event DependencyAdded(uint256 indexed chainId);
     event DependencyRemoved(uint256 indexed chainId);
@@ -27,19 +30,16 @@ interface IL1BlockInterop {
     function gasPayingToken() external view returns (address addr_, uint8 decimals_);
     function gasPayingTokenName() external view returns (string memory name_);
     function gasPayingTokenSymbol() external view returns (string memory symbol_);
-    function getConfig(Types.ConfigType _type) external view returns (bytes memory data_);
     function hash() external view returns (bytes32);
     function isCustomGasToken() external view returns (bool);
     function isDeposit() external view returns (bool isDeposit_);
-    function isIsthmus() external view returns (bool);
     function isInDependencySet(uint256 _chainId) external view returns (bool);
     function l1FeeOverhead() external view returns (uint256);
     function l1FeeScalar() external view returns (uint256);
     function number() external view returns (uint64);
     function sequenceNumber() external view returns (uint64);
-    function setConfig(Types.ConfigType _type, bytes memory _value) external;
+    function setConfig(ConfigType _type, bytes memory _value) external;
     function setGasPayingToken(address _token, uint8 _decimals, bytes32 _name, bytes32 _symbol) external;
-    function setIsthmus() external;
     function setL1BlockValues(
         uint64 _number,
         uint64 _timestamp,
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol
index 7f1362a034ab..eb695a7e9a58 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol
@@ -9,20 +9,21 @@ interface IL1FeeVault {
 
     receive() external payable;
 
-    function config()
-        external
-        view
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
 
     function version() external view returns (string memory);
 
-    function __constructor__() external;
+    function __constructor__(
+        address _recipient,
+        uint256 _minWithdrawalAmount,
+        Types.WithdrawalNetwork _withdrawalNetwork
+    )
+        external;
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
index 60f241d55723..1cb49f674ec0 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
@@ -5,9 +5,8 @@ import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMess
 
 interface IL2CrossDomainMessenger is ICrossDomainMessenger {
     function MESSAGE_VERSION() external view returns (uint16);
+    function initialize(ICrossDomainMessenger _l1CrossDomainMessenger) external;
     function l1CrossDomainMessenger() external view returns (ICrossDomainMessenger);
-    function OTHER_MESSENGER() external view returns (ICrossDomainMessenger);
-    function otherMessenger() external view returns (ICrossDomainMessenger);
     function version() external view returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
index 6d3c1c1a4d60..a760ce1d803c 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 
 interface IL2ERC721Bridge is IERC721Bridge {
     function finalizeBridgeERC721(
@@ -14,7 +13,7 @@ interface IL2ERC721Bridge is IERC721Bridge {
         bytes memory _extraData
     )
         external;
-    function messenger() external pure returns (ICrossDomainMessenger);
+    function initialize(address payable _l1ERC721Bridge) external;
     function version() external view returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol
deleted file mode 100644
index 298465021ac6..000000000000
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2OptimismMintableERC20Factory.sol
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-interface IL2OptimismMintableERC20Factory {
-    event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
-    event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
-
-    function BRIDGE() external view returns (address);
-    function bridge() external view returns (address);
-    function createOptimismMintableERC20(
-        address _remoteToken,
-        string memory _name,
-        string memory _symbol
-    )
-        external
-        returns (address);
-    function createOptimismMintableERC20WithDecimals(
-        address _remoteToken,
-        string memory _name,
-        string memory _symbol,
-        uint8 _decimals
-    )
-        external
-        returns (address);
-    function createStandardL2Token(
-        address _remoteToken,
-        string memory _name,
-        string memory _symbol
-    )
-        external
-        returns (address);
-    function deployments(address) external view returns (address);
-    function version() external view returns (string memory);
-
-    function __constructor__() external;
-}
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
index 3526ae5a49de..9f9ce1a85621 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
@@ -2,7 +2,6 @@
 pragma solidity ^0.8.0;
 
 import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 
 interface IL2StandardBridge is IStandardBridge {
     event DepositFinalized(
@@ -24,13 +23,8 @@ interface IL2StandardBridge is IStandardBridge {
 
     receive() external payable;
 
+    function initialize(IStandardBridge _otherBridge) external;
     function l1TokenBridge() external view returns (address);
-    function MESSENGER() external view returns (ICrossDomainMessenger);
-    function messenger() external pure returns (ICrossDomainMessenger);
-
-    function OTHER_BRIDGE() external view returns (IStandardBridge);
-    function otherBridge() external view returns (IStandardBridge);
-
     function version() external pure returns (string memory);
     function withdraw(
         address _l2Token,
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
index aaed62e14f0a..6b60f5e4f9b2 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
@@ -31,6 +31,8 @@ interface IL2StandardBridgeInterop is IStandardBridge {
         bytes extraData
     );
 
+    function MESSENGER() external view returns (ICrossDomainMessenger);
+    function OTHER_BRIDGE() external view returns (IStandardBridge);
     function bridgeERC20(
         address _localToken,
         address _remoteToken,
@@ -61,15 +63,11 @@ interface IL2StandardBridgeInterop is IStandardBridge {
     )
         external;
     function finalizeBridgeETH(address _from, address _to, uint256 _amount, bytes memory _extraData) external payable;
-
-    function MESSENGER() external view returns (ICrossDomainMessenger);
-    function messenger() external pure returns (ICrossDomainMessenger);
-
-    function OTHER_BRIDGE() external view returns (IStandardBridge);
+    function messenger() external view returns (ICrossDomainMessenger);
     function otherBridge() external view returns (IStandardBridge);
-
     function paused() external view returns (bool);
 
+    function initialize(IStandardBridge _otherBridge) external;
     function l1TokenBridge() external view returns (address);
     function withdraw(
         address _l2Token,
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol b/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol
index f6201268134a..e4ae46413eff 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol
@@ -11,18 +11,20 @@ interface ISequencerFeeVault {
 
     function MIN_WITHDRAWAL_AMOUNT() external view returns (uint256);
     function RECIPIENT() external view returns (address);
-    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function WITHDRAWAL_NETWORK() external view returns (Types.WithdrawalNetwork);
     function minWithdrawalAmount() external view returns (uint256 amount_);
     function recipient() external view returns (address recipient_);
     function totalProcessed() external view returns (uint256);
     function withdraw() external;
-    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork withdrawalNetwork_);
+    function withdrawalNetwork() external view returns (Types.WithdrawalNetwork network_);
 
     function version() external view returns (string memory);
-    function l1FeeWallet() external view returns (address recipient_);
-    function config()
-        external
-        view
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork withdrawalNetwork_);
-    function __constructor__() external;
+    function l1FeeWallet() external view returns (address);
+
+    function __constructor__(
+        address _recipient,
+        uint256 _minWithdrawalAmount,
+        Types.WithdrawalNetwork _withdrawalNetwork
+    )
+        external;
 }
diff --git a/packages/contracts-bedrock/src/libraries/Encoding.sol b/packages/contracts-bedrock/src/libraries/Encoding.sol
index 9d8ffe7b76fb..84d5f732f5f6 100644
--- a/packages/contracts-bedrock/src/libraries/Encoding.sol
+++ b/packages/contracts-bedrock/src/libraries/Encoding.sol
@@ -8,9 +8,6 @@ import { RLPWriter } from "src/libraries/rlp/RLPWriter.sol";
 /// @title Encoding
 /// @notice Encoding handles Optimism's various different encoding schemes.
 library Encoding {
-    /// @notice Error to be used when an unsafe cast is attempted.
-    error UnsafeCast();
-
     /// @notice RLP encodes the L2 transaction that would be generated when a given deposit is sent
     ///         to the L2 system. Useful for searching for a deposit in the L2 system. The
     ///         transaction is prefixed with 0x7e to identify its EIP-2718 type.
@@ -139,39 +136,6 @@ library Encoding {
         return (nonce, version);
     }
 
-    /// @notice Encodes a fee vault configuration.
-    /// @param _recipient Address of the recipient of the fee vault.
-    /// @param _amount    Amount of the fee vault.
-    /// @param _network   Network of the fee vault.
-    /// @return Encoded fee vault configuration.
-    function encodeFeeVaultConfig(
-        address _recipient,
-        uint256 _amount,
-        Types.WithdrawalNetwork _network
-    )
-        internal
-        pure
-        returns (bytes32)
-    {
-        if (_amount > type(uint88).max) revert UnsafeCast();
-        return bytes32(uint256(_network) << 248 | _amount << 160 | uint256(uint160(_recipient)));
-    }
-
-    /// @notice Decodes a fee vault configuration.
-    /// @param _data Encoded fee vault configuration.
-    /// @return recipient_ Recipient of the fee vault.
-    /// @return amount_ Amount of the fee vault.
-    /// @return network_ Network of the fee vault.
-    function decodeFeeVaultConfig(bytes32 _data)
-        internal
-        pure
-        returns (address recipient_, uint256 amount_, Types.WithdrawalNetwork network_)
-    {
-        recipient_ = address(uint160(uint256(_data) & uint256(type(uint160).max)));
-        amount_ = (uint256(_data) & uint256(type(uint88).max) << 160) >> 160;
-        network_ = Types.WithdrawalNetwork(uint8(uint256(_data >> 248)));
-    }
-
     /// @notice Returns an appropriately encoded call to L1Block.setL1BlockValuesEcotone
     /// @param _baseFeeScalar       L1 base fee Scalar
     /// @param _blobBaseFeeScalar   L1 blob base fee Scalar
diff --git a/packages/contracts-bedrock/src/libraries/Predeploys.sol b/packages/contracts-bedrock/src/libraries/Predeploys.sol
index 7a6b30100b5a..30cad3b1f854 100644
--- a/packages/contracts-bedrock/src/libraries/Predeploys.sol
+++ b/packages/contracts-bedrock/src/libraries/Predeploys.sol
@@ -119,13 +119,13 @@ library Predeploys {
         if (_addr == GAS_PRICE_ORACLE) return "GasPriceOracle";
         if (_addr == L2_STANDARD_BRIDGE) return "L2StandardBridge";
         if (_addr == SEQUENCER_FEE_WALLET) return "SequencerFeeVault";
-        if (_addr == OPTIMISM_MINTABLE_ERC20_FACTORY) return "L2OptimismMintableERC20Factory";
+        if (_addr == OPTIMISM_MINTABLE_ERC20_FACTORY) return "OptimismMintableERC20Factory";
         if (_addr == L1_BLOCK_NUMBER) return "L1BlockNumber";
         if (_addr == L2_ERC721_BRIDGE) return "L2ERC721Bridge";
         if (_addr == L1_BLOCK_ATTRIBUTES) return "L1Block";
         if (_addr == L2_TO_L1_MESSAGE_PASSER) return "L2ToL1MessagePasser";
         if (_addr == OPTIMISM_MINTABLE_ERC721_FACTORY) return "OptimismMintableERC721Factory";
-        if (_addr == PROXY_ADMIN) return "L2ProxyAdmin";
+        if (_addr == PROXY_ADMIN) return "ProxyAdmin";
         if (_addr == BASE_FEE_VAULT) return "BaseFeeVault";
         if (_addr == L1_FEE_VAULT) return "L1FeeVault";
         if (_addr == SCHEMA_REGISTRY) return "SchemaRegistry";
diff --git a/packages/contracts-bedrock/src/libraries/StaticConfig.sol b/packages/contracts-bedrock/src/libraries/StaticConfig.sol
index 9c16205e281d..ffaa0b4e5535 100644
--- a/packages/contracts-bedrock/src/libraries/StaticConfig.sol
+++ b/packages/contracts-bedrock/src/libraries/StaticConfig.sol
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Types } from "src/libraries/Types.sol";
-
 /// @title StaticConfig
 /// @notice Library for encoding and decoding static configuration data.
 library StaticConfig {
@@ -59,60 +57,4 @@ library StaticConfig {
     function decodeRemoveDependency(bytes memory _data) internal pure returns (uint256) {
         return abi.decode(_data, (uint256));
     }
-
-    /// @notice Encodes the static configuration data for setting a fee vault config.
-    /// @param _recipient Address of the recipient of the fee vault.
-    /// @param _min Minimum withdrawal amount allowed to be processed.
-    /// @param _network The network in which the fees should be withdrawn to.
-    /// @return Encoded static configuration data.
-    function encodeSetFeeVaultConfig(
-        address _recipient,
-        uint256 _min,
-        Types.WithdrawalNetwork _network
-    )
-        internal
-        pure
-        returns (bytes memory)
-    {
-        return abi.encode(_recipient, _min, _network);
-    }
-
-    /// @notice Decodes the static configuration data for setting a fee vault config.
-    /// @param _data Encoded static configuration data.
-    /// @return Decoded fee vault config data (recipient, min, network).
-    function decodeSetFeeVaultConfig(bytes memory _data)
-        internal
-        pure
-        returns (address, uint256, Types.WithdrawalNetwork)
-    {
-        return abi.decode(_data, (address, uint256, Types.WithdrawalNetwork));
-    }
-
-    /// @notice Encodes the static configuration data for setting an address.
-    /// @param _address Address to set.
-    /// @return Encoded static configuration data.
-    function encodeSetAddress(address _address) internal pure returns (bytes memory) {
-        return abi.encode(_address);
-    }
-
-    /// @notice Decodes the static configuration data for setting an address.
-    /// @param _data Encoded static configuration data.
-    /// @return Decoded address.
-    function decodeSetAddress(bytes memory _data) internal pure returns (address) {
-        return abi.decode(_data, (address));
-    }
-
-    /// @notice Encodes the static configuration data for setting a remote chain ID.
-    /// @param _chainId Chain ID of the remote chain.
-    /// @return Encoded static configuration data.
-    function encodeSetRemoteChainId(uint256 _chainId) internal pure returns (bytes memory) {
-        return abi.encode(_chainId);
-    }
-
-    /// @notice Decodes the static configuration data for setting a remote chain ID.
-    /// @param _data Encoded static configuration data.
-    /// @return Decoded chain ID of the remote chain.
-    function decodeSetRemoteChainId(bytes memory _data) internal pure returns (uint256) {
-        return abi.decode(_data, (uint256));
-    }
 }
diff --git a/packages/contracts-bedrock/src/libraries/Types.sol b/packages/contracts-bedrock/src/libraries/Types.sol
index ea1513df3693..7e9a65654bc1 100644
--- a/packages/contracts-bedrock/src/libraries/Types.sol
+++ b/packages/contracts-bedrock/src/libraries/Types.sol
@@ -75,29 +75,4 @@ library Types {
         L1,
         L2
     }
-
-    /// @notice Enum representing different types of configurations that can be set on L1BlockIsthmus.
-    /// @custom:value GAS_PAYING_TOKEN  Config type for the gas paying token.
-    /// @custom:value BASE_FEE_VAULT_CONFIG Config type for the base fee vault config.
-    /// @custom:value L1_FEE_VAULT_CONFIG Config type for the L1 fee vault config.
-    /// @custom:value SEQUENCER_FEE_VAULT_CONFIG Config type for the sequencer fee vault config.
-    /// @custom:value L1_CROSS_DOMAIN_MESSENGER_ADDRESS Config type for the L1 Cross Domain Messenger address.
-    /// @custom:value L1_ERC_721_BRIDGE_ADDRESS Config type for the L1 ERC721 Bridge address.
-    /// @custom:value L1_STANDARD_BRIDGE_ADDRESS Config type for the L1 Standard Bridge address.
-    /// @custom:value REMOTE_CHAIN_ID Config type for the remote chain ID.
-    /// @custom:value ADD_DEPENDENCY        Config type for adding a chain to the interop dependency set.
-    /// @custom:value REMOVE_DEPENDENCY     Config type for removing a chain from the interop dependency
-    /// set.
-    enum ConfigType {
-        GAS_PAYING_TOKEN,
-        BASE_FEE_VAULT_CONFIG,
-        L1_FEE_VAULT_CONFIG,
-        SEQUENCER_FEE_VAULT_CONFIG,
-        L1_CROSS_DOMAIN_MESSENGER_ADDRESS,
-        L1_ERC_721_BRIDGE_ADDRESS,
-        L1_STANDARD_BRIDGE_ADDRESS,
-        REMOTE_CHAIN_ID,
-        ADD_DEPENDENCY,
-        REMOVE_DEPENDENCY
-    }
 }
diff --git a/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol b/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
index cf1ba049d428..66c724d3eba9 100644
--- a/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
@@ -1,27 +1,30 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 /// @custom:legacy
-/// @title CrossDomainMessengerLegacySpacer
+/// @title CrossDomainMessengerLegacySpacer0
 /// @notice Contract only exists to add a spacer to the CrossDomainMessenger where the
-///         libAddressManager variable, PausableUpgradable and OwnableUpgradeable
-///         variables used to exist.
-abstract contract CrossDomainMessengerLegacySpacer {
+///         libAddressManager variable used to exist. Must be the first contract in the inheritance
+///         tree of the CrossDomainMessenger.
+contract CrossDomainMessengerLegacySpacer0 {
     /// @custom:legacy
     /// @custom:spacer libAddressManager
     /// @notice Spacer for backwards compatibility.
     address private spacer_0_0_20;
+}
 
-    /// @custom:legacy
-    /// @custom:spacer initializer
-    /// @notice Spacer for backwards compatibility.
-    bytes12 private spacer_0_20_12;
-
+/// @custom:legacy
+/// @title CrossDomainMessengerLegacySpacer1
+/// @notice Contract only exists to add a spacer to the CrossDomainMessenger where the
+///         PausableUpgradable and OwnableUpgradeable variables used to exist. Must be
+///         the third contract in the inheritance tree of the CrossDomainMessenger.
+contract CrossDomainMessengerLegacySpacer1 {
     /// @custom:legacy
     /// @custom:spacer ContextUpgradable's __gap
     /// @notice Spacer for backwards compatibility. Comes from OpenZeppelin
@@ -31,7 +34,7 @@ abstract contract CrossDomainMessengerLegacySpacer {
     /// @custom:legacy
     /// @custom:spacer OwnableUpgradeable's _owner
     /// @notice Spacer for backwards compatibility.
-    ///         Comes from OpenZeppelin OwnableUpgradeable.
+    ///         Come from OpenZeppelin OwnableUpgradeable.
     address private spacer_51_0_20;
 
     /// @custom:legacy
@@ -81,7 +84,11 @@ abstract contract CrossDomainMessengerLegacySpacer {
 ///         chain it's deployed on. Currently only designed for message passing between two paired
 ///         chains and does not support one-to-many interactions.
 ///         Any changes to this contract MUST result in a semver bump for contracts that inherit it.
-abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
+abstract contract CrossDomainMessenger is
+    CrossDomainMessengerLegacySpacer0,
+    Initializable,
+    CrossDomainMessengerLegacySpacer1
+{
     /// @notice Current message version identifier.
     uint16 public constant MESSAGE_VERSION = 1;
 
@@ -112,12 +119,11 @@ abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
     ///         can therefore not be relayed again.
     mapping(bytes32 => bool) public successfulMessages;
 
-    /// @custom:legacy
-    /// @custom:spacer xDomainMsgSender
-    /// @notice Spacer for backwards compatibility. The storage slot was migrated when the
-    ///         initializer pattern was moved away from in the base contract to remove the
-    ///         need to set `Constants.DEFAULT_L2_SENDER` into storage during a call to `initialize`.
-    bytes20 internal spacer_204_0_20;
+    /// @notice Address of the sender of the currently executing message on the other chain. If the
+    ///         value of this variable is the default value (0x00000000...dead) then no message is
+    ///         currently being executed. Use the xDomainMessageSender getter which will throw an
+    ///         error if this is the case.
+    address internal xDomainMsgSender;
 
     /// @notice Nonce for the next message to be sent, without the message version applied. Use the
     ///         messageNonce getter which will insert the message version into the nonce to give you
@@ -129,23 +135,14 @@ abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
     ///         successfully executed on the first attempt.
     mapping(bytes32 => bool) public failedMessages;
 
-    /// @custom:legacy
-    /// @custom:spacer CrossDomainMessenger
-    /// @notice Spacer for backwards compatibility.
-    address private spacer_207_0_20;
-
-    /// @notice Address of the sender of the currently executing message on the other chain. If the
-    ///         value of this variable is address(0) then no message is currently being executed.
-    ///         Use the xDomainMessageSender getter which will throw an error if this is the case.
-    address private xDomainMsgSender;
-
-    /// @notice Spacer to ensure that there is no collision with the xDomainMsgSender slot.
-    bytes12 private spacer_208_20_12;
+    /// @notice CrossDomainMessenger contract on the other chain.
+    /// @custom:network-specific
+    CrossDomainMessenger public otherMessenger;
 
     /// @notice Reserve extra slots in the storage layout for future upgrades.
-    ///         A gap size of 40 was chosen here, so that the first slot used in a child contract
+    ///         A gap size of 43 was chosen here, so that the first slot used in a child contract
     ///         would be 1 plus a multiple of 50.
-    uint256[41] private __gap;
+    uint256[43] private __gap;
 
     /// @notice Emitted whenever a message is sent to the other chain.
     /// @param target       Address of the recipient of the message.
@@ -186,7 +183,7 @@ abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
         // guarantee the property that the call to the target contract will always have at least
         // the minimum gas limit specified by the user.
         _sendMessage({
-            _to: address(otherMessenger()),
+            _to: address(otherMessenger),
             _gasLimit: baseGas(_message, _minGasLimit),
             _value: msg.value,
             _data: abi.encodeWithSelector(
@@ -269,7 +266,7 @@ abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
         // is being re-entered. This marks the message as failed to allow it to be replayed.
         if (
             !SafeCall.hasMinGas(_minGasLimit, RELAY_RESERVED_GAS + RELAY_GAS_CHECK_BUFFER)
-                || getCrossDomainMessageSender() != Constants.DEFAULT_L2_SENDER
+                || xDomainMsgSender != Constants.DEFAULT_L2_SENDER
         ) {
             failedMessages[versionedHash] = true;
             emit FailedRelayedMessage(versionedHash);
@@ -286,9 +283,9 @@ abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
             return;
         }
 
-        setCrossDomainMessageSender(_sender);
+        xDomainMsgSender = _sender;
         bool success = SafeCall.call(_target, gasleft() - RELAY_RESERVED_GAS, _value, _message);
-        setCrossDomainMessageSender(address(0));
+        xDomainMsgSender = Constants.DEFAULT_L2_SENDER;
 
         if (success) {
             // This check is identical to one above, but it ensures that the same message cannot be relayed
@@ -311,40 +308,24 @@ abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
         }
     }
 
-    /// @notice Retrieves the address of the contract or wallet that initiated the currently
-    ///         executing message on the other chain.
-    /// @return Address of the sender of the currently executing message on the other chain.
-    function getCrossDomainMessageSender() internal view returns (address) {
-        if (xDomainMsgSender == address(0)) return Constants.DEFAULT_L2_SENDER;
-        return xDomainMsgSender;
-    }
-
-    /// @notice Setter function for the cross-domain message sender.
-    /// @param _address Address of the sender of the currently executing message on the other chain.
-    function setCrossDomainMessageSender(address _address) internal {
-        xDomainMsgSender = _address;
-    }
-
     /// @notice Retrieves the address of the contract or wallet that initiated the currently
     ///         executing message on the other chain. Will throw an error if there is no message
     ///         currently being executed. Allows the recipient of a call to see who triggered it.
     /// @return Address of the sender of the currently executing message on the other chain.
     function xDomainMessageSender() external view returns (address) {
-        address sender = getCrossDomainMessageSender();
-        require(sender != Constants.DEFAULT_L2_SENDER, "CrossDomainMessenger: xDomainMessageSender is not set");
-        return sender;
-    }
+        require(
+            xDomainMsgSender != Constants.DEFAULT_L2_SENDER, "CrossDomainMessenger: xDomainMessageSender is not set"
+        );
 
-    /// @notice Returns the contract of the other messenger on this chain.
-    /// @return Contract of the other messenger on this chain.
-    function otherMessenger() public view virtual returns (CrossDomainMessenger);
+        return xDomainMsgSender;
+    }
 
     /// @notice Retrieves the address of the paired CrossDomainMessenger contract on the other chain
     ///         Public getter is legacy and will be removed in the future. Use `otherMessenger()` instead.
     /// @return CrossDomainMessenger contract on the other chain.
     /// @custom:legacy
     function OTHER_MESSENGER() public view returns (CrossDomainMessenger) {
-        return otherMessenger();
+        return otherMessenger;
     }
 
     /// @notice Retrieves the next message nonce. Message version will be added to the upper two
@@ -390,6 +371,19 @@ abstract contract CrossDomainMessenger is CrossDomainMessengerLegacySpacer {
         return token != Constants.ETHER;
     }
 
+    /// @notice Initializer.
+    /// @param _otherMessenger CrossDomainMessenger contract on the other chain.
+    function __CrossDomainMessenger_init(CrossDomainMessenger _otherMessenger) internal onlyInitializing {
+        // We only want to set the xDomainMsgSender to the default value if it hasn't been initialized yet,
+        // meaning that this is a fresh contract deployment.
+        // This prevents resetting the xDomainMsgSender to the default value during an upgrade, which would enable
+        // a reentrant withdrawal to sandwhich the upgrade replay a withdrawal twice.
+        if (xDomainMsgSender == address(0)) {
+            xDomainMsgSender = Constants.DEFAULT_L2_SENDER;
+        }
+        otherMessenger = _otherMessenger;
+    }
+
     /// @notice Sends a low-level message to the other messenger. Needs to be implemented by child
     ///         contracts because the logic for this depends on the network where the messenger is
     ///         being deployed.
diff --git a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
index 60edc5a55b57..52217fab713c 100644
--- a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
@@ -1,25 +1,24 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.25;
+pragma solidity 0.8.15;
 
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 /// @title ERC721Bridge
 /// @notice ERC721Bridge is a base contract for the L1 and L2 ERC721 bridges.
-abstract contract ERC721Bridge {
+abstract contract ERC721Bridge is Initializable {
     /// @custom:spacer ERC721Bridge's initializer slot spacing
-    /// @notice Spacer for legacy initializable slot
-    bytes32 private spacer_0_0_32;
+    /// @notice Spacer to avoid packing into the initializer slot
+    bytes30 private spacer_0_2_30;
 
-    /// @custom:legacy
-    /// @custom:spacer messenger
-    /// @notice Spacer for backwards compatibility.
-    address private spacer_1_0_20;
+    /// @notice Messenger contract on this domain.
+    /// @custom:network-specific
+    ICrossDomainMessenger public messenger;
 
-    /// @custom:legacy
-    /// @custom:spacer otherBridge
-    /// @notice Spacer for backwards compatibility.
-    address private spacer_2_0_20;
+    /// @notice Contract of the bridge on the other network.
+    /// @custom:network-specific
+    ERC721Bridge public otherBridge;
 
     /// @notice Reserve extra slots (to a total of 50) in the storage layout for future upgrades.
     uint256[46] private __gap;
@@ -58,37 +57,41 @@ abstract contract ERC721Bridge {
 
     /// @notice Ensures that the caller is a cross-chain message from the other bridge.
     modifier onlyOtherBridge() {
-        ICrossDomainMessenger crossDomainMessenger = messenger();
         require(
-            msg.sender == address(crossDomainMessenger)
-                && crossDomainMessenger.xDomainMessageSender() == address(otherBridge()),
+            msg.sender == address(messenger) && messenger.xDomainMessageSender() == address(otherBridge),
             "ERC721Bridge: function can only be called from the other bridge"
         );
         _;
     }
 
-    /// @notice Getter function for the messenger contract.
-    /// @return Messenger contract on this domain.
-    function messenger() public view virtual returns (ICrossDomainMessenger);
+    /// @notice Initializer.
+    /// @param _messenger   Contract of the CrossDomainMessenger on this network.
+    /// @param _otherBridge Contract of the ERC721 bridge on the other network.
+    function __ERC721Bridge_init(
+        ICrossDomainMessenger _messenger,
+        ERC721Bridge _otherBridge
+    )
+        internal
+        onlyInitializing
+    {
+        messenger = _messenger;
+        otherBridge = _otherBridge;
+    }
 
     /// @notice Legacy getter for messenger contract.
     ///         Public getter is legacy and will be removed in the future. Use `messenger` instead.
     /// @return Messenger contract on this domain.
     /// @custom:legacy
     function MESSENGER() external view returns (ICrossDomainMessenger) {
-        return messenger();
+        return messenger;
     }
 
-    /// @notice Getter function for the other bridge.
-    /// @return Contract of the bridge on the other network.
-    function otherBridge() public view virtual returns (ERC721Bridge);
-
     /// @notice Legacy getter for other bridge address.
     ///         Public getter is legacy and will be removed in the future. Use `otherBridge` instead.
     /// @return Contract of the bridge on the other network.
     /// @custom:legacy
     function OTHER_BRIDGE() external view returns (ERC721Bridge) {
-        return otherBridge();
+        return otherBridge;
     }
 
     /// @notice This function should return true if the contract is paused.
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
index 788ef2b2f546..d7a9cd3372cd 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
@@ -3,21 +3,24 @@ pragma solidity 0.8.15;
 
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
 
+/// @custom:proxied true
+/// @custom:predeployed 0x4200000000000000000000000000000000000012
 /// @title OptimismMintableERC20Factory
-/// @notice OptimismMintableERC20Factory is an abstract factory contract that generates OptimismMintableERC20
-///         contracts on the network it's deployed to. It should be inherited by a child contract that
-///         implements the `bridge` getter function.
-///         Any changes to this contract MUST result in a semver bump for contracts that inherit it.
-abstract contract OptimismMintableERC20Factory is ISemver, IOptimismERC20Factory {
+/// @notice OptimismMintableERC20Factory is a factory contract that generates OptimismMintableERC20
+///         contracts on the network it's deployed to. Simplifies the deployment process for users
+///         who may be less familiar with deploying smart contracts. Designed to be backwards
+///         compatible with the older StandardL2ERC20Factory contract.
+contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20Factory {
     /// @custom:spacer OptimismMintableERC20Factory's initializer slot spacing
     /// @notice Spacer to avoid packing into the initializer slot
-    bytes32 private spacer_0_0_32;
+    bytes30 private spacer_0_2_30;
 
-    /// @custom:spacer bridge
-    /// @notice Spacer to avoid packing into the initializer slot
-    bytes32 private spacer_1_0_32;
+    /// @notice Address of the StandardBridge on this chain.
+    /// @custom:network-specific
+    address public bridge;
 
     /// @notice Mapping of local token address to remote token address.
     ///         This is used to keep track of the token deployments.
@@ -41,14 +44,30 @@ abstract contract OptimismMintableERC20Factory is ISemver, IOptimismERC20Factory
     /// @param deployer    Address of the account that deployed the token.
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
 
-    function bridge() public view virtual returns (address);
+    /// @notice The semver MUST be bumped any time that there is a change in
+    ///         the OptimismMintableERC20 token contract since this contract
+    ///         is responsible for deploying OptimismMintableERC20 contracts.
+    /// @notice Semantic version.
+    /// @custom:semver 1.10.1-beta.4
+    string public constant version = "1.10.1-beta.4";
+
+    /// @notice Constructs the OptimismMintableERC20Factory contract.
+    constructor() {
+        initialize({ _bridge: address(0) });
+    }
+
+    /// @notice Initializes the contract.
+    /// @param _bridge Address of the StandardBridge on this chain.
+    function initialize(address _bridge) public initializer {
+        bridge = _bridge;
+    }
 
     /// @notice Getter function for the address of the StandardBridge on this chain.
     ///         Public getter is legacy and will be removed in the future. Use `bridge` instead.
     /// @return Address of the StandardBridge on this chain.
     /// @custom:legacy
     function BRIDGE() external view returns (address) {
-        return bridge();
+        return bridge;
     }
 
     /// @custom:legacy
@@ -105,7 +124,7 @@ abstract contract OptimismMintableERC20Factory is ISemver, IOptimismERC20Factory
         bytes32 salt = keccak256(abi.encode(_remoteToken, _name, _symbol, _decimals));
 
         address localToken =
-            address(new OptimismMintableERC20{ salt: salt }(bridge(), _remoteToken, _name, _symbol, _decimals));
+            address(new OptimismMintableERC20{ salt: salt }(bridge, _remoteToken, _name, _symbol, _decimals));
 
         deployments[localToken] = _remoteToken;
 
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
index 692e8546b923..9dd05e10d1fe 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
@@ -5,7 +5,6 @@ import { ERC721Enumerable } from "@openzeppelin/contracts/token/ERC721/extension
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @title OptimismMintableERC721
@@ -30,20 +29,20 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     address public immutable REMOTE_TOKEN;
 
     /// @notice Address of the ERC721 bridge on this network.
-    IL2ERC721Bridge public immutable BRIDGE;
+    address public immutable BRIDGE;
 
     /// @notice Base token URI for this token.
     string public baseTokenURI;
 
     /// @notice Modifier that prevents callers other than the bridge from calling the function.
     modifier onlyBridge() {
-        require(msg.sender == address(BRIDGE), "OptimismMintableERC721: only bridge can call this function");
+        require(msg.sender == BRIDGE, "OptimismMintableERC721: only bridge can call this function");
         _;
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.4
-    string public constant version = "1.3.1-beta.4";
+    /// @custom:semver 1.3.1-beta.3
+    string public constant version = "1.3.1-beta.3";
 
     /// @param _bridge        Address of the bridge on this network.
     /// @param _remoteChainId Chain ID where the remote token is deployed.
@@ -51,7 +50,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     /// @param _name          ERC721 name.
     /// @param _symbol        ERC721 symbol.
     constructor(
-        IL2ERC721Bridge _bridge,
+        address _bridge,
         uint256 _remoteChainId,
         address _remoteToken,
         string memory _name,
@@ -59,7 +58,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     )
         ERC721(_name, _symbol)
     {
-        require(address(_bridge) != address(0), "OptimismMintableERC721: bridge cannot be address(0)");
+        require(_bridge != address(0), "OptimismMintableERC721: bridge cannot be address(0)");
         require(_remoteChainId != 0, "OptimismMintableERC721: remote chain id cannot be zero");
         require(_remoteToken != address(0), "OptimismMintableERC721: remote token cannot be address(0)");
 
@@ -91,8 +90,8 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     }
 
     /// @notice Address of the ERC721 bridge on this network.
-    function bridge() external view returns (IL2ERC721Bridge) {
-        return IL2ERC721Bridge(BRIDGE);
+    function bridge() external view returns (address) {
+        return BRIDGE;
     }
 
     /// @notice Mints some token ID for a user, checking first that contract recipients
diff --git a/packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
similarity index 51%
rename from packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
rename to packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
index a6818a83c9e6..7350e0fae0de 100644
--- a/packages/contracts-bedrock/src/L2/OptimismMintableERC721Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
@@ -2,18 +2,19 @@
 pragma solidity 0.8.15;
 
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Types } from "src/libraries/Types.sol";
 
 /// @title OptimismMintableERC721Factory
 /// @notice Factory contract for creating OptimismMintableERC721 contracts.
-///         This contract could in theory live on both L1 and L2 but it is not widely
-///         used and is therefore set up to work on L2. This could be abstracted in the
-///         future to be deployable on L1 as well.
 contract OptimismMintableERC721Factory is ISemver {
+    /// @custom:legacy true
+    /// @notice Address of the ERC721 bridge on this network.
+    address public immutable BRIDGE;
+
+    /// @custom:legacy true
+    /// @notice Chain ID for the remote network.
+    uint256 public immutable REMOTE_CHAIN_ID;
+
     /// @notice Tracks addresses created by this factory.
     mapping(address => bool) public isOptimismMintableERC721;
 
@@ -24,34 +25,27 @@ contract OptimismMintableERC721Factory is ISemver {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     /// @notice Semantic version.
-    ///     The semver MUST be bumped any time that there is a change in
-    ///     the OptimismMintableERC721 token contract since this contract
-    ///     is responsible for deploying OptimismMintableERC721 contracts.
     /// @custom:semver 1.4.1-beta.4
     string public constant version = "1.4.1-beta.4";
 
-    /// @notice Returns the remote chain id
-    function REMOTE_CHAIN_ID() external view returns (uint256) {
-        return remoteChainId();
-    }
-
-    /// @notice Getter function for the remote chain id.
-    function remoteChainId() public view returns (uint256) {
-        bytes memory data = IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).getConfig(Types.ConfigType.REMOTE_CHAIN_ID);
-        return abi.decode(data, (uint256));
+    /// @notice The semver MUST be bumped any time that there is a change in
+    ///         the OptimismMintableERC721 token contract since this contract
+    ///         is responsible for deploying OptimismMintableERC721 contracts.
+    /// @param _bridge Address of the ERC721 bridge on this network.
+    /// @param _remoteChainId Chain ID for the remote network.
+    constructor(address _bridge, uint256 _remoteChainId) {
+        BRIDGE = _bridge;
+        REMOTE_CHAIN_ID = _remoteChainId;
     }
 
-    /// @notice Getter function for the bridge contract.
-    ///         Public getter is legacy and will be removed in the future. Use `bridge()` instead.
-    /// @return Bridge contract on this domain.
-    /// @custom:legacy
-    function BRIDGE() external pure returns (IL2ERC721Bridge) {
-        return bridge();
+    /// @notice Address of the ERC721 bridge on this network.
+    function bridge() external view returns (address) {
+        return BRIDGE;
     }
 
-    /// @notice Returns the ERC721 bridge contract.
-    function bridge() public pure returns (IL2ERC721Bridge) {
-        return IL2ERC721Bridge(Predeploys.L2_ERC721_BRIDGE);
+    /// @notice Chain ID for the remote network.
+    function remoteChainID() external view returns (uint256) {
+        return REMOTE_CHAIN_ID;
     }
 
     /// @notice Creates an instance of the standard ERC721.
@@ -70,7 +64,7 @@ contract OptimismMintableERC721Factory is ISemver {
 
         bytes32 salt = keccak256(abi.encode(_remoteToken, _name, _symbol));
         address localToken =
-            address(new OptimismMintableERC721{ salt: salt }(bridge(), remoteChainId(), _remoteToken, _name, _symbol));
+            address(new OptimismMintableERC721{ salt: salt }(BRIDGE, REMOTE_CHAIN_ID, _remoteToken, _name, _symbol));
 
         isOptimismMintableERC721[localToken] = true;
         emit OptimismMintableERC721Created(localToken, _remoteToken, msg.sender);
diff --git a/packages/contracts-bedrock/src/universal/StandardBridge.sol b/packages/contracts-bedrock/src/universal/StandardBridge.sol
index 42b891c169fb..57af2247a65a 100644
--- a/packages/contracts-bedrock/src/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/StandardBridge.sol
@@ -9,8 +9,8 @@ import { SafeCall } from "src/libraries/SafeCall.sol";
 import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
 import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
+import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 /// @custom:upgradeable
@@ -18,16 +18,16 @@ import { Constants } from "src/libraries/Constants.sol";
 /// @notice StandardBridge is a base contract for the L1 and L2 standard ERC20 bridges. It handles
 ///         the core bridging logic, including escrowing tokens that are native to the local chain
 ///         and minting/burning tokens that are native to the remote chain.
-abstract contract StandardBridge {
+abstract contract StandardBridge is Initializable {
     using SafeERC20 for IERC20;
 
     /// @notice The L2 gas limit set when eth is depoisited using the receive() function.
     uint32 internal constant RECEIVE_DEFAULT_GAS_LIMIT = 200_000;
 
     /// @custom:legacy
-    /// @custom:spacer messenger + initializable
+    /// @custom:spacer messenger
     /// @notice Spacer for backwards compatibility.
-    bytes32 private spacer_0_0_32;
+    bytes30 private spacer_0_2_30;
 
     /// @custom:legacy
     /// @custom:spacer l2TokenBridge
@@ -37,20 +37,18 @@ abstract contract StandardBridge {
     /// @notice Mapping that stores deposits for a given pair of local and remote tokens.
     mapping(address => mapping(address => uint256)) public deposits;
 
-    /// @custom:legacy
-    /// @custom:spacer messenger
-    /// @notice Spacer for backwards compatibility.
-    address private spacer_3_0_20;
+    /// @notice Messenger contract on this domain.
+    /// @custom:network-specific
+    ICrossDomainMessenger public messenger;
 
-    /// @custom:legacy
-    /// @custom:spacer otherBridge
-    /// @notice Spacer for backwards compatibility.
-    address private spacer_4_0_20;
+    /// @notice Corresponding bridge on the other domain.
+    /// @custom:network-specific
+    StandardBridge public otherBridge;
 
     /// @notice Reserve extra slots (to a total of 50) in the storage layout for future upgrades.
-    ///         The gap size was previously 45, but is now 44, allowing for the initializer slot to be
-    ///         included in the L1StandardBridge contract without breaking its storage layout.
-    uint256[44] private __gap;
+    ///         A gap size of 45 was chosen here, so that the first slot used in a child contract
+    ///         would be a multiple of 50.
+    uint256[45] private __gap;
 
     /// @notice Emitted when an ETH bridge is initiated to the other chain.
     /// @param from      Address of the sender.
@@ -108,15 +106,27 @@ abstract contract StandardBridge {
 
     /// @notice Ensures that the caller is a cross-chain message from the other bridge.
     modifier onlyOtherBridge() {
-        ICrossDomainMessenger crossDomainMessenger = messenger();
         require(
-            msg.sender == address(crossDomainMessenger)
-                && crossDomainMessenger.xDomainMessageSender() == address(otherBridge()),
+            msg.sender == address(messenger) && messenger.xDomainMessageSender() == address(otherBridge),
             "StandardBridge: function can only be called from the other bridge"
         );
         _;
     }
 
+    /// @notice Initializer.
+    /// @param _messenger   Contract for CrossDomainMessenger on this network.
+    /// @param _otherBridge Contract for the other StandardBridge contract.
+    function __StandardBridge_init(
+        ICrossDomainMessenger _messenger,
+        StandardBridge _otherBridge
+    )
+        internal
+        onlyInitializing
+    {
+        messenger = _messenger;
+        otherBridge = _otherBridge;
+    }
+
     /// @notice Allows EOAs to bridge ETH by sending directly to the bridge.
     ///         Must be implemented by contracts that inherit.
     receive() external payable virtual;
@@ -130,28 +140,20 @@ abstract contract StandardBridge {
         return token != Constants.ETHER;
     }
 
-    /// @notice Returns the contract of the CrossDomainMessenger on this chain.
-    /// @return Contract of the CrossDomainMessenger on this chain.
-    function messenger() public view virtual returns (ICrossDomainMessenger);
-
     /// @notice Getter for messenger contract.
     ///         Public getter is legacy and will be removed in the future. Use `messenger` instead.
     /// @return Contract of the messenger on this domain.
     /// @custom:legacy
     function MESSENGER() external view returns (ICrossDomainMessenger) {
-        return messenger();
+        return messenger;
     }
 
-    /// @notice Returns the contract of the bridge on the other chain.
-    /// @return Contract of the bridge on the other chain.
-    function otherBridge() public view virtual returns (IStandardBridge);
-
     /// @notice Getter for the other bridge contract.
     ///         Public getter is legacy and will be removed in the future. Use `otherBridge` instead.
     /// @return Contract of the bridge on the other network.
     /// @custom:legacy
-    function OTHER_BRIDGE() external view returns (IStandardBridge) {
-        return otherBridge();
+    function OTHER_BRIDGE() external view returns (StandardBridge) {
+        return otherBridge;
     }
 
     /// @notice This function should return true if the contract is paused.
@@ -254,7 +256,7 @@ abstract contract StandardBridge {
         require(isCustomGasToken() == false, "StandardBridge: cannot bridge ETH with custom gas token");
         require(msg.value == _amount, "StandardBridge: amount sent does not match amount required");
         require(_to != address(this), "StandardBridge: cannot send to self");
-        require(_to != address(messenger()), "StandardBridge: cannot send to messenger");
+        require(_to != address(messenger), "StandardBridge: cannot send to messenger");
 
         // Emit the correct events. By default this will be _amount, but child
         // contracts may override this function in order to emit legacy events as well.
@@ -327,8 +329,8 @@ abstract contract StandardBridge {
         // contracts may override this function in order to emit legacy events as well.
         _emitETHBridgeInitiated(_from, _to, _amount, _extraData);
 
-        messenger().sendMessage{ value: _amount }({
-            _target: address(otherBridge()),
+        messenger.sendMessage{ value: _amount }({
+            _target: address(otherBridge),
             _message: abi.encodeWithSelector(this.finalizeBridgeETH.selector, _from, _to, _amount, _extraData),
             _minGasLimit: _minGasLimit
         });
@@ -372,8 +374,8 @@ abstract contract StandardBridge {
         // contracts may override this function in order to emit legacy events as well.
         _emitERC20BridgeInitiated(_localToken, _remoteToken, _from, _to, _amount, _extraData);
 
-        messenger().sendMessage({
-            _target: address(otherBridge()),
+        messenger.sendMessage({
+            _target: address(otherBridge),
             _message: abi.encodeWithSelector(
                 this.finalizeBridgeERC20.selector,
                 // Because this call will be executed on the remote chain, we reverse the order of
diff --git a/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol b/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol
index 479e8a6ba273..256b09fa56ef 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol
@@ -3,6 +3,7 @@ pragma solidity ^0.8.0;
 
 interface ICrossDomainMessenger {
     event FailedRelayedMessage(bytes32 indexed msgHash);
+    event Initialized(uint8 version);
     event RelayedMessage(bytes32 indexed msgHash);
     event SentMessage(address indexed target, address sender, bytes message, uint256 messageNonce, uint256 gasLimit);
     event SentMessageExtension1(address indexed sender, uint256 value);
@@ -12,7 +13,6 @@ interface ICrossDomainMessenger {
     function MIN_GAS_DYNAMIC_OVERHEAD_DENOMINATOR() external view returns (uint64);
     function MIN_GAS_DYNAMIC_OVERHEAD_NUMERATOR() external view returns (uint64);
     function OTHER_MESSENGER() external view returns (ICrossDomainMessenger);
-    function otherMessenger() external view returns (ICrossDomainMessenger);
     function RELAY_CALL_OVERHEAD() external view returns (uint64);
     function RELAY_CONSTANT_OVERHEAD() external view returns (uint64);
     function RELAY_GAS_CHECK_BUFFER() external view returns (uint64);
@@ -20,6 +20,7 @@ interface ICrossDomainMessenger {
     function baseGas(bytes memory _message, uint32 _minGasLimit) external pure returns (uint64);
     function failedMessages(bytes32) external view returns (bool);
     function messageNonce() external view returns (uint256);
+    function otherMessenger() external view returns (ICrossDomainMessenger);
     function paused() external view returns (bool);
     function relayMessage(
         uint256 _nonce,
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol b/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
index fb1f0021aa05..3c97958c1033 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
@@ -20,6 +20,7 @@ interface IERC721Bridge {
         uint256 tokenId,
         bytes extraData
     );
+    event Initialized(uint8 version);
 
     function MESSENGER() external view returns (ICrossDomainMessenger);
     function OTHER_BRIDGE() external view returns (IERC721Bridge);
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol
index 36978feece9e..91f6eba6c175 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol
@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 interface IOptimismMintableERC20Factory {
+    event Initialized(uint8 version);
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
     event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
 
@@ -30,6 +31,7 @@ interface IOptimismMintableERC20Factory {
         external
         returns (address);
     function deployments(address) external view returns (address);
+    function initialize(address _bridge) external;
     function version() external view returns (string memory);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
index f678e1338dc5..7d745ad8436e 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
@@ -1,14 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
-
 /// @title IOptimismMintableERC721
 /// @notice Interface for contracts that are compatible with the OptimismMintableERC721 standard.
 ///         Tokens that follow this standard can be easily transferred across the ERC721 bridge.
 interface IOptimismMintableERC721 {
     function __constructor__(
-        IL2ERC721Bridge _bridge,
+        address _bridge,
         uint256 _remoteChainId,
         address _remoteToken,
         string memory _name,
@@ -66,13 +64,11 @@ interface IOptimismMintableERC721 {
 
     function REMOTE_TOKEN() external view returns (address);
 
-    /// @notice Address of the ERC721 bridge on this network.
-    function BRIDGE() external view returns (IL2ERC721Bridge);
+    function BRIDGE() external view returns (address);
 
     function remoteChainId() external view returns (uint256);
 
     function remoteToken() external view returns (address);
 
-    /// @notice Address of the ERC721 bridge on this network.
-    function bridge() external view returns (IL2ERC721Bridge);
+    function bridge() external view returns (address);
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IOptimismMintableERC721Factory.sol b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol
similarity index 66%
rename from packages/contracts-bedrock/src/L2/interfaces/IOptimismMintableERC721Factory.sol
rename to packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol
index 013c0b73c1a6..be3e8ad05425 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IOptimismMintableERC721Factory.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol
@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
-
 interface IOptimismMintableERC721Factory {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
-    function BRIDGE() external pure returns (IL2ERC721Bridge);
-    function bridge() external pure returns (IL2ERC721Bridge);
+    function BRIDGE() external view returns (address);
+    function REMOTE_CHAIN_ID() external view returns (uint256);
+    function bridge() external view returns (address);
     function createOptimismMintableERC721(
         address _remoteToken,
         string memory _name,
@@ -16,9 +15,8 @@ interface IOptimismMintableERC721Factory {
         external
         returns (address);
     function isOptimismMintableERC721(address) external view returns (bool);
-    function REMOTE_CHAIN_ID() external view returns (uint256);
-    function remoteChainId() external view returns (uint256);
+    function remoteChainID() external view returns (uint256);
     function version() external view returns (string memory);
 
-    function __constructor__() external;
+    function __constructor__(address _bridge, uint256 _remoteChainId) external;
 }
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol b/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
index 3fdc09df503b..406a172c0737 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
@@ -22,10 +22,12 @@ interface IStandardBridge {
     );
     event ETHBridgeFinalized(address indexed from, address indexed to, uint256 amount, bytes extraData);
     event ETHBridgeInitiated(address indexed from, address indexed to, uint256 amount, bytes extraData);
+    event Initialized(uint8 version);
 
     receive() external payable;
 
     function MESSENGER() external view returns (ICrossDomainMessenger);
+    function OTHER_BRIDGE() external view returns (IStandardBridge);
     function bridgeERC20(
         address _localToken,
         address _remoteToken,
@@ -58,7 +60,6 @@ interface IStandardBridge {
     function finalizeBridgeETH(address _from, address _to, uint256 _amount, bytes memory _extraData) external payable;
     function messenger() external view returns (ICrossDomainMessenger);
     function otherBridge() external view returns (IStandardBridge);
-    function OTHER_BRIDGE() external view returns (IStandardBridge);
     function paused() external view returns (bool);
 
     function __constructor__() external;
diff --git a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
index 232142e9070c..5b2260fce992 100644
--- a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
+++ b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
@@ -70,8 +70,7 @@ contract OPContractsManager_Deploy_Test is DeployOPChain_TestBase {
                 batcher: _doi.batcher(),
                 unsafeBlockSigner: _doi.unsafeBlockSigner(),
                 proposer: _doi.proposer(),
-                challenger: _doi.challenger(),
-                systemConfigFeeAdmin: msg.sender
+                challenger: _doi.challenger()
             }),
             basefeeScalar: _doi.basefeeScalar(),
             blobBasefeeScalar: _doi.blobBaseFeeScalar(),
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index 41c85e463f99..028fc7587043 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -19,7 +19,6 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
-import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Interfaces
@@ -68,7 +67,6 @@ contract OptimismPortal_Test is CommonTest {
         assertEq(optimismPortal.paused(), false);
         (uint128 prevBaseFee, uint64 prevBoughtGas, uint64 prevBlockNum) = optimismPortal.params();
         assertEq(prevBaseFee, 1 gwei);
-        // someplace upstream there is a deposit tx
         assertEq(prevBoughtGas, 0);
         assertEq(prevBlockNum, uint64(block.number));
     }
@@ -459,7 +457,6 @@ contract OptimismPortal_Test is CommonTest {
     )
         external
     {
-        bytes memory data = StaticConfig.encodeSetGasPayingToken(_token, _decimals, _name, _symbol);
         vm.expectEmit(address(optimismPortal));
         emit TransactionDeposited(
             0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
@@ -470,12 +467,12 @@ contract OptimismPortal_Test is CommonTest {
                 uint256(0), // value
                 uint64(200_000), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
+                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
             )
         );
 
         vm.prank(address(systemConfig));
-        optimismPortal.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
+        optimismPortal.setGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol });
     }
 
     /// @notice Ensures that the deposit event is correct for the `setGasPayingToken`
@@ -494,13 +491,10 @@ contract OptimismPortal_Test is CommonTest {
         bytes32 name = GasPayingToken.sanitize(_name);
         bytes32 symbol = GasPayingToken.sanitize(_symbol);
 
-        bytes memory data =
-            StaticConfig.encodeSetGasPayingToken({ _token: _token, _decimals: 18, _name: name, _symbol: symbol });
-
         vm.recordLogs();
 
         vm.prank(address(systemConfig));
-        optimismPortal.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
+        optimismPortal.setGasPayingToken({ _token: _token, _decimals: 18, _name: name, _symbol: symbol });
 
         vm.prank(Constants.DEPOSITOR_ACCOUNT, Constants.DEPOSITOR_ACCOUNT);
         optimismPortal.depositTransaction({
@@ -508,7 +502,7 @@ contract OptimismPortal_Test is CommonTest {
             _value: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
+            _data: abi.encodeCall(IL1Block.setGasPayingToken, (_token, 18, name, symbol))
         });
 
         VmSafe.Log[] memory logs = vm.getRecordedLogs();
@@ -531,7 +525,7 @@ contract OptimismPortal_Test is CommonTest {
         vm.assume(_caller != address(systemConfig));
         vm.prank(_caller);
         vm.expectRevert(Unauthorized.selector);
-        optimismPortal.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, hex"");
+        optimismPortal.setGasPayingToken({ _token: address(0), _decimals: 0, _name: "", _symbol: "" });
     }
 
     /// @dev Tests that `depositERC20Transaction` reverts when the gas paying token is ether.
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index a400c3e5de32..8cc56937bd33 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -19,7 +19,6 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
-import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import "src/dispute/lib/Types.sol";
 import "src/libraries/PortalErrors.sol";
 
@@ -309,13 +308,6 @@ contract OptimismPortal2_Test is CommonTest {
     )
         external
     {
-        bytes memory data = StaticConfig.encodeSetGasPayingToken({
-            _token: _token,
-            _decimals: _decimals,
-            _name: _name,
-            _symbol: _symbol
-        });
-
         vm.expectEmit(address(optimismPortal2));
         emit TransactionDeposited(
             0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
@@ -326,12 +318,12 @@ contract OptimismPortal2_Test is CommonTest {
                 uint256(0), // value
                 uint64(200_000), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
+                abi.encodeCall(IL1Block.setGasPayingToken, (_token, _decimals, _name, _symbol))
             )
         );
 
         vm.prank(address(systemConfig));
-        optimismPortal2.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
+        optimismPortal2.setGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol });
     }
 
     /// @notice Ensures that the deposit event is correct for the `setGasPayingToken`
@@ -350,12 +342,10 @@ contract OptimismPortal2_Test is CommonTest {
         bytes32 name = GasPayingToken.sanitize(_name);
         bytes32 symbol = GasPayingToken.sanitize(_symbol);
 
-        bytes memory data = StaticConfig.encodeSetGasPayingToken(_token, 18, name, symbol);
-
         vm.recordLogs();
 
         vm.prank(address(systemConfig));
-        optimismPortal2.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, data);
+        optimismPortal2.setGasPayingToken({ _token: _token, _decimals: 18, _name: name, _symbol: symbol });
 
         vm.prank(Constants.DEPOSITOR_ACCOUNT, Constants.DEPOSITOR_ACCOUNT);
         optimismPortal2.depositTransaction({
@@ -363,70 +353,7 @@ contract OptimismPortal2_Test is CommonTest {
             _value: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
-        });
-
-        VmSafe.Log[] memory logs = vm.getRecordedLogs();
-        assertEq(logs.length, 2);
-
-        VmSafe.Log memory systemPath = logs[0];
-        VmSafe.Log memory userPath = logs[1];
-
-        assertEq(systemPath.topics.length, 4);
-        assertEq(systemPath.topics.length, userPath.topics.length);
-        assertEq(systemPath.topics[0], userPath.topics[0]);
-        assertEq(systemPath.topics[1], userPath.topics[1]);
-        assertEq(systemPath.topics[2], userPath.topics[2]);
-        assertEq(systemPath.topics[3], userPath.topics[3]);
-        assertEq(systemPath.data, userPath.data);
-    }
-
-    /// @dev Tests that the upgrade function succeeds.
-    function testFuzz_upgrade_succeeds(uint32 _gasLimit, bytes memory _calldata) external {
-        address upgrader = superchainConfig.upgrader();
-
-        vm.expectEmit(address(optimismPortal2));
-        emit TransactionDeposited(
-            0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
-            Predeploys.PROXY_ADMIN,
-            0,
-            abi.encodePacked(
-                uint256(0), // mint
-                uint256(0), // value
-                uint64(_gasLimit), // gasLimit
-                false, // isCreation,
-                _calldata
-            )
-        );
-
-        vm.prank(upgrader);
-        optimismPortal2.upgrade(_gasLimit, _calldata);
-    }
-
-    /// @notice Ensures that the deposit event is correct for the `setGasPayingToken`
-    ///         code path that manually emits a deposit transaction outside of the
-    ///         `depositTransaction` function. This is a simple differential test.
-    function test_upgrade_correctEvent_succeeds(uint32 _gasLimit, bytes memory _calldata) external {
-        vm.assume(_calldata.length <= 120_000);
-        IResourceMetering.ResourceConfig memory rcfg = systemConfig.resourceConfig();
-        _gasLimit =
-            uint32(bound(_gasLimit, optimismPortal2.minimumGasLimit(uint32(_calldata.length)), rcfg.maxResourceLimit));
-
-        vm.recordLogs();
-
-        vm.prank(superchainConfig.upgrader());
-        optimismPortal2.upgrade(_gasLimit, _calldata);
-
-        // Advance the block to ensure that the deposit transaction is processed in the next block, so that we
-        // aren't limited by the resource limit consumed by the previous call.
-        vm.roll(block.number + 1);
-        vm.prank(Constants.DEPOSITOR_ACCOUNT, Constants.DEPOSITOR_ACCOUNT);
-        optimismPortal2.depositTransaction({
-            _to: Predeploys.PROXY_ADMIN,
-            _value: 0,
-            _gasLimit: uint64(_gasLimit),
-            _isCreation: false,
-            _data: _calldata
+            _data: abi.encodeCall(IL1Block.setGasPayingToken, (_token, 18, name, symbol))
         });
 
         VmSafe.Log[] memory logs = vm.getRecordedLogs();
@@ -444,41 +371,12 @@ contract OptimismPortal2_Test is CommonTest {
         assertEq(systemPath.data, userPath.data);
     }
 
-    /// @dev Tests that any config type can be set by the system config.
-    function testFuzz_setConfig_succeeds(uint8 _configType, bytes calldata _value) public {
-        // Ensure that _configType is within the range of the ConfigType enum
-        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
-
-        vm.expectEmit(address(optimismPortal2));
-        emitTransactionDeposited({
-            _from: Constants.DEPOSITOR_ACCOUNT,
-            _to: Predeploys.L1_BLOCK_ATTRIBUTES,
-            _value: 0,
-            _mint: 0,
-            _gasLimit: 200_000,
-            _isCreation: false,
-            _data: abi.encodeCall(IL1Block.setConfig, (Types.ConfigType(_configType), _value))
-        });
-
-        vm.prank(address(optimismPortal2.systemConfig()));
-        optimismPortal2.setConfig(Types.ConfigType(_configType), _value);
-    }
-
-    /// @dev Tests that the gas paying token cannot be set by a non-system config for any config type.
-    function testFuzz_setConfig_notSystemConfig_fails(
-        address _caller,
-        uint8 _configType,
-        bytes calldata _value
-    )
-        external
-    {
-        // Ensure that _configType is within the range of the ConfigType enum
-        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
-
+    /// @dev Tests that the gas paying token cannot be set by a non-system config.
+    function test_setGasPayingToken_notSystemConfig_fails(address _caller) external {
         vm.assume(_caller != address(systemConfig));
         vm.prank(_caller);
         vm.expectRevert(Unauthorized.selector);
-        optimismPortal2.setConfig(Types.ConfigType(_configType), _value);
+        optimismPortal2.setGasPayingToken({ _token: address(0), _decimals: 0, _name: "", _symbol: "" });
     }
 
     /// @dev Tests that `depositERC20Transaction` reverts when the gas paying token is ether.
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
index a8e0344359ed..bc9a980276aa 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
@@ -7,13 +7,12 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 // Libraries
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Types } from "src/libraries/Types.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Target contract dependencies
 import "src/libraries/PortalErrors.sol";
 import { OptimismPortalInterop } from "src/L1/OptimismPortalInterop.sol";
-import { L1BlockInterop } from "src/L2/L1BlockInterop.sol";
+import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Interfaces
 import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
@@ -26,11 +25,31 @@ contract OptimismPortalInterop_Test is CommonTest {
         super.setUp();
     }
 
-    /// @dev Tests that any config type can be set by the system config.
-    function testFuzz_setConfig_succeeds(uint8 _configType, bytes calldata _value) public {
-        // Ensure that _configType is within the range of the ConfigType enum
-        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
+    /// @dev Tests that the config for the gas paying token can be set.
+    function testFuzz_setConfig_gasPayingToken_succeeds(bytes calldata _value) public {
+        vm.expectEmit(address(optimismPortal));
+        emitTransactionDeposited({
+            _from: Constants.DEPOSITOR_ACCOUNT,
+            _to: Predeploys.L1_BLOCK_ATTRIBUTES,
+            _value: 0,
+            _mint: 0,
+            _gasLimit: 200_000,
+            _isCreation: false,
+            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.SET_GAS_PAYING_TOKEN, _value))
+        });
+
+        vm.prank(address(_optimismPortalInterop().systemConfig()));
+        _optimismPortalInterop().setConfig(ConfigType.SET_GAS_PAYING_TOKEN, _value);
+    }
+
+    /// @dev Tests that setting the gas paying token config as not the system config reverts.
+    function testFuzz_setConfig_gasPayingToken_notSystemConfig_reverts(bytes calldata _value) public {
+        vm.expectRevert(Unauthorized.selector);
+        _optimismPortalInterop().setConfig(ConfigType.SET_GAS_PAYING_TOKEN, _value);
+    }
 
+    /// @dev Tests that the config for adding a dependency can be set.
+    function testFuzz_setConfig_addDependency_succeeds(bytes calldata _value) public {
         vm.expectEmit(address(optimismPortal));
         emitTransactionDeposited({
             _from: Constants.DEPOSITOR_ACCOUNT,
@@ -39,28 +58,40 @@ contract OptimismPortalInterop_Test is CommonTest {
             _mint: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(L1BlockInterop.setConfig, (Types.ConfigType(_configType), _value))
+            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.ADD_DEPENDENCY, _value))
         });
 
         vm.prank(address(_optimismPortalInterop().systemConfig()));
-        _optimismPortalInterop().setConfig(Types.ConfigType(_configType), _value);
+        _optimismPortalInterop().setConfig(ConfigType.ADD_DEPENDENCY, _value);
     }
 
-    /// @dev Tests that setting any config type as not the system config reverts.
-    function testFuzz_setConfig_notSystemConfig_reverts(
-        address _caller,
-        uint8 _configType,
-        bytes calldata _value
-    )
-        external
-    {
-        // Ensure that _configType is within the range of the ConfigType enum
-        _configType = uint8(bound(uint256(_configType), 0, uint256(type(Types.ConfigType).max)));
+    /// @dev Tests that setting the add dependency config as not the system config reverts.
+    function testFuzz_setConfig_addDependency_notSystemConfig_reverts(bytes calldata _value) public {
+        vm.expectRevert(Unauthorized.selector);
+        _optimismPortalInterop().setConfig(ConfigType.ADD_DEPENDENCY, _value);
+    }
+
+    /// @dev Tests that the config for removing a dependency can be set.
+    function testFuzz_setConfig_removeDependency_succeeds(bytes calldata _value) public {
+        vm.expectEmit(address(optimismPortal));
+        emitTransactionDeposited({
+            _from: Constants.DEPOSITOR_ACCOUNT,
+            _to: Predeploys.L1_BLOCK_ATTRIBUTES,
+            _value: 0,
+            _mint: 0,
+            _gasLimit: 200_000,
+            _isCreation: false,
+            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.REMOVE_DEPENDENCY, _value))
+        });
+
+        vm.prank(address(_optimismPortalInterop().systemConfig()));
+        _optimismPortalInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, _value);
+    }
 
-        vm.assume(_caller != address(_optimismPortalInterop().systemConfig()));
-        vm.prank(_caller);
+    /// @dev Tests that setting the remove dependency config as not the system config reverts.
+    function testFuzz_setConfig_removeDependency_notSystemConfig_reverts(bytes calldata _value) public {
         vm.expectRevert(Unauthorized.selector);
-        _optimismPortalInterop().setConfig(Types.ConfigType(_configType), _value);
+        _optimismPortalInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, _value);
     }
 
     /// @dev Returns the OptimismPortalInterop instance.
diff --git a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
index b7a76cb664bd..2772ec0c2a3c 100644
--- a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
@@ -13,10 +13,9 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract SuperchainConfig_Init_Test is CommonTest {
     /// @dev Tests that initialization sets the correct values. These are defined in CommonTest.sol.
-    function test_initialize_succeeds() external view {
+    function test_initialize_unpaused_succeeds() external view {
         assertFalse(superchainConfig.paused());
         assertEq(superchainConfig.guardian(), deploy.cfg().superchainConfigGuardian());
-        assertEq(superchainConfig.upgrader(), deploy.cfg().finalSystemOwner());
     }
 
     /// @dev Tests that it can be intialized as paused.
@@ -37,15 +36,11 @@ contract SuperchainConfig_Init_Test is CommonTest {
         vm.startPrank(alice);
         newProxy.upgradeToAndCall(
             address(newImpl),
-            abi.encodeCall(
-                ISuperchainConfig.initialize,
-                (deploy.cfg().superchainConfigGuardian(), deploy.cfg().finalSystemOwner(), true)
-            )
+            abi.encodeCall(ISuperchainConfig.initialize, (deploy.cfg().superchainConfigGuardian(), true))
         );
 
         assertTrue(ISuperchainConfig(address(newProxy)).paused());
         assertEq(ISuperchainConfig(address(newProxy)).guardian(), deploy.cfg().superchainConfigGuardian());
-        assertEq(ISuperchainConfig(address(newProxy)).upgrader(), deploy.cfg().finalSystemOwner());
     }
 }
 
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index f2a605bfcd33..dff0852fb40d 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -3,7 +3,6 @@ pragma solidity 0.8.15;
 
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
-import { VmSafe } from "forge-std/Vm.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
@@ -12,10 +11,6 @@ import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
-import { StaticConfig } from "src/libraries/StaticConfig.sol";
-import { Types } from "src/libraries/Types.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
-import { Bytes } from "src/libraries/Bytes.sol";
 
 // Interfaces
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
@@ -53,18 +48,18 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
     /// @dev Tests that constructor sets the correct values.
     function test_constructor_succeeds() external view {
         ISystemConfig impl = ISystemConfig(systemConfigImpl);
-        assertEq(impl.owner(), address(0));
+        assertEq(impl.owner(), address(0xdEaD));
         assertEq(impl.overhead(), 0);
-        assertEq(impl.scalar(), 0);
+        assertEq(impl.scalar(), uint256(0x01) << 248);
         assertEq(impl.batcherHash(), bytes32(0));
-        assertEq(impl.gasLimit(), 0);
+        assertEq(impl.gasLimit(), 1);
         assertEq(impl.unsafeBlockSigner(), address(0));
         assertEq(impl.basefeeScalar(), 0);
         assertEq(impl.blobbasefeeScalar(), 0);
         IResourceMetering.ResourceConfig memory actual = impl.resourceConfig();
-        assertEq(actual.maxResourceLimit, 0);
-        assertEq(actual.elasticityMultiplier, 0);
-        assertEq(actual.baseFeeMaxChangeDenominator, 0);
+        assertEq(actual.maxResourceLimit, 1);
+        assertEq(actual.elasticityMultiplier, 1);
+        assertEq(actual.baseFeeMaxChangeDenominator, 2);
         assertEq(actual.minimumBaseFee, 0);
         assertEq(actual.systemTxMaxGas, 0);
         assertEq(actual.maximumBaseFee, 0);
@@ -83,7 +78,6 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
         assertEq(decimals, 18);
     }
 
-    // TODO: add a reinit test to ensure calls are made to the Portal.
     /// @dev Tests that initialization sets the correct values.
     function test_initialize_succeeds() external view {
         assertEq(systemConfig.owner(), owner);
@@ -119,54 +113,6 @@ contract SystemConfig_Initialize_Test is SystemConfig_Init {
         assertEq(token, Constants.ETHER);
         assertEq(decimals, 18);
     }
-
-    /// @dev Tests that the gas usage of `initialize` does not exceed the max resource limit.
-    function test_initialize_gasUsage() external {
-        // Wipe out the initialized slot so the proxy can be initialized again
-        vm.store(address(systemConfig), bytes32(0), bytes32(0));
-
-        vm.recordLogs();
-        systemConfig.initialize({
-            _roles: ISystemConfig.Roles({
-                owner: alice,
-                feeAdmin: bob,
-                unsafeBlockSigner: address(1),
-                batcherHash: bytes32(hex"abcd")
-            }),
-            _basefeeScalar: basefeeScalar,
-            _blobbasefeeScalar: blobbasefeeScalar,
-            _gasLimit: gasLimit,
-            _config: Constants.DEFAULT_RESOURCE_CONFIG(),
-            _batchInbox: address(0),
-            _addresses: ISystemConfig.Addresses({
-                l1CrossDomainMessenger: address(0),
-                l1ERC721Bridge: address(0),
-                l1StandardBridge: address(0),
-                disputeGameFactory: address(0),
-                optimismPortal: address(optimismPortal),
-                optimismMintableERC20Factory: address(0),
-                gasPayingToken: Constants.ETHER
-            })
-        });
-
-        VmSafe.Log[] memory logs = vm.getRecordedLogs();
-        uint64 totalGasUsed = 0;
-        for (uint256 i = 0; i < logs.length; i++) {
-            if (logs[i].topics[0] == keccak256("TransactionDeposited(address,address,uint256,bytes)")) {
-                // The first 32 bytes of the Data will give us the offset of the opaqueData,
-                // The next 32 bytes indicate the length of the opaqueData content.
-                // The remaining data is the opaqueData which is tightly packed. There are two
-                // uint256 values before the gasLimit, so we'll start at 4x32 = 128.
-                uint256 start = 128;
-                uint64 gasUsed = uint64(bytes8(Bytes.slice(logs[i].data, start, 8)));
-                // Assert that the expected SYSTEM_DEPOSIT_GAS_LIMIT gas limit is used for the
-                // detected events.
-                assertEq(gasUsed, 200_000);
-                totalGasUsed += gasUsed;
-            }
-        }
-        assertLe(totalGasUsed, Constants.DEFAULT_RESOURCE_CONFIG().maxResourceLimit);
-    }
 }
 
 contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
@@ -182,15 +128,12 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
 
         vm.expectRevert("SystemConfig: gas limit too low");
         systemConfig.initialize({
-            _roles: ISystemConfig.Roles({
-                owner: alice,
-                feeAdmin: bob,
-                unsafeBlockSigner: address(1),
-                batcherHash: bytes32(hex"abcd")
-            }),
+            _owner: alice,
             _basefeeScalar: basefeeScalar,
             _blobbasefeeScalar: blobbasefeeScalar,
+            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: minimumGasLimit - 1,
+            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -198,7 +141,7 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(optimismPortal),
+                optimismPortal: address(0),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: Constants.ETHER
             })
@@ -215,15 +158,12 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
         // Initialize and check that StartBlock updates to current block number
         vm.prank(systemConfig.owner());
         systemConfig.initialize({
-            _roles: ISystemConfig.Roles({
-                owner: alice,
-                feeAdmin: bob,
-                unsafeBlockSigner: address(1),
-                batcherHash: bytes32(hex"abcd")
-            }),
+            _owner: alice,
             _basefeeScalar: basefeeScalar,
             _blobbasefeeScalar: blobbasefeeScalar,
+            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: gasLimit,
+            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -231,7 +171,7 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(optimismPortal),
+                optimismPortal: address(0),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: Constants.ETHER
             })
@@ -249,15 +189,12 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
         // Initialize and check that StartBlock doesn't update
         vm.prank(systemConfig.owner());
         systemConfig.initialize({
-            _roles: ISystemConfig.Roles({
-                owner: alice,
-                feeAdmin: bob,
-                unsafeBlockSigner: address(1),
-                batcherHash: bytes32(hex"abcd")
-            }),
+            _owner: alice,
             _basefeeScalar: basefeeScalar,
             _blobbasefeeScalar: blobbasefeeScalar,
+            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: gasLimit,
+            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -265,7 +202,7 @@ contract SystemConfig_Initialize_TestFail is SystemConfig_Initialize_Test {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(optimismPortal),
+                optimismPortal: address(0),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: Constants.ETHER
             })
@@ -347,15 +284,12 @@ contract SystemConfig_Init_ResourceConfig is SystemConfig_Init {
 
         vm.expectRevert(bytes(revertMessage));
         systemConfig.initialize({
-            _roles: ISystemConfig.Roles({
-                owner: address(0xdEaD),
-                feeAdmin: address(0xdEaD),
-                unsafeBlockSigner: address(1),
-                batcherHash: bytes32(0)
-            }),
+            _owner: address(0xdEaD),
             _basefeeScalar: 0,
             _blobbasefeeScalar: 0,
+            _batcherHash: bytes32(0),
             _gasLimit: gasLimit,
+            _unsafeBlockSigner: address(0),
             _config: config,
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -363,7 +297,7 @@ contract SystemConfig_Init_ResourceConfig is SystemConfig_Init {
                 l1ERC721Bridge: address(0),
                 l1StandardBridge: address(0),
                 disputeGameFactory: address(0),
-                optimismPortal: address(optimismPortal),
+                optimismPortal: address(0),
                 optimismMintableERC20Factory: address(0),
                 gasPayingToken: address(0)
             })
@@ -389,15 +323,12 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
         vm.store(address(systemConfig), GasPayingToken.GAS_PAYING_TOKEN_SYMBOL_SLOT, bytes32(0));
 
         systemConfig.initialize({
-            _roles: ISystemConfig.Roles({
-                owner: alice,
-                feeAdmin: bob,
-                unsafeBlockSigner: address(1),
-                batcherHash: bytes32(hex"abcd")
-            }),
+            _owner: alice,
             _basefeeScalar: 2100,
             _blobbasefeeScalar: 1000000,
+            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: 30_000_000,
+            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
@@ -410,13 +341,6 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
                 gasPayingToken: _gasPayingToken
             })
         });
-
-        vm.roll(block.number + 1);
-        // Reset the OptimismPortal resource config gas used
-        bytes32 slot = vm.load(address(optimismPortal), bytes32(uint256(1)));
-        vm.store(
-            address(optimismPortal), bytes32(uint256(1)), bytes32(uint256(slot) & ~(uint256(type(uint64).max) << 64))
-        );
     }
 
     /// @dev Tests that initialization sets the correct values and getters work.
@@ -527,15 +451,9 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
 
     /// @dev Tests that initialization works with OptimismPortal.
     function test_initialize_customGasTokenCall_succeeds() external {
-        bytes memory data = StaticConfig.encodeSetGasPayingToken({
-            _token: address(token),
-            _decimals: 18,
-            _name: bytes32("Silly"),
-            _symbol: bytes32("SIL")
-        });
-
         vm.expectCall(
-            address(optimismPortal), abi.encodeCall(optimismPortal.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
+            address(optimismPortal),
+            abi.encodeCall(optimismPortal.setGasPayingToken, (address(token), 18, bytes32("Silly"), bytes32("SIL")))
         );
 
         vm.expectEmit(address(optimismPortal));
@@ -548,7 +466,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
                 uint256(0), // value
                 uint64(200_000), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(IL1Block.setConfig, (Types.ConfigType.GAS_PAYING_TOKEN, data))
+                abi.encodeCall(IL1Block.setGasPayingToken, (address(token), 18, bytes32("Silly"), bytes32("SIL")))
             )
         );
 
@@ -609,26 +527,6 @@ contract SystemConfig_Setters_TestFail is SystemConfig_Init {
         systemConfig.setGasLimit(maximumGasLimit + 1);
     }
 
-    /// @dev Tests that `setFeeVaultConfig` reverts if the config type is not a fee vault config.
-    function testFuzz_setFeeVaultConfig_badType_reverts(uint8 _type) external {
-        // Ensure that _type is a valid ConfigType, but not a fee vault type.
-        _type = uint8(bound(uint256(_type), 0, uint256(uint8(type(Types.ConfigType).max))));
-        vm.assume(_type == 0 || _type > 3);
-
-        vm.prank(systemConfig.feeAdmin());
-        vm.expectRevert("SystemConfig: ConfigType is is not a Fee Vault Config type");
-        systemConfig.setFeeVaultConfig(Types.ConfigType(_type), address(0), 0, Types.WithdrawalNetwork.L1);
-    }
-
-    /// @dev Tests that `setFeeVaultConfig` reverts if the caller is not authorized.
-    function testFuzz_setFeeVaultConfig_badAuth_reverts(address _caller) external {
-        vm.assume(_caller != systemConfig.feeAdmin());
-        vm.expectRevert("SystemConfig: caller is not the fee admin");
-
-        vm.prank(_caller);
-        systemConfig.setFeeVaultConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG, _caller, 0, Types.WithdrawalNetwork.L1);
-    }
-
     /// @dev Tests that `setEIP1559Params` reverts if the caller is not the owner.
     function test_setEIP1559Params_notOwner_reverts(uint32 _denominator, uint32 _elasticity) external {
         vm.expectRevert("Ownable: caller is not the owner");
@@ -717,42 +615,6 @@ contract SystemConfig_Setters_Test is SystemConfig_Init {
         assertEq(systemConfig.unsafeBlockSigner(), newUnsafeSigner);
     }
 
-    /// @dev Tests that `setFeeVaultConfig` emits the expected event in the OptimismPortal
-    function testFuzz_setFeeVaultConfig_succeeds(
-        uint8 _vaultConfig,
-        address _recipient,
-        uint256 _min,
-        uint8 _network
-    )
-        external
-    {
-        vm.assume(_min <= type(uint88).max);
-        // Bound the _vaultConfig to one of the 3 enum entries associated with Fee Vault Config.
-        Types.ConfigType feeType = Types.ConfigType(uint8(bound(_vaultConfig, 1, 3)));
-        // Bound the _network to one of the 2 enum entries associated with Withdrawal Network.
-        Types.WithdrawalNetwork withdrawalNetwork = Types.WithdrawalNetwork(uint8(bound(_network, 0, 1)));
-
-        bytes memory value = abi.encode(Encoding.encodeFeeVaultConfig(_recipient, _min, withdrawalNetwork));
-
-        address feeAdmin = systemConfig.feeAdmin();
-        vm.expectEmit(address(optimismPortal2));
-        emit TransactionDeposited(
-            0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001,
-            Predeploys.L1_BLOCK_ATTRIBUTES,
-            0,
-            abi.encodePacked(
-                uint256(0), // mint
-                uint256(0), // value
-                uint64(200_000), // gasLimit
-                false, // isCreation,
-                abi.encodeCall(IL1Block.setConfig, (feeType, value))
-            )
-        );
-
-        vm.prank(feeAdmin);
-        systemConfig.setFeeVaultConfig(feeType, _recipient, _min, withdrawalNetwork);
-    }
-
     /// @dev Tests that `setEIP1559Params` updates the EIP1559 parameters successfully.
     function testFuzz_setEIP1559Params_succeeds(uint32 _denominator, uint32 _elasticity) external {
         vm.assume(_denominator > 1);
@@ -769,5 +631,3 @@ contract SystemConfig_Setters_Test is SystemConfig_Init {
         assertEq(systemConfig.eip1559Elasticity(), _elasticity);
     }
 }
-
-// TODO: GasBenchmarks for initialize
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index f10d175b0d5c..426dba30c72a 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -6,12 +6,12 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Libraries
 import { Constants } from "src/libraries/Constants.sol";
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
@@ -50,7 +50,7 @@ contract SystemConfigInterop_Test is CommonTest {
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
                 (
-                    Types.ConfigType.GAS_PAYING_TOKEN,
+                    ConfigType.SET_GAS_PAYING_TOKEN,
                     StaticConfig.encodeSetGasPayingToken({
                         _token: _token,
                         _decimals: 18,
@@ -70,7 +70,7 @@ contract SystemConfigInterop_Test is CommonTest {
             address(optimismPortal),
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
-                (Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId))
+                (ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId))
             )
         );
 
@@ -92,7 +92,7 @@ contract SystemConfigInterop_Test is CommonTest {
             address(optimismPortal),
             abi.encodeCall(
                 IOptimismPortalInterop.setConfig,
-                (Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId))
+                (ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId))
             )
         );
 
@@ -117,15 +117,12 @@ contract SystemConfigInterop_Test is CommonTest {
         vm.store(address(systemConfig), GasPayingToken.GAS_PAYING_TOKEN_SYMBOL_SLOT, bytes32(0));
 
         systemConfig.initialize({
-            _roles: ISystemConfig.Roles({
-                owner: alice,
-                feeAdmin: bob,
-                unsafeBlockSigner: address(1),
-                batcherHash: bytes32(hex"abcd")
-            }),
+            _owner: alice,
             _basefeeScalar: 2100,
             _blobbasefeeScalar: 1000000,
+            _batcherHash: bytes32(hex"abcd"),
             _gasLimit: 30_000_000,
+            _unsafeBlockSigner: address(1),
             _config: Constants.DEFAULT_RESOURCE_CONFIG(),
             _batchInbox: address(0),
             _addresses: ISystemConfig.Addresses({
diff --git a/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol b/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
index 520adc77c55b..bf63a700c098 100644
--- a/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
@@ -8,7 +8,7 @@ import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Test the implementations of the FeeVault
-contract BaseFeeVault_Test is Bridge_Initializer {
+contract FeeVault_Test is Bridge_Initializer {
     /// @dev Tests that the constructor sets the correct values.
     function test_constructor_baseFeeVault_succeeds() external view {
         assertEq(baseFeeVault.RECIPIENT(), deploy.cfg().baseFeeVaultRecipient());
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
index c317519c5dbd..a80f633fede2 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
@@ -7,6 +7,7 @@ import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
+import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
 
 // Target contract dependencies
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
@@ -38,6 +39,18 @@ contract CrossDomainOwnable2_Test is Bridge_Initializer {
         setter.set(1);
     }
 
+    /// @dev Tests that the `onlyOwner` modifier reverts when not called by the owner.
+    function test_onlyOwner_notOwner_reverts() external {
+        // set the xDomainMsgSender storage slot
+        bytes32 key = bytes32(uint256(204));
+        bytes32 value = Bytes32AddressLib.fillLast12Bytes(address(alice));
+        vm.store(address(l2CrossDomainMessenger), key, value);
+
+        vm.prank(address(l2CrossDomainMessenger));
+        vm.expectRevert("CrossDomainOwnable2: caller is not the owner");
+        setter.set(1);
+    }
+
     /// @dev Tests that the `onlyOwner` modifier causes the relayed message to fail.
     function test_onlyOwner_notOwner2_reverts() external {
         uint240 nonce = 0;
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
index 6c86ccb50b11..968910478198 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
@@ -71,7 +71,7 @@ contract CrossDomainOwnable3_Test is Bridge_Initializer {
         setter.transferOwnership({ _owner: alice, _isLocal: false });
 
         // set the xDomainMsgSender storage slot
-        bytes32 key = bytes32(uint256(208));
+        bytes32 key = bytes32(uint256(204));
         bytes32 value = Bytes32AddressLib.fillLast12Bytes(bob);
         vm.store(address(l2CrossDomainMessenger), key, value);
 
diff --git a/packages/contracts-bedrock/test/L2/FeeVault.t.sol b/packages/contracts-bedrock/test/L2/FeeVault.t.sol
deleted file mode 100644
index bf63a700c098..000000000000
--- a/packages/contracts-bedrock/test/L2/FeeVault.t.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-// Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
-
-// Libraries
-import { Types } from "src/libraries/Types.sol";
-
-// Test the implementations of the FeeVault
-contract FeeVault_Test is Bridge_Initializer {
-    /// @dev Tests that the constructor sets the correct values.
-    function test_constructor_baseFeeVault_succeeds() external view {
-        assertEq(baseFeeVault.RECIPIENT(), deploy.cfg().baseFeeVaultRecipient());
-        assertEq(baseFeeVault.recipient(), deploy.cfg().baseFeeVaultRecipient());
-        assertEq(baseFeeVault.MIN_WITHDRAWAL_AMOUNT(), deploy.cfg().baseFeeVaultMinimumWithdrawalAmount());
-        assertEq(baseFeeVault.minWithdrawalAmount(), deploy.cfg().baseFeeVaultMinimumWithdrawalAmount());
-        assertEq(uint8(baseFeeVault.WITHDRAWAL_NETWORK()), uint8(Types.WithdrawalNetwork.L1));
-        assertEq(uint8(baseFeeVault.withdrawalNetwork()), uint8(Types.WithdrawalNetwork.L1));
-    }
-}
diff --git a/packages/contracts-bedrock/test/L2/L1Block.t.sol b/packages/contracts-bedrock/test/L2/L1Block.t.sol
index 58fc6e08ea4e..762553a2ff2f 100644
--- a/packages/contracts-bedrock/test/L2/L1Block.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1Block.t.sol
@@ -6,11 +6,8 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Encoding } from "src/libraries/Encoding.sol";
-import { Types } from "src/libraries/Types.sol";
-import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import "src/libraries/L1BlockErrors.sol";
-import { LibString } from "lib/solady/src/utils/LibString.sol";
 
 contract L1BlockTest is CommonTest {
     address depositor;
@@ -168,148 +165,6 @@ contract L1BlockEcotone_Test is L1BlockTest {
     }
 }
 
-contract L1BlockIsthmus_Test is L1BlockTest {
-    /// @dev Tests that `setIsthmus` succeeds if sender address is the depositor
-    function test_setIsthmus_isDepositor_succeeds() external {
-        vm.prank(depositor);
-        l1Block.setIsthmus();
-        assertTrue(l1Block.isIsthmus());
-
-        bytes memory baseFeeVaultConfig = l1Block.getConfig(Types.ConfigType.BASE_FEE_VAULT_CONFIG);
-        (address recipient, uint256 min, Types.WithdrawalNetwork network) =
-            Encoding.decodeFeeVaultConfig(bytes32(baseFeeVaultConfig));
-        assertEq(recipient, deploy.cfg().baseFeeVaultRecipient());
-        assertEq(min, deploy.cfg().baseFeeVaultMinimumWithdrawalAmount());
-        assertEq(uint8(network), uint8(deploy.cfg().baseFeeVaultWithdrawalNetwork()));
-
-        bytes memory sequencerFeeVaultConfig = l1Block.getConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG);
-        (recipient, min, network) = Encoding.decodeFeeVaultConfig(bytes32(sequencerFeeVaultConfig));
-        assertEq(recipient, deploy.cfg().sequencerFeeVaultRecipient());
-        assertEq(min, deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount());
-        assertEq(uint8(network), uint8(deploy.cfg().sequencerFeeVaultWithdrawalNetwork()));
-
-        bytes memory l1FeeVaultConfig = l1Block.getConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG);
-        (recipient, min, network) = Encoding.decodeFeeVaultConfig(bytes32(l1FeeVaultConfig));
-        assertEq(recipient, deploy.cfg().l1FeeVaultRecipient());
-        assertEq(min, deploy.cfg().l1FeeVaultMinimumWithdrawalAmount());
-        assertEq(uint8(network), uint8(deploy.cfg().l1FeeVaultWithdrawalNetwork()));
-
-        assertEq(
-            abi.decode(l1Block.getConfig(Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS), (address)),
-            address(l1ERC721Bridge)
-        );
-        assertEq(
-            abi.decode(l1Block.getConfig(Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS), (address)),
-            address(l1CrossDomainMessenger)
-        );
-        assertEq(
-            abi.decode(l1Block.getConfig(Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS), (address)),
-            address(l1StandardBridge)
-        );
-        assertEq(abi.decode(l1Block.getConfig(Types.ConfigType.REMOTE_CHAIN_ID), (uint256)), deploy.cfg().l1ChainID());
-    }
-
-    /// @dev Tests that `setIsthmus` reverts if sender address is not the depositor
-    function test_setIsthmus_notDepositor_reverts() external {
-        vm.expectRevert(NotDepositor.selector);
-        l1Block.setIsthmus();
-    }
-}
-
-contract L1BlockConfig_Test is L1BlockTest {
-    /// @notice Ensures that `setConfig` always reverts when called, across all possible config types.
-    ///         Use a magic number of 10 since solidity doesn't offer a good way to know the nubmer
-    ///         of enum elements.
-    function test_setConfig_onlyDepositor_reverts(address _caller, uint8 _type) external {
-        vm.assume(_caller != Constants.DEPOSITOR_ACCOUNT);
-        vm.assume(_type < 10); // the number of defined config types
-        vm.expectRevert(NotDepositor.selector);
-        vm.prank(_caller);
-        l1Block.setConfig(Types.ConfigType(_type), hex"");
-    }
-
-    function test_getConfigRoundtripGasPayingToken_succeeds(
-        address _token,
-        uint8 _decimals,
-        bytes32 _name,
-        bytes32 _symbol
-    )
-        external
-    {
-        _name = LibString.normalizeSmallString(_name);
-        _symbol = LibString.normalizeSmallString(_symbol);
-        // Both the 0 address and the ether address are prevented from being set by
-        // `_setGasPayingToken` in `SystemConfig.sol`
-        vm.assume(_token != address(0) && _token != Constants.ETHER);
-        vm.prank(Constants.DEPOSITOR_ACCOUNT);
-        l1Block.setConfig(Types.ConfigType.GAS_PAYING_TOKEN, abi.encode(_token, _decimals, _name, _symbol));
-        bytes memory data = l1Block.getConfig(Types.ConfigType.GAS_PAYING_TOKEN);
-        (address token, uint8 decimals, bytes32 name, bytes32 symbol) =
-            abi.decode(data, (address, uint8, bytes32, bytes32));
-        assertEq(token, _token);
-        assertEq(decimals, _decimals);
-
-        assertEq(name, _name);
-        assertEq(symbol, _symbol);
-    }
-
-    /// @notice Tests roundtrip setConfig/getConfig for base fee vault config
-    function test_getConfigRoundtripBaseFeeVault_succeeds(bytes32 _config) external {
-        _getConfigRoundTrip(_config, Types.ConfigType.BASE_FEE_VAULT_CONFIG);
-    }
-
-    /// @notice Tests roundtrip setConfig/getConfig for L1 fee vault config
-    function test_getConfigRoundtripL1FeeVault_succeeds(bytes32 _config) external {
-        _getConfigRoundTrip(_config, Types.ConfigType.L1_FEE_VAULT_CONFIG);
-    }
-
-    /// @notice Tests roundtrip setConfig/getConfig for sequencer fee vault config
-    function test_getConfigRoundtripSequencerFeeVault_succeeds(bytes32 _config) external {
-        _getConfigRoundTrip(_config, Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG);
-    }
-
-    /// @notice Internal function for logic on round trip testing fee vault config
-    function _getConfigRoundTrip(bytes32 _config, Types.ConfigType _type) internal {
-        vm.prank(Constants.DEPOSITOR_ACCOUNT);
-        l1Block.setConfig(_type, abi.encode(_config));
-        bytes memory data = l1Block.getConfig(_type);
-        bytes32 config = abi.decode(data, (bytes32));
-        assertEq(config, _config);
-    }
-
-    function test_getConfigRoundtripL1CrossDomainMessenger_succeeds(address _addr) external {
-        _getConfigRoundTrip(_addr, Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS);
-    }
-
-    function test_getConfigRoundtripL1ERC721Bridge_succeeds(address _addr) external {
-        _getConfigRoundTrip(_addr, Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS);
-    }
-
-    function test_getConfigRoundtripL1StandardBridge_succeeds(address _addr) external {
-        _getConfigRoundTrip(_addr, Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS);
-    }
-
-    function _getConfigRoundTrip(address _addr, Types.ConfigType _type) internal {
-        vm.prank(Constants.DEPOSITOR_ACCOUNT);
-        l1Block.setConfig(_type, abi.encode(_addr));
-        bytes memory data = l1Block.getConfig(_type);
-        address addr = abi.decode(data, (address));
-        assertEq(addr, _addr);
-    }
-
-    function test_getConfigRoundtripRemoteChainId_succeeds(uint256 _value) external {
-        _getConfigRoundTrip(_value, Types.ConfigType.REMOTE_CHAIN_ID);
-    }
-
-    function _getConfigRoundTrip(uint256 _value, Types.ConfigType _type) internal {
-        vm.prank(Constants.DEPOSITOR_ACCOUNT);
-        l1Block.setConfig(_type, abi.encode(_value));
-        bytes memory data = l1Block.getConfig(_type);
-        uint256 value = abi.decode(data, (uint256));
-        assertEq(value, _value);
-    }
-}
-
 contract L1BlockCustomGasToken_Test is L1BlockTest {
     function testFuzz_setGasPayingToken_succeeds(
         address _token,
diff --git a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
index fca80975141c..6f0ef2188b8c 100644
--- a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
@@ -6,10 +6,9 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Target contract dependencies
-import { L1BlockInterop } from "src/L2/L1BlockInterop.sol";
+import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import "src/libraries/L1BlockErrors.sol";
 
@@ -35,7 +34,7 @@ contract L1BlockInteropTest is CommonTest {
     function testFuzz_isInDependencySet_succeeds(uint256 _chainId) public prankDepositor {
         vm.assume(_chainId != block.chainid);
 
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
 
         assertTrue(_l1BlockInterop().isInDependencySet(_chainId));
     }
@@ -71,7 +70,7 @@ contract L1BlockInteropTest is CommonTest {
 
         for (uint256 i = 0; i < _dependencySetSize; i++) {
             if (i == block.chainid) continue;
-            _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
+            _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
             uniqueCount++;
         }
 
@@ -99,7 +98,7 @@ contract L1BlockInteropTest is CommonTest {
         emit GasPayingTokenSet({ token: _token, decimals: _decimals, name: _name, symbol: _symbol });
 
         _l1BlockInterop().setConfig(
-            Types.ConfigType.GAS_PAYING_TOKEN,
+            ConfigType.SET_GAS_PAYING_TOKEN,
             StaticConfig.encodeSetGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol })
         );
     }
@@ -117,7 +116,7 @@ contract L1BlockInteropTest is CommonTest {
 
         vm.expectRevert(NotDepositor.selector);
         _l1BlockInterop().setConfig(
-            Types.ConfigType.GAS_PAYING_TOKEN,
+            ConfigType.SET_GAS_PAYING_TOKEN,
             StaticConfig.encodeSetGasPayingToken({ _token: _token, _decimals: _decimals, _name: _name, _symbol: _symbol })
         );
     }
@@ -129,41 +128,41 @@ contract L1BlockInteropTest is CommonTest {
         vm.expectEmit(address(l1Block));
         emit DependencyAdded(_chainId);
 
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
     }
 
     /// @dev Tests that adding a dependency reverts if it's the chain's chain id
     function test_setConfig_addDependency_chainChainId_reverts() public prankDepositor {
         vm.expectRevert(AlreadyDependency.selector);
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(block.chainid));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(block.chainid));
     }
 
     /// @dev Tests that adding a dependency already in the set reverts
     function test_setConfig_addDependency_alreadyDependency_reverts(uint256 _chainId) public prankDepositor {
         vm.assume(_chainId != block.chainid);
 
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
 
         vm.expectRevert(AlreadyDependency.selector);
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
     }
 
     /// @dev Tests that setting the add dependency config as not the depositor reverts.
     function testFuzz_setConfig_addDependency_notDepositor_reverts(uint256 _chainId) public {
         vm.expectRevert(NotDepositor.selector);
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
     }
 
     /// @dev Tests that setting the add dependency config when the dependency set size is too large reverts.
     function test_setConfig_addDependency_dependencySetSizeTooLarge_reverts() public prankDepositor {
         for (uint256 i = 0; i < type(uint8).max; i++) {
-            _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
+            _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
         }
 
         assertEq(_l1BlockInterop().dependencySetSize(), type(uint8).max);
 
         vm.expectRevert(DependencySetSizeTooLarge.selector);
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(1));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(1));
     }
 
     /// @dev Tests that the config for removing a dependency can be set.
@@ -171,26 +170,24 @@ contract L1BlockInteropTest is CommonTest {
         vm.assume(_chainId != block.chainid);
 
         // Add the chain ID to the dependency set before removing it
-        _l1BlockInterop().setConfig(Types.ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
 
         vm.expectEmit(address(l1Block));
         emit DependencyRemoved(_chainId);
 
-        _l1BlockInterop().setConfig(Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
     }
 
     /// @dev Tests that setting the remove dependency config as not the depositor reverts.
     function testFuzz_setConfig_removeDependency_notDepositor_reverts(uint256 _chainId) public {
         vm.expectRevert(NotDepositor.selector);
-        _l1BlockInterop().setConfig(Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
     }
 
     /// @dev Tests that setting the remove dependency config for the chain's chain ID reverts.
     function test_setConfig_removeDependency_chainChainId_reverts() public prankDepositor {
         vm.expectRevert(CantRemovedDependency.selector);
-        _l1BlockInterop().setConfig(
-            Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(block.chainid)
-        );
+        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(block.chainid));
     }
 
     /// @dev Tests that setting the remove dependency config for a chain ID that is not in the dependency set reverts.
@@ -198,7 +195,7 @@ contract L1BlockInteropTest is CommonTest {
         vm.assume(_chainId != block.chainid);
 
         vm.expectRevert(NotDependency.selector);
-        _l1BlockInterop().setConfig(Types.ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
+        _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
     }
 
     /// @dev Returns the L1BlockInterop instance.
diff --git a/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol b/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
index 825ee77e5c1f..03a3e7e5ad9b 100644
--- a/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
@@ -8,7 +8,7 @@ import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Test the implementations of the FeeVault
-contract L1FeeVault_Test is Bridge_Initializer {
+contract FeeVault_Test is Bridge_Initializer {
     /// @dev Tests that the constructor sets the correct values.
     function test_constructor_l1FeeVault_succeeds() external view {
         assertEq(l1FeeVault.RECIPIENT(), deploy.cfg().l1FeeVaultRecipient());
diff --git a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
index bd6ee0cd28b6..1dc5749d6d54 100644
--- a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
@@ -21,14 +21,12 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     address recipient = address(0xabbaacdc);
 
     /// @dev Tests that the implementation is initialized correctly.
-    ///      The implementation returns the actual address rather than `address(0)`
-    ///      because the contract calls L1Block for the result.
     function test_constructor_succeeds() external view {
         IL2CrossDomainMessenger impl =
             IL2CrossDomainMessenger(EIP1967Helper.getImplementation(deploy.mustGetAddress("L2CrossDomainMessenger")));
-        assertEq(address(impl.OTHER_MESSENGER()), address(l1CrossDomainMessenger));
-        assertEq(address(impl.otherMessenger()), address(l1CrossDomainMessenger));
-        assertEq(address(impl.l1CrossDomainMessenger()), address(l1CrossDomainMessenger));
+        assertEq(address(impl.OTHER_MESSENGER()), address(0));
+        assertEq(address(impl.otherMessenger()), address(0));
+        assertEq(address(impl.l1CrossDomainMessenger()), address(0));
     }
 
     /// @dev Tests that the proxy is initialized correctly.
diff --git a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
index 54993d666a4f..58179cb93207 100644
--- a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
@@ -22,7 +22,7 @@ contract TestERC721 is ERC721 {
 
 contract TestMintableERC721 is OptimismMintableERC721 {
     constructor(
-        IL2ERC721Bridge _bridge,
+        address _bridge,
         address _remoteToken
     )
         OptimismMintableERC721(_bridge, 1, _remoteToken, "Test", "TST")
@@ -61,7 +61,7 @@ contract L2ERC721Bridge_Test is Bridge_Initializer {
         super.setUp();
 
         remoteToken = new TestERC721();
-        localToken = new TestMintableERC721(l2ERC721Bridge, address(remoteToken));
+        localToken = new TestMintableERC721(address(l2ERC721Bridge), address(remoteToken));
 
         // Mint alice a token.
         localToken.mint(alice, tokenId);
diff --git a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
index 827849826836..57b22e628eba 100644
--- a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
@@ -191,7 +191,7 @@ contract L2GenesisTest is Test {
         // 16 prefunded dev accounts are excluded
         assertEq(expected, getJSONKeyCount(_path), "key count check");
 
-        // 2 slots: implementation, admin
-        assertEq(2, getStorageKeysCount(_path, Predeploys.PROXY_ADMIN), "proxy admin storage check");
+        // 3 slots: implementation, owner, admin
+        assertEq(3, getStorageKeysCount(_path, Predeploys.PROXY_ADMIN), "proxy admin storage check");
     }
 }
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
index f4fadb06dd31..d703ec95f64e 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
@@ -28,12 +28,12 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     function test_constructor_succeeds() external view {
         IL2StandardBridge impl =
             IL2StandardBridge(payable(EIP1967Helper.getImplementation(deploy.mustGetAddress("L2StandardBridge"))));
-        // The implementation contract calls out to L1Block to get the otherBridge
+        // The implementation contract is initialized with a 0 L1 bridge address,
         // but the L2 cross-domain-messenger is always set to the predeploy address for both proxy and implementation.
-        assertEq(address(impl.MESSENGER()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor check MESSENGER");
-        assertEq(address(impl.messenger()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor check messenger");
-        assertEq(address(impl.OTHER_BRIDGE()), address(l1StandardBridge), "constructor check OTHER_BRIDGE");
-        assertEq(address(impl.otherBridge()), address(l1StandardBridge), "constructor check otherBridge");
+        assertEq(address(impl.MESSENGER()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor zero check MESSENGER");
+        assertEq(address(impl.messenger()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor zero check messenger");
+        assertEq(address(impl.OTHER_BRIDGE()), address(0), "constructor zero check OTHER_BRIDGE");
+        assertEq(address(impl.otherBridge()), address(0), "constructor zero check otherBridge");
     }
 
     /// @dev Tests that the bridge is initialized correctly.
diff --git a/packages/contracts-bedrock/test/L2/Predeploys.t.sol b/packages/contracts-bedrock/test/L2/Predeploys.t.sol
index 38e8ff74be69..27e3d75b2fdc 100644
--- a/packages/contracts-bedrock/test/L2/Predeploys.t.sol
+++ b/packages/contracts-bedrock/test/L2/Predeploys.t.sol
@@ -21,9 +21,10 @@ contract PredeploysBaseTest is CommonTest {
         return _addr == Predeploys.L1_MESSAGE_SENDER;
     }
 
-    /// @dev No predeploys should ever be initializable.
-    function _isInitializable(address) internal pure returns (bool) {
-        return false;
+    /// @dev Returns true if the predeploy is initializable.
+    function _isInitializable(address _addr) internal pure returns (bool) {
+        return _addr == Predeploys.L2_CROSS_DOMAIN_MESSENGER || _addr == Predeploys.L2_STANDARD_BRIDGE
+            || _addr == Predeploys.L2_ERC721_BRIDGE || _addr == Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY;
     }
 
     /// @dev Returns true if the predeploy uses immutables.
@@ -48,7 +49,7 @@ contract PredeploysBaseTest is CommonTest {
         );
     }
 
-    function _test_predeploys(bool _useInterop) internal view {
+    function _test_predeploys(bool _useInterop) internal {
         uint256 count = 2048;
         uint160 prefix = uint160(0x420) << 148;
 
@@ -103,6 +104,10 @@ contract PredeploysBaseTest is CommonTest {
                 // can't check bytecode if it's modified with immutables in genesis.
                 assertEq(implAddr.code, supposedCode, "proxy implementation contract should match contract source");
             }
+
+            if (_isInitializable(addr)) {
+                assertEq(l2Genesis.loadInitializedSlot(cname), uint8(1));
+            }
         }
     }
 }
@@ -110,7 +115,7 @@ contract PredeploysBaseTest is CommonTest {
 contract PredeploysTest is PredeploysBaseTest {
     /// @dev Tests that the predeploy addresses are set correctly. They have code
     ///      and the proxied accounts have the correct admin.
-    function test_predeploys_succeeds() external view {
+    function test_predeploys_succeeds() external {
         _test_predeploys(false);
     }
 }
@@ -124,7 +129,7 @@ contract PredeploysInteropTest is PredeploysBaseTest {
 
     /// @dev Tests that the predeploy addresses are set correctly. They have code
     ///      and the proxied accounts have the correct admin. Using interop.
-    function test_predeploys_succeeds() external view {
+    function test_predeploys_succeeds() external {
         _test_predeploys(true);
     }
 }
diff --git a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
index 9ba232dcf0b3..ca8c3806b38b 100644
--- a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
@@ -4,29 +4,33 @@ pragma solidity 0.8.15;
 // Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Reverter } from "test/mocks/Callers.sol";
+import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
+
+// Contracts
+import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Types } from "src/libraries/Types.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
-import { Constants } from "src/libraries/Constants.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract SequencerFeeVault_Test is CommonTest {
+    address recipient;
+
+    /// @dev Sets up the test suite.
     function setUp() public override {
         super.setUp();
-        assertEq(uint8(deploy.cfg().sequencerFeeVaultWithdrawalNetwork()), uint8(Types.WithdrawalNetwork.L1));
+        recipient = deploy.cfg().sequencerFeeVaultRecipient();
     }
 
-    /// @dev Tests that the sequencer fee wallet is correct.
+    /// @dev Tests that the l1 fee wallet is correct.
     function test_constructor_succeeds() external view {
-        address recipient = deploy.cfg().sequencerFeeVaultRecipient();
-        uint256 amount = deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount();
         assertEq(sequencerFeeVault.l1FeeWallet(), recipient);
         assertEq(sequencerFeeVault.RECIPIENT(), recipient);
         assertEq(sequencerFeeVault.recipient(), recipient);
-        assertEq(sequencerFeeVault.MIN_WITHDRAWAL_AMOUNT(), amount);
-        assertEq(sequencerFeeVault.minWithdrawalAmount(), amount);
+        assertEq(sequencerFeeVault.MIN_WITHDRAWAL_AMOUNT(), deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount());
+        assertEq(sequencerFeeVault.minWithdrawalAmount(), deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount());
         assertEq(uint8(sequencerFeeVault.WITHDRAWAL_NETWORK()), uint8(Types.WithdrawalNetwork.L1));
         assertEq(uint8(sequencerFeeVault.withdrawalNetwork()), uint8(Types.WithdrawalNetwork.L1));
     }
@@ -59,8 +63,6 @@ contract SequencerFeeVault_Test is CommonTest {
         // No ether has been withdrawn yet
         assertEq(sequencerFeeVault.totalProcessed(), 0);
 
-        address recipient = deploy.cfg().sequencerFeeVaultRecipient();
-
         vm.expectEmit(address(Predeploys.SEQUENCER_FEE_WALLET));
         emit Withdrawal(address(sequencerFeeVault).balance, recipient, address(this));
         vm.expectEmit(address(Predeploys.SEQUENCER_FEE_WALLET));
@@ -100,31 +102,34 @@ contract SequencerFeeVault_Test is CommonTest {
 }
 
 contract SequencerFeeVault_L2Withdrawal_Test is CommonTest {
+    /// @dev a cache for the config fee recipient
+    address recipient;
+
     /// @dev Sets up the test suite.
     function setUp() public override {
         super.setUp();
 
-        // Explicitly use L2 withdrawal network
-        bytes32 sequencerFeeVaultConfig = Encoding.encodeFeeVaultConfig({
-            _recipient: deploy.cfg().sequencerFeeVaultRecipient(),
-            _amount: deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
-            _network: Types.WithdrawalNetwork.L2
-        });
-        vm.prank(Constants.DEPOSITOR_ACCOUNT);
-        l1Block.setConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG, abi.encode(sequencerFeeVaultConfig));
-    }
+        // Alter the deployment to use WithdrawalNetwork.L2
+        vm.etch(
+            EIP1967Helper.getImplementation(Predeploys.SEQUENCER_FEE_WALLET),
+            address(
+                DeployUtils.create1({
+                    _name: "SequencerFeeVault",
+                    _args: DeployUtils.encodeConstructor(
+                        abi.encodeCall(
+                            ISequencerFeeVault.__constructor__,
+                            (
+                                deploy.cfg().sequencerFeeVaultRecipient(),
+                                deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
+                                Types.WithdrawalNetwork.L2
+                            )
+                        )
+                    )
+                })
+            ).code
+        );
 
-    /// @dev Tests that the sequencer fee wallet is correct.
-    function test_constructor_succeeds() external view {
-        address recipient = deploy.cfg().sequencerFeeVaultRecipient();
-        uint256 amount = deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount();
-        assertEq(sequencerFeeVault.l1FeeWallet(), recipient);
-        assertEq(sequencerFeeVault.RECIPIENT(), recipient);
-        assertEq(sequencerFeeVault.recipient(), recipient);
-        assertEq(sequencerFeeVault.MIN_WITHDRAWAL_AMOUNT(), amount);
-        assertEq(sequencerFeeVault.minWithdrawalAmount(), amount);
-        assertEq(uint8(sequencerFeeVault.WITHDRAWAL_NETWORK()), uint8(Types.WithdrawalNetwork.L2));
-        assertEq(uint8(sequencerFeeVault.withdrawalNetwork()), uint8(Types.WithdrawalNetwork.L2));
+        recipient = deploy.cfg().sequencerFeeVaultRecipient();
     }
 
     /// @dev Tests that `withdraw` successfully initiates a withdrawal to L2.
@@ -143,14 +148,14 @@ contract SequencerFeeVault_L2Withdrawal_Test is CommonTest {
         );
 
         // The entire vault's balance is withdrawn
-        vm.expectCall(sequencerFeeVault.RECIPIENT(), address(sequencerFeeVault).balance, bytes(""));
+        vm.expectCall(recipient, address(sequencerFeeVault).balance, bytes(""));
 
         sequencerFeeVault.withdraw();
 
         // The withdrawal was successful
         assertEq(sequencerFeeVault.totalProcessed(), amount);
         assertEq(address(sequencerFeeVault).balance, 0);
-        assertEq(sequencerFeeVault.recipient().balance, amount);
+        assertEq(recipient.balance, amount);
     }
 
     /// @dev Tests that `withdraw` fails if the Recipient reverts. This also serves to simulate
@@ -166,7 +171,7 @@ contract SequencerFeeVault_L2Withdrawal_Test is CommonTest {
         vm.etch(sequencerFeeVault.RECIPIENT(), type(Reverter).runtimeCode);
 
         // The entire vault's balance is withdrawn
-        vm.expectCall(sequencerFeeVault.recipient(), address(sequencerFeeVault).balance, bytes(""));
+        vm.expectCall(recipient, address(sequencerFeeVault).balance, bytes(""));
         vm.expectRevert("FeeVault: failed to send ETH to L2 fee recipient");
         sequencerFeeVault.withdraw();
         assertEq(sequencerFeeVault.totalProcessed(), 0);
diff --git a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
index 31700f3a7529..5b0b300abda0 100644
--- a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
@@ -7,12 +7,6 @@ import { IProxy } from "src/universal/interfaces/IProxy.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
-contract ConfigSetter {
-    function setConfig(uint8, bytes calldata) external {
-        // noop
-    }
-}
-
 contract SystemConfig_GasLimitBoundaries_Invariant is Test {
     ISystemConfig public config;
 
@@ -29,7 +23,6 @@ contract SystemConfig_GasLimitBoundaries_Invariant is Test {
                 _args: DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfig.__constructor__, ()))
             })
         );
-        ConfigSetter setter = new ConfigSetter();
 
         vm.prank(msg.sender);
         proxy.upgradeToAndCall(
@@ -37,15 +30,12 @@ contract SystemConfig_GasLimitBoundaries_Invariant is Test {
             abi.encodeCall(
                 configImpl.initialize,
                 (
-                    ISystemConfig.Roles({
-                        owner: address(0xbeef),
-                        feeAdmin: address(0xbeef),
-                        unsafeBlockSigner: address(1),
-                        batcherHash: bytes32(hex"abcd")
-                    }),
+                    address(0xbeef), // owner
                     2100, // overhead
                     1000000, // scalar
+                    bytes32(hex"abcd"), // batcher hash
                     30_000_000, // gas limit
+                    address(1), // unsafe block signer
                     Constants.DEFAULT_RESOURCE_CONFIG(),
                     address(0), // _batchInbox
                     ISystemConfig.Addresses({ // _addrs
@@ -53,7 +43,7 @@ contract SystemConfig_GasLimitBoundaries_Invariant is Test {
                         l1ERC721Bridge: address(0),
                         l1StandardBridge: address(0),
                         disputeGameFactory: address(0),
-                        optimismPortal: address(setter),
+                        optimismPortal: address(0),
                         optimismMintableERC20Factory: address(0),
                         gasPayingToken: Constants.ETHER
                     })
diff --git a/packages/contracts-bedrock/test/libraries/Encoding.t.sol b/packages/contracts-bedrock/test/libraries/Encoding.t.sol
index 11df7eeae17e..a301fdd97b3a 100644
--- a/packages/contracts-bedrock/test/libraries/Encoding.t.sol
+++ b/packages/contracts-bedrock/test/libraries/Encoding.t.sol
@@ -93,15 +93,4 @@ contract Encoding_Test is CommonTest {
 
         assertEq(txn, _txn);
     }
-
-    // using a bool simulates the 2 enum values that exist
-    function testFuzz_encodeFeeVaultConfig_succeeds(address _recipient, uint88 _amount, bool _network) public pure {
-        Types.WithdrawalNetwork _withdrawalNetwork = _network ? Types.WithdrawalNetwork.L1 : Types.WithdrawalNetwork.L2;
-        bytes32 encoded = Encoding.encodeFeeVaultConfig(_recipient, uint256(_amount), _withdrawalNetwork);
-        (address recipient, uint256 amount, Types.WithdrawalNetwork withdrawalNetwork) =
-            Encoding.decodeFeeVaultConfig(encoded);
-        assertEq(_recipient, recipient, "bad recipient");
-        assertEq(uint256(_amount), amount, "bad amount");
-        assertEq(uint256(withdrawalNetwork), uint256(withdrawalNetwork), "bad network");
-    }
 }
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
index 6f1f59c9fe96..54e0e456def3 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
@@ -35,7 +35,6 @@ contract DeployOPChainInput_Test is Test {
     // Define defaults.
     address opChainProxyAdminOwner = makeAddr("opChainProxyAdminOwner");
     address systemConfigOwner = makeAddr("systemConfigOwner");
-    address systemConfigFeeAdmin = makeAddr("systemConfigFeeAdmin");
     address batcher = makeAddr("batcher");
     address unsafeBlockSigner = makeAddr("unsafeBlockSigner");
     address proposer = makeAddr("proposer");
@@ -53,7 +52,6 @@ contract DeployOPChainInput_Test is Test {
     function test_set_succeeds() public {
         doi.set(doi.opChainProxyAdminOwner.selector, opChainProxyAdminOwner);
         doi.set(doi.systemConfigOwner.selector, systemConfigOwner);
-        doi.set(doi.systemConfigFeeAdmin.selector, systemConfigFeeAdmin);
         doi.set(doi.batcher.selector, batcher);
         doi.set(doi.unsafeBlockSigner.selector, unsafeBlockSigner);
         doi.set(doi.proposer.selector, proposer);
@@ -69,7 +67,6 @@ contract DeployOPChainInput_Test is Test {
         // Compare the default inputs to the getter methods.
         assertEq(opChainProxyAdminOwner, doi.opChainProxyAdminOwner(), "200");
         assertEq(systemConfigOwner, doi.systemConfigOwner(), "300");
-        assertEq(systemConfigFeeAdmin, doi.systemConfigFeeAdmin(), "310");
         assertEq(batcher, doi.batcher(), "400");
         assertEq(unsafeBlockSigner, doi.unsafeBlockSigner(), "500");
         assertEq(proposer, doi.proposer(), "600");
@@ -90,9 +87,6 @@ contract DeployOPChainInput_Test is Test {
         vm.expectRevert(expectedErr);
         doi.systemConfigOwner();
 
-        vm.expectRevert(expectedErr);
-        doi.systemConfigFeeAdmin();
-
         vm.expectRevert(expectedErr);
         doi.batcher();
 
@@ -336,7 +330,6 @@ contract DeployOPChain_TestBase is Test {
     // `opcm` is set during `setUp` since it is an output of the previous step.
     address opChainProxyAdminOwner = makeAddr("defaultOPChainProxyAdminOwner");
     address systemConfigOwner = makeAddr("defaultSystemConfigOwner");
-    address systemConfigFeeAdmin = makeAddr("defaultSystemConfigFeeAdmin");
     address batcher = makeAddr("defaultBatcher");
     address unsafeBlockSigner = makeAddr("defaultUnsafeBlockSigner");
     address proposer = makeAddr("defaultProposer");
@@ -437,14 +430,13 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
     function testFuzz_run_memory_succeed(bytes32 _seed) public {
         opChainProxyAdminOwner = address(uint160(uint256(hash(_seed, 0))));
         systemConfigOwner = address(uint160(uint256(hash(_seed, 1))));
-        systemConfigFeeAdmin = address(uint160(uint256(hash(_seed, 2))));
-        batcher = address(uint160(uint256(hash(_seed, 3))));
-        unsafeBlockSigner = address(uint160(uint256(hash(_seed, 4))));
-        proposer = address(uint160(uint256(hash(_seed, 5))));
-        challenger = address(uint160(uint256(hash(_seed, 6))));
-        basefeeScalar = uint32(uint256(hash(_seed, 7)));
-        blobBaseFeeScalar = uint32(uint256(hash(_seed, 8)));
-        l2ChainId = uint256(hash(_seed, 9));
+        batcher = address(uint160(uint256(hash(_seed, 2))));
+        unsafeBlockSigner = address(uint160(uint256(hash(_seed, 3))));
+        proposer = address(uint160(uint256(hash(_seed, 4))));
+        challenger = address(uint160(uint256(hash(_seed, 5))));
+        basefeeScalar = uint32(uint256(hash(_seed, 6)));
+        blobBaseFeeScalar = uint32(uint256(hash(_seed, 7)));
+        l2ChainId = uint256(hash(_seed, 8));
 
         // Set the initial anchor states. The typical usage we expect is to pass in one root per game type.
         uint256 cannonBlock = uint256(hash(_seed, 9));
@@ -467,7 +459,6 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
 
         doi.set(doi.opChainProxyAdminOwner.selector, opChainProxyAdminOwner);
         doi.set(doi.systemConfigOwner.selector, systemConfigOwner);
-        doi.set(doi.systemConfigFeeAdmin.selector, systemConfigFeeAdmin);
         doi.set(doi.batcher.selector, batcher);
         doi.set(doi.unsafeBlockSigner.selector, unsafeBlockSigner);
         doi.set(doi.proposer.selector, proposer);
@@ -492,7 +483,6 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         // Assert that individual input fields were properly set based on the inputs.
         assertEq(opChainProxyAdminOwner, doi.opChainProxyAdminOwner(), "100");
         assertEq(systemConfigOwner, doi.systemConfigOwner(), "200");
-        assertEq(systemConfigFeeAdmin, doi.systemConfigFeeAdmin(), "210");
         assertEq(batcher, doi.batcher(), "300");
         assertEq(unsafeBlockSigner, doi.unsafeBlockSigner(), "400");
         assertEq(proposer, doi.proposer(), "500");
@@ -512,7 +502,6 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         // Assert inputs were properly passed through to the contract initializers.
         assertEq(address(doo.opChainProxyAdmin().owner()), opChainProxyAdminOwner, "2100");
         assertEq(address(doo.systemConfigProxy().owner()), systemConfigOwner, "2200");
-        assertEq(address(doo.systemConfigProxy().feeAdmin()), systemConfigFeeAdmin, "2210");
         address batcherActual = address(uint160(uint256(doo.systemConfigProxy().batcherHash())));
         assertEq(batcherActual, batcher, "2300");
         assertEq(address(doo.systemConfigProxy().unsafeBlockSigner()), unsafeBlockSigner, "2400");
@@ -563,7 +552,6 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
     function setDOI() internal {
         doi.set(doi.opChainProxyAdminOwner.selector, opChainProxyAdminOwner);
         doi.set(doi.systemConfigOwner.selector, systemConfigOwner);
-        doi.set(doi.systemConfigFeeAdmin.selector, systemConfigFeeAdmin);
         doi.set(doi.batcher.selector, batcher);
         doi.set(doi.unsafeBlockSigner.selector, unsafeBlockSigner);
         doi.set(doi.proposer.selector, proposer);
diff --git a/packages/contracts-bedrock/test/setup/Setup.sol b/packages/contracts-bedrock/test/setup/Setup.sol
index e324aec5f3b5..ef2b654b2410 100644
--- a/packages/contracts-bedrock/test/setup/Setup.sol
+++ b/packages/contracts-bedrock/test/setup/Setup.sol
@@ -15,9 +15,6 @@ import { OutputMode, Fork, ForkUtils } from "scripts/libraries/Config.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
-import { Constants } from "src/libraries/Constants.sol";
-import { Encoding } from "src/libraries/Encoding.sol";
-import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
 import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
@@ -30,7 +27,7 @@ import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityC
 import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IOptimismMintableERC721Factory } from "src/L2/interfaces/IOptimismMintableERC721Factory.sol";
+import { IOptimismMintableERC721Factory } from "src/universal/interfaces/IOptimismMintableERC721Factory.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
@@ -38,8 +35,7 @@ import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMesseng
 import { IL2StandardBridgeInterop } from "src/L2/interfaces/IL2StandardBridgeInterop.sol";
 import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
 import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
-import { IL1OptimismMintableERC20Factory } from "src/L1/interfaces/IL1OptimismMintableERC20Factory.sol";
-import { IL2OptimismMintableERC20Factory } from "src/L2/interfaces/IL2OptimismMintableERC20Factory.sol";
+import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
 import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
 import { IOptimismSuperchainERC20Factory } from "src/L2/interfaces/IOptimismSuperchainERC20Factory.sol";
 import { IBaseFeeVault } from "src/L2/interfaces/IBaseFeeVault.sol";
@@ -87,7 +83,7 @@ contract Setup {
     IL1CrossDomainMessenger l1CrossDomainMessenger;
     IAddressManager addressManager;
     IL1ERC721Bridge l1ERC721Bridge;
-    IL1OptimismMintableERC20Factory l1OptimismMintableERC20Factory;
+    IOptimismMintableERC20Factory l1OptimismMintableERC20Factory;
     IProtocolVersions protocolVersions;
     ISuperchainConfig superchainConfig;
     IDataAvailabilityChallenge dataAvailabilityChallenge;
@@ -97,8 +93,8 @@ contract Setup {
         IL2CrossDomainMessenger(payable(Predeploys.L2_CROSS_DOMAIN_MESSENGER));
     IL2StandardBridgeInterop l2StandardBridge = IL2StandardBridgeInterop(payable(Predeploys.L2_STANDARD_BRIDGE));
     IL2ToL1MessagePasser l2ToL1MessagePasser = IL2ToL1MessagePasser(payable(Predeploys.L2_TO_L1_MESSAGE_PASSER));
-    IL2OptimismMintableERC20Factory l2OptimismMintableERC20Factory =
-        IL2OptimismMintableERC20Factory(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
+    IOptimismMintableERC20Factory l2OptimismMintableERC20Factory =
+        IOptimismMintableERC20Factory(Predeploys.OPTIMISM_MINTABLE_ERC20_FACTORY);
     IL2ERC721Bridge l2ERC721Bridge = IL2ERC721Bridge(Predeploys.L2_ERC721_BRIDGE);
     IOptimismMintableERC721Factory l2OptimismMintableERC721Factory =
         IOptimismMintableERC721Factory(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
@@ -158,7 +154,7 @@ contract Setup {
         addressManager = IAddressManager(deploy.mustGetAddress("AddressManager"));
         l1ERC721Bridge = IL1ERC721Bridge(deploy.mustGetAddress("L1ERC721BridgeProxy"));
         l1OptimismMintableERC20Factory =
-            IL1OptimismMintableERC20Factory(deploy.mustGetAddress("L1OptimismMintableERC20FactoryProxy"));
+            IOptimismMintableERC20Factory(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"));
         protocolVersions = IProtocolVersions(deploy.mustGetAddress("ProtocolVersionsProxy"));
         superchainConfig = ISuperchainConfig(deploy.mustGetAddress("SuperchainConfigProxy"));
         anchorStateRegistry = IAnchorStateRegistry(deploy.mustGetAddress("AnchorStateRegistryProxy"));
@@ -178,8 +174,8 @@ contract Setup {
         vm.label(address(addressManager), "AddressManager");
         vm.label(address(l1ERC721Bridge), "L1ERC721Bridge");
         vm.label(deploy.mustGetAddress("L1ERC721BridgeProxy"), "L1ERC721BridgeProxy");
-        vm.label(address(l1OptimismMintableERC20Factory), "L1OptimismMintableERC20Factory");
-        vm.label(deploy.mustGetAddress("L1OptimismMintableERC20FactoryProxy"), "L1OptimismMintableERC20FactoryProxy");
+        vm.label(address(l1OptimismMintableERC20Factory), "OptimismMintableERC20Factory");
+        vm.label(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"), "OptimismMintableERC20FactoryProxy");
         vm.label(address(protocolVersions), "ProtocolVersions");
         vm.label(deploy.mustGetAddress("ProtocolVersionsProxy"), "ProtocolVersionsProxy");
         vm.label(address(superchainConfig), "SuperchainConfig");
@@ -204,16 +200,15 @@ contract Setup {
     /// @dev Sets up the L2 contracts. Depends on `L1()` being called first.
     function L2() public {
         console.log("Setup: creating L2 genesis with fork %s", l2Fork.toString());
-        l2Genesis.runWithOptions({
-            _mode: OutputMode.NONE,
-            _fork: l2Fork,
-            _populateNetworkConfig: false,
-            _l1Dependencies: L1Dependencies({
+        l2Genesis.runWithOptions(
+            OutputMode.NONE,
+            l2Fork,
+            L1Dependencies({
                 l1CrossDomainMessengerProxy: payable(address(l1CrossDomainMessenger)),
                 l1StandardBridgeProxy: payable(address(l1StandardBridge)),
                 l1ERC721BridgeProxy: payable(address(l1ERC721Bridge))
             })
-        });
+        );
 
         // Set the governance token's owner to be the final system owner
         address finalSystemOwner = deploy.cfg().finalSystemOwner();
@@ -221,46 +216,8 @@ contract Setup {
         governanceToken.transferOwnership(finalSystemOwner);
         vm.stopPrank();
 
-        // These calls by the depositor account simulate the SystemConfig setting the
-        // network specific configuration into L2. Ideally there is a library that automatically
-        // translates TransactionDeposited and ConfigUpdate events into the appropriate calls
-        vm.startPrank(Constants.DEPOSITOR_ACCOUNT);
-        l1Block.setConfig(Types.ConfigType.L1_ERC_721_BRIDGE_ADDRESS, abi.encode(l1ERC721Bridge));
-        l1Block.setConfig(Types.ConfigType.REMOTE_CHAIN_ID, abi.encode(deploy.cfg().l1ChainID()));
-        l1Block.setConfig(Types.ConfigType.L1_CROSS_DOMAIN_MESSENGER_ADDRESS, abi.encode(l1CrossDomainMessenger));
-        l1Block.setConfig(Types.ConfigType.L1_STANDARD_BRIDGE_ADDRESS, abi.encode(l1StandardBridge));
-
-        bytes32 sequencerFeeVaultConfig = Encoding.encodeFeeVaultConfig({
-            _recipient: deploy.cfg().sequencerFeeVaultRecipient(),
-            _amount: deploy.cfg().sequencerFeeVaultMinimumWithdrawalAmount(),
-            _network: Types.WithdrawalNetwork(deploy.cfg().sequencerFeeVaultWithdrawalNetwork())
-        });
-        l1Block.setConfig(Types.ConfigType.SEQUENCER_FEE_VAULT_CONFIG, abi.encode(sequencerFeeVaultConfig));
-
-        bytes32 baseFeeVaultConfig = Encoding.encodeFeeVaultConfig({
-            _recipient: deploy.cfg().baseFeeVaultRecipient(),
-            _amount: deploy.cfg().baseFeeVaultMinimumWithdrawalAmount(),
-            _network: Types.WithdrawalNetwork(deploy.cfg().baseFeeVaultWithdrawalNetwork())
-        });
-        l1Block.setConfig(Types.ConfigType.BASE_FEE_VAULT_CONFIG, abi.encode(baseFeeVaultConfig));
-
-        bytes32 l1FeeVaultConfig = Encoding.encodeFeeVaultConfig({
-            _recipient: deploy.cfg().l1FeeVaultRecipient(),
-            _amount: deploy.cfg().l1FeeVaultMinimumWithdrawalAmount(),
-            _network: Types.WithdrawalNetwork(deploy.cfg().l1FeeVaultWithdrawalNetwork())
-        });
-        l1Block.setConfig(Types.ConfigType.L1_FEE_VAULT_CONFIG, abi.encode(l1FeeVaultConfig));
-        vm.stopPrank();
-
-        // Reset the ResourceConfig gas used to 0
-        bytes32 slot = vm.load(address(optimismPortal), bytes32(uint256(1)));
-        slot = bytes32(uint256(slot) & ~(uint256(type(uint64).max) << 128));
-        vm.store(address(optimismPortal), bytes32(uint256(1)), slot);
-        vm.store(address(optimismPortal2), bytes32(uint256(1)), slot);
-
         // L2 predeploys
         labelPredeploy(Predeploys.L2_STANDARD_BRIDGE);
-        labelPredeploy(Predeploys.OPTIMISM_MINTABLE_ERC721_FACTORY);
         labelPredeploy(Predeploys.L2_CROSS_DOMAIN_MESSENGER);
         labelPredeploy(Predeploys.L2_TO_L1_MESSAGE_PASSER);
         labelPredeploy(Predeploys.SEQUENCER_FEE_WALLET);
@@ -275,7 +232,6 @@ contract Setup {
         labelPredeploy(Predeploys.EAS);
         labelPredeploy(Predeploys.SCHEMA_REGISTRY);
         labelPredeploy(Predeploys.WETH);
-        labelPredeploy(Predeploys.L2_ERC721_BRIDGE);
         labelPredeploy(Predeploys.SUPERCHAIN_WETH);
         labelPredeploy(Predeploys.ETH_LIQUIDITY);
         labelPredeploy(Predeploys.OPTIMISM_SUPERCHAIN_ERC20_FACTORY);
@@ -303,11 +259,7 @@ contract Setup {
     }
 
     function labelPredeploy(address _addr) internal {
-        string memory name = Predeploys.getName(_addr);
-        vm.label(_addr, name);
-        if (!Predeploys.notProxied(_addr)) {
-            vm.label(Predeploys.predeployToCodeNamespace(_addr), string.concat(name, "Implementation"));
-        }
+        vm.label(_addr, Predeploys.getName(_addr));
     }
 
     function labelPreinstall(address _addr) internal {
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
index 6b382eab117f..d146b050f387 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
@@ -12,11 +12,19 @@ import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC2
 
 // Interfaces
 import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
 
 contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
     event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
 
+    /// @notice Tests that the constructor is initialized correctly.
+    function test_constructor_succeeds() external {
+        IOptimismMintableERC20Factory impl = IOptimismMintableERC20Factory(address(new OptimismMintableERC20Factory()));
+        assertEq(address(impl.BRIDGE()), address(0));
+        assertEq(address(impl.bridge()), address(0));
+    }
+
     /// @notice Tests that the proxy is initialized correctly.
     function test_initialize_succeeds() external view {
         assertEq(address(l1OptimismMintableERC20Factory.BRIDGE()), address(l1StandardBridge));
@@ -25,7 +33,7 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
 
     /// @notice Tests that the upgrade is successful.
     function test_upgrading_succeeds() external {
-        IProxy proxy = IProxy(deploy.mustGetAddress("L1OptimismMintableERC20FactoryProxy"));
+        IProxy proxy = IProxy(deploy.mustGetAddress("OptimismMintableERC20FactoryProxy"));
         // Check an unused slot before upgrading.
         bytes32 slot21Before = vm.load(address(l1OptimismMintableERC20Factory), bytes32(uint256(21)));
         assertEq(bytes32(0), slot21Before);
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
index 989699987219..daea00064cf4 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
@@ -23,7 +23,7 @@ contract OptimismMintableERC721_Test is Bridge_Initializer {
 
         // Set up the token pair.
         L1NFT = new ERC721("L1NFT", "L1T");
-        L2NFT = new OptimismMintableERC721(l2ERC721Bridge, 1, address(L1NFT), "L2NFT", "L2T");
+        L2NFT = new OptimismMintableERC721(address(l2ERC721Bridge), 1, address(L1NFT), "L2NFT", "L2T");
 
         // Label the addresses for nice traces.
         vm.label(address(L1NFT), "L1ERC721Token");
@@ -34,10 +34,10 @@ contract OptimismMintableERC721_Test is Bridge_Initializer {
         assertEq(L2NFT.name(), "L2NFT");
         assertEq(L2NFT.symbol(), "L2T");
         assertEq(L2NFT.remoteToken(), address(L1NFT));
-        assertEq(address(L2NFT.bridge()), address(l2ERC721Bridge));
+        assertEq(L2NFT.bridge(), address(l2ERC721Bridge));
         assertEq(L2NFT.remoteChainId(), 1);
         assertEq(L2NFT.REMOTE_TOKEN(), address(L1NFT));
-        assertEq(address(L2NFT.BRIDGE()), address(l2ERC721Bridge));
+        assertEq(L2NFT.BRIDGE(), address(l2ERC721Bridge));
         assertEq(L2NFT.REMOTE_CHAIN_ID(), 1);
     }
 
diff --git a/packages/contracts-bedrock/test/L2/OptimismMintableERC721Factory.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
similarity index 89%
rename from packages/contracts-bedrock/test/L2/OptimismMintableERC721Factory.t.sol
rename to packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
index f5256cb73cbb..ef9019eafa04 100644
--- a/packages/contracts-bedrock/test/L2/OptimismMintableERC721Factory.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
@@ -4,15 +4,16 @@ pragma solidity 0.8.15;
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
+import { OptimismMintableERC721Factory } from "src/universal/OptimismMintableERC721Factory.sol";
 
 contract OptimismMintableERC721Factory_Test is Bridge_Initializer {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     function test_constructor_succeeds() external view {
-        assertEq(address(l2OptimismMintableERC721Factory.BRIDGE()), address(l2ERC721Bridge));
-        assertEq(address(l2OptimismMintableERC721Factory.bridge()), address(l2ERC721Bridge));
+        assertEq(l2OptimismMintableERC721Factory.BRIDGE(), address(l2ERC721Bridge));
+        assertEq(l2OptimismMintableERC721Factory.bridge(), address(l2ERC721Bridge));
         assertEq(l2OptimismMintableERC721Factory.REMOTE_CHAIN_ID(), deploy.cfg().l1ChainID());
-        assertEq(l2OptimismMintableERC721Factory.remoteChainId(), deploy.cfg().l1ChainID());
+        assertEq(l2OptimismMintableERC721Factory.remoteChainID(), deploy.cfg().l1ChainID());
     }
 
     function test_createOptimismMintableERC721_succeeds() external {
@@ -39,7 +40,7 @@ contract OptimismMintableERC721Factory_Test is Bridge_Initializer {
         assertEq(created.name(), "L2Token");
         assertEq(created.symbol(), "L2T");
         assertEq(created.REMOTE_TOKEN(), remote);
-        assertEq(address(created.BRIDGE()), address(l2ERC721Bridge));
+        assertEq(created.BRIDGE(), address(l2ERC721Bridge));
         assertEq(created.REMOTE_CHAIN_ID(), deploy.cfg().l1ChainID());
     }
 
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index ea53608a7a8e..9c22e178a5f4 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -14,6 +14,7 @@ import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 // Interfaces
 import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
+import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
@@ -41,8 +42,7 @@ contract Specification_Test is CommonTest {
         DELAYEDWETHOWNER,
         COUNCILSAFE,
         COUNCILSAFEOWNER,
-        DEPENDENCYMANAGER,
-        FEEADMIN
+        DEPENDENCYMANAGER
     }
 
     /// @notice Represents the specification of a function.
@@ -276,7 +276,7 @@ contract Specification_Test is CommonTest {
             _name: "OptimismPortal",
             _sel: _getSel("depositERC20Transaction(address,uint256,uint256,uint64,bool,bytes)")
         });
-        _addSpec({ _name: "OptimismPortal", _sel: _getSel("setConfig(uint8,bytes)") });
+        _addSpec({ _name: "OptimismPortal", _sel: _getSel("setGasPayingToken(address,uint8,bytes32,bytes32)") });
 
         // OptimismPortalInterop
         _addSpec({
@@ -335,8 +335,12 @@ contract Specification_Test is CommonTest {
             _name: "OptimismPortalInterop",
             _sel: _getSel("depositERC20Transaction(address,uint256,uint256,uint64,bool,bytes)")
         });
-        _addSpec({ _name: "OptimismPortalInterop", _sel: _getSel("upgrade(uint32,bytes)"), _auth: Role.FEEADMIN });
-        _addSpec({ _name: "OptimismPortalInterop", _sel: _getSel("setConfig(uint8,bytes)") });
+        _addSpec({ _name: "OptimismPortalInterop", _sel: _getSel("setGasPayingToken(address,uint8,bytes32,bytes32)") });
+        _addSpec({
+            _name: "OptimismPortalInterop",
+            _sel: IOptimismPortalInterop.setConfig.selector,
+            _auth: Role.SYSTEMCONFIGOWNER
+        });
 
         // OptimismPortal2
         _addSpec({ _name: "OptimismPortal2", _sel: _getSel("depositTransaction(address,uint256,uint64,bool,bytes)") });
@@ -383,27 +387,7 @@ contract Specification_Test is CommonTest {
             _name: "OptimismPortal2",
             _sel: _getSel("depositERC20Transaction(address,uint256,uint256,uint64,bool,bytes)")
         });
-        _addSpec({ _name: "OptimismPortal2", _sel: _getSel("upgrade(uint32,bytes)"), _auth: Role.FEEADMIN });
-        _addSpec({ _name: "OptimismPortal2", _sel: _getSel("setConfig(uint8,bytes)") });
-
-        // L1OptimismMintableERC20Factory
-        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("BRIDGE()") });
-        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("bridge()") });
-        _addSpec({
-            _name: "L1OptimismMintableERC20Factory",
-            _sel: _getSel("createOptimismMintableERC20(address,string,string)")
-        });
-        _addSpec({
-            _name: "L1OptimismMintableERC20Factory",
-            _sel: _getSel("createOptimismMintableERC20WithDecimals(address,string,string,uint8)")
-        });
-        _addSpec({
-            _name: "L1OptimismMintableERC20Factory",
-            _sel: _getSel("createStandardL2Token(address,string,string)")
-        });
-        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("deployments(address)") });
-        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("version()") });
-        _addSpec({ _name: "L1OptimismMintableERC20Factory", _sel: _getSel("initialize(address)") });
+        _addSpec({ _name: "OptimismPortal2", _sel: _getSel("setGasPayingToken(address,uint8,bytes32,bytes32)") });
 
         // ProtocolVersions
         _addSpec({ _name: "ProtocolVersions", _sel: _getSel("RECOMMENDED_SLOT()") });
@@ -434,13 +418,11 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("GUARDIAN_SLOT()") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("PAUSED_SLOT()") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("guardian()") });
-        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("initialize(address,address,bool)") });
+        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("initialize(address,bool)") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("pause(string)"), _auth: Role.GUARDIAN });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("paused()") });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("unpause()"), _auth: Role.GUARDIAN });
         _addSpec({ _name: "SuperchainConfig", _sel: _getSel("version()") });
-        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("UPGRADER_SLOT()") });
-        _addSpec({ _name: "SuperchainConfig", _sel: _getSel("upgrader()") });
 
         // SystemConfig
         _addSpec({ _name: "SystemConfig", _sel: _getSel("UNSAFE_BLOCK_SIGNER_SLOT()") });
@@ -454,7 +436,6 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SystemConfig", _sel: ISystemConfig.minimumGasLimit.selector });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("overhead()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("owner()") });
-        _addSpec({ _name: "SystemConfig", _sel: _getSel("feeAdmin()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("renounceOwnership()"), _auth: Role.SYSTEMCONFIGOWNER });
         _addSpec({ _name: "SystemConfig", _sel: ISystemConfig.resourceConfig.selector });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("scalar()") });
@@ -497,7 +478,6 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SystemConfig", _sel: _getSel("basefeeScalar()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("blobbasefeeScalar()") });
         _addSpec({ _name: "SystemConfig", _sel: _getSel("maximumGasLimit()") });
-        _addSpec({ _name: "SystemConfig", _sel: _getSel("setFeeVaultConfig(uint8,address,uint256,uint8)") });
 
         // SystemConfigInterop
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("UNSAFE_BLOCK_SIGNER_SLOT()") });
@@ -509,15 +489,8 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("eip1559Elasticity()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.initialize.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.minimumGasLimit.selector });
-        _addSpec({
-            _name: "SystemConfigInterop",
-            _sel: _getSel(
-                "initialize((address,address,address,bytes32),uint32,uint32,uint64,(uint32,uint8,uint8,uint32,uint32,uint128),address,(address,address,address,address,address,address,address),address)"
-            )
-        });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("overhead()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("owner()") });
-        _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("feeAdmin()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("renounceOwnership()"), _auth: Role.SYSTEMCONFIGOWNER });
         _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.resourceConfig.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("scalar()") });
@@ -587,7 +560,12 @@ contract Specification_Test is CommonTest {
             _auth: Role.DEPENDENCYMANAGER
         });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("dependencyManager()") });
-        _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("setFeeVaultConfig(uint8,address,uint256,uint8)") });
+        _addSpec({
+            _name: "SystemConfigInterop",
+            _sel: _getSel(
+                "initialize(address,uint32,uint32,bytes32,uint64,address,(uint32,uint8,uint8,uint32,uint32,uint128),address,(address,address,address,address,address,address,address),address)"
+            )
+        });
 
         // ProxyAdmin
         _addSpec({ _name: "ProxyAdmin", _sel: _getSel("addressManager()") });
diff --git a/packages/contracts-bedrock/test/universal/StandardBridge.t.sol b/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
index 22146147f129..be7f8a51107c 100644
--- a/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/universal/StandardBridge.t.sol
@@ -2,12 +2,10 @@
 pragma solidity 0.8.15;
 
 import { StandardBridge } from "src/universal/StandardBridge.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { OptimismMintableERC20, ILegacyMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { Constants } from "src/libraries/Constants.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
 
 /// @title StandardBridgeTester
 /// @notice Simple wrapper around the StandardBridge contract that exposes
@@ -23,14 +21,6 @@ contract StandardBridgeTester is StandardBridge {
         return _isCorrectTokenPair(_mintableToken, _otherToken);
     }
 
-    function otherBridge() public pure override returns (IStandardBridge) {
-        return IStandardBridge(payable(address(0)));
-    }
-
-    function messenger() public pure override returns (ICrossDomainMessenger) {
-        return ICrossDomainMessenger(address(0));
-    }
-
     function gasPayingToken() internal pure override returns (address, uint8) {
         return (Constants.ETHER, 18);
     }
diff --git a/packages/contracts-bedrock/test/vendor/Initializable.t.sol b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
index 331b141bd124..5c17987c471d 100644
--- a/packages/contracts-bedrock/test/vendor/Initializable.t.sol
+++ b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
@@ -28,10 +28,6 @@ import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistr
 ///      deepest contract in the inheritance chain for setting up the system contracts.
 ///      For each L1 contract both the implementation and the proxy are tested.
 contract Initializer_Test is Bridge_Initializer {
-    /// @notice Error used by openzeppelin v5 initializable.
-    ///         The contract is already initialized.
-    error InvalidInitialization();
-
     /// @notice Contains the address of an `Initializable` contract and the calldata
     ///         used to initialize it.
     struct InitializeableContract {
@@ -61,7 +57,7 @@ contract Initializer_Test is Bridge_Initializer {
             InitializeableContract({
                 name: "SuperchainConfig",
                 target: deploy.mustGetAddress("SuperchainConfig"),
-                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), address(0), false))
+                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), false))
             })
         );
         // SuperchainConfigProxy
@@ -69,7 +65,7 @@ contract Initializer_Test is Bridge_Initializer {
             InitializeableContract({
                 name: "SuperchainConfigProxy",
                 target: address(superchainConfig),
-                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), address(0), false))
+                initCalldata: abi.encodeCall(superchainConfig.initialize, (address(0), false))
             })
         );
         // L1CrossDomainMessengerImpl
@@ -180,15 +176,12 @@ contract Initializer_Test is Bridge_Initializer {
                 initCalldata: abi.encodeCall(
                     systemConfig.initialize,
                     (
-                        ISystemConfig.Roles({
-                            owner: address(0xdead),
-                            feeAdmin: address(0xdead),
-                            unsafeBlockSigner: address(0),
-                            batcherHash: bytes32(0)
-                        }),
+                        address(0xdead),
                         0,
                         0,
+                        bytes32(0),
                         1,
+                        address(0),
                         IResourceMetering.ResourceConfig({
                             maxResourceLimit: 1,
                             elasticityMultiplier: 1,
@@ -219,15 +212,12 @@ contract Initializer_Test is Bridge_Initializer {
                 initCalldata: abi.encodeCall(
                     systemConfig.initialize,
                     (
-                        ISystemConfig.Roles({
-                            owner: address(0xdead),
-                            feeAdmin: address(0xdead),
-                            unsafeBlockSigner: address(0),
-                            batcherHash: bytes32(0)
-                        }),
+                        address(0xdead),
                         0,
                         0,
+                        bytes32(0),
                         1,
+                        address(0),
                         IResourceMetering.ResourceConfig({
                             maxResourceLimit: 1,
                             elasticityMultiplier: 1,
@@ -270,6 +260,14 @@ contract Initializer_Test is Bridge_Initializer {
                 )
             })
         );
+        // L2CrossDomainMessenger
+        contracts.push(
+            InitializeableContract({
+                name: "L2CrossDomainMessenger",
+                target: address(l2CrossDomainMessenger),
+                initCalldata: abi.encodeCall(l2CrossDomainMessenger.initialize, (l1CrossDomainMessenger))
+            })
+        );
         // L1StandardBridgeImpl
         contracts.push(
             InitializeableContract({
@@ -290,6 +288,22 @@ contract Initializer_Test is Bridge_Initializer {
                 )
             })
         );
+        // L2StandardBridge
+        contracts.push(
+            InitializeableContract({
+                name: "L2StandardBridge",
+                target: address(l2StandardBridge),
+                initCalldata: abi.encodeCall(l2StandardBridge.initialize, (l1StandardBridge))
+            })
+        );
+        // L2StandardBridgeInterop
+        contracts.push(
+            InitializeableContract({
+                name: "L2StandardBridgeInterop",
+                target: address(l2StandardBridge),
+                initCalldata: abi.encodeCall(l2StandardBridge.initialize, (l1StandardBridge))
+            })
+        );
         // L1ERC721BridgeImpl
         contracts.push(
             InitializeableContract({
@@ -306,18 +320,26 @@ contract Initializer_Test is Bridge_Initializer {
                 initCalldata: abi.encodeCall(l1ERC721Bridge.initialize, (l1CrossDomainMessenger, superchainConfig))
             })
         );
-        // L1OptimismMintableERC20FactoryImpl
+        // L2ERC721Bridge
+        contracts.push(
+            InitializeableContract({
+                name: "L2ERC721Bridge",
+                target: address(l2ERC721Bridge),
+                initCalldata: abi.encodeCall(l2ERC721Bridge.initialize, (payable(address(l1ERC721Bridge))))
+            })
+        );
+        // OptimismMintableERC20FactoryImpl
         contracts.push(
             InitializeableContract({
-                name: "L1OptimismMintableERC20Factory",
+                name: "OptimismMintableERC20Factory",
                 target: deploy.mustGetAddress("OptimismMintableERC20Factory"),
                 initCalldata: abi.encodeCall(l1OptimismMintableERC20Factory.initialize, (address(l1StandardBridge)))
             })
         );
-        // L1OptimismMintableERC20FactoryProxy
+        // OptimismMintableERC20FactoryProxy
         contracts.push(
             InitializeableContract({
-                name: "L1OptimismMintableERC20FactoryProxy",
+                name: "OptimismMintableERC20FactoryProxy",
                 target: address(l1OptimismMintableERC20Factory),
                 initCalldata: abi.encodeCall(l1OptimismMintableERC20Factory.initialize, (address(l1StandardBridge)))
             })
@@ -465,7 +487,7 @@ contract Initializer_Test is Bridge_Initializer {
             // Then, attempt to re-initialize the contract. This should fail.
             (bool success, bytes memory returnData) = _contract.target.call(_contract.initCalldata);
             assertFalse(success);
-            assertErrorString(returnData);
+            assertEq(_extractErrorString(returnData), "Initializable: contract is already initialized");
         }
     }
 
@@ -487,12 +509,10 @@ contract Initializer_Test is Bridge_Initializer {
         real_ = bytes(nicknames[_name]).length > 0 ? nicknames[_name] : _name;
     }
 
-    /// @dev Asserts the expected revert from the returndata
-    function assertErrorString(bytes memory _returnData) internal pure returns (string memory error_) {
-        if (bytes4(_returnData) == InvalidInitialization.selector) {
-            // do nothing as this is the correct 4byte returndata
-        } else if (bytes4(_returnData) == 0x08c379a0) {
-            // The first 4 bytes of the return data should be the selector for `Error(string)`. If not, revert.
+    /// @dev Extracts the revert string from returndata encoded in the form of `Error(string)`.
+    function _extractErrorString(bytes memory _returnData) internal pure returns (string memory error_) {
+        // The first 4 bytes of the return data should be the selector for `Error(string)`. If not, revert.
+        if (bytes4(_returnData) == 0x08c379a0) {
             // Extract the error string from the returndata. The error string is located 68 bytes after
             // the pointer to `returnData`.
             //
@@ -503,7 +523,6 @@ contract Initializer_Test is Bridge_Initializer {
             assembly {
                 error_ := add(_returnData, 0x44)
             }
-            assertEq(error_, "Initializable: contract is already initialized");
         } else {
             revert("Initializer_Test: Invalid returndata format. Expected `Error(string)`");
         }

From 21e1291ae707ce3252682839246df8921a43558e Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 7 Nov 2024 21:27:57 +0100
Subject: [PATCH 152/451] make custom process bash function (#12704)

* make custom process bash function

* rm Executables.sol, fix failing test

* fixes

* fixes...
---
 .../contracts-bedrock/scripts/Artifacts.s.sol |   6 +-
 .../contracts-bedrock/scripts/L2Genesis.s.sol |   6 +-
 .../scripts/autogen/SemverLock.s.sol          |  26 ++-
 .../scripts/deploy/Deploy.s.sol               |  20 +--
 .../scripts/deploy/DeployConfig.s.sol         |  17 +-
 .../scripts/deploy/Deployer.sol               |  13 +-
 .../scripts/libraries/Executables.sol         |  34 ----
 .../scripts/libraries/ForgeArtifacts.sol      | 166 ++++++------------
 .../scripts/libraries/Process.sol             |  19 ++
 .../contracts-bedrock/test/L2/L2Genesis.t.sol |  99 +++++------
 .../test/vendor/Initializable.t.sol           |  16 +-
 11 files changed, 158 insertions(+), 264 deletions(-)
 delete mode 100644 packages/contracts-bedrock/scripts/libraries/Executables.sol

diff --git a/packages/contracts-bedrock/scripts/Artifacts.s.sol b/packages/contracts-bedrock/scripts/Artifacts.s.sol
index 3ed021ea9dbb..87a87f61fb90 100644
--- a/packages/contracts-bedrock/scripts/Artifacts.s.sol
+++ b/packages/contracts-bedrock/scripts/Artifacts.s.sol
@@ -67,11 +67,7 @@ abstract contract Artifacts {
     ///         as well as the JSON files that contain addresses in the `superchain-registry`
     ///         repo. The JSON key is the name of the contract and the value is an address.
     function _loadAddresses(string memory _path) internal {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat("jq -cr < ", _path);
-        string memory json = string(Process.run(commands));
+        string memory json = Process.bash(string.concat("jq -cr < ", _path));
         string[] memory keys = vm.parseJsonKeys(json, "");
         for (uint256 i; i < keys.length; i++) {
             string memory key = keys[i];
diff --git a/packages/contracts-bedrock/scripts/L2Genesis.s.sol b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
index 207c59732146..0f681185a551 100644
--- a/packages/contracts-bedrock/scripts/L2Genesis.s.sol
+++ b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
@@ -642,11 +642,7 @@ contract L2Genesis is Deployer {
 
     /// @notice Sorts the allocs by address
     function sortJsonByKeys(string memory _path) internal {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat("cat <<< $(jq -S '.' ", _path, ") > ", _path);
-        Process.run(commands);
+        Process.bash(string.concat("cat <<< $(jq -S '.' ", _path, ") > ", _path));
     }
 
     /// @notice Funds the default dev accounts with ether
diff --git a/packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol b/packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol
index 1d5aeb963e3d..00b0f1855fb1 100644
--- a/packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol
+++ b/packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol
@@ -9,11 +9,8 @@ import { Process } from "scripts/libraries/Process.sol";
 contract SemverLock is Script {
     function run() public {
         // First, find all contracts with a Semver inheritance.
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = "grep -rl '@custom:semver' src | jq -Rs 'split(\"\\n\") | map(select(length > 0))'";
-        string memory rawFiles = string(Process.run(commands));
+        string memory rawFiles =
+            Process.bash("grep -rl '@custom:semver' src | jq -Rs 'split(\"\\n\") | map(select(length > 0))'");
 
         string[] memory files = vm.parseJsonStringArray(rawFiles, "");
         writeSemverLock(files);
@@ -30,22 +27,21 @@ contract SemverLock is Script {
             string memory fileContents = string(Process.run(commands));
 
             // Grab the contract name
-            commands = new string[](3);
-            commands[0] = "bash";
-            commands[1] = "-c";
-            commands[2] = string.concat("echo \"", _files[i], "\"| sed -E \'s|src/.*/(.+)\\.sol|\\1|\'");
-            string memory contractName = string(Process.run(commands));
+            string memory contractName =
+                Process.bash(string.concat("echo \"", _files[i], "\"| sed -E 's|src/.*/(.+)\\.sol|\\1|'"));
 
-            commands[2] = "forge config --json | jq -r .out";
-            string memory artifactsDir = string(Process.run(commands));
+            string memory artifactsDir = Process.bash("forge config --json | jq -r .out");
 
             // Handle the case where there are multiple artifacts for a contract. This happens
             // when the same contract is compiled with multiple compiler versions.
             string memory contractArtifactDir = string.concat(artifactsDir, "/", contractName, ".sol");
-            commands[2] = string.concat(
-                "ls -1 --color=never ", contractArtifactDir, " | jq -R -s -c 'split(\"\n\") | map(select(length > 0))'"
+            string memory artifactFiles = Process.bash(
+                string.concat(
+                    "ls -1 --color=never ",
+                    contractArtifactDir,
+                    " | jq -R -s -c 'split(\"\n\") | map(select(length > 0))'"
+                )
             );
-            string memory artifactFiles = string(Process.run(commands));
 
             string[] memory files = stdJson.readStringArray(artifactFiles, "");
             require(files.length > 0, string.concat("SemverLock: no artifacts found for ", contractName));
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index d40c03987d53..33e1578ea8bb 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -995,17 +995,13 @@ contract Deploy is Deployer {
     function _loadDevnetStMipsAbsolutePrestate() internal returns (Claim mipsAbsolutePrestate_) {
         // Fetch the absolute prestate dump
         string memory filePath = string.concat(vm.projectRoot(), "/../../op-program/bin/prestate-proof.json");
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat("[[ -f ", filePath, " ]] && echo \"present\"");
-        if (Process.run(commands).length == 0) {
+        if (bytes(Process.bash(string.concat("[[ -f ", filePath, " ]] && echo \"present\""))).length == 0) {
             revert(
                 "Deploy: cannon prestate dump not found, generate it with `make cannon-prestate` in the monorepo root"
             );
         }
-        commands[2] = string.concat("cat ", filePath, " | jq -r .pre");
-        mipsAbsolutePrestate_ = Claim.wrap(abi.decode(Process.run(commands), (bytes32)));
+        mipsAbsolutePrestate_ =
+            Claim.wrap(abi.decode(bytes(Process.bash(string.concat("cat ", filePath, " | jq -r .pre"))), (bytes32)));
         console.log(
             "[Cannon Dispute Game] Using devnet MIPS Absolute prestate: %s",
             vm.toString(Claim.unwrap(mipsAbsolutePrestate_))
@@ -1017,17 +1013,13 @@ contract Deploy is Deployer {
     function _loadDevnetMtMipsAbsolutePrestate() internal returns (Claim mipsAbsolutePrestate_) {
         // Fetch the absolute prestate dump
         string memory filePath = string.concat(vm.projectRoot(), "/../../op-program/bin/prestate-proof-mt.json");
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat("[[ -f ", filePath, " ]] && echo \"present\"");
-        if (Process.run(commands).length == 0) {
+        if (bytes(Process.bash(string.concat("[[ -f ", filePath, " ]] && echo \"present\""))).length == 0) {
             revert(
                 "Deploy: MT-Cannon prestate dump not found, generate it with `make cannon-prestate-mt` in the monorepo root"
             );
         }
-        commands[2] = string.concat("cat ", filePath, " | jq -r .pre");
-        mipsAbsolutePrestate_ = Claim.wrap(abi.decode(Process.run(commands), (bytes32)));
+        mipsAbsolutePrestate_ =
+            Claim.wrap(abi.decode(bytes(Process.bash(string.concat("cat ", filePath, " | jq -r .pre"))), (bytes32)));
         console.log(
             "[MT-Cannon Dispute Game] Using devnet MIPS2 Absolute prestate: %s",
             vm.toString(Claim.unwrap(mipsAbsolutePrestate_))
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
index 69341dd3e874..be5f95ef39ca 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
@@ -4,7 +4,6 @@ pragma solidity 0.8.15;
 import { Script } from "forge-std/Script.sol";
 import { console2 as console } from "forge-std/console2.sol";
 import { stdJson } from "forge-std/StdJson.sol";
-import { Executables } from "scripts/libraries/Executables.sol";
 import { Process } from "scripts/libraries/Process.sol";
 import { Config, Fork, ForkUtils } from "scripts/libraries/Config.sol";
 
@@ -211,12 +210,9 @@ contract DeployConfig is Script {
     function l2OutputOracleStartingTimestamp() public returns (uint256) {
         if (_l2OutputOracleStartingTimestamp < 0) {
             bytes32 tag = l1StartingBlockTag();
-            string[] memory cmd = new string[](3);
-            cmd[0] = Executables.bash;
-            cmd[1] = "-c";
-            cmd[2] = string.concat("cast block ", vm.toString(tag), " --json | ", Executables.jq, " .timestamp");
-            bytes memory res = Process.run(cmd);
-            return stdJson.readUint(string(res), "");
+            string memory cmd = string.concat("cast block ", vm.toString(tag), " --json | jq .timestamp");
+            string memory res = Process.bash(cmd);
+            return stdJson.readUint(res, "");
         }
         return uint256(_l2OutputOracleStartingTimestamp);
     }
@@ -263,11 +259,8 @@ contract DeployConfig is Script {
     }
 
     function _getBlockByTag(string memory _tag) internal returns (bytes32) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat("cast block ", _tag, " --json | ", Executables.jq, " -r .hash");
-        bytes memory res = Process.run(cmd);
+        string memory cmd = string.concat("cast block ", _tag, " --json | jq -r .hash");
+        bytes memory res = bytes(Process.bash(cmd));
         return abi.decode(res, (bytes32));
     }
 
diff --git a/packages/contracts-bedrock/scripts/deploy/Deployer.sol b/packages/contracts-bedrock/scripts/deploy/Deployer.sol
index 36de8dd440fc..fa7454f5ee1d 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deployer.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deployer.sol
@@ -5,8 +5,8 @@ import { Script } from "forge-std/Script.sol";
 import { Artifacts } from "scripts/Artifacts.s.sol";
 import { Config } from "scripts/libraries/Config.sol";
 import { DeployConfig } from "scripts/deploy/DeployConfig.s.sol";
-import { Executables } from "scripts/libraries/Executables.sol";
 import { console } from "forge-std/console.sol";
+import { Process } from "scripts/libraries/Process.sol";
 
 /// @title Deployer
 /// @author tynes
@@ -19,11 +19,20 @@ abstract contract Deployer is Script, Artifacts {
     function setUp() public virtual override {
         Artifacts.setUp();
 
-        console.log("Commit hash: %s", Executables.gitCommitHash());
+        console.log("Commit hash: %s", gitCommitHash());
 
         vm.etch(address(cfg), vm.getDeployedCode("DeployConfig.s.sol:DeployConfig"));
         vm.label(address(cfg), "DeployConfig");
         vm.allowCheatcodes(address(cfg));
         cfg.read(Config.deployConfigPath());
     }
+
+    /// @notice Returns the commit hash of HEAD. If no git repository is
+    /// found, it will return the contents of the .gitcommit file. Otherwise,
+    /// it will return an error. The .gitcommit file is used to store the
+    /// git commit of the contracts when they are packaged into docker images
+    /// in order to avoid the need to have a git repository in the image.
+    function gitCommitHash() internal returns (string memory) {
+        return Process.bash("cast abi-encode 'f(string)' $(git rev-parse HEAD || cat .gitcommit)");
+    }
 }
diff --git a/packages/contracts-bedrock/scripts/libraries/Executables.sol b/packages/contracts-bedrock/scripts/libraries/Executables.sol
deleted file mode 100644
index 0dc91e32072d..000000000000
--- a/packages/contracts-bedrock/scripts/libraries/Executables.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { Vm } from "forge-std/Vm.sol";
-import { Process } from "scripts/libraries/Process.sol";
-
-/// @notice The executables used in ffi commands. These are set here
-///         to have a single source of truth in case absolute paths
-///         need to be used.
-library Executables {
-    /// @notice Foundry cheatcode VM.
-    Vm private constant vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
-    string internal constant bash = "bash";
-    string internal constant jq = "jq";
-    string internal constant forge = "forge";
-    string internal constant echo = "echo";
-    string internal constant sed = "sed";
-    string internal constant find = "find";
-    string internal constant ls = "ls";
-    string internal constant git = "git";
-
-    /// @notice Returns the commit hash of HEAD. If no git repository is
-    /// found, it will return the contents of the .gitcommit file. Otherwise,
-    /// it will return an error. The .gitcommit file is used to store the
-    /// git commit of the contracts when they are packaged into docker images
-    /// in order to avoid the need to have a git repository in the image.
-    function gitCommitHash() internal returns (string memory) {
-        string[] memory commands = new string[](3);
-        commands[0] = bash;
-        commands[1] = "-c";
-        commands[2] = "cast abi-encode 'f(string)' $(git rev-parse HEAD || cat .gitcommit)";
-        return abi.decode(Process.run(commands), (string));
-    }
-}
diff --git a/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol b/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
index 944206694d78..dba01345d05e 100644
--- a/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
+++ b/packages/contracts-bedrock/scripts/libraries/ForgeArtifacts.sol
@@ -4,7 +4,6 @@ pragma solidity ^0.8.0;
 import { Vm } from "forge-std/Vm.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { LibString } from "@solady/utils/LibString.sol";
-import { Executables } from "scripts/libraries/Executables.sol";
 import { Process } from "scripts/libraries/Process.sol";
 
 /// @notice Contains information about a storage slot. Mirrors the layout of the storage
@@ -37,14 +36,7 @@ library ForgeArtifacts {
     /// @notice Removes the semantic versioning from a contract name. The semver will exist if the contract is compiled
     /// more than once with different versions of the compiler.
     function _stripSemver(string memory _name) internal returns (string memory out_) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(
-            Executables.echo, " ", _name, " | ", Executables.sed, " -E 's/[.][0-9]+\\.[0-9]+\\.[0-9]+//g'"
-        );
-        bytes memory res = Process.run(cmd);
-        out_ = string(res);
+        out_ = Process.bash(string.concat("echo ", _name, " | sed -E 's/[.][0-9]+\\.[0-9]+\\.[0-9]+//g'"));
     }
 
     /// @notice Builds the fully qualified name of a contract. Assumes that the
@@ -56,48 +48,33 @@ library ForgeArtifacts {
 
     /// @notice Returns the storage layout for a deployed contract.
     function getStorageLayout(string memory _name) internal returns (string memory layout_) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(Executables.jq, " -r '.storageLayout' < ", _getForgeArtifactPath(_name));
-        bytes memory res = Process.run(cmd);
-        layout_ = string(res);
+        layout_ = Process.bash(string.concat("jq -r '.storageLayout' < ", _getForgeArtifactPath(_name)));
     }
 
     /// @notice Returns the abi from a the forge artifact
     function getAbi(string memory _name) internal returns (string memory abi_) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(Executables.jq, " -r '.abi' < ", _getForgeArtifactPath(_name));
-        bytes memory res = Process.run(cmd);
-        abi_ = string(res);
+        abi_ = Process.bash(string.concat("jq -r '.abi' < ", _getForgeArtifactPath(_name)));
     }
 
     /// @notice Returns the methodIdentifiers from the forge artifact
     function getMethodIdentifiers(string memory _name) internal returns (string[] memory ids_) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(Executables.jq, " '.methodIdentifiers // {} | keys ' < ", _getForgeArtifactPath(_name));
-        bytes memory res = Process.run(cmd, true);
-        ids_ = stdJson.readStringArray(string(res), "");
+        string memory res = Process.bash({
+            _command: string.concat("jq '.methodIdentifiers // {} | keys ' < ", _getForgeArtifactPath(_name)),
+            _allowEmpty: true
+        });
+        ids_ = stdJson.readStringArray(res, "");
     }
 
     /// @notice Returns the kind of contract (i.e. library, contract, or interface).
     /// @param _name The name of the contract to get the kind of.
     /// @return kind_ The kind of contract ("library", "contract", or "interface").
     function getContractKind(string memory _name) internal returns (string memory kind_) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(
-            Executables.jq,
-            " -r '.ast.nodes[] | select(.nodeType == \"ContractDefinition\") | .contractKind' < ",
-            _getForgeArtifactPath(_name)
+        kind_ = Process.bash(
+            string.concat(
+                "jq -r '.ast.nodes[] | select(.nodeType == \"ContractDefinition\") | .contractKind' < ",
+                _getForgeArtifactPath(_name)
+            )
         );
-        bytes memory res = Process.run(cmd);
-        kind_ = string(res);
     }
 
     /// @notice Returns whether or not a contract is proxied.
@@ -109,19 +86,14 @@ library ForgeArtifacts {
         // contract. We should consider determining whether a contract is proxied based on the
         // deployment script since it's the source of truth for that. Current deployment script
         // does not make this easy but an updated script should likely make this possible.
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(
-            Executables.jq,
-            " -r '.rawMetadata' ",
-            _getForgeArtifactPath(_name),
-            " | ",
-            Executables.jq,
-            " -r '.output.devdoc' | jq -r 'has(\"custom:proxied\")'"
+        string memory res = Process.bash(
+            string.concat(
+                "jq -r '.rawMetadata' ",
+                _getForgeArtifactPath(_name),
+                " | jq -r '.output.devdoc' | jq -r 'has(\"custom:proxied\")'"
+            )
         );
-        bytes memory res = Process.run(cmd);
-        out_ = stdJson.readBool(string(res), "");
+        out_ = stdJson.readBool(res, "");
     }
 
     /// @notice Returns whether or not a contract is predeployed.
@@ -130,27 +102,18 @@ library ForgeArtifacts {
     function isPredeployedContract(string memory _name) internal returns (bool out_) {
         // TODO: Similar to the above, using the `@custom:predeployed` tag is not reliable but
         // functional for now. Deployment script should make this easier to determine.
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(
-            Executables.jq,
-            " -r '.rawMetadata' ",
-            _getForgeArtifactPath(_name),
-            " | ",
-            Executables.jq,
-            " -r '.output.devdoc' | jq -r 'has(\"custom:predeploy\")'"
+        string memory res = Process.bash(
+            string.concat(
+                "jq -r '.rawMetadata' ",
+                _getForgeArtifactPath(_name),
+                " | jq -r '.output.devdoc' | jq -r 'has(\"custom:predeploy\")'"
+            )
         );
-        bytes memory res = Process.run(cmd);
-        out_ = stdJson.readBool(string(res), "");
+        out_ = stdJson.readBool(res, "");
     }
 
     function _getForgeArtifactDirectory(string memory _name) internal returns (string memory dir_) {
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(Executables.forge, " config --json | ", Executables.jq, " -r .out");
-        bytes memory res = Process.run(cmd);
+        string memory res = Process.bash("forge config --json | jq -r .out");
         string memory contractName = _stripSemver(_name);
         dir_ = string.concat(vm.projectRoot(), "/", string(res), "/", contractName, ".sol");
     }
@@ -164,19 +127,10 @@ library ForgeArtifacts {
             return path;
         }
 
-        string[] memory cmd = new string[](3);
-        cmd[0] = Executables.bash;
-        cmd[1] = "-c";
-        cmd[2] = string.concat(
-            Executables.ls,
-            " -1 --color=never ",
-            directory,
-            " | ",
-            Executables.jq,
-            " -R -s -c 'split(\"\n\") | map(select(length > 0))'"
+        string memory res = Process.bash(
+            string.concat("ls -1 --color=never ", directory, " | jq -R -s -c 'split(\"\n\") | map(select(length > 0))'")
         );
-        bytes memory res = Process.run(cmd);
-        string[] memory files = stdJson.readStringArray(string(res), "");
+        string[] memory files = stdJson.readStringArray(res, "");
         out_ = string.concat(directory, "/", files[0]);
     }
 
@@ -198,23 +152,19 @@ library ForgeArtifacts {
             slotType = "t_bool";
         }
 
-        string[] memory command = new string[](3);
-        command[0] = Executables.bash;
-        command[1] = "-c";
-        command[2] = string.concat(
-            Executables.echo,
-            " '",
-            storageLayout,
-            "'",
-            " | ",
-            Executables.jq,
-            " '.storage[] | select(.label == \"",
-            slotName,
-            "\" and .type == \"",
-            slotType,
-            "\")'"
+        bytes memory rawSlot = vm.parseJson(
+            Process.bash(
+                string.concat(
+                    "echo '",
+                    storageLayout,
+                    "' | jq '.storage[] | select(.label == \"",
+                    slotName,
+                    "\" and .type == \"",
+                    slotType,
+                    "\")'"
+                )
+            )
         );
-        bytes memory rawSlot = vm.parseJson(string(Process.run(command)));
         slot_ = abi.decode(rawSlot, (StorageSlot));
     }
 
@@ -245,25 +195,19 @@ library ForgeArtifacts {
             }
         }
 
-        string[] memory command = new string[](3);
-        command[0] = Executables.bash;
-        command[1] = "-c";
-        command[2] = string.concat(
-            Executables.find,
-            " ",
-            _path,
-            bytes(pathExcludesPat).length > 0 ? string.concat(" ! \\( ", pathExcludesPat, " \\)") : "",
-            " -type f ",
-            "-exec basename {} \\;",
-            " | ",
-            Executables.sed,
-            " 's/\\.[^.]*$//'",
-            " | ",
-            Executables.jq,
-            " -R -s 'split(\"\n\")[:-1]'"
+        contractNames_ = abi.decode(
+            vm.parseJson(
+                Process.bash(
+                    string.concat(
+                        "find ",
+                        _path,
+                        bytes(pathExcludesPat).length > 0 ? string.concat(" ! \\( ", pathExcludesPat, " \\)") : "",
+                        " -type f -exec basename {} \\; | sed 's/\\.[^.]*$//' | jq -R -s 'split(\"\n\")[:-1]'"
+                    )
+                )
+            ),
+            (string[])
         );
-
-        contractNames_ = abi.decode(vm.parseJson(string(Process.run(command))), (string[]));
     }
 
     /// @notice Returns the function ABIs of all L1 contracts.
diff --git a/packages/contracts-bedrock/scripts/libraries/Process.sol b/packages/contracts-bedrock/scripts/libraries/Process.sol
index d2cf5c3af4aa..7a8c939f11f8 100644
--- a/packages/contracts-bedrock/scripts/libraries/Process.sol
+++ b/packages/contracts-bedrock/scripts/libraries/Process.sol
@@ -10,6 +10,25 @@ library Process {
     /// @notice Foundry cheatcode VM.
     Vm private constant vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
 
+    /// @notice Executes a bash command in a subprocess and returns its output as a string. Will revert if the command
+    /// returns no output.
+    /// @param _command The bash command to execute
+    function bash(string memory _command) internal returns (string memory stdout_) {
+        stdout_ = bash({ _command: _command, _allowEmpty: false });
+    }
+
+    /// @notice Executes a bash command in a subprocess and returns its output as a string. Will 'optionally' revert if
+    /// the command returns no output.
+    /// @param _command The bash command to execute
+    /// @param _allowEmpty Allow empty output.
+    function bash(string memory _command, bool _allowEmpty) internal returns (string memory stdout_) {
+        string[] memory command = new string[](3);
+        command[0] = "bash";
+        command[1] = "-c";
+        command[2] = _command;
+        stdout_ = string(run({ _command: command, _allowEmpty: _allowEmpty }));
+    }
+
     /// @notice Run a command in a subprocess. Fails if no output is returned.
     /// @param _command Command to run.
     function run(string[] memory _command) internal returns (bytes memory stdout_) {
diff --git a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
index 57b22e628eba..6d9884bd677a 100644
--- a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
@@ -22,32 +22,21 @@ contract L2GenesisTest is Test {
 
     /// @notice Creates a temp file and returns the path to it.
     function tmpfile() internal returns (string memory) {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = "mktemp";
-        bytes memory result = Process.run(commands);
-        return string(result);
+        return Process.bash("mktemp");
     }
 
     /// @notice Deletes a file at a given filesystem path. Does not force delete
     ///         and does not recursively delete.
     function deleteFile(string memory path) internal {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat("rm ", path);
-        Process.run({ _command: commands, _allowEmpty: true });
+        Process.bash(string.concat("rm ", path), true);
     }
 
     /// @notice Returns the number of top level keys in a JSON object at a given
     ///         file path.
     function getJSONKeyCount(string memory path) internal returns (uint256) {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat("jq 'keys | length' < ", path, " | xargs cast abi-encode 'f(uint256)'");
-        return abi.decode(Process.run(commands), (uint256));
+        bytes memory result =
+            bytes(Process.bash(string.concat("jq 'keys | length' < ", path, " | xargs cast abi-encode 'f(uint256)'")));
+        return abi.decode(result, (uint256));
     }
 
     /// @notice Helper function to run a function with a temporary dump file.
@@ -59,43 +48,44 @@ contract L2GenesisTest is Test {
 
     /// @notice Helper function for reading the number of storage keys for a given account.
     function getStorageKeysCount(string memory _path, address _addr) internal returns (uint256) {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] =
-            string.concat("jq -r '.[\"", vm.toLowercase(vm.toString(_addr)), "\"].storage | length' < ", _path);
-        return vm.parseUint(string(Process.run(commands)));
+        return vm.parseUint(
+            Process.bash(
+                string.concat("jq -r '.[\"", vm.toLowercase(vm.toString(_addr)), "\"].storage | length' < ", _path)
+            )
+        );
     }
 
     /// @notice Returns the number of accounts that contain particular code at a given path to a genesis file.
     function getCodeCount(string memory path, string memory name) internal returns (uint256) {
         bytes memory code = vm.getDeployedCode(name);
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat(
-            "jq -r 'map_values(select(.code == \"",
-            vm.toString(code),
-            "\")) | length' < ",
-            path,
-            " | xargs cast abi-encode 'f(uint256)'"
+        bytes memory result = bytes(
+            Process.bash(
+                string.concat(
+                    "jq -r 'map_values(select(.code == \"",
+                    vm.toString(code),
+                    "\")) | length' < ",
+                    path,
+                    " | xargs cast abi-encode 'f(uint256)'"
+                )
+            )
         );
-        return abi.decode(Process.run(commands), (uint256));
+        return abi.decode(result, (uint256));
     }
 
     /// @notice Returns the number of accounts that have a particular slot set.
     function getPredeployCountWithSlotSet(string memory path, bytes32 slot) internal returns (uint256) {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat(
-            "jq 'map_values(.storage | select(has(\"",
-            vm.toString(slot),
-            "\"))) | keys | length' < ",
-            path,
-            " | xargs cast abi-encode 'f(uint256)'"
+        bytes memory result = bytes(
+            Process.bash(
+                string.concat(
+                    "jq 'map_values(.storage | select(has(\"",
+                    vm.toString(slot),
+                    "\"))) | keys | length' < ",
+                    path,
+                    " | xargs cast abi-encode 'f(uint256)'"
+                )
+            )
         );
-        return abi.decode(Process.run(commands), (uint256));
+        return abi.decode(result, (uint256));
     }
 
     /// @notice Returns the number of accounts that have a particular slot set to a particular value.
@@ -107,19 +97,20 @@ contract L2GenesisTest is Test {
         internal
         returns (uint256)
     {
-        string[] memory commands = new string[](3);
-        commands[0] = "bash";
-        commands[1] = "-c";
-        commands[2] = string.concat(
-            "jq 'map_values(.storage | select(.\"",
-            vm.toString(slot),
-            "\" == \"",
-            vm.toString(value),
-            "\")) | length' < ",
-            path,
-            " | xargs cast abi-encode 'f(uint256)'"
+        bytes memory result = bytes(
+            Process.bash(
+                string.concat(
+                    "jq 'map_values(.storage | select(.\"",
+                    vm.toString(slot),
+                    "\" == \"",
+                    vm.toString(value),
+                    "\")) | length' < ",
+                    path,
+                    " | xargs cast abi-encode 'f(uint256)'"
+                )
+            )
         );
-        return abi.decode(Process.run(commands), (uint256));
+        return abi.decode(result, (uint256));
     }
 
     /// @notice Tests the genesis predeploys setup using a temp file for the case where useInterop is false.
diff --git a/packages/contracts-bedrock/test/vendor/Initializable.t.sol b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
index 5c17987c471d..9d60ab71e7c8 100644
--- a/packages/contracts-bedrock/test/vendor/Initializable.t.sol
+++ b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
@@ -5,7 +5,6 @@ pragma solidity 0.8.15;
 import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 
 // Scripts
-import { Executables } from "scripts/libraries/Executables.sol";
 import { ForgeArtifacts } from "scripts/libraries/ForgeArtifacts.sol";
 import { Process } from "scripts/libraries/Process.sol";
 
@@ -432,21 +431,14 @@ contract Initializer_Test is Bridge_Initializer {
             }
 
             // Construct the query for the initialize function in the contract's ABI.
-            string[] memory command = new string[](3);
-            command[0] = Executables.bash;
-            command[1] = "-c";
-            command[2] = string.concat(
-                Executables.echo,
-                " '",
+            string memory cmd = string.concat(
+                "echo '",
                 ForgeArtifacts.getAbi(contractName),
-                "'",
-                " | ",
-                Executables.jq,
-                " '.[] | select(.name == \"initialize\" and .type == \"function\")'"
+                "' | jq '.[] | select(.name == \"initialize\" and .type == \"function\")'"
             );
 
             // If the contract does not have an `initialize()` function, skip it.
-            if (Process.run(command).length == 0) {
+            if (bytes(Process.bash(cmd)).length == 0) {
                 continue;
             }
 

From cdc52a14126ac93882a31acbe090a93c490f3716 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 7 Nov 2024 21:29:31 +0100
Subject: [PATCH 153/451] add createX runtime bytecode hash check (#12776)

---
 packages/contracts-bedrock/test/L2/Preinstalls.t.sol | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
index ad14e5ea32fb..be0d01181e81 100644
--- a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
+++ b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
@@ -118,4 +118,15 @@ contract PreinstallsTest is CommonTest {
     function test_preinstall_createX_succeeds() external view {
         assertPreinstall(Preinstalls.CreateX, Preinstalls.CreateXCode);
     }
+
+    function test_createX_runtimeBytecodeHash() external view {
+        bytes memory createXRuntimeBytecode = Preinstalls.CreateX.code;
+        bytes32 createXRuntimeBytecodeHash = keccak256(createXRuntimeBytecode);
+
+        assertEq(
+            createXRuntimeBytecodeHash,
+            0xbd8a7ea8cfca7b4e5f5041d7d4b17bc317c5ce42cfbc42066a00cf26b43eb53f,
+            "CreateX runtime bytecode hash mismatch"
+        );
+    }
 }

From ed6a629026432c4c46bb8194d36c9d5cf6668474 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 7 Nov 2024 21:31:17 +0100
Subject: [PATCH 154/451] move slither related files to test/slither (#12788)

---
 packages/contracts-bedrock/{ => test/slither}/slither.config.json | 0
 packages/contracts-bedrock/{ => test/slither}/slither.db.json     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/contracts-bedrock/{ => test/slither}/slither.config.json (100%)
 rename packages/contracts-bedrock/{ => test/slither}/slither.db.json (100%)

diff --git a/packages/contracts-bedrock/slither.config.json b/packages/contracts-bedrock/test/slither/slither.config.json
similarity index 100%
rename from packages/contracts-bedrock/slither.config.json
rename to packages/contracts-bedrock/test/slither/slither.config.json
diff --git a/packages/contracts-bedrock/slither.db.json b/packages/contracts-bedrock/test/slither/slither.db.json
similarity index 100%
rename from packages/contracts-bedrock/slither.db.json
rename to packages/contracts-bedrock/test/slither/slither.db.json

From 04d79720d895780b60c953efad147ae0d1fafc6b Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 7 Nov 2024 21:32:42 +0100
Subject: [PATCH 155/451] apply exclude in test name checks and add it to ci
 and just check (#12805)

* apply exclude in test name checks and add it to ci and just check

* rename names/ to test-names/

* add and use no build test names check command

* apply test name checks to half of excludes test files

* apply test name checks to last half of excludes test files
---
 .circleci/config.yml                          |  2 +
 packages/contracts-bedrock/justfile           | 10 +++-
 .../checks/{names => test-names}/main.go      |  6 ++
 .../test/L1/DataAvailabilityChallenge.t.sol   | 60 +++++++++++--------
 .../test/L1/DelayedVetoable.t.sol             |  2 +-
 .../test/L1/L1CrossDomainMessenger.t.sol      |  8 +--
 .../test/L1/OptimismPortal.t.sol              | 12 ++--
 .../test/L1/OptimismPortal2.t.sol             | 20 +++----
 .../test/L1/OptimismPortalInterop.t.sol       |  6 +-
 .../test/L1/SystemConfig.t.sol                | 10 ++--
 .../test/L2/CrossL2Inbox.t.sol                |  4 +-
 .../test/L2/L1BlockInterop.t.sol              | 18 +++---
 .../test/L2/L2CrossDomainMessenger.t.sol      |  8 +--
 .../contracts-bedrock/test/L2/L2Genesis.t.sol |  6 +-
 .../test/L2/OptimismSuperchainERC20.t.sol     |  4 +-
 .../L2/OptimismSuperchainERC20Beacon.t.sol    |  2 +-
 .../test/L2/Predeploys.t.sol                  |  2 +-
 .../test/L2/Preinstalls.t.sol                 |  4 +-
 .../test/L2/SuperchainWETH.t.sol              |  8 +--
 .../contracts-bedrock/test/cannon/MIPS.t.sol  |  8 +--
 .../contracts-bedrock/test/cannon/MIPS2.t.sol | 14 ++---
 .../test/cannon/MIPS64Memory.t.sol            |  6 +-
 .../test/cannon/PreimageOracle.t.sol          |  2 +-
 .../test/libraries/Blueprint.t.sol            |  6 +-
 .../test/libraries/TransientContext.t.sol     |  4 +-
 .../test/opcm/DeployAuthSystem.t.sol          |  6 +-
 .../test/opcm/DeployImplementations.t.sol     |  8 +--
 .../test/opcm/DeployOPChain.t.sol             |  8 +--
 .../test/opcm/DeploySuperchain.t.sol          |  6 +-
 .../test/safe/DeployOwnership.t.sol           |  6 +-
 .../test/safe/LivenessGuard.t.sol             |  6 +-
 .../test/safe/LivenessModule.t.sol            |  2 +-
 .../test/setup/DeployVariations.t.sol         |  4 +-
 .../universal/OptimismMintableERC20.t.sol     |  4 +-
 .../test/universal/Specs.t.sol                |  4 +-
 35 files changed, 155 insertions(+), 131 deletions(-)
 rename packages/contracts-bedrock/scripts/checks/{names => test-names}/main.go (96%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 030c15ae6367..9fbed7bde44d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -706,6 +706,8 @@ jobs:
           command: size-check
       - run-contracts-check:
           command: unused-imports-check-no-build
+      - run-contracts-check:
+          command: lint-forge-tests-check-no-build
 
   contracts-bedrock-validate-spacers:
     docker:
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 41cfd24bb2d6..9be9bc4e09ea 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -165,9 +165,12 @@ semver-diff-check: build semver-diff-check-no-build
 semgrep-test-validity-check:
   forge fmt ../../.semgrep/tests/sol-rules.t.sol --check
 
+# Checks that forge test names are correctly formatted. Does not build contracts.
+lint-forge-tests-check-no-build:
+  go run ./scripts/checks/test-names
+
 # Checks that forge test names are correctly formatted.
-lint-forge-tests-check:
-  go run ./scripts/checks/names
+lint-forge-tests-check: build lint-forge-tests-check-no-build
 
 # Checks that contracts are properly linted.
 lint-check:
@@ -216,7 +219,8 @@ check:
   semver-diff-check-no-build \
   validate-deploy-configs \
   validate-spacers-no-build \
-  interfaces-check-no-build
+  interfaces-check-no-build \
+  lint-forge-tests-check-no-build
 
 ########################################################
 #                      DEV TOOLS                       #
diff --git a/packages/contracts-bedrock/scripts/checks/names/main.go b/packages/contracts-bedrock/scripts/checks/test-names/main.go
similarity index 96%
rename from packages/contracts-bedrock/scripts/checks/names/main.go
rename to packages/contracts-bedrock/scripts/checks/test-names/main.go
index 1a0be03f33f2..86550f211cba 100644
--- a/packages/contracts-bedrock/scripts/checks/names/main.go
+++ b/packages/contracts-bedrock/scripts/checks/test-names/main.go
@@ -18,6 +18,8 @@ type CheckInfo struct {
 	error string
 }
 
+var excludes = map[string]bool{}
+
 var checks = []CheckInfo{
 	{
 		error: "test name parts should be in camelCase",
@@ -97,6 +99,10 @@ func main() {
 			return nil
 		}
 
+		if excludes[strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))] {
+			return nil
+		}
+
 		data, err := os.ReadFile(path)
 		if err != nil {
 			return err
diff --git a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
index dd14b349c68a..ddbacec67c3e 100644
--- a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
+++ b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
@@ -17,20 +17,20 @@ contract DataAvailabilityChallengeTest is CommonTest {
         super.setUp();
     }
 
-    function testDeposit() public {
+    function test_deposit_succeeds() public {
         assertEq(dataAvailabilityChallenge.balances(address(this)), 0);
         dataAvailabilityChallenge.deposit{ value: 1000 }();
         assertEq(dataAvailabilityChallenge.balances(address(this)), 1000);
     }
 
-    function testReceive() public {
+    function test_receive_succeeds() public {
         assertEq(dataAvailabilityChallenge.balances(address(this)), 0);
         (bool success,) = payable(address(dataAvailabilityChallenge)).call{ value: 1000 }("");
         assertTrue(success);
         assertEq(dataAvailabilityChallenge.balances(address(this)), 1000);
     }
 
-    function testWithdraw(address sender, uint256 amount) public {
+    function test_withdraw_succeeds(address sender, uint256 amount) public {
         assumePayable(sender);
         assumeNotPrecompile(sender);
         // EntryPoint will revert if using amount > type(uint112).max.
@@ -52,7 +52,13 @@ contract DataAvailabilityChallengeTest is CommonTest {
         assertEq(sender.balance, amount);
     }
 
-    function testChallengeSuccess(address challenger, uint256 challengedBlockNumber, bytes calldata preImage) public {
+    function test_challenge_succeeds(
+        address challenger,
+        uint256 challengedBlockNumber,
+        bytes calldata preImage
+    )
+        public
+    {
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
 
         // Assume the challenger is not the 0 address
@@ -99,7 +105,13 @@ contract DataAvailabilityChallengeTest is CommonTest {
         assertEq(dataAvailabilityChallenge.balances(challenger), 0);
     }
 
-    function testChallengeDeposit(address challenger, uint256 challengedBlockNumber, bytes memory preImage) public {
+    function test_challenge_deposit_succeeds(
+        address challenger,
+        uint256 challengedBlockNumber,
+        bytes memory preImage
+    )
+        public
+    {
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
 
         // Assume the challenger is not the 0 address
@@ -142,7 +154,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         assertEq(dataAvailabilityChallenge.balances(challenger), 0);
     }
 
-    function testChallengeFailBondTooLow() public {
+    function test_challenge_bondTooLow_reverts() public {
         uint256 requiredBond = dataAvailabilityChallenge.bondSize();
         uint256 actualBond = requiredBond - 1;
         dataAvailabilityChallenge.deposit{ value: actualBond }();
@@ -153,7 +165,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.challenge(0, computeCommitmentKeccak256("some hash"));
     }
 
-    function testChallengeFailChallengeExists() public {
+    function test_challenge_challengeExists_reverts() public {
         // Move to a block after the hash to challenge
         vm.roll(2);
 
@@ -176,7 +188,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.challenge(0, computeCommitmentKeccak256("some other hash"));
     }
 
-    function testChallengeFailBeforeChallengeWindow() public {
+    function test_challenge_beforeChallengeWindow_reverts() public {
         uint256 challengedBlockNumber = 1;
         bytes memory challengedCommitment = computeCommitmentKeccak256("some hash");
 
@@ -189,7 +201,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.challenge(challengedBlockNumber, challengedCommitment);
     }
 
-    function testChallengeFailAfterChallengeWindow() public {
+    function test_challenge_afterChallengeWindow_reverts() public {
         uint256 challengedBlockNumber = 1;
         bytes memory challengedCommitment = computeCommitmentKeccak256("some hash");
 
@@ -202,7 +214,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.challenge(challengedBlockNumber, challengedCommitment);
     }
 
-    function testResolveSuccess(
+    function test_resolve_succeeds(
         address challenger,
         address resolver,
         bytes memory preImage,
@@ -283,7 +295,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         assertEq(address(0).balance - zeroAddressBalanceBeforeResolve, burned, "burned bond");
     }
 
-    function testResolveFailNonExistentChallenge() public {
+    function test_resolve_nonExistentChallenge_reverts() public {
         bytes memory preImage = "some preimage";
         uint256 challengedBlockNumber = 1;
 
@@ -295,7 +307,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.resolve(challengedBlockNumber, computeCommitmentKeccak256(preImage), preImage);
     }
 
-    function testResolveFailResolved() public {
+    function test_resolve_resolved_reverts() public {
         bytes memory preImage = "some preimage";
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
         uint256 challengedBlockNumber = 1;
@@ -315,7 +327,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.resolve(challengedBlockNumber, challengedCommitment, preImage);
     }
 
-    function testResolveFailExpired() public {
+    function test_resolve_expired_reverts() public {
         bytes memory preImage = "some preimage";
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
         uint256 challengedBlockNumber = 1;
@@ -335,7 +347,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.resolve(challengedBlockNumber, challengedCommitment, preImage);
     }
 
-    function testResolveFailAfterResolveWindow() public {
+    function test_resolve_afterResolveWindow_reverts() public {
         bytes memory preImage = "some preimage";
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
         uint256 challengedBlockNumber = 1;
@@ -355,7 +367,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.resolve(challengedBlockNumber, challengedCommitment, preImage);
     }
 
-    function testUnlockBondSuccess(bytes memory preImage, uint256 challengedBlockNumber) public {
+    function test_unlockBond_succeeds(bytes memory preImage, uint256 challengedBlockNumber) public {
         // Assume the block number is not close to the max uint256 value
         vm.assume(
             challengedBlockNumber
@@ -400,7 +412,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         assertEq(dataAvailabilityChallenge.balances(address(this)), balanceAfterUnlock);
     }
 
-    function testUnlockBondFailNonExistentChallenge() public {
+    function test_unlockBond_nonExistentChallenge_reverts() public {
         bytes memory preImage = "some preimage";
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
         uint256 challengedBlockNumber = 1;
@@ -413,7 +425,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.unlockBond(challengedBlockNumber, challengedCommitment);
     }
 
-    function testUnlockBondFailResolvedChallenge() public {
+    function test_unlockBond_resolvedChallenge_reverts() public {
         bytes memory preImage = "some preimage";
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
         uint256 challengedBlockNumber = 1;
@@ -433,7 +445,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.unlockBond(challengedBlockNumber, challengedCommitment);
     }
 
-    function testUnlockBondExpiredChallengeTwice() public {
+    function test_unlockBond_expiredChallengeTwice_fails() public {
         bytes memory preImage = "some preimage";
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
         uint256 challengedBlockNumber = 1;
@@ -458,7 +470,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         assertEq(dataAvailabilityChallenge.balances(address(this)), balanceAfterUnlock);
     }
 
-    function testUnlockFailResolveWindowNotClosed() public {
+    function test_unlockBond_resolveWindowNotClosed_reverts() public {
         bytes memory preImage = "some preimage";
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
         uint256 challengedBlockNumber = 1;
@@ -477,7 +489,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.unlockBond(challengedBlockNumber, challengedCommitment);
     }
 
-    function testSetBondSize() public {
+    function test_setBondSize_succeeds() public {
         uint256 requiredBond = dataAvailabilityChallenge.bondSize();
         uint256 actualBond = requiredBond - 1;
         dataAvailabilityChallenge.deposit{ value: actualBond }();
@@ -497,14 +509,14 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.challenge(0, challengedCommitment);
     }
 
-    function testSetResolverRefundPercentage(uint256 resolverRefundPercentage) public {
+    function test_setResolverRefundPercentage_succeeds(uint256 resolverRefundPercentage) public {
         resolverRefundPercentage = bound(resolverRefundPercentage, 0, 100);
         vm.prank(dataAvailabilityChallenge.owner());
         dataAvailabilityChallenge.setResolverRefundPercentage(resolverRefundPercentage);
         assertEq(dataAvailabilityChallenge.resolverRefundPercentage(), resolverRefundPercentage);
     }
 
-    function testSetResolverRefundPercentageFail() public {
+    function test_setResolverRefundPercentage_invalidResolverRefundPercentage_reverts() public {
         address owner = dataAvailabilityChallenge.owner();
         vm.expectRevert(
             abi.encodeWithSelector(IDataAvailabilityChallenge.InvalidResolverRefundPercentage.selector, 101)
@@ -513,7 +525,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.setResolverRefundPercentage(101);
     }
 
-    function testSetBondSizeFailOnlyOwner(address notOwner, uint256 newBondSize) public {
+    function test_setBondSize_onlyOwner_reverts(address notOwner, uint256 newBondSize) public {
         vm.assume(notOwner != dataAvailabilityChallenge.owner());
 
         // Expect setting the bond size to fail because the sender is not the owner
@@ -522,7 +534,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.setBondSize(newBondSize);
     }
 
-    function testValidateCommitment() public {
+    function test_validateCommitment_succeeds() public {
         // Should not revert given a valid commitment
         bytes memory validCommitment = abi.encodePacked(CommitmentType.Keccak256, keccak256("test"));
         dataAvailabilityChallenge.validateCommitment(validCommitment);
diff --git a/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol b/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
index 6eade75e8ffa..a0dd2d8c138e 100644
--- a/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
+++ b/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
@@ -61,7 +61,7 @@ contract DelayedVetoable_Init is Test {
 
 contract DelayedVetoable_Getters_Test is DelayedVetoable_Init {
     /// @dev The getters return the expected values when called by the zero address.
-    function test_getters() external {
+    function test_getters_succeeds() external {
         vm.startPrank(address(0));
         assertEq(delayedVetoable.initiator(), initiator);
         assertEq(delayedVetoable.vetoer(), vetoer);
diff --git a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
index 08a976aa0ec2..9ef537e435b3 100644
--- a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
@@ -623,7 +623,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
     }
 
     /// @dev Tests that sendMessage succeeds with a custom gas token when the call value is zero.
-    function test_sendMessage_customGasToken_noValue_succeeds() external {
+    function test_sendMessage_customGasTokenButNoValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
             address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(18))
@@ -671,7 +671,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
     }
 
     /// @dev Tests that the sendMessage reverts when call value is non-zero with custom gas token.
-    function test_sendMessage_customGasToken_withValue_reverts() external {
+    function test_sendMessage_customGasTokenWithValue_reverts() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
             address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
@@ -682,7 +682,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
     }
 
     /// @dev Tests that the relayMessage succeeds with a custom gas token when the call value is zero.
-    function test_relayMessage_customGasToken_noValue_succeeds() external {
+    function test_relayMessage_customGasTokenAndNoValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
             address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
@@ -722,7 +722,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
 
     /// @dev Tests that the relayMessage reverts when call value is non-zero with custom gas token.
     ///      The L2CrossDomainMessenger contract cannot `sendMessage` with value when using a custom gas token.
-    function test_relayMessage_customGasToken_withValue_reverts() external virtual {
+    function test_relayMessage_customGasTokenWithValue_reverts() external virtual {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(
             address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2))
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index 028fc7587043..70b1c6d4ed94 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -773,7 +773,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    function test_finalizeWithdrawalTransaction_provenWithdrawalHash_ether_succeeds() external {
+    function test_finalizeWithdrawalTransaction_provenWithdrawalHashEther_succeeds() external {
         uint256 bobBalanceBefore = address(bob).balance;
 
         vm.expectEmit(true, true, true, true);
@@ -789,7 +789,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    function test_finalizeWithdrawalTransaction_provenWithdrawalHash_nonEther_targetToken_reverts() external {
+    function test_finalizeWithdrawalTransaction_provenWithdrawalHashNonEtherTargetToken_reverts() external {
         vm.mockCall(
             address(systemConfig),
             abi.encodeCall(systemConfig.gasPayingToken, ()),
@@ -1483,7 +1483,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    function test_finalizeWithdrawalTransaction_provenWithdrawalHash_nonEther_succeeds() external {
+    function test_finalizeWithdrawalTransaction_provenWithdrawalHashNonEther_succeeds() external {
         // Mint the token to the contract and approve the token for the portal
         token.mint(address(this), _defaultTx.value);
         token.approve(address(optimismPortal), _defaultTx.value);
@@ -1562,7 +1562,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
     /// forge-config: ciheavy.fuzz.runs = 8192
-    function testFuzz_depositTransaction_customGasToken_noValue_senderIsOrigin_succeeds(
+    function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderIsOrigin_succeeds(
         address _to,
         uint256 _value,
         uint64 _gasLimit,
@@ -1586,7 +1586,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
     /// forge-config: ciheavy.fuzz.runs = 8192
-    function testFuzz_depositTransaction_customGasToken_noValue_senderNotOrigin_succeeds(
+    function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderNotOrigin_succeeds(
         address _to,
         uint256 _value,
         uint64 _gasLimit,
@@ -1609,7 +1609,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositTransaction` fails when a custom gas token is used and msg.value is non-zero.
-    function test_depositTransaction_customGasToken_withValue_reverts() external {
+    function test_depositTransaction_customGasTokenWithValue_reverts() external {
         // Mock the gas paying token to be the ERC20 token
         vm.mockCall(
             address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index 8cc56937bd33..d252609e5eea 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -583,7 +583,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
 
     /// @dev Tests that `proveWithdrawalTransaction` reverts when the withdrawal has already been proven, and the new
     ///      game has the `CHALLENGER_WINS` status.
-    function test_proveWithdrawalTransaction_replayProve_differentGameChallengerWins_reverts() external {
+    function test_proveWithdrawalTransaction_replayProveDifferentGameChallengerWins_reverts() external {
         vm.expectEmit(address(optimismPortal2));
         emit WithdrawalProven(_withdrawalHash, alice, bob);
         vm.expectEmit(address(optimismPortal2));
@@ -632,7 +632,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
 
     /// @dev Tests that `proveWithdrawalTransaction` can be re-executed if the dispute game proven against has been
     ///      blacklisted.
-    function test_proveWithdrawalTransaction_replayProveBlacklisted_suceeds() external {
+    function test_proveWithdrawalTransaction_replayProveBlacklisted_succeeds() external {
         vm.expectEmit(true, true, true, true);
         emit WithdrawalProven(_withdrawalHash, alice, bob);
         vm.expectEmit(true, true, true, true);
@@ -670,7 +670,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
 
     /// @dev Tests that `proveWithdrawalTransaction` can be re-executed if the dispute game proven against has resolved
     ///      against the favor of the root claim.
-    function test_proveWithdrawalTransaction_replayProveBadProposal_suceeds() external {
+    function test_proveWithdrawalTransaction_replayProveBadProposal_succeeds() external {
         vm.expectEmit(true, true, true, true);
         emit WithdrawalProven(_withdrawalHash, alice, bob);
         vm.expectEmit(true, true, true, true);
@@ -704,7 +704,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
 
     /// @dev Tests that `proveWithdrawalTransaction` can be re-executed if the dispute game proven against is no longer
     ///      of the respected game type.
-    function test_proveWithdrawalTransaction_replayRespectedGameTypeChanged_suceeds() external {
+    function test_proveWithdrawalTransaction_replayRespectedGameTypeChanged_succeeds() external {
         // Prove the withdrawal against a game with the current respected game type.
         vm.expectEmit(true, true, true, true);
         emit WithdrawalProven(_withdrawalHash, alice, bob);
@@ -803,7 +803,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    function test_finalizeWithdrawalTransaction_provenWithdrawalHash_ether_succeeds() external {
+    function test_finalizeWithdrawalTransaction_provenWithdrawalHashEther_succeeds() external {
         uint256 bobBalanceBefore = address(bob).balance;
 
         vm.expectEmit(address(optimismPortal2));
@@ -891,7 +891,7 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    function test_finalizeWithdrawalTransaction_provenWithdrawalHash_nonEther_targetToken_reverts() external {
+    function test_finalizeWithdrawalTransaction_provenWithdrawalHashNonEtherTargetToken_reverts() external {
         vm.mockCall(
             address(systemConfig),
             abi.encodeCall(systemConfig.gasPayingToken, ()),
@@ -1730,7 +1730,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    function test_finalizeWithdrawalTransaction_provenWithdrawalHash_nonEther_succeeds() external {
+    function test_finalizeWithdrawalTransaction_provenWithdrawalHashWithNonEther_succeeds() external {
         // Mint the token to the contract and approve the token for the portal
         token.mint(address(this), _defaultTx.value);
         token.approve(address(optimismPortal2), _defaultTx.value);
@@ -1818,7 +1818,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
     /// forge-config: ciheavy.fuzz.runs = 8192
-    function testFuzz_depositTransaction_customGasToken_noValue_senderIsOrigin_succeeds(
+    function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderIsOrigin_succeeds(
         address _to,
         uint256 _value,
         uint64 _gasLimit,
@@ -1842,7 +1842,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
     /// forge-config: ciheavy.fuzz.runs = 8192
-    function testFuzz_depositTransaction_customGasToken_noValue_senderNotOrigin_succeeds(
+    function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderNotOrigin_succeeds(
         address _to,
         uint256 _value,
         uint64 _gasLimit,
@@ -1865,7 +1865,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositTransaction` fails when a custom gas token is used and msg.value is non-zero.
-    function test_depositTransaction_customGasToken_withValue_reverts() external {
+    function test_depositTransaction_customGasTokenWithValue_reverts() external {
         // Mock the gas paying token to be the ERC20 token
         vm.mockCall(
             address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(token), 18)
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
index bc9a980276aa..bd6d3b5d7de9 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
@@ -43,7 +43,7 @@ contract OptimismPortalInterop_Test is CommonTest {
     }
 
     /// @dev Tests that setting the gas paying token config as not the system config reverts.
-    function testFuzz_setConfig_gasPayingToken_notSystemConfig_reverts(bytes calldata _value) public {
+    function testFuzz_setConfig_gasPayingTokenButNotSystemConfig_reverts(bytes calldata _value) public {
         vm.expectRevert(Unauthorized.selector);
         _optimismPortalInterop().setConfig(ConfigType.SET_GAS_PAYING_TOKEN, _value);
     }
@@ -66,7 +66,7 @@ contract OptimismPortalInterop_Test is CommonTest {
     }
 
     /// @dev Tests that setting the add dependency config as not the system config reverts.
-    function testFuzz_setConfig_addDependency_notSystemConfig_reverts(bytes calldata _value) public {
+    function testFuzz_setConfig_addDependencyButNotSystemConfig_reverts(bytes calldata _value) public {
         vm.expectRevert(Unauthorized.selector);
         _optimismPortalInterop().setConfig(ConfigType.ADD_DEPENDENCY, _value);
     }
@@ -89,7 +89,7 @@ contract OptimismPortalInterop_Test is CommonTest {
     }
 
     /// @dev Tests that setting the remove dependency config as not the system config reverts.
-    function testFuzz_setConfig_removeDependency_notSystemConfig_reverts(bytes calldata _value) public {
+    function testFuzz_setConfig_removeDependencyButNotSystemConfig_reverts(bytes calldata _value) public {
         vm.expectRevert(Unauthorized.selector);
         _optimismPortalInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, _value);
     }
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index dff0852fb40d..a6311c02b1e4 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -396,7 +396,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
     }
 
     /// @dev Tests that initialization sets the correct values and getters work when token address passed is 0.
-    function test_initialize_customGasToken_zeroTokenAddress_succeeds() external {
+    function test_initialize_customGasTokenWithZeroTokenAddress_succeeds() external {
         cleanStorageAndInit(address(0));
 
         (address addr, uint8 decimals) = systemConfig.gasPayingToken();
@@ -408,7 +408,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
     }
 
     /// @dev Tests that initialization sets the correct values and getters work when token address is Constants.ETHER
-    function test_initialize_customGasToken_etherTokenAddress_succeeds() external {
+    function test_initialize_customGasTokenWithEtherTokenAddress_succeeds() external {
         cleanStorageAndInit(Constants.ETHER);
 
         (address addr, uint8 decimals) = systemConfig.gasPayingToken();
@@ -420,7 +420,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
     }
 
     /// @dev Tests that initialization fails if decimals are not 18.
-    function test_initialize_customGasToken_wrongDecimals_fails() external {
+    function test_initialize_customGasTokenWrongDecimals_fails() external {
         vm.mockCall(address(token), abi.encodeCall(token.decimals, ()), abi.encode(8));
         vm.expectRevert("SystemConfig: bad decimals of gas paying token");
 
@@ -428,7 +428,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
     }
 
     /// @dev Tests that initialization fails if name is too long.
-    function test_initialize_customGasToken_nameTooLong_fails() external {
+    function test_initialize_customGasTokenNameTooLong_fails() external {
         string memory name = new string(32);
         name = string.concat(name, "a");
 
@@ -439,7 +439,7 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
     }
 
     /// @dev Tests that initialization fails if symbol is too long.
-    function test_initialize_customGasToken_symbolTooLong_fails() external {
+    function test_initialize_customGasTokenSymbolTooLong_fails() external {
         string memory symbol = new string(33);
         symbol = string.concat(symbol, "a");
 
diff --git a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
index 9e79906efeec..25b6e711c1ec 100644
--- a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
@@ -328,7 +328,7 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Tests that the `executeMessage` function reverts when called with an identifier with a timestamp earlier
     /// than INTEROP_START timestamp
-    function testFuzz_executeMessage_invalidTimestamp_interopStart_reverts(
+    function testFuzz_executeMessage_invalidTimestampInteropStart_reverts(
         Identifier memory _id,
         address _target,
         bytes calldata _message,
@@ -513,7 +513,7 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Tests that the `validateMessage` function reverts when called with an identifier with a timestamp earlier
     /// than INTEROP_START timestamp
-    function testFuzz_validateMessage_invalidTimestamp_interopStart_reverts(
+    function testFuzz_validateMessage_invalidTimestampInteropStart_reverts(
         Identifier memory _id,
         bytes32 _messageHash
     )
diff --git a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
index 6f0ef2188b8c..c8779342c3bf 100644
--- a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
@@ -104,7 +104,7 @@ contract L1BlockInteropTest is CommonTest {
     }
 
     /// @dev Tests that setting the gas paying token config as not the depositor reverts.
-    function testFuzz_setConfig_gasPayingToken_notDepositor_reverts(
+    function testFuzz_setConfig_gasPayingTokenButNotDepositor_reverts(
         address _token,
         uint8 _decimals,
         bytes32 _name,
@@ -132,13 +132,13 @@ contract L1BlockInteropTest is CommonTest {
     }
 
     /// @dev Tests that adding a dependency reverts if it's the chain's chain id
-    function test_setConfig_addDependency_chainChainId_reverts() public prankDepositor {
+    function test_setConfig_addDependencyButChainChainId_reverts() public prankDepositor {
         vm.expectRevert(AlreadyDependency.selector);
         _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(block.chainid));
     }
 
     /// @dev Tests that adding a dependency already in the set reverts
-    function test_setConfig_addDependency_alreadyDependency_reverts(uint256 _chainId) public prankDepositor {
+    function test_setConfig_addDependencyButAlreadyDependency_reverts(uint256 _chainId) public prankDepositor {
         vm.assume(_chainId != block.chainid);
 
         _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
@@ -148,13 +148,13 @@ contract L1BlockInteropTest is CommonTest {
     }
 
     /// @dev Tests that setting the add dependency config as not the depositor reverts.
-    function testFuzz_setConfig_addDependency_notDepositor_reverts(uint256 _chainId) public {
+    function testFuzz_setConfig_addDependencyButNotDepositor_reverts(uint256 _chainId) public {
         vm.expectRevert(NotDepositor.selector);
         _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(_chainId));
     }
 
     /// @dev Tests that setting the add dependency config when the dependency set size is too large reverts.
-    function test_setConfig_addDependency_dependencySetSizeTooLarge_reverts() public prankDepositor {
+    function test_setConfig_addDependencyButDependencySetSizeTooLarge_reverts() public prankDepositor {
         for (uint256 i = 0; i < type(uint8).max; i++) {
             _l1BlockInterop().setConfig(ConfigType.ADD_DEPENDENCY, StaticConfig.encodeAddDependency(i));
         }
@@ -179,19 +179,19 @@ contract L1BlockInteropTest is CommonTest {
     }
 
     /// @dev Tests that setting the remove dependency config as not the depositor reverts.
-    function testFuzz_setConfig_removeDependency_notDepositor_reverts(uint256 _chainId) public {
+    function testFuzz_setConfig_removeDependencyButNotDepositor_reverts(uint256 _chainId) public {
         vm.expectRevert(NotDepositor.selector);
         _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(_chainId));
     }
 
     /// @dev Tests that setting the remove dependency config for the chain's chain ID reverts.
-    function test_setConfig_removeDependency_chainChainId_reverts() public prankDepositor {
+    function test_setConfig_removeDependencyButChainChainId_reverts() public prankDepositor {
         vm.expectRevert(CantRemovedDependency.selector);
         _l1BlockInterop().setConfig(ConfigType.REMOVE_DEPENDENCY, StaticConfig.encodeRemoveDependency(block.chainid));
     }
 
     /// @dev Tests that setting the remove dependency config for a chain ID that is not in the dependency set reverts.
-    function testFuzz_setConfig_removeDependency_notDependency_reverts(uint256 _chainId) public prankDepositor {
+    function testFuzz_setConfig_removeDependencyButNotDependency_reverts(uint256 _chainId) public prankDepositor {
         vm.assume(_chainId != block.chainid);
 
         vm.expectRevert(NotDependency.selector);
@@ -284,7 +284,7 @@ contract L1BlockInteropSetL1BlockValuesInterop_Test is L1BlockInteropTest {
 
 contract L1BlockDepositsComplete_Test is L1BlockInteropTest {
     // @dev Tests that `depositsComplete` reverts if the caller is not the depositor.
-    function test_deposits_is_depositor_reverts(address _caller) external {
+    function test_depositsComplete_notDepositor_reverts(address _caller) external {
         vm.assume(_caller != _l1BlockInterop().DEPOSITOR_ACCOUNT());
         vm.expectRevert(NotDepositor.selector);
         _l1BlockInterop().depositsComplete();
diff --git a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
index 1dc5749d6d54..a2cd9382ca84 100644
--- a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
@@ -226,7 +226,7 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     }
 
     /// @dev Tests that sendMessage succeeds with a custom gas token when the call value is zero.
-    function test_sendMessage_customGasToken_noValue_succeeds() external {
+    function test_sendMessage_customGasTokenButNoValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
 
@@ -266,7 +266,7 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     }
 
     /// @dev Tests that the sendMessage reverts when call value is non-zero with custom gas token.
-    function test_sendMessage_customGasToken_withValue_reverts() external {
+    function test_sendMessage_customGasTokenWithValue_reverts() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
 
@@ -275,7 +275,7 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
     }
 
     /// @dev Tests that the relayMessage succeeds with a custom gas token when the call value is zero.
-    function test_relayMessage_customGasToken_noValue_succeeds() external {
+    function test_relayMessage_customGasTokenAndNoValue_succeeds() external {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
 
@@ -311,7 +311,7 @@ contract L2CrossDomainMessenger_Test is Bridge_Initializer {
 
     /// @dev Tests that the relayMessage reverts when call value is non-zero with custom gas token.
     ///       The L1CrossDomainMessenger `sendMessage` function cannot send value with a custom gas token.
-    function test_relayMessage_customGasToken_withValue_reverts() external virtual {
+    function test_relayMessage_customGasTokenWithValue_reverts() external virtual {
         // Mock the gasPayingToken function to return a custom gas token
         vm.mockCall(address(l1Block), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(1), uint8(2)));
         vm.expectRevert("CrossDomainMessenger: value must be zero unless message is from a system address");
diff --git a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
index 6d9884bd677a..2398ac332df5 100644
--- a/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2Genesis.t.sol
@@ -114,14 +114,14 @@ contract L2GenesisTest is Test {
     }
 
     /// @notice Tests the genesis predeploys setup using a temp file for the case where useInterop is false.
-    function test_genesis_predeploys_notUsingInterop() external {
+    function test_genesisPredeploys_notUsingInterop_works() external {
         string memory path = tmpfile();
         _test_genesis_predeploys(path, false);
         deleteFile(path);
     }
 
     /// @notice Tests the genesis predeploys setup using a temp file for the case where useInterop is true.
-    function test_genesis_predeploys_usingInterop() external {
+    function test_genesisPredeploys_usingInterop_works() external {
         string memory path = tmpfile();
         _test_genesis_predeploys(path, true);
         deleteFile(path);
@@ -154,7 +154,7 @@ contract L2GenesisTest is Test {
     }
 
     /// @notice Tests the number of accounts in the genesis setup
-    function test_allocs_size() external {
+    function test_allocs_size_works() external {
         withTempDump(_test_allocs_size);
     }
 
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
index e1dc1286d2bd..d5b999a922e5 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
@@ -102,7 +102,7 @@ contract OptimismSuperchainERC20Test is Test {
     }
 
     /// @notice Tests the `initialize` function reverts when the contract is already initialized.
-    function testFuzz_initializer_reverts(
+    function testFuzz_initializer_invalidInitialization_reverts(
         address _remoteToken,
         string memory _name,
         string memory _symbol,
@@ -256,7 +256,7 @@ contract OptimismSuperchainERC20Test is Test {
 
     /// @notice Tests that the `supportsInterface` function returns false for any other interface than the
     /// `ISuperchainERC20` one.
-    function testFuzz_supportInterface_returnFalse(bytes4 _interfaceId) public view {
+    function testFuzz_supportInterface_returnFalse_works(bytes4 _interfaceId) public view {
         vm.assume(_interfaceId != type(IERC165).interfaceId);
         vm.assume(_interfaceId != type(IERC20).interfaceId);
         vm.assume(_interfaceId != type(IERC7802).interfaceId);
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol
index 68217127e0cb..4de8b06b8ee0 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol
@@ -18,7 +18,7 @@ contract OptimismSuperchainERC20BeaconTest is Bridge_Initializer {
     }
 
     /// @notice Test that calling the implementation function returns the correct implementation address.
-    function test_implementation_is_correct() public view {
+    function test_implementation_isCorrect_works() public view {
         IBeacon beacon = IBeacon(Predeploys.OPTIMISM_SUPERCHAIN_ERC20_BEACON);
         assertEq(beacon.implementation(), Predeploys.OPTIMISM_SUPERCHAIN_ERC20);
     }
diff --git a/packages/contracts-bedrock/test/L2/Predeploys.t.sol b/packages/contracts-bedrock/test/L2/Predeploys.t.sol
index 27e3d75b2fdc..6cc36c45c9e1 100644
--- a/packages/contracts-bedrock/test/L2/Predeploys.t.sol
+++ b/packages/contracts-bedrock/test/L2/Predeploys.t.sol
@@ -34,7 +34,7 @@ contract PredeploysBaseTest is CommonTest {
             || _addr == Predeploys.GOVERNANCE_TOKEN;
     }
 
-    function test_predeployToCodeNamespace() external pure {
+    function test_predeployToCodeNamespace_works() external pure {
         assertEq(
             address(0xc0D3C0d3C0d3C0D3c0d3C0d3c0D3C0d3c0d30000),
             Predeploys.predeployToCodeNamespace(Predeploys.LEGACY_MESSAGE_PASSER)
diff --git a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
index be0d01181e81..a9202346be6a 100644
--- a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
+++ b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
@@ -9,7 +9,7 @@ import { IEIP712 } from "src/universal/interfaces/IEIP712.sol";
 /// @title PreinstallsTest
 contract PreinstallsTest is CommonTest {
     /// @dev The domain separator commits to the chainid of the chain
-    function test_preinstall_permit2_domain_separator() external view {
+    function test_preinstall_permit2DomainSeparator_works() external view {
         bytes32 domainSeparator = IEIP712(Preinstalls.Permit2).DOMAIN_SEPARATOR();
         bytes32 typeHash =
             keccak256(abi.encodePacked("EIP712Domain(string name,uint256 chainId,address verifyingContract)"));
@@ -23,7 +23,7 @@ contract PreinstallsTest is CommonTest {
         // Warning the Permit2 domain separator as cached in the DeployPermit2.sol bytecode is incorrect.
     }
 
-    function test_permit2_templating() external pure {
+    function test_permit2_templating_works() external pure {
         bytes memory customCode = Preinstalls.getPermit2Code(1234);
         assertNotEq(customCode.length, 0, "must have code");
         assertEq(uint256(bytes32(Bytes.slice(customCode, 6945, 32))), uint256(1234), "expecting custom chain ID");
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index 4d4109b6885a..d0744ecb48ef 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -322,7 +322,7 @@ contract SuperchainWETH_Test is CommonTest {
     }
 
     /// @notice Test that the internal mint function reverts to protect against accidentally changing the visibility.
-    function testFuzz_calling_internal_mint_function_reverts(address _caller, address _to, uint256 _amount) public {
+    function testFuzz_calling_internalMintFunction_reverts(address _caller, address _to, uint256 _amount) public {
         // Arrange
         bytes memory _calldata = abi.encodeWithSignature("_mint(address,uint256)", _to, _amount); // nosemgrep:
             // sol-style-use-abi-encodecall
@@ -337,7 +337,7 @@ contract SuperchainWETH_Test is CommonTest {
     }
 
     /// @notice Test that the mint function reverts to protect against accidentally changing the visibility.
-    function testFuzz_calling_mint_function_reverts(address _caller, address _to, uint256 _amount) public {
+    function testFuzz_calling_mintFunction_reverts(address _caller, address _to, uint256 _amount) public {
         // Arrange
         bytes memory _calldata = abi.encodeWithSignature("mint(address,uint256)", _to, _amount); // nosemgrep:
             // sol-style-use-abi-encodecall
@@ -352,7 +352,7 @@ contract SuperchainWETH_Test is CommonTest {
     }
 
     /// @notice Test that the internal burn function reverts to protect against accidentally changing the visibility.
-    function testFuzz_calling_internal_burn_function_reverts(address _caller, address _from, uint256 _amount) public {
+    function testFuzz_calling_internalBurnFunction_reverts(address _caller, address _from, uint256 _amount) public {
         // Arrange
         bytes memory _calldata = abi.encodeWithSignature("_burn(address,uint256)", _from, _amount); // nosemgrep:
             // sol-style-use-abi-encodecall
@@ -367,7 +367,7 @@ contract SuperchainWETH_Test is CommonTest {
     }
 
     /// @notice Test that the burn function reverts to protect against accidentally changing the visibility.
-    function testFuzz_calling_burn_function_reverts(address _caller, address _from, uint256 _amount) public {
+    function testFuzz_calling_burnFuunction_reverts(address _caller, address _from, uint256 _amount) public {
         // Arrange
         bytes memory _calldata = abi.encodeWithSignature("burn(address,uint256)", _from, _amount); // nosemgrep:
             // sol-style-use-abi-encodecall
diff --git a/packages/contracts-bedrock/test/cannon/MIPS.t.sol b/packages/contracts-bedrock/test/cannon/MIPS.t.sol
index e4221dfcf66b..62100f31cfbe 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS.t.sol
@@ -1509,7 +1509,7 @@ contract MIPS_Test is CommonTest {
         assertEq(postState, outputState(expect), "unexpected post state");
     }
 
-    function test_mmap_succeeds_justWithinMemLimit() external {
+    function test_mmap_justWithinMemLimit_succeeds() external {
         uint32 insn = 0x0000000c; // syscall
         (bytes32 memRoot, bytes memory proof) = ffi.getCannonMemoryProof(0, insn);
 
@@ -1538,7 +1538,7 @@ contract MIPS_Test is CommonTest {
         assertEq(postState, outputState(expect), "unexpected post state");
     }
 
-    function test_mmap_fails() external {
+    function test_step_mmap_fails() external {
         uint32 insn = 0x0000000c; // syscall
         (bytes32 memRoot, bytes memory proof) = ffi.getCannonMemoryProof(0, insn);
 
@@ -1692,7 +1692,7 @@ contract MIPS_Test is CommonTest {
         mips.step(encodedState, proof, 0);
     }
 
-    function test_invalid_root_fails() external {
+    function test_step_invalidRoot_fails() external {
         uint32 insn = 0x0000000c; // syscall
         (IMIPS.State memory state, bytes memory proof) = constructMIPSState(0, insn, 0x4, 0);
         state.registers[2] = 4246; // exit_group syscall
@@ -1706,7 +1706,7 @@ contract MIPS_Test is CommonTest {
         mips.step(encodeState(state), proof, 0);
     }
 
-    function test_invalid_root_different_leaf_fails() external {
+    function test_step_invalidRootDifferentLeaf_fails() external {
         uint32 insn = 0x0000000c; // syscall
 
         // Initialize the state, though for the proof, use valid proofs for the instruction
diff --git a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
index 0c2ad04362bb..2cc0519ea5bf 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
@@ -159,7 +159,7 @@ contract MIPS2_Test is CommonTest {
     /// This is useful to more easily debug non-forge tests.
     /// For example, in cannon/mipsevm/evm_test.go step input can be pulled here:
     /// https://github.com/ethereum-optimism/optimism/blob/1f64dd6db5561f3bb76ed1d1ffdaff0cde9b7c4b/cannon/mipsevm/evm_test.go#L80-L80
-    function test_mips2_step_debug_succeeds() external {
+    function test_step_debug_succeeds() external {
         bytes memory input =
             hex"e14ced3200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000acab5a39c6f974b22302e96dcdef1815483eaf580639bb1ee7ac98267afac2bf1ac041d3ff12045b73c86e4ff95ff662a5eee82abdf44a2d0b75fb180daf48a79e3143a81fa7c3d90b000000000000000000000078fc2ffac2fd940100000000000080c8ffffffff006504aeffb6e08baf3f85da5476a9160fa8f9f188a722fdd29268b0cbaf596736ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb500000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007c6000000000000ffffffff000000000000000000000000f1f85ff4f1f85ff8506d442dbb3938f83eb60825a7ecbff2000010185e1a31f600050f0000000064a7c3d90be5acea102ad7bda149e0bfd0e7111c77d98b335645e665389becadf140ef999cc64fbd7f04799e85c97dadc5cca510bd5b3d97166d1aec28829f3dd43d8cf1f9358e4103b16d09d466e2c7c048ea3ba1aef3141e700270581aa0b75b50e34fc926bb2d83ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb500000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5b4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d3021ddb9a356815c3fac1026b6dec5df3124afbadb485c9ba5a3e3398a04b7ba85e58769b32a1beaf1ea27375a44095a0d1fb664ce2dd358e7fcbfb78c26a193440eb01ebfc9ed27500cd4dfc979272d1f0913cc9f66540d7e8005811109e1cf2d887c22bd8750d34016ac3c66b5ff102dacdd73f6b014e710b51e8022af9a1968ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f839867cc5f7f196b93bae1e27e6320742445d290f2263827498b54fec539f756afcefad4e508c098b9a7e1d8feb19955fb02ba9675585078710969d3440f5054e0f9dc3e7fe016e050eff260334f18a5d4fe391d82092319f5964f2e2eb7c1c3a5f8b13a49e282f609c317a833fb8d976d11517c571d1221a265d25af778ecf8923490c6ceeb450aecdc82e28293031d10c7d73bf85e57bf041a97360aa2c5d99cc1df82d9c4b87413eae2ef048f94b4d3554cea73d92b0f7af96e0271c691e2bb5c67add7c6caf302256adedf7ab114da0acfe870d449a3a489f781d659e8beccda7bce9f4e8618b6bd2f4132ce798cdc7a60e7e1460a7299e3c6342a579626d22733e50f526ec2fa19a22b31e8ed50f23cd1fdf94c9154ed3a7609a2f1ff981fe1d3b5c807b281e4683cc6d6315cf95b9ade8641defcb32372f1c126e398ef7a5a2dce0a8a7f68bb74560f8f71837c2c2ebbcbf7fffb42ae1896f13f7c7479a0b46a28b6f55540f89444f63de0378e3d121be09e06cc9ded1c20e65876d36aa0c65e9645644786b620e2dd2ad648ddfcbf4a7e5b1a3a4ecfe7f64667a3f0b7e2f4418588ed35a2458cffeb39b93d26f18d2ab13bdce6aee58e7b99359ec2dfd95a9c16dc00d6ef18b7933a6f8dc65ccb55667138776f7dea101070dc8796e3774df84f40ae0c8229d0d6069e5c8f39a7c299677a09d367fc7b05e3bc380ee652cdc72595f74c7b1043d0e1ffbab734648c838dfb0527d971b602bc216c9619ef0abf5ac974a1ed57f4050aa510dd9c74f508277b39d7973bb2dfccc5eeb0618db8cd74046ff337f0a7bf2c8e03e10f642c1886798d71806ab1e888d9e5ee87d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
         (bool success, bytes memory retVal) = address(mips).call(input);
@@ -246,7 +246,7 @@ contract MIPS2_Test is CommonTest {
         }
     }
 
-    function test_invalidThreadWitness_reverts() public {
+    function test_step_invalidThreadWitness_reverts() public {
         IMIPS2.State memory state;
         IMIPS2.ThreadState memory thread;
         bytes memory memProof;
@@ -743,12 +743,12 @@ contract MIPS2_Test is CommonTest {
     }
 
     /// @dev Test asserting that an clock_gettime monotonic syscall reverts on an invalid memory proof
-    function test_syscallClockGettimeMonotonicInvalidProof_reverts() public {
+    function test_step_syscallClockGettimeMonotonicInvalidProof_reverts() public {
         _test_syscallClockGettimeInvalidProof_reverts(sys.CLOCK_GETTIME_MONOTONIC_FLAG);
     }
 
     /// @dev Test asserting that an clock_gettime realtime syscall reverts on an invalid memory proof
-    function test_syscallClockGettimeRealtimeInvalidProof_reverts() public {
+    function test_step_syscallClockGettimeRealtimeInvalidProof_reverts() public {
         _test_syscallClockGettimeInvalidProof_reverts(sys.CLOCK_GETTIME_REALTIME_FLAG);
     }
 
@@ -1336,7 +1336,7 @@ contract MIPS2_Test is CommonTest {
         assertEq(postState, outputState(expect), "unexpected post state");
     }
 
-    function test_mmap_succeeds_simple() external {
+    function test_mmap_simple_succeeds() external {
         uint32 insn = 0x0000000c; // syscall
         (IMIPS2.State memory state, IMIPS2.ThreadState memory thread, bytes memory memProof) =
             constructMIPSState(0, insn, 0x4, 0);
@@ -1368,7 +1368,7 @@ contract MIPS2_Test is CommonTest {
         assertEq(postState, outputState(expect), "unexpected post state");
     }
 
-    function test_mmap_succeeds_justWithinMemLimit() external {
+    function test_mmap_justWithinMemLimit_succeeds() external {
         uint32 insn = 0x0000000c; // syscall
         (IMIPS2.State memory state, IMIPS2.ThreadState memory thread, bytes memory memProof) =
             constructMIPSState(0, insn, 0x4, 0);
@@ -1400,7 +1400,7 @@ contract MIPS2_Test is CommonTest {
         assertEq(postState, outputState(expect), "unexpected post state");
     }
 
-    function test_mmap_fails() external {
+    function test_step_mmap_fails() external {
         uint32 insn = 0x0000000c; // syscall
         (IMIPS2.State memory state, IMIPS2.ThreadState memory thread, bytes memory memProof) =
             constructMIPSState(0, insn, 0x4, 0);
diff --git a/packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol b/packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol
index a3a1160c7d48..9ba0f0bcf5f5 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS64Memory.t.sol
@@ -49,7 +49,7 @@ contract MIPS64Memory_Test is CommonTest {
     }
 
     /// @dev Static unit test asserting that reads revert when a misaligned memory address is provided
-    function test_readInvalidAddress_reverts() external {
+    function test_readMem_readInvalidAddress_reverts() external {
         uint64 addr = 0x100;
         uint64 word = 0x11_22_33_44_55_66_77_88;
         bytes32 root;
@@ -60,7 +60,7 @@ contract MIPS64Memory_Test is CommonTest {
     }
 
     /// @dev Static unit test asserting that reads revert when an invalid proof is provided
-    function test_readInvalidProof_reverts() external {
+    function test_readMem_readInvalidProof_reverts() external {
         uint64 addr = 0x100;
         uint64 word = 0x11_22_33_44_55_66_77_88;
         bytes32 root;
@@ -170,7 +170,7 @@ contract MIPS64Memory_Test is CommonTest {
     }
 
     /// @dev Static unit test asserting that writes revert when a misaligned memory address is provided
-    function test_writeMemInvalidAddress_reverts() external {
+    function test_writeMem_writeMemInvalidAddress_reverts() external {
         bytes memory zeroProof;
         (, zeroProof) = ffi.getCannonMemory64Proof(0x100, 0);
         vm.expectRevert(InvalidAddress.selector);
diff --git a/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol b/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
index d43d52784ba5..1c4d41728fcc 100644
--- a/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
+++ b/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
@@ -391,7 +391,7 @@ contract PreimageOracle_LargePreimageProposals_Test is Test {
     }
 
     /// @notice Gas snapshot for `addLeaves`
-    function test_addLeaves_gasSnapshot() public {
+    function test_addLeaves_gasSnapshot_benchmark() public {
         // Allocate the preimage data.
         bytes memory data = new bytes(136 * 500);
         for (uint256 i; i < data.length; i++) {
diff --git a/packages/contracts-bedrock/test/libraries/Blueprint.t.sol b/packages/contracts-bedrock/test/libraries/Blueprint.t.sol
index c94616a88e4f..3e2a96a01912 100644
--- a/packages/contracts-bedrock/test/libraries/Blueprint.t.sol
+++ b/packages/contracts-bedrock/test/libraries/Blueprint.t.sol
@@ -56,7 +56,7 @@ contract Blueprint_Test is Test {
     // --- We start with the test cases from ERC-5202 ---
 
     // An example (and trivial!) blueprint contract with no data section, whose initcode is just the STOP instruction.
-    function test_ERC5202_trivialBlueprint_succeeds() public view {
+    function test_trivialBlueprint_erc5202_succeeds() public view {
         bytes memory bytecode = hex"FE710000";
         Blueprint.Preamble memory preamble = blueprint.parseBlueprintPreamble(bytecode);
 
@@ -67,7 +67,7 @@ contract Blueprint_Test is Test {
 
     // An example blueprint contract whose initcode is the trivial STOP instruction and whose data
     // section contains the byte 0xFF repeated seven times.
-    function test_ERC5202_blueprintWithDataSection_succeeds() public view {
+    function test_blueprintWithDataSection_erc5202_succeeds() public view {
         // Here, 0xFE71 is the magic header, 0x01 means version 0 + 1 length bit, 0x07 encodes the
         // length in bytes of the data section. These are followed by the data section, and then the
         // initcode. For illustration, this code with delimiters would be:
@@ -82,7 +82,7 @@ contract Blueprint_Test is Test {
 
     // An example blueprint whose initcode is the trivial STOP instruction and whose data section
     // contains the byte 0xFF repeated 256 times.
-    function test_ERC5202_blueprintWithLargeDataSection_succeeds() public view {
+    function test_blueprintWithLargeDataSection_erc5205_succeeds() public view {
         // Delimited, this would be 0xFE71|02|0100|FF...FF|00
         bytes memory bytecode =
             hex"FE71020100FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00";
diff --git a/packages/contracts-bedrock/test/libraries/TransientContext.t.sol b/packages/contracts-bedrock/test/libraries/TransientContext.t.sol
index a7b414ad3882..20e8434b9c16 100644
--- a/packages/contracts-bedrock/test/libraries/TransientContext.t.sol
+++ b/packages/contracts-bedrock/test/libraries/TransientContext.t.sol
@@ -88,7 +88,7 @@ contract TransientContextTest is Test {
     /// @param _slot    Slot to test.
     /// @param _value1  Value to write to slot at call depth 0.
     /// @param _value2  Value to write to slot at call depth 1.
-    function testFuzz_setGet_twice_sameDepth_succeeds(bytes32 _slot, uint256 _value1, uint256 _value2) public {
+    function testFuzz_setGet_twiceSameDepth_succeeds(bytes32 _slot, uint256 _value1, uint256 _value2) public {
         assertEq(TransientContext.callDepth(), 0);
         testFuzz_set_succeeds(_slot, _value1);
         assertEq(TransientContext.get(_slot), _value1);
@@ -102,7 +102,7 @@ contract TransientContextTest is Test {
     /// @param _slot    Slot to test.
     /// @param _value1  Value to write to slot at call depth 0.
     /// @param _value2  Value to write to slot at call depth 1.
-    function testFuzz_setGet_twice_differentDepth_succeeds(bytes32 _slot, uint256 _value1, uint256 _value2) public {
+    function testFuzz_setGet_twiceDifferentDepth_succeeds(bytes32 _slot, uint256 _value1, uint256 _value2) public {
         assertEq(TransientContext.callDepth(), 0);
         testFuzz_set_succeeds(_slot, _value1);
         assertEq(TransientContext.get(_slot), _value1);
diff --git a/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol b/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
index 58912409a09c..7126ce25efaf 100644
--- a/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployAuthSystem.t.sol
@@ -30,7 +30,7 @@ contract DeployAuthSystemInput_Test is Test {
         }
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         vm.expectRevert("DeployAuthSystemInput: threshold not set");
         dasi.threshold();
 
@@ -38,7 +38,7 @@ contract DeployAuthSystemInput_Test is Test {
         dasi.owners();
     }
 
-    function test_setters_ownerAlreadySet_revert() public {
+    function test_setters_ownerAlreadySet_reverts() public {
         dasi.set(dasi.owners.selector, owners);
 
         vm.expectRevert("DeployAuthSystemInput: owners already set");
@@ -135,7 +135,7 @@ contract DeployAuthSystem_Test is Test {
         daso.checkOutput();
     }
 
-    function test_run_NullInput_reverts() public {
+    function test_run_nullInput_reverts() public {
         dasi.set(dasi.owners.selector, defaultOwners);
         dasi.set(dasi.threshold.selector, defaultThreshold);
 
diff --git a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
index d01ef6a387b2..0282ea0b3d90 100644
--- a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
@@ -44,7 +44,7 @@ contract DeployImplementationsInput_Test is Test {
         dii = new DeployImplementationsInput();
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         vm.expectRevert("DeployImplementationsInput: not set");
         dii.withdrawalDelaySeconds();
 
@@ -157,7 +157,7 @@ contract DeployImplementationsOutput_Test is Test {
         assertEq(address(disputeGameFactoryImpl), address(dio.disputeGameFactoryImpl()), "950");
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         bytes memory expectedErr = "DeployUtils: zero address";
 
         vm.expectRevert(expectedErr);
@@ -335,7 +335,7 @@ contract DeployImplementations_Test is Test {
         assertEq(srDisputeGameFactoryImpl, address(dio.disputeGameFactoryImpl()));
     }
 
-    function test_deployAtNonExistentRelease_reverts() public {
+    function test_deploy_atNonExistentRelease_reverts() public {
         string memory unknownRelease = "op-contracts/v0.0.0";
         dii.set(dii.release.selector, unknownRelease);
 
@@ -390,7 +390,7 @@ contract DeployImplementations_Test is Test {
         deployImplementations.deployDisputeGameFactoryImpl(dii, dio);
     }
 
-    function test_noContractExistsAtRelease_reverts() public {
+    function test_deploy_noContractExistsAtRelease_reverts() public {
         string memory unknownRelease = "op-contracts/v1.3.0";
         dii.set(dii.release.selector, unknownRelease);
         bytes memory expectedErr =
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
index 54e0e456def3..5249ded41cc9 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
@@ -78,7 +78,7 @@ contract DeployOPChainInput_Test is Test {
         assertEq(true, doi.allowCustomDisputeParameters(), "1200");
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         bytes memory expectedErr = "DeployOPChainInput: not set";
 
         vm.expectRevert(expectedErr);
@@ -182,7 +182,7 @@ contract DeployOPChainOutput_Test is Test {
         // "1600");
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         bytes memory expectedErr = "DeployUtils: zero address";
 
         vm.expectRevert(expectedErr);
@@ -427,7 +427,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         return keccak256(abi.encode(_seed, _i));
     }
 
-    function testFuzz_run_memory_succeed(bytes32 _seed) public {
+    function testFuzz_run_memory_succeeds(bytes32 _seed) public {
         opChainProxyAdminOwner = address(uint160(uint256(hash(_seed, 0))));
         systemConfigOwner = address(uint160(uint256(hash(_seed, 1))));
         batcher = address(uint160(uint256(hash(_seed, 2))));
@@ -541,7 +541,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         deployOPChain.run(doi, doo);
     }
 
-    function test_customDisputeGame_customEnabled_doesNotRevert() public {
+    function test_customDisputeGame_customEnabled_succeeds() public {
         setDOI();
         doi.set(doi.allowCustomDisputeParameters.selector, true);
         doi.set(doi.disputeSplitDepth.selector, disputeSplitDepth + 1);
diff --git a/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol b/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
index 15e24f470f1c..924957cc1800 100644
--- a/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
@@ -24,7 +24,7 @@ contract DeploySuperchainInput_Test is Test {
         dsi = new DeploySuperchainInput();
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         vm.expectRevert("DeploySuperchainInput: superchainProxyAdminOwner not set");
         dsi.superchainProxyAdminOwner();
 
@@ -83,7 +83,7 @@ contract DeploySuperchainOutput_Test is Test {
         assertEq(address(protocolVersionsProxy), address(dso.protocolVersionsProxy()), "500");
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         vm.expectRevert("DeployUtils: zero address");
         dso.superchainConfigImpl();
 
@@ -194,7 +194,7 @@ contract DeploySuperchain_Test is Test {
         dso.checkOutput(dsi);
     }
 
-    function test_run_NullInput_reverts() public {
+    function test_run_nullInput_reverts() public {
         // Set default values for all inputs.
         dsi.set(dsi.superchainProxyAdminOwner.selector, defaultProxyAdminOwner);
         dsi.set(dsi.protocolVersionsOwner.selector, defaultProtocolVersionsOwner);
diff --git a/packages/contracts-bedrock/test/safe/DeployOwnership.t.sol b/packages/contracts-bedrock/test/safe/DeployOwnership.t.sol
index 973b888ddf68..835b05b80f6b 100644
--- a/packages/contracts-bedrock/test/safe/DeployOwnership.t.sol
+++ b/packages/contracts-bedrock/test/safe/DeployOwnership.t.sol
@@ -42,7 +42,7 @@ contract DeployOwnershipTest is Test, DeployOwnership {
 
     /// @dev Test the example Foundation Safe configurations, against the expected configuration, and
     ///     check that they both have the same configuration.
-    function test_exampleFoundationSafes() public {
+    function test_exampleFoundationSafes_configuration_succeeds() public {
         Safe upgradeSafe = Safe(payable(mustGetAddress("FoundationUpgradeSafe")));
         Safe operationsSafe = Safe(payable(mustGetAddress("FoundationOperationsSafe")));
         SafeConfig memory exampleFoundationConfig = _getExampleFoundationConfig();
@@ -57,7 +57,7 @@ contract DeployOwnershipTest is Test, DeployOwnership {
     }
 
     /// @dev Test the example Security Council Safe configuration.
-    function test_exampleSecurityCouncilSafe() public {
+    function test_exampleSecurityCouncilSafe_configuration_succeeds() public {
         Safe securityCouncilSafe = Safe(payable(mustGetAddress("SecurityCouncilSafe")));
         SecurityCouncilConfig memory exampleSecurityCouncilConfig = _getExampleCouncilConfig();
 
@@ -96,7 +96,7 @@ contract DeployOwnershipTest is Test, DeployOwnership {
     }
 
     /// @dev Test the example Guardian Safe configuration.
-    function test_exampleGuardianSafe() public view {
+    function test_exampleGuardianSafe_configuration_succeeds() public view {
         Safe guardianSafe = Safe(payable(mustGetAddress("GuardianSafe")));
         address[] memory owners = new address[](1);
         owners[0] = mustGetAddress("SecurityCouncilSafe");
diff --git a/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol b/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
index 68ddddec5b37..a7b67b415b22 100644
--- a/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
+++ b/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
@@ -68,7 +68,7 @@ contract LivenessGuard_Getters_Test is LivenessGuard_TestInit {
 
 contract LivenessGuard_CheckTx_TestFails is LivenessGuard_TestInit {
     /// @dev Tests that the checkTransaction function reverts if the caller is not the Safe
-    function test_checkTransaction_callerIsNotSafe_revert() external {
+    function test_checkTransaction_callerIsNotSafe_reverts() external {
         vm.expectRevert("LivenessGuard: only Safe can call this function");
         livenessGuard.checkTransaction({
             _to: address(0),
@@ -123,7 +123,7 @@ contract LivenessGuard_CheckTx_Test is LivenessGuard_TestInit {
 
 contract LivenessGuard_CheckAfterExecution_TestFails is LivenessGuard_TestInit {
     /// @dev Tests that the checkAfterExecution function reverts if the caller is not the Safe
-    function test_checkAfterExecution_callerIsNotSafe_revert() external {
+    function test_checkAfterExecution_callerIsNotSafe_reverts() external {
         vm.expectRevert("LivenessGuard: only Safe can call this function");
         livenessGuard.checkAfterExecution(bytes32(0), false);
     }
@@ -229,7 +229,7 @@ contract LivenessGuard_FuzzOwnerManagement_Test is StdCheats, StdUtils, Liveness
 
     /// @dev Tests that the guard correctly manages the lastLive mapping when owners are added, removed, or swapped
     /// forge-config: ciheavy.fuzz.runs = 8192
-    function testFuzz_OwnerManagement_works(
+    function testFuzz_ownerManagement_works(
         uint256 initialOwners,
         uint256 threshold,
         OwnerChange[] memory changes
diff --git a/packages/contracts-bedrock/test/safe/LivenessModule.t.sol b/packages/contracts-bedrock/test/safe/LivenessModule.t.sol
index e101f59ca5a4..5a6a30950227 100644
--- a/packages/contracts-bedrock/test/safe/LivenessModule.t.sol
+++ b/packages/contracts-bedrock/test/safe/LivenessModule.t.sol
@@ -488,7 +488,7 @@ contract LivenessModule_RemoveOwnersFuzz_Test is LivenessModule_TestInit {
     }
 
     /// @dev Tests if removing owners works correctly for various safe configurations and numbeers of live owners
-    function testFuzz_removeOwners(
+    function testFuzz_removeOwners_works(
         uint256 _numOwners,
         uint256 _minOwners,
         uint256 _numLiveOwners,
diff --git a/packages/contracts-bedrock/test/setup/DeployVariations.t.sol b/packages/contracts-bedrock/test/setup/DeployVariations.t.sol
index 348d3d8e5237..31f687f0fdb8 100644
--- a/packages/contracts-bedrock/test/setup/DeployVariations.t.sol
+++ b/packages/contracts-bedrock/test/setup/DeployVariations.t.sol
@@ -24,7 +24,7 @@ contract DeployVariations_Test is CommonTest {
 
     /// forge-config: ciheavy.fuzz.runs = 512
     /// @dev It should be possible to enable Fault Proofs with any mix of CGT and Alt-DA.
-    function testFuzz_enableFaultProofs(bool _enableCGT, bool _enableAltDa) public virtual {
+    function testFuzz_enableFaultProofs_succeeds(bool _enableCGT, bool _enableAltDa) public virtual {
         enableAddOns(_enableCGT, _enableAltDa);
 
         super.setUp();
@@ -32,7 +32,7 @@ contract DeployVariations_Test is CommonTest {
 
     /// forge-config: ciheavy.fuzz.runs = 512
     /// @dev It should be possible to enable Fault Proofs and Interop with any mix of CGT and Alt-DA.
-    function test_enableInteropAndFaultProofs(bool _enableCGT, bool _enableAltDa) public virtual {
+    function test_enableInteropAndFaultProofs_succeeds(bool _enableCGT, bool _enableAltDa) public virtual {
         enableAddOns(_enableCGT, _enableAltDa);
         super.enableInterop();
 
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
index 19b156e2f6e6..18e080372745 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
@@ -47,11 +47,11 @@ contract OptimismMintableERC20_Test is Bridge_Initializer {
         assertEq(L2Token.balanceOf(alice), 100);
     }
 
-    function test_allowance_permit2_max() external view {
+    function test_allowance_permit2Max_works() external view {
         assertEq(L2Token.allowance(alice, L2Token.PERMIT2()), type(uint256).max);
     }
 
-    function test_permit2_transferFrom() external {
+    function test_permit2_transferFrom_succeeds() external {
         vm.prank(address(l2StandardBridge));
         L2Token.mint(alice, 100);
 
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index 9c22e178a5f4..5150b4d725dd 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -952,7 +952,7 @@ contract Specification_Test is CommonTest {
     }
 
     /// @notice Ensures that there's an auth spec for every L1 contract function.
-    function testContractAuth() public {
+    function test_contractAuth_works() public {
         string[] memory pathExcludes = new string[](6);
         pathExcludes[0] = "src/dispute/interfaces/*";
         pathExcludes[1] = "src/dispute/lib/*";
@@ -1002,7 +1002,7 @@ contract Specification_Test is CommonTest {
     }
 
     /// @notice Ensures that the DeputyGuardian is authorized to take all Guardian actions.
-    function testDeputyGuardianAuth() public view {
+    function test_deputyGuardianAuth_works() public view {
         assertEq(specsByRole[Role.DEPUTYGUARDIAN].length, specsByRole[Role.GUARDIAN].length);
         assertEq(specsByRole[Role.DEPUTYGUARDIAN].length, 5);
 

From 6ea4e40b2133315174f15fbc80f071ce3791f8a8 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 7 Nov 2024 21:33:49 +0100
Subject: [PATCH 156/451] merge bridge initializer into common test (#12795)

* merge bridge initializer into common test

* gas snapshot

* remove duplicate import
---
 packages/contracts-bedrock/.gas-snapshot      |  4 +-
 .../test/L1/L1CrossDomainMessenger.t.sol      |  6 +-
 .../test/L1/L1ERC721Bridge.t.sol              |  8 +--
 .../test/L1/L1StandardBridge.t.sol            | 42 +++++------
 .../test/L2/BaseFeeVault.t.sol                |  4 +-
 .../test/L2/CrossDomainOwnable2.t.sol         |  4 +-
 .../test/L2/CrossDomainOwnable3.t.sol         |  4 +-
 .../test/L2/L1FeeVault.t.sol                  |  4 +-
 .../test/L2/L2CrossDomainMessenger.t.sol      |  4 +-
 .../test/L2/L2ERC721Bridge.t.sol              |  4 +-
 .../test/L2/L2StandardBridge.t.sol            | 12 ++--
 .../test/L2/L2StandardBridgeInterop.t.sol     |  4 +-
 .../L2/OptimismSuperchainERC20Beacon.t.sol    |  4 +-
 .../L2/OptimismSuperchainERC20Factory.t.sol   |  4 +-
 .../test/L2/SuperchainTokenBridge.t.sol       |  4 +-
 .../invariants/CrossDomainMessenger.t.sol     |  5 +-
 .../test/setup/Bridge_Initializer.sol         | 69 -------------------
 .../test/setup/CommonTest.sol                 | 62 ++++++++++++++++-
 .../test/universal/BenchmarkTest.t.sol        |  7 +-
 .../test/universal/CrossDomainMessenger.t.sol |  6 +-
 .../universal/OptimismMintableERC20.t.sol     |  4 +-
 .../OptimismMintableERC20Factory.t.sol        |  4 +-
 .../universal/OptimismMintableERC721.t.sol    |  4 +-
 .../OptimismMintableERC721Factory.t.sol       |  5 +-
 .../test/vendor/Initializable.t.sol           |  7 +-
 25 files changed, 136 insertions(+), 149 deletions(-)
 delete mode 100644 packages/contracts-bedrock/test/setup/Bridge_Initializer.sol

diff --git a/packages/contracts-bedrock/.gas-snapshot b/packages/contracts-bedrock/.gas-snapshot
index 1b1a01905ba5..2ab3157a714e 100644
--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
@@ -5,7 +5,7 @@ GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_b
 GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158531)
 GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369280)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967420)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967465)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564398)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076613)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467098)
@@ -14,4 +14,4 @@ GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (g
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68422)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68986)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155610)
\ No newline at end of file
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155565)
\ No newline at end of file
diff --git a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
index 9ef537e435b3..23c1365e9156 100644
--- a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 import { Reverter } from "test/mocks/Callers.sol";
 
 // Libraries
@@ -17,7 +17,7 @@ import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 
-contract L1CrossDomainMessenger_Test is Bridge_Initializer {
+contract L1CrossDomainMessenger_Test is CommonTest {
     /// @dev The receiver address
     address recipient = address(0xabbaacdc);
 
@@ -742,7 +742,7 @@ contract L1CrossDomainMessenger_Test is Bridge_Initializer {
 
 /// @dev A regression test against a reentrancy vulnerability in the CrossDomainMessenger contract, which
 ///      was possible by intercepting and sandwhiching a signed Safe Transaction to upgrade it.
-contract L1CrossDomainMessenger_ReinitReentryTest is Bridge_Initializer {
+contract L1CrossDomainMessenger_ReinitReentryTest is CommonTest {
     bool attacked;
 
     // Common values used across functions
diff --git a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
index 055ba45d0e1b..3949bf30f4eb 100644
--- a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Contracts
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
@@ -25,7 +25,7 @@ contract TestERC721 is ERC721 {
     }
 }
 
-contract L1ERC721Bridge_Test is Bridge_Initializer {
+contract L1ERC721Bridge_Test is CommonTest {
     TestERC721 internal localToken;
     TestERC721 internal remoteToken;
     uint256 internal constant tokenId = 1;
@@ -315,7 +315,7 @@ contract L1ERC721Bridge_Test is Bridge_Initializer {
     }
 }
 
-contract L1ERC721Bridge_Pause_Test is Bridge_Initializer {
+contract L1ERC721Bridge_Pause_Test is CommonTest {
     /// @dev Verifies that the `paused` accessor returns the same value as the `paused` function of the
     ///      `superchainConfig`.
     function test_paused_succeeds() external view {
@@ -343,7 +343,7 @@ contract L1ERC721Bridge_Pause_Test is Bridge_Initializer {
     }
 }
 
-contract L1ERC721Bridge_Pause_TestFail is Bridge_Initializer {
+contract L1ERC721Bridge_Pause_TestFail is CommonTest {
     /// @dev Sets up the test by pausing the bridge, giving ether to the bridge and mocking
     ///      the calls to the xDomainMessageSender so that it returns the correct value.
     function setUp() public override {
diff --git a/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol b/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
index 760f602df21e..97ef01262ab6 100644
--- a/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 // Testing
 import { stdStorage, StdStorage } from "forge-std/Test.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
@@ -19,7 +19,7 @@ import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
 
-contract L1StandardBridge_Getter_Test is Bridge_Initializer {
+contract L1StandardBridge_Getter_Test is CommonTest {
     /// @dev Test that the accessors return the correct initialized values.
     function test_getters_succeeds() external view {
         assert(l1StandardBridge.l2TokenBridge() == address(l2StandardBridge));
@@ -31,7 +31,7 @@ contract L1StandardBridge_Getter_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_Initialize_Test is Bridge_Initializer {
+contract L1StandardBridge_Initialize_Test is CommonTest {
     /// @dev Test that the constructor sets the correct values.
     /// @notice Marked virtual to be overridden in
     ///         test/kontrol/deployment/DeploymentSummary.t.sol
@@ -58,7 +58,7 @@ contract L1StandardBridge_Initialize_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_Pause_Test is Bridge_Initializer {
+contract L1StandardBridge_Pause_Test is CommonTest {
     /// @dev Verifies that the `paused` accessor returns the same value as the `paused` function of the
     ///      `superchainConfig`.
     function test_paused_succeeds() external view {
@@ -86,7 +86,7 @@ contract L1StandardBridge_Pause_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_Pause_TestFail is Bridge_Initializer {
+contract L1StandardBridge_Pause_TestFail is CommonTest {
     /// @dev Sets up the test by pausing the bridge, giving ether to the bridge and mocking
     ///      the calls to the xDomainMessageSender so that it returns the correct value.
     function setUp() public override {
@@ -157,9 +157,9 @@ contract L1StandardBridge_Pause_TestFail is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_Initialize_TestFail is Bridge_Initializer { }
+contract L1StandardBridge_Initialize_TestFail is CommonTest { }
 
-contract L1StandardBridge_Receive_Test is Bridge_Initializer {
+contract L1StandardBridge_Receive_Test is CommonTest {
     /// @dev Tests receive bridges ETH successfully.
     function test_receive_succeeds() external {
         assertEq(address(optimismPortal).balance, 0);
@@ -190,7 +190,7 @@ contract L1StandardBridge_Receive_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_Receive_TestFail is Bridge_Initializer {
+contract L1StandardBridge_Receive_TestFail is CommonTest {
     /// @dev Tests receive function reverts with custom gas token.
     function testFuzz_receive_customGasToken_reverts(uint256 _value) external {
         vm.prank(alice, alice);
@@ -207,7 +207,7 @@ contract L1StandardBridge_Receive_TestFail is Bridge_Initializer {
     }
 }
 
-contract PreBridgeETH is Bridge_Initializer {
+contract PreBridgeETH is CommonTest {
     /// @dev Asserts the expected calls and events for bridging ETH depending
     ///      on whether the bridge call is legacy or not.
     function _preBridgeETH(bool isLegacy, uint256 value) internal {
@@ -285,7 +285,7 @@ contract L1StandardBridge_DepositETH_Test is PreBridgeETH {
     }
 }
 
-contract L1StandardBridge_DepositETH_TestFail is Bridge_Initializer {
+contract L1StandardBridge_DepositETH_TestFail is CommonTest {
     /// @dev Tests that depositing ETH reverts if the call is not from an EOA.
     function test_depositETH_notEoa_reverts() external {
         vm.etch(alice, address(L1Token).code);
@@ -331,7 +331,7 @@ contract L1StandardBridge_BridgeETH_TestFail is PreBridgeETH {
     }
 }
 
-contract PreBridgeETHTo is Bridge_Initializer {
+contract PreBridgeETHTo is CommonTest {
     /// @dev Asserts the expected calls and events for bridging ETH to a different
     ///      address depending on whether the bridge call is legacy or not.
     function _preBridgeETHTo(bool isLegacy, uint256 value) internal {
@@ -411,7 +411,7 @@ contract L1StandardBridge_DepositETHTo_Test is PreBridgeETHTo {
     }
 }
 
-contract L1StandardBridge_DepositETHTo_TestFail is Bridge_Initializer {
+contract L1StandardBridge_DepositETHTo_TestFail is CommonTest {
     /// @dev Tests that depositETHTo reverts with custom gas token.
     function testFuzz_depositETHTo_customGasToken_reverts(
         uint256 _value,
@@ -463,7 +463,7 @@ contract L1StandardBridge_BridgeETHTo_TestFail is PreBridgeETHTo {
     }
 }
 
-contract L1StandardBridge_DepositERC20_Test is Bridge_Initializer {
+contract L1StandardBridge_DepositERC20_Test is CommonTest {
     using stdStorage for StdStorage;
 
     // depositERC20
@@ -540,7 +540,7 @@ contract L1StandardBridge_DepositERC20_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_DepositERC20_TestFail is Bridge_Initializer {
+contract L1StandardBridge_DepositERC20_TestFail is CommonTest {
     /// @dev Tests that depositing an ERC20 to the bridge reverts
     ///      if the caller is not an EOA.
     function test_depositERC20_notEoa_reverts() external {
@@ -553,7 +553,7 @@ contract L1StandardBridge_DepositERC20_TestFail is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
+contract L1StandardBridge_DepositERC20To_Test is CommonTest {
     /// @dev Tests that depositing ERC20 to the bridge succeeds when
     ///      sent to a different address.
     ///      Bridge deposits are updated.
@@ -622,7 +622,7 @@ contract L1StandardBridge_DepositERC20To_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_FinalizeETHWithdrawal_Test is Bridge_Initializer {
+contract L1StandardBridge_FinalizeETHWithdrawal_Test is CommonTest {
     using stdStorage for StdStorage;
 
     /// @dev Tests that finalizing an ETH withdrawal succeeds.
@@ -654,7 +654,7 @@ contract L1StandardBridge_FinalizeETHWithdrawal_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_FinalizeETHWithdrawal_TestFail is Bridge_Initializer {
+contract L1StandardBridge_FinalizeETHWithdrawal_TestFail is CommonTest {
     /// @dev Tests that finalizeETHWithdrawal reverts with custom gas token.
     function testFuzz_finalizeETHWithdrawal_customGasToken_reverts(
         uint256 _value,
@@ -678,7 +678,7 @@ contract L1StandardBridge_FinalizeETHWithdrawal_TestFail is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_FinalizeERC20Withdrawal_Test is Bridge_Initializer {
+contract L1StandardBridge_FinalizeERC20Withdrawal_Test is CommonTest {
     using stdStorage for StdStorage;
 
     /// @dev Tests that finalizing an ERC20 withdrawal succeeds.
@@ -717,7 +717,7 @@ contract L1StandardBridge_FinalizeERC20Withdrawal_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_FinalizeERC20Withdrawal_TestFail is Bridge_Initializer {
+contract L1StandardBridge_FinalizeERC20Withdrawal_TestFail is CommonTest {
     /// @dev Tests that finalizing an ERC20 withdrawal reverts if the caller is not the L2 bridge.
     function test_finalizeERC20Withdrawal_notMessenger_reverts() external {
         vm.mockCall(
@@ -743,7 +743,7 @@ contract L1StandardBridge_FinalizeERC20Withdrawal_TestFail is Bridge_Initializer
     }
 }
 
-contract L1StandardBridge_FinalizeBridgeETH_Test is Bridge_Initializer {
+contract L1StandardBridge_FinalizeBridgeETH_Test is CommonTest {
     /// @dev Tests that finalizing bridged ETH succeeds.
     function test_finalizeBridgeETH_succeeds() external {
         address messenger = address(l1StandardBridge.messenger());
@@ -762,7 +762,7 @@ contract L1StandardBridge_FinalizeBridgeETH_Test is Bridge_Initializer {
     }
 }
 
-contract L1StandardBridge_FinalizeBridgeETH_TestFail is Bridge_Initializer {
+contract L1StandardBridge_FinalizeBridgeETH_TestFail is CommonTest {
     /// @dev Tests that finalizing bridged reverts with custom gas token.
     function testFuzz_finalizeBridgeETH_customGasToken_reverts(uint256 _value, bytes calldata _extraData) external {
         vm.mockCall(
diff --git a/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol b/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
index bf63a700c098..1864e1d07664 100644
--- a/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/BaseFeeVault.t.sol
@@ -2,13 +2,13 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Types } from "src/libraries/Types.sol";
 
 // Test the implementations of the FeeVault
-contract FeeVault_Test is Bridge_Initializer {
+contract FeeVault_Test is CommonTest {
     /// @dev Tests that the constructor sets the correct values.
     function test_constructor_baseFeeVault_succeeds() external view {
         assertEq(baseFeeVault.RECIPIENT(), deploy.cfg().baseFeeVaultRecipient());
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
index a80f633fede2..7bdbdaa9f708 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable2.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
@@ -23,7 +23,7 @@ contract XDomainSetter2 is CrossDomainOwnable2 {
     }
 }
 
-contract CrossDomainOwnable2_Test is Bridge_Initializer {
+contract CrossDomainOwnable2_Test is CommonTest {
     XDomainSetter2 setter;
 
     /// @dev Sets up the test suite.
diff --git a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
index 968910478198..e1bac7c784bb 100644
--- a/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossDomainOwnable3.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
@@ -23,7 +23,7 @@ contract XDomainSetter3 is CrossDomainOwnable3 {
     }
 }
 
-contract CrossDomainOwnable3_Test is Bridge_Initializer {
+contract CrossDomainOwnable3_Test is CommonTest {
     XDomainSetter3 setter;
 
     /// @dev CrossDomainOwnable3.sol transferOwnership event
diff --git a/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol b/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
index 03a3e7e5ad9b..5284054056d1 100644
--- a/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1FeeVault.t.sol
@@ -2,13 +2,13 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Types } from "src/libraries/Types.sol";
 
 // Test the implementations of the FeeVault
-contract FeeVault_Test is Bridge_Initializer {
+contract FeeVault_Test is CommonTest {
     /// @dev Tests that the constructor sets the correct values.
     function test_constructor_l1FeeVault_succeeds() external view {
         assertEq(l1FeeVault.RECIPIENT(), deploy.cfg().l1FeeVaultRecipient());
diff --git a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
index a2cd9382ca84..131851783c79 100644
--- a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 import { Reverter } from "test/mocks/Callers.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
@@ -16,7 +16,7 @@ import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
 import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
 
-contract L2CrossDomainMessenger_Test is Bridge_Initializer {
+contract L2CrossDomainMessenger_Test is CommonTest {
     /// @dev Receiver address for testing
     address recipient = address(0xabbaacdc);
 
diff --git a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
index 58179cb93207..5e7798824c8d 100644
--- a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Contracts
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
@@ -33,7 +33,7 @@ contract TestMintableERC721 is OptimismMintableERC721 {
     }
 }
 
-contract L2ERC721Bridge_Test is Bridge_Initializer {
+contract L2ERC721Bridge_Test is CommonTest {
     TestMintableERC721 internal localToken;
     TestERC721 internal remoteToken;
     uint256 internal constant tokenId = 1;
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
index d703ec95f64e..86100b6e4d40 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
 // Testing
 import { stdStorage, StdStorage } from "forge-std/Test.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
@@ -21,7 +21,7 @@ import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
 import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
 import { IL2StandardBridge } from "src/L2/interfaces/IL2StandardBridge.sol";
 
-contract L2StandardBridge_Test is Bridge_Initializer {
+contract L2StandardBridge_Test is CommonTest {
     using stdStorage for StdStorage;
 
     /// @dev Test that the bridge's constructor sets the correct values.
@@ -275,7 +275,7 @@ contract L2StandardBridge_Test is Bridge_Initializer {
     }
 }
 
-contract PreBridgeERC20 is Bridge_Initializer {
+contract PreBridgeERC20 is CommonTest {
     /// @dev Sets up expected calls and emits for a successful ERC20 withdrawal.
     function _preBridgeERC20(bool _isLegacy, address _l2Token) internal {
         // Alice has 100 L2Token
@@ -401,7 +401,7 @@ contract L2StandardBridge_BridgeERC20_Test is PreBridgeERC20 {
     }
 }
 
-contract PreBridgeERC20To is Bridge_Initializer {
+contract PreBridgeERC20To is CommonTest {
     // withdrawTo and BridgeERC20To should behave the same when transferring ERC20 tokens
     // so they should share the same setup and expectEmit calls
     function _preBridgeERC20To(bool _isLegacy, address _l2Token) internal {
@@ -501,7 +501,7 @@ contract L2StandardBridge_BridgeERC20To_Test is PreBridgeERC20To {
     }
 }
 
-contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
+contract L2StandardBridge_Bridge_Test is CommonTest {
     /// @dev Tests that `finalizeBridgeETH` reverts if the recipient is the other bridge.
     function test_finalizeBridgeETH_sendToSelf_reverts() external {
         vm.mockCall(
@@ -622,7 +622,7 @@ contract L2StandardBridge_Bridge_Test is Bridge_Initializer {
     }
 }
 
-contract L2StandardBridge_FinalizeBridgeETH_Test is Bridge_Initializer {
+contract L2StandardBridge_FinalizeBridgeETH_Test is CommonTest {
     /// @dev Tests that `finalizeBridgeETH` succeeds.
     function test_finalizeBridgeETH_succeeds() external {
         address messenger = address(l2StandardBridge.messenger());
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
index fdfd1b0ec6d3..30212d7ad622 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Interfaces
 import { IMintableAndBurnableERC20 } from "src/L2/interfaces/IMintableAndBurnableERC20.sol";
@@ -13,7 +13,7 @@ import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintab
 import { ILegacyMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
 
-contract L2StandardBridgeInterop_Test is Bridge_Initializer {
+contract L2StandardBridgeInterop_Test is CommonTest {
     /// @notice Emitted when a conversion is made.
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol
index 4de8b06b8ee0..8a6a77014698 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Beacon.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -10,7 +10,7 @@ import { IBeacon } from "@openzeppelin/contracts/proxy/beacon/IBeacon.sol";
 
 /// @title OptimismSuperchainERC20BeaconTest
 /// @notice Contract for testing the OptimismSuperchainERC20Beacon contract.
-contract OptimismSuperchainERC20BeaconTest is Bridge_Initializer {
+contract OptimismSuperchainERC20BeaconTest is CommonTest {
     /// @notice Sets up the test suite.
     function setUp() public override {
         super.enableInterop();
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol
index 15630a15d8eb..d8d7f86f26a2 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { CREATE3, Bytes32AddressLib } from "@rari-capital/solmate/src/utils/CREATE3.sol";
@@ -13,7 +13,7 @@ import { IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadat
 
 /// @title OptimismSuperchainERC20FactoryTest
 /// @notice Contract for testing the OptimismSuperchainERC20Factory contract.
-contract OptimismSuperchainERC20FactoryTest is Bridge_Initializer {
+contract OptimismSuperchainERC20FactoryTest is CommonTest {
     using Bytes32AddressLib for bytes32;
 
     event OptimismSuperchainERC20Created(
diff --git a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
index 1dc01ba0008e..3c39e8b1792c 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing utilities
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -17,7 +17,7 @@ import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
 
 /// @title SuperchainTokenBridgeTest
 /// @notice Contract for testing the SuperchainTokenBridge contract.
-contract SuperchainTokenBridgeTest is Bridge_Initializer {
+contract SuperchainTokenBridgeTest is CommonTest {
     address internal constant ZERO_ADDRESS = address(0);
     string internal constant NAME = "SuperchainERC20";
     string internal constant SYMBOL = "OSE";
diff --git a/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol
index 08a0c0027763..3bf4ad3f7b3a 100644
--- a/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol
@@ -5,12 +5,11 @@ import { StdUtils } from "forge-std/StdUtils.sol";
 import { Vm } from "forge-std/Vm.sol";
 import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 
 contract RelayActor is StdUtils {
     // Storage slot of the l2Sender
@@ -88,7 +87,7 @@ contract RelayActor is StdUtils {
     }
 }
 
-contract XDM_MinGasLimits is Bridge_Initializer {
+contract XDM_MinGasLimits is CommonTest {
     RelayActor actor;
 
     function init(bool doFail) public virtual {
diff --git a/packages/contracts-bedrock/test/setup/Bridge_Initializer.sol b/packages/contracts-bedrock/test/setup/Bridge_Initializer.sol
deleted file mode 100644
index 6b931712935e..000000000000
--- a/packages/contracts-bedrock/test/setup/Bridge_Initializer.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { CommonTest } from "test/setup/CommonTest.sol";
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
-import { LegacyMintableERC20 } from "src/legacy/LegacyMintableERC20.sol";
-
-/// @title Bridge_Initializer
-/// @dev This contract extends the CommonTest contract with token deployments
-///      meant to be used with the bridge contracts.
-contract Bridge_Initializer is CommonTest {
-    ERC20 L1Token;
-    ERC20 BadL1Token;
-    OptimismMintableERC20 L2Token;
-    LegacyMintableERC20 LegacyL2Token;
-    ERC20 NativeL2Token;
-    ERC20 BadL2Token;
-    OptimismMintableERC20 RemoteL1Token;
-
-    function setUp() public virtual override {
-        super.setUp();
-
-        L1Token = new ERC20("Native L1 Token", "L1T");
-
-        LegacyL2Token = new LegacyMintableERC20({
-            _l2Bridge: address(l2StandardBridge),
-            _l1Token: address(L1Token),
-            _name: string.concat("LegacyL2-", L1Token.name()),
-            _symbol: string.concat("LegacyL2-", L1Token.symbol())
-        });
-        vm.label(address(LegacyL2Token), "LegacyMintableERC20");
-
-        // Deploy the L2 ERC20 now
-        L2Token = OptimismMintableERC20(
-            l2OptimismMintableERC20Factory.createStandardL2Token(
-                address(L1Token),
-                string(abi.encodePacked("L2-", L1Token.name())),
-                string(abi.encodePacked("L2-", L1Token.symbol()))
-            )
-        );
-
-        BadL2Token = OptimismMintableERC20(
-            l2OptimismMintableERC20Factory.createStandardL2Token(
-                address(1),
-                string(abi.encodePacked("L2-", L1Token.name())),
-                string(abi.encodePacked("L2-", L1Token.symbol()))
-            )
-        );
-
-        NativeL2Token = new ERC20("Native L2 Token", "L2T");
-
-        RemoteL1Token = OptimismMintableERC20(
-            l1OptimismMintableERC20Factory.createStandardL2Token(
-                address(NativeL2Token),
-                string(abi.encodePacked("L1-", NativeL2Token.name())),
-                string(abi.encodePacked("L1-", NativeL2Token.symbol()))
-            )
-        );
-
-        BadL1Token = OptimismMintableERC20(
-            l1OptimismMintableERC20Factory.createStandardL2Token(
-                address(1),
-                string(abi.encodePacked("L1-", NativeL2Token.name())),
-                string(abi.encodePacked("L1-", NativeL2Token.symbol()))
-            )
-        );
-    }
-}
diff --git a/packages/contracts-bedrock/test/setup/CommonTest.sol b/packages/contracts-bedrock/test/setup/CommonTest.sol
index 679ce200559c..93ede20b629e 100644
--- a/packages/contracts-bedrock/test/setup/CommonTest.sol
+++ b/packages/contracts-bedrock/test/setup/CommonTest.sol
@@ -6,7 +6,9 @@ import { Setup } from "test/setup/Setup.sol";
 import { Events } from "test/setup/Events.sol";
 import { FFIInterface } from "test/setup/FFIInterface.sol";
 import { Constants } from "src/libraries/Constants.sol";
-import "scripts/deploy/DeployConfig.s.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
+import { LegacyMintableERC20 } from "src/legacy/LegacyMintableERC20.sol";
 
 /// @title CommonTest
 /// @dev An extenstion to `Test` that sets up the optimism smart contracts.
@@ -23,6 +25,14 @@ contract CommonTest is Test, Setup, Events {
     address customGasToken;
     bool useInteropOverride;
 
+    ERC20 L1Token;
+    ERC20 BadL1Token;
+    OptimismMintableERC20 L2Token;
+    LegacyMintableERC20 LegacyL2Token;
+    ERC20 NativeL2Token;
+    ERC20 BadL2Token;
+    OptimismMintableERC20 RemoteL1Token;
+
     function setUp() public virtual override {
         alice = makeAddr("alice");
         bob = makeAddr("bob");
@@ -65,6 +75,56 @@ contract CommonTest is Test, Setup, Events {
         Setup.L1();
         // Deploy L2
         Setup.L2();
+
+        // Call bridge initializer setup function
+        bridgeInitializerSetUp();
+    }
+
+    function bridgeInitializerSetUp() public {
+        L1Token = new ERC20("Native L1 Token", "L1T");
+
+        LegacyL2Token = new LegacyMintableERC20({
+            _l2Bridge: address(l2StandardBridge),
+            _l1Token: address(L1Token),
+            _name: string.concat("LegacyL2-", L1Token.name()),
+            _symbol: string.concat("LegacyL2-", L1Token.symbol())
+        });
+        vm.label(address(LegacyL2Token), "LegacyMintableERC20");
+
+        // Deploy the L2 ERC20 now
+        L2Token = OptimismMintableERC20(
+            l2OptimismMintableERC20Factory.createStandardL2Token(
+                address(L1Token),
+                string(abi.encodePacked("L2-", L1Token.name())),
+                string(abi.encodePacked("L2-", L1Token.symbol()))
+            )
+        );
+
+        BadL2Token = OptimismMintableERC20(
+            l2OptimismMintableERC20Factory.createStandardL2Token(
+                address(1),
+                string(abi.encodePacked("L2-", L1Token.name())),
+                string(abi.encodePacked("L2-", L1Token.symbol()))
+            )
+        );
+
+        NativeL2Token = new ERC20("Native L2 Token", "L2T");
+
+        RemoteL1Token = OptimismMintableERC20(
+            l1OptimismMintableERC20Factory.createStandardL2Token(
+                address(NativeL2Token),
+                string(abi.encodePacked("L1-", NativeL2Token.name())),
+                string(abi.encodePacked("L1-", NativeL2Token.symbol()))
+            )
+        );
+
+        BadL1Token = OptimismMintableERC20(
+            l1OptimismMintableERC20Factory.createStandardL2Token(
+                address(1),
+                string(abi.encodePacked("L1-", NativeL2Token.name())),
+                string(abi.encodePacked("L1-", NativeL2Token.symbol()))
+            )
+        );
     }
 
     /// @dev Helper function that wraps `TransactionDeposited` event.
diff --git a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
index a68cccf6862f..fd0a9bfc7847 100644
--- a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
+++ b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
@@ -5,7 +5,6 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
 
 // Libraries
 import { Types } from "src/libraries/Types.sol";
@@ -110,7 +109,7 @@ contract GasBenchMark_OptimismPortal is CommonTest {
     }
 }
 
-contract GasBenchMark_L1CrossDomainMessenger is Bridge_Initializer {
+contract GasBenchMark_L1CrossDomainMessenger is CommonTest {
     function test_sendMessage_benchmark_0() external {
         vm.pauseGasMetering();
         setPrevBaseFee(vm, address(optimismPortal), 1 gwei);
@@ -132,7 +131,7 @@ contract GasBenchMark_L1CrossDomainMessenger is Bridge_Initializer {
     }
 }
 
-contract GasBenchMark_L1StandardBridge_Deposit is Bridge_Initializer {
+contract GasBenchMark_L1StandardBridge_Deposit is CommonTest {
     function setUp() public virtual override {
         super.setUp();
         deal(address(L1Token), alice, 100000, true);
@@ -181,7 +180,7 @@ contract GasBenchMark_L1StandardBridge_Deposit is Bridge_Initializer {
     }
 }
 
-contract GasBenchMark_L1StandardBridge_Finalize is Bridge_Initializer {
+contract GasBenchMark_L1StandardBridge_Finalize is CommonTest {
     function setUp() public virtual override {
         super.setUp();
         deal(address(L1Token), address(l1StandardBridge), 100, true);
diff --git a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
index 065c3e1bc3fc..50398e4a8920 100644
--- a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Test } from "forge-std/Test.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -14,7 +14,7 @@ import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMesseng
 
 // CrossDomainMessenger_Test is for testing functionality which is common to both the L1 and L2
 // CrossDomainMessenger contracts. For simplicity, we use the L1 Messenger as the test contract.
-contract CrossDomainMessenger_BaseGas_Test is Bridge_Initializer {
+contract CrossDomainMessenger_BaseGas_Test is CommonTest {
     /// @dev Ensure that baseGas passes for the max value of _minGasLimit,
     ///      this is about 4 Billion.
     function test_baseGas_succeeds() external view {
@@ -110,7 +110,7 @@ contract ExternalRelay is Test {
 
 /// @title CrossDomainMessenger_RelayMessage_Test
 /// @notice Fuzz tests re-entrancy into the CrossDomainMessenger relayMessage function.
-contract CrossDomainMessenger_RelayMessage_Test is Bridge_Initializer {
+contract CrossDomainMessenger_RelayMessage_Test is CommonTest {
     // Storage slot of the l2Sender
     uint256 constant senderSlotIndex = 50;
 
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
index 18e080372745..d56a97b19db3 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
 import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-contract OptimismMintableERC20_Test is Bridge_Initializer {
+contract OptimismMintableERC20_Test is CommonTest {
     event Mint(address indexed account, uint256 amount);
     event Burn(address indexed account, uint256 amount);
 
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
index d146b050f387..74df9e729e83 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 import { NextImpl } from "test/mocks/NextImpl.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
@@ -14,7 +14,7 @@ import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC2
 import { IProxy } from "src/universal/interfaces/IProxy.sol";
 import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
 
-contract OptimismMintableTokenFactory_Test is Bridge_Initializer {
+contract OptimismMintableTokenFactory_Test is CommonTest {
     event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
     event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
 
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
index daea00064cf4..d22e0957a7df 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
@@ -5,10 +5,10 @@ import { ERC721, IERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol
 import { IERC721Enumerable } from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 import { OptimismMintableERC721, IOptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
 
-contract OptimismMintableERC721_Test is Bridge_Initializer {
+contract OptimismMintableERC721_Test is CommonTest {
     ERC721 internal L1NFT;
     OptimismMintableERC721 internal L2NFT;
 
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
index ef9019eafa04..91340001c5e9 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC721Factory.t.sol
@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
 import { OptimismMintableERC721Factory } from "src/universal/OptimismMintableERC721Factory.sol";
 
-contract OptimismMintableERC721Factory_Test is Bridge_Initializer {
+contract OptimismMintableERC721Factory_Test is CommonTest {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     function test_constructor_succeeds() external view {
diff --git a/packages/contracts-bedrock/test/vendor/Initializable.t.sol b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
index 9d60ab71e7c8..eb43ae187599 100644
--- a/packages/contracts-bedrock/test/vendor/Initializable.t.sol
+++ b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Testing
-import { Bridge_Initializer } from "test/setup/Bridge_Initializer.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Scripts
 import { ForgeArtifacts } from "scripts/libraries/ForgeArtifacts.sol";
@@ -11,8 +11,7 @@ import { Process } from "scripts/libraries/Process.sol";
 // Libraries
 import { LibString } from "@solady/utils/LibString.sol";
 import { Constants } from "src/libraries/Constants.sol";
-import "src/dispute/lib/Types.sol";
-import "scripts/deploy/Deployer.sol";
+import { GameType } from "src/dispute/lib/Types.sol";
 
 // Interfaces
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
@@ -26,7 +25,7 @@ import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistr
 ///      once. This contract inherits from `ERC721Bridge_Initializer` because it is the
 ///      deepest contract in the inheritance chain for setting up the system contracts.
 ///      For each L1 contract both the implementation and the proxy are tested.
-contract Initializer_Test is Bridge_Initializer {
+contract Initializer_Test is CommonTest {
     /// @notice Contains the address of an `Initializable` contract and the calldata
     ///         used to initialize it.
     struct InitializeableContract {

From f7cef71158da35c2cb4b16adcb899a4cf77f1ce7 Mon Sep 17 00:00:00 2001
From: Michael de Hoog <michael.dehoog@coinbase.com>
Date: Thu, 7 Nov 2024 15:39:44 -1000
Subject: [PATCH 157/451] [Batcher] Fix memory leak, reverse prepended blocks
 (#12874)

* Don't prepend blocks in reverse order

* Fix memory leak
---
 op-batcher/batcher/channel_manager.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 25900906d0dd..06403645ea4d 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -118,8 +118,11 @@ func (s *channelManager) TxConfirmed(_id txID, inclusionBlock eth.BlockID) {
 		delete(s.txChannels, id)
 		done, blocksToRequeue := channel.TxConfirmed(id, inclusionBlock)
 		if done {
+			s.removePendingChannel(channel)
+			if len(blocksToRequeue) > 0 {
+				s.blocks.Prepend(blocksToRequeue...)
+			}
 			for _, b := range blocksToRequeue {
-				s.blocks.Prepend(b)
 				s.metr.RecordL2BlockInPendingQueue(b)
 			}
 		}
@@ -505,8 +508,8 @@ func (s *channelManager) Requeue(newCfg ChannelConfig) {
 	}
 
 	// We put the blocks back at the front of the queue:
+	s.blocks.Prepend(blocksToRequeue...)
 	for _, b := range blocksToRequeue {
-		s.blocks.Prepend(b)
 		s.metr.RecordL2BlockInPendingQueue(b)
 	}
 

From 4ee0737dafd83de22989c5be0ce74397fd9c3a94 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 8 Nov 2024 08:01:44 +0100
Subject: [PATCH 158/451] add semgrep rule sol-style-no-bare-imports and
 implement it (#12723)

* add semgrep rule sol-style-no-bare-imports and implement it

* write test for bare imports rule

* fix forge fmt on semgrep test

* fix bare import

* semver lock

* fix semver
---
 .semgrep/rules/sol-rules.yaml                 |  9 ++++++++
 .semgrep/tests/sol-rules.t.sol                | 23 +++++++++++++++++++
 .../scripts/deploy/Deploy.s.sol               |  2 +-
 packages/contracts-bedrock/semver-lock.json   |  4 ++--
 .../src/cannon/libraries/MIPS64Memory.sol     |  2 +-
 .../src/cannon/libraries/MIPSMemory.sol       |  2 +-
 .../src/dispute/FaultDisputeGame.sol          |  7 +++---
 .../interfaces/IAnchorStateRegistry.sol       |  2 +-
 .../src/dispute/interfaces/IDisputeGame.sol   |  2 +-
 .../interfaces/IDisputeGameFactory.sol        |  2 +-
 .../dispute/interfaces/IFaultDisputeGame.sol  |  2 +-
 .../interfaces/IPermissionedDisputeGame.sol   |  2 +-
 .../src/dispute/lib/Errors.sol                |  2 +-
 .../src/dispute/lib/LibUDT.sol                |  2 +-
 .../src/dispute/lib/Types.sol                 | 14 ++++++++++-
 .../src/libraries/rlp/RLPReader.sol           |  9 +++++++-
 16 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/.semgrep/rules/sol-rules.yaml b/.semgrep/rules/sol-rules.yaml
index e0d83414c4bd..57dc88a3e51e 100644
--- a/.semgrep/rules/sol-rules.yaml
+++ b/.semgrep/rules/sol-rules.yaml
@@ -186,3 +186,12 @@ rules:
     paths:
       exclude:
         - packages/contracts-bedrock/
+
+  - id: sol-style-no-bare-imports
+    languages: [solidity]
+    severity: ERROR
+    message: Import specific components instead of the entire file
+    pattern-regex: import\s+"[^"]+"\s*;
+    paths:
+      exclude:
+        - packages/contracts-bedrock/test
diff --git a/.semgrep/tests/sol-rules.t.sol b/.semgrep/tests/sol-rules.t.sol
index 3b4329f7e388..650e03198270 100644
--- a/.semgrep/tests/sol-rules.t.sol
+++ b/.semgrep/tests/sol-rules.t.sol
@@ -7,6 +7,29 @@
 // Use comments like "ruleid: <rule-id>" to assert that the rule catches the code.
 // Use comments like "ok: <rule-id>" to assert that the rule does not catch the code.
 
+/// begin SemgrepTest__sol-style-no-bare-imports
+// ok: sol-style-no-bare-imports
+import { SomeStruct } from "some-library.sol";
+
+// ok: sol-style-no-bare-imports
+import { SomeStruct, AnotherThing } from "some-library.sol";
+
+// ok: sol-style-no-bare-imports
+import { SomeStruct as SomeOtherStruct } from "some-library.sol";
+
+// ok: sol-style-no-bare-imports
+import { SomeStruct as SomeOtherStruct, AnotherThing as AnotherOtherThing } from "some-library.sol";
+
+// ok: sol-style-no-bare-imports
+import { SomeStruct as SomeOtherStruct, AnotherThing } from "some-library.sol";
+
+// ok: sol-style-no-bare-imports
+import { AnotherThing, SomeStruct as SomeOtherStruct } from "some-library.sol";
+
+// ruleid: sol-style-no-bare-imports
+import "some-library.sol";
+/// end   SemgrepTest__sol-style-no-bare-imports
+
 contract SemgrepTest__sol_safety_deployutils_args {
     function test() {
         // ruleid: sol-safety-deployutils-args
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 33e1578ea8bb..54cc1a23e172 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -33,7 +33,7 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Types } from "scripts/libraries/Types.sol";
 import { Duration } from "src/dispute/lib/LibUDT.sol";
 import { StorageSlot, ForgeArtifacts } from "scripts/libraries/ForgeArtifacts.sol";
-import "src/dispute/lib/Types.sol";
+import { GameType, Claim, GameTypes, OutputRoot, Hash } from "src/dispute/lib/Types.sol";
 
 // Interfaces
 import { IProxy } from "src/universal/interfaces/IProxy.sol";
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 1e14f5d286b5..cb4cc8a55be9 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -168,8 +168,8 @@
     "sourceCodeHash": "0x9cb0851b6e471461f2bb369bd72eef4cffe8a0d1345546608a2aa6795540211d"
   },
   "src/dispute/FaultDisputeGame.sol": {
-    "initCodeHash": "0x1480098a19f71ce6b4f4548880c8794402315ed3efa6793241a3df0fae864205",
-    "sourceCodeHash": "0x2f084f3f0e52017beb2ecf571178b94ba885cca987ada472d9e178b486a91d9e"
+    "initCodeHash": "0xa352179f5055232764aac6b66a3ff5a6b3bfae2101d20c077f714b0ed7e40eef",
+    "sourceCodeHash": "0x730eff9147294c115a0a53e7e75771bcc4a517beb48457140ab929a8d1510893"
   },
   "src/legacy/DeployerWhitelist.sol": {
     "initCodeHash": "0x0b8177ed75b69eddbb9ce6537683f69a9935efed86a1d6faa8feaafbd151c1bd",
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
index 23a6639bc9c4..9ed97396e10f 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "src/cannon/libraries/CannonErrors.sol";
+import { InvalidMemoryProof } from "src/cannon/libraries/CannonErrors.sol";
 
 library MIPS64Memory {
     uint64 internal constant EXT_MASK = 0x7;
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
index e88f51438ef4..015955954b5a 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import "src/cannon/libraries/CannonErrors.sol";
+import { InvalidMemoryProof } from "src/cannon/libraries/CannonErrors.sol";
 
 library MIPSMemory {
     /// @notice Reads a 32-bit value from memory.
diff --git a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
index 9466465bd7ff..2bd5ec67e96c 100644
--- a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
@@ -12,17 +12,16 @@ import {
     GameStatus,
     GameType,
     Claim,
-    Position,
     Clock,
     Duration,
     Timestamp,
     Hash,
     OutputRoot,
-    LibPosition,
     LibClock,
     LocalPreimageKey,
     VMStatuses
 } from "src/dispute/lib/Types.sol";
+import { Position, LibPosition } from "src/dispute/lib/LibPosition.sol";
 import {
     InvalidParent,
     ClaimAlreadyExists,
@@ -147,8 +146,8 @@ contract FaultDisputeGame is Clone, ISemver {
     uint256 internal constant HEADER_BLOCK_NUMBER_INDEX = 8;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.6
-    string public constant version = "1.3.1-beta.6";
+    /// @custom:semver 1.3.1-beta.7
+    string public constant version = "1.3.1-beta.7";
 
     /// @notice The starting timestamp of the game
     Timestamp public createdAt;
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol b/packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol
index 4de2bb1deab6..4c79c4c092a9 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import "src/dispute/lib/Types.sol";
+import { GameType, Hash, OutputRoot } from "src/dispute/lib/Types.sol";
 
 interface IAnchorStateRegistry {
     struct StartingAnchorRoot {
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol b/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol
index f5a650202d0c..0f860e68b5a1 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { IInitializable } from "src/dispute/interfaces/IInitializable.sol";
-import "src/dispute/lib/Types.sol";
+import { Timestamp, GameStatus, GameType, Claim, Hash } from "src/dispute/lib/Types.sol";
 
 interface IDisputeGame is IInitializable {
     event Resolved(GameStatus indexed status);
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol b/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol
index 0f21d42aa27a..3e7233f440d6 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import "src/dispute/lib/Types.sol";
+import { GameId, Timestamp, Claim, Hash, GameType } from "src/dispute/lib/Types.sol";
 
 interface IDisputeGameFactory {
     struct GameSearchResult {
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol b/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
index ec0f86ff709c..8c5bac02e9ba 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
@@ -6,7 +6,7 @@ import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 import { Types } from "src/libraries/Types.sol";
-import "src/dispute/lib/Types.sol";
+import { GameType, Claim, Position, Clock, Hash, Duration } from "src/dispute/lib/Types.sol";
 
 interface IFaultDisputeGame is IDisputeGame {
     struct ClaimData {
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol b/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
index 980d3460c048..c5a5a187ec12 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
-import "src/dispute/lib/Types.sol";
+import { GameType, Claim, Position, Clock, Hash, Duration } from "src/dispute/lib/Types.sol";
 
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
diff --git a/packages/contracts-bedrock/src/dispute/lib/Errors.sol b/packages/contracts-bedrock/src/dispute/lib/Errors.sol
index 6cd1d1d073f4..6e95bfa5a342 100644
--- a/packages/contracts-bedrock/src/dispute/lib/Errors.sol
+++ b/packages/contracts-bedrock/src/dispute/lib/Errors.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "src/dispute/lib/LibUDT.sol";
+import { GameType, Hash, Claim } from "src/dispute/lib/LibUDT.sol";
 
 ////////////////////////////////////////////////////////////////
 //                `DisputeGameFactory` Errors                 //
diff --git a/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol b/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol
index b0b8edfab8f4..bfc110f09526 100644
--- a/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol
+++ b/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "src/dispute/lib/LibPosition.sol";
+import { Position } from "src/dispute/lib/LibPosition.sol";
 
 using LibClaim for Claim global;
 using LibHash for Hash global;
diff --git a/packages/contracts-bedrock/src/dispute/lib/Types.sol b/packages/contracts-bedrock/src/dispute/lib/Types.sol
index 8d86e6e25387..70df7b7912ba 100644
--- a/packages/contracts-bedrock/src/dispute/lib/Types.sol
+++ b/packages/contracts-bedrock/src/dispute/lib/Types.sol
@@ -1,7 +1,19 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "src/dispute/lib/LibUDT.sol";
+import {
+    Position,
+    Hash,
+    GameType,
+    VMStatus,
+    Timestamp,
+    Duration,
+    Clock,
+    GameId,
+    Claim,
+    LibGameId,
+    LibClock
+} from "src/dispute/lib/LibUDT.sol";
 
 /// @notice The current status of the dispute game.
 enum GameStatus {
diff --git a/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol b/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol
index 9f82ca8c802e..559c53391f70 100644
--- a/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol
+++ b/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol
@@ -1,7 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.8;
 
-import "./RLPErrors.sol";
+import {
+    EmptyItem,
+    UnexpectedString,
+    InvalidDataRemainder,
+    ContentLengthMismatch,
+    InvalidHeader,
+    UnexpectedList
+} from "./RLPErrors.sol";
 
 /// @custom:attribution https://github.com/hamdiallam/Solidity-RLP
 /// @title RLPReader

From eb977a8e168354288e730e037e0ed43f47d461f7 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 8 Nov 2024 08:02:56 +0100
Subject: [PATCH 159/451] update check-foundry-install.sh to
 check-dep-install.sh (#12778)

* add semgrep check to checks and rename check-foundry-install to check-dep-install

* fixes

* fixes
---
 justfile                                           |  2 +-
 .../scripts/check-foundry.sh                       |  5 +----
 packages/contracts-bedrock/justfile                | 14 +++++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)
 rename packages/contracts-bedrock/scripts/checks/check-foundry-install.sh => ops/scripts/check-foundry.sh (84%)

diff --git a/justfile b/justfile
index 00a272e899ae..e40186f75dff 100644
--- a/justfile
+++ b/justfile
@@ -19,7 +19,7 @@ update-foundry:
   bash ./ops/scripts/install-foundry.sh
 
 check-foundry:
-  bash ./packages/contracts-bedrock/scripts/checks/check-foundry-install.sh
+  bash ./ops/scripts/check-foundry.sh
 
 install-kontrol:
   curl -L https://kframework.org/install | bash && just update-kontrol
diff --git a/packages/contracts-bedrock/scripts/checks/check-foundry-install.sh b/ops/scripts/check-foundry.sh
similarity index 84%
rename from packages/contracts-bedrock/scripts/checks/check-foundry-install.sh
rename to ops/scripts/check-foundry.sh
index a2093e936f3f..530046bd85ea 100755
--- a/packages/contracts-bedrock/scripts/checks/check-foundry-install.sh
+++ b/ops/scripts/check-foundry.sh
@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-CONTRACTS_BASE=$(dirname "$(dirname "$SCRIPT_DIR")")
-MONOREPO_BASE=$(dirname "$(dirname "$CONTRACTS_BASE")")
-VERSIONS_FILE="${MONOREPO_BASE}/versions.json"
+VERSIONS_FILE="versions.json"
 
 if ! command -v jq &> /dev/null
 then
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 9be9bc4e09ea..3536e0b8d264 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -16,15 +16,23 @@ dep-status:
 ########################################################
 
 # Checks that the correct version of Foundry is installed.
-prebuild:
-  ./scripts/checks/check-foundry-install.sh
+check-foundry:
+  cd ../../ && ./ops/scripts/check-foundry.sh
+
+# Checks that semgrep is installed.
+check-semgrep:
+  cd ../../ && just check-semgrep
+
+# Checks that the correct versions of Foundry and semgrep are installed.
+check-dependencies:
+  just check-foundry && just check-semgrep
 
 # Core forge build command
 forge-build:
   forge build
 
 # Builds the contracts.
-build: prebuild lint-fix-no-fail forge-build interfaces-check-no-build
+build: check-dependencies lint-fix-no-fail forge-build interfaces-check-no-build
 
 # Builds the go-ffi tool for contract tests.
 build-go-ffi-default:

From 8df2b1d5beed782e8630eb3af403aeebac8497c5 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 8 Nov 2024 08:25:10 +0100
Subject: [PATCH 160/451] convert semver lock to go (#12775)

* convert semver lock to go

* updae just file

* delete old semver lock file

* fixes

* move snapshot files to snapshots folder

* fixes

* fix check-semver-diff
---
 packages/contracts-bedrock/foundry.toml       |   1 -
 packages/contracts-bedrock/justfile           |   8 +-
 .../scripts/autogen/SemverLock.s.sol          |  65 ---------
 .../autogen/generate-semver-lock/main.go      | 128 ++++++++++++++++++
 .../scripts/checks/check-semver-diff.sh       |   9 +-
 .../scripts/ops/calculate-checksum.sh         |   2 +-
 .../{ => snapshots}/.gas-snapshot             |   0
 .../{ => snapshots}/semver-lock.json          |   0
 8 files changed, 140 insertions(+), 73 deletions(-)
 delete mode 100644 packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol
 create mode 100644 packages/contracts-bedrock/scripts/autogen/generate-semver-lock/main.go
 mode change 100644 => 100755 packages/contracts-bedrock/scripts/ops/calculate-checksum.sh
 rename packages/contracts-bedrock/{ => snapshots}/.gas-snapshot (100%)
 rename packages/contracts-bedrock/{ => snapshots}/semver-lock.json (100%)

diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index b2ea03b86538..6bd441ca3cdb 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -48,7 +48,6 @@ fs_permissions = [
   { access='read', path='./deploy-config-periphery/' },
   { access='read', path='./broadcast/' },
   { access='read', path = './forge-artifacts/' },
-  { access='write', path='./semver-lock.json' },
   { access='read-write', path='./.testdata/' },
   { access='read', path='./kout-deployment' },
   { access='read', path='./test/fixtures' },
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 3536e0b8d264..fe6f4c0834c9 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -96,7 +96,7 @@ deploy:
 
 # Generates a gas snapshot without building.
 gas-snapshot-no-build:
-  forge snapshot --match-contract GasBenchMark
+  forge snapshot --match-contract GasBenchMark --snap snapshots/.gas-snapshot
 
 # Generates a gas snapshot.
 gas-snapshot: build-go-ffi gas-snapshot-no-build
@@ -116,9 +116,9 @@ kontrol-summary-full: kontrol-summary kontrol-summary-fp
 snapshots-abi-storage:
   go run ./scripts/autogen/generate-snapshots .
 
-# Updates the semver-lock.json file.
+# Updates the snapshots/semver-lock.json file.
 semver-lock:
-  forge script scripts/autogen/SemverLock.s.sol
+  go run scripts/autogen/generate-semver-lock/main.go
 
 # Generates core snapshots without building contracts. Currently just an alias for
 # snapshots-abi-storage because we no longer run Kontrol snapshots here. Run
@@ -135,7 +135,7 @@ snapshots: build snapshots-no-build
 
 # Checks that the gas snapshot is up to date without building.
 gas-snapshot-check-no-build:
-  forge snapshot --match-contract GasBenchMark --check
+  forge snapshot --match-contract GasBenchMark --snap snapshots/.gas-snapshot --check
 
 # Checks that the gas snapshot is up to date.
 gas-snapshot-check: build-go-ffi gas-snapshot-check-no-build
diff --git a/packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol b/packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol
deleted file mode 100644
index 00b0f1855fb1..000000000000
--- a/packages/contracts-bedrock/scripts/autogen/SemverLock.s.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { Script } from "forge-std/Script.sol";
-import { stdJson } from "forge-std/StdJson.sol";
-import { console2 as console } from "forge-std/console2.sol";
-import { Process } from "scripts/libraries/Process.sol";
-
-contract SemverLock is Script {
-    function run() public {
-        // First, find all contracts with a Semver inheritance.
-        string memory rawFiles =
-            Process.bash("grep -rl '@custom:semver' src | jq -Rs 'split(\"\\n\") | map(select(length > 0))'");
-
-        string[] memory files = vm.parseJsonStringArray(rawFiles, "");
-        writeSemverLock(files);
-    }
-
-    /// @dev Writes a Semver lockfile
-    function writeSemverLock(string[] memory _files) internal {
-        string memory out;
-        for (uint256 i; i < _files.length; i++) {
-            // Use FFI to read the file to remove the need for FS permissions in the foundry.toml.
-            string[] memory commands = new string[](2);
-            commands[0] = "cat";
-            commands[1] = _files[i];
-            string memory fileContents = string(Process.run(commands));
-
-            // Grab the contract name
-            string memory contractName =
-                Process.bash(string.concat("echo \"", _files[i], "\"| sed -E 's|src/.*/(.+)\\.sol|\\1|'"));
-
-            string memory artifactsDir = Process.bash("forge config --json | jq -r .out");
-
-            // Handle the case where there are multiple artifacts for a contract. This happens
-            // when the same contract is compiled with multiple compiler versions.
-            string memory contractArtifactDir = string.concat(artifactsDir, "/", contractName, ".sol");
-            string memory artifactFiles = Process.bash(
-                string.concat(
-                    "ls -1 --color=never ",
-                    contractArtifactDir,
-                    " | jq -R -s -c 'split(\"\n\") | map(select(length > 0))'"
-                )
-            );
-
-            string[] memory files = stdJson.readStringArray(artifactFiles, "");
-            require(files.length > 0, string.concat("SemverLock: no artifacts found for ", contractName));
-            string memory fileName = files[0];
-
-            // Parse the artifact to get the contract's initcode hash.
-            bytes memory initCode = vm.getCode(string.concat(artifactsDir, "/", contractName, ".sol/", fileName));
-
-            // Serialize the initcode hash + sourcecode hash in JSON.
-            vm.serializeBytes32(_files[i], "initCodeHash", keccak256(initCode));
-            string memory obj = vm.serializeBytes32(_files[i], "sourceCodeHash", keccak256(bytes(fileContents)));
-
-            // Serialize the map from the file name -> initcode hash + sourcecode hash in JSON.
-            out = vm.serializeString("", _files[i], obj);
-        }
-
-        // Write the semver lockfile.
-        vm.writeJson(out, "semver-lock.json");
-        console.logString("Wrote semver lock file to \"semver-lock.json\".");
-    }
-}
diff --git a/packages/contracts-bedrock/scripts/autogen/generate-semver-lock/main.go b/packages/contracts-bedrock/scripts/autogen/generate-semver-lock/main.go
new file mode 100644
index 000000000000..162f81c840dd
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/autogen/generate-semver-lock/main.go
@@ -0,0 +1,128 @@
+package main
+
+import (
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+const semverLockFile = "snapshots/semver-lock.json"
+
+func main() {
+	if err := run(); err != nil {
+		panic(err)
+	}
+}
+
+func run() error {
+	// Find semver files
+	// Execute grep command to find files with @custom:semver
+	var cmd = exec.Command("bash", "-c", "grep -rl '@custom:semver' src | jq -Rs 'split(\"\n\") | map(select(length > 0))'")
+	cmdOutput, err := cmd.Output()
+	if err != nil {
+		return err
+	}
+
+	// Parse the JSON array of files
+	var files []string
+	if err := json.Unmarshal(cmdOutput, &files); err != nil {
+		return fmt.Errorf("failed to parse JSON output: %w", err)
+	}
+
+	// Hash and write to JSON file
+	// Map to store our JSON output
+	output := make(map[string]map[string]string)
+
+	// regex to extract contract name from file path
+	re := regexp.MustCompile(`src/.*/(.+)\.sol`)
+
+	// Get artifacts directory
+	cmd = exec.Command("forge", "config", "--json")
+	out, err := cmd.Output()
+	if err != nil {
+		return fmt.Errorf("failed to get forge config: %w", err)
+	}
+	var config struct {
+		Out string `json:"out"`
+	}
+	if err := json.Unmarshal(out, &config); err != nil {
+		return fmt.Errorf("failed to parse forge config: %w", err)
+	}
+
+	for _, file := range files {
+		// Read file contents
+		fileContents, err := os.ReadFile(file)
+		if err != nil {
+			return fmt.Errorf("failed to read file %s: %w", file, err)
+		}
+
+		// Extract contract name from file path using regex
+		matches := re.FindStringSubmatch(file)
+		if len(matches) < 2 {
+			return fmt.Errorf("invalid file path format: %s", file)
+		}
+		contractName := matches[1]
+
+		// Get artifact files
+		artifactDir := filepath.Join(config.Out, contractName+".sol")
+		files, err := os.ReadDir(artifactDir)
+		if err != nil {
+			return fmt.Errorf("failed to read artifact directory: %w", err)
+		}
+		if len(files) == 0 {
+			return fmt.Errorf("no artifacts found for %s", contractName)
+		}
+
+		// Read initcode from artifact
+		artifactPath := filepath.Join(artifactDir, files[0].Name())
+		artifact, err := os.ReadFile(artifactPath)
+		if err != nil {
+			return fmt.Errorf("failed to read initcode: %w", err)
+		}
+		artifactJson := json.RawMessage(artifact)
+		var artifactObj struct {
+			Bytecode struct {
+				Object string `json:"object"`
+			} `json:"bytecode"`
+		}
+		if err := json.Unmarshal(artifactJson, &artifactObj); err != nil {
+			return fmt.Errorf("failed to parse artifact: %w", err)
+		}
+
+		// convert the hex bytecode to a uint8 array / bytes
+		initCodeBytes, err := hex.DecodeString(strings.TrimPrefix(artifactObj.Bytecode.Object, "0x"))
+		if err != nil {
+			return fmt.Errorf("failed to decode hex: %w", err)
+		}
+
+		// Calculate hashes using Keccak256
+		var sourceCode = []byte(strings.TrimSuffix(string(fileContents), "\n"))
+		initCodeHash := fmt.Sprintf("0x%x", crypto.Keccak256Hash(initCodeBytes))
+		sourceCodeHash := fmt.Sprintf("0x%x", crypto.Keccak256Hash(sourceCode))
+
+		// Store in output map
+		output[file] = map[string]string{
+			"initCodeHash":   initCodeHash,
+			"sourceCodeHash": sourceCodeHash,
+		}
+	}
+
+	// Write to JSON file
+	jsonData, err := json.MarshalIndent(output, "", "  ")
+	if err != nil {
+		return fmt.Errorf("failed to marshal JSON: %w", err)
+	}
+	if err := os.WriteFile(semverLockFile, jsonData, 0644); err != nil {
+		return fmt.Errorf("failed to write semver lock file: %w", err)
+	}
+
+	fmt.Printf("Wrote semver lock file to \"%s\".\n", semverLockFile)
+	return nil
+}
diff --git a/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh b/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
index 81e7c6476d3a..62872e1e73d8 100755
--- a/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
+++ b/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
@@ -9,7 +9,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$SCRIPT_DIR/utils/semver-utils.sh"
 
 # Path to semver-lock.json.
-SEMVER_LOCK="semver-lock.json"
+SEMVER_LOCK="snapshots/semver-lock.json"
 
 # Create a temporary directory.
 temp_dir=$(mktemp -d)
@@ -22,7 +22,12 @@ if ! { git diff origin/develop...HEAD --name-only; git diff --name-only; git dif
 fi
 
 # Get the upstream semver-lock.json.
-git show origin/develop:packages/contracts-bedrock/semver-lock.json > "$temp_dir/upstream_semver_lock.json"
+if ! git show origin/develop:packages/contracts-bedrock/snapshots/semver-lock.json > "$temp_dir/upstream_semver_lock.json" 2>/dev/null; then
+    if ! git show origin/develop:packages/contracts-bedrock/semver-lock.json > "$temp_dir/upstream_semver_lock.json" 2>/dev/null; then
+        echo "❌ Error: Could not find semver-lock.json in either snapshots/ or root directory of develop branch"
+        exit 1
+    fi
+fi
 
 # Copy the local semver-lock.json.
 cp "$SEMVER_LOCK" "$temp_dir/local_semver_lock.json"
diff --git a/packages/contracts-bedrock/scripts/ops/calculate-checksum.sh b/packages/contracts-bedrock/scripts/ops/calculate-checksum.sh
old mode 100644
new mode 100755
index 86fb4394c091..f00fa6b17641
--- a/packages/contracts-bedrock/scripts/ops/calculate-checksum.sh
+++ b/packages/contracts-bedrock/scripts/ops/calculate-checksum.sh
@@ -14,7 +14,7 @@ cd "$CONTRACTS_DIR"
 echoerr "> Calculating contracts checksum..."
 
 find . -type f -name '*.sol' -exec sha256sum {} + > manifest.txt
-sha256sum semver-lock.json >> manifest.txt
+sha256sum snapshots/semver-lock.json >> manifest.txt
 sha256sum foundry.toml >> manifest.txt
 # need to specify the locale to ensure consistent sorting across platforms
 LC_ALL=C sort -o manifest.txt manifest.txt
diff --git a/packages/contracts-bedrock/.gas-snapshot b/packages/contracts-bedrock/snapshots/.gas-snapshot
similarity index 100%
rename from packages/contracts-bedrock/.gas-snapshot
rename to packages/contracts-bedrock/snapshots/.gas-snapshot
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
similarity index 100%
rename from packages/contracts-bedrock/semver-lock.json
rename to packages/contracts-bedrock/snapshots/semver-lock.json

From 85c9a9ea4cf74adf562fb54ceeb7631407074177 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 8 Nov 2024 09:58:51 +0100
Subject: [PATCH 161/451] fix test name checks (#12880)

---
 packages/contracts-bedrock/test/L2/Preinstalls.t.sol     | 2 +-
 packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol | 2 +-
 packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol  | 2 +-
 packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
index a9202346be6a..5eec3f811dec 100644
--- a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
+++ b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
@@ -119,7 +119,7 @@ contract PreinstallsTest is CommonTest {
         assertPreinstall(Preinstalls.CreateX, Preinstalls.CreateXCode);
     }
 
-    function test_createX_runtimeBytecodeHash() external view {
+    function test_createX_runtimeBytecodeHash_works() external view {
         bytes memory createXRuntimeBytecode = Preinstalls.CreateX.code;
         bytes32 createXRuntimeBytecodeHash = keccak256(createXRuntimeBytecode);
 
diff --git a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
index a9aa3b501618..87f723a9345b 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
@@ -125,7 +125,7 @@ contract SuperchainERC20Test is Test {
 
     /// @notice Tests that the `supportsInterface` function returns false for any other interface than the
     /// `IERC7802` one.
-    function testFuzz_supportInterface_returnFalse(bytes4 _interfaceId) public view {
+    function testFuzz_supportInterface_works(bytes4 _interfaceId) public view {
         vm.assume(_interfaceId != type(IERC165).interfaceId);
         vm.assume(_interfaceId != type(IERC7802).interfaceId);
         vm.assume(_interfaceId != type(IERC20).interfaceId);
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index d0744ecb48ef..e342a53b6026 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -469,7 +469,7 @@ contract SuperchainWETH_Test is CommonTest {
 
     /// @notice Tests that the `supportsInterface` function returns false for any other interface than the
     /// `IERC7802` one.
-    function testFuzz_supportInterface_returnFalse(bytes4 _interfaceId) public view {
+    function testFuzz_supportInterface_works(bytes4 _interfaceId) public view {
         vm.assume(_interfaceId != type(IERC165).interfaceId);
         vm.assume(_interfaceId != type(IERC7802).interfaceId);
         vm.assume(_interfaceId != type(IERC20).interfaceId);
diff --git a/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol b/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
index e48a9b37a9f8..d7cdc69f37e7 100644
--- a/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
@@ -44,7 +44,7 @@ contract DeployAltDAInput_Test is Test {
         assertEq(resolverRefundPercentage, dai.resolverRefundPercentage(), "700");
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         bytes memory expectedErr = "DeployAltDAInput: ";
 
         vm.expectRevert(abi.encodePacked(expectedErr, "salt not set"));
@@ -119,7 +119,7 @@ contract DeployAltDAOutput_Test is Test {
         assertEq(address(dataAvailabilityChallengeImpl), address(dao.dataAvailabilityChallengeImpl()), "200");
     }
 
-    function test_getters_whenNotSet_revert() public {
+    function test_getters_whenNotSet_reverts() public {
         vm.expectRevert("DeployUtils: zero address");
         dao.dataAvailabilityChallengeProxy();
 
@@ -231,7 +231,7 @@ contract DeployAltDA_Test is Test {
         deployer.checkOutput(dai, dao);
     }
 
-    function testFuzz_run_withDifferentParameters(
+    function testFuzz_run_withDifferentParameters_works(
         uint256 _challengeWindow,
         uint256 _resolveWindow,
         uint256 _bondSize,

From 4c656b3a1638076aeaf3ee999f6e03dd796ed385 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 8 Nov 2024 05:19:35 -0700
Subject: [PATCH 162/451] op-e2e: Minor test updates (#12877)

Attempt at fixing the ongoing test flakiness with the batcher tests. Makes two changes:

- Waits for the L1 to be up for all end-to-end tests to mitigate the I/O and context timeouts we've been seeing.
- Update the multi batcher test to use an algorithm that's more tolerant of when the L1 doesn't immediately include the transaction.
---
 op-e2e/e2eutils/wait/waits.go  | 26 +++++++++++++++++++++
 op-e2e/system/da/multi_test.go | 42 +++++++++++++++++++++-------------
 op-e2e/system/e2esys/setup.go  | 10 ++++++++
 3 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/op-e2e/e2eutils/wait/waits.go b/op-e2e/e2eutils/wait/waits.go
index 3c0e29466cea..9b03e0bba7f9 100644
--- a/op-e2e/e2eutils/wait/waits.go
+++ b/op-e2e/e2eutils/wait/waits.go
@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -164,3 +166,27 @@ func AndGet[T interface{}](ctx context.Context, pollRate time.Duration, get func
 		}
 	}
 }
+
+func ForNodeUp(ctx context.Context, client *ethclient.Client, lgr log.Logger) error {
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		default:
+			// Create a new context deliberately. The shorter timeout is used to detect
+			// potential I/O timeouts on the RPC so we can retry.
+			callCtx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
+			_, err := client.BlockNumber(callCtx)
+			cancel()
+			if err == nil {
+				lgr.Info("node is up")
+				return nil
+			}
+			if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, os.ErrDeadlineExceeded) {
+				lgr.Info("timeout waiting for node come up, trying again")
+				continue
+			}
+			return err
+		}
+	}
+}
diff --git a/op-e2e/system/da/multi_test.go b/op-e2e/system/da/multi_test.go
index 3d150010a0f3..461270282008 100644
--- a/op-e2e/system/da/multi_test.go
+++ b/op-e2e/system/da/multi_test.go
@@ -32,10 +32,8 @@ func TestBatcherMultiTx(t *testing.T) {
 	_, err = geth.WaitForBlock(big.NewInt(10), l2Seq)
 	require.NoError(t, err, "Waiting for L2 blocks")
 
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
-	l1Number, err := l1Client.BlockNumber(ctx)
-	require.NoError(t, err)
 
 	// start batch submission
 	driver := sys.BatchSubmitter.TestDriver()
@@ -43,21 +41,33 @@ func TestBatcherMultiTx(t *testing.T) {
 	require.NoError(t, err)
 
 	totalBatcherTxsCount := int64(0)
-	// wait for up to 5 L1 blocks, usually only 3 is required, but it's
-	// possible additional L1 blocks will be created before the batcher starts,
-	// so we wait additional blocks.
-	for i := int64(0); i < 5; i++ {
-		block, err := geth.WaitForBlock(big.NewInt(int64(l1Number)+i), l1Client)
-		require.NoError(t, err, "Waiting for l1 blocks")
-		// there are possibly other services (proposer/challenger) in the background sending txs
-		// so we only count the batcher txs
-		batcherTxCount, err := transactions.TransactionsBySender(block, cfg.DeployConfig.BatchSenderAddress)
-		require.NoError(t, err)
-		totalBatcherTxsCount += int64(batcherTxCount)
 
-		if totalBatcherTxsCount >= 10 {
-			return
+	headNum, err := l1Client.BlockNumber(ctx)
+	require.NoError(t, err)
+	stopNum := headNum + 10
+	startBlock := uint64(1)
+
+	for {
+		for i := startBlock; i <= headNum; i++ {
+			block, err := l1Client.BlockByNumber(ctx, big.NewInt(int64(i)))
+			require.NoError(t, err)
+
+			batcherTxCount, err := transactions.TransactionsBySender(block, cfg.DeployConfig.BatchSenderAddress)
+			require.NoError(t, err)
+			totalBatcherTxsCount += batcherTxCount
+
+			if totalBatcherTxsCount >= 10 {
+				return
+			}
+		}
+
+		headNum++
+		if headNum > stopNum {
+			break
 		}
+		startBlock = headNum
+		_, err = geth.WaitForBlock(big.NewInt(int64(headNum)), l1Client)
+		require.NoError(t, err)
 	}
 
 	t.Fatal("Expected at least 10 transactions from the batcher")
diff --git a/op-e2e/system/e2esys/setup.go b/op-e2e/system/e2esys/setup.go
index 9ab6d2de14f6..a54a46d1e5db 100644
--- a/op-e2e/system/e2esys/setup.go
+++ b/op-e2e/system/e2esys/setup.go
@@ -16,6 +16,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
+
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/maps"
 
@@ -671,6 +673,14 @@ func (cfg SystemConfig) Start(t *testing.T, startOpts ...StartOption) (*System,
 		return nil, err
 	}
 
+	sysLogger := testlog.Logger(t, log.LevelInfo).New("role", "system")
+
+	l1UpCtx, l1UpCancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer l1UpCancel()
+	if err := wait.ForNodeUp(l1UpCtx, sys.NodeClient(RoleL1), sysLogger); err != nil {
+		return nil, fmt.Errorf("l1 never came up: %w", err)
+	}
+
 	// Ordered such that the Sequencer is initialized first. Setup this way so that
 	// the `RollupSequencerHTTP` GethOption can be supplied to any sentry nodes.
 	l2Nodes := []string{RoleSeq}

From 5662448279e4fb16e073e00baeb6e458b12a59b2 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 8 Nov 2024 19:51:12 +0700
Subject: [PATCH 163/451] op-conductor,op-node: allow system to select port,
 make op-node wait for conductor endpoint (#12863)

* op-conductor,op-node: allow system to select port, make op-node wait for conductor endpoint

* op-conductor,op-node: debugging conductor test

* op-conductor: more debugging

* op-e2e: increase conductor timeout
---
 op-conductor/conductor/config.go              |  18 +-
 op-conductor/conductor/service.go             |  17 +-
 op-conductor/conductor/service_test.go        |   2 +-
 op-conductor/consensus/iface.go               |   3 +
 op-conductor/consensus/mocks/Consensus.go     |  47 +++++-
 op-conductor/consensus/raft.go                |  66 +++++++-
 op-conductor/consensus/raft_test.go           |   4 +-
 op-conductor/flags/flags.go                   |  11 +-
 .../conductor/sequencer_failover_setup.go     | 158 ++++++++----------
 .../conductor/sequencer_failover_test.go      |   1 -
 op-node/node/conductor.go                     |  45 +++--
 op-node/node/config.go                        |   5 +-
 op-node/node/node.go                          |   1 +
 op-node/service.go                            |   9 +-
 14 files changed, 258 insertions(+), 129 deletions(-)

diff --git a/op-conductor/conductor/config.go b/op-conductor/conductor/config.go
index ca18de7d1a18..98e3ad83440e 100644
--- a/op-conductor/conductor/config.go
+++ b/op-conductor/conductor/config.go
@@ -19,12 +19,19 @@ import (
 )
 
 type Config struct {
-	// ConsensusAddr is the address to listen for consensus connections.
+	// ConsensusAddr is the address, excluding port, to listen on for consensus connections.
+	// E.g. 0.0.0.0 to bind to the external-facing network interface.
 	ConsensusAddr string
 
-	// ConsensusPort is the port to listen for consensus connections.
+	// ConsensusPort is the port to listen on for consensus connections.
+	// If 0, the server binds to a port selected by the system.
 	ConsensusPort int
 
+	// ConsensusAdvertisedAddr is the network address, including port, to advertise to other peers.
+	// This is optional: if empty, the address that the server network transport binds to is used instead.
+	// E.g. local tests may use temporary addresses, rather than preset known addresses.
+	ConsensusAdvertisedAddr string
+
 	// RaftServerID is the unique ID for this server used by raft consensus.
 	RaftServerID string
 
@@ -117,8 +124,11 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*Config, error) {
 	}
 
 	return &Config{
-		ConsensusAddr:         ctx.String(flags.ConsensusAddr.Name),
-		ConsensusPort:         ctx.Int(flags.ConsensusPort.Name),
+		ConsensusAddr: ctx.String(flags.ConsensusAddr.Name),
+		ConsensusPort: ctx.Int(flags.ConsensusPort.Name),
+		// The consensus server will advertise the address it binds to if this is empty/unspecified.
+		ConsensusAdvertisedAddr: ctx.String(flags.AdvertisedFullAddr.Name),
+
 		RaftBootstrap:         ctx.Bool(flags.RaftBootstrap.Name),
 		RaftServerID:          ctx.String(flags.RaftServerID.Name),
 		RaftStorageDir:        ctx.String(flags.RaftStorageDir.Name),
diff --git a/op-conductor/conductor/service.go b/op-conductor/conductor/service.go
index 89656fd727aa..cccba2c76ac9 100644
--- a/op-conductor/conductor/service.go
+++ b/op-conductor/conductor/service.go
@@ -169,10 +169,12 @@ func (c *OpConductor) initConsensus(ctx context.Context) error {
 		return nil
 	}
 
-	serverAddr := fmt.Sprintf("%s:%d", c.cfg.ConsensusAddr, c.cfg.ConsensusPort)
 	raftConsensusConfig := &consensus.RaftConsensusConfig{
-		ServerID:          c.cfg.RaftServerID,
-		ServerAddr:        serverAddr,
+		ServerID: c.cfg.RaftServerID,
+		// AdvertisedAddr may be empty: the server will then default to what it binds to.
+		AdvertisedAddr:    raft.ServerAddress(c.cfg.ConsensusAdvertisedAddr),
+		ListenAddr:        c.cfg.ConsensusAddr,
+		ListenPort:        c.cfg.ConsensusPort,
 		StorageDir:        c.cfg.RaftStorageDir,
 		Bootstrap:         c.cfg.RaftBootstrap,
 		RollupCfg:         &c.cfg.RollupCfg,
@@ -472,6 +474,12 @@ func (oc *OpConductor) Paused() bool {
 	return oc.paused.Load()
 }
 
+// ConsensusEndpoint returns the raft consensus server address to connect to.
+func (oc *OpConductor) ConsensusEndpoint() string {
+	return oc.cons.Addr()
+}
+
+// HTTPEndpoint returns the HTTP RPC endpoint
 func (oc *OpConductor) HTTPEndpoint() string {
 	if oc.rpcServer == nil {
 		return ""
@@ -613,7 +621,8 @@ func (oc *OpConductor) handleHealthUpdate(hcerr error) {
 		oc.queueAction()
 	}
 
-	if oc.healthy.Swap(healthy) != healthy {
+	if old := oc.healthy.Swap(healthy); old != healthy {
+		oc.log.Info("Health state changed", "old", old, "new", healthy)
 		// queue an action if health status changed.
 		oc.queueAction()
 	}
diff --git a/op-conductor/conductor/service_test.go b/op-conductor/conductor/service_test.go
index 49a05e902763..87df417a4683 100644
--- a/op-conductor/conductor/service_test.go
+++ b/op-conductor/conductor/service_test.go
@@ -30,7 +30,7 @@ func mockConfig(t *testing.T) Config {
 	now := uint64(time.Now().Unix())
 	return Config{
 		ConsensusAddr:  "127.0.0.1",
-		ConsensusPort:  50050,
+		ConsensusPort:  0,
 		RaftServerID:   "SequencerA",
 		RaftStorageDir: "/tmp/raft",
 		RaftBootstrap:  false,
diff --git a/op-conductor/consensus/iface.go b/op-conductor/consensus/iface.go
index 69b9506c50b2..e0dcb6efd5a7 100644
--- a/op-conductor/consensus/iface.go
+++ b/op-conductor/consensus/iface.go
@@ -42,6 +42,9 @@ type ServerInfo struct {
 //
 //go:generate mockery --name Consensus --output mocks/ --with-expecter=true
 type Consensus interface {
+	// Addr returns the address of this consensus server.
+	// Internally the server may override what is advertised, or fall back to the address it listens to.
+	Addr() string
 	// AddVoter adds a voting member into the cluster, voter is eligible to become leader.
 	// If version is non-zero, this will only be applied if the current cluster version matches the expected version.
 	AddVoter(id, addr string, version uint64) error
diff --git a/op-conductor/consensus/mocks/Consensus.go b/op-conductor/consensus/mocks/Consensus.go
index ca1397a690e1..902174435146 100644
--- a/op-conductor/consensus/mocks/Consensus.go
+++ b/op-conductor/consensus/mocks/Consensus.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.39.1. DO NOT EDIT.
+// Code generated by mockery v2.46.0. DO NOT EDIT.
 
 package mocks
 
@@ -118,6 +118,51 @@ func (_c *Consensus_AddVoter_Call) RunAndReturn(run func(string, string, uint64)
 	return _c
 }
 
+// Addr provides a mock function with given fields:
+func (_m *Consensus) Addr() string {
+	ret := _m.Called()
+
+	if len(ret) == 0 {
+		panic("no return value specified for Addr")
+	}
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func() string); ok {
+		r0 = rf()
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	return r0
+}
+
+// Consensus_Addr_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Addr'
+type Consensus_Addr_Call struct {
+	*mock.Call
+}
+
+// Addr is a helper method to define mock.On call
+func (_e *Consensus_Expecter) Addr() *Consensus_Addr_Call {
+	return &Consensus_Addr_Call{Call: _e.mock.On("Addr")}
+}
+
+func (_c *Consensus_Addr_Call) Run(run func()) *Consensus_Addr_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run()
+	})
+	return _c
+}
+
+func (_c *Consensus_Addr_Call) Return(_a0 string) *Consensus_Addr_Call {
+	_c.Call.Return(_a0)
+	return _c
+}
+
+func (_c *Consensus_Addr_Call) RunAndReturn(run func() string) *Consensus_Addr_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // ClusterMembership provides a mock function with given fields:
 func (_m *Consensus) ClusterMembership() (*consensus.ClusterMembership, error) {
 	ret := _m.Called()
diff --git a/op-conductor/consensus/raft.go b/op-conductor/consensus/raft.go
index f6acc0fb76f1..86b32ea00f8c 100644
--- a/op-conductor/consensus/raft.go
+++ b/op-conductor/consensus/raft.go
@@ -29,12 +29,30 @@ type RaftConsensus struct {
 	serverID raft.ServerID
 	r        *raft.Raft
 
+	transport *raft.NetworkTransport
+	// advertisedAddr is the host & port to contact this server.
+	// If empty, the address of the transport should be used instead.
+	advertisedAddr string
+
 	unsafeTracker *unsafeHeadTracker
 }
 
 type RaftConsensusConfig struct {
-	ServerID          string
-	ServerAddr        string
+	ServerID string
+
+	// AdvertisedAddr is the address to advertise,
+	// i.e. the address external raft peers use to contact us.
+	// If left empty, it defaults to the resulting
+	// local address that we bind the underlying transport to.
+	AdvertisedAddr raft.ServerAddress
+
+	// ListenPort is the port to bind the server to.
+	// This may be 0, an available port will then be selected by the system.
+	ListenPort int
+	// ListenAddr is the address to bind the server to.
+	// E.g. use 0.0.0.0 to bind to an external-facing network.
+	ListenAddr string
+
 	StorageDir        string
 	Bootstrap         bool
 	RollupCfg         *rollup.Config
@@ -86,18 +104,31 @@ func NewRaftConsensus(log log.Logger, cfg *RaftConsensusConfig) (*RaftConsensus,
 		return nil, fmt.Errorf(`raft.NewFileSnapshotStore(%q): %w`, baseDir, err)
 	}
 
-	addr, err := net.ResolveTCPAddr("tcp", cfg.ServerAddr)
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to resolve tcp address")
+	var advertiseAddr net.Addr
+	if cfg.AdvertisedAddr == "" {
+		log.Warn("No advertised address specified. Advertising local address.")
+	} else {
+		x, err := net.ResolveTCPAddr("tcp", string(cfg.AdvertisedAddr))
+		if err != nil {
+			return nil, fmt.Errorf("failed to resolve advertised TCP address %q: %w", string(cfg.AdvertisedAddr), err)
+		}
+		advertiseAddr = x
+		log.Info("Resolved advertising address", "adAddr", cfg.AdvertisedAddr,
+			"adIP", x.IP, "adPort", x.Port, "adZone", x.Zone)
 	}
 
+	bindAddr := fmt.Sprintf("%s:%d", cfg.ListenAddr, cfg.ListenPort)
+	log.Info("Binding raft server to network transport", "listenAddr", bindAddr)
+
 	maxConnPool := 10
 	timeout := 5 * time.Second
-	bindAddr := fmt.Sprintf("0.0.0.0:%d", addr.Port)
-	transport, err := raft.NewTCPTransportWithLogger(bindAddr, addr, maxConnPool, timeout, rc.Logger)
+
+	// When advertiseAddr == nil, the transport will use the local address that it is bound to.
+	transport, err := raft.NewTCPTransportWithLogger(bindAddr, advertiseAddr, maxConnPool, timeout, rc.Logger)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create raft tcp transport")
 	}
+	log.Info("Raft server network transport is up", "addr", transport.LocalAddr())
 
 	fsm := NewUnsafeHeadTracker(log)
 
@@ -110,11 +141,19 @@ func NewRaftConsensus(log log.Logger, cfg *RaftConsensusConfig) (*RaftConsensus,
 	// If bootstrap = true, start raft in bootstrap mode, this will allow the current node to elect itself as leader when there's no other participants
 	// and allow other nodes to join the cluster.
 	if cfg.Bootstrap {
+		var advertisedAddr raft.ServerAddress
+		if cfg.AdvertisedAddr == "" {
+			advertisedAddr = transport.LocalAddr()
+		} else {
+			advertisedAddr = cfg.AdvertisedAddr
+		}
+		log.Info("Bootstrapping raft consensus cluster with self", "addr", advertisedAddr)
+
 		raftCfg := raft.Configuration{
 			Servers: []raft.Server{
 				{
 					ID:       rc.LocalID,
-					Address:  raft.ServerAddress(cfg.ServerAddr),
+					Address:  advertisedAddr,
 					Suffrage: raft.Voter,
 				},
 			},
@@ -132,9 +171,20 @@ func NewRaftConsensus(log log.Logger, cfg *RaftConsensusConfig) (*RaftConsensus,
 		serverID:      raft.ServerID(cfg.ServerID),
 		unsafeTracker: fsm,
 		rollupCfg:     cfg.RollupCfg,
+		transport:     transport,
 	}, nil
 }
 
+// Addr returns the address to contact this raft consensus server.
+// If no explicit address to advertise was configured,
+// the local network address that the raft-consensus server is listening on will be used.
+func (rc *RaftConsensus) Addr() string {
+	if rc.advertisedAddr != "" {
+		return rc.advertisedAddr
+	}
+	return string(rc.transport.LocalAddr())
+}
+
 // AddNonVoter implements Consensus, it tries to add a non-voting member into the cluster.
 func (rc *RaftConsensus) AddNonVoter(id string, addr string, version uint64) error {
 	if err := checkTCPPortOpen(addr); err != nil {
diff --git a/op-conductor/consensus/raft_test.go b/op-conductor/consensus/raft_test.go
index fbd9c7cb3bc8..9c8ca48247ef 100644
--- a/op-conductor/consensus/raft_test.go
+++ b/op-conductor/consensus/raft_test.go
@@ -28,7 +28,9 @@ func TestCommitAndRead(t *testing.T) {
 	}
 	raftConsensusConfig := &RaftConsensusConfig{
 		ServerID:          "SequencerA",
-		ServerAddr:        "127.0.0.1:0",
+		ListenPort:        0,
+		ListenAddr:        "127.0.0.1", // local test, don't bind to external interface
+		AdvertisedAddr:    "",          // use local address that the server binds to
 		StorageDir:        storageDir,
 		Bootstrap:         true,
 		RollupCfg:         rollupCfg,
diff --git a/op-conductor/flags/flags.go b/op-conductor/flags/flags.go
index 249e8a676e07..7c29bfcab2c3 100644
--- a/op-conductor/flags/flags.go
+++ b/op-conductor/flags/flags.go
@@ -19,16 +19,22 @@ const EnvVarPrefix = "OP_CONDUCTOR"
 var (
 	ConsensusAddr = &cli.StringFlag{
 		Name:    "consensus.addr",
-		Usage:   "Address to listen for consensus connections",
+		Usage:   "Address (excluding port) to listen for consensus connections.",
 		EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "CONSENSUS_ADDR"),
 		Value:   "127.0.0.1",
 	}
 	ConsensusPort = &cli.IntFlag{
 		Name:    "consensus.port",
-		Usage:   "Port to listen for consensus connections",
+		Usage:   "Port to listen for consensus connections. May be 0 to let the system select a port.",
 		EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "CONSENSUS_PORT"),
 		Value:   50050,
 	}
+	AdvertisedFullAddr = &cli.StringFlag{
+		Name:    "consensus.advertised",
+		Usage:   "Full address (host and port) for other peers to contact the consensus server. Optional: if left empty, the local address is advertised.",
+		EnvVars: opservice.PrefixEnvVar(EnvVarPrefix, "CONSENSUS_ADVERTISED"),
+		Value:   "",
+	}
 	RaftBootstrap = &cli.BoolFlag{
 		Name:    "raft.bootstrap",
 		Usage:   "If this node should bootstrap a new raft cluster",
@@ -127,6 +133,7 @@ var requiredFlags = []cli.Flag{
 }
 
 var optionalFlags = []cli.Flag{
+	AdvertisedFullAddr,
 	Paused,
 	RPCEnableProxy,
 	RaftBootstrap,
diff --git a/op-e2e/system/conductor/sequencer_failover_setup.go b/op-e2e/system/conductor/sequencer_failover_setup.go
index ea515ecc1e64..a4e5178e3d3e 100644
--- a/op-e2e/system/conductor/sequencer_failover_setup.go
+++ b/op-e2e/system/conductor/sequencer_failover_setup.go
@@ -2,9 +2,8 @@ package conductor
 
 import (
 	"context"
+	"errors"
 	"fmt"
-	"math/rand"
-	"net"
 	"strings"
 	"testing"
 	"time"
@@ -51,28 +50,23 @@ const (
 var retryStrategy = &retry.FixedStrategy{Dur: 50 * time.Millisecond}
 
 type conductor struct {
-	service       *con.OpConductor
-	client        conrpc.API
-	consensusPort int
-	rpcPort       int
+	service *con.OpConductor
+	client  conrpc.API
 }
 
 func (c *conductor) ConsensusEndpoint() string {
-	return fmt.Sprintf("%s:%d", localhost, c.consensusPort)
+	return c.service.ConsensusEndpoint()
 }
 
 func (c *conductor) RPCEndpoint() string {
-	return fmt.Sprintf("http://%s:%d", localhost, c.rpcPort)
+	return c.service.HTTPEndpoint()
 }
 
 func setupSequencerFailoverTest(t *testing.T) (*e2esys.System, map[string]*conductor, func()) {
 	op_e2e.InitParallel(t)
 	ctx := context.Background()
 
-	sys, conductors, err := retry.Do2(ctx, maxSetupRetries, retryStrategy, func() (*e2esys.System, map[string]*conductor, error) {
-		return setupHAInfra(t, ctx)
-	})
-	require.NoError(t, err, "Expected to successfully setup sequencers and conductors after retry")
+	sys, conductors := setupHAInfra(t, ctx)
 
 	// form a cluster
 	c1 := conductors[Sequencer1Name]
@@ -143,79 +137,80 @@ func setupSequencerFailoverTest(t *testing.T) (*e2esys.System, map[string]*condu
 	}
 }
 
-func setupHAInfra(t *testing.T, ctx context.Context) (*e2esys.System, map[string]*conductor, error) {
+func setupHAInfra(t *testing.T, ctx context.Context) (*e2esys.System, map[string]*conductor) {
 	startTime := time.Now()
-
-	var sys *e2esys.System
-	var conductors map[string]*conductor
-	var err error
-
-	// clean up if setup fails due to port in use.
 	defer func() {
-		if err != nil {
-			if sys != nil {
-				sys.Close()
-			}
-
-			for _, c := range conductors {
-				if c == nil || c.service == nil {
-					// pass. Sometimes we can get nil in this map
-				} else if serr := c.service.Stop(ctx); serr != nil {
-					t.Log("Failed to stop conductor", "error", serr)
-				}
-			}
-		}
 		t.Logf("setupHAInfra took %s\n", time.Since(startTime))
 	}()
 
-	conductorRpcPorts := map[string]int{
-		Sequencer1Name: findAvailablePort(t),
-		Sequencer2Name: findAvailablePort(t),
-		Sequencer3Name: findAvailablePort(t),
+	conductorsReady := map[string]chan string{
+		Sequencer1Name: make(chan string, 1),
+		Sequencer2Name: make(chan string, 1),
+		Sequencer3Name: make(chan string, 1),
 	}
 
-	// 3 sequencers, 1 verifier, 1 active sequencer.
-	cfg := sequencerFailoverSystemConfig(t, conductorRpcPorts)
-	if sys, err = cfg.Start(t); err != nil {
-		return nil, nil, err
+	// The sequencer op-node & execution engine have to be up first, to get their endpoints running.
+	// The conductor is then started after, using the endpoints of op-node and execution engine.
+	// The op-node, while starting, will wait for the conductor to be up and running, to get its endpoint.
+	// No endpoint is reserved/hardcoded this way, this avoids CI test flakes in the setup.
+	conductorEndpointFn := func(ctx context.Context, name string) (endpoint string, err error) {
+		endpointCh, ok := conductorsReady[name]
+		if !ok {
+			return "", errors.New("conductor %s is not known")
+		}
+		select {
+		case <-ctx.Done():
+			return "", fmt.Errorf("failed to set up conductor timely: %w", err)
+		case endpoint := <-endpointCh:
+			return endpoint, nil
+		}
 	}
 
-	// 3 conductors that connects to 1 sequencer each.
-	conductors = make(map[string]*conductor)
+	// 3 sequencers, 1 verifier, 1 active sequencer.
+	cfg := sequencerFailoverSystemConfig(t, conductorEndpointFn)
+
+	// sys is configured to close itself on test cleanup.
+	sys, err := cfg.Start(t)
+	require.NoError(t, err, "must start system")
+
+	out := make(map[string]*conductor)
 
+	// 3 conductors that connects to 1 sequencer each.
 	// initialize all conductors in paused mode
 	conductorCfgs := []struct {
 		name      string
-		port      int
 		bootstrap bool
 	}{
-		{Sequencer1Name, conductorRpcPorts[Sequencer1Name], true}, // one in bootstrap mode so that we can form a cluster.
-		{Sequencer2Name, conductorRpcPorts[Sequencer2Name], false},
-		{Sequencer3Name, conductorRpcPorts[Sequencer3Name], false},
+		{Sequencer1Name, true}, // one in bootstrap mode so that we can form a cluster.
+		{Sequencer2Name, false},
+		{Sequencer3Name, false},
 	}
 	for _, cfg := range conductorCfgs {
 		cfg := cfg
 		nodePRC := sys.RollupNodes[cfg.name].UserRPC().RPC()
 		engineRPC := sys.EthInstances[cfg.name].UserRPC().RPC()
-		if conductors[cfg.name], err = setupConductor(t, cfg.name, t.TempDir(), nodePRC, engineRPC, cfg.port, cfg.bootstrap, *sys.RollupConfig); err != nil {
-			return nil, nil, err
-		}
+
+		conduc, err := setupConductor(t, cfg.name, t.TempDir(), nodePRC, engineRPC, cfg.bootstrap, *sys.RollupConfig)
+		require.NoError(t, err, "failed to set up conductor %s", cfg.name)
+		out[cfg.name] = conduc
+		// Signal that the conductor RPC endpoint is ready
+		conductorsReady[cfg.name] <- conduc.RPCEndpoint()
 	}
 
-	return sys, conductors, nil
+	return sys, out
 }
 
 func setupConductor(
 	t *testing.T,
 	serverID, dir, nodeRPC, engineRPC string,
-	rpcPort int,
 	bootstrap bool,
 	rollupCfg rollup.Config,
 ) (*conductor, error) {
-	consensusPort := findAvailablePort(t)
 	cfg := con.Config{
-		ConsensusAddr:         localhost,
-		ConsensusPort:         consensusPort,
+		ConsensusAddr:           localhost,
+		ConsensusPort:           0,  // let the system select a port, avoid conflicts
+		ConsensusAdvertisedAddr: "", // use the local address we bind to
+
 		RaftServerID:          serverID,
 		RaftStorageDir:        dir,
 		RaftBootstrap:         bootstrap,
@@ -237,17 +232,18 @@ func setupConductor(
 		RollupCfg:      rollupCfg,
 		RPCEnableProxy: true,
 		LogConfig: oplog.CLIConfig{
-			Level: log.LevelInfo,
+			Level: log.LevelDebug,
 			Color: false,
 		},
 		RPC: oprpc.CLIConfig{
 			ListenAddr: localhost,
-			ListenPort: rpcPort,
+			ListenPort: 0, // let the system select a port
 		},
 	}
 
+	logger := testlog.Logger(t, log.LevelDebug)
 	ctx := context.Background()
-	service, err := con.New(ctx, &cfg, testlog.Logger(t, log.LevelInfo), "0.0.1")
+	service, err := con.New(ctx, &cfg, logger, "0.0.1")
 	if err != nil {
 		return nil, err
 	}
@@ -257,6 +253,8 @@ func setupConductor(
 		return nil, err
 	}
 
+	logger.Info("Started conductor", "nodeRPC", nodeRPC, "engineRPC", engineRPC)
+
 	rawClient, err := rpc.DialContext(ctx, service.HTTPEndpoint())
 	if err != nil {
 		return nil, err
@@ -265,10 +263,8 @@ func setupConductor(
 	client := conrpc.NewAPIClient(rawClient)
 
 	return &conductor{
-		service:       service,
-		client:        client,
-		consensusPort: consensusPort,
-		rpcPort:       rpcPort,
+		service: service,
+		client:  client,
 	}, nil
 }
 
@@ -316,12 +312,18 @@ func setupBatcher(t *testing.T, sys *e2esys.System, conductors map[string]*condu
 	sys.BatchSubmitter = batcher
 }
 
-func sequencerFailoverSystemConfig(t *testing.T, ports map[string]int) e2esys.SystemConfig {
+func sequencerFailoverSystemConfig(t *testing.T, conductorRPCEndpoints func(ctx context.Context, name string) (string, error)) e2esys.SystemConfig {
 	cfg := e2esys.EcotoneSystemConfig(t, new(hexutil.Uint64))
 	delete(cfg.Nodes, "sequencer")
-	cfg.Nodes[Sequencer1Name] = sequencerCfg(ports[Sequencer1Name])
-	cfg.Nodes[Sequencer2Name] = sequencerCfg(ports[Sequencer2Name])
-	cfg.Nodes[Sequencer3Name] = sequencerCfg(ports[Sequencer3Name])
+	cfg.Nodes[Sequencer1Name] = sequencerCfg(func(ctx context.Context) (string, error) {
+		return conductorRPCEndpoints(ctx, Sequencer1Name)
+	})
+	cfg.Nodes[Sequencer2Name] = sequencerCfg(func(ctx context.Context) (string, error) {
+		return conductorRPCEndpoints(ctx, Sequencer2Name)
+	})
+	cfg.Nodes[Sequencer3Name] = sequencerCfg(func(ctx context.Context) (string, error) {
+		return conductorRPCEndpoints(ctx, Sequencer3Name)
+	})
 
 	delete(cfg.Loggers, "sequencer")
 	cfg.Loggers[Sequencer1Name] = testlog.Logger(t, log.LevelInfo).New("role", Sequencer1Name)
@@ -338,7 +340,7 @@ func sequencerFailoverSystemConfig(t *testing.T, ports map[string]int) e2esys.Sy
 	return cfg
 }
 
-func sequencerCfg(rpcPort int) *rollupNode.Config {
+func sequencerCfg(conductorRPCEndpoint rollupNode.ConductorRPCFunc) *rollupNode.Config {
 	return &rollupNode.Config{
 		Driver: driver.Config{
 			VerifierConfDepth:  0,
@@ -357,8 +359,8 @@ func sequencerCfg(rpcPort int) *rollupNode.Config {
 		ConfigPersistence:           &rollupNode.DisabledConfigPersistence{},
 		Sync:                        sync.Config{SyncMode: sync.CLSync},
 		ConductorEnabled:            true,
-		ConductorRpc:                fmt.Sprintf("http://%s:%d", localhost, rpcPort),
-		ConductorRpcTimeout:         1 * time.Second,
+		ConductorRpc:                conductorRPCEndpoint,
+		ConductorRpcTimeout:         5 * time.Second,
 	}
 }
 
@@ -453,26 +455,6 @@ func sequencerActive(t *testing.T, ctx context.Context, rollupClient *sources.Ro
 	return active
 }
 
-func findAvailablePort(t *testing.T) int {
-	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
-	defer cancel()
-	for {
-		select {
-		case <-ctx.Done():
-			t.Error("Failed to find available port")
-		default:
-			// private / ephemeral ports are in the range 49152-65535
-			port := rand.Intn(65535-49152) + 49152
-			addr := fmt.Sprintf("127.0.0.1:%d", port)
-			l, err := net.Listen("tcp", addr)
-			if err == nil {
-				l.Close() // Close the listener and return the port if it's available
-				return port
-			}
-		}
-	}
-}
-
 func findLeader(t *testing.T, conductors map[string]*conductor) (string, *conductor) {
 	for id, con := range conductors {
 		if leader(t, context.Background(), con) {
diff --git a/op-e2e/system/conductor/sequencer_failover_test.go b/op-e2e/system/conductor/sequencer_failover_test.go
index 74047fcc6fdd..5722dc3b82e9 100644
--- a/op-e2e/system/conductor/sequencer_failover_test.go
+++ b/op-e2e/system/conductor/sequencer_failover_test.go
@@ -103,7 +103,6 @@ func TestSequencerFailover_ConductorRPC(t *testing.T) {
 			t, VerifierName, t.TempDir(),
 			sys.RollupEndpoint(Sequencer3Name).RPC(),
 			sys.NodeEndpoint(Sequencer3Name).RPC(),
-			findAvailablePort(t),
 			false,
 			*sys.RollupConfig,
 		)
diff --git a/op-node/node/conductor.go b/op-node/node/conductor.go
index ff5723889b95..cc45f4bfabc4 100644
--- a/op-node/node/conductor.go
+++ b/op-node/node/conductor.go
@@ -13,15 +13,17 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
 	"github.com/ethereum-optimism/optimism/op-service/dial"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/locks"
 	"github.com/ethereum-optimism/optimism/op-service/retry"
 )
 
 // ConductorClient is a client for the op-conductor RPC service.
 type ConductorClient struct {
-	cfg       *Config
-	metrics   *metrics.Metrics
-	log       log.Logger
-	apiClient *conductorRpc.APIClient
+	cfg     *Config
+	metrics *metrics.Metrics
+	log     log.Logger
+
+	apiClient locks.RWValue[*conductorRpc.APIClient]
 
 	// overrideLeader is used to override the leader check for disaster recovery purposes.
 	// During disaster situations where the cluster is unhealthy (no leader, only 1 or less nodes up),
@@ -41,15 +43,23 @@ func NewConductorClient(cfg *Config, log log.Logger, metrics *metrics.Metrics) c
 }
 
 // Initialize initializes the conductor client.
-func (c *ConductorClient) initialize() error {
-	if c.apiClient != nil {
+func (c *ConductorClient) initialize(ctx context.Context) error {
+	c.apiClient.Lock()
+	defer c.apiClient.Unlock()
+	if c.apiClient.Value != nil {
 		return nil
 	}
-	conductorRpcClient, err := dial.DialRPCClientWithTimeout(context.Background(), time.Minute*1, c.log, c.cfg.ConductorRpc)
+	endpoint, err := retry.Do[string](ctx, 10, retry.Exponential(), func() (string, error) {
+		return c.cfg.ConductorRpc(ctx)
+	})
+	if err != nil {
+		return fmt.Errorf("no conductor RPC endpoint available: %w", err)
+	}
+	conductorRpcClient, err := dial.DialRPCClientWithTimeout(context.Background(), time.Minute*1, c.log, endpoint)
 	if err != nil {
 		return fmt.Errorf("failed to dial conductor RPC: %w", err)
 	}
-	c.apiClient = conductorRpc.NewAPIClient(conductorRpcClient)
+	c.apiClient.Value = conductorRpc.NewAPIClient(conductorRpcClient)
 	return nil
 }
 
@@ -64,7 +74,7 @@ func (c *ConductorClient) Leader(ctx context.Context) (bool, error) {
 		return true, nil
 	}
 
-	if err := c.initialize(); err != nil {
+	if err := c.initialize(ctx); err != nil {
 		return false, err
 	}
 	ctx, cancel := context.WithTimeout(ctx, c.cfg.ConductorRpcTimeout)
@@ -72,8 +82,11 @@ func (c *ConductorClient) Leader(ctx context.Context) (bool, error) {
 
 	isLeader, err := retry.Do(ctx, 2, retry.Fixed(50*time.Millisecond), func() (bool, error) {
 		record := c.metrics.RecordRPCClientRequest("conductor_leader")
-		result, err := c.apiClient.Leader(ctx)
+		result, err := c.apiClient.Get().Leader(ctx)
 		record(err)
+		if err != nil {
+			c.log.Error("Failed to check conductor for leadership", "err", err)
+		}
 		return result, err
 	})
 	return isLeader, err
@@ -85,7 +98,7 @@ func (c *ConductorClient) CommitUnsafePayload(ctx context.Context, payload *eth.
 		return nil
 	}
 
-	if err := c.initialize(); err != nil {
+	if err := c.initialize(ctx); err != nil {
 		return err
 	}
 	ctx, cancel := context.WithTimeout(ctx, c.cfg.ConductorRpcTimeout)
@@ -93,7 +106,7 @@ func (c *ConductorClient) CommitUnsafePayload(ctx context.Context, payload *eth.
 
 	err := retry.Do0(ctx, 2, retry.Fixed(50*time.Millisecond), func() error {
 		record := c.metrics.RecordRPCClientRequest("conductor_commitUnsafePayload")
-		err := c.apiClient.CommitUnsafePayload(ctx, payload)
+		err := c.apiClient.Get().CommitUnsafePayload(ctx, payload)
 		record(err)
 		return err
 	})
@@ -107,9 +120,11 @@ func (c *ConductorClient) OverrideLeader(ctx context.Context) error {
 }
 
 func (c *ConductorClient) Close() {
-	if c.apiClient == nil {
+	c.apiClient.Lock()
+	defer c.apiClient.Unlock()
+	if c.apiClient.Value == nil {
 		return
 	}
-	c.apiClient.Close()
-	c.apiClient = nil
+	c.apiClient.Value.Close()
+	c.apiClient.Value = nil
 }
diff --git a/op-node/node/config.go b/op-node/node/config.go
index a78b55853aa2..6591a756e715 100644
--- a/op-node/node/config.go
+++ b/op-node/node/config.go
@@ -69,13 +69,16 @@ type Config struct {
 
 	// Conductor is used to determine this node is the leader sequencer.
 	ConductorEnabled    bool
-	ConductorRpc        string
+	ConductorRpc        ConductorRPCFunc
 	ConductorRpcTimeout time.Duration
 
 	// AltDA config
 	AltDA altda.CLIConfig
 }
 
+// ConductorRPCFunc retrieves the endpoint. The RPC may not immediately be available.
+type ConductorRPCFunc func(ctx context.Context) (string, error)
+
 type RPCConfig struct {
 	ListenAddr  string
 	ListenPort  int
diff --git a/op-node/node/node.go b/op-node/node/node.go
index 298c98aa2b18..2727552b8190 100644
--- a/op-node/node/node.go
+++ b/op-node/node/node.go
@@ -445,6 +445,7 @@ func (n *OpNode) initRPCServer(cfg *Config) error {
 	if err := server.Start(); err != nil {
 		return fmt.Errorf("unable to start RPC server: %w", err)
 	}
+	n.log.Info("Started JSON-RPC server", "addr", server.Addr())
 	n.server = server
 	return nil
 }
diff --git a/op-node/service.go b/op-node/service.go
index b24e2a638335..4d12c7f5446f 100644
--- a/op-node/service.go
+++ b/op-node/service.go
@@ -1,6 +1,7 @@
 package opnode
 
 import (
+	"context"
 	"crypto/rand"
 	"encoding/json"
 	"errors"
@@ -80,7 +81,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 		ctx.IsSet(flags.HeartbeatURLFlag.Name) {
 		log.Warn("Heartbeat functionality is not supported anymore, CLI flags will be removed in following release.")
 	}
-
+	conductorRPCEndpoint := ctx.String(flags.ConductorRpcFlag.Name)
 	cfg := &node.Config{
 		L1:         l1Endpoint,
 		L2:         l2Endpoint,
@@ -108,8 +109,10 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 		Sync:                        *syncConfig,
 		RollupHalt:                  haltOption,
 
-		ConductorEnabled:    ctx.Bool(flags.ConductorEnabledFlag.Name),
-		ConductorRpc:        ctx.String(flags.ConductorRpcFlag.Name),
+		ConductorEnabled: ctx.Bool(flags.ConductorEnabledFlag.Name),
+		ConductorRpc: func(context.Context) (string, error) {
+			return conductorRPCEndpoint, nil
+		},
 		ConductorRpcTimeout: ctx.Duration(flags.ConductorRpcTimeoutFlag.Name),
 
 		AltDA: altda.ReadCLIConfig(ctx),

From ba74f8a8a6b50ff28744955651629af41aa93079 Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Fri, 8 Nov 2024 17:01:28 -0500
Subject: [PATCH 164/451] cannon: Port step post-checks to MIPS2.sol (#12815)

---
 .../snapshots/abi/MIPS2.json                  |  2 +-
 .../snapshots/semver-lock.json                |  4 +-
 .../contracts-bedrock/src/cannon/MIPS2.sol    | 38 +++++++++++++++++--
 .../src/cannon/interfaces/IMIPS2.sol          |  8 +++-
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/abi/MIPS2.json b/packages/contracts-bedrock/snapshots/abi/MIPS2.json
index 2294e23e754e..348868bfba0a 100644
--- a/packages/contracts-bedrock/snapshots/abi/MIPS2.json
+++ b/packages/contracts-bedrock/snapshots/abi/MIPS2.json
@@ -45,7 +45,7 @@
     "outputs": [
       {
         "internalType": "bytes32",
-        "name": "",
+        "name": "postState_",
         "type": "bytes32"
       }
     ],
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index cb4cc8a55be9..fb7b6d824392 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -144,8 +144,8 @@
     "sourceCodeHash": "0xd8467700c80b3e62fa37193dc6513bac35282094b686b50e162e157f704dde00"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0xaedf0d0b0e94a0c5e7d987331d2fdba84230f5704a6ca33677e70cde7051b17e",
-    "sourceCodeHash": "0x9fa2d1297ad1e93b4d3c5c0fed08bedcd8f746807589f0fd3369e79347c6a027"
+    "initCodeHash": "0xc38c76ab3aad78c81ca01b3235b402614972d6604b22fda1e870f1bf47be1194",
+    "sourceCodeHash": "0x3d38b1924669d1bde756f1306601c764a6d31f428ac72667a3dd194b3388210d"
   },
   "src/cannon/MIPS64.sol": {
     "initCodeHash": "0x93aa8d7f9fd3c22276c0d303a3fefdf8f73cc55807b35e483bba64c92d02aaef",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index 220c66ddde54..1d73473fde24 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -60,8 +60,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.21
-    string public constant version = "1.0.0-beta.21";
+    /// @custom:semver 1.0.0-beta.22
+    string public constant version = "1.0.0-beta.22";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -102,7 +102,39 @@ contract MIPS2 is ISemver {
     /// the current thread stack.
     /// @param _localContext The local key context for the preimage oracle. Optional, can be set as a constant
     ///                      if the caller only requires one set of local keys.
-    function step(bytes calldata _stateData, bytes calldata _proof, bytes32 _localContext) public returns (bytes32) {
+    /// @return postState_ The hash of the post state witness after the state transition.
+    function step(
+        bytes calldata _stateData,
+        bytes calldata _proof,
+        bytes32 _localContext
+    )
+        public
+        returns (bytes32 postState_)
+    {
+        postState_ = doStep(_stateData, _proof, _localContext);
+        assertPostStateChecks();
+    }
+
+    function assertPostStateChecks() internal pure {
+        State memory state;
+        assembly {
+            state := STATE_MEM_OFFSET
+        }
+
+        bytes32 activeStack = state.traverseRight ? state.rightThreadStack : state.leftThreadStack;
+        if (activeStack == EMPTY_THREAD_ROOT) {
+            revert("MIPS2: post-state active thread stack is empty");
+        }
+    }
+
+    function doStep(
+        bytes calldata _stateData,
+        bytes calldata _proof,
+        bytes32 _localContext
+    )
+        internal
+        returns (bytes32)
+    {
         unchecked {
             State memory state;
             ThreadState memory thread;
diff --git a/packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol b/packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol
index 614daac1a731..be37d5b49ff7 100644
--- a/packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol
@@ -46,7 +46,13 @@ interface IMIPS2 is ISemver {
     error InvalidRMWInstruction();
 
     function oracle() external view returns (IPreimageOracle oracle_);
-    function step(bytes memory _stateData, bytes memory _proof, bytes32 _localContext) external returns (bytes32);
+    function step(
+        bytes memory _stateData,
+        bytes memory _proof,
+        bytes32 _localContext
+    )
+        external
+        returns (bytes32 postState_);
 
     function __constructor__(IPreimageOracle _oracle) external;
 }

From a786daaf0f06eb0edf3c84a24049f9a32b9101f1 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 11 Nov 2024 12:28:27 +0000
Subject: [PATCH 165/451] load HoloceneTime from registry (#12890)

---
 op-node/rollup/superchain.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op-node/rollup/superchain.go b/op-node/rollup/superchain.go
index 21a74323c05f..e4ca043011a2 100644
--- a/op-node/rollup/superchain.go
+++ b/op-node/rollup/superchain.go
@@ -91,6 +91,7 @@ func LoadOPStackRollupConfig(chainID uint64) (*Config, error) {
 		EcotoneTime:            chConfig.EcotoneTime,
 		FjordTime:              chConfig.FjordTime,
 		GraniteTime:            chConfig.GraniteTime,
+		HoloceneTime:           chConfig.HoloceneTime,
 		BatchInboxAddress:      common.Address(chConfig.BatchInboxAddr),
 		DepositContractAddress: common.Address(addrs.OptimismPortalProxy),
 		L1SystemConfigAddress:  common.Address(addrs.SystemConfigProxy),

From 5af6860f69a3150733e5349d077efa8e9a6ddadc Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 11 Nov 2024 16:30:05 +0000
Subject: [PATCH 166/451] op-e2e/actions: improve Holocene tests by adding log
 assertions (#12889)

* fix double error in inferring isHolocene

* add capture logging to l2faultproofenv

* fold log expectations into holoceneExpectations

* improve test failure output

* attach log expectations to invalid batch test case

* add more log expectations

* add more log expectations

* add more test expectations for invalid payloads

* add log assertion for deposits-only attributes

* improve test names

* improve subtest names

* move holocene helpers to separate file

* remove shadow

* add log assertions for holocene_batches_test.go

* remove assertion on logs in frame queue
---
 op-e2e/actions/proofs/helpers/env.go          |  5 +-
 .../actions/proofs/holocene_batches_test.go   | 47 +++++++++++-------
 op-e2e/actions/proofs/holocene_frame_test.go  | 46 ++++++------------
 .../actions/proofs/holocene_helpers_test.go   | 45 +++++++++++++++++
 .../proofs/holocene_invalid_batch_test.go     | 48 ++++++++++++++-----
 5 files changed, 128 insertions(+), 63 deletions(-)
 create mode 100644 op-e2e/actions/proofs/holocene_helpers_test.go

diff --git a/op-e2e/actions/proofs/helpers/env.go b/op-e2e/actions/proofs/helpers/env.go
index 8ba29a6101ea..4226f4ccc4cf 100644
--- a/op-e2e/actions/proofs/helpers/env.go
+++ b/op-e2e/actions/proofs/helpers/env.go
@@ -28,6 +28,7 @@ import (
 // L2FaultProofEnv is a test harness for a fault provable L2 chain.
 type L2FaultProofEnv struct {
 	log       log.Logger
+	Logs      *testlog.CapturingHandler
 	Batcher   *helpers.L2Batcher
 	Sequencer *helpers.L2Sequencer
 	Engine    *helpers.L2Engine
@@ -40,7 +41,8 @@ type L2FaultProofEnv struct {
 }
 
 func NewL2FaultProofEnv[c any](t helpers.Testing, testCfg *TestCfg[c], tp *e2eutils.TestParams, batcherCfg *helpers.BatcherCfg) *L2FaultProofEnv {
-	log := testlog.Logger(t, log.LvlDebug)
+	log, logs := testlog.CaptureLogger(t, log.LevelDebug)
+
 	dp := NewDeployParams(t, tp, func(dp *e2eutils.DeployParams) {
 		genesisBlock := hexutil.Uint64(0)
 
@@ -111,6 +113,7 @@ func NewL2FaultProofEnv[c any](t helpers.Testing, testCfg *TestCfg[c], tp *e2eut
 
 	return &L2FaultProofEnv{
 		log:       log,
+		Logs:      logs,
 		Batcher:   batcher,
 		Sequencer: sequencer,
 		Engine:    engine,
diff --git a/op-e2e/actions/proofs/holocene_batches_test.go b/op-e2e/actions/proofs/holocene_batches_test.go
index b67d2bd9da6d..8028aa0f5b90 100644
--- a/op-e2e/actions/proofs/holocene_batches_test.go
+++ b/op-e2e/actions/proofs/holocene_batches_test.go
@@ -25,41 +25,54 @@ func Test_ProgramAction_HoloceneBatches(gt *testing.T) {
 	testCases := []testCase{
 		// Standard channel composition
 		{
-			name: "case-0", blocks: []uint{1, 2, 3},
+			name: "ordered", blocks: []uint{1, 2, 3},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3,
-				safeHeadHolocene:    3,
+				preHolocene: expectations{safeHead: 3},
+				holocene:    expectations{safeHead: 3},
 			},
 		},
 
 		// Non-standard channel composition
 		{
-			name: "case-2a", blocks: []uint{1, 3, 2},
+			name: "disordered-a", blocks: []uint{1, 3, 2},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, // batches are buffered, so the block ordering does not matter
-				safeHeadHolocene:    1, // batch for block 3 is considered invalid because it is from the future. This batch + remaining channel is dropped.
+				preHolocene: expectations{safeHead: 3}, // batches are buffered, so the block ordering does not matter
+				holocene: expectations{safeHead: 1, // batch for block 3 is considered invalid because it is from the future. This batch + remaining channel is dropped.
+					logs: append(
+						sequencerOnce("dropping future batch"),
+						sequencerOnce("Dropping invalid singular batch, flushing channel")...,
+					)},
 			},
 		},
 		{
-			name: "case-2b", blocks: []uint{2, 1, 3},
+			name: "disordered-b", blocks: []uint{2, 1, 3},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, // batches are buffered, so the block ordering does not matter
-				safeHeadHolocene:    0, // batch for block 2 is considered invalid because it is from the future. This batch + remaining channel is dropped.
+				preHolocene: expectations{safeHead: 3}, // batches are buffered, so the block ordering does not matter
+				holocene: expectations{safeHead: 0, // batch for block 2 is considered invalid because it is from the future. This batch + remaining channel is dropped.
+					logs: append(
+						sequencerOnce("dropping future batch"),
+						sequencerOnce("Dropping invalid singular batch, flushing channel")...,
+					)},
 			},
 		},
 
 		{
-			name: "case-2c", blocks: []uint{1, 1, 2, 3},
+			name: "duplicates-a", blocks: []uint{1, 1, 2, 3},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, // duplicate batches are silently dropped, so this reduceds to case-0
-				safeHeadHolocene:    3, // duplicate batches are silently dropped
+				preHolocene: expectations{safeHead: 3}, // duplicate batches are dropped, so this reduces to the "ordered" case
+				holocene: expectations{safeHead: 3, // duplicate batches are dropped, so this reduces to the "ordered" case
+					logs: sequencerOnce("dropping past batch with old timestamp")},
 			},
 		},
 		{
-			name: "case-2d", blocks: []uint{2, 2, 1, 3},
+			name: "duplicates-b", blocks: []uint{2, 2, 1, 3},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, // duplicate batches are silently dropped, so this reduces to case-2b
-				safeHeadHolocene:    0, // duplicate batches are silently dropped, so this reduces to case-2b
+				preHolocene: expectations{safeHead: 3}, // duplicate batches are silently dropped, so this reduces to disordered-2b
+				holocene: expectations{safeHead: 0, // duplicate batches are silently dropped, so this reduces to disordered-2b
+					logs: append(
+						sequencerOnce("dropping future batch"),
+						sequencerOnce("Dropping invalid singular batch, flushing channel")...,
+					)},
 			},
 		},
 	}
@@ -112,8 +125,8 @@ func Test_ProgramAction_HoloceneBatches(gt *testing.T) {
 		env.Sequencer.ActL2PipelineFull(t)
 
 		l2SafeHead := env.Sequencer.L2Safe()
-		testCfg.Custom.RequireExpectedProgress(t, l2SafeHead, testCfg.Hardfork.Precedence < helpers.Holocene.Precedence, env.Engine)
-
+		isHolocene := testCfg.Hardfork.Precedence >= helpers.Holocene.Precedence
+		testCfg.Custom.RequireExpectedProgressAndLogs(t, l2SafeHead, isHolocene, env.Engine, env.Logs)
 		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
 
 		env.RunFaultProofProgram(t, l2SafeHead.Number, testCfg.CheckResult, testCfg.InputParams...)
diff --git a/op-e2e/actions/proofs/holocene_frame_test.go b/op-e2e/actions/proofs/holocene_frame_test.go
index 5093527b758d..2eb843d62ef8 100644
--- a/op-e2e/actions/proofs/holocene_frame_test.go
+++ b/op-e2e/actions/proofs/holocene_frame_test.go
@@ -7,28 +7,10 @@ import (
 	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
 	"github.com/ethereum-optimism/optimism/op-e2e/actions/proofs/helpers"
 	"github.com/ethereum-optimism/optimism/op-program/client/claim"
-	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 )
 
-type holoceneExpectations struct {
-	safeHeadPreHolocene uint64
-	safeHeadHolocene    uint64
-}
-
-func (h holoceneExpectations) RequireExpectedProgress(t actionsHelpers.StatefulTesting, actualSafeHead eth.L2BlockRef, isHolocene bool, engine *actionsHelpers.L2Engine) {
-	if isHolocene {
-		require.Equal(t, h.safeHeadPreHolocene, actualSafeHead.Number)
-		expectedHash := engine.L2Chain().GetBlockByNumber(h.safeHeadPreHolocene).Hash()
-		require.Equal(t, expectedHash, actualSafeHead.Hash)
-	} else {
-		require.Equal(t, h.safeHeadHolocene, actualSafeHead.Number)
-		expectedHash := engine.L2Chain().GetBlockByNumber(h.safeHeadHolocene).Hash()
-		require.Equal(t, expectedHash, actualSafeHead.Hash)
-	}
-}
-
 func Test_ProgramAction_HoloceneFrames(gt *testing.T) {
 	type testCase struct {
 		name   string
@@ -42,33 +24,33 @@ func Test_ProgramAction_HoloceneFrames(gt *testing.T) {
 	testCases := []testCase{
 		// Standard frame submission,
 		{
-			name: "case-0", frames: []uint{0, 1, 2},
+			name: "ordered", frames: []uint{0, 1, 2},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3,
-				safeHeadHolocene:    3,
+				preHolocene: expectations{safeHead: 3},
+				holocene:    expectations{safeHead: 3},
 			},
 		},
 
 		// Non-standard frame submission
 		{
-			name: "case-1a", frames: []uint{2, 1, 0},
+			name: "disordered-a", frames: []uint{2, 1, 0},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, // frames are buffered, so ordering does not matter
-				safeHeadHolocene:    0, // non-first frames will be dropped b/c it is the first seen with that channel Id. The safe head won't move until the channel is closed/completed.
+				preHolocene: expectations{safeHead: 3}, // frames are buffered, so ordering does not matter
+				holocene:    expectations{safeHead: 0}, // non-first frames will be dropped b/c it is the first seen with that channel Id. The safe head won't move until the channel is closed/completed.
 			},
 		},
 		{
-			name: "case-1b", frames: []uint{0, 1, 0, 2},
+			name: "disordered-b", frames: []uint{0, 1, 0, 2},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, // frames are buffered, so ordering does not matter
-				safeHeadHolocene:    0, // non-first frames will be dropped b/c it is the first seen with that channel Id. The safe head won't move until the channel is closed/completed.
+				preHolocene: expectations{safeHead: 3}, // frames are buffered, so ordering does not matter
+				holocene:    expectations{safeHead: 0}, // non-first frames will be dropped b/c it is the first seen with that channel Id. The safe head won't move until the channel is closed/completed.
 			},
 		},
 		{
-			name: "case-1c", frames: []uint{0, 1, 1, 2},
+			name: "duplicates", frames: []uint{0, 1, 1, 2},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, // frames are buffered, so ordering does not matter
-				safeHeadHolocene:    3, // non-contiguous frames are dropped. So this reduces to case-0.
+				preHolocene: expectations{safeHead: 3}, // frames are buffered, so ordering does not matter
+				holocene:    expectations{safeHead: 3}, // non-contiguous frames are dropped. So this reduces to case-0.
 			},
 		},
 	}
@@ -126,8 +108,8 @@ func Test_ProgramAction_HoloceneFrames(gt *testing.T) {
 
 		l2SafeHead := env.Sequencer.L2Safe()
 
-		testCfg.Custom.RequireExpectedProgress(t, l2SafeHead, testCfg.Hardfork.Precedence < helpers.Holocene.Precedence, env.Engine)
-
+		isHolocene := testCfg.Hardfork.Precedence >= helpers.Holocene.Precedence
+		testCfg.Custom.RequireExpectedProgressAndLogs(t, l2SafeHead, isHolocene, env.Engine, env.Logs)
 		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
 
 		env.RunFaultProofProgram(t, l2SafeHead.Number, testCfg.CheckResult, testCfg.InputParams...)
diff --git a/op-e2e/actions/proofs/holocene_helpers_test.go b/op-e2e/actions/proofs/holocene_helpers_test.go
new file mode 100644
index 000000000000..4b19185fe357
--- /dev/null
+++ b/op-e2e/actions/proofs/holocene_helpers_test.go
@@ -0,0 +1,45 @@
+package proofs
+
+import (
+	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/stretchr/testify/require"
+)
+
+type logExpectations struct {
+	role   string
+	filter string
+	num    int
+}
+type expectations struct {
+	safeHead uint64
+	logs     []logExpectations
+}
+type holoceneExpectations struct {
+	preHolocene, holocene expectations
+}
+
+func (h holoceneExpectations) RequireExpectedProgressAndLogs(t actionsHelpers.StatefulTesting, actualSafeHead eth.L2BlockRef, isHolocene bool, engine *actionsHelpers.L2Engine, logs *testlog.CapturingHandler) {
+	var exp expectations
+	if isHolocene {
+		exp = h.holocene
+	} else {
+		exp = h.preHolocene
+	}
+
+	require.Equal(t, exp.safeHead, actualSafeHead.Number)
+	expectedHash := engine.L2Chain().GetBlockByNumber(exp.safeHead).Hash()
+	require.Equal(t, expectedHash, actualSafeHead.Hash)
+
+	for _, l := range exp.logs {
+		t.Helper()
+		recs := logs.FindLogs(testlog.NewMessageContainsFilter(l.filter), testlog.NewAttributesFilter("role", l.role))
+		require.Len(t, recs, l.num, "searching for %d instances of '%s' in logs from role %s", l.num, l.filter, l.role)
+	}
+
+}
+
+func sequencerOnce(filter string) []logExpectations {
+	return []logExpectations{{filter: filter, role: "sequencer", num: 1}}
+}
diff --git a/op-e2e/actions/proofs/holocene_invalid_batch_test.go b/op-e2e/actions/proofs/holocene_invalid_batch_test.go
index 3e210ab72ee4..202861401c9c 100644
--- a/op-e2e/actions/proofs/holocene_invalid_batch_test.go
+++ b/op-e2e/actions/proofs/holocene_invalid_batch_test.go
@@ -62,7 +62,7 @@ func Test_ProgramAction_HoloceneInvalidBatch(gt *testing.T) {
 		{
 			name: "valid", blocks: []uint{1, 2, 3},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 3, safeHeadHolocene: 3,
+				preHolocene: expectations{safeHead: 3}, holocene: expectations{safeHead: 3},
 			},
 		},
 
@@ -70,24 +70,38 @@ func Test_ProgramAction_HoloceneInvalidBatch(gt *testing.T) {
 			name: "invalid-payload", blocks: []uint{1, 2, 3}, blockModifiers: []actionsHelpers.BlockModifier{nil, invalidPayload, nil},
 			useSpanBatch: false,
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 1, // Invalid signature in block 2 causes an invalid _payload_ in the engine queue. Entire span batch is invalidated.
-				safeHeadHolocene:    2, // We expect the safe head to move to 2 due to creation of an deposit-only block.
+				preHolocene: expectations{safeHead: 1, // Invalid signature in block 2 causes an invalid _payload_ in the engine queue. Entire span batch is invalidated.
+					logs: sequencerOnce("could not process payload attributes"),
+				},
+				holocene: expectations{safeHead: 2, // We expect the safe head to move to 2 due to creation of a deposit-only block.
+					logs: append(
+						sequencerOnce("Holocene active, requesting deposits-only attributes"),
+						sequencerOnce("could not process payload attributes")...,
+					),
+				},
 			},
 		},
 		{
 			name: "invalid-payload-span", blocks: []uint{1, 2, 3}, blockModifiers: []actionsHelpers.BlockModifier{nil, invalidPayload, nil},
 			useSpanBatch: true,
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 0, // Invalid signature in block 2 causes an invalid _payload_ in the engine queue. Entire span batch is invalidated.
-				safeHeadHolocene:    2, // We expect the safe head to move to 2 due to creation of an deposit-only block.
+				preHolocene: expectations{safeHead: 0, // Invalid signature in block 2 causes an invalid _payload_ in the engine queue. Entire span batch is invalidated.
+					logs: sequencerOnce("could not process payload attributes"),
+				},
+
+				holocene: expectations{safeHead: 2, // We expect the safe head to move to 2 due to creation of an deposit-only block.
+					logs: sequencerOnce("could not process payload attributes"),
+				},
 			},
 		},
 
 		{
 			name: "invalid-parent-hash", blocks: []uint{1, 2, 3}, blockModifiers: []actionsHelpers.BlockModifier{nil, invalidParentHash, nil},
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 1, // Invalid parentHash in block 2 causes an invalid batch to be dropped.
-				safeHeadHolocene:    1, // Same with Holocene.
+				preHolocene: expectations{safeHead: 1, // Invalid parentHash in block 2 causes an invalid batch to be dropped.
+					logs: sequencerOnce("ignoring batch with mismatching parent hash")},
+				holocene: expectations{safeHead: 1, // Same with Holocene.
+					logs: sequencerOnce("Dropping invalid singular batch, flushing channel")},
 			},
 		},
 		{
@@ -95,8 +109,12 @@ func Test_ProgramAction_HoloceneInvalidBatch(gt *testing.T) {
 			useSpanBatch:            true,
 			breachMaxSequencerDrift: true,
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 0,    // Entire span batch invalidated.
-				safeHeadHolocene:    1800, // We expect partial validity until we hit sequencer drift.
+				preHolocene: expectations{safeHead: 0, // Entire span batch invalidated.
+					logs: sequencerOnce("batch exceeded sequencer time drift without adopting next origin, and next L1 origin would have been valid"),
+				},
+				holocene: expectations{safeHead: 1800, // We expect partial validity until we hit sequencer drift.
+					logs: sequencerOnce("batch exceeded sequencer time drift without adopting next origin, and next L1 origin would have been valid"),
+				},
 			},
 		},
 		{
@@ -105,8 +123,12 @@ func Test_ProgramAction_HoloceneInvalidBatch(gt *testing.T) {
 			useSpanBatch:        true,
 			overAdvanceL1Origin: 3, // this will over-advance the L1 origin of block 3
 			holoceneExpectations: holoceneExpectations{
-				safeHeadPreHolocene: 0, // Entire span batch invalidated.
-				safeHeadHolocene:    2, // We expect partial validity, safe head should move to block 2, dropping invalid block 3 and remaining channel.
+				preHolocene: expectations{safeHead: 0, // Entire span batch invalidated.
+					logs: sequencerOnce("block timestamp is less than L1 origin timestamp"),
+				},
+				holocene: expectations{safeHead: 2, // We expect partial validity, safe head should move to block 2, dropping invalid block 3 and remaining channel.
+					logs: sequencerOnce("batch timestamp is less than L1 origin timestamp"),
+				},
 			},
 		},
 	}
@@ -204,8 +226,8 @@ func Test_ProgramAction_HoloceneInvalidBatch(gt *testing.T) {
 
 		l2SafeHead := env.Sequencer.L2Safe()
 
-		testCfg.Custom.RequireExpectedProgress(t, l2SafeHead, testCfg.Hardfork.Precedence < helpers.Holocene.Precedence, env.Engine)
-
+		isHolocene := testCfg.Hardfork.Precedence >= helpers.Holocene.Precedence
+		testCfg.Custom.RequireExpectedProgressAndLogs(t, l2SafeHead, isHolocene, env.Engine, env.Logs)
 		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
 
 		if safeHeadNumber := l2SafeHead.Number; safeHeadNumber > 0 {

From 9ae58ba02261ad96fbd11710dd6030ba643cceab Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 11 Nov 2024 21:31:29 +0000
Subject: [PATCH 167/451] op-e2e/actions: Cover Holocene activation and
 pipeline reset (#12891)

* confirm holocene activation behavior

TODO remove hack around setting holocene time
TODO add log assertions

* add holocene_activation_test.go

* move holocene time hardcoding into test override

* tidy

* Update op-e2e/actions/proofs/holocene_activation_test.go

Co-authored-by: clabby <ben@clab.by>

---------

Co-authored-by: clabby <ben@clab.by>
---
 op-e2e/actions/proofs/helpers/env.go          |   9 +-
 .../proofs/holocene_activation_test.go        | 117 ++++++++++++++++++
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 op-e2e/actions/proofs/holocene_activation_test.go

diff --git a/op-e2e/actions/proofs/helpers/env.go b/op-e2e/actions/proofs/helpers/env.go
index 4226f4ccc4cf..7027647e142b 100644
--- a/op-e2e/actions/proofs/helpers/env.go
+++ b/op-e2e/actions/proofs/helpers/env.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"math/rand"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	e2ecfg "github.com/ethereum-optimism/optimism/op-e2e/config"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
@@ -40,7 +41,9 @@ type L2FaultProofEnv struct {
 	Bob       *helpers.CrossLayerUser
 }
 
-func NewL2FaultProofEnv[c any](t helpers.Testing, testCfg *TestCfg[c], tp *e2eutils.TestParams, batcherCfg *helpers.BatcherCfg) *L2FaultProofEnv {
+type deployConfigOverride func(*genesis.DeployConfig)
+
+func NewL2FaultProofEnv[c any](t helpers.Testing, testCfg *TestCfg[c], tp *e2eutils.TestParams, batcherCfg *helpers.BatcherCfg, deployConfigOverrides ...deployConfigOverride) *L2FaultProofEnv {
 	log, logs := testlog.CaptureLogger(t, log.LevelDebug)
 
 	dp := NewDeployParams(t, tp, func(dp *e2eutils.DeployParams) {
@@ -66,6 +69,10 @@ func NewL2FaultProofEnv[c any](t helpers.Testing, testCfg *TestCfg[c], tp *e2eut
 		case Holocene:
 			dp.DeployConfig.L2GenesisHoloceneTimeOffset = &genesisBlock
 		}
+
+		for _, override := range deployConfigOverrides {
+			override(dp.DeployConfig)
+		}
 	})
 	sd := e2eutils.Setup(t, dp, helpers.DefaultAlloc)
 
diff --git a/op-e2e/actions/proofs/holocene_activation_test.go b/op-e2e/actions/proofs/holocene_activation_test.go
new file mode 100644
index 000000000000..55b8c1162de3
--- /dev/null
+++ b/op-e2e/actions/proofs/holocene_activation_test.go
@@ -0,0 +1,117 @@
+package proofs
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+	actionsHelpers "github.com/ethereum-optimism/optimism/op-e2e/actions/helpers"
+	"github.com/ethereum-optimism/optimism/op-e2e/actions/proofs/helpers"
+	"github.com/ethereum-optimism/optimism/op-program/client/claim"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_ProgramAction_HoloceneActivation(gt *testing.T) {
+
+	runHoloceneDerivationTest := func(gt *testing.T, testCfg *helpers.TestCfg[any]) {
+		t := actionsHelpers.NewDefaultTesting(gt)
+
+		// Define override to activate Holocene 14 seconds after genesis
+		var setHoloceneTime = func(dc *genesis.DeployConfig) {
+			fourteen := hexutil.Uint64(14)
+			dc.L2GenesisHoloceneTimeOffset = &fourteen
+		}
+
+		env := helpers.NewL2FaultProofEnv(t, testCfg, helpers.NewTestParams(), helpers.NewBatcherCfg(), setHoloceneTime)
+
+		t.Log("HoloceneTime:  ", env.Sequencer.RollupCfg.HoloceneTime)
+
+		// Build the L2 chain
+		blocks := []uint{1, 2}
+		targetHeadNumber := 2
+		for env.Engine.L2Chain().CurrentBlock().Number.Uint64() < uint64(targetHeadNumber) {
+			env.Sequencer.ActL2StartBlock(t)
+			// Send an L2 tx
+			env.Alice.L2.ActResetTxOpts(t)
+			env.Alice.L2.ActSetTxToAddr(&env.Dp.Addresses.Bob)
+			env.Alice.L2.ActMakeTx(t)
+			env.Engine.ActL2IncludeTx(env.Alice.Address())(t)
+			env.Sequencer.ActL2EndBlock(t)
+		}
+
+		// Build up a local list of frames
+		orderedFrames := make([][]byte, 0, 2)
+		// Buffer the blocks in the batcher and populate orderedFrames list
+		env.Batcher.ActCreateChannel(t, false)
+		for i, blockNum := range blocks {
+			env.Batcher.ActAddBlockByNumber(t, int64(blockNum), actionsHelpers.BlockLogger(t))
+			if i == len(blocks)-1 {
+				env.Batcher.ActL2ChannelClose(t)
+			}
+			frame := env.Batcher.ReadNextOutputFrame(t)
+			require.NotEmpty(t, frame, "frame %d", i)
+			orderedFrames = append(orderedFrames, frame)
+		}
+
+		includeBatchTx := func() {
+			// Include the last transaction submitted by the batcher.
+			env.Miner.ActL1StartBlock(12)(t)
+			env.Miner.ActL1IncludeTxByHash(env.Batcher.LastSubmitted.Hash())(t)
+			env.Miner.ActL1EndBlock(t)
+		}
+
+		// Submit first frame
+		env.Batcher.ActL2BatchSubmitRaw(t, orderedFrames[0])
+		includeBatchTx() // block should have a timestamp of 12s after genesis
+
+		// Holocene should activate 14s after genesis, so that the previous l1 block
+		// was before HoloceneTime and the next l1 block is after it
+
+		// Submit final frame
+		env.Batcher.ActL2BatchSubmitRaw(t, orderedFrames[1])
+		includeBatchTx() // block should have a timestamp of 24s after genesis
+
+		// Instruct the sequencer to derive the L2 chain from the data on L1 that the batcher just posted.
+		env.Sequencer.ActL1HeadSignal(t)
+		env.Sequencer.ActL2PipelineFull(t)
+
+		l2SafeHead := env.Sequencer.L2Safe()
+		require.EqualValues(t, uint64(0), l2SafeHead.Number) // channel should be dropped, so no safe head progression
+		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
+
+		// Log assertions
+		filters := []string{
+			"FrameQueue: resetting with Holocene activation",
+			"ChannelMux: transforming to Holocene stage",
+			"BatchMux: transforming to Holocene stage",
+			"dropping non-first frame without channel",
+		}
+		for _, filter := range filters {
+			recs := env.Logs.FindLogs(testlog.NewMessageContainsFilter(filter), testlog.NewAttributesFilter("role", "sequencer"))
+			require.Len(t, recs, 1, "searching for %d instances of '%s' in logs from role %s", 1, filter, "sequencer")
+		}
+
+		env.RunFaultProofProgram(t, l2SafeHead.Number, testCfg.CheckResult, testCfg.InputParams...)
+	}
+
+	matrix := helpers.NewMatrix[any]()
+	defer matrix.Run(gt)
+
+	matrix.AddTestCase(
+		"HonestClaim-HoloceneActivation",
+		nil,
+		helpers.NewForkMatrix(helpers.Granite),
+		runHoloceneDerivationTest,
+		helpers.ExpectNoError(),
+	)
+	matrix.AddTestCase(
+		"JunkClaim-HoloceneActivation",
+		nil,
+		helpers.NewForkMatrix(helpers.Granite),
+		runHoloceneDerivationTest,
+		helpers.ExpectError(claim.ErrClaimNotValid),
+		helpers.WithL2Claim(common.HexToHash("0xdeadbeef")),
+	)
+}

From 38ee0891bab0c5c6607354eb3479d8597b808f4f Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Tue, 12 Nov 2024 00:29:38 -0800
Subject: [PATCH 168/451] cannon: Add more 64-bit tests (#12839)

* cannon: Add more 64-bit tests

* address review comments
---
 cannon/Makefile                               |  47 +-
 cannon/mipsevm/exec/mips_instructions.go      |   4 +-
 cannon/mipsevm/tests/evm_common64_test.go     | 243 ++-------
 cannon/mipsevm/tests/evm_common_test.go       | 275 ++--------
 .../mipsevm/tests/evm_multithreaded64_test.go | 122 +++++
 .../mipsevm/tests/evm_multithreaded_test.go   | 330 +++---------
 cannon/mipsevm/tests/fuzz_evm_common_test.go  |  97 +---
 .../tests/fuzz_evm_multithreaded_test.go      |  11 +-
 cannon/mipsevm/tests/testfuncs_test.go        | 502 ++++++++++++++++++
 cannon/mipsevm/testutil/arch.go               |   8 +
 cannon/mipsevm/testutil/vmtests.go            |   7 -
 11 files changed, 820 insertions(+), 826 deletions(-)
 create mode 100644 cannon/mipsevm/tests/testfuncs_test.go

diff --git a/cannon/Makefile b/cannon/Makefile
index f71ffa24d200..6156cd68d64e 100644
--- a/cannon/Makefile
+++ b/cannon/Makefile
@@ -18,6 +18,9 @@ endif
 # The MIPS64 r1 opcodes not supported by cannon. This list does not include coprocess-specific opcodes.
 UNSUPPORTED_OPCODES := (dclo|dclz)
 
+CANNON32_FUZZTIME := 10s
+CANNON64_FUZZTIME := 20s
+
 cannon32-impl:
 	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build --tags=cannon32 -v $(LDFLAGS) -o ./bin/cannon32-impl .
 
@@ -87,28 +90,28 @@ cannon-stf-verify:
 
 fuzz:
 	printf "%s\n" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallBrk32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallMmap32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallExitGroup32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallFcntl32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintRead32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateHintWrite32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzStateSyscallCloneMT32 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMulOp ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultOp ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateConsistencyMultuOp ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallBrk64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallMmap64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallExitGroup64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallFcntl64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateHintRead64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateHintWrite64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite64 ./mipsevm/tests" \
-		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStateSyscallCloneMT64 ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateSyscallBrk ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateSyscallMmap ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateSyscallExitGroup ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateSyscallFcntl ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateHintRead ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageRead ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateHintWrite ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 20s -fuzz=FuzzStatePreimageWrite ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateSyscallCloneST ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime $(CANNON32_FUZZTIME) -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateConsistencyMulOp ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateConsistencyMultOp ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) -tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateConsistencyMultuOp ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateSyscallBrk ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateSyscallMmap ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateSyscallExitGroup ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateSyscallFcntl ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateHintRead ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStatePreimageRead ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateHintWrite ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStatePreimageWrite ./mipsevm/tests" \
+		"go test $(FUZZLDFLAGS) --tags=cannon64 -run NOTAREALTEST -v -fuzztime $(CANNON64_FUZZTIME) -fuzz=FuzzStateSyscallCloneMT ./mipsevm/tests" \
 	| parallel -j 8 {}
 
 .PHONY: \
diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index bf1a8fdd0e7c..c8e27e63df01 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -455,10 +455,10 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 			assertMips64(insn)
 			return rt
 		default:
-			panic("invalid instruction")
+			panic(fmt.Sprintf("invalid instruction: %x", insn))
 		}
 	}
-	panic("invalid instruction")
+	panic(fmt.Sprintf("invalid instruction: %x", insn))
 }
 
 func SignExtend(dat Word, idx Word) Word {
diff --git a/cannon/mipsevm/tests/evm_common64_test.go b/cannon/mipsevm/tests/evm_common64_test.go
index d83ac4fa63d1..ce1253886742 100644
--- a/cannon/mipsevm/tests/evm_common64_test.go
+++ b/cannon/mipsevm/tests/evm_common64_test.go
@@ -8,22 +8,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 	"github.com/stretchr/testify/require"
 )
 
-func TestEVMSingleStep_Operators64(t *testing.T) {
-	cases := []struct {
-		name      string
-		isImm     bool
-		rs        Word
-		rt        Word
-		imm       uint16
-		opcode    uint32
-		funct     uint32
-		expectRes Word
-	}{
+func TestEVM_SingleStep_Operators64(t *testing.T) {
+	cases := []operatorTestCase{
 		{name: "dadd. both unsigned 32", funct: 0x2c, isImm: false, rs: Word(0x12), rt: Word(0x20), expectRes: Word(0x32)},                                                                  // dadd t0, s1, s2
 		{name: "dadd. unsigned 32 and signed", funct: 0x2c, isImm: false, rs: Word(0x12), rt: Word(^uint32(0)), expectRes: Word(0x1_00_00_00_11)},                                           // dadd t0, s1, s2
 		{name: "dadd. signed and unsigned 32", funct: 0x2c, isImm: false, rs: Word(^uint32(0)), rt: Word(0x12), expectRes: Word(0x1_00_00_00_11)},                                           // dadd t0, s1, s2
@@ -93,52 +83,26 @@ func TestEVMSingleStep_Operators64(t *testing.T) {
 		{name: "dsrav max", funct: 0x17, rt: Word(0x7F_FF_00_00_00_00_00_20), rs: Word(0x3f), expectRes: Word(0x0)},
 		{name: "dsrav max sign-extend", funct: 0x17, rt: Word(0x80_00_00_00_00_00_00_20), rs: Word(0x3f), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FF_FF)},
 	}
+	testOperators(t, cases, false)
+}
 
-	v := GetMultiThreadedTestCase(t)
-	for i, tt := range cases {
-		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
-		t.Run(testName, func(t *testing.T) {
-			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
-			state := goVm.GetState()
-			var insn uint32
-			var rsReg uint32 = 17
-			var rtReg uint32
-			var rdReg uint32
-			if tt.isImm {
-				rtReg = 8
-				insn = tt.opcode<<26 | rsReg<<21 | rtReg<<16 | uint32(tt.imm)
-				state.GetRegistersRef()[rtReg] = tt.rt
-				state.GetRegistersRef()[rsReg] = tt.rs
-			} else {
-				rtReg = 18
-				rdReg = 8
-				insn = rsReg<<21 | rtReg<<16 | rdReg<<11 | tt.funct
-				state.GetRegistersRef()[rsReg] = tt.rs
-				state.GetRegistersRef()[rtReg] = tt.rt
-			}
-			testutil.StoreInstruction(state.GetMemory(), 0, insn)
-			step := state.GetStep()
-
-			// Setup expectations
-			expected := testutil.NewExpectedState(state)
-			expected.ExpectStep()
-			if tt.isImm {
-				expected.Registers[rtReg] = tt.expectRes
-			} else {
-				expected.Registers[rdReg] = tt.expectRes
-			}
-
-			stepWitness, err := goVm.Step(true)
-			require.NoError(t, err)
-
-			// Check expectations
-			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-		})
+func TestEVM_SingleStep_Bitwise64(t *testing.T) {
+	cases := []operatorTestCase{
+		{name: "and", funct: 0x24, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(160)},                          // and t0, s1, s2
+		{name: "andi", opcode: 0xc, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(0)},                // andi t0, s1, 40
+		{name: "or", funct: 0x25, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(1530)},                          // or t0, s1, s2
+		{name: "ori", opcode: 0xd, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},                // ori t0, s1, 40
+		{name: "xor", funct: 0x26, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(1370)},                         // xor t0, s1, s2
+		{name: "xori", opcode: 0xe, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(44)},               // xori t0, s1, 40
+		{name: "nor", funct: 0x27, isImm: false, rs: Word(0x4b0), rt: Word(0x1ea), expectRes: Word(0xFF_FF_FF_FF_FF_FF_FA_05)}, // nor t0, s1, s2
+		{name: "slt", funct: 0x2a, isImm: false, rs: 0xFF_FF_FF_FE, rt: Word(5), expectRes: Word(0)},                           // slt t0, s1, s2
+		{name: "slt", funct: 0x2a, isImm: false, rs: 0xFF_FF_FF_FF_FF_FF_FF_FE, rt: Word(5), expectRes: Word(1)},               // slt t0, s1, s2
+		{name: "sltu", funct: 0x2b, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(0)},                           // sltu t0, s1, s2
 	}
+	testOperators(t, cases, false)
 }
 
-func TestEVMSingleStep_Shift64(t *testing.T) {
+func TestEVM_SingleStep_Shift64(t *testing.T) {
 	cases := []struct {
 		name      string
 		rd        Word
@@ -218,17 +182,10 @@ func TestEVMSingleStep_Shift64(t *testing.T) {
 	}
 }
 
-func TestEVMSingleStep_LoadStore64(t *testing.T) {
-	cases := []struct {
-		name         string
-		rs           Word
-		rt           Word
-		opcode       uint32
-		memVal       Word
-		expectMemVal Word
-		expectRes    Word
-		imm          uint16
-	}{
+func TestEVM_SingleStep_LoadStore64(t *testing.T) {
+	t1 := Word(0xFF000000_00000108)
+
+	cases := []loadStoreTestCase{
 		{name: "lb 0", opcode: uint32(0x20), memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x71)},                                            // lb $t0, 0($t1)
 		{name: "lb 1", opcode: uint32(0x20), imm: 1, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x72)},                                    // lb $t0, 1($t1)
 		{name: "lb 2", opcode: uint32(0x20), imm: 2, memVal: Word(0x71_72_73_74_75_76_77_78), expectRes: Word(0x73)},                                    // lb $t0, 2($t1)
@@ -421,63 +378,15 @@ func TestEVMSingleStep_LoadStore64(t *testing.T) {
 		{name: "sd", opcode: uint32(0x3f), rt: Word(0x11_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x11_22_33_44_55_66_77_88)},        // sd $t0, 0($t1)
 		{name: "sd signed", opcode: uint32(0x3f), rt: Word(0x81_22_33_44_55_66_77_88), memVal: Word(0xAA_BB_CC_DD_A1_B1_C1_D1), expectMemVal: Word(0x81_22_33_44_55_66_77_88)}, // sd $t0, 4($t1)
 	}
-
-	v := GetMultiThreadedTestCase(t)
-	var t1 Word = 0xFF000000_00000108
-	var baseReg uint32 = 9
-	var rtReg uint32 = 8
-	for i, tt := range cases {
-		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
-		t.Run(testName, func(t *testing.T) {
-			effAddr := arch.AddressMask & t1
-
-			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
-			state := goVm.GetState()
-
-			insn := tt.opcode<<26 | baseReg<<21 | rtReg<<16 | uint32(tt.imm)
-			state.GetRegistersRef()[rtReg] = tt.rt
-			state.GetRegistersRef()[baseReg] = t1
-
-			testutil.StoreInstruction(state.GetMemory(), 0, insn)
-			state.GetMemory().SetWord(t1&arch.AddressMask, tt.memVal)
-			step := state.GetStep()
-
-			// Setup expectations
-			expected := testutil.NewExpectedState(state)
-			expected.ExpectStep()
-			if tt.expectMemVal != 0 {
-				expected.ExpectMemoryWriteWord(effAddr, tt.expectMemVal)
-			} else {
-				expected.Registers[rtReg] = tt.expectRes
-			}
-			stepWitness, err := goVm.Step(true)
-			require.NoError(t, err)
-
-			// Check expectations
-			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-		})
+	// use a fixed base for all tests
+	for i := range cases {
+		cases[i].base = t1
 	}
+	testLoadStore(t, cases)
 }
 
-func TestEVMSingleStep_DivMult64(t *testing.T) {
-	cases := []struct {
-		name        string
-		rs          Word
-		rt          Word
-		funct       uint32
-		expectLo    Word
-		expectHi    Word
-		expectPanic string
-	}{
-		// TODO(#12598): Fix 32-bit tests and remove these
-		{name: "mult", funct: uint32(0x18), rs: Word(0x0F_FF_00_00), rt: Word(100), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},
-		{name: "mult", funct: uint32(0x18), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), expectHi: Word(0x0), expectLo: Word(0x1)},
-		{name: "mult", funct: uint32(0x18), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD), expectHi: Word(0xE), expectLo: Word(0xFF_FF_FF_FF_FC_FC_FD_27)},
-		{name: "multu", funct: uint32(0x19), rs: Word(0x0F_FF_00_00), rt: Word(100), expectHi: Word(0x6), expectLo: Word(0x3F_9C_00_00)},
-		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), expectHi: Word(0xFF_FF_FF_FF_FF_FF_FF_FE), expectLo: Word(0x1)},
-		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_BE), expectHi: Word(0xFF_FF_FF_FF_AA_BB_CC_9F), expectLo: Word(0xFF_FF_FF_FF_FC_FD_02_9A)},
-
+func TestEVM_SingleStep_MulDiv64(t *testing.T) {
+	cases := []mulDivTestCase{
 		// dmult s1, s2
 		// expected hi,lo were verified using qemu-mips
 		{name: "dmult 0", funct: 0x1c, rs: 0, rt: 0, expectLo: 0, expectHi: 0},
@@ -514,9 +423,9 @@ func TestEVMSingleStep_DivMult64(t *testing.T) {
 		{name: "dmultu 14", funct: 0x1d, rs: Word(0x7F_FF_FF_FF_FF_FF_FF_FF), rt: Word(0x8F_FF_FF_FF_FF_FF_FF_FF), expectLo: 0xF0_00_00_00_00_00_00_01, expectHi: 0x47_FF_FF_FF_FF_FF_FF_FE},
 
 		// ddiv rs, rt
-		{name: "ddiv", funct: 0x1e, rs: 0, rt: 0, expectPanic: "instruction divide by zero"},
-		{name: "ddiv", funct: 0x1e, rs: 1, rt: 0, expectPanic: "instruction divide by zero"},
-		{name: "ddiv", funct: 0x1e, rs: 0xFF_FF_FF_FF_FF_FF_FF_FF, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddiv", funct: 0x1e, rs: 0, rt: 0, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
+		{name: "ddiv", funct: 0x1e, rs: 1, rt: 0, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
+		{name: "ddiv", funct: 0x1e, rs: 0xFF_FF_FF_FF_FF_FF_FF_FF, rt: 0, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
 		{name: "ddiv", funct: 0x1e, rs: 0, rt: 1, expectLo: 0, expectHi: 0},
 		{name: "ddiv", funct: 0x1e, rs: 1, rt: 1, expectLo: 1, expectHi: 0},
 		{name: "ddiv", funct: 0x1e, rs: 10, rt: 3, expectLo: 3, expectHi: 1},
@@ -527,9 +436,9 @@ func TestEVMSingleStep_DivMult64(t *testing.T) {
 		{name: "ddiv", funct: 0x1e, rs: 0x7F_FF_FF_FF_00_00_00_00, rt: ^Word(0), expectLo: 0x80_00_00_01_00_00_00_00, expectHi: 0},
 
 		// ddivu
-		{name: "ddivu", funct: 0x1f, rs: 0, rt: 0, expectPanic: "instruction divide by zero"},
-		{name: "ddivu", funct: 0x1f, rs: 1, rt: 0, expectPanic: "instruction divide by zero"},
-		{name: "ddivu", funct: 0x1f, rs: 0xFF_FF_FF_FF_FF_FF_FF_FF, rt: 0, expectPanic: "instruction divide by zero"},
+		{name: "ddivu", funct: 0x1f, rs: 0, rt: 0, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
+		{name: "ddivu", funct: 0x1f, rs: 1, rt: 0, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
+		{name: "ddivu", funct: 0x1f, rs: 0xFF_FF_FF_FF_FF_FF_FF_FF, rt: 0, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
 		{name: "ddivu", funct: 0x1f, rs: 0, rt: 1, expectLo: 0, expectHi: 0},
 		{name: "ddivu", funct: 0x1f, rs: 1, rt: 1, expectLo: 1, expectHi: 0},
 		{name: "ddivu", funct: 0x1f, rs: 10, rt: 3, expectLo: 3, expectHi: 1},
@@ -540,57 +449,16 @@ func TestEVMSingleStep_DivMult64(t *testing.T) {
 		{name: "ddivu", funct: 0x1f, rs: 0x7F_FF_FF_FF_00_00_00_00, rt: ^Word(0), expectLo: 0, expectHi: 0x7F_FF_FF_FF_00_00_00_00},
 
 		// a couple div/divu 64-bit edge cases
-		{name: "div lower word zero", funct: 0x1a, rs: 1, rt: 0xFF_FF_FF_FF_00_00_00_00, expectPanic: "instruction divide by zero"},
-		{name: "divu lower word zero", funct: 0x1b, rs: 1, rt: 0xFF_FF_FF_FF_00_00_00_00, expectPanic: "instruction divide by zero"},
+		{name: "div lower word zero", funct: 0x1a, rs: 1, rt: 0xFF_FF_FF_FF_00_00_00_00, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
+		{name: "divu lower word zero", funct: 0x1b, rs: 1, rt: 0xFF_FF_FF_FF_00_00_00_00, panicMsg: "instruction divide by zero", revertMsg: "division by zero"},
 	}
 
-	v := GetMultiThreadedTestCase(t)
-	for i, tt := range cases {
-		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
-		t.Run(testName, func(t *testing.T) {
-			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
-			state := goVm.GetState()
-			var rsReg uint32 = 17
-			var rtReg uint32 = 18
-			insn := rsReg<<21 | rtReg<<16 | tt.funct
-			state.GetRegistersRef()[rsReg] = tt.rs
-			state.GetRegistersRef()[rtReg] = tt.rt
-			testutil.StoreInstruction(state.GetMemory(), 0, insn)
-			step := state.GetStep()
-
-			// Setup expectations
-			expected := testutil.NewExpectedState(state)
-			expected.ExpectStep()
-			expected.LO = tt.expectLo
-			expected.HI = tt.expectHi
-
-			if tt.expectPanic != "" {
-				require.PanicsWithValue(t, tt.expectPanic, func() { _, _ = goVm.Step(true) })
-				// TODO(#12250): Assert EVM panic for divide by zero
-				// testutil.AssertEVMReverts(t, state, contracts, nil, proofData, errMsg)
-			} else {
-				stepWitness, err := goVm.Step(true)
-				require.NoError(t, err)
-				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-			}
-		})
-	}
+	testMulDiv(t, cases, false)
 }
 
-func TestEVMSingleStep_Branch64(t *testing.T) {
-	versions := GetMipsVersionTestCases(t)
-	cases := []struct {
-		name         string
-		pc           Word
-		expectNextPC Word
-		opcode       uint32
-		regimm       uint32
-		expectLink   bool
-		rs           arch.SignedInteger
-		rt           Word
-		offset       uint16
-	}{
+func TestEVM_SingleStep_Branch64(t *testing.T) {
+	t.Parallel()
+	cases := []branchTestCase{
 		// blez
 		{name: "blez", pc: 0, opcode: 0x6, rs: 0x5, offset: 0x100, expectNextPC: 0x8},
 		{name: "blez large rs", pc: 0x10, opcode: 0x6, rs: 0x7F_FF_FF_FF_FF_FF_FF_FF, offset: 0x100, expectNextPC: 0x18},
@@ -635,34 +503,5 @@ func TestEVMSingleStep_Branch64(t *testing.T) {
 		{name: "bgezal fill bit offset except sign", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x7F_FF, expectNextPC: 0x2_00_10, expectLink: true},
 	}
 
-	for _, v := range versions {
-		for i, tt := range cases {
-			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
-			t.Run(testName, func(t *testing.T) {
-				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(tt.pc))
-				state := goVm.GetState()
-				const rsReg = 8 // t0
-				insn := tt.opcode<<26 | rsReg<<21 | tt.regimm<<16 | uint32(tt.offset)
-				testutil.StoreInstruction(state.GetMemory(), tt.pc, insn)
-				state.GetRegistersRef()[rsReg] = Word(tt.rs)
-				step := state.GetStep()
-
-				// Setup expectations
-				expected := testutil.NewExpectedState(state)
-				expected.Step += 1
-				expected.PC = state.GetCpu().NextPC
-				expected.NextPC = tt.expectNextPC
-				if tt.expectLink {
-					expected.Registers[31] = state.GetPC() + 8
-				}
-
-				stepWitness, err := goVm.Step(true)
-				require.NoError(t, err)
-
-				// Check expectations
-				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-			})
-		}
-	}
+	testBranch(t, cases)
 }
diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index f61ee0850d51..6845fb07d59a 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -20,7 +20,9 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
-func TestEVM(t *testing.T) {
+func TestEVM_OpenMIPS(t *testing.T) {
+	testutil.Cannon32OnlyTest(t, "Skipping MIPS32 assembly test vectors for cannon64")
+
 	testFiles, err := os.ReadDir("open_mips_tests/test/bin")
 	require.NoError(t, err)
 
@@ -36,7 +38,6 @@ func TestEVM(t *testing.T) {
 		for _, f := range testFiles {
 			testName := fmt.Sprintf("%v (%v)", f.Name(), c.Name)
 			t.Run(testName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				for _, skipped := range skipped {
 					if f.Name() == skipped {
 						t.Skipf("Skipping explicitly excluded open_mips testcase: %v", f.Name())
@@ -105,7 +106,7 @@ func TestEVM(t *testing.T) {
 	}
 }
 
-func TestEVMSingleStep_Jump(t *testing.T) {
+func TestEVM_SingleStep_Jump(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name         string
@@ -150,18 +151,8 @@ func TestEVMSingleStep_Jump(t *testing.T) {
 	}
 }
 
-func TestEVMSingleStep_Operators(t *testing.T) {
-	versions := GetMipsVersionTestCases(t)
-	cases := []struct {
-		name      string
-		isImm     bool
-		rs        Word
-		rt        Word
-		imm       uint16
-		funct     uint32
-		opcode    uint32
-		expectRes Word
-	}{
+func TestEVM_SingleStep_Operators(t *testing.T) {
+	cases := []operatorTestCase{
 		{name: "add", funct: 0x20, isImm: false, rs: Word(12), rt: Word(20), expectRes: Word(32)},                                  // add t0, s1, s2
 		{name: "add", funct: 0x20, isImm: false, rs: ^Word(0), rt: ^Word(0), expectRes: Word(0xFF_FF_FF_FE)},                       // add t0, s1, s2
 		{name: "add", funct: 0x20, isImm: false, rs: Word(0x7F_FF_FF_FF), rt: Word(0x7F_FF_FF_FF), expectRes: Word(0xFF_FF_FF_FE)}, // add t0, s1, s2
@@ -191,7 +182,14 @@ func TestEVMSingleStep_Operators(t *testing.T) {
 		{name: "subu", funct: 0x23, isImm: false, rs: Word(20), rt: Word(12), expectRes: Word(8)},            // subu t0, s1, s2
 		{name: "subu", funct: 0x23, isImm: false, rs: ^Word(0), rt: Word(1), expectRes: Word(0xFF_FF_FF_FE)}, // subu t0, s1, s2
 		{name: "subu", funct: 0x23, isImm: false, rs: Word(1), rt: ^Word(0), expectRes: Word(0x2)},           // subu t0, s1, s2
+	}
+	testOperators(t, cases, true)
+}
 
+func TestEVM_SingleStep_Bitwise32(t *testing.T) {
+	testutil.Cannon32OnlyTest(t, "These tests are fully covered for 64-bits in TestEVM_SingleStep_Bitwise64")
+	// bitwise operations that use the full word size
+	cases := []operatorTestCase{
 		{name: "and", funct: 0x24, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(160)},            // and t0, s1, s2
 		{name: "andi", opcode: 0xc, isImm: true, rs: Word(4), rt: Word(1), imm: uint16(40), expectRes: Word(0)},  // andi t0, s1, 40
 		{name: "or", funct: 0x25, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(1530)},            // or t0, s1, s2
@@ -202,70 +200,15 @@ func TestEVMSingleStep_Operators(t *testing.T) {
 		{name: "slt", funct: 0x2a, isImm: false, rs: 0xFF_FF_FF_FE, rt: Word(5), expectRes: Word(1)},             // slt t0, s1, s2
 		{name: "sltu", funct: 0x2b, isImm: false, rs: Word(1200), rt: Word(490), expectRes: Word(0)},             // sltu t0, s1, s2
 	}
-
-	for _, v := range versions {
-		for i, tt := range cases {
-			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
-			t.Run(testName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
-				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
-				state := goVm.GetState()
-				var insn uint32
-				var baseReg uint32 = 17
-				var rtReg uint32
-				var rdReg uint32
-				if tt.isImm {
-					rtReg = 8
-					insn = tt.opcode<<26 | baseReg<<21 | rtReg<<16 | uint32(tt.imm)
-					state.GetRegistersRef()[rtReg] = tt.rt
-					state.GetRegistersRef()[baseReg] = tt.rs
-				} else {
-					rtReg = 18
-					rdReg = 8
-					insn = baseReg<<21 | rtReg<<16 | rdReg<<11 | tt.funct
-					state.GetRegistersRef()[baseReg] = tt.rs
-					state.GetRegistersRef()[rtReg] = tt.rt
-				}
-				testutil.StoreInstruction(state.GetMemory(), 0, insn)
-				step := state.GetStep()
-
-				// Setup expectations
-				expected := testutil.NewExpectedState(state)
-				expected.Step += 1
-				expected.PC = 4
-				expected.NextPC = 8
-				if tt.isImm {
-					expected.Registers[rtReg] = tt.expectRes
-				} else {
-					expected.Registers[rdReg] = tt.expectRes
-				}
-
-				stepWitness, err := goVm.Step(true)
-				require.NoError(t, err)
-
-				// Check expectations
-				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-			})
-		}
-	}
+	testOperators(t, cases, false)
 }
 
-func TestEVMSingleStep_LoadStore(t *testing.T) {
+func TestEVM_SingleStep_LoadStore32(t *testing.T) {
+	testutil.Cannon32OnlyTest(t, "These tests are fully covered for 64-bits in TestEVM_SingleStep_LoadStore64")
 	loadMemVal := Word(0x11_22_33_44)
 	loadMemValNeg := Word(0xF1_F2_F3_F4)
 	rtVal := Word(0xaa_bb_cc_dd)
-	versions := GetMipsVersionTestCases(t)
-	cases := []struct {
-		name         string
-		rt           Word
-		base         Word
-		imm          uint32
-		opcode       uint32
-		memVal       Word
-		expectMemVal Word
-		expectRes    Word
-	}{
+	cases := []loadStoreTestCase{
 		{name: "lb, offset=0", opcode: uint32(0x20), base: 0x100, imm: 0x20, memVal: loadMemVal, expectRes: 0x11},
 		{name: "lb, offset=1", opcode: uint32(0x20), base: 0x100, imm: 0x1, memVal: loadMemVal, expectRes: 0x22},
 		{name: "lb, offset=2", opcode: uint32(0x20), base: 0x100, imm: 0x2, memVal: loadMemVal, expectRes: 0x33},
@@ -302,49 +245,10 @@ func TestEVMSingleStep_LoadStore(t *testing.T) {
 		{name: "sw", opcode: uint32(0x2b), base: 0x100, imm: 0x20, rt: rtVal, expectMemVal: 0xaa_bb_cc_dd},
 		{name: "swr unaligned", opcode: uint32(0x2e), base: 0x100, imm: 0x1, rt: rtVal, expectMemVal: 0xcc_dd_00_00},
 	}
-
-	var baseReg uint32 = 9
-	var rtReg uint32 = 8
-	for i, tt := range cases {
-		for _, v := range versions {
-			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
-			t.Run(testName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
-				addr := tt.base + Word(tt.imm)
-				effAddr := arch.AddressMask & addr
-
-				// Setup
-				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
-				state := goVm.GetState()
-				insn := tt.opcode<<26 | baseReg<<21 | rtReg<<16 | tt.imm
-				state.GetRegistersRef()[rtReg] = tt.rt
-				state.GetRegistersRef()[baseReg] = tt.base
-				testutil.StoreInstruction(state.GetMemory(), 0, insn)
-				state.GetMemory().SetWord(effAddr, tt.memVal)
-				step := state.GetStep()
-
-				// Setup expectations
-				expected := testutil.NewExpectedState(state)
-				expected.ExpectStep()
-				if tt.expectMemVal != 0 {
-					expected.ExpectMemoryWriteWord(effAddr, tt.expectMemVal)
-				} else {
-					expected.Registers[rtReg] = tt.expectRes
-				}
-
-				// Run vm
-				stepWitness, err := goVm.Step(true)
-				require.NoError(t, err)
-
-				// Validate
-				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-			})
-		}
-	}
+	testLoadStore(t, cases)
 }
 
-func TestEVMSingleStep_MovzMovn(t *testing.T) {
+func TestEVM_SingleStep_MovzMovn(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name  string
@@ -406,7 +310,7 @@ func TestEVMSingleStep_MovzMovn(t *testing.T) {
 
 }
 
-func TestEVMSingleStep_MfhiMflo(t *testing.T) {
+func TestEVM_SingleStep_MfhiMflo(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name  string
@@ -442,23 +346,8 @@ func TestEVMSingleStep_MfhiMflo(t *testing.T) {
 	}
 }
 
-func TestEVMSingleStep_MulDiv(t *testing.T) {
-	var tracer *tracing.Hooks
-
-	versions := GetMipsVersionTestCases(t)
-	cases := []struct {
-		name         string
-		rs           Word
-		rt           Word
-		funct        uint32
-		opcode       uint32
-		expectHi     Word
-		expectLo     Word
-		expectRes    Word
-		rdReg        uint32
-		expectRevert string
-		errMsg       string
-	}{
+func TestEVM_SingleStep_MulDiv(t *testing.T) {
+	cases := []mulDivTestCase{
 		{name: "mul", funct: uint32(0x2), opcode: uint32(28), rs: Word(5), rt: Word(2), rdReg: uint32(0x8), expectRes: Word(10)},                                    // mul t0, t1, t2
 		{name: "mul", funct: uint32(0x2), opcode: uint32(28), rs: Word(0x1), rt: ^Word(0), rdReg: uint32(0x8), expectRes: ^Word(0)},                                 // mul t1, t2
 		{name: "mul", funct: uint32(0x2), opcode: uint32(28), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x8), expectRes: Word(0x1)},           // mul t1, t2
@@ -473,62 +362,18 @@ func TestEVMSingleStep_MulDiv(t *testing.T) {
 		{name: "multu", funct: uint32(0x19), rs: Word(0x1), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0x0), expectLo: Word(0xFF_FF_FF_FF)},                     // multu t1, t2
 		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_FF), rt: Word(0xFF_FF_FF_FF), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0xFF_FF_FF_FE), expectLo: Word(0x1)},           // multu t1, t2
 		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_DD), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0xAA_BB_CC_BE), expectLo: Word(0xFC_FC_FD_27)}, // multu t1, t2
+		{name: "multu", funct: uint32(0x19), rs: Word(0xFF_FF_FF_D3), rt: Word(0xAA_BB_CC_BE), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(0xAA_BB_CC_9F), expectLo: Word(0xFC_FD_02_9A)}, // multu t1, t2
 
-		{name: "div", funct: uint32(0x1a), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                                  // div t1, t2
-		{name: "div by zero", funct: uint32(0x1a), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), expectRevert: "instruction divide by zero", errMsg: "MIPS: division by zero"},  // div t1, t2
-		{name: "divu", funct: uint32(0x1b), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                                 // divu t1, t2
-		{name: "divu by zero", funct: uint32(0x1b), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), expectRevert: "instruction divide by zero", errMsg: "MIPS: division by zero"}, // divu t1, t2
+		{name: "div", funct: uint32(0x1a), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                           // div t1, t2
+		{name: "div by zero", funct: uint32(0x1a), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), panicMsg: "instruction divide by zero", revertMsg: "division by zero"},  // div t1, t2
+		{name: "divu", funct: uint32(0x1b), rs: Word(5), rt: Word(2), rdReg: uint32(0x0), opcode: uint32(0), expectHi: Word(1), expectLo: Word(2)},                                          // divu t1, t2
+		{name: "divu by zero", funct: uint32(0x1b), rs: Word(5), rt: Word(0), rdReg: uint32(0x0), opcode: uint32(0), panicMsg: "instruction divide by zero", revertMsg: "division by zero"}, // divu t1, t2
 	}
 
-	for _, v := range versions {
-		for i, tt := range cases {
-			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
-			t.Run(testName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
-				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
-				state := goVm.GetState()
-				var insn uint32
-				baseReg := uint32(0x9)
-				rtReg := uint32(0xa)
-
-				insn = tt.opcode<<26 | baseReg<<21 | rtReg<<16 | tt.rdReg<<11 | tt.funct
-				state.GetRegistersRef()[rtReg] = tt.rt
-				state.GetRegistersRef()[baseReg] = tt.rs
-				testutil.StoreInstruction(state.GetMemory(), 0, insn)
-
-				if tt.expectRevert != "" {
-					proofData := v.ProofGenerator(t, goVm.GetState())
-					require.PanicsWithValue(t, tt.expectRevert, func() {
-						_, _ = goVm.Step(
-							false)
-					})
-					testutil.AssertEVMReverts(t, state, v.Contracts, tracer, proofData, testutil.CreateErrorStringMatcher(tt.errMsg))
-					return
-				}
-
-				step := state.GetStep()
-				// Setup expectations
-				expected := testutil.NewExpectedState(state)
-				expected.ExpectStep()
-				if tt.expectRes != 0 {
-					expected.Registers[tt.rdReg] = tt.expectRes
-				} else {
-					expected.HI = tt.expectHi
-					expected.LO = tt.expectLo
-				}
-
-				stepWitness, err := goVm.Step(true)
-				require.NoError(t, err)
-
-				// Check expectations
-				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-			})
-		}
-	}
+	testMulDiv(t, cases, true)
 }
 
-func TestEVMSingleStep_MthiMtlo(t *testing.T) {
+func TestEVM_SingleStep_MthiMtlo(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name  string
@@ -631,7 +476,7 @@ func TestEVM_MMap(t *testing.T) {
 	}
 }
 
-func TestEVMSysWriteHint(t *testing.T) {
+func TestEVM_SysWriteHint(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {
 		name             string
@@ -824,7 +669,7 @@ func TestEVMSysWriteHint(t *testing.T) {
 	}
 }
 
-func TestEVMFault(t *testing.T) {
+func TestEVM_Fault(t *testing.T) {
 	var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
 
 	versions := GetMipsVersionTestCases(t)
@@ -846,7 +691,7 @@ func TestEVMFault(t *testing.T) {
 		errMsg               testutil.ErrMatcher
 		memoryProofAddresses []Word
 	}{
-		{name: "illegal instruction", nextPC: 0, insn: 0xFF_FF_FF_FF, errMsg: testutil.CreateErrorStringMatcher("invalid instruction"), memoryProofAddresses: []Word{0xa7ef00cc}},
+		{name: "illegal instruction", nextPC: 0, insn: 0b111110 << 26, errMsg: testutil.CreateErrorStringMatcher("invalid instruction"), memoryProofAddresses: []Word{0x0}}, // memoryProof for the zero address at register 0 (+ imm)
 		{name: "branch in delay-slot", nextPC: 8, insn: 0x11_02_00_03, errMsg: testutil.CreateErrorStringMatcher("branch in delay slot")},
 		{name: "jump in delay-slot", nextPC: 8, insn: 0x0c_00_00_0c, errMsg: testutil.CreateErrorStringMatcher("jump in delay slot")},
 		{name: "misaligned instruction", pc: 1, nextPC: 4, insn: 0b110111_00001_00001 << 16, errMsg: misAlignedInstructionErr()},
@@ -859,7 +704,6 @@ func TestEVMFault(t *testing.T) {
 		for _, tt := range cases {
 			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
 			t.Run(testName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithPC(tt.pc), testutil.WithNextPC(tt.nextPC))
 				state := goVm.GetState()
 				testutil.StoreInstruction(state.GetMemory(), 0, tt.insn)
@@ -874,7 +718,7 @@ func TestEVMFault(t *testing.T) {
 	}
 }
 
-func TestHelloEVM(t *testing.T) {
+func TestEVM_HelloProgram(t *testing.T) {
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}
@@ -921,7 +765,7 @@ func TestHelloEVM(t *testing.T) {
 	}
 }
 
-func TestClaimEVM(t *testing.T) {
+func TestEVM_ClaimProgram(t *testing.T) {
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}
@@ -966,7 +810,7 @@ func TestClaimEVM(t *testing.T) {
 	}
 }
 
-func TestEntryEVM(t *testing.T) {
+func TestEVM_EntryProgram(t *testing.T) {
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
 	}
@@ -1010,19 +854,10 @@ func TestEntryEVM(t *testing.T) {
 	}
 }
 
-func TestEVMSingleStepBranch(t *testing.T) {
-	versions := GetMipsVersionTestCases(t)
-	cases := []struct {
-		name         string
-		pc           Word
-		expectNextPC Word
-		opcode       uint32
-		regimm       uint32
-		expectLink   bool
-		rs           arch.SignedInteger
-		rt           Word
-		offset       uint16
-	}{
+func TestEVM_SingleStep_Branch32(t *testing.T) {
+	testutil.Cannon32OnlyTest(t, "These tests are fully covered for 64-bits in TestEVM_SingleStep_Branch64")
+	t.Parallel()
+	cases := []branchTestCase{
 		// blez
 		{name: "blez", pc: 0, opcode: 0x6, rs: 0x5, offset: 0x100, expectNextPC: 0x8},
 		{name: "blez large rs", pc: 0x10, opcode: 0x6, rs: 0x7F_FF_FF_FF, offset: 0x100, expectNextPC: 0x18},
@@ -1076,35 +911,5 @@ func TestEVMSingleStepBranch(t *testing.T) {
 		{name: "bgezal fill bit offset except sign", pc: 0x10, opcode: 0x1, regimm: 0x11, rs: 1, offset: 0x7F_FF, expectNextPC: 0x2_00_10, expectLink: true},
 	}
 
-	for _, v := range versions {
-		for i, tt := range cases {
-			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
-			t.Run(testName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
-				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(tt.pc))
-				state := goVm.GetState()
-				const rsReg = 8 // t0
-				insn := tt.opcode<<26 | rsReg<<21 | tt.regimm<<16 | uint32(tt.offset)
-				testutil.StoreInstruction(state.GetMemory(), tt.pc, insn)
-				state.GetRegistersRef()[rsReg] = Word(tt.rs)
-				step := state.GetStep()
-
-				// Setup expectations
-				expected := testutil.NewExpectedState(state)
-				expected.Step += 1
-				expected.PC = state.GetCpu().NextPC
-				expected.NextPC = tt.expectNextPC
-				if tt.expectLink {
-					expected.Registers[31] = state.GetPC() + 8
-				}
-
-				stepWitness, err := goVm.Step(true)
-				require.NoError(t, err)
-
-				// Check expectations
-				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
-			})
-		}
-	}
+	testBranch(t, cases)
 }
diff --git a/cannon/mipsevm/tests/evm_multithreaded64_test.go b/cannon/mipsevm/tests/evm_multithreaded64_test.go
index 5c5963a0e027..911a0d256a3c 100644
--- a/cannon/mipsevm/tests/evm_multithreaded64_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded64_test.go
@@ -5,10 +5,13 @@
 package tests
 
 import (
+	"encoding/binary"
 	"fmt"
+	"slices"
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"golang.org/x/exp/maps"
 
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
@@ -360,3 +363,122 @@ func TestEVM_MT64_SCD(t *testing.T) {
 		}
 	}
 }
+
+func TestEVM_MT_SysRead_Preimage64(t *testing.T) {
+	preimageValue := make([]byte, 0, 8)
+	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x12_34_56_78)
+	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x98_76_54_32)
+	prestateMem := Word(0xEE_EE_EE_EE_FF_FF_FF_FF)
+	cases := []testMTSysReadPreimageTestCase{
+		{name: "Aligned addr, write 1 byte", addr: 0x00_00_FF_00, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_EE_EE_EE_FF_FF_FF_FF},
+		{name: "Aligned addr, write 2 byte", addr: 0x00_00_FF_00, count: 2, writeLen: 2, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_EE_EE_FF_FF_FF_FF},
+		{name: "Aligned addr, write 3 byte", addr: 0x00_00_FF_00, count: 3, writeLen: 3, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_56_EE_FF_FF_FF_FF},
+		{name: "Aligned addr, write 4 byte", addr: 0x00_00_FF_00, count: 4, writeLen: 4, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_56_78_FF_FF_FF_FF},
+		{name: "Aligned addr, write 5 byte", addr: 0x00_00_FF_00, count: 5, writeLen: 5, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_56_78_98_FF_FF_FF},
+		{name: "Aligned addr, write 6 byte", addr: 0x00_00_FF_00, count: 6, writeLen: 6, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_56_78_98_76_FF_FF},
+		{name: "Aligned addr, write 7 byte", addr: 0x00_00_FF_00, count: 7, writeLen: 7, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_56_78_98_76_54_FF},
+		{name: "Aligned addr, write 8 byte", addr: 0x00_00_FF_00, count: 8, writeLen: 8, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_56_78_98_76_54_32},
+
+		{name: "1-byte misaligned addr, write 1 byte", addr: 0x00_00_FF_01, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_12_EE_EE_FF_FF_FF_FF},
+		{name: "1-byte misaligned addr, write 2 byte", addr: 0x00_00_FF_01, count: 2, writeLen: 2, preimageOffset: 9, prestateMem: prestateMem, postateMem: 0xEE_34_56_EE_FF_FF_FF_FF},
+		{name: "1-byte misaligned addr, write 3 byte", addr: 0x00_00_FF_01, count: 3, writeLen: 3, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_12_34_56_FF_FF_FF_FF},
+		{name: "1-byte misaligned addr, write 4 byte", addr: 0x00_00_FF_01, count: 4, writeLen: 4, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_12_34_56_78_FF_FF_FF},
+		{name: "1-byte misaligned addr, write 5 byte", addr: 0x00_00_FF_01, count: 5, writeLen: 5, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_12_34_56_78_98_FF_FF},
+		{name: "1-byte misaligned addr, write 6 byte", addr: 0x00_00_FF_01, count: 6, writeLen: 6, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_12_34_56_78_98_76_FF},
+		{name: "1-byte misaligned addr, write 7 byte", addr: 0x00_00_FF_01, count: 7, writeLen: 7, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_12_34_56_78_98_76_54},
+
+		{name: "2-byte misaligned addr, write 1 byte", addr: 0x00_00_FF_02, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_EE_12_EE_FF_FF_FF_FF},
+		{name: "2-byte misaligned addr, write 2 byte", addr: 0x00_00_FF_02, count: 2, writeLen: 2, preimageOffset: 12, prestateMem: prestateMem, postateMem: 0xEE_EE_98_76_FF_FF_FF_FF},
+		{name: "2-byte misaligned addr, write 2 byte", addr: 0x00_00_FF_02, count: 3, writeLen: 3, preimageOffset: 12, prestateMem: prestateMem, postateMem: 0xEE_EE_98_76_54_FF_FF_FF},
+		{name: "2-byte misaligned addr, write 2 byte", addr: 0x00_00_FF_02, count: 4, writeLen: 4, preimageOffset: 12, prestateMem: prestateMem, postateMem: 0xEE_EE_98_76_54_32_FF_FF},
+
+		{name: "3-byte misaligned addr, write 1 byte", addr: 0x00_00_FF_03, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_12_FF_FF_FF_FF},
+		{name: "4-byte misaligned addr, write 1 byte", addr: 0x00_00_FF_04, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_EE_12_FF_FF_FF},
+		{name: "5-byte misaligned addr, write 1 byte", addr: 0x00_00_FF_05, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_EE_FF_12_FF_FF},
+		{name: "6-byte misaligned addr, write 1 byte", addr: 0x00_00_FF_06, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_EE_FF_FF_12_FF},
+		{name: "7-byte misaligned addr, write 1 byte", addr: 0x00_00_FF_07, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_EE_FF_FF_FF_12},
+
+		{name: "Count of 0", addr: 0x00_00_FF_03, count: 0, writeLen: 0, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_EE_FF_FF_FF_FF},
+		{name: "Count greater than 8", addr: 0x00_00_FF_00, count: 15, writeLen: 8, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0x12_34_56_78_98_76_54_32},
+		{name: "Count greater than 8, unaligned", addr: 0x00_00_FF_01, count: 15, writeLen: 7, preimageOffset: 8, prestateMem: prestateMem, postateMem: 0xEE_12_34_56_78_98_76_54},
+		{name: "Offset at last byte", addr: 0x00_00_FF_00, count: 8, writeLen: 1, preimageOffset: 15, prestateMem: prestateMem, postateMem: 0x32_EE_EE_EE_FF_FF_FF_FF},
+		{name: "Offset just out of bounds", addr: 0x00_00_FF_00, count: 4, writeLen: 0, preimageOffset: 16, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_EE_FF_FF_FF_FF, shouldPanic: true},
+		{name: "Offset out of bounds", addr: 0x00_00_FF_00, count: 4, writeLen: 0, preimageOffset: 17, prestateMem: prestateMem, postateMem: 0xEE_EE_EE_EE_FF_FF_FF_FF, shouldPanic: true},
+	}
+	testMTSysReadPreimage(t, preimageValue, cases)
+}
+
+func TestEVM_MT_StoreOpsClearMemReservation64(t *testing.T) {
+	t.Parallel()
+	cases := []testMTStoreOpsClearMemReservationTestCase{
+		{name: "Store byte", opcode: 0b10_1000, base: 0xFF_00_00_00, offset: 0x10, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0x78_FF_FF_FF_FF_FF_FF_FF},
+		{name: "Store byte lower", opcode: 0b10_1000, base: 0xFF_00_00_00, offset: 0x14, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0xFF_FF_FF_FF_78_FF_FF_FF},
+		{name: "Store halfword", opcode: 0b10_1001, base: 0xFF_00_00_00, offset: 0x10, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0x56_78_FF_FF_FF_FF_FF_FF},
+		{name: "Store halfword lower", opcode: 0b10_1001, base: 0xFF_00_00_00, offset: 0x14, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0xFF_FF_FF_FF_56_78_FF_FF},
+		{name: "Store word left", opcode: 0b10_1010, base: 0xFF_00_00_00, offset: 0x10, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0x12_34_56_78_FF_FF_FF_FF},
+		{name: "Store word left lower", opcode: 0b10_1010, base: 0xFF_00_00_00, offset: 0x14, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0xFF_FF_FF_FF_12_34_56_78},
+		{name: "Store word", opcode: 0b10_1011, base: 0xFF_00_00_00, offset: 0x10, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0x12_34_56_78_FF_FF_FF_FF},
+		{name: "Store word lower", opcode: 0b10_1011, base: 0xFF_00_00_00, offset: 0x14, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0xFF_FF_FF_FF_12_34_56_78},
+		{name: "Store word right", opcode: 0b10_1110, base: 0xFF_00_00_00, offset: 0x10, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0x78_FF_FF_FF_FF_FF_FF_FF},
+		{name: "Store word right lower", opcode: 0b10_1110, base: 0xFF_00_00_00, offset: 0x14, effAddr: 0xFF_00_00_10, preMem: ^Word(0), postMem: 0xFF_FF_FF_FF_78_FF_FF_FF},
+	}
+	testMTStoreOpsClearMemReservation(t, cases)
+}
+
+var NoopSyscalls64 = map[string]uint32{
+	"SysMunmap":        5011,
+	"SysGetAffinity":   5196,
+	"SysMadvise":       5027,
+	"SysRtSigprocmask": 5014,
+	"SysSigaltstack":   5129,
+	"SysRtSigaction":   5013,
+	"SysPrlimit64":     5297,
+	"SysClose":         5003,
+	"SysPread64":       5016,
+	"SysStat":          5004,
+	"SysFstat":         5005,
+	//"SysFstat64":      UndefinedSysNr,
+	"SysOpenAt":       5247,
+	"SysReadlink":     5087,
+	"SysReadlinkAt":   5257,
+	"SysIoctl":        5015,
+	"SysEpollCreate1": 5285,
+	"SysPipe2":        5287,
+	"SysEpollCtl":     5208,
+	"SysEpollPwait":   5272,
+	"SysGetRandom":    5313,
+	"SysUname":        5061,
+	//"SysStat64":       UndefinedSysNr,
+	"SysGetuid": 5100,
+	"SysGetgid": 5102,
+	//"SysLlseek":       UndefinedSysNr,
+	"SysMinCore":      5026,
+	"SysTgkill":       5225,
+	"SysGetRLimit":    5095,
+	"SysLseek":        5008,
+	"SysSetITimer":    5036,
+	"SysTimerCreate":  5216,
+	"SysTimerSetTime": 5217,
+	"SysTimerDelete":  5220,
+}
+
+func TestEVM_NoopSyscall64(t *testing.T) {
+	testNoopSyscall(t, NoopSyscalls64)
+}
+
+func TestEVM_UnsupportedSyscall64(t *testing.T) {
+	t.Parallel()
+
+	var noopSyscallNums = maps.Values(NoopSyscalls64)
+	var SupportedSyscalls = []uint32{arch.SysMmap, arch.SysBrk, arch.SysClone, arch.SysExitGroup, arch.SysRead, arch.SysWrite, arch.SysFcntl, arch.SysExit, arch.SysSchedYield, arch.SysGetTID, arch.SysFutex, arch.SysOpen, arch.SysNanosleep, arch.SysClockGetTime, arch.SysGetpid}
+	unsupportedSyscalls := make([]uint32, 0, 400)
+	for i := 5000; i < 5400; i++ {
+		candidate := uint32(i)
+		if slices.Contains(SupportedSyscalls, candidate) || slices.Contains(noopSyscallNums, candidate) {
+			continue
+		}
+		unsupportedSyscalls = append(unsupportedSyscalls, candidate)
+	}
+
+	testUnsupportedSyscall(t, unsupportedSyscalls)
+}
diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index ba858585980b..1353932dd71f 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -9,7 +9,6 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/core/tracing"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/maps"
 
@@ -19,7 +18,6 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
 	mttestutil "github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded/testutil"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
-	preimage "github.com/ethereum-optimism/optimism/op-preimage"
 )
 
 type Word = arch.Word
@@ -190,37 +188,14 @@ func TestEVM_MT_SC(t *testing.T) {
 	}
 }
 
-func TestEVM_MT_SysRead_Preimage(t *testing.T) {
+func TestEVM_MT_SysRead_Preimage32(t *testing.T) {
+	testutil.Cannon32OnlyTest(t, "These tests are fully covered for 64-bits in TestEVM_MT_SysRead_Preimage64")
+
+	t.Parallel()
 	preimageValue := make([]byte, 0, 8)
 	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x12_34_56_78)
 	preimageValue = binary.BigEndian.AppendUint32(preimageValue, 0x98_76_54_32)
-
-	llVariations := []struct {
-		name                   string
-		llReservationStatus    multithreaded.LLReservationStatus
-		matchThreadId          bool
-		effAddrOffset          Word
-		shouldClearReservation bool
-	}{
-		{name: "matching reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, shouldClearReservation: true},
-		{name: "matching reservation, unaligned", llReservationStatus: multithreaded.LLStatusActive32bit, effAddrOffset: 1, matchThreadId: true, shouldClearReservation: true},
-		{name: "matching reservation, diff thread", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: false, shouldClearReservation: true},
-		{name: "mismatched reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
-		{name: "mismatched reservation", llReservationStatus: multithreaded.LLStatusActive64bit, matchThreadId: false, effAddrOffset: 8, shouldClearReservation: false},
-		{name: "no reservation, matching addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, shouldClearReservation: true},
-		{name: "no reservation, mismatched addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
-	}
-
-	cases := []struct {
-		name           string
-		addr           Word
-		count          Word
-		writeLen       Word
-		preimageOffset Word
-		prestateMem    Word
-		postateMem     Word
-		shouldPanic    bool
-	}{
+	cases := []testMTSysReadPreimageTestCase{
 		{name: "Aligned addr, write 1 byte", addr: 0x00_00_FF_00, count: 1, writeLen: 1, preimageOffset: 8, prestateMem: 0xFF_FF_FF_FF, postateMem: 0x12_FF_FF_FF},
 		{name: "Aligned addr, write 2 byte", addr: 0x00_00_FF_00, count: 2, writeLen: 2, preimageOffset: 8, prestateMem: 0xFF_FF_FF_FF, postateMem: 0x12_34_FF_FF},
 		{name: "Aligned addr, write 3 byte", addr: 0x00_00_FF_00, count: 3, writeLen: 3, preimageOffset: 8, prestateMem: 0xFF_FF_FF_FF, postateMem: 0x12_34_56_FF},
@@ -238,147 +213,22 @@ func TestEVM_MT_SysRead_Preimage(t *testing.T) {
 		{name: "Offset just out of bounds", addr: 0x00_00_FF_00, count: 4, writeLen: 0, preimageOffset: 16, prestateMem: 0xFF_FF_FF_FF, postateMem: 0xFF_FF_FF_FF, shouldPanic: true},
 		{name: "Offset out of bounds", addr: 0x00_00_FF_00, count: 4, writeLen: 0, preimageOffset: 17, prestateMem: 0xFF_FF_FF_FF, postateMem: 0xFF_FF_FF_FF, shouldPanic: true},
 	}
-	for i, c := range cases {
-		for _, v := range llVariations {
-			tName := fmt.Sprintf("%v (%v)", c.name, v.name)
-			t.Run(tName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
-				effAddr := arch.AddressMask & c.addr
-				preimageKey := preimage.Keccak256Key(crypto.Keccak256Hash(preimageValue)).PreimageKey()
-				oracle := testutil.StaticOracle(t, preimageValue)
-				goVm, state, contracts := setup(t, i, oracle)
-				step := state.GetStep()
-
-				// Define LL-related params
-				llAddress := effAddr + v.effAddrOffset
-				llOwnerThread := state.GetCurrentThread().ThreadId
-				if !v.matchThreadId {
-					llOwnerThread += 1
-				}
-
-				// Set up state
-				state.PreimageKey = preimageKey
-				state.PreimageOffset = c.preimageOffset
-				state.GetRegistersRef()[2] = arch.SysRead
-				state.GetRegistersRef()[4] = exec.FdPreimageRead
-				state.GetRegistersRef()[5] = c.addr
-				state.GetRegistersRef()[6] = c.count
-				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
-				state.LLReservationStatus = v.llReservationStatus
-				state.LLAddress = llAddress
-				state.LLOwnerThread = llOwnerThread
-				state.GetMemory().SetWord(effAddr, c.prestateMem)
 
-				// Setup expectations
-				expected := mttestutil.NewExpectedMTState(state)
-				expected.ExpectStep()
-				expected.ActiveThread().Registers[2] = c.writeLen
-				expected.ActiveThread().Registers[7] = 0 // no error
-				expected.PreimageOffset += c.writeLen
-				expected.ExpectMemoryWordWrite(effAddr, c.postateMem)
-				if v.shouldClearReservation {
-					expected.LLReservationStatus = multithreaded.LLStatusNone
-					expected.LLAddress = 0
-					expected.LLOwnerThread = 0
-				}
-
-				if c.shouldPanic {
-					require.Panics(t, func() { _, _ = goVm.Step(true) })
-					testutil.AssertPreimageOracleReverts(t, preimageKey, preimageValue, c.preimageOffset, contracts)
-				} else {
-					stepWitness, err := goVm.Step(true)
-					require.NoError(t, err)
-
-					// Check expectations
-					expected.Validate(t, state)
-					testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
-				}
-			})
-		}
-	}
+	testMTSysReadPreimage(t, preimageValue, cases)
 }
 
-func TestEVM_MT_StoreOpsClearMemReservation(t *testing.T) {
-	llVariations := []struct {
-		name                   string
-		llReservationStatus    multithreaded.LLReservationStatus
-		matchThreadId          bool
-		effAddrOffset          Word
-		shouldClearReservation bool
-	}{
-		{name: "matching reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, shouldClearReservation: true},
-		{name: "matching reservation, unaligned", llReservationStatus: multithreaded.LLStatusActive32bit, effAddrOffset: 1, matchThreadId: true, shouldClearReservation: true},
-		{name: "matching reservation, 64-bit", llReservationStatus: multithreaded.LLStatusActive64bit, matchThreadId: true, shouldClearReservation: true},
-		{name: "matching reservation, diff thread", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: false, shouldClearReservation: true},
-		{name: "matching reservation, diff thread, 64-bit", llReservationStatus: multithreaded.LLStatusActive64bit, matchThreadId: false, shouldClearReservation: true},
-		{name: "mismatched reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
-		{name: "mismatched reservation, diff thread", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: false, effAddrOffset: 8, shouldClearReservation: false},
-		{name: "no reservation, matching addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, shouldClearReservation: true},
-		{name: "no reservation, mismatched addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
-	}
-
-	rt := Word(0x12_34_56_78)
-	baseReg := 5
-	rtReg := 6
-	cases := []struct {
-		name    string
-		opcode  int
-		offset  int
-		base    Word
-		effAddr Word
-		preMem  Word
-		postMem Word
-	}{
-		{name: "Store byte", opcode: 0b10_1000, base: 0xFF_00_00_04, offset: 0xFF_00_00_08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x78_FF_FF_FF},
-		{name: "Store halfword", opcode: 0b10_1001, base: 0xFF_00_00_04, offset: 0xFF_00_00_08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x56_78_FF_FF},
-		{name: "Store word left", opcode: 0b10_1010, base: 0xFF_00_00_04, offset: 0xFF_00_00_08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x12_34_56_78},
-		{name: "Store word", opcode: 0b10_1011, base: 0xFF_00_00_04, offset: 0xFF_00_00_08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x12_34_56_78},
-		{name: "Store word right", opcode: 0b10_1110, base: 0xFF_00_00_04, offset: 0xFF_00_00_08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x78_FF_FF_FF},
-	}
-	for i, c := range cases {
-		for _, v := range llVariations {
-			tName := fmt.Sprintf("%v (%v)", c.name, v.name)
-			t.Run(tName, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
-				insn := uint32((c.opcode << 26) | (baseReg & 0x1F << 21) | (rtReg & 0x1F << 16) | (0xFFFF & c.offset))
-				goVm, state, contracts := setup(t, i, nil, testutil.WithPCAndNextPC(0x08))
-				step := state.GetStep()
-
-				// Define LL-related params
-				llAddress := c.effAddr + v.effAddrOffset
-				llOwnerThread := state.GetCurrentThread().ThreadId
-				if !v.matchThreadId {
-					llOwnerThread += 1
-				}
-
-				// Setup state
-				state.GetRegistersRef()[rtReg] = rt
-				state.GetRegistersRef()[baseReg] = c.base
-				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
-				state.GetMemory().SetWord(c.effAddr, c.preMem)
-				state.LLReservationStatus = v.llReservationStatus
-				state.LLAddress = llAddress
-				state.LLOwnerThread = llOwnerThread
-
-				// Setup expectations
-				expected := mttestutil.NewExpectedMTState(state)
-				expected.ExpectStep()
-				expected.ExpectMemoryWordWrite(c.effAddr, c.postMem)
-				if v.shouldClearReservation {
-					expected.LLReservationStatus = multithreaded.LLStatusNone
-					expected.LLAddress = 0
-					expected.LLOwnerThread = 0
-				}
-
-				stepWitness, err := goVm.Step(true)
-				require.NoError(t, err)
-
-				// Check expectations
-				expected.Validate(t, state)
-				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
-			})
-		}
+func TestEVM_MT_StoreOpsClearMemReservation32(t *testing.T) {
+	t.Parallel()
+	testutil.Cannon32OnlyTest(t, "These tests are fully covered for 64-bits in TestEVM_MT_StoreOpsClearMemReservation64")
+
+	cases := []testMTStoreOpsClearMemReservationTestCase{
+		{name: "Store byte", opcode: 0b10_1000, base: 0xFF_00_00_04, offset: 0x08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x78_FF_FF_FF},
+		{name: "Store halfword", opcode: 0b10_1001, base: 0xFF_00_00_04, offset: 0x08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x56_78_FF_FF},
+		{name: "Store word left", opcode: 0b10_1010, base: 0xFF_00_00_04, offset: 0x08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x12_34_56_78},
+		{name: "Store word", opcode: 0b10_1011, base: 0xFF_00_00_04, offset: 0x08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x12_34_56_78},
+		{name: "Store word right", opcode: 0b10_1110, base: 0xFF_00_00_04, offset: 0x08, effAddr: 0xFF_00_00_0C, preMem: 0xFF_FF_FF_FF, postMem: 0x78_FF_FF_FF},
 	}
+	testMTStoreOpsClearMemReservation(t, cases)
 }
 
 func TestEVM_SysClone_FlagHandling(t *testing.T) {
@@ -633,39 +483,38 @@ func TestEVM_PopExitedThread(t *testing.T) {
 }
 
 func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
+	// Note: parameters are written as 64-bit values. For 32-bit architectures, these values are downcast to 32-bit
 	cases := []struct {
 		name             string
-		addressParam     Word
-		effAddr          Word
-		targetValue      Word
-		actualValue      Word
-		timeout          Word
+		addressParam     uint64
+		effAddr          uint64
+		targetValue      uint64
+		actualValue      uint64
+		timeout          uint64
 		shouldFail       bool
 		shouldSetTimeout bool
 	}{
-		{name: "successful wait, no timeout", addressParam: 0x1234, effAddr: 0x1234, targetValue: 0x01, actualValue: 0x01},
-		{name: "successful wait, no timeout, unaligned addr", addressParam: 0x1235, effAddr: 0x1234, targetValue: 0x01, actualValue: 0x01},
-		{name: "memory mismatch, no timeout", addressParam: 0x1200, effAddr: 0x1200, targetValue: 0x01, actualValue: 0x02, shouldFail: true},
-		{name: "memory mismatch, no timeout, unaligned", addressParam: 0x1203, effAddr: 0x1200, targetValue: 0x01, actualValue: 0x02, shouldFail: true},
-		{name: "successful wait w timeout", addressParam: 0x1234, effAddr: 0x1234, targetValue: 0x01, actualValue: 0x01, timeout: 1000000, shouldSetTimeout: true},
-		{name: "successful wait w timeout, unaligned", addressParam: 0x1232, effAddr: 0x1230, targetValue: 0x01, actualValue: 0x01, timeout: 1000000, shouldSetTimeout: true},
-		{name: "memory mismatch w timeout", addressParam: 0x1200, effAddr: 0x1200, targetValue: 0x01, actualValue: 0x02, timeout: 2000000, shouldFail: true},
-		{name: "memory mismatch w timeout, unaligned", addressParam: 0x120F, effAddr: 0x120C, targetValue: 0x01, actualValue: 0x02, timeout: 2000000, shouldFail: true},
+		{name: "successful wait, no timeout", addressParam: 0xFF_FF_FF_FF_FF_FF_12_38, effAddr: 0xFF_FF_FF_FF_FF_FF_12_38, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_01},
+		{name: "successful wait, no timeout, unaligned addr", addressParam: 0xFF_FF_FF_FF_FF_FF_12_39, effAddr: 0xFF_FF_FF_FF_FF_FF_12_38, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_01},
+		{name: "memory mismatch, no timeout", addressParam: 0xFF_FF_FF_FF_FF_FF_12_00, effAddr: 0xFF_FF_FF_FF_FF_FF_12_00, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_02, shouldFail: true},
+		{name: "memory mismatch, no timeout, unaligned", addressParam: 0xFF_FF_FF_FF_FF_FF_12_03, effAddr: 0xFF_FF_FF_FF_FF_FF_12_00, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_02, shouldFail: true},
+		{name: "successful wait w timeout", addressParam: 0xFF_FF_FF_FF_FF_FF_12_38, effAddr: 0xFF_FF_FF_FF_FF_FF_12_38, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_01, timeout: 1000000, shouldSetTimeout: true},
+		{name: "successful wait w timeout, unaligned", addressParam: 0xFF_FF_FF_FF_FF_FF_12_32, effAddr: 0xFF_FF_FF_FF_FF_FF_12_30, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_01, timeout: 1000000, shouldSetTimeout: true},
+		{name: "memory mismatch w timeout", addressParam: 0xFF_FF_FF_FF_FF_FF_12_00, effAddr: 0xFF_FF_FF_FF_FF_FF_12_00, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_02, timeout: 2000000, shouldFail: true},
+		{name: "memory mismatch w timeout, unaligned", addressParam: 0xFF_FF_FF_FF_FF_FF_12_0F, effAddr: 0xFF_FF_FF_FF_FF_FF_12_10, targetValue: 0xFF_FF_FF_FF_FF_FF_FF_01, actualValue: 0xFF_FF_FF_FF_FF_FF_FF_02, timeout: 2000000, shouldFail: true},
 	}
-
 	for i, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			testutil.TemporarilySkip64BitTests(t)
 			goVm, state, contracts := setup(t, i*1234, nil)
 			step := state.GetStep()
 
 			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
-			state.Memory.SetWord(c.effAddr, c.actualValue)
+			state.Memory.SetWord(Word(c.effAddr), Word(c.actualValue))
 			state.GetRegistersRef()[2] = arch.SysFutex // Set syscall number
-			state.GetRegistersRef()[4] = c.addressParam
+			state.GetRegistersRef()[4] = Word(c.addressParam)
 			state.GetRegistersRef()[5] = exec.FutexWaitPrivate
-			state.GetRegistersRef()[6] = c.targetValue
-			state.GetRegistersRef()[7] = c.timeout
+			state.GetRegistersRef()[6] = Word(c.targetValue)
+			state.GetRegistersRef()[7] = Word(c.timeout)
 
 			// Setup expectations
 			expected := mttestutil.NewExpectedMTState(state)
@@ -678,8 +527,8 @@ func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
 				expected.ActiveThread().Registers[7] = exec.MipsEAGAIN
 			} else {
 				// PC and return registers should not update on success, updates happen when wait completes
-				expected.ActiveThread().FutexAddr = c.effAddr
-				expected.ActiveThread().FutexVal = c.targetValue
+				expected.ActiveThread().FutexAddr = Word(c.effAddr)
+				expected.ActiveThread().FutexVal = Word(c.targetValue)
 				expected.ActiveThread().FutexTimeoutStep = exec.FutexNoTimeout
 				if c.shouldSetTimeout {
 					expected.ActiveThread().FutexTimeoutStep = step + exec.FutexTimeoutSteps + 1
@@ -687,9 +536,7 @@ func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
 			}
 
 			// State transition
-			var err error
-			var stepWitness *mipsevm.StepWitness
-			stepWitness, err = goVm.Step(true)
+			stepWitness, err := goVm.Step(true)
 			require.NoError(t, err)
 
 			// Validate post-state
@@ -700,39 +547,38 @@ func TestEVM_SysFutex_WaitPrivate(t *testing.T) {
 }
 
 func TestEVM_SysFutex_WakePrivate(t *testing.T) {
+	// Note: parameters are written as 64-bit values. For 32-bit architectures, these values are downcast to 32-bit
 	cases := []struct {
 		name                string
-		addressParam        Word
-		effAddr             Word
+		addressParam        uint64
+		effAddr             uint64
 		activeThreadCount   int
 		inactiveThreadCount int
 		traverseRight       bool
 		expectTraverseRight bool
 	}{
-		{name: "Traverse right", addressParam: 0x6700, effAddr: 0x6700, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: true},
-		{name: "Traverse right, unaligned addr", addressParam: 0x6789, effAddr: 0x6788, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: true},
-		{name: "Traverse right, no left threads", addressParam: 0x6784, effAddr: 0x6784, activeThreadCount: 2, inactiveThreadCount: 0, traverseRight: true},
-		{name: "Traverse right, no left threads, unaligned addr", addressParam: 0x678E, effAddr: 0x678C, activeThreadCount: 2, inactiveThreadCount: 0, traverseRight: true},
-		{name: "Traverse right, single thread", addressParam: 0x6788, effAddr: 0x6788, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: true},
-		{name: "Traverse right, single thread, unaligned", addressParam: 0x6789, effAddr: 0x6788, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: true},
-		{name: "Traverse left", addressParam: 0x6788, effAddr: 0x6788, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: false},
-		{name: "Traverse left, unaliagned", addressParam: 0x6789, effAddr: 0x6788, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: false},
-		{name: "Traverse left, switch directions", addressParam: 0x6788, effAddr: 0x6788, activeThreadCount: 1, inactiveThreadCount: 1, traverseRight: false, expectTraverseRight: true},
-		{name: "Traverse left, switch directions, unaligned", addressParam: 0x6789, effAddr: 0x6788, activeThreadCount: 1, inactiveThreadCount: 1, traverseRight: false, expectTraverseRight: true},
-		{name: "Traverse left, single thread", addressParam: 0x6788, effAddr: 0x6788, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: false, expectTraverseRight: true},
-		{name: "Traverse left, single thread, unaligned", addressParam: 0x6789, effAddr: 0x6788, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: false, expectTraverseRight: true},
+		{name: "Traverse right", addressParam: 0xFF_FF_FF_FF_FF_FF_67_00, effAddr: 0xFF_FF_FF_FF_FF_FF_67_00, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: true},
+		{name: "Traverse right, unaligned addr", addressParam: 0xFF_FF_FF_FF_FF_FF_67_89, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: true},
+		{name: "Traverse right, no left threads", addressParam: 0xFF_FF_FF_FF_FF_FF_67_84, effAddr: 0xFF_FF_FF_FF_FF_FF_67_84, activeThreadCount: 2, inactiveThreadCount: 0, traverseRight: true},
+		{name: "Traverse right, no left threads, unaligned addr", addressParam: 0xFF_FF_FF_FF_FF_FF_67_8E, effAddr: 0xFF_FF_FF_FF_FF_FF_67_8C, activeThreadCount: 2, inactiveThreadCount: 0, traverseRight: true},
+		{name: "Traverse right, single thread", addressParam: 0xFF_FF_FF_FF_FF_FF_67_88, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: true},
+		{name: "Traverse right, single thread, unaligned", addressParam: 0xFF_FF_FF_FF_FF_FF_67_89, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: true},
+		{name: "Traverse left", addressParam: 0xFF_FF_FF_FF_FF_FF_67_88, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: false},
+		{name: "Traverse left, unaliagned", addressParam: 0xFF_FF_FF_FF_FF_FF_67_89, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 2, inactiveThreadCount: 1, traverseRight: false},
+		{name: "Traverse left, switch directions", addressParam: 0xFF_FF_FF_FF_FF_FF_67_88, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 1, inactiveThreadCount: 1, traverseRight: false, expectTraverseRight: true},
+		{name: "Traverse left, switch directions, unaligned", addressParam: 0xFF_FF_FF_FF_FF_FF_67_89, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 1, inactiveThreadCount: 1, traverseRight: false, expectTraverseRight: true},
+		{name: "Traverse left, single thread", addressParam: 0xFF_FF_FF_FF_FF_FF_67_88, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: false, expectTraverseRight: true},
+		{name: "Traverse left, single thread, unaligned", addressParam: 0xFF_FF_FF_FF_FF_FF_67_89, effAddr: 0xFF_FF_FF_FF_FF_FF_67_88, activeThreadCount: 1, inactiveThreadCount: 0, traverseRight: false, expectTraverseRight: true},
 	}
-
 	for i, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			testutil.TemporarilySkip64BitTests(t)
 			goVm, state, contracts := setup(t, i*1122, nil)
 			mttestutil.SetupThreads(int64(i*2244), state, c.traverseRight, c.activeThreadCount, c.inactiveThreadCount)
 			step := state.Step
 
 			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
 			state.GetRegistersRef()[2] = arch.SysFutex // Set syscall number
-			state.GetRegistersRef()[4] = c.addressParam
+			state.GetRegistersRef()[4] = Word(c.addressParam)
 			state.GetRegistersRef()[5] = exec.FutexWakePrivate
 
 			// Set up post-state expectations
@@ -740,7 +586,7 @@ func TestEVM_SysFutex_WakePrivate(t *testing.T) {
 			expected.ExpectStep()
 			expected.ActiveThread().Registers[2] = 0
 			expected.ActiveThread().Registers[7] = 0
-			expected.Wakeup = c.effAddr
+			expected.Wakeup = Word(c.effAddr) & arch.AddressMask // aligned for 32 and 64-bit compatibility
 			expected.ExpectPreemption(state)
 			expected.TraverseRight = c.expectTraverseRight
 			if c.traverseRight != c.expectTraverseRight {
@@ -750,9 +596,7 @@ func TestEVM_SysFutex_WakePrivate(t *testing.T) {
 			}
 
 			// State transition
-			var err error
-			var stepWitness *mipsevm.StepWitness
-			stepWitness, err = goVm.Step(true)
+			stepWitness, err := goVm.Step(true)
 			require.NoError(t, err)
 
 			// Validate post-state
@@ -760,6 +604,7 @@ func TestEVM_SysFutex_WakePrivate(t *testing.T) {
 			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
 		})
 	}
+
 }
 
 func TestEVM_SysFutex_UnsupportedOp(t *testing.T) {
@@ -1103,70 +948,27 @@ var NoopSyscalls = map[string]uint32{
 	"SysTimerDelete":   4261,
 }
 
-func TestEVM_NoopSyscall(t *testing.T) {
-	for noopName, noopVal := range NoopSyscalls {
-		t.Run(noopName, func(t *testing.T) {
-			testutil.TemporarilySkip64BitTests(t)
-			goVm, state, contracts := setup(t, int(noopVal), nil)
-
-			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
-			state.GetRegistersRef()[2] = Word(noopVal) // Set syscall number
-			step := state.Step
-
-			// Set up post-state expectations
-			expected := mttestutil.NewExpectedMTState(state)
-			expected.ExpectStep()
-			expected.ActiveThread().Registers[2] = 0
-			expected.ActiveThread().Registers[7] = 0
-
-			// State transition
-			var err error
-			var stepWitness *mipsevm.StepWitness
-			stepWitness, err = goVm.Step(true)
-			require.NoError(t, err)
-
-			// Validate post-state
-			expected.Validate(t, state)
-			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
-		})
-
-	}
+func TestEVM_NoopSyscall32(t *testing.T) {
+	testutil.Cannon32OnlyTest(t, "These tests are fully covered for 64-bits in TestEVM_NoopSyscall64")
+	testNoopSyscall(t, NoopSyscalls)
 }
 
-func TestEVM_UnsupportedSyscall(t *testing.T) {
+func TestEVM_UnsupportedSyscall32(t *testing.T) {
+	testutil.Cannon32OnlyTest(t, "These tests are fully covered for 64-bits in TestEVM_UnsupportedSyscall64")
 	t.Parallel()
-	var tracer *tracing.Hooks
 
-	var NoopSyscallNums = maps.Values(NoopSyscalls)
-	var SupportedSyscalls = []uint32{arch.SysMmap, arch.SysBrk, arch.SysClone, arch.SysExitGroup, arch.SysRead, arch.SysWrite, arch.SysFcntl, arch.SysExit, arch.SysSchedYield, arch.SysGetTID, arch.SysFutex, arch.SysOpen, arch.SysNanosleep, arch.SysClockGetTime, arch.SysGetpid}
+	var noopSyscallNums = maps.Values(NoopSyscalls)
+	var supportedSyscalls = []uint32{arch.SysMmap, arch.SysBrk, arch.SysClone, arch.SysExitGroup, arch.SysRead, arch.SysWrite, arch.SysFcntl, arch.SysExit, arch.SysSchedYield, arch.SysGetTID, arch.SysFutex, arch.SysOpen, arch.SysNanosleep, arch.SysClockGetTime, arch.SysGetpid}
 	unsupportedSyscalls := make([]uint32, 0, 400)
 	for i := 4000; i < 4400; i++ {
 		candidate := uint32(i)
-		if slices.Contains(SupportedSyscalls, candidate) || slices.Contains(NoopSyscallNums, candidate) {
+		if slices.Contains(supportedSyscalls, candidate) || slices.Contains(noopSyscallNums, candidate) {
 			continue
 		}
 		unsupportedSyscalls = append(unsupportedSyscalls, candidate)
 	}
 
-	for i, syscallNum := range unsupportedSyscalls {
-		testName := fmt.Sprintf("Unsupported syscallNum %v", syscallNum)
-		i := i
-		syscallNum := syscallNum
-		t.Run(testName, func(t *testing.T) {
-			testutil.TemporarilySkip64BitTests(t)
-			t.Parallel()
-			goVm, state, contracts := setup(t, i*3434, nil)
-			// Setup basic getThreadId syscall instruction
-			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
-			state.GetRegistersRef()[2] = Word(syscallNum)
-			proofData := multiThreadedProofGenerator(t, state)
-			// Set up post-state expectations
-			require.Panics(t, func() { _, _ = goVm.Step(true) })
-
-			errorMessage := "MIPS2: unimplemented syscall"
-			testutil.AssertEVMReverts(t, state, contracts, tracer, proofData, testutil.CreateErrorStringMatcher(errorMessage))
-		})
-	}
+	testUnsupportedSyscall(t, unsupportedSyscalls)
 }
 
 func TestEVM_EmptyThreadStacks(t *testing.T) {
diff --git a/cannon/mipsevm/tests/fuzz_evm_common_test.go b/cannon/mipsevm/tests/fuzz_evm_common_test.go
index c58e1421a9e1..c637cbbe19a0 100644
--- a/cannon/mipsevm/tests/fuzz_evm_common_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_common_test.go
@@ -19,20 +19,11 @@ import (
 
 const syscallInsn = uint32(0x00_00_00_0c)
 
-func FuzzStateSyscallBrk32(f *testing.F) {
-	doFuzzStateSyscallBrk(f)
-}
-
-func FuzzStateSyscallBrk64(f *testing.F) {
-	doFuzzStateSyscallBrk(f)
-}
-
-func doFuzzStateSyscallBrk(f *testing.F) {
+func FuzzStateSyscallBrk(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(seed))
 				state := goVm.GetState()
 				state.GetRegistersRef()[2] = arch.SysBrk
@@ -57,15 +48,7 @@ func doFuzzStateSyscallBrk(f *testing.F) {
 	})
 }
 
-func FuzzStateSyscallMmap32(f *testing.F) {
-	doFuzzStateSyscallMmap(f)
-}
-
-func FuzzStateSyscallMmap64(f *testing.F) {
-	doFuzzStateSyscallMmap(f)
-}
-
-func doFuzzStateSyscallMmap(f *testing.F) {
+func FuzzStateSyscallMmap(f *testing.F) {
 	// Add special cases for large memory allocation
 	f.Add(Word(0), Word(0x1000), Word(program.HEAP_END), int64(1))
 	f.Add(Word(0), Word(1<<31), Word(program.HEAP_START), int64(2))
@@ -76,7 +59,6 @@ func doFuzzStateSyscallMmap(f *testing.F) {
 	f.Fuzz(func(t *testing.T, addr Word, siz Word, heap Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(),
 					testutil.WithRandomization(seed), testutil.WithHeap(heap))
 				state := goVm.GetState()
@@ -121,20 +103,11 @@ func doFuzzStateSyscallMmap(f *testing.F) {
 	})
 }
 
-func FuzzStateSyscallExitGroup32(f *testing.F) {
-	doFuzzStateSyscallExitGroup(f)
-}
-
-func FuzzStateSyscallExitGroup64(f *testing.F) {
-	doFuzzStateSyscallExitGroup(f)
-}
-
-func doFuzzStateSyscallExitGroup(f *testing.F) {
+func FuzzStateSyscallExitGroup(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, exitCode uint8, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(),
 					testutil.WithRandomization(seed))
 				state := goVm.GetState()
@@ -159,20 +132,11 @@ func doFuzzStateSyscallExitGroup(f *testing.F) {
 	})
 }
 
-func FuzzStateSyscallFcntl32(f *testing.F) {
-	doFuzzStateSyscallFcntl(f)
-}
-
-func FuzzStateSyscallFcntl64(f *testing.F) {
-	doFuzzStateSyscallFcntl(f)
-}
-
-func doFuzzStateSyscallFcntl(f *testing.F) {
+func FuzzStateSyscallFcntl(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, fd Word, cmd Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(),
 					testutil.WithRandomization(seed))
 				state := goVm.GetState()
@@ -193,7 +157,7 @@ func doFuzzStateSyscallFcntl(f *testing.F) {
 						expected.Registers[2] = 0
 						expected.Registers[7] = 0
 					default:
-						expected.Registers[2] = 0xFF_FF_FF_FF
+						expected.Registers[2] = ^Word(0)
 						expected.Registers[7] = exec.MipsEBADF
 					}
 				} else if cmd == 3 {
@@ -205,11 +169,11 @@ func doFuzzStateSyscallFcntl(f *testing.F) {
 						expected.Registers[2] = 1
 						expected.Registers[7] = 0
 					default:
-						expected.Registers[2] = 0xFF_FF_FF_FF
+						expected.Registers[2] = ^Word(0)
 						expected.Registers[7] = exec.MipsEBADF
 					}
 				} else {
-					expected.Registers[2] = 0xFF_FF_FF_FF
+					expected.Registers[2] = ^Word(0)
 					expected.Registers[7] = exec.MipsEINVAL
 				}
 
@@ -224,20 +188,11 @@ func doFuzzStateSyscallFcntl(f *testing.F) {
 	})
 }
 
-func FuzzStateHintRead32(f *testing.F) {
-	doFuzzStateHintRead(f)
-}
-
-func FuzzStateHintRead64(f *testing.F) {
-	doFuzzStateHintRead(f)
-}
-
-func doFuzzStateHintRead(f *testing.F) {
+func FuzzStateHintRead(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr Word, count Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				preimageData := []byte("hello world")
 				preimageKey := preimage.Keccak256Key(crypto.Keccak256Hash(preimageData)).PreimageKey()
 				oracle := testutil.StaticOracle(t, preimageData) // only used for hinting
@@ -270,15 +225,7 @@ func doFuzzStateHintRead(f *testing.F) {
 	})
 }
 
-func FuzzStatePreimageRead32(f *testing.F) {
-	doFuzzStatePreimageRead(f)
-}
-
-func FuzzStatePreimageRead64(f *testing.F) {
-	doFuzzStatePreimageRead(f)
-}
-
-func doFuzzStatePreimageRead(f *testing.F) {
+func FuzzStatePreimageRead(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr arch.Word, pc arch.Word, count arch.Word, preimageOffset arch.Word, seed int64) {
 		for _, v := range versions {
@@ -342,20 +289,11 @@ func doFuzzStatePreimageRead(f *testing.F) {
 	})
 }
 
-func FuzzStateHintWrite32(f *testing.F) {
-	doFuzzStateHintWrite(f)
-}
-
-func FuzzStateHintWrite64(f *testing.F) {
-	doFuzzStateHintWrite(f)
-}
-
-func doFuzzStateHintWrite(f *testing.F) {
+func FuzzStateHintWrite(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr Word, count Word, hint1, hint2, hint3 []byte, randSeed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				// Make sure pc does not overlap with hint data in memory
 				pc := Word(0)
 				if addr <= 8 {
@@ -433,27 +371,18 @@ func doFuzzStateHintWrite(f *testing.F) {
 	})
 }
 
-func FuzzStatePreimageWrite32(f *testing.F) {
-	doFuzzStatePreimageWrite(f)
-}
-
-func FuzzStatePreimageWrite64(f *testing.F) {
-	doFuzzStatePreimageWrite(f)
-}
-
-func doFuzzStatePreimageWrite(f *testing.F) {
+func FuzzStatePreimageWrite(f *testing.F) {
 	versions := GetMipsVersionTestCases(f)
 	f.Fuzz(func(t *testing.T, addr arch.Word, count arch.Word, seed int64) {
 		for _, v := range versions {
 			t.Run(v.Name, func(t *testing.T) {
-				testutil.TemporarilySkip64BitTests(t)
 				// Make sure pc does not overlap with preimage data in memory
 				pc := Word(0)
 				if addr <= 8 {
 					addr += 8
 				}
 				effAddr := addr & arch.AddressMask
-				preexistingMemoryVal := [4]byte{0x12, 0x34, 0x56, 0x78}
+				preexistingMemoryVal := [8]byte{0x12, 0x34, 0x56, 0x78, 0x87, 0x65, 0x43, 0x21}
 				preimageData := []byte("hello world")
 				preimageKey := preimage.Keccak256Key(crypto.Keccak256Hash(preimageData)).PreimageKey()
 				oracle := testutil.StaticOracle(t, preimageData)
@@ -471,7 +400,7 @@ func doFuzzStatePreimageWrite(f *testing.F) {
 
 				expectBytesWritten := count
 				alignment := addr & arch.ExtMask
-				sz := 4 - alignment
+				sz := arch.WordSizeBytes - alignment
 				if sz < expectBytesWritten {
 					expectBytesWritten = sz
 				}
diff --git a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
index 9d4bb46a4271..49f45a4a5f2c 100644
--- a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
@@ -13,18 +13,9 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
-func FuzzStateSyscallCloneMT32(f *testing.F) {
-	doFuzzStateSyscallCloneMT(f)
-}
-
-func FuzzStateSyscallCloneMT64(f *testing.F) {
-	doFuzzStateSyscallCloneMT(f)
-}
-
-func doFuzzStateSyscallCloneMT(f *testing.F) {
+func FuzzStateSyscallCloneMT(f *testing.F) {
 	v := GetMultiThreadedTestCase(f)
 	f.Fuzz(func(t *testing.T, nextThreadId, stackPtr Word, seed int64) {
-		testutil.TemporarilySkip64BitTests(t)
 		goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(seed))
 		state := mttestutil.GetMtState(t, goVm)
 		// Update existing threads to avoid collision with nextThreadId
diff --git a/cannon/mipsevm/tests/testfuncs_test.go b/cannon/mipsevm/tests/testfuncs_test.go
new file mode 100644
index 000000000000..0087ab445d73
--- /dev/null
+++ b/cannon/mipsevm/tests/testfuncs_test.go
@@ -0,0 +1,502 @@
+package tests
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
+	mttestutil "github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded/testutil"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
+	preimage "github.com/ethereum-optimism/optimism/op-preimage"
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+type operatorTestCase struct {
+	name      string
+	isImm     bool
+	rs        Word
+	rt        Word
+	imm       uint16
+	funct     uint32
+	opcode    uint32
+	expectRes Word
+}
+
+func testOperators(t *testing.T, cases []operatorTestCase, mips32Insn bool) {
+	versions := GetMipsVersionTestCases(t)
+	for _, v := range versions {
+		for i, tt := range cases {
+			// sign extend inputs for 64-bit compatibility
+			if mips32Insn {
+				tt.rs = randomizeUpperWord(signExtend64(tt.rs))
+				tt.rt = randomizeUpperWord(signExtend64(tt.rt))
+				tt.expectRes = signExtend64(tt.expectRes)
+			}
+
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				validator := testutil.NewEvmValidator(t, v.StateHashFn, v.Contracts)
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
+				state := goVm.GetState()
+				var insn uint32
+				var baseReg uint32 = 17
+				var rtReg uint32
+				var rdReg uint32
+				if tt.isImm {
+					rtReg = 8
+					insn = tt.opcode<<26 | baseReg<<21 | rtReg<<16 | uint32(tt.imm)
+					state.GetRegistersRef()[rtReg] = tt.rt
+					state.GetRegistersRef()[baseReg] = tt.rs
+				} else {
+					rtReg = 18
+					rdReg = 8
+					insn = baseReg<<21 | rtReg<<16 | rdReg<<11 | tt.funct
+					state.GetRegistersRef()[baseReg] = tt.rs
+					state.GetRegistersRef()[rtReg] = tt.rt
+				}
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
+				step := state.GetStep()
+
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.Step += 1
+				expected.PC = 4
+				expected.NextPC = 8
+				if tt.isImm {
+					expected.Registers[rtReg] = tt.expectRes
+				} else {
+					expected.Registers[rdReg] = tt.expectRes
+				}
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				validator.ValidateEVM(t, stepWitness, step, goVm)
+			})
+		}
+	}
+}
+
+type mulDivTestCase struct {
+	name      string
+	rs        Word
+	rt        Word
+	funct     uint32
+	opcode    uint32
+	expectHi  Word
+	expectLo  Word
+	expectRes Word
+	rdReg     uint32
+	panicMsg  string
+	revertMsg string
+}
+
+func testMulDiv(t *testing.T, cases []mulDivTestCase, mips32Insn bool) {
+	versions := GetMipsVersionTestCases(t)
+	for _, v := range versions {
+		for i, tt := range cases {
+			if mips32Insn {
+				tt.rs = randomizeUpperWord(signExtend64(tt.rs))
+				tt.rt = randomizeUpperWord(signExtend64(tt.rt))
+				tt.expectHi = signExtend64(tt.expectHi)
+				tt.expectLo = signExtend64(tt.expectLo)
+				tt.expectRes = signExtend64(tt.expectRes)
+			}
+
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
+				state := goVm.GetState()
+				var insn uint32
+				baseReg := uint32(0x9)
+				rtReg := uint32(0xa)
+
+				insn = tt.opcode<<26 | baseReg<<21 | rtReg<<16 | tt.rdReg<<11 | tt.funct
+				state.GetRegistersRef()[rtReg] = tt.rt
+				state.GetRegistersRef()[baseReg] = tt.rs
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
+
+				if tt.panicMsg != "" {
+					proofData := v.ProofGenerator(t, goVm.GetState())
+					require.PanicsWithValue(t, tt.panicMsg, func() {
+						_, _ = goVm.Step(
+							false)
+					})
+					testutil.AssertEVMReverts(t, state, v.Contracts, nil, proofData, testutil.CreateErrorStringMatcher(tt.revertMsg))
+					return
+				}
+
+				step := state.GetStep()
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.ExpectStep()
+				if tt.expectRes != 0 {
+					expected.Registers[tt.rdReg] = tt.expectRes
+				} else {
+					expected.HI = tt.expectHi
+					expected.LO = tt.expectLo
+				}
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+			})
+		}
+	}
+}
+
+type loadStoreTestCase struct {
+	name         string
+	rt           Word
+	base         Word
+	imm          uint32
+	opcode       uint32
+	memVal       Word
+	expectMemVal Word
+	expectRes    Word
+}
+
+func testLoadStore(t *testing.T, cases []loadStoreTestCase) {
+	baseReg := uint32(9)
+	rtReg := uint32(8)
+
+	v := GetMultiThreadedTestCase(t)
+	for i, tt := range cases {
+		testName := fmt.Sprintf("%v %v", v.Name, tt.name)
+		t.Run(testName, func(t *testing.T) {
+			addr := tt.base + Word(tt.imm)
+			effAddr := arch.AddressMask & addr
+
+			goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(0))
+			state := goVm.GetState()
+
+			insn := tt.opcode<<26 | baseReg<<21 | rtReg<<16 | uint32(tt.imm)
+			state.GetRegistersRef()[rtReg] = tt.rt
+			state.GetRegistersRef()[baseReg] = tt.base
+
+			testutil.StoreInstruction(state.GetMemory(), 0, insn)
+			state.GetMemory().SetWord(effAddr, tt.memVal)
+			step := state.GetStep()
+
+			// Setup expectations
+			expected := testutil.NewExpectedState(state)
+			expected.ExpectStep()
+			if tt.expectMemVal != 0 {
+				expected.ExpectMemoryWriteWord(effAddr, tt.expectMemVal)
+			} else {
+				expected.Registers[rtReg] = tt.expectRes
+			}
+			stepWitness, err := goVm.Step(true)
+			require.NoError(t, err)
+
+			// Check expectations
+			expected.Validate(t, state)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+		})
+	}
+}
+
+type branchTestCase struct {
+	name         string
+	pc           Word
+	expectNextPC Word
+	opcode       uint32
+	regimm       uint32
+	expectLink   bool
+	rs           arch.SignedInteger
+	offset       uint16
+}
+
+func testBranch(t *testing.T, cases []branchTestCase) {
+	versions := GetMipsVersionTestCases(t)
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPCAndNextPC(tt.pc))
+				state := goVm.GetState()
+				const rsReg = 8 // t0
+				insn := tt.opcode<<26 | rsReg<<21 | tt.regimm<<16 | uint32(tt.offset)
+				testutil.StoreInstruction(state.GetMemory(), tt.pc, insn)
+				state.GetRegistersRef()[rsReg] = Word(tt.rs)
+				step := state.GetStep()
+
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.Step += 1
+				expected.PC = state.GetCpu().NextPC
+				expected.NextPC = tt.expectNextPC
+				if tt.expectLink {
+					expected.Registers[31] = state.GetPC() + 8
+				}
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+			})
+		}
+	}
+}
+
+type testMTStoreOpsClearMemReservationTestCase struct {
+	// name is the test name
+	name string
+	// opcode is the instruction opcode
+	opcode uint32
+	// offset is the immediate offset encoded in the instruction
+	offset uint32
+	// base is the base/rs register prestate
+	base Word
+	// effAddr is the address used to set the prestate preMem value. It is also used as the base LLAddress that can be adjusted reservation assertions
+	effAddr Word
+	// premem is the prestate value of the word located at effrAddr
+	preMem Word
+	// postMem is the expected post-state value of the word located at effAddr
+	postMem Word
+}
+
+func testMTStoreOpsClearMemReservation(t *testing.T, cases []testMTStoreOpsClearMemReservationTestCase) {
+	llVariations := []struct {
+		name                   string
+		llReservationStatus    multithreaded.LLReservationStatus
+		matchThreadId          bool
+		effAddrOffset          Word
+		shouldClearReservation bool
+	}{
+		{name: "matching reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, shouldClearReservation: true},
+		{name: "matching reservation, unaligned", llReservationStatus: multithreaded.LLStatusActive32bit, effAddrOffset: 1, matchThreadId: true, shouldClearReservation: true},
+		{name: "matching reservation, 64-bit", llReservationStatus: multithreaded.LLStatusActive64bit, matchThreadId: true, shouldClearReservation: true},
+		{name: "matching reservation, diff thread", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: false, shouldClearReservation: true},
+		{name: "matching reservation, diff thread, 64-bit", llReservationStatus: multithreaded.LLStatusActive64bit, matchThreadId: false, shouldClearReservation: true},
+		{name: "mismatched reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
+		{name: "mismatched reservation, diff thread", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: false, effAddrOffset: 8, shouldClearReservation: false},
+		{name: "no reservation, matching addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, shouldClearReservation: true},
+		{name: "no reservation, mismatched addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
+	}
+
+	rt := Word(0x12_34_56_78)
+	//rt := Word(0x12_34_56_78_12_34_56_78)
+	baseReg := uint32(5)
+	rtReg := uint32(6)
+	for i, c := range cases {
+		for _, v := range llVariations {
+			tName := fmt.Sprintf("%v (%v)", c.name, v.name)
+			t.Run(tName, func(t *testing.T) {
+				t.Parallel()
+				insn := uint32((c.opcode << 26) | (baseReg & 0x1F << 21) | (rtReg & 0x1F << 16) | (0xFFFF & c.offset))
+				goVm, state, contracts := setup(t, i, nil, testutil.WithPCAndNextPC(0x08))
+				step := state.GetStep()
+
+				// Define LL-related params
+				llAddress := c.effAddr + v.effAddrOffset
+				llOwnerThread := state.GetCurrentThread().ThreadId
+				if !v.matchThreadId {
+					llOwnerThread += 1
+				}
+
+				// Setup state
+				state.GetRegistersRef()[rtReg] = rt
+				state.GetRegistersRef()[baseReg] = c.base
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
+				state.GetMemory().SetWord(c.effAddr, c.preMem)
+				state.LLReservationStatus = v.llReservationStatus
+				state.LLAddress = llAddress
+				state.LLOwnerThread = llOwnerThread
+
+				// Setup expectations
+				expected := mttestutil.NewExpectedMTState(state)
+				expected.ExpectStep()
+				expected.ExpectMemoryWordWrite(c.effAddr, c.postMem)
+				if v.shouldClearReservation {
+					expected.LLReservationStatus = multithreaded.LLStatusNone
+					expected.LLAddress = 0
+					expected.LLOwnerThread = 0
+				}
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
+			})
+		}
+	}
+}
+
+type testMTSysReadPreimageTestCase struct {
+	name           string
+	addr           Word
+	count          Word
+	writeLen       Word
+	preimageOffset Word
+	prestateMem    Word
+	postateMem     Word
+	shouldPanic    bool
+}
+
+func testMTSysReadPreimage(t *testing.T, preimageValue []byte, cases []testMTSysReadPreimageTestCase) {
+	llVariations := []struct {
+		name                   string
+		llReservationStatus    multithreaded.LLReservationStatus
+		matchThreadId          bool
+		effAddrOffset          Word
+		shouldClearReservation bool
+	}{
+		{name: "matching reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, shouldClearReservation: true},
+		{name: "matching reservation, unaligned", llReservationStatus: multithreaded.LLStatusActive32bit, effAddrOffset: 1, matchThreadId: true, shouldClearReservation: true},
+		{name: "matching reservation, diff thread", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: false, shouldClearReservation: true},
+		{name: "mismatched reservation", llReservationStatus: multithreaded.LLStatusActive32bit, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
+		{name: "mismatched reservation", llReservationStatus: multithreaded.LLStatusActive64bit, matchThreadId: false, effAddrOffset: 8, shouldClearReservation: false},
+		{name: "no reservation, matching addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, shouldClearReservation: true},
+		{name: "no reservation, mismatched addr", llReservationStatus: multithreaded.LLStatusNone, matchThreadId: true, effAddrOffset: 8, shouldClearReservation: false},
+	}
+
+	for i, c := range cases {
+		for _, v := range llVariations {
+			tName := fmt.Sprintf("%v (%v)", c.name, v.name)
+			t.Run(tName, func(t *testing.T) {
+				t.Parallel()
+				effAddr := arch.AddressMask & c.addr
+				preimageKey := preimage.Keccak256Key(crypto.Keccak256Hash(preimageValue)).PreimageKey()
+				oracle := testutil.StaticOracle(t, preimageValue)
+				goVm, state, contracts := setup(t, i, oracle)
+				step := state.GetStep()
+
+				// Define LL-related params
+				llAddress := effAddr + v.effAddrOffset
+				llOwnerThread := state.GetCurrentThread().ThreadId
+				if !v.matchThreadId {
+					llOwnerThread += 1
+				}
+
+				// Set up state
+				state.PreimageKey = preimageKey
+				state.PreimageOffset = c.preimageOffset
+				state.GetRegistersRef()[2] = arch.SysRead
+				state.GetRegistersRef()[4] = exec.FdPreimageRead
+				state.GetRegistersRef()[5] = c.addr
+				state.GetRegistersRef()[6] = c.count
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), syscallInsn)
+				state.LLReservationStatus = v.llReservationStatus
+				state.LLAddress = llAddress
+				state.LLOwnerThread = llOwnerThread
+				state.GetMemory().SetWord(effAddr, c.prestateMem)
+
+				// Setup expectations
+				expected := mttestutil.NewExpectedMTState(state)
+				expected.ExpectStep()
+				expected.ActiveThread().Registers[2] = c.writeLen
+				expected.ActiveThread().Registers[7] = 0 // no error
+				expected.PreimageOffset += c.writeLen
+				expected.ExpectMemoryWordWrite(effAddr, c.postateMem)
+				if v.shouldClearReservation {
+					expected.LLReservationStatus = multithreaded.LLStatusNone
+					expected.LLAddress = 0
+					expected.LLOwnerThread = 0
+				}
+
+				if c.shouldPanic {
+					require.Panics(t, func() { _, _ = goVm.Step(true) })
+					testutil.AssertPreimageOracleReverts(t, preimageKey, preimageValue, c.preimageOffset, contracts)
+				} else {
+					stepWitness, err := goVm.Step(true)
+					require.NoError(t, err)
+
+					// Check expectations
+					expected.Validate(t, state)
+					testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
+				}
+			})
+		}
+	}
+}
+
+func testNoopSyscall(t *testing.T, syscalls map[string]uint32) {
+	for noopName, noopVal := range syscalls {
+		t.Run(noopName, func(t *testing.T) {
+			t.Parallel()
+			goVm, state, contracts := setup(t, int(noopVal), nil)
+
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
+			state.GetRegistersRef()[2] = Word(noopVal) // Set syscall number
+			step := state.Step
+
+			// Set up post-state expectations
+			expected := mttestutil.NewExpectedMTState(state)
+			expected.ExpectStep()
+			expected.ActiveThread().Registers[2] = 0
+			expected.ActiveThread().Registers[7] = 0
+
+			// State transition
+			stepWitness, err := goVm.Step(true)
+			require.NoError(t, err)
+
+			// Validate post-state
+			expected.Validate(t, state)
+			testutil.ValidateEVM(t, stepWitness, step, goVm, multithreaded.GetStateHashFn(), contracts)
+		})
+	}
+}
+
+func testUnsupportedSyscall(t *testing.T, unsupportedSyscalls []uint32) {
+	for i, syscallNum := range unsupportedSyscalls {
+		testName := fmt.Sprintf("Unsupported syscallNum %v", syscallNum)
+		i := i
+		syscallNum := syscallNum
+		t.Run(testName, func(t *testing.T) {
+			t.Parallel()
+			goVm, state, contracts := setup(t, i*3434, nil)
+			// Setup basic getThreadId syscall instruction
+			testutil.StoreInstruction(state.Memory, state.GetPC(), syscallInsn)
+			state.GetRegistersRef()[2] = Word(syscallNum)
+			proofData := multiThreadedProofGenerator(t, state)
+			// Set up post-state expectations
+			require.Panics(t, func() { _, _ = goVm.Step(true) })
+
+			errorMessage := "unimplemented syscall"
+			testutil.AssertEVMReverts(t, state, contracts, nil, proofData, testutil.CreateErrorStringMatcher(errorMessage))
+		})
+	}
+}
+
+// signExtend64 is used to sign-extend 32-bit words for 64-bit compatibility
+func signExtend64(w Word) Word {
+	if arch.IsMips32 {
+		return w
+	} else {
+		return exec.SignExtend(w, 32)
+	}
+}
+
+const seed = 0xdead
+
+var rand = testutil.NewRandHelper(seed)
+
+// randomizeUpperWord is used to assert that 32-bit operations use the lower word only
+func randomizeUpperWord(w Word) Word {
+	if arch.IsMips32 {
+		return w
+	} else {
+		if w>>32 == 0x0 { // nolint:staticcheck
+			rnd := rand.Uint32()
+			upper := uint64(rnd) << 32
+			return Word(upper | uint64(uint32(w)))
+		} else {
+			return w
+		}
+	}
+}
diff --git a/cannon/mipsevm/testutil/arch.go b/cannon/mipsevm/testutil/arch.go
index a69896c041e5..b4eb50b7e3f1 100644
--- a/cannon/mipsevm/testutil/arch.go
+++ b/cannon/mipsevm/testutil/arch.go
@@ -4,6 +4,7 @@ package testutil
 
 import (
 	"bytes"
+	"testing"
 
 	"github.com/stretchr/testify/require"
 
@@ -46,3 +47,10 @@ func SetMemoryUint64(t require.TestingT, mem *memory.Memory, addr Word, value ui
 func ToSignedInteger(x Word) arch.SignedInteger {
 	return arch.SignedInteger(x)
 }
+
+// Cannon32OnlyTest skips the test if it's not a cannon64 build
+func Cannon32OnlyTest(t testing.TB, msg string, args ...any) {
+	if !arch.IsMips32 {
+		t.Skipf(msg, args...)
+	}
+}
diff --git a/cannon/mipsevm/testutil/vmtests.go b/cannon/mipsevm/testutil/vmtests.go
index b16550e446c7..333720a4ec02 100644
--- a/cannon/mipsevm/testutil/vmtests.go
+++ b/cannon/mipsevm/testutil/vmtests.go
@@ -141,10 +141,3 @@ func RunVMTest_Claim[T mipsevm.FPVMState](t *testing.T, initState program.Create
 	require.Equal(t, expectedStdOut, stdOutBuf.String(), "stdout")
 	require.Equal(t, expectedStdErr, stdErrBuf.String(), "stderr")
 }
-
-func TemporarilySkip64BitTests(t *testing.T) {
-	if !arch.IsMips32 {
-		// TODO(#12598) Update and enable these tests
-		t.Skip("Skipping 64-bit test")
-	}
-}

From 9f3f8cbc20337a07840ff59d9e4c5f991766a82c Mon Sep 17 00:00:00 2001
From: Joshua Gutow <jgutow@oplabs.co>
Date: Tue, 12 Nov 2024 18:18:19 +0700
Subject: [PATCH 169/451] Add tool to reconstruct L2 deposit tx hash (#12893)

---
 op-chain-ops/cmd/deposit-hash/main.go | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 op-chain-ops/cmd/deposit-hash/main.go

diff --git a/op-chain-ops/cmd/deposit-hash/main.go b/op-chain-ops/cmd/deposit-hash/main.go
new file mode 100644
index 000000000000..9166a0667c09
--- /dev/null
+++ b/op-chain-ops/cmd/deposit-hash/main.go
@@ -0,0 +1,44 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+func main() {
+	var rpcURL, txHash string
+	flag.StringVar(&rpcURL, "rpc", "", "L1 RPC URL")
+	flag.StringVar(&txHash, "tx", "", "Deposit transaction hash on L1")
+	flag.Parse()
+
+	depositLogTopic := common.HexToHash("0xb3813568d9991fc951961fcb4c784893574240a28925604d09fc577c55bb7c32")
+
+	ethClient, err := ethclient.Dial(rpcURL)
+	if err != nil {
+		log.Crit("Error creating RPC", "err", err)
+	}
+
+	l1Receipt, err := ethClient.TransactionReceipt(context.TODO(), common.HexToHash(txHash))
+	if err != nil {
+		log.Crit("Error fetching transaction", "err", err)
+	}
+
+	for _, ethLog := range l1Receipt.Logs {
+		if ethLog.Topics[0].String() == depositLogTopic.String() {
+
+			reconstructedDep, err := derive.UnmarshalDepositLogEvent(ethLog)
+			if err != nil {
+				log.Crit("Failed to parse deposit event ", "err", err)
+			}
+			tx := types.NewTx(reconstructedDep)
+			fmt.Println("L2 Tx Hash", tx.Hash().String())
+		}
+	}
+}

From 72e67e53b18e697b6e421e9eba303fb821064a8f Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Tue, 12 Nov 2024 23:38:16 +0700
Subject: [PATCH 170/451] op-bootnode: remove op-bootnode service (#12901)

---
 README.md                                     |   1 -
 op-bootnode/.gitignore                        |   1 -
 op-bootnode/Makefile                          |  22 ---
 op-bootnode/bootnode/entrypoint.go            | 134 ------------------
 op-bootnode/cmd/main.go                       |  28 ----
 op-bootnode/flags/flags.go                    |  25 ----
 .../op-stack-go/Dockerfile.dockerignore       |   1 -
 7 files changed, 212 deletions(-)
 delete mode 100644 op-bootnode/.gitignore
 delete mode 100644 op-bootnode/Makefile
 delete mode 100644 op-bootnode/bootnode/entrypoint.go
 delete mode 100644 op-bootnode/cmd/main.go
 delete mode 100644 op-bootnode/flags/flags.go

diff --git a/README.md b/README.md
index 42a880f5f427..bda740f63c2c 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,6 @@ The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vuln
 <pre>
 ├── <a href="./docs">docs</a>: A collection of documents including audits and post-mortems
 ├── <a href="./op-batcher">op-batcher</a>: L2-Batch Submitter, submits bundles of batches to L1
-├── <a href="./op-bootnode">op-bootnode</a>: Standalone op-node discovery bootnode
 ├── <a href="./op-chain-ops">op-chain-ops</a>: State surgery utilities
 ├── <a href="./op-challenger">op-challenger</a>: Dispute game challenge agent
 ├── <a href="./op-e2e">op-e2e</a>: End-to-End testing of all bedrock components in Go
diff --git a/op-bootnode/.gitignore b/op-bootnode/.gitignore
deleted file mode 100644
index ba077a4031ad..000000000000
--- a/op-bootnode/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/op-bootnode/Makefile b/op-bootnode/Makefile
deleted file mode 100644
index f9f276e9ed11..000000000000
--- a/op-bootnode/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-VERSION ?= v0.0.0
-
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X main.Version=$(VERSION)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-op-bootnode:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build -v $(LDFLAGS) -o ./bin/op-bootnode ./cmd
-
-clean:
-	rm -f bin/op-bootnode
-
-test:
-	go test -v ./...
-
-.PHONY: \
-	op-bootnode \
-	clean \
-	test
diff --git a/op-bootnode/bootnode/entrypoint.go b/op-bootnode/bootnode/entrypoint.go
deleted file mode 100644
index 0c33383c70c7..000000000000
--- a/op-bootnode/bootnode/entrypoint.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package bootnode
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/urfave/cli/v2"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum/go-ethereum/rpc"
-
-	opnode "github.com/ethereum-optimism/optimism/op-node"
-	"github.com/ethereum-optimism/optimism/op-node/metrics"
-	"github.com/ethereum-optimism/optimism/op-node/p2p"
-	p2pcli "github.com/ethereum-optimism/optimism/op-node/p2p/cli"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
-	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
-	"github.com/ethereum-optimism/optimism/op-service/eth"
-	oplog "github.com/ethereum-optimism/optimism/op-service/log"
-	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
-	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
-)
-
-type gossipNoop struct{}
-
-func (g *gossipNoop) OnUnsafeL2Payload(_ context.Context, _ peer.ID, _ *eth.ExecutionPayloadEnvelope) error {
-	return nil
-}
-
-type gossipConfig struct{}
-
-func (g *gossipConfig) P2PSequencerAddress() common.Address {
-	return common.Address{}
-}
-
-type l2Chain struct{}
-
-func (l *l2Chain) PayloadByNumber(_ context.Context, _ uint64) (*eth.ExecutionPayloadEnvelope, error) {
-	return nil, errors.New("P2P req/resp is not supported in bootnodes")
-}
-
-func Main(cliCtx *cli.Context) error {
-	log.Info("Initializing bootnode")
-	logCfg := oplog.ReadCLIConfig(cliCtx)
-	logger := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
-	oplog.SetGlobalLogHandler(logger.Handler())
-	m := metrics.NewMetrics("default")
-	ctx := context.Background()
-
-	config, err := opnode.NewRollupConfigFromCLI(logger, cliCtx)
-	if err != nil {
-		return err
-	}
-	if err = validateConfig(config); err != nil {
-		return err
-	}
-
-	p2pConfig, err := p2pcli.NewConfig(cliCtx, config)
-	if err != nil {
-		return fmt.Errorf("failed to load p2p config: %w", err)
-	}
-	if p2pConfig.EnableReqRespSync {
-		logger.Warn("req-resp sync is enabled, bootnode does not support this feature")
-		p2pConfig.EnableReqRespSync = false
-	}
-
-	p2pNode, err := p2p.NewNodeP2P(ctx, config, logger, p2pConfig, &gossipNoop{}, &l2Chain{}, &gossipConfig{}, m, false)
-	if err != nil || p2pNode == nil {
-		return err
-	}
-	if p2pNode.Dv5Udp() == nil {
-		return fmt.Errorf("uninitialized discovery service")
-	}
-
-	rpcCfg := oprpc.ReadCLIConfig(cliCtx)
-	if err := rpcCfg.Check(); err != nil {
-		return fmt.Errorf("failed to validate RPC config")
-	}
-	rpcServer := oprpc.NewServer(rpcCfg.ListenAddr, rpcCfg.ListenPort, "", oprpc.WithLogger(logger))
-	if rpcCfg.EnableAdmin {
-		logger.Info("Admin RPC enabled but does nothing for the bootnode")
-	}
-	rpcServer.AddAPI(rpc.API{
-		Namespace:     p2p.NamespaceRPC,
-		Version:       "",
-		Service:       p2p.NewP2PAPIBackend(p2pNode, logger, m),
-		Authenticated: false,
-	})
-	if err := rpcServer.Start(); err != nil {
-		return fmt.Errorf("failed to start the RPC server")
-	}
-	defer func() {
-		if err := rpcServer.Stop(); err != nil {
-			log.Error("failed to stop RPC server", "err", err)
-		}
-	}()
-
-	go p2pNode.DiscoveryProcess(ctx, logger, config, p2pConfig.TargetPeers())
-
-	metricsCfg := opmetrics.ReadCLIConfig(cliCtx)
-	if metricsCfg.Enabled {
-		log.Debug("starting metrics server", "addr", metricsCfg.ListenAddr, "port", metricsCfg.ListenPort)
-		metricsSrv, err := m.StartServer(metricsCfg.ListenAddr, metricsCfg.ListenPort)
-		if err != nil {
-			return fmt.Errorf("failed to start metrics server: %w", err)
-		}
-		defer func() {
-			if err := metricsSrv.Stop(context.Background()); err != nil {
-				log.Error("failed to stop metrics server", "err", err)
-			}
-		}()
-		log.Info("started metrics server", "addr", metricsSrv.Addr())
-		m.RecordUp()
-	}
-
-	return ctxinterrupt.Wait(ctx)
-}
-
-// validateConfig ensures the minimal config required to run a bootnode
-func validateConfig(config *rollup.Config) error {
-	if config.L2ChainID == nil || config.L2ChainID.Uint64() == 0 {
-		return errors.New("chain ID is not set")
-	}
-	if config.Genesis.L2Time <= 0 {
-		return errors.New("genesis timestamp is not set")
-	}
-	if config.BlockTime <= 0 {
-		return errors.New("block time is not set")
-	}
-	return nil
-}
diff --git a/op-bootnode/cmd/main.go b/op-bootnode/cmd/main.go
deleted file mode 100644
index 1dbc82010cfc..000000000000
--- a/op-bootnode/cmd/main.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/urfave/cli/v2"
-
-	"github.com/ethereum-optimism/optimism/op-bootnode/bootnode"
-	"github.com/ethereum-optimism/optimism/op-bootnode/flags"
-	oplog "github.com/ethereum-optimism/optimism/op-service/log"
-)
-
-func main() {
-	oplog.SetupDefaults()
-
-	app := cli.NewApp()
-	app.Flags = flags.Flags
-	app.Name = "bootnode"
-	app.Usage = "Rollup Bootnode"
-	app.Description = "Broadcasts incoming P2P peers to each other, enabling peer bootstrapping."
-	app.Action = bootnode.Main
-
-	err := app.Run(os.Args)
-	if err != nil {
-		log.Crit("Application failed", "message", err)
-	}
-}
diff --git a/op-bootnode/flags/flags.go b/op-bootnode/flags/flags.go
deleted file mode 100644
index 5fbe0d538b33..000000000000
--- a/op-bootnode/flags/flags.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package flags
-
-import (
-	"github.com/urfave/cli/v2"
-
-	"github.com/ethereum-optimism/optimism/op-node/flags"
-	opflags "github.com/ethereum-optimism/optimism/op-service/flags"
-	oplog "github.com/ethereum-optimism/optimism/op-service/log"
-	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
-	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
-)
-
-const envVarPrefix = "OP_BOOTNODE"
-
-var Flags = []cli.Flag{
-	opflags.CLINetworkFlag(envVarPrefix, ""),
-	opflags.CLIRollupConfigFlag(envVarPrefix, ""),
-}
-
-func init() {
-	Flags = append(Flags, flags.P2PFlags(envVarPrefix)...)
-	Flags = append(Flags, opmetrics.CLIFlags(envVarPrefix)...)
-	Flags = append(Flags, oplog.CLIFlags(envVarPrefix)...)
-	Flags = append(Flags, oprpc.CLIFlags(envVarPrefix)...)
-}
diff --git a/ops/docker/op-stack-go/Dockerfile.dockerignore b/ops/docker/op-stack-go/Dockerfile.dockerignore
index e5eceaea73b8..bd700e291e49 100644
--- a/ops/docker/op-stack-go/Dockerfile.dockerignore
+++ b/ops/docker/op-stack-go/Dockerfile.dockerignore
@@ -4,7 +4,6 @@
 
 !/cannon
 !/op-batcher
-!/op-bootnode
 !/op-chain-ops
 !/op-deployer
 !/op-challenger

From 816885d42faa2c6b3ef40a2365ad322b791bbe1e Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 13 Nov 2024 05:42:37 +0100
Subject: [PATCH 171/451] improve contracts code coverage (#12900)

* improve L1 contracts code cov

* improve L1 contracts code cov

* improve L1 contracts code cov

* improve L1 contracts code cov

* improve L1 contracts code cov

* improve L1 contracts code cov
---
 .../test/L1/DataAvailabilityChallenge.t.sol   | 120 +++++++++++++++---
 .../test/L1/L2OutputOracle.t.sol              |  20 +++
 .../test/L1/OptimismPortal.t.sol              |  75 ++++++++++-
 .../contracts-bedrock/test/setup/Events.sol   |   2 +
 4 files changed, 199 insertions(+), 18 deletions(-)

diff --git a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
index ddbacec67c3e..a2ab917a0d2b 100644
--- a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
+++ b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
@@ -52,6 +52,26 @@ contract DataAvailabilityChallengeTest is CommonTest {
         assertEq(sender.balance, amount);
     }
 
+    function test_withdraw_fails_reverts(address sender, uint256 amount) public {
+        assumePayable(sender);
+        assumeNotPrecompile(sender);
+        // EntryPoint will revert if using amount > type(uint112).max.
+        vm.assume(sender != Preinstalls.EntryPoint_v060);
+        vm.assume(sender != address(dataAvailabilityChallenge));
+        vm.assume(sender.balance == 0);
+        vm.deal(sender, amount);
+
+        vm.prank(sender);
+        dataAvailabilityChallenge.deposit{ value: amount }();
+
+        assertEq(dataAvailabilityChallenge.balances(sender), amount);
+        assertEq(sender.balance, 0);
+
+        vm.etch(sender, hex"fe");
+        vm.expectRevert(abi.encodeWithSelector(IDataAvailabilityChallenge.WithdrawalFailed.selector));
+        dataAvailabilityChallenge.withdraw();
+    }
+
     function test_challenge_succeeds(
         address challenger,
         uint256 challengedBlockNumber,
@@ -220,6 +240,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         bytes memory preImage,
         uint256 challengedBlockNumber,
         uint256 resolverRefundPercentage,
+        uint64 bondSize,
         uint128 txGasPrice
     )
         public
@@ -229,6 +250,9 @@ contract DataAvailabilityChallengeTest is CommonTest {
         vm.assume(resolver != address(0));
         vm.assume(challenger != resolver);
 
+        vm.prank(dataAvailabilityChallenge.owner());
+        dataAvailabilityChallenge.setBondSize(bondSize);
+
         // Bound the resolver refund percentage to 100
         resolverRefundPercentage = bound(resolverRefundPercentage, 0, 100);
 
@@ -251,7 +275,6 @@ contract DataAvailabilityChallengeTest is CommonTest {
         vm.roll(challengedBlockNumber + 1);
 
         // Challenge the hash
-        uint256 bondSize = dataAvailabilityChallenge.bondSize();
         vm.deal(challenger, bondSize);
         vm.prank(challenger);
         dataAvailabilityChallenge.challenge{ value: bondSize }(challengedBlockNumber, challengedCommitment);
@@ -259,6 +282,26 @@ contract DataAvailabilityChallengeTest is CommonTest {
         // Store the address(0) balance before resolving to assert the burned amount later
         uint256 zeroAddressBalanceBeforeResolve = address(0).balance;
 
+        // Assert challenger balance after bond distribution
+        uint256 resolutionCost = (
+            dataAvailabilityChallenge.fixedResolutionCost()
+                + preImage.length * dataAvailabilityChallenge.variableResolutionCost()
+                    / dataAvailabilityChallenge.variableResolutionCostPrecision()
+        ) * block.basefee;
+        uint256 challengerRefund = bondSize > resolutionCost ? bondSize - resolutionCost : 0;
+        uint256 resolverRefund = resolutionCost * dataAvailabilityChallenge.resolverRefundPercentage() / 100;
+        resolverRefund = resolverRefund > resolutionCost ? resolutionCost : resolverRefund;
+        resolverRefund = resolverRefund > bondSize ? bondSize : resolverRefund;
+
+        if (challengerRefund > 0) {
+            vm.expectEmit(true, true, true, true);
+            emit BalanceChanged(challenger, challengerRefund);
+        }
+        if (resolverRefund > 0) {
+            vm.expectEmit(true, true, true, true);
+            emit BalanceChanged(resolver, resolverRefund);
+        }
+
         // Resolve the challenge
         vm.prank(resolver);
         dataAvailabilityChallenge.resolve(challengedBlockNumber, challengedCommitment, preImage);
@@ -274,27 +317,72 @@ contract DataAvailabilityChallengeTest is CommonTest {
             uint8(dataAvailabilityChallenge.getChallengeStatus(challengedBlockNumber, challengedCommitment)),
             uint8(ChallengeStatus.Resolved)
         );
-
-        // Assert challenger balance after bond distribution
-        uint256 resolutionCost = (
-            dataAvailabilityChallenge.fixedResolutionCost()
-                + preImage.length * dataAvailabilityChallenge.variableResolutionCost()
-                    / dataAvailabilityChallenge.variableResolutionCostPrecision()
-        ) * block.basefee;
-        uint256 challengerRefund = bondSize > resolutionCost ? bondSize - resolutionCost : 0;
-        assertEq(dataAvailabilityChallenge.balances(challenger), challengerRefund, "challenger refund");
-
-        // Assert resolver balance after bond distribution
-        uint256 resolverRefund = resolutionCost * dataAvailabilityChallenge.resolverRefundPercentage() / 100;
-        resolverRefund = resolverRefund > resolutionCost ? resolutionCost : resolverRefund;
-        resolverRefund = resolverRefund > bondSize ? bondSize : resolverRefund;
-        assertEq(dataAvailabilityChallenge.balances(resolver), resolverRefund, "resolver refund");
+        address _challenger = challenger;
+        address _resolver = resolver;
+        assertEq(dataAvailabilityChallenge.balances(_challenger), challengerRefund, "challenger refund");
+        assertEq(dataAvailabilityChallenge.balances(_resolver), resolverRefund, "resolver refund");
 
         // Assert burned amount after bond distribution
         uint256 burned = bondSize - challengerRefund - resolverRefund;
         assertEq(address(0).balance - zeroAddressBalanceBeforeResolve, burned, "burned bond");
     }
 
+    function test_resolve_invalidInputData_reverts(
+        address challenger,
+        address resolver,
+        bytes memory preImage,
+        bytes memory wrongPreImage,
+        uint256 challengedBlockNumber,
+        uint256 resolverRefundPercentage,
+        uint128 txGasPrice
+    )
+        public
+    {
+        // Assume neither the challenger nor resolver is address(0) and that they're not the same entity
+        vm.assume(challenger != address(0));
+        vm.assume(resolver != address(0));
+        vm.assume(challenger != resolver);
+        vm.assume(keccak256(preImage) != keccak256(wrongPreImage));
+
+        // Bound the resolver refund percentage to 100
+        resolverRefundPercentage = bound(resolverRefundPercentage, 0, 100);
+
+        // Set the gas price to a fuzzed value to test bond distribution logic
+        vm.txGasPrice(txGasPrice);
+
+        // Change the resolver refund percentage
+        vm.prank(dataAvailabilityChallenge.owner());
+        dataAvailabilityChallenge.setResolverRefundPercentage(resolverRefundPercentage);
+
+        // Assume the block number is not close to the max uint256 value
+        vm.assume(
+            challengedBlockNumber
+                < type(uint256).max - dataAvailabilityChallenge.challengeWindow()
+                    - dataAvailabilityChallenge.resolveWindow()
+        );
+        bytes memory challengedCommitment = computeCommitmentKeccak256(wrongPreImage);
+
+        // Move to block after challenged block
+        vm.roll(challengedBlockNumber + 1);
+
+        // Challenge the hash
+        uint256 bondSize = dataAvailabilityChallenge.bondSize();
+        vm.deal(challenger, bondSize);
+        vm.prank(challenger);
+        dataAvailabilityChallenge.challenge{ value: bondSize }(challengedBlockNumber, challengedCommitment);
+
+        // Resolve the challenge
+        vm.prank(resolver);
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                IDataAvailabilityChallenge.InvalidInputData.selector,
+                computeCommitmentKeccak256(preImage),
+                challengedCommitment
+            )
+        );
+        dataAvailabilityChallenge.resolve(challengedBlockNumber, challengedCommitment, preImage);
+    }
+
     function test_resolve_nonExistentChallenge_reverts() public {
         bytes memory preImage = "some preimage";
         uint256 challengedBlockNumber = 1;
diff --git a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
index 9b18479d5255..490ae07c927d 100644
--- a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
+++ b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
@@ -111,6 +111,10 @@ contract L2OutputOracle_getter_Test is L2OutputOracle_TestBase {
         // Querying with exact same block as proposed returns the proposal.
         uint256 index1 = l2OutputOracle.getL2OutputIndexAfter(nextBlockNumber1);
         assertEq(index1, 0);
+        assertEq(
+            keccak256(abi.encode(l2OutputOracle.getL2Output(index1))),
+            keccak256(abi.encode(output1, block.timestamp, nextBlockNumber1))
+        );
     }
 
     /// @dev Tests that `getL2OutputIndexAfter` returns the correct value
@@ -125,6 +129,10 @@ contract L2OutputOracle_getter_Test is L2OutputOracle_TestBase {
         // Querying with previous block returns the proposal too.
         uint256 index1 = l2OutputOracle.getL2OutputIndexAfter(nextBlockNumber1 - 1);
         assertEq(index1, 0);
+        assertEq(
+            keccak256(abi.encode(l2OutputOracle.getL2Output(index1))),
+            keccak256(abi.encode(output1, block.timestamp, nextBlockNumber1))
+        );
     }
 
     /// @dev Tests that `getL2OutputIndexAfter` returns the correct value.
@@ -156,14 +164,26 @@ contract L2OutputOracle_getter_Test is L2OutputOracle_TestBase {
         // Querying with a block number between the first and second proposal
         uint256 index1 = l2OutputOracle.getL2OutputIndexAfter(nextBlockNumber1 + 1);
         assertEq(index1, 1);
+        assertEq(
+            keccak256(abi.encode(l2OutputOracle.getL2Output(index1))),
+            keccak256(abi.encode(output2, l2OutputOracle.computeL2Timestamp(nextBlockNumber2) + 1, nextBlockNumber2))
+        );
 
         // Querying with a block number between the second and third proposal
         uint256 index2 = l2OutputOracle.getL2OutputIndexAfter(nextBlockNumber2 + 1);
         assertEq(index2, 2);
+        assertEq(
+            keccak256(abi.encode(l2OutputOracle.getL2Output(index2))),
+            keccak256(abi.encode(output3, l2OutputOracle.computeL2Timestamp(nextBlockNumber3) + 1, nextBlockNumber3))
+        );
 
         // Querying with a block number between the third and fourth proposal
         uint256 index3 = l2OutputOracle.getL2OutputIndexAfter(nextBlockNumber3 + 1);
         assertEq(index3, 3);
+        assertEq(
+            keccak256(abi.encode(l2OutputOracle.getL2Output(index3))),
+            keccak256(abi.encode(output4, l2OutputOracle.computeL2Timestamp(nextBlockNumber4) + 1, nextBlockNumber4))
+        );
     }
 
     /// @dev Tests that `getL2OutputIndexAfter` reverts when no output exists.
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index 70b1c6d4ed94..f19e7ca6f5c2 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -598,7 +598,6 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         // Get withdrawal proof data we can use for testing.
         (_stateRoot, _storageRoot, _outputRoot, _withdrawalHash, _withdrawalProof) =
             ffi.getProveWithdrawalTransactionInputs(_defaultTx);
-
         // Setup a dummy output root proof for reuse.
         _outputRootProof = Types.OutputRootProof({
             version: bytes32(uint256(0)),
@@ -606,6 +605,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
             messagePasserStorageRoot: _storageRoot,
             latestBlockhash: bytes32(uint256(0))
         });
+
         _proposedBlockNumber = l2OutputOracle.nextBlockNumber();
         _proposedOutputIndex = l2OutputOracle.nextOutputIndex();
     }
@@ -934,7 +934,7 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         assertEq(bobBalanceBefore, address(bob).balance);
     }
 
-    /// @dev Tests that `finalizeWithdrawalTransaction` reverts if the target reverts.
+    /// @dev Tests that `finalizeWithdrawalTransaction` fails if the target reverts.
     function test_finalizeWithdrawalTransaction_targetFails_fails() external {
         uint256 bobBalanceBefore = address(bob).balance;
         vm.etch(bob, hex"fe"); // Contract with just the invalid opcode.
@@ -951,6 +951,77 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         assert(address(bob).balance == bobBalanceBefore);
     }
 
+    /// @dev Tests that `finalizeWithdrawalTransaction` reverts if the target reverts and caller is the
+    /// ESTIMATION_ADDRESS.
+    function test_finalizeWithdrawalTransaction_targetFailsAndCallerIsEstimationAddress_reverts() external {
+        vm.etch(bob, hex"fe"); // Contract with just the invalid opcode.
+
+        vm.expectEmit(true, true, true, true);
+        emit WithdrawalProven(_withdrawalHash, alice, bob);
+        optimismPortal.proveWithdrawalTransaction(_defaultTx, _proposedOutputIndex, _outputRootProof, _withdrawalProof);
+
+        vm.warp(block.timestamp + l2OutputOracle.FINALIZATION_PERIOD_SECONDS() + 1);
+
+        vm.startPrank(Constants.ESTIMATION_ADDRESS, Constants.ESTIMATION_ADDRESS);
+        vm.expectRevert(GasEstimation.selector);
+        optimismPortal.finalizeWithdrawalTransaction(_defaultTx);
+    }
+
+    /// @dev Tests that `finalizeWithdrawalTransaction` succeeds when _tx.data is empty.
+    function test_finalizeWithdrawalTransaction_noTxData_succeeds() external {
+        Types.WithdrawalTransaction memory _defaultTx_noData = Types.WithdrawalTransaction({
+            nonce: 0,
+            sender: alice,
+            target: bob,
+            value: 100,
+            gasLimit: 100_000,
+            data: hex""
+        });
+        // Get withdrawal proof data we can use for testing.
+        (
+            bytes32 _stateRoot_noData,
+            bytes32 _storageRoot_noData,
+            bytes32 _outputRoot_noData,
+            bytes32 _withdrawalHash_noData,
+            bytes[] memory _withdrawalProof_noData
+        ) = ffi.getProveWithdrawalTransactionInputs(_defaultTx_noData);
+        // Setup a dummy output root proof for reuse.
+        Types.OutputRootProof memory _outputRootProof_noData = Types.OutputRootProof({
+            version: bytes32(uint256(0)),
+            stateRoot: _stateRoot_noData,
+            messagePasserStorageRoot: _storageRoot_noData,
+            latestBlockhash: bytes32(uint256(0))
+        });
+
+        // Configure the oracle to return the output root we've prepared.
+        vm.mockCall(
+            address(l2OutputOracle),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
+            abi.encode(
+                Types.OutputProposal(
+                    _outputRoot_noData,
+                    l2OutputOracle.getL2Output(_proposedOutputIndex).timestamp,
+                    uint128(_proposedBlockNumber)
+                )
+            )
+        );
+
+        uint256 bobBalanceBefore = address(bob).balance;
+
+        vm.expectEmit(true, true, true, true);
+        emit WithdrawalProven(_withdrawalHash_noData, alice, bob);
+        optimismPortal.proveWithdrawalTransaction(
+            _defaultTx_noData, _proposedOutputIndex, _outputRootProof_noData, _withdrawalProof_noData
+        );
+
+        vm.warp(block.timestamp + l2OutputOracle.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.expectEmit(true, true, false, true);
+        emit WithdrawalFinalized(_withdrawalHash_noData, true);
+        optimismPortal.finalizeWithdrawalTransaction(_defaultTx_noData);
+
+        assertEq(address(bob).balance, bobBalanceBefore + 100);
+    }
+
     /// @dev Tests that `finalizeWithdrawalTransaction` reverts if the finalization period
     ///      has not yet passed.
     function test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() external {
diff --git a/packages/contracts-bedrock/test/setup/Events.sol b/packages/contracts-bedrock/test/setup/Events.sol
index 7f8017bfb2c1..966b236c30c8 100644
--- a/packages/contracts-bedrock/test/setup/Events.sol
+++ b/packages/contracts-bedrock/test/setup/Events.sol
@@ -104,4 +104,6 @@ contract Events {
     event Paused(string identifier);
 
     event Unpaused();
+
+    event BalanceChanged(address account, uint256 balance);
 }

From 3aac7289902b912a23241cb13b00ad920151611d Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Wed, 13 Nov 2024 14:04:54 +0700
Subject: [PATCH 172/451] op-chain-ops: state forking, Go script forking,
 cheatcode access-control (#11919)

* op-chain-ops: state forking, Go script forking, cheatcode access-control

* add forking unit tests

* goimports

* linter

* fix state dump

* Add script test, hammer out bugs

* semgrep ignore scripts

* op-chain-ops: script state dump test

* fix merge error

* goimports

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 .semgrepignore                                |   3 +
 op-chain-ops/script/addresses/addresses.go    |  20 +
 op-chain-ops/script/cheatcodes.go             |  37 ++
 op-chain-ops/script/cheatcodes_environment.go |   4 +
 op-chain-ops/script/cheatcodes_forking.go     | 169 ++++++++
 op-chain-ops/script/console_test.go           |   6 +-
 op-chain-ops/script/context.go                |  23 +-
 op-chain-ops/script/fork.go                   |  60 +++
 op-chain-ops/script/forking/cache.go          | 103 +++++
 op-chain-ops/script/forking/cache_test.go     | 196 +++++++++
 op-chain-ops/script/forking/db.go             | 117 ++++++
 op-chain-ops/script/forking/diff.go           |  88 ++++
 op-chain-ops/script/forking/forking_test.go   | 291 ++++++++++++++
 op-chain-ops/script/forking/iface.go          |  52 +++
 op-chain-ops/script/forking/reader.go         |  36 ++
 op-chain-ops/script/forking/rpc.go            | 140 +++++++
 op-chain-ops/script/forking/rpc_test.go       | 210 ++++++++++
 op-chain-ops/script/forking/state.go          | 377 ++++++++++++++++++
 op-chain-ops/script/forking/trie.go           | 223 +++++++++++
 op-chain-ops/script/forking/trie_test.go      | 209 ++++++++++
 op-chain-ops/script/prank.go                  |   4 +-
 op-chain-ops/script/precompile.go             |   7 +
 op-chain-ops/script/script.go                 |  97 +++--
 op-chain-ops/script/script_test.go            | 212 +++++++++-
 .../testdata/scripts/ScriptExample.s.sol      |  52 +++
 .../ScriptExample.s.sol/FooBar.json           |   2 +-
 .../ScriptExample.s.sol/ForkTester.json       |   1 +
 .../ScriptExample.s.sol/ForkedContract.json   |   1 +
 .../ScriptExample.s.sol/NonceGetter.json      |   1 +
 .../ScriptExample.s.sol/ScriptExample.json    |   2 +-
 .../ScriptExample.s.sol/Vm.json               |   2 +-
 .../ScriptExample.s.sol/console.json          |   2 +-
 op-chain-ops/script/with.go                   |   8 +-
 33 files changed, 2684 insertions(+), 71 deletions(-)
 create mode 100644 op-chain-ops/script/addresses/addresses.go
 create mode 100644 op-chain-ops/script/cheatcodes_forking.go
 create mode 100644 op-chain-ops/script/fork.go
 create mode 100644 op-chain-ops/script/forking/cache.go
 create mode 100644 op-chain-ops/script/forking/cache_test.go
 create mode 100644 op-chain-ops/script/forking/db.go
 create mode 100644 op-chain-ops/script/forking/diff.go
 create mode 100644 op-chain-ops/script/forking/forking_test.go
 create mode 100644 op-chain-ops/script/forking/iface.go
 create mode 100644 op-chain-ops/script/forking/reader.go
 create mode 100644 op-chain-ops/script/forking/rpc.go
 create mode 100644 op-chain-ops/script/forking/rpc_test.go
 create mode 100644 op-chain-ops/script/forking/state.go
 create mode 100644 op-chain-ops/script/forking/trie.go
 create mode 100644 op-chain-ops/script/forking/trie_test.go
 create mode 100644 op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkTester.json
 create mode 100644 op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkedContract.json
 create mode 100644 op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/NonceGetter.json

diff --git a/.semgrepignore b/.semgrepignore
index b5fcb0303882..6c3e11fae449 100644
--- a/.semgrepignore
+++ b/.semgrepignore
@@ -13,3 +13,6 @@ vendor/
 
 # Semgrep-action log folder
 .semgrep_logs/
+
+# Test contracts the scripts folder
+op-chain-ops/script/testdata/scripts/
\ No newline at end of file
diff --git a/op-chain-ops/script/addresses/addresses.go b/op-chain-ops/script/addresses/addresses.go
new file mode 100644
index 000000000000..76895e203e37
--- /dev/null
+++ b/op-chain-ops/script/addresses/addresses.go
@@ -0,0 +1,20 @@
+package addresses
+
+import "github.com/ethereum/go-ethereum/common"
+
+var (
+	// DefaultSenderAddr is known as DEFAULT_SENDER = address(uint160(uint256(keccak256("foundry default caller"))))
+	DefaultSenderAddr = common.HexToAddress("0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38")
+	// DefaultScriptAddr is the address of the initial executing script, computed from:
+	// cast compute-address --nonce 1 0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38
+	DefaultScriptAddr = common.HexToAddress("0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496")
+	// VMAddr is known as VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
+	VMAddr = common.HexToAddress("0x7109709ECfa91a80626fF3989D68f67F5b1DD12D")
+	// ConsoleAddr is known as CONSOLE, "console.log" in ascii.
+	// Utils like console.sol and console2.sol work by executing a staticcall to this address.
+	ConsoleAddr = common.HexToAddress("0x000000000000000000636F6e736F6c652e6c6f67")
+	// ScriptDeployer is used for temporary scripts address(uint160(uint256(keccak256("op-stack script deployer"))))
+	ScriptDeployer = common.HexToAddress("0x76Ce131128F3616871f8CDA86d18fAB44E4d0D8B")
+	// ForgeDeployer is used by some scripts as a default deployer address, e.g. makeAddr("deployer")
+	ForgeDeployer = common.HexToAddress("0xaE0bDc4eEAC5E950B67C6819B118761CaAF61946")
+)
diff --git a/op-chain-ops/script/cheatcodes.go b/op-chain-ops/script/cheatcodes.go
index 07755e527314..46e2bc4e314c 100644
--- a/op-chain-ops/script/cheatcodes.go
+++ b/op-chain-ops/script/cheatcodes.go
@@ -1,8 +1,45 @@
 package script
 
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/core/vm"
+)
+
 // CheatCodesPrecompile implements the Forge vm cheatcodes.
 // Note that forge-std wraps these cheatcodes,
 // and provides additional convenience functions that use these cheatcodes.
 type CheatCodesPrecompile struct {
 	h *Host
 }
+
+// AccessControlledPrecompile wraps a precompile,
+// and checks that the caller has cheatcode access.
+type AccessControlledPrecompile struct {
+	h     *Host
+	inner vm.PrecompiledContract
+}
+
+var _ vm.PrecompiledContract = (*AccessControlledPrecompile)(nil)
+
+func (c *AccessControlledPrecompile) RequiredGas(input []byte) uint64 {
+	// call-frame is not open yet, and prank is ignored for cheatcode access-checking.
+	accessor := c.h.SelfAddress()
+	_, ok := c.h.allowedCheatcodes[accessor]
+	if !ok {
+		// Don't just return infinite gas, we can allow it to run,
+		// and then revert with a proper error message.
+		return 0
+	}
+	return c.inner.RequiredGas(input)
+}
+
+func (c *AccessControlledPrecompile) Run(input []byte) ([]byte, error) {
+	// call-frame is not open yet, and prank is ignored for cheatcode access-checking.
+	accessor := c.h.SelfAddress()
+	if !c.h.AllowedCheatcodes(accessor) {
+		c.h.log.Error("Cheatcode access denied!", "caller", accessor, "label", c.h.labels[accessor])
+		return encodeRevert(fmt.Errorf("call by %s to cheatcode precompile is not allowed", accessor))
+	}
+	return c.inner.Run(input)
+}
diff --git a/op-chain-ops/script/cheatcodes_environment.go b/op-chain-ops/script/cheatcodes_environment.go
index 92baa429010e..55584c835db0 100644
--- a/op-chain-ops/script/cheatcodes_environment.go
+++ b/op-chain-ops/script/cheatcodes_environment.go
@@ -67,6 +67,10 @@ func (c *CheatCodesPrecompile) Load(account common.Address, slot [32]byte) [32]b
 // Etch implements https://book.getfoundry.sh/cheatcodes/etch
 func (c *CheatCodesPrecompile) Etch(who common.Address, code []byte) {
 	c.h.state.SetCode(who, bytes.Clone(code)) // important to clone; geth EVM will reuse the calldata memory.
+	if len(code) > 0 {
+		// if we're not just zeroing out the account: allow it to access cheatcodes
+		c.h.AllowCheatcodes(who)
+	}
 }
 
 // Deal implements https://book.getfoundry.sh/cheatcodes/deal
diff --git a/op-chain-ops/script/cheatcodes_forking.go b/op-chain-ops/script/cheatcodes_forking.go
new file mode 100644
index 000000000000..a1f30c7a11b9
--- /dev/null
+++ b/op-chain-ops/script/cheatcodes_forking.go
@@ -0,0 +1,169 @@
+package script
+
+import (
+	"errors"
+	"fmt"
+	"math/big"
+
+	"github.com/holiman/uint256"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
+)
+
+func (c *CheatCodesPrecompile) CreateFork_31ba3498(urlOrAlias string) (*big.Int, error) {
+	return c.createFork(ForkWithURLOrAlias(urlOrAlias))
+}
+
+func (c *CheatCodesPrecompile) CreateFork_6ba3ba2b(urlOrAlias string, block *big.Int) (*big.Int, error) {
+	return c.createFork(ForkWithURLOrAlias(urlOrAlias), ForkWithBlockNumberU256(block))
+}
+
+func (c *CheatCodesPrecompile) CreateFork_7ca29682(urlOrAlias string, txHash common.Hash) (*big.Int, error) {
+	return c.createFork(ForkWithURLOrAlias(urlOrAlias), ForkWithTransaction(txHash))
+}
+
+// createFork implements vm.createFork:
+// https://book.getfoundry.sh/cheatcodes/create-fork
+func (c *CheatCodesPrecompile) createFork(opts ...ForkOption) (*big.Int, error) {
+	src, err := c.h.onFork(opts...)
+	if err != nil {
+		return nil, fmt.Errorf("failed to setup fork source: %w", err)
+	}
+	id, err := c.h.state.CreateFork(src)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create fork: %w", err)
+	}
+	return id.U256().ToBig(), nil
+}
+
+func (c *CheatCodesPrecompile) CreateSelectFork_98680034(urlOrAlias string) (*big.Int, error) {
+	return c.createSelectFork(ForkWithURLOrAlias(urlOrAlias))
+}
+
+func (c *CheatCodesPrecompile) CreateSelectFork_71ee464d(urlOrAlias string, block *big.Int) (*big.Int, error) {
+	return c.createSelectFork(ForkWithURLOrAlias(urlOrAlias), ForkWithBlockNumberU256(block))
+}
+
+func (c *CheatCodesPrecompile) CreateSelectFork_84d52b7a(urlOrAlias string, txHash common.Hash) (*big.Int, error) {
+	return c.createSelectFork(ForkWithURLOrAlias(urlOrAlias), ForkWithTransaction(txHash))
+}
+
+// createSelectFork implements vm.createSelectFork:
+// https://book.getfoundry.sh/cheatcodes/create-select-fork
+func (c *CheatCodesPrecompile) createSelectFork(opts ...ForkOption) (*big.Int, error) {
+	src, err := c.h.onFork(opts...)
+	if err != nil {
+		return nil, fmt.Errorf("failed to setup fork source: %w", err)
+	}
+	id, err := c.h.state.CreateSelectFork(src)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create-select fork: %w", err)
+	}
+	return id.U256().ToBig(), nil
+}
+
+// ActiveFork implements vm.activeFork:
+// https://book.getfoundry.sh/cheatcodes/active-fork
+func (c *CheatCodesPrecompile) ActiveFork() (*uint256.Int, error) {
+	id, active := c.h.state.ActiveFork()
+	if !active {
+		return nil, errors.New("no active fork")
+	}
+	return id.U256(), nil
+}
+
+// convenience method, to repeat the same URLOrAlias as the given fork when setting up a new fork
+func (c *CheatCodesPrecompile) forkURLOption(id forking.ForkID) ForkOption {
+	return func(cfg *ForkConfig) error {
+		urlOrAlias, err := c.h.state.ForkURLOrAlias(id)
+		if err != nil {
+			return err
+		}
+		return ForkWithURLOrAlias(urlOrAlias)(cfg)
+	}
+}
+
+func (c *CheatCodesPrecompile) RollFork_d9bbf3a1(block *big.Int) error {
+	id, ok := c.h.state.ActiveFork()
+	if !ok {
+		return errors.New("no active fork")
+	}
+	return c.rollFork(id, c.forkURLOption(id), ForkWithBlockNumberU256(block))
+}
+
+func (c *CheatCodesPrecompile) RollFork_0f29772b(txHash common.Hash) error {
+	id, ok := c.h.state.ActiveFork()
+	if !ok {
+		return errors.New("no active fork")
+	}
+	return c.rollFork(id, c.forkURLOption(id), ForkWithTransaction(txHash))
+}
+
+func (c *CheatCodesPrecompile) RollFork_d74c83a4(forkID *big.Int, block *big.Int) error {
+	id := forking.ForkIDFromBig(forkID)
+	return c.rollFork(id, c.forkURLOption(id), ForkWithBlockNumberU256(block))
+}
+
+func (c *CheatCodesPrecompile) RollFork_f2830f7b(forkID *uint256.Int, txHash common.Hash) error {
+	id := forking.ForkID(*forkID)
+	return c.rollFork(id, c.forkURLOption(id), ForkWithTransaction(txHash))
+}
+
+// rollFork implements vm.rollFork:
+// https://book.getfoundry.sh/cheatcodes/roll-fork
+func (c *CheatCodesPrecompile) rollFork(id forking.ForkID, opts ...ForkOption) error {
+	src, err := c.h.onFork(opts...)
+	if err != nil {
+		return fmt.Errorf("cannot setup fork source for roll-fork change: %w", err)
+	}
+	return c.h.state.ResetFork(id, src)
+}
+
+// MakePersistent_57e22dde implements vm.makePersistent:
+// https://book.getfoundry.sh/cheatcodes/make-persistent
+func (c *CheatCodesPrecompile) MakePersistent_57e22dde(account0 common.Address) {
+	c.h.state.MakePersistent(account0)
+}
+
+func (c *CheatCodesPrecompile) MakePersistent_4074e0a8(account0, account1 common.Address) {
+	c.h.state.MakePersistent(account0)
+	c.h.state.MakePersistent(account1)
+}
+
+func (c *CheatCodesPrecompile) MakePersistent_efb77a75(account0, account1, account2 common.Address) {
+	c.h.state.MakePersistent(account0)
+	c.h.state.MakePersistent(account1)
+	c.h.state.MakePersistent(account2)
+}
+
+func (c *CheatCodesPrecompile) MakePersistent_1d9e269e(accounts []common.Address) {
+	for _, addr := range accounts {
+		c.h.state.MakePersistent(addr)
+	}
+}
+
+// RevokePersistent_997a0222 implements vm.revokePersistent:
+// https://book.getfoundry.sh/cheatcodes/revoke-persistent
+func (c *CheatCodesPrecompile) RevokePersistent_997a0222(addr common.Address) {
+	c.h.state.RevokePersistent(addr)
+}
+
+func (c *CheatCodesPrecompile) RevokePersistent_3ce969e6(addrs []common.Address) {
+	for _, addr := range addrs {
+		c.h.state.RevokePersistent(addr)
+	}
+}
+
+// IsPersistent implements vm.isPersistent:
+// https://book.getfoundry.sh/cheatcodes/is-persistent
+func (c *CheatCodesPrecompile) IsPersistent(addr common.Address) bool {
+	return c.h.state.IsPersistent(addr)
+}
+
+// AllowCheatcodes implements vm.allowCheatcodes:
+// https://book.getfoundry.sh/cheatcodes/allow-cheatcodes
+func (c *CheatCodesPrecompile) AllowCheatcodes(addr common.Address) {
+	c.h.AllowCheatcodes(addr)
+}
diff --git a/op-chain-ops/script/console_test.go b/op-chain-ops/script/console_test.go
index d67f5efc0f5f..70b78828b5d6 100644
--- a/op-chain-ops/script/console_test.go
+++ b/op-chain-ops/script/console_test.go
@@ -7,6 +7,8 @@ import (
 	"math/rand" // nosemgrep
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/log"
@@ -62,8 +64,8 @@ func TestFormatter(t *testing.T) {
 	require.Equal(t, "4.2", consoleFormat("%8e", big.NewInt(420000000)))
 	require.Equal(t, "foo true bar false", consoleFormat("foo %s bar %s", true, false))
 	require.Equal(t, "foo 1 bar 0", consoleFormat("foo %d bar %d", true, false))
-	require.Equal(t, "sender: "+DefaultSenderAddr.String(),
-		consoleFormat("sender: %s", DefaultSenderAddr))
+	require.Equal(t, "sender: "+addresses.DefaultSenderAddr.String(),
+		consoleFormat("sender: %s", addresses.DefaultSenderAddr))
 	require.Equal(t, "long 0.000000000000000042 number", consoleFormat("long %18e number", big.NewInt(42)))
 	require.Equal(t, "long 4200.000000000000000003 number", consoleFormat("long %18e number",
 		new(big.Int).Add(new(big.Int).Mul(
diff --git a/op-chain-ops/script/context.go b/op-chain-ops/script/context.go
index a6baad7cce66..fbb3704688e3 100644
--- a/op-chain-ops/script/context.go
+++ b/op-chain-ops/script/context.go
@@ -3,24 +3,9 @@ package script
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-)
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
 
-var (
-	// DefaultSenderAddr is known as DEFAULT_SENDER = address(uint160(uint256(keccak256("foundry default caller"))))
-	DefaultSenderAddr = common.HexToAddress("0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38")
-	// DefaultScriptAddr is the address of the initial executing script, computed from:
-	// cast compute-address --nonce 1 0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38
-	DefaultScriptAddr = common.HexToAddress("0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496")
-	// VMAddr is known as VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
-	VMAddr = common.HexToAddress("0x7109709ECfa91a80626fF3989D68f67F5b1DD12D")
-	// ConsoleAddr is known as CONSOLE, "console.log" in ascii.
-	// Utils like console.sol and console2.sol work by executing a staticcall to this address.
-	ConsoleAddr = common.HexToAddress("0x000000000000000000636F6e736F6c652e6c6f67")
-	// ScriptDeployer is used for temporary scripts address(uint160(uint256(keccak256("op-stack script deployer"))))
-	ScriptDeployer = common.HexToAddress("0x76Ce131128F3616871f8CDA86d18fAB44E4d0D8B")
-	// ForgeDeployer is used by some scripts as a default deployer address, e.g. makeAddr("deployer")
-	ForgeDeployer = common.HexToAddress("0xaE0bDc4eEAC5E950B67C6819B118761CaAF61946")
+	"github.com/ethereum/go-ethereum/common"
 )
 
 const (
@@ -42,8 +27,8 @@ type Context struct {
 
 var DefaultContext = Context{
 	ChainID:      big.NewInt(1337),
-	Sender:       DefaultSenderAddr,
-	Origin:       DefaultSenderAddr,
+	Sender:       addresses.DefaultSenderAddr,
+	Origin:       addresses.DefaultSenderAddr,
 	FeeRecipient: common.Address{},
 	GasLimit:     DefaultFoundryGasLimit,
 	BlockNum:     0,
diff --git a/op-chain-ops/script/fork.go b/op-chain-ops/script/fork.go
new file mode 100644
index 000000000000..8954a9984a35
--- /dev/null
+++ b/op-chain-ops/script/fork.go
@@ -0,0 +1,60 @@
+package script
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+// ForkOption modifies a ForkConfig, and can be used by Host internals,
+// like the forking cheatcodes, to customize the forking action.
+type ForkOption func(cfg *ForkConfig) error
+
+// ForkHook is a callback to the user of the Host,
+// to translate an intent to fork into a source of data that can be forked with.
+type ForkHook func(opts *ForkConfig) (forking.ForkSource, error)
+
+// ForkConfig is a bundle of data to express a fork intent
+type ForkConfig struct {
+	URLOrAlias  string
+	BlockNumber *uint64      // latest if nil
+	Transaction *common.Hash // up to pre-state of given transaction
+}
+
+func ForkWithURLOrAlias(urlOrAlias string) ForkOption {
+	return func(cfg *ForkConfig) error {
+		cfg.URLOrAlias = urlOrAlias
+		return nil
+	}
+}
+
+func ForkWithBlockNumberU256(num *big.Int) ForkOption {
+	return func(cfg *ForkConfig) error {
+		if !num.IsUint64() {
+			return fmt.Errorf("block number %s is too large", num.String())
+		}
+		v := num.Uint64()
+		cfg.BlockNumber = &v
+		return nil
+	}
+}
+
+func ForkWithTransaction(txHash common.Hash) ForkOption {
+	return func(cfg *ForkConfig) error {
+		cfg.Transaction = &txHash
+		return nil
+	}
+}
+
+// onFork is called by script-internals to translate a fork-intent into forks data-source.
+func (h *Host) onFork(opts ...ForkOption) (forking.ForkSource, error) {
+	cfg := &ForkConfig{}
+	for _, opt := range opts {
+		if err := opt(cfg); err != nil {
+			return nil, err
+		}
+	}
+	return h.hooks.OnFork(cfg)
+}
diff --git a/op-chain-ops/script/forking/cache.go b/op-chain-ops/script/forking/cache.go
new file mode 100644
index 000000000000..c9fec7bda96f
--- /dev/null
+++ b/op-chain-ops/script/forking/cache.go
@@ -0,0 +1,103 @@
+package forking
+
+import (
+	lru "github.com/hashicorp/golang-lru/v2"
+	"github.com/holiman/uint256"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type storageKey struct {
+	Addr common.Address
+	Slot common.Hash
+}
+
+// CachedSource wraps a ForkSource, and caches the retrieved data for faster repeat-queries.
+// The ForkSource should be immutable (as per the StateRoot value).
+// All cache data accumulates in-memory in LRU collections per data type.
+type CachedSource struct {
+	stateRoot common.Hash
+	src       ForkSource
+
+	nonces   *lru.Cache[common.Address, uint64]
+	balances *lru.Cache[common.Address, *uint256.Int]
+	storage  *lru.Cache[storageKey, common.Hash]
+	code     *lru.Cache[common.Address, []byte]
+}
+
+var _ ForkSource = (*CachedSource)(nil)
+
+func mustNewLRU[K comparable, V any](size int) *lru.Cache[K, V] {
+	out, err := lru.New[K, V](size)
+	if err != nil {
+		panic(err) // bad size parameter may produce an error
+	}
+	return out
+}
+
+func Cache(src ForkSource) *CachedSource {
+	return &CachedSource{
+		stateRoot: src.StateRoot(),
+		src:       src,
+		nonces:    mustNewLRU[common.Address, uint64](1000),
+		balances:  mustNewLRU[common.Address, *uint256.Int](1000),
+		storage:   mustNewLRU[storageKey, common.Hash](1000),
+		code:      mustNewLRU[common.Address, []byte](100),
+	}
+}
+
+func (c *CachedSource) URLOrAlias() string {
+	return c.src.URLOrAlias()
+}
+
+func (c *CachedSource) StateRoot() common.Hash {
+	return c.stateRoot
+}
+
+func (c *CachedSource) Nonce(addr common.Address) (uint64, error) {
+	if v, ok := c.nonces.Get(addr); ok {
+		return v, nil
+	}
+	v, err := c.src.Nonce(addr)
+	if err != nil {
+		return 0, err
+	}
+	c.nonces.Add(addr, v)
+	return v, nil
+}
+
+func (c *CachedSource) Balance(addr common.Address) (*uint256.Int, error) {
+	if v, ok := c.balances.Get(addr); ok {
+		return v.Clone(), nil
+	}
+	v, err := c.src.Balance(addr)
+	if err != nil {
+		return nil, err
+	}
+	c.balances.Add(addr, v)
+	return v.Clone(), nil
+}
+
+func (c *CachedSource) StorageAt(addr common.Address, key common.Hash) (common.Hash, error) {
+	if v, ok := c.storage.Get(storageKey{Addr: addr, Slot: key}); ok {
+		return v, nil
+	}
+	v, err := c.src.StorageAt(addr, key)
+	if err != nil {
+		return common.Hash{}, err
+	}
+	c.storage.Add(storageKey{Addr: addr, Slot: key}, v)
+	return v, nil
+}
+
+func (c *CachedSource) Code(addr common.Address) ([]byte, error) {
+	if v, ok := c.code.Get(addr); ok {
+		return v, nil
+	}
+	v, err := c.src.Code(addr)
+	if err != nil {
+		return nil, err
+	}
+	c.code.Add(addr, v)
+	return v, nil
+}
diff --git a/op-chain-ops/script/forking/cache_test.go b/op-chain-ops/script/forking/cache_test.go
new file mode 100644
index 000000000000..7ed4f9745042
--- /dev/null
+++ b/op-chain-ops/script/forking/cache_test.go
@@ -0,0 +1,196 @@
+package forking
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/holiman/uint256"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+// MockForkSource implements ForkSource interface for testing
+type MockForkSource struct {
+	mock.Mock
+}
+
+func (m *MockForkSource) URLOrAlias() string {
+	args := m.Called()
+	return args.String(0)
+}
+
+func (m *MockForkSource) StateRoot() common.Hash {
+	args := m.Called()
+	return args.Get(0).(common.Hash)
+}
+
+func (m *MockForkSource) Nonce(addr common.Address) (uint64, error) {
+	args := m.Called(addr)
+	return args.Get(0).(uint64), args.Error(1)
+}
+
+func (m *MockForkSource) Balance(addr common.Address) (*uint256.Int, error) {
+	args := m.Called(addr)
+	if args.Get(0) == nil {
+		return nil, args.Error(1)
+	}
+	return args.Get(0).(*uint256.Int), args.Error(1)
+}
+
+func (m *MockForkSource) StorageAt(addr common.Address, key common.Hash) (common.Hash, error) {
+	args := m.Called(addr, key)
+	return args.Get(0).(common.Hash), args.Error(1)
+}
+
+func (m *MockForkSource) Code(addr common.Address) ([]byte, error) {
+	args := m.Called(addr)
+	return args.Get(0).([]byte), args.Error(1)
+}
+
+func setupCache(t *testing.T) (*CachedSource, *MockForkSource) {
+	mockSource := new(MockForkSource)
+	stateRoot := common.HexToHash("0x1234")
+	mockSource.On("StateRoot").Return(stateRoot)
+	mockSource.On("URLOrAlias").Return("test_source")
+
+	cached := Cache(mockSource)
+	require.NotNil(t, cached)
+	require.Equal(t, stateRoot, cached.StateRoot())
+	require.Equal(t, "test_source", cached.URLOrAlias())
+
+	return cached, mockSource
+}
+
+func TestCachedSource_Nonce(t *testing.T) {
+	cached, mockSource := setupCache(t)
+	addr := common.HexToAddress("0x1234")
+	expectedNonce := uint64(42)
+
+	// First call should hit the source
+	mockSource.On("Nonce", addr).Return(expectedNonce, nil).Once()
+
+	nonce, err := cached.Nonce(addr)
+	require.NoError(t, err)
+	require.Equal(t, expectedNonce, nonce)
+
+	// Second call should use cache
+	nonce, err = cached.Nonce(addr)
+	require.NoError(t, err)
+	require.Equal(t, expectedNonce, nonce)
+
+	mockSource.AssertNumberOfCalls(t, "Nonce", 1)
+}
+
+func TestCachedSource_Balance(t *testing.T) {
+	cached, mockSource := setupCache(t)
+	addr := common.HexToAddress("0x5678")
+	expectedBalance := uint256.NewInt(1000)
+
+	// First call should hit the source
+	mockSource.On("Balance", addr).Return(expectedBalance, nil).Once()
+
+	balance, err := cached.Balance(addr)
+	require.NoError(t, err)
+	require.Equal(t, expectedBalance, balance)
+
+	// Second call should use cache
+	balance, err = cached.Balance(addr)
+	require.NoError(t, err)
+	require.Equal(t, expectedBalance, balance)
+
+	// Verify the returned balance is a clone
+	balance.Add(balance, uint256.NewInt(1))
+	cachedBalance, _ := cached.Balance(addr)
+	require.Equal(t, expectedBalance, cachedBalance)
+
+	mockSource.AssertNumberOfCalls(t, "Balance", 1)
+}
+
+func TestCachedSource_Storage(t *testing.T) {
+	cached, mockSource := setupCache(t)
+	addr := common.HexToAddress("0x9abc")
+	slot := common.HexToHash("0xdef0")
+	expectedValue := common.HexToHash("0x1234")
+
+	// First call should hit the source
+	mockSource.On("StorageAt", addr, slot).Return(expectedValue, nil).Once()
+
+	value, err := cached.StorageAt(addr, slot)
+	require.NoError(t, err)
+	require.Equal(t, expectedValue, value)
+
+	// Second call should use cache
+	value, err = cached.StorageAt(addr, slot)
+	require.NoError(t, err)
+	require.Equal(t, expectedValue, value)
+
+	mockSource.AssertNumberOfCalls(t, "StorageAt", 1)
+}
+
+func TestCachedSource_Code(t *testing.T) {
+	cached, mockSource := setupCache(t)
+	addr := common.HexToAddress("0xdef0")
+	expectedCode := []byte{1, 2, 3, 4}
+
+	// First call should hit the source
+	mockSource.On("Code", addr).Return(expectedCode, nil).Once()
+
+	code, err := cached.Code(addr)
+	require.NoError(t, err)
+	require.Equal(t, expectedCode, code)
+
+	// Second call should use cache
+	code, err = cached.Code(addr)
+	require.NoError(t, err)
+	require.Equal(t, expectedCode, code)
+
+	mockSource.AssertNumberOfCalls(t, "Code", 1)
+}
+
+func TestCachedSource_CacheEviction(t *testing.T) {
+	cached, mockSource := setupCache(t)
+
+	// Test nonce cache eviction
+	for i := 0; i < 1001; i++ { // Cache size is 1000
+		addr := common.BigToAddress(big.NewInt(int64(i)))
+		mockSource.On("Nonce", addr).Return(uint64(i), nil).Once()
+		_, _ = cached.Nonce(addr)
+	}
+
+	// This should cause first address to be evicted
+	firstAddr := common.BytesToAddress([]byte{0})
+	mockSource.On("Nonce", firstAddr).Return(uint64(0), nil).Once()
+	_, _ = cached.Nonce(firstAddr)
+
+	mockSource.AssertNumberOfCalls(t, "Nonce", 1002) // 1001 + 1 for evicted key
+}
+
+func TestCachedSource_MultipleStorageSlots(t *testing.T) {
+	cached, mockSource := setupCache(t)
+	addr := common.HexToAddress("0xabcd")
+	slot1 := common.HexToHash("0x1111")
+	slot2 := common.HexToHash("0x2222")
+	value1 := common.HexToHash("0x3333")
+	value2 := common.HexToHash("0x4444")
+
+	mockSource.On("StorageAt", addr, slot1).Return(value1, nil).Once()
+	mockSource.On("StorageAt", addr, slot2).Return(value2, nil).Once()
+
+	// Different slots should trigger separate cache entries
+	val1, err := cached.StorageAt(addr, slot1)
+	require.NoError(t, err)
+	require.Equal(t, value1, val1)
+
+	val2, err := cached.StorageAt(addr, slot2)
+	require.NoError(t, err)
+	require.Equal(t, value2, val2)
+
+	// Verify both are cached
+	val1Again, _ := cached.StorageAt(addr, slot1)
+	val2Again, _ := cached.StorageAt(addr, slot2)
+	require.Equal(t, value1, val1Again)
+	require.Equal(t, value2, val2Again)
+
+	mockSource.AssertNumberOfCalls(t, "StorageAt", 2)
+}
diff --git a/op-chain-ops/script/forking/db.go b/op-chain-ops/script/forking/db.go
new file mode 100644
index 000000000000..6a40b4310d95
--- /dev/null
+++ b/op-chain-ops/script/forking/db.go
@@ -0,0 +1,117 @@
+package forking
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/triedb/pathdb"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/state/snapshot"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie/utils"
+	"github.com/ethereum/go-ethereum/triedb"
+)
+
+// ForkDB is a virtual state database: it wraps a forked accounts trie,
+// and can maintain a state diff, so we can mutate the forked state,
+// and even finalize state changes (so we can accurately measure things like cold storage gas cost).
+type ForkDB struct {
+	active *ForkedAccountsTrie
+}
+
+// Reader for read-only access to a known state. All cold reads go through this.
+// So the state-DB creates one initially, and then holds on to it.
+// The diff will be overlayed on the reader still. To get rid of the diff, it has to be explicitly cleared.
+// Warning: diffs applied to the original state that the reader wraps will be visible.
+// Geth StateDB is meant to be reinitialized after committing state.
+func (f *ForkDB) Reader(root common.Hash) (state.Reader, error) {
+	if root != f.active.stateRoot {
+		return nil, fmt.Errorf("current state is at %s, cannot open state at %s", f.active.stateRoot, root)
+	}
+	return &forkStateReader{
+		f.active,
+	}, nil
+}
+
+func (f *ForkDB) Snapshot() *snapshot.Tree {
+	return nil
+}
+
+var _ state.Database = (*ForkDB)(nil)
+
+func NewForkDB(source ForkSource) *ForkDB {
+	return &ForkDB{active: &ForkedAccountsTrie{
+		stateRoot: source.StateRoot(),
+		src:       source,
+		diff:      NewExportDiff(),
+	}}
+}
+
+// fakeRoot is just a marker; every account we load into the fork-db has this storage-root.
+// When opening a storage-trie, we sanity-check we have this root, or an empty trie.
+// And then just return the same global trie view for storage reads/writes.
+var fakeRoot = common.Hash{0: 42}
+
+func (f *ForkDB) OpenTrie(root common.Hash) (state.Trie, error) {
+	if f.active.stateRoot != root {
+		return nil, fmt.Errorf("active fork is at %s, but tried to open %s", f.active.stateRoot, root)
+	}
+	return f.active, nil
+}
+
+func (f *ForkDB) OpenStorageTrie(stateRoot common.Hash, address common.Address, root common.Hash, trie state.Trie) (state.Trie, error) {
+	if f.active.stateRoot != stateRoot {
+		return nil, fmt.Errorf("active fork is at %s, but tried to open account %s of state %s", f.active.stateRoot, address, stateRoot)
+	}
+	if _, ok := trie.(*ForkedAccountsTrie); !ok {
+		return nil, fmt.Errorf("ForkDB tried to open non-fork storage-trie %v", trie)
+	}
+	if root != fakeRoot && root != types.EmptyRootHash {
+		return nil, fmt.Errorf("ForkDB unexpectedly was queried with real looking storage root: %s", root)
+	}
+	return f.active, nil
+}
+
+func (f *ForkDB) CopyTrie(trie state.Trie) state.Trie {
+	if st, ok := trie.(*ForkedAccountsTrie); ok {
+		return st.Copy()
+	}
+	panic(fmt.Errorf("ForkDB tried to copy non-fork trie %v", trie))
+}
+
+func (f *ForkDB) ContractCode(addr common.Address, codeHash common.Hash) ([]byte, error) {
+	return f.active.ContractCode(addr, codeHash)
+}
+
+func (f *ForkDB) ContractCodeSize(addr common.Address, codeHash common.Hash) (int, error) {
+	return f.active.ContractCodeSize(addr, codeHash)
+}
+
+func (f *ForkDB) DiskDB() ethdb.KeyValueStore {
+	panic("DiskDB() during active Fork is not supported")
+}
+
+func (f *ForkDB) PointCache() *utils.PointCache {
+	panic("PointCache() is not supported")
+}
+
+func (f *ForkDB) TrieDB() *triedb.Database {
+	// The TrieDB is unused, but geth does use to check if Verkle is activated.
+	// So we have to create a read-only dummy one, to communicate that verkle really is disabled.
+	diskDB := rawdb.NewMemoryDatabase()
+	tdb := triedb.NewDatabase(diskDB, &triedb.Config{
+		Preimages: false,
+		IsVerkle:  false,
+		HashDB:    nil,
+		PathDB: &pathdb.Config{
+			StateHistory:   0,
+			CleanCacheSize: 0,
+			DirtyCacheSize: 0,
+			ReadOnly:       true,
+		},
+	})
+	return tdb
+}
diff --git a/op-chain-ops/script/forking/diff.go b/op-chain-ops/script/forking/diff.go
new file mode 100644
index 000000000000..c46b2704dc85
--- /dev/null
+++ b/op-chain-ops/script/forking/diff.go
@@ -0,0 +1,88 @@
+package forking
+
+import (
+	"bytes"
+	"maps"
+
+	"github.com/holiman/uint256"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+// AccountDiff represents changes to an account. Unchanged values of the account are not included.
+type AccountDiff struct {
+	// Nonce change.
+	// No diff if nil.
+	Nonce *uint64 `json:"nonce"`
+
+	// Balance change.
+	// No diff if nil.
+	Balance *uint256.Int `json:"balance"`
+
+	// Storage changes.
+	// No diff if not present in map. Deletions are zero-value entries.
+	Storage map[common.Hash]common.Hash `json:"storage"`
+
+	// CodeHash, for lookup of contract bytecode in the code diff map.
+	// No code-diff if nil.
+	CodeHash *common.Hash `json:"codeHash"`
+}
+
+func (d *AccountDiff) Copy() *AccountDiff {
+	var out AccountDiff
+	if d.Nonce != nil {
+		v := *d.Nonce // copy the value
+		out.Nonce = &v
+	}
+	if d.Balance != nil {
+		out.Balance = d.Balance.Clone()
+	}
+	if d.Storage != nil {
+		out.Storage = maps.Clone(d.Storage)
+	}
+	if d.CodeHash != nil {
+		h := *d.CodeHash
+		out.CodeHash = &h
+	}
+	return &out
+}
+
+type ExportDiff struct {
+	// Accounts diff. Deleted accounts are set to nil.
+	// Warning: this only contains finalized state changes.
+	// The state itself holds on to non-flushed changes.
+	Account map[common.Address]*AccountDiff `json:"account"`
+
+	// Stores new contract codes by code-hash
+	Code map[common.Hash][]byte `json:"code"`
+}
+
+func NewExportDiff() *ExportDiff {
+	return &ExportDiff{
+		Account: make(map[common.Address]*AccountDiff),
+		Code:    make(map[common.Hash][]byte),
+	}
+}
+
+func (ed *ExportDiff) Copy() *ExportDiff {
+	out := &ExportDiff{
+		Account: make(map[common.Address]*AccountDiff),
+		Code:    make(map[common.Hash][]byte),
+	}
+	for addr, acc := range ed.Account {
+		out.Account[addr] = acc.Copy()
+	}
+	for addr, code := range ed.Code {
+		out.Code[addr] = bytes.Clone(code)
+	}
+	return out
+}
+
+func (ed *ExportDiff) Any() bool {
+	return len(ed.Code) > 0 || len(ed.Account) > 0
+}
+
+func (ed *ExportDiff) Clear() {
+	ed.Account = make(map[common.Address]*AccountDiff)
+	ed.Code = make(map[common.Hash][]byte)
+}
diff --git a/op-chain-ops/script/forking/forking_test.go b/op-chain-ops/script/forking/forking_test.go
new file mode 100644
index 000000000000..e6e62c19fc19
--- /dev/null
+++ b/op-chain-ops/script/forking/forking_test.go
@@ -0,0 +1,291 @@
+package forking
+
+import (
+	"bytes"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/holiman/uint256"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/tracing"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/triedb"
+	"github.com/ethereum/go-ethereum/triedb/hashdb"
+)
+
+type TestForkSource struct {
+	urlOrAlias string
+	stateRoot  common.Hash
+	nonces     map[common.Address]uint64
+	balances   map[common.Address]*uint256.Int
+	storage    map[common.Address]map[common.Hash]common.Hash
+	code       map[common.Address][]byte
+}
+
+func (t TestForkSource) URLOrAlias() string {
+	return t.urlOrAlias
+}
+
+func (t TestForkSource) StateRoot() common.Hash {
+	return t.stateRoot
+}
+
+func (t TestForkSource) Nonce(addr common.Address) (uint64, error) {
+	return t.nonces[addr], nil
+}
+
+func (t TestForkSource) Balance(addr common.Address) (*uint256.Int, error) {
+	b, ok := t.balances[addr]
+	if !ok {
+		return uint256.NewInt(0), nil
+	}
+	return b.Clone(), nil
+}
+
+func (t TestForkSource) StorageAt(addr common.Address, key common.Hash) (common.Hash, error) {
+	storage, ok := t.storage[addr]
+	if !ok {
+		return common.Hash{}, nil
+	}
+	return storage[key], nil
+}
+
+func (t TestForkSource) Code(addr common.Address) ([]byte, error) {
+	return t.code[addr], nil
+}
+
+var _ ForkSource = (*TestForkSource)(nil)
+
+func TestForking(t *testing.T) {
+	// create regular DB
+	rawDB := rawdb.NewMemoryDatabase()
+	stateDB := state.NewDatabase(triedb.NewDatabase(rawDB, &triedb.Config{
+		Preimages: true, // To be able to iterate the state we need the Preimages
+		IsVerkle:  false,
+		HashDB:    hashdb.Defaults,
+		PathDB:    nil,
+	}), nil)
+	baseState, err := state.New(types.EmptyRootHash, stateDB)
+	if err != nil {
+		panic(fmt.Errorf("failed to create memory state db: %w", err))
+	}
+	forkState := NewForkableState(baseState)
+
+	// No active fork yet
+	id, active := forkState.ActiveFork()
+	require.False(t, active)
+	require.Equal(t, ForkID{}, id)
+
+	name, err := forkState.ForkURLOrAlias(ForkID{})
+	require.ErrorContains(t, err, "default")
+	require.Equal(t, "", name)
+
+	alice := common.Address(bytes.Repeat([]byte{0xaa}, 20))
+	bob := common.Address(bytes.Repeat([]byte{0xbb}, 20))
+
+	forkState.CreateAccount(alice)
+	forkState.SetNonce(alice, 3)
+	forkState.AddBalance(alice, uint256.NewInt(123), tracing.BalanceChangeUnspecified)
+	// Check if writes worked
+	require.Equal(t, uint64(123), forkState.GetBalance(alice).Uint64())
+	require.Equal(t, uint64(3), forkState.GetNonce(alice))
+	// No active fork yet, balance change should be applied to underlying base-state
+	require.Equal(t, uint64(123), baseState.GetBalance(alice).Uint64())
+	require.Equal(t, uint64(3), baseState.GetNonce(alice))
+
+	src1 := &TestForkSource{
+		urlOrAlias: "src 1",
+		stateRoot:  crypto.Keccak256Hash([]byte("test fork state 1")),
+		nonces: map[common.Address]uint64{
+			alice: uint64(42),
+			bob:   uint64(1000),
+		},
+		balances: make(map[common.Address]*uint256.Int),
+		storage:  make(map[common.Address]map[common.Hash]common.Hash),
+		code:     make(map[common.Address][]byte),
+	}
+	forkA, err := forkState.CreateSelectFork(src1)
+	require.NoError(t, err)
+	// Check that we selected A
+	id, active = forkState.ActiveFork()
+	require.True(t, active)
+	require.Equal(t, forkA, id)
+	name, err = forkState.ForkURLOrAlias(forkA)
+	require.NoError(t, err)
+	require.Equal(t, "src 1", name)
+
+	// the fork has a different nonce for alice
+	require.Equal(t, uint64(42), forkState.GetNonce(alice))
+	// the fork has Bob, which didn't exist thus far
+	require.Equal(t, uint64(1000), forkState.GetNonce(bob))
+
+	// Apply a diff change on top of the fork
+	forkState.SetNonce(bob, 99999)
+
+	// Now unselect the fork, going back to the default again.
+	require.NoError(t, forkState.SelectFork(ForkID{}))
+	// No longer active fork
+	id, active = forkState.ActiveFork()
+	require.False(t, active)
+	require.Equal(t, ForkID{}, id)
+
+	// Check that things are back to normal
+	require.Equal(t, uint64(3), forkState.GetNonce(alice))
+	require.Equal(t, uint64(0), forkState.GetNonce(bob))
+
+	// Make a change to the base-state, to see if it survives going back to the fork.
+	forkState.SetNonce(bob, 5)
+
+	// Re-select the fork, see if the changes come back, including the diff we made
+	require.NoError(t, forkState.SelectFork(forkA))
+	require.Equal(t, uint64(42), forkState.GetNonce(alice))
+	require.Equal(t, uint64(99999), forkState.GetNonce(bob))
+
+	// This change will continue to be visible across forks,
+	// alice is going to be persistent.
+	forkState.SetNonce(alice, 777)
+
+	// Now make Alice persistent, see if we can get the original value
+	forkState.MakePersistent(alice)
+
+	// Activate a fork, to see if alice is really persistent
+	src2 := &TestForkSource{
+		urlOrAlias: "src 2",
+		stateRoot:  crypto.Keccak256Hash([]byte("test fork state 2")),
+		nonces: map[common.Address]uint64{
+			alice: uint64(2222),
+			bob:   uint64(222),
+		},
+		balances: make(map[common.Address]*uint256.Int),
+		storage:  make(map[common.Address]map[common.Hash]common.Hash),
+		code:     make(map[common.Address][]byte),
+	}
+	tmpFork, err := forkState.CreateSelectFork(src2)
+	require.NoError(t, err)
+	require.Equal(t, uint64(777), forkState.GetNonce(alice), "persistent original value")
+	// While bob is still read from the fork
+	require.Equal(t, uint64(222), forkState.GetNonce(bob), "bob is forked")
+
+	// Mutate both, and undo the fork, to test if the persistent change is still there in non-fork mode
+	forkState.SetNonce(alice, 1001) // this mutates forkA, because alice was made persistent there
+	forkState.SetNonce(bob, 1002)
+	require.NoError(t, forkState.SelectFork(ForkID{}))
+	require.Equal(t, uint64(1001), forkState.GetNonce(alice), "alice is persistent")
+	require.Equal(t, uint64(5), forkState.GetNonce(bob), "bob is not persistent")
+
+	// Stop alice persistence. Forks can now override it again.
+	forkState.RevokePersistent(alice)
+	// This foundry behavior is unspecified/undocumented.
+	// Not sure if correctly doing it by dropping the previously persisted state if it comes from another fork.
+	require.Equal(t, uint64(3), forkState.GetNonce(alice))
+	require.Equal(t, uint64(3), baseState.GetNonce(alice))
+	require.Equal(t, uint64(5), forkState.GetNonce(bob))
+
+	// Create another fork, don't select it immediately
+	src3 := &TestForkSource{
+		urlOrAlias: "src 3",
+		stateRoot:  crypto.Keccak256Hash([]byte("test fork state 3")),
+		nonces: map[common.Address]uint64{
+			alice: uint64(3333),
+		},
+		balances: make(map[common.Address]*uint256.Int),
+		storage:  make(map[common.Address]map[common.Hash]common.Hash),
+		code:     make(map[common.Address][]byte),
+	}
+	forkB, err := forkState.CreateFork(src3)
+	require.NoError(t, err)
+
+	id, active = forkState.ActiveFork()
+	require.False(t, active)
+	require.Equal(t, ForkID{}, id)
+
+	// forkA is still bound to src 1
+	name, err = forkState.ForkURLOrAlias(forkA)
+	require.NoError(t, err)
+	require.Equal(t, "src 1", name)
+	// tmpFork is still bound to src 2
+	name, err = forkState.ForkURLOrAlias(tmpFork)
+	require.NoError(t, err)
+	require.Equal(t, "src 2", name)
+	// forkB is on src 3
+	name, err = forkState.ForkURLOrAlias(forkB)
+	require.NoError(t, err)
+	require.Equal(t, "src 3", name)
+
+	require.Equal(t, uint64(3), forkState.GetNonce(alice), "not forked yet")
+	require.NoError(t, forkState.SelectFork(forkB))
+	id, active = forkState.ActiveFork()
+	require.True(t, active)
+	require.Equal(t, forkB, id)
+
+	// check if successfully forked now
+	require.Equal(t, uint64(3333), forkState.GetNonce(alice), "fork B active now")
+	// Bob is not in this fork. But that doesn't mean the base-state should be used.
+	require.Equal(t, uint64(0), forkState.GetNonce(bob))
+
+	// See if we can go from B straight to A
+	require.NoError(t, forkState.SelectFork(forkA))
+	require.Equal(t, uint64(1001), forkState.GetNonce(alice), "alice from A says hi")
+	// And back to B
+	require.NoError(t, forkState.SelectFork(forkB))
+	require.Equal(t, uint64(3333), forkState.GetNonce(alice), "alice from B says hi")
+
+	// And a fork on top of a fork; forks don't stack, they are their own individual contexts.
+	src4 := &TestForkSource{
+		urlOrAlias: "src 4",
+		stateRoot:  crypto.Keccak256Hash([]byte("test fork state 4")),
+		nonces: map[common.Address]uint64{
+			bob: uint64(9000),
+		},
+		balances: make(map[common.Address]*uint256.Int),
+		storage:  make(map[common.Address]map[common.Hash]common.Hash),
+		code:     make(map[common.Address][]byte),
+	}
+	forkC, err := forkState.CreateSelectFork(src4)
+	require.NoError(t, err)
+	// No alice in this fork.
+	require.Equal(t, uint64(0), forkState.GetNonce(alice))
+	// But bob is set
+	require.Equal(t, uint64(9000), forkState.GetNonce(bob))
+
+	// Put in some mutations, for the fork-diff testing
+	forkState.SetNonce(alice, 1234)
+	forkState.SetBalance(alice, uint256.NewInt(100_000), tracing.BalanceChangeUnspecified)
+	forkState.SetState(alice, common.Hash{4}, common.Hash{42})
+	forkState.SetState(alice, common.Hash{5}, common.Hash{100})
+	forkState.SetCode(alice, []byte("hello world"))
+
+	// Check the name
+	name, err = forkState.ForkURLOrAlias(forkC)
+	require.NoError(t, err)
+	require.Equal(t, "src 4", name)
+
+	// Now test our fork-diff exporting:
+	// it needs to reflect the changes we made to the fork, but not other fork contents.
+	forkADiff, err := forkState.ExportDiff(forkA)
+	require.NoError(t, err)
+	require.NotNil(t, forkADiff.Account[alice])
+	require.Equal(t, uint64(1001), *forkADiff.Account[alice].Nonce)
+	require.Equal(t, uint64(99999), *forkADiff.Account[bob].Nonce)
+
+	forkBDiff, err := forkState.ExportDiff(forkB)
+	require.NoError(t, err)
+	require.Len(t, forkBDiff.Account, 0, "no changes to fork B")
+
+	forkCDiff, err := forkState.ExportDiff(forkC)
+	require.NoError(t, err)
+	require.Contains(t, forkCDiff.Account, alice)
+	require.NotContains(t, forkCDiff.Account, bob)
+	require.Equal(t, uint64(1234), *forkCDiff.Account[alice].Nonce)
+	require.Equal(t, uint64(100_000), forkCDiff.Account[alice].Balance.Uint64())
+	require.Equal(t, common.Hash{42}, forkCDiff.Account[alice].Storage[common.Hash{4}])
+	require.Equal(t, common.Hash{100}, forkCDiff.Account[alice].Storage[common.Hash{5}])
+	require.Equal(t, crypto.Keccak256Hash([]byte("hello world")), *forkCDiff.Account[alice].CodeHash)
+	require.Equal(t, []byte("hello world"), forkCDiff.Code[*forkCDiff.Account[alice].CodeHash])
+}
diff --git a/op-chain-ops/script/forking/iface.go b/op-chain-ops/script/forking/iface.go
new file mode 100644
index 000000000000..2e1c29031be1
--- /dev/null
+++ b/op-chain-ops/script/forking/iface.go
@@ -0,0 +1,52 @@
+package forking
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/core/tracing"
+	"github.com/holiman/uint256"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/vm"
+)
+
+type VMStateDB interface {
+	vm.StateDB
+	Finalise(deleteEmptyObjects bool)
+	// SetBalance sets the balance of an account. Not part of the geth VM StateDB interface (add/sub balance are).
+	SetBalance(addr common.Address, amount *uint256.Int, reason tracing.BalanceChangeReason)
+}
+
+// ForkID is an identifier of a fork
+type ForkID uint256.Int
+
+func ForkIDFromBig(b *big.Int) ForkID {
+	return ForkID(*uint256.MustFromBig(b))
+}
+
+// U256 returns a uint256 copy of the fork ID, for usage inside the EVM.
+func (id *ForkID) U256() *uint256.Int {
+	return new(uint256.Int).Set((*uint256.Int)(id))
+}
+
+func (id ForkID) String() string {
+	return (*uint256.Int)(&id).String()
+}
+
+// ForkSource is a read-only source for ethereum state,
+// that can be used to fork a ForkableState.
+type ForkSource interface {
+	// URLOrAlias returns the URL or alias that the fork uses. This is not unique to a single fork.
+	URLOrAlias() string
+	// StateRoot returns the accounts-trie root of the committed-to state.
+	// This root must never change.
+	StateRoot() common.Hash
+	// Nonce returns 0, without error, if the account does not exist.
+	Nonce(addr common.Address) (uint64, error)
+	// Balance returns 0, without error, if the account does not exist.
+	Balance(addr common.Address) (*uint256.Int, error)
+	// StorageAt returns a zeroed hash, without error, if the storage does not exist.
+	StorageAt(addr common.Address, key common.Hash) (common.Hash, error)
+	// Code returns an empty byte slice, without error, if no code exists.
+	Code(addr common.Address) ([]byte, error)
+}
diff --git a/op-chain-ops/script/forking/reader.go b/op-chain-ops/script/forking/reader.go
new file mode 100644
index 000000000000..d943ddf14449
--- /dev/null
+++ b/op-chain-ops/script/forking/reader.go
@@ -0,0 +1,36 @@
+package forking
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/types"
+)
+
+// forkStateReader implements the state.Reader abstraction,
+// for read-only access to a state-trie at a particular state-root.
+type forkStateReader struct {
+	trie *ForkedAccountsTrie
+}
+
+var _ state.Reader = (*forkStateReader)(nil)
+
+func (f *forkStateReader) Account(addr common.Address) (*types.StateAccount, error) {
+	acc, err := f.trie.GetAccount(addr)
+	if err != nil {
+		return nil, err
+	}
+	// We copy because the Reader interface defines that it should be safe to modify after returning.
+	return acc.Copy(), nil
+}
+
+func (f *forkStateReader) Storage(addr common.Address, slot common.Hash) (common.Hash, error) {
+	v, err := f.trie.GetStorage(addr, slot[:])
+	if err != nil {
+		return common.Hash{}, err
+	}
+	return common.Hash(v), nil
+}
+
+func (f *forkStateReader) Copy() state.Reader {
+	return f
+}
diff --git a/op-chain-ops/script/forking/rpc.go b/op-chain-ops/script/forking/rpc.go
new file mode 100644
index 000000000000..501c0fd6e372
--- /dev/null
+++ b/op-chain-ops/script/forking/rpc.go
@@ -0,0 +1,140 @@
+package forking
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/holiman/uint256"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+
+	"github.com/ethereum-optimism/optimism/op-service/retry"
+)
+
+type RPCClient interface {
+	CallContext(ctx context.Context, result any, method string, args ...any) error
+}
+
+type RPCSource struct {
+	stateRoot common.Hash
+	blockHash common.Hash
+
+	maxAttempts int
+	timeout     time.Duration
+	strategy    retry.Strategy
+
+	ctx    context.Context
+	cancel context.CancelFunc
+
+	client     RPCClient
+	urlOrAlias string
+}
+
+var _ ForkSource = (*RPCSource)(nil)
+
+func RPCSourceByNumber(urlOrAlias string, cl RPCClient, num uint64) (*RPCSource, error) {
+	src := newRPCSource(urlOrAlias, cl)
+	err := src.init(hexutil.Uint64(num))
+	return src, err
+}
+
+func RPCSourceByHash(urlOrAlias string, cl RPCClient, h common.Hash) (*RPCSource, error) {
+	src := newRPCSource(urlOrAlias, cl)
+	err := src.init(h)
+	return src, err
+}
+
+func newRPCSource(urlOrAlias string, cl RPCClient) *RPCSource {
+	ctx, cancel := context.WithCancel(context.Background())
+	return &RPCSource{
+		maxAttempts: 10,
+		timeout:     time.Second * 10,
+		strategy:    retry.Exponential(),
+		ctx:         ctx,
+		cancel:      cancel,
+		client:      cl,
+		urlOrAlias:  urlOrAlias,
+	}
+}
+
+type Header struct {
+	StateRoot common.Hash `json:"stateRoot"`
+	BlockHash common.Hash `json:"hash"`
+}
+
+func (r *RPCSource) init(id any) error {
+	head, err := retry.Do[*Header](r.ctx, r.maxAttempts, r.strategy, func() (*Header, error) {
+		var result *Header
+		err := r.client.CallContext(r.ctx, &result, "eth_getBlockByNumber", id, false)
+		if err == nil && result == nil {
+			err = ethereum.NotFound
+		}
+		return result, err
+	})
+	if err != nil {
+		return fmt.Errorf("failed to initialize RPC fork source around block %v: %w", id, err)
+	}
+	r.blockHash = head.BlockHash
+	r.stateRoot = head.StateRoot
+	return nil
+}
+
+func (c *RPCSource) URLOrAlias() string {
+	return c.urlOrAlias
+}
+
+func (r *RPCSource) BlockHash() common.Hash {
+	return r.blockHash
+}
+
+func (r *RPCSource) StateRoot() common.Hash {
+	return r.stateRoot
+}
+
+func (r *RPCSource) Nonce(addr common.Address) (uint64, error) {
+	return retry.Do[uint64](r.ctx, r.maxAttempts, r.strategy, func() (uint64, error) {
+		ctx, cancel := context.WithTimeout(r.ctx, r.timeout)
+		defer cancel()
+		var result hexutil.Uint64
+		err := r.client.CallContext(ctx, &result, "eth_getTransactionCount", addr, r.blockHash)
+		return uint64(result), err
+	})
+}
+
+func (r *RPCSource) Balance(addr common.Address) (*uint256.Int, error) {
+	return retry.Do[*uint256.Int](r.ctx, r.maxAttempts, r.strategy, func() (*uint256.Int, error) {
+		ctx, cancel := context.WithTimeout(r.ctx, r.timeout)
+		defer cancel()
+		var result hexutil.U256
+		err := r.client.CallContext(ctx, &result, "eth_getBalance", addr, r.blockHash)
+		return (*uint256.Int)(&result), err
+	})
+}
+
+func (r *RPCSource) StorageAt(addr common.Address, key common.Hash) (common.Hash, error) {
+	return retry.Do[common.Hash](r.ctx, r.maxAttempts, r.strategy, func() (common.Hash, error) {
+		ctx, cancel := context.WithTimeout(r.ctx, r.timeout)
+		defer cancel()
+		var result common.Hash
+		err := r.client.CallContext(ctx, &result, "eth_getStorageAt", addr, key, r.blockHash)
+		return result, err
+	})
+}
+
+func (r *RPCSource) Code(addr common.Address) ([]byte, error) {
+	return retry.Do[[]byte](r.ctx, r.maxAttempts, r.strategy, func() ([]byte, error) {
+		ctx, cancel := context.WithTimeout(r.ctx, r.timeout)
+		defer cancel()
+		var result hexutil.Bytes
+		err := r.client.CallContext(ctx, &result, "eth_getCode", addr, r.blockHash)
+		return result, err
+	})
+}
+
+// Close stops any ongoing RPC requests by cancelling the RPC context
+func (r *RPCSource) Close() {
+	r.cancel()
+}
diff --git a/op-chain-ops/script/forking/rpc_test.go b/op-chain-ops/script/forking/rpc_test.go
new file mode 100644
index 000000000000..9f23e957b1e9
--- /dev/null
+++ b/op-chain-ops/script/forking/rpc_test.go
@@ -0,0 +1,210 @@
+package forking
+
+import (
+	"context"
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-service/retry"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/holiman/uint256"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+)
+
+// MockRPCClient implements RPCClient interface for testing
+type MockRPCClient struct {
+	mock.Mock
+}
+
+func (m *MockRPCClient) CallContext(ctx context.Context, result any, method string, args ...any) error {
+	return m.Called(ctx, result, method, args).Error(0)
+}
+
+func TestRPCSourceInitialization(t *testing.T) {
+	mockClient := new(MockRPCClient)
+	expectedStateRoot := common.HexToHash("0x1234")
+	expectedBlockHash := common.HexToHash("0x5678")
+
+	t.Run("initialization by block number", func(t *testing.T) {
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("**forking.Header"),
+			"eth_getBlockByNumber", []any{hexutil.Uint64(123), false}).
+			Run(func(args mock.Arguments) {
+				result := args.Get(1).(**Header)
+				*result = &Header{
+					StateRoot: expectedStateRoot,
+					BlockHash: expectedBlockHash,
+				}
+			}).
+			Return(nil).Once()
+
+		source, err := RPCSourceByNumber("test_url", mockClient, 123)
+		require.NoError(t, err)
+		require.Equal(t, expectedStateRoot, source.StateRoot())
+		require.Equal(t, expectedBlockHash, source.BlockHash())
+	})
+
+	t.Run("initialization by block hash", func(t *testing.T) {
+		blockHash := common.HexToHash("0xabcd")
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("**forking.Header"),
+			"eth_getBlockByNumber", []any{blockHash, false}).
+			Run(func(args mock.Arguments) {
+				result := args.Get(1).(**Header)
+				*result = &Header{
+					StateRoot: expectedStateRoot,
+					BlockHash: expectedBlockHash,
+				}
+			}).
+			Return(nil).Once()
+
+		source, err := RPCSourceByHash("test_url", mockClient, blockHash)
+		require.NoError(t, err)
+		require.Equal(t, expectedStateRoot, source.StateRoot())
+		require.Equal(t, expectedBlockHash, source.BlockHash())
+	})
+
+	t.Run("initialization failure", func(t *testing.T) {
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("**forking.Header"),
+			"eth_getBlockByNumber", []any{hexutil.Uint64(999), false}).
+			Return(ethereum.NotFound).Times(2)
+
+		src := newRPCSource("test_url", mockClient)
+		strategy := retry.Exponential()
+		strategy.(*retry.ExponentialStrategy).Max = 100 * time.Millisecond
+		src.strategy = strategy
+		src.maxAttempts = 2
+		require.Error(t, src.init(hexutil.Uint64(999)))
+	})
+}
+
+func TestRPCSourceDataRetrieval(t *testing.T) {
+	mockClient := new(MockRPCClient)
+	testAddr := common.HexToAddress("0x1234567890123456789012345678901234567890")
+	blockHash := common.HexToHash("0xabcd")
+
+	source := &RPCSource{
+		blockHash:   blockHash,
+		client:      mockClient,
+		ctx:         context.Background(),
+		strategy:    retry.Exponential(),
+		maxAttempts: 10,
+		timeout:     time.Second * 10,
+	}
+
+	t.Run("get nonce", func(t *testing.T) {
+		expectedNonce := uint64(5)
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.Uint64"),
+			"eth_getTransactionCount", []any{testAddr, blockHash}).
+			Run(func(args mock.Arguments) {
+				result := args.Get(1).(*hexutil.Uint64)
+				*result = hexutil.Uint64(expectedNonce)
+			}).
+			Return(nil).Once()
+
+		nonce, err := source.Nonce(testAddr)
+		require.NoError(t, err)
+		require.Equal(t, expectedNonce, nonce)
+	})
+
+	t.Run("get balance", func(t *testing.T) {
+		expectedBalance := uint256.NewInt(1000)
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.U256"),
+			"eth_getBalance", []any{testAddr, blockHash}).
+			Run(func(args mock.Arguments) {
+				result := args.Get(1).(*hexutil.U256)
+				*(*uint256.Int)(result) = *expectedBalance
+			}).
+			Return(nil).Once()
+
+		balance, err := source.Balance(testAddr)
+		require.NoError(t, err)
+		require.Equal(t, expectedBalance, balance)
+	})
+
+	t.Run("get storage", func(t *testing.T) {
+		storageKey := common.HexToHash("0x1234")
+		expectedValue := common.HexToHash("0x5678")
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("*common.Hash"),
+			"eth_getStorageAt", []any{testAddr, storageKey, blockHash}).
+			Run(func(args mock.Arguments) {
+				result := args.Get(1).(*common.Hash)
+				*result = expectedValue
+			}).
+			Return(nil).Once()
+
+		value, err := source.StorageAt(testAddr, storageKey)
+		require.NoError(t, err)
+		require.Equal(t, expectedValue, value)
+	})
+
+	t.Run("get code", func(t *testing.T) {
+		expectedCode := []byte{1, 2, 3, 4}
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.Bytes"),
+			"eth_getCode", []any{testAddr, blockHash}).
+			Run(func(args mock.Arguments) {
+				result := args.Get(1).(*hexutil.Bytes)
+				*result = expectedCode
+			}).
+			Return(nil).Once()
+
+		code, err := source.Code(testAddr)
+		require.NoError(t, err)
+		require.Equal(t, expectedCode, code)
+	})
+}
+
+func TestRPCSourceRetry(t *testing.T) {
+	mockClient := new(MockRPCClient)
+	testAddr := common.HexToAddress("0x1234")
+	blockHash := common.HexToHash("0xabcd")
+	strategy := retry.Exponential()
+	strategy.(*retry.ExponentialStrategy).Max = 100 * time.Millisecond
+
+	source := &RPCSource{
+		blockHash:   blockHash,
+		client:      mockClient,
+		ctx:         context.Background(),
+		strategy:    strategy,
+		maxAttempts: 3,
+		timeout:     time.Second * 10,
+	}
+
+	t.Run("retry on temporary error", func(t *testing.T) {
+		tempError := errors.New("temporary network error")
+
+		// Fail twice, succeed on third attempt
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.Uint64"),
+			"eth_getTransactionCount", []any{testAddr, blockHash}).
+			Return(tempError).Times(2)
+
+		mockClient.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.Uint64"),
+			"eth_getTransactionCount", []any{testAddr, blockHash}).
+			Run(func(args mock.Arguments) {
+				result := args.Get(1).(*hexutil.Uint64)
+				*result = hexutil.Uint64(5)
+			}).
+			Return(nil).Once()
+
+		nonce, err := source.Nonce(testAddr)
+		require.NoError(t, err)
+		require.Equal(t, uint64(5), nonce)
+	})
+}
+
+func TestRPCSourceClose(t *testing.T) {
+	mockClient := new(MockRPCClient)
+	source := newRPCSource("test_url", mockClient)
+
+	// Verify context is active before close
+	require.NoError(t, source.ctx.Err())
+
+	source.Close()
+
+	// Verify context is cancelled after close
+	require.Error(t, source.ctx.Err())
+	require.Equal(t, context.Canceled, source.ctx.Err())
+}
diff --git a/op-chain-ops/script/forking/state.go b/op-chain-ops/script/forking/state.go
new file mode 100644
index 000000000000..5370179423ab
--- /dev/null
+++ b/op-chain-ops/script/forking/state.go
@@ -0,0 +1,377 @@
+package forking
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/stateless"
+	"github.com/ethereum/go-ethereum/core/tracing"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/trie/utils"
+	"github.com/holiman/uint256"
+)
+
+type forkStateEntry struct {
+	state *state.StateDB
+}
+
+func (fe *forkStateEntry) DB() *ForkDB {
+	return fe.state.Database().(*ForkDB)
+}
+
+// ForkableState implements the vm.StateDB interface,
+// and a few other methods as defined in the VMStateDB interface.
+// This state can be forked in-place,
+// swapping over operations to route to in-memory states that wrap fork sources.
+type ForkableState struct {
+	selected VMStateDB
+
+	activeFork ForkID
+	forks      map[ForkID]*forkStateEntry
+
+	// persistent accounts will override any interactions
+	// to be directly with the forkID that was active at the time it was made persistent,
+	// rather than whatever fork is currently active.
+	persistent map[common.Address]ForkID
+
+	fallback VMStateDB
+
+	idCounter uint64
+}
+
+var _ VMStateDB = (*ForkableState)(nil)
+
+func NewForkableState(base VMStateDB) *ForkableState {
+	return &ForkableState{
+		selected:   base,
+		activeFork: ForkID{},
+		forks:      make(map[ForkID]*forkStateEntry),
+		persistent: map[common.Address]ForkID{
+			addresses.DefaultSenderAddr: ForkID{},
+			addresses.VMAddr:            ForkID{},
+			addresses.ConsoleAddr:       ForkID{},
+			addresses.ScriptDeployer:    ForkID{},
+			addresses.ForgeDeployer:     ForkID{},
+		},
+		fallback:  base,
+		idCounter: 0,
+	}
+}
+
+// ExportDiff exports a state diff. Warning: diffs are like flushed states.
+// So we flush the state, making all the contents cold, losing transient storage, etc.
+func (fst *ForkableState) ExportDiff(id ForkID) (*ExportDiff, error) {
+	if id == (ForkID{}) {
+		return nil, errors.New("default no-fork state does not have an exportable diff")
+	}
+	f, ok := fst.forks[id]
+	if !ok {
+		return nil, fmt.Errorf("unknown fork %q", id)
+	}
+	// Finalize the state content, so we can get an accurate diff.
+	f.state.IntermediateRoot(true)
+	tr := f.state.GetTrie()
+	ft, ok := tr.(*ForkedAccountsTrie)
+	if !ok {
+		return nil, fmt.Errorf("forked state trie is unexpectedly not a ForkedAccountsTrie: %T", tr)
+	}
+	diff := ft.ExportDiff()
+	// Now re-init the state, so we can use it again (albeit it cold).
+	forkDB := &ForkDB{active: ft}
+	st, err := state.New(forkDB.active.stateRoot, forkDB)
+	if err != nil {
+		return nil, fmt.Errorf("failed to construct fork state: %w", err)
+	}
+	fst.forks[id].state = st
+	if fst.activeFork == id {
+		fst.selected = st
+	}
+	return diff, nil
+}
+
+// CreateSelectFork is like vm.createSelectFork, it creates a fork, and selects it immediately.
+func (fst *ForkableState) CreateSelectFork(source ForkSource) (ForkID, error) {
+	id, err := fst.CreateFork(source)
+	if err != nil {
+		return id, err
+	}
+	return id, fst.SelectFork(id)
+}
+
+// CreateFork is like vm.createFork, it creates a fork, but does not select it yet.
+func (fst *ForkableState) CreateFork(source ForkSource) (ForkID, error) {
+	fst.idCounter += 1 // increment first, don't use ID 0
+	id := ForkID(*uint256.NewInt(fst.idCounter))
+	_, ok := fst.forks[id]
+	if ok { // sanity check our ID counter is consistent with the tracked forks
+		return id, fmt.Errorf("cannot create fork, fork %q already exists", id)
+	}
+	forkDB := NewForkDB(source)
+	st, err := state.New(forkDB.active.stateRoot, forkDB)
+	if err != nil {
+		return id, fmt.Errorf("failed to construct fork state: %w", err)
+	}
+	fst.forks[id] = &forkStateEntry{
+		state: st,
+	}
+	return id, nil
+}
+
+// SelectFork is like vm.selectFork, it activates the usage of a previously created fork.
+func (fst *ForkableState) SelectFork(id ForkID) error {
+	if id == (ForkID{}) {
+		fst.selected = fst.fallback
+		fst.activeFork = ForkID{}
+		return nil
+	}
+	f, ok := fst.forks[id]
+	if !ok {
+		return fmt.Errorf("cannot select fork, fork %q is unknown", id)
+	}
+	fst.selected = f.state
+	fst.activeFork = id
+	return nil
+}
+
+// ResetFork resets the fork to be coupled to the given fork-source.
+// Any ephemeral state changes (transient storage, warm s-loads, etc.)
+// as well as any uncommitted state, as well as any previously flushed diffs, will be lost.
+func (fst *ForkableState) ResetFork(id ForkID, src ForkSource) error {
+	if id == (ForkID{}) {
+		return errors.New("default no-fork state cannot change its ForkSource")
+	}
+	f, ok := fst.forks[id]
+	if !ok {
+		return fmt.Errorf("unknown fork %q", id)
+	}
+	// Now create a new state
+	forkDB := NewForkDB(src)
+	st, err := state.New(src.StateRoot(), forkDB)
+	if err != nil {
+		return fmt.Errorf("failed to construct fork state: %w", err)
+	}
+	f.state = st
+	if fst.activeFork == id {
+		fst.selected = st
+	}
+	return nil
+}
+
+// ActiveFork returns the ID current active fork, or active == false if no fork is active.
+func (fst *ForkableState) ActiveFork() (id ForkID, active bool) {
+	return fst.activeFork, fst.activeFork != (ForkID{})
+}
+
+// ForkURLOrAlias returns the URL or alias that the fork was configured with as source.
+// Returns an error if no fork is active
+func (fst *ForkableState) ForkURLOrAlias(id ForkID) (string, error) {
+	if id == (ForkID{}) {
+		return "", errors.New("default no-fork state does not have an URL or Alias")
+	}
+	f, ok := fst.forks[id]
+	if !ok {
+		return "", fmt.Errorf("unknown fork %q", id)
+	}
+	return f.DB().active.src.URLOrAlias(), nil
+}
+
+// SubstituteBaseState substitutes in a fallback state.
+func (fst *ForkableState) SubstituteBaseState(base VMStateDB) {
+	fst.fallback = base
+	// If the fallback is currently selected, also updated the fallback.
+	if fst.activeFork == (ForkID{}) {
+		fst.selected = base
+	}
+}
+
+// MakePersistent is like vm.makePersistent, it maintains this account context across all forks.
+// It does not make the account of a fork persistent, it makes an account override what might be in a fork.
+func (fst *ForkableState) MakePersistent(addr common.Address) {
+	fst.persistent[addr] = fst.activeFork
+}
+
+// RevokePersistent is like vm.revokePersistent, it undoes a previous vm.makePersistent.
+func (fst *ForkableState) RevokePersistent(addr common.Address) {
+	delete(fst.persistent, addr)
+}
+
+// IsPersistent is like vm.isPersistent, it checks if an account persists across forks.
+func (fst *ForkableState) IsPersistent(addr common.Address) bool {
+	_, ok := fst.persistent[addr]
+	return ok
+}
+
+func (fst *ForkableState) stateFor(addr common.Address) VMStateDB {
+	// if forked, check if we persisted this account across forks
+	persistedForkID, ok := fst.persistent[addr]
+	if ok {
+		if persistedForkID == (ForkID{}) {
+			return fst.fallback
+		}
+		return fst.forks[persistedForkID].state
+	}
+	// This may be the fallback state, if no fork is active.
+	return fst.selected
+}
+
+// Finalise finalises the state by removing the destructed objects and clears
+// the journal as well as the refunds. Finalise, however, will not push any updates
+// into the tries just yet.
+//
+// The changes will be flushed to the underlying DB.
+// A *ForkDB if the state is currently forked.
+func (fst *ForkableState) Finalise(deleteEmptyObjects bool) {
+	fst.selected.Finalise(deleteEmptyObjects)
+}
+
+func (fst *ForkableState) CreateAccount(address common.Address) {
+	fst.stateFor(address).CreateAccount(address)
+}
+
+func (fst *ForkableState) CreateContract(address common.Address) {
+	fst.stateFor(address).CreateContract(address)
+}
+
+func (fst *ForkableState) SubBalance(address common.Address, u *uint256.Int, reason tracing.BalanceChangeReason) {
+	fst.stateFor(address).SubBalance(address, u, reason)
+}
+
+func (fst *ForkableState) AddBalance(address common.Address, u *uint256.Int, reason tracing.BalanceChangeReason) {
+	fst.stateFor(address).AddBalance(address, u, reason)
+}
+
+func (fst *ForkableState) GetBalance(address common.Address) *uint256.Int {
+	return fst.stateFor(address).GetBalance(address)
+}
+
+func (fst *ForkableState) GetNonce(address common.Address) uint64 {
+	return fst.stateFor(address).GetNonce(address)
+}
+
+func (fst *ForkableState) SetNonce(address common.Address, u uint64) {
+	fst.stateFor(address).SetNonce(address, u)
+}
+
+func (fst *ForkableState) GetCodeHash(address common.Address) common.Hash {
+	return fst.stateFor(address).GetCodeHash(address)
+}
+
+func (fst *ForkableState) GetCode(address common.Address) []byte {
+	return fst.stateFor(address).GetCode(address)
+}
+
+func (fst *ForkableState) SetCode(address common.Address, bytes []byte) {
+	fst.stateFor(address).SetCode(address, bytes)
+}
+
+func (fst *ForkableState) GetCodeSize(address common.Address) int {
+	return fst.stateFor(address).GetCodeSize(address)
+}
+
+func (fst *ForkableState) AddRefund(u uint64) {
+	fst.selected.AddRefund(u)
+}
+
+func (fst *ForkableState) SubRefund(u uint64) {
+	fst.selected.SubRefund(u)
+}
+
+func (fst *ForkableState) GetRefund() uint64 {
+	return fst.selected.GetRefund()
+}
+
+func (fst *ForkableState) GetCommittedState(address common.Address, hash common.Hash) common.Hash {
+	return fst.stateFor(address).GetCommittedState(address, hash)
+}
+
+func (fst *ForkableState) GetState(address common.Address, k common.Hash) common.Hash {
+	return fst.stateFor(address).GetState(address, k)
+}
+
+func (fst *ForkableState) SetState(address common.Address, k common.Hash, v common.Hash) {
+	fst.stateFor(address).SetState(address, k, v)
+}
+
+func (fst *ForkableState) GetStorageRoot(addr common.Address) common.Hash {
+	return fst.stateFor(addr).GetStorageRoot(addr)
+}
+
+func (fst *ForkableState) GetTransientState(addr common.Address, key common.Hash) common.Hash {
+	return fst.stateFor(addr).GetTransientState(addr, key)
+}
+
+func (fst *ForkableState) SetTransientState(addr common.Address, key, value common.Hash) {
+	fst.stateFor(addr).SetTransientState(addr, key, value)
+}
+
+func (fst *ForkableState) SelfDestruct(address common.Address) {
+	fst.stateFor(address).SelfDestruct(address)
+}
+
+func (fst *ForkableState) HasSelfDestructed(address common.Address) bool {
+	return fst.stateFor(address).HasSelfDestructed(address)
+}
+
+func (fst *ForkableState) Selfdestruct6780(address common.Address) {
+	fst.stateFor(address).Selfdestruct6780(address)
+}
+
+func (fst *ForkableState) Exist(address common.Address) bool {
+	return fst.stateFor(address).Exist(address)
+}
+
+func (fst *ForkableState) Empty(address common.Address) bool {
+	return fst.stateFor(address).Empty(address)
+}
+
+func (fst *ForkableState) AddressInAccessList(addr common.Address) bool {
+	return fst.stateFor(addr).AddressInAccessList(addr)
+}
+
+func (fst *ForkableState) SlotInAccessList(addr common.Address, slot common.Hash) (addressOk bool, slotOk bool) {
+	return fst.stateFor(addr).SlotInAccessList(addr, slot)
+}
+
+func (fst *ForkableState) AddAddressToAccessList(addr common.Address) {
+	fst.stateFor(addr).AddAddressToAccessList(addr)
+}
+
+func (fst *ForkableState) AddSlotToAccessList(addr common.Address, slot common.Hash) {
+	fst.stateFor(addr).AddSlotToAccessList(addr, slot)
+}
+
+func (fst *ForkableState) PointCache() *utils.PointCache {
+	return fst.selected.PointCache()
+}
+
+func (fst *ForkableState) Prepare(rules params.Rules, sender, coinbase common.Address, dest *common.Address, precompiles []common.Address, txAccesses types.AccessList) {
+	fst.selected.Prepare(rules, sender, coinbase, dest, precompiles, txAccesses)
+}
+
+func (fst *ForkableState) RevertToSnapshot(i int) {
+	fst.selected.RevertToSnapshot(i)
+}
+
+func (fst *ForkableState) Snapshot() int {
+	return fst.selected.Snapshot()
+}
+
+func (fst *ForkableState) AddLog(log *types.Log) {
+	fst.selected.AddLog(log)
+}
+
+func (fst *ForkableState) AddPreimage(hash common.Hash, img []byte) {
+	fst.selected.AddPreimage(hash, img)
+}
+
+func (fst *ForkableState) Witness() *stateless.Witness {
+	return fst.selected.Witness()
+}
+
+func (fst *ForkableState) SetBalance(addr common.Address, amount *uint256.Int, reason tracing.BalanceChangeReason) {
+	fst.stateFor(addr).SetBalance(addr, amount, reason)
+}
diff --git a/op-chain-ops/script/forking/trie.go b/op-chain-ops/script/forking/trie.go
new file mode 100644
index 000000000000..3af50bad973b
--- /dev/null
+++ b/op-chain-ops/script/forking/trie.go
@@ -0,0 +1,223 @@
+package forking
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/holiman/uint256"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/trie"
+	"github.com/ethereum/go-ethereum/trie/trienode"
+)
+
+type ForkedAccountsTrie struct {
+	// stateRoot that this diff is based on top of
+	stateRoot common.Hash
+
+	// source to retrieve data from when it's not in the diff
+	src ForkSource
+
+	diff *ExportDiff
+}
+
+var _ state.Trie = (*ForkedAccountsTrie)(nil)
+
+func (f *ForkedAccountsTrie) Copy() *ForkedAccountsTrie {
+	return &ForkedAccountsTrie{
+		stateRoot: f.stateRoot,
+		diff:      f.diff.Copy(),
+	}
+}
+
+func (f *ForkedAccountsTrie) ExportDiff() *ExportDiff {
+	return f.diff.Copy()
+}
+
+func (f *ForkedAccountsTrie) HasDiff() bool {
+	return len(f.diff.Code) > 0 || len(f.diff.Account) > 0
+}
+
+// ClearDiff clears the flushed changes. This does not clear the warm state changes.
+// To fully clear, first Finalise the forked state that uses this trie, and then clear the diff.
+func (f *ForkedAccountsTrie) ClearDiff() {
+	f.diff.Clear()
+}
+
+// ContractCode is not directly part of the vm.State interface,
+// but is used by the ForkDB to retrieve the contract code.
+func (f *ForkedAccountsTrie) ContractCode(addr common.Address, codeHash common.Hash) ([]byte, error) {
+	diffAcc, ok := f.diff.Account[addr]
+	if ok {
+		if diffAcc.CodeHash != nil && *diffAcc.CodeHash != codeHash {
+			return nil, fmt.Errorf("account code changed to %s, cannot get code %s of account %s", *diffAcc.CodeHash, codeHash, addr)
+		}
+		if code, ok := f.diff.Code[codeHash]; ok {
+			return code, nil
+		}
+		// if not in codeDiff, the actual code has not changed.
+	}
+	code, err := f.src.Code(addr)
+	if err != nil {
+		return nil, fmt.Errorf("failed to retrieve code: %w", err)
+	}
+	// sanity-check the retrieved code matches the expected codehash
+	if h := crypto.Keccak256Hash(code); h != codeHash {
+		return nil, fmt.Errorf("retrieved code of %s hashed to %s, but expected %s", addr, h, codeHash)
+	}
+	return code, nil
+}
+
+// ContractCodeSize is not directly part of the vm.State interface,
+// but is used by the ForkDB to retrieve the contract code-size.
+func (f *ForkedAccountsTrie) ContractCodeSize(addr common.Address, codeHash common.Hash) (int, error) {
+	code, err := f.ContractCode(addr, codeHash)
+	if err != nil {
+		return 0, fmt.Errorf("cannot get contract code to determine code size: %w", err)
+	}
+	return len(code), nil
+}
+
+func (f *ForkedAccountsTrie) GetKey(bytes []byte) []byte {
+	panic("arbitrary key lookups on ForkedAccountsTrie are not supported")
+}
+
+func (f *ForkedAccountsTrie) GetAccount(address common.Address) (*types.StateAccount, error) {
+	acc := &types.StateAccount{
+		Nonce:    0,
+		Balance:  nil,
+		Root:     fakeRoot,
+		CodeHash: nil,
+	}
+	diffAcc := f.diff.Account[address]
+	if diffAcc != nil && diffAcc.Nonce != nil {
+		acc.Nonce = *diffAcc.Nonce
+	} else {
+		v, err := f.src.Nonce(address)
+		if err != nil {
+			return nil, fmt.Errorf("failed to retrieve nonce of account %s: %w", address, err)
+		}
+		acc.Nonce = v
+	}
+	if diffAcc != nil && diffAcc.Balance != nil {
+		acc.Balance = new(uint256.Int).Set(diffAcc.Balance)
+	} else {
+		v, err := f.src.Balance(address)
+		if err != nil {
+			return nil, fmt.Errorf("failed to retrieve balance of account %s: %w", address, err)
+		}
+		acc.Balance = new(uint256.Int).Set(v)
+	}
+	if diffAcc != nil && diffAcc.CodeHash != nil {
+		cpy := *diffAcc.CodeHash
+		acc.CodeHash = cpy.Bytes()
+	} else {
+		v, err := f.src.Code(address)
+		if err != nil {
+			return nil, fmt.Errorf("failed to retrieve code of account %s: %w", address, err)
+		}
+		acc.CodeHash = crypto.Keccak256Hash(v).Bytes()
+	}
+	return acc, nil
+}
+
+func (f *ForkedAccountsTrie) GetStorage(addr common.Address, key []byte) ([]byte, error) {
+	k := common.BytesToHash(key)
+	diffAcc, ok := f.diff.Account[addr]
+	if ok { // if there is a diff, try and see if it contains a storage diff
+		v, ok := diffAcc.Storage[k]
+		if ok { // if the storage has changed, return that change
+			return v.Bytes(), nil
+		}
+	}
+	v, err := f.src.StorageAt(addr, k)
+	if err != nil {
+		return nil, err
+	}
+	return v.Bytes(), nil
+}
+
+func (f *ForkedAccountsTrie) UpdateAccount(address common.Address, account *types.StateAccount, codeLen int) error {
+	// Ignored, account contains the code details we need.
+	// Also see the trie.StateTrie of geth itself, which ignores this arg too.
+	_ = codeLen
+
+	nonce := account.Nonce
+	b := account.Balance.Clone()
+	codeHash := common.BytesToHash(account.CodeHash)
+	out := &AccountDiff{
+		Nonce:    &nonce,
+		Balance:  b,
+		Storage:  nil,
+		CodeHash: &codeHash,
+	}
+	// preserve the storage diff
+	if diffAcc, ok := f.diff.Account[address]; ok {
+		out.Storage = diffAcc.Storage
+	}
+	f.diff.Account[address] = out
+	return nil
+}
+
+func (f *ForkedAccountsTrie) UpdateStorage(addr common.Address, key, value []byte) error {
+	diffAcc, ok := f.diff.Account[addr]
+	if !ok {
+		diffAcc = &AccountDiff{}
+		f.diff.Account[addr] = diffAcc
+	}
+	if diffAcc.Storage == nil {
+		diffAcc.Storage = make(map[common.Hash]common.Hash)
+	}
+	k := common.BytesToHash(key)
+	v := common.BytesToHash(value)
+	diffAcc.Storage[k] = v
+	return nil
+}
+
+func (f *ForkedAccountsTrie) DeleteAccount(address common.Address) error {
+	f.diff.Account[address] = nil
+	return nil
+}
+
+func (f *ForkedAccountsTrie) DeleteStorage(addr common.Address, key []byte) error {
+	return f.UpdateStorage(addr, key, nil)
+}
+
+func (f *ForkedAccountsTrie) UpdateContractCode(addr common.Address, codeHash common.Hash, code []byte) error {
+	diffAcc, ok := f.diff.Account[addr]
+	if !ok {
+		diffAcc = &AccountDiff{}
+		f.diff.Account[addr] = diffAcc
+	}
+	diffAcc.CodeHash = &codeHash
+	f.diff.Code[codeHash] = code
+	return nil
+}
+
+func (f *ForkedAccountsTrie) Hash() common.Hash {
+	return f.stateRoot
+}
+
+func (f *ForkedAccountsTrie) Commit(collectLeaf bool) (common.Hash, *trienode.NodeSet) {
+	panic("cannot commit state-changes of a forked trie")
+}
+
+func (f *ForkedAccountsTrie) Witness() map[string]struct{} {
+	panic("witness generation of a ForkedAccountsTrie is not supported")
+}
+
+func (f *ForkedAccountsTrie) NodeIterator(startKey []byte) (trie.NodeIterator, error) {
+	return nil, errors.New("node iteration of a ForkedAccountsTrie is not supported")
+}
+
+func (f *ForkedAccountsTrie) Prove(key []byte, proofDb ethdb.KeyValueWriter) error {
+	return errors.New("proving of a ForkedAccountsTrie is not supported")
+}
+
+func (f *ForkedAccountsTrie) IsVerkle() bool {
+	return false
+}
diff --git a/op-chain-ops/script/forking/trie_test.go b/op-chain-ops/script/forking/trie_test.go
new file mode 100644
index 000000000000..6d703814ed4d
--- /dev/null
+++ b/op-chain-ops/script/forking/trie_test.go
@@ -0,0 +1,209 @@
+package forking
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/holiman/uint256"
+	"github.com/stretchr/testify/require"
+)
+
+func setupTrie(t *testing.T) (*ForkedAccountsTrie, *MockForkSource) {
+	mockSource := new(MockForkSource)
+	stateRoot := common.HexToHash("0x1234")
+	mockSource.On("StateRoot").Return(stateRoot)
+
+	trie := &ForkedAccountsTrie{
+		stateRoot: stateRoot,
+		src:       mockSource,
+		diff:      NewExportDiff(),
+	}
+	return trie, mockSource
+}
+
+func TestForkedAccountsTrie_GetAccount(t *testing.T) {
+	trie, mockSource := setupTrie(t)
+	addr := common.HexToAddress("0x1234")
+
+	// Setup mock responses
+	expectedNonce := uint64(1)
+	expectedBalance := uint256.NewInt(100)
+	expectedCode := []byte{1, 2, 3, 4}
+	expectedCodeHash := crypto.Keccak256Hash(expectedCode)
+
+	mockSource.On("Nonce", addr).Return(expectedNonce, nil)
+	mockSource.On("Balance", addr).Return(expectedBalance, nil)
+	mockSource.On("Code", addr).Return(expectedCode, nil)
+
+	// Test initial account retrieval
+	account, err := trie.GetAccount(addr)
+	require.NoError(t, err)
+	require.Equal(t, expectedNonce, account.Nonce)
+	require.Equal(t, expectedBalance, uint256.NewInt(0).SetBytes(account.Balance.Bytes()))
+	require.Equal(t, expectedCodeHash.Bytes(), account.CodeHash)
+
+	// Update account and verify diff
+	newNonce := uint64(2)
+	newBalance := uint256.NewInt(200)
+	account.Nonce = newNonce
+	account.Balance = newBalance
+
+	err = trie.UpdateAccount(addr, account, 0)
+	require.NoError(t, err)
+
+	// Verify updated account
+	updatedAccount, err := trie.GetAccount(addr)
+	require.NoError(t, err)
+	require.Equal(t, newNonce, updatedAccount.Nonce)
+	require.Equal(t, newBalance, uint256.NewInt(0).SetBytes(updatedAccount.Balance.Bytes()))
+}
+
+func TestForkedAccountsTrie_Storage(t *testing.T) {
+	trie, mockSource := setupTrie(t)
+	addr := common.HexToAddress("0x1234")
+	key := common.HexToHash("0x1")
+	value := common.HexToHash("0x2")
+
+	// Setup mock for initial storage value
+	mockSource.On("StorageAt", addr, key).Return(value, nil)
+
+	// Test initial storage retrieval
+	storageValue, err := trie.GetStorage(addr, key.Bytes())
+	require.NoError(t, err)
+	require.Equal(t, value.Bytes(), storageValue)
+
+	// Update storage
+	newValue := common.HexToHash("0x3")
+	err = trie.UpdateStorage(addr, key.Bytes(), newValue.Bytes())
+	require.NoError(t, err)
+
+	// Verify updated storage
+	updatedValue, err := trie.GetStorage(addr, key.Bytes())
+	require.NoError(t, err)
+	require.Equal(t, newValue.Bytes(), updatedValue)
+}
+
+func TestForkedAccountsTrie_ContractCode(t *testing.T) {
+	trie, mockSource := setupTrie(t)
+	addr := common.HexToAddress("0x1234")
+	code := []byte{1, 2, 3, 4}
+	codeHash := crypto.Keccak256Hash(code)
+
+	// Setup mock for code retrieval
+	mockSource.On("Code", addr).Return(code, nil)
+
+	// Test initial code retrieval
+	retrievedCode, err := trie.ContractCode(addr, codeHash)
+	require.NoError(t, err)
+	require.Equal(t, code, retrievedCode)
+
+	// Update code
+	newCode := []byte{5, 6, 7, 8}
+	newCodeHash := crypto.Keccak256Hash(newCode)
+
+	err = trie.UpdateContractCode(addr, newCodeHash, newCode)
+	require.NoError(t, err)
+
+	// Verify updated code
+	updatedCode, err := trie.ContractCode(addr, newCodeHash)
+	require.NoError(t, err)
+	require.Equal(t, newCode, updatedCode)
+}
+
+func TestForkedAccountsTrie_DeleteAccount(t *testing.T) {
+	trie, _ := setupTrie(t)
+	addr := common.HexToAddress("0x1234")
+
+	// Setup initial account
+	account := &types.StateAccount{
+		Nonce:    1,
+		Balance:  uint256.NewInt(100),
+		CodeHash: crypto.Keccak256([]byte{1, 2, 3, 4}),
+	}
+
+	err := trie.UpdateAccount(addr, account, 0)
+	require.NoError(t, err)
+
+	// Delete account
+	err = trie.DeleteAccount(addr)
+	require.NoError(t, err)
+
+	// Verify account is marked as deleted in diff
+	require.Nil(t, trie.diff.Account[addr])
+}
+
+func TestForkedAccountsTrie_Copy(t *testing.T) {
+	trie, _ := setupTrie(t)
+	addr := common.HexToAddress("0x1234")
+
+	// Setup some initial state
+	account := &types.StateAccount{
+		Nonce:    1,
+		Balance:  uint256.NewInt(100),
+		CodeHash: crypto.Keccak256([]byte{1, 2, 3, 4}),
+	}
+	err := trie.UpdateAccount(addr, account, 0)
+	require.NoError(t, err)
+
+	// Make a copy
+	cpy := trie.Copy()
+
+	// Verify copy has same state
+	require.Equal(t, trie.stateRoot, cpy.stateRoot)
+	require.Equal(t, trie.diff.Account[addr].Nonce, cpy.diff.Account[addr].Nonce)
+	require.True(t, trie.diff.Account[addr].Balance.Eq(cpy.diff.Account[addr].Balance))
+
+	// Modify copy and verify original is unchanged
+	newAccount := &types.StateAccount{
+		Nonce:    2,
+		Balance:  uint256.NewInt(200),
+		CodeHash: crypto.Keccak256([]byte{5, 6, 7, 8}),
+	}
+	err = cpy.UpdateAccount(addr, newAccount, 0)
+	require.NoError(t, err)
+
+	originalAccount, err := trie.GetAccount(addr)
+	require.NoError(t, err)
+	require.Equal(t, uint64(1), originalAccount.Nonce)
+	require.True(t, uint256.NewInt(100).Eq(uint256.NewInt(0).SetBytes(originalAccount.Balance.Bytes())))
+}
+
+func TestForkedAccountsTrie_HasDiff(t *testing.T) {
+	trie, _ := setupTrie(t)
+
+	// Initially no diff
+	require.False(t, trie.HasDiff())
+
+	// Add account change
+	addr := common.HexToAddress("0x1234")
+	account := &types.StateAccount{
+		Nonce:    1,
+		Balance:  uint256.NewInt(100),
+		CodeHash: crypto.Keccak256([]byte{1, 2, 3, 4}),
+	}
+	err := trie.UpdateAccount(addr, account, 0)
+	require.NoError(t, err)
+
+	// Verify diff exists
+	require.True(t, trie.HasDiff())
+
+	// Clear diff
+	trie.ClearDiff()
+	require.False(t, trie.HasDiff())
+}
+
+func TestForkedAccountsTrie_UnsupportedOperations(t *testing.T) {
+	trie, _ := setupTrie(t)
+
+	require.Panics(t, func() { trie.GetKey([]byte{1, 2, 3}) })
+	require.Panics(t, func() { trie.Commit(false) })
+	require.Panics(t, func() { trie.Witness() })
+
+	_, err := trie.NodeIterator(nil)
+	require.Error(t, err)
+
+	err = trie.Prove(nil, nil)
+	require.Error(t, err)
+}
diff --git a/op-chain-ops/script/prank.go b/op-chain-ops/script/prank.go
index b6a68f4c44b1..cdea026063a2 100644
--- a/op-chain-ops/script/prank.go
+++ b/op-chain-ops/script/prank.go
@@ -8,6 +8,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
+
 	"github.com/holiman/uint256"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -53,7 +55,7 @@ func (h *Host) handleCaller(caller vm.ContractRef) vm.ContractRef {
 	// apply prank, if top call-frame had set up a prank
 	if len(h.callStack) > 0 {
 		parentCallFrame := h.callStack[len(h.callStack)-1]
-		if parentCallFrame.Prank != nil && caller.Address() != VMAddr { // pranks do not apply to the cheatcode precompile
+		if parentCallFrame.Prank != nil && caller.Address() != addresses.VMAddr { // pranks do not apply to the cheatcode precompile
 			if parentCallFrame.Prank.Broadcast && parentCallFrame.LastOp == vm.CREATE2 && h.useCreate2Deployer {
 				return &prankRef{
 					prank: DeterministicDeployerAddress,
diff --git a/op-chain-ops/script/precompile.go b/op-chain-ops/script/precompile.go
index 2dcea6601883..0ac692be7c1b 100644
--- a/op-chain-ops/script/precompile.go
+++ b/op-chain-ops/script/precompile.go
@@ -9,6 +9,8 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/holiman/uint256"
+
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -352,6 +354,8 @@ type ABIInt256 big.Int
 
 var abiInt256Type = typeFor[ABIInt256]()
 
+var abiUint256Type = typeFor[uint256.Int]()
+
 // goTypeToSolidityType converts a Go type to the solidity ABI type definition.
 // The "internalType" is a quirk of the Geth ABI utils, for nested structures.
 // Unfortunately we have to convert to string, not directly to ABI type structure,
@@ -364,6 +368,9 @@ func goTypeToSolidityType(typ reflect.Type) (typeDef, internalType string, err e
 		reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
 		return strings.ToLower(typ.Kind().String()), "", nil
 	case reflect.Array:
+		if typ.AssignableTo(abiUint256Type) { // uint256.Int underlying Go type is [4]uint64
+			return "uint256", "", nil
+		}
 		if typ.Elem().Kind() == reflect.Uint8 {
 			if typ.Len() == 20 && typ.Name() == "Address" {
 				return "address", "", nil
diff --git a/op-chain-ops/script/script.go b/op-chain-ops/script/script.go
index b6dfa5406230..e5630d0783c5 100644
--- a/op-chain-ops/script/script.go
+++ b/op-chain-ops/script/script.go
@@ -4,9 +4,12 @@ import (
 	"bytes"
 	"encoding/binary"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
+
 	"github.com/holiman/uint256"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
@@ -19,13 +22,13 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/triedb"
 	"github.com/ethereum/go-ethereum/triedb/hashdb"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/srcmap"
 )
 
@@ -72,9 +75,12 @@ type Host struct {
 	af       *foundry.ArtifactsFS
 	chainCfg *params.ChainConfig
 	env      *vm.EVM
-	state    *state.StateDB
-	stateDB  state.Database
-	rawDB    ethdb.Database
+
+	state     *forking.ForkableState
+	baseState *state.StateDB
+
+	// only known contracts may utilize cheatcodes and logging
+	allowedCheatcodes map[common.Address]struct{}
 
 	cheatcodes *Precompile[*CheatCodesPrecompile]
 	console    *Precompile[*ConsolePrecompile]
@@ -117,6 +123,7 @@ type BroadcastHook func(broadcast Broadcast)
 
 type Hooks struct {
 	OnBroadcast BroadcastHook
+	OnFork      ForkHook
 }
 
 func WithBroadcastHook(hook BroadcastHook) HostOption {
@@ -125,6 +132,12 @@ func WithBroadcastHook(hook BroadcastHook) HostOption {
 	}
 }
 
+func WithForkHook(hook ForkHook) HostOption {
+	return func(h *Host) {
+		h.hooks.OnFork = hook
+	}
+}
+
 // WithIsolatedBroadcasts makes each broadcast clean the context,
 // by flushing the dirty storage changes, and preparing the ephemeral state again.
 // This then produces more accurate gas estimation for broadcast calls.
@@ -167,7 +180,11 @@ func NewHost(
 		srcMaps:          make(map[common.Address]*srcmap.SourceMap),
 		hooks: &Hooks{
 			OnBroadcast: func(broadcast Broadcast) {},
+			OnFork: func(opts *ForkConfig) (forking.ForkSource, error) {
+				return nil, errors.New("no forking configured")
+			},
 		},
+		allowedCheatcodes: make(map[common.Address]struct{}),
 	}
 
 	for _, opt := range options {
@@ -212,18 +229,19 @@ func NewHost(
 	}
 
 	// Create an in-memory database, to host our temporary script state changes
-	h.rawDB = rawdb.NewMemoryDatabase()
-	h.stateDB = state.NewDatabase(triedb.NewDatabase(h.rawDB, &triedb.Config{
+	rawDB := rawdb.NewMemoryDatabase()
+	stateDB := state.NewDatabase(triedb.NewDatabase(rawDB, &triedb.Config{
 		Preimages: true, // To be able to iterate the state we need the Preimages
 		IsVerkle:  false,
 		HashDB:    hashdb.Defaults,
 		PathDB:    nil,
 	}), nil)
 	var err error
-	h.state, err = state.New(types.EmptyRootHash, h.stateDB)
+	h.baseState, err = state.New(types.EmptyRootHash, stateDB)
 	if err != nil {
 		panic(fmt.Errorf("failed to create memory state db: %w", err))
 	}
+	h.state = forking.NewForkableState(h.baseState)
 
 	// Initialize a block-context for the EVM to access environment variables.
 	// The block context (after embedding inside of the EVM environment) may be mutated later.
@@ -252,7 +270,7 @@ func NewHost(
 		GasPrice:     big.NewInt(0),
 		BlobHashes:   executionContext.BlobHashes,
 		BlobFeeCap:   big.NewInt(0),
-		AccessEvents: state.NewAccessEvents(h.stateDB.PointCache()),
+		AccessEvents: state.NewAccessEvents(h.baseState.PointCache()),
 	}
 
 	// Hook up the Host to capture the EVM environment changes
@@ -278,6 +296,18 @@ func NewHost(
 	return h
 }
 
+// AllowCheatcodes allows the given address to utilize the cheatcodes and logging precompiles
+func (h *Host) AllowCheatcodes(addr common.Address) {
+	h.log.Debug("Allowing cheatcodes", "address", addr, "label", h.labels[addr])
+	h.allowedCheatcodes[addr] = struct{}{}
+}
+
+// AllowedCheatcodes returns whether the given address is allowed to use cheatcodes
+func (h *Host) AllowedCheatcodes(addr common.Address) bool {
+	_, ok := h.allowedCheatcodes[addr]
+	return ok
+}
+
 // EnableCheats enables the Forge/HVM cheat-codes precompile and the Hardhat-style console2 precompile.
 func (h *Host) EnableCheats() error {
 	vmPrecompile, err := NewPrecompile[*CheatCodesPrecompile](&CheatCodesPrecompile{h: h})
@@ -288,8 +318,8 @@ func (h *Host) EnableCheats() error {
 	// Solidity does EXTCODESIZE checks on functions without return-data.
 	// We need to insert some placeholder code to prevent it from aborting calls.
 	// Emulates Forge script: https://github.com/foundry-rs/foundry/blob/224fe9cbf76084c176dabf7d3b2edab5df1ab818/crates/evm/evm/src/executors/mod.rs#L108
-	h.state.SetCode(VMAddr, []byte{0x00})
-	h.precompiles[VMAddr] = h.cheatcodes
+	h.state.SetCode(addresses.VMAddr, []byte{0x00})
+	h.precompiles[addresses.VMAddr] = h.cheatcodes
 
 	consolePrecompile, err := NewPrecompile[*ConsolePrecompile](&ConsolePrecompile{
 		logger: h.log,
@@ -299,7 +329,7 @@ func (h *Host) EnableCheats() error {
 		return fmt.Errorf("failed to init console precompile: %w", err)
 	}
 	h.console = consolePrecompile
-	h.precompiles[ConsoleAddr] = h.console
+	h.precompiles[addresses.ConsoleAddr] = h.console
 	// The Console precompile does not need bytecode,
 	// calls all go through a console lib, which avoids the EXTCODESIZE.
 	return nil
@@ -414,7 +444,7 @@ func (h *Host) ImportAccount(addr common.Address, account types.Account) {
 // getPrecompile overrides any accounts during runtime, to insert special precompiles, if activated.
 func (h *Host) getPrecompile(rules params.Rules, original vm.PrecompiledContract, addr common.Address) vm.PrecompiledContract {
 	if p, ok := h.precompiles[addr]; ok {
-		return p
+		return &AccessControlledPrecompile{h: h, inner: p}
 	}
 	return original
 }
@@ -462,7 +492,7 @@ func (h *Host) onEnter(depth int, typ byte, from common.Address, to common.Addre
 	if !parentCallFrame.Prank.Broadcast {
 		return
 	}
-	if to == VMAddr || to == ConsoleAddr { // no broadcasts to the cheatcode or console address
+	if to == addresses.VMAddr || to == addresses.ConsoleAddr { // no broadcasts to the cheatcode or console address
 		return
 	}
 
@@ -561,6 +591,13 @@ func (h *Host) unwindCallstack(depth int) {
 func (h *Host) onOpcode(pc uint64, op byte, gas, cost uint64, scope tracing.OpContext, rData []byte, depth int, err error) {
 	h.unwindCallstack(depth)
 	scopeCtx := scope.(*vm.ScopeContext)
+	if scopeCtx.Contract.IsDeployment {
+		// If we are not yet allowed access to cheatcodes, but if the caller is,
+		// and if this is a contract-creation, then we are automatically granted cheatcode access.
+		if !h.AllowedCheatcodes(scopeCtx.Address()) && h.AllowedCheatcodes(scopeCtx.Caller()) {
+			h.AllowCheatcodes(scopeCtx.Address())
+		}
+	}
 	// Check if we are entering a new depth, add it to the call-stack if so.
 	// We do this here, instead of onEnter, to capture an initialized scope.
 	if len(h.callStack) == 0 || h.callStack[len(h.callStack)-1].Depth < depth {
@@ -609,11 +646,11 @@ func (h *Host) onLog(ev *types.Log) {
 
 // CurrentCall returns the top of the callstack. Or zeroed if there was no call frame yet.
 // If zeroed, the call-frame has a nil scope context.
-func (h *Host) CurrentCall() CallFrame {
+func (h *Host) CurrentCall() *CallFrame {
 	if len(h.callStack) == 0 {
-		return CallFrame{}
+		return &CallFrame{}
 	}
-	return *h.callStack[len(h.callStack)-1]
+	return h.callStack[len(h.callStack)-1]
 }
 
 // MsgSender returns the msg.sender of the current active EVM call-frame,
@@ -652,27 +689,35 @@ func (h *Host) SetEnvVar(key string, value string) {
 // After flushing the EVM state also cannot revert to a previous snapshot state:
 // the state should not be dumped within contract-execution that needs to revert.
 func (h *Host) StateDump() (*foundry.ForgeAllocs, error) {
+	if id, ok := h.state.ActiveFork(); ok {
+		return nil, fmt.Errorf("cannot state-dump while fork %s is active", id)
+	}
+	baseState := h.baseState
 	// We have to commit the existing state to the trie,
 	// for all the state-changes to be captured by the trie iterator.
-	root, err := h.state.Commit(h.env.Context.BlockNumber.Uint64(), true)
+	root, err := baseState.Commit(h.env.Context.BlockNumber.Uint64(), true)
 	if err != nil {
 		return nil, fmt.Errorf("failed to commit state: %w", err)
 	}
 	// We need a state object around the state DB
-	st, err := state.New(root, h.stateDB)
+	st, err := state.New(root, baseState.Database())
 	if err != nil {
 		return nil, fmt.Errorf("failed to create state object for state-dumping: %w", err)
 	}
 	// After Commit we cannot reuse the old State, so we update the host to use the new one
-	h.state = st
-	h.env.StateDB = st
+	h.baseState = st
+	h.state.SubstituteBaseState(st)
 
+	// We use the new state object for state-dumping & future state-access, wrapped around
+	// the just committed trie that has all changes in it.
+	// I.e. the trie is committed and ready to provide all data,
+	// and the state is new and iterable, prepared specifically for FromState(state).
 	var allocs foundry.ForgeAllocs
 	allocs.FromState(st)
 
 	// Sanity check we have no lingering scripts.
-	for i := uint64(0); i <= allocs.Accounts[ScriptDeployer].Nonce; i++ {
-		scriptAddr := crypto.CreateAddress(ScriptDeployer, i)
+	for i := uint64(0); i <= allocs.Accounts[addresses.ScriptDeployer].Nonce; i++ {
+		scriptAddr := crypto.CreateAddress(addresses.ScriptDeployer, i)
 		h.log.Info("removing script from state-dump", "addr", scriptAddr, "label", h.labels[scriptAddr])
 		delete(allocs.Accounts, scriptAddr)
 	}
@@ -694,12 +739,12 @@ func (h *Host) StateDump() (*foundry.ForgeAllocs, error) {
 	}
 
 	// Remove the script deployer from the output
-	delete(allocs.Accounts, ScriptDeployer)
-	delete(allocs.Accounts, ForgeDeployer)
+	delete(allocs.Accounts, addresses.ScriptDeployer)
+	delete(allocs.Accounts, addresses.ForgeDeployer)
 
 	// The cheatcodes VM has a placeholder bytecode,
 	// because solidity checks if the code exists prior to regular EVM-calls to it.
-	delete(allocs.Accounts, VMAddr)
+	delete(allocs.Accounts, addresses.VMAddr)
 
 	// Precompile overrides come with temporary state account placeholders. Ignore those.
 	for addr := range h.precompiles {
@@ -776,7 +821,7 @@ func (h *Host) Label(addr common.Address, label string) {
 
 // NewScriptAddress creates a new address for the ScriptDeployer account, and bumps the nonce.
 func (h *Host) NewScriptAddress() common.Address {
-	deployer := ScriptDeployer
+	deployer := addresses.ScriptDeployer
 	deployNonce := h.state.GetNonce(deployer)
 	// compute address of script contract to be deployed
 	addr := crypto.CreateAddress(deployer, deployNonce)
diff --git a/op-chain-ops/script/script_test.go b/op-chain-ops/script/script_test.go
index 9d029c801060..dbeef794fe37 100644
--- a/op-chain-ops/script/script_test.go
+++ b/op-chain-ops/script/script_test.go
@@ -2,12 +2,18 @@ package script
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"math/big"
 	"strings"
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
+	"github.com/stretchr/testify/mock"
+
 	"github.com/holiman/uint256"
 	"github.com/stretchr/testify/require"
 
@@ -23,16 +29,27 @@ import (
 
 //go:generate ./testdata/generate.sh
 
+// MockRPCClient implements RPCClient interface for testing
+type MockRPCClient struct {
+	mock.Mock
+}
+
+func (m *MockRPCClient) CallContext(ctx context.Context, result any, method string, args ...any) error {
+	return m.Called(ctx, result, method, args).Error(0)
+}
+
 func TestScript(t *testing.T) {
 	logger, captLog := testlog.CaptureLogger(t, log.LevelInfo)
 	af := foundry.OpenArtifactsDir("./testdata/test-artifacts")
 
 	scriptContext := DefaultContext
 	h := NewHost(logger, af, nil, scriptContext)
+	require.NoError(t, h.EnableCheats())
+
 	addr, err := h.LoadContract("ScriptExample.s.sol", "ScriptExample")
 	require.NoError(t, err)
-
-	require.NoError(t, h.EnableCheats())
+	h.AllowCheatcodes(addr)
+	t.Logf("allowing %s to access cheatcodes", addr)
 
 	h.SetEnvVar("EXAMPLE_BOOL", "true")
 	input := bytes4("run()")
@@ -45,19 +62,19 @@ func TestScript(t *testing.T) {
 	require.NoError(t, h.cheatcodes.Precompile.DumpState("noop"))
 }
 
+func mustEncodeStringCalldata(t *testing.T, method, input string) []byte {
+	packer, err := abi.JSON(strings.NewReader(fmt.Sprintf(`[{"type":"function","name":"%s","inputs":[{"type":"string","name":"input"}]}]`, method)))
+	require.NoError(t, err)
+
+	data, err := packer.Pack(method, input)
+	require.NoError(t, err)
+	return data
+}
+
 func TestScriptBroadcast(t *testing.T) {
 	logger := testlog.Logger(t, log.LevelDebug)
 	af := foundry.OpenArtifactsDir("./testdata/test-artifacts")
 
-	mustEncodeCalldata := func(method, input string) []byte {
-		packer, err := abi.JSON(strings.NewReader(fmt.Sprintf(`[{"type":"function","name":"%s","inputs":[{"type":"string","name":"input"}]}]`, method)))
-		require.NoError(t, err)
-
-		data, err := packer.Pack(method, input)
-		require.NoError(t, err)
-		return data
-	}
-
 	fooBar, err := af.ReadArtifact("ScriptExample.s.sol", "FooBar")
 	require.NoError(t, err)
 
@@ -74,7 +91,7 @@ func TestScriptBroadcast(t *testing.T) {
 		{
 			From:    scriptAddr,
 			To:      scriptAddr,
-			Input:   mustEncodeCalldata("call1", "single_call1"),
+			Input:   mustEncodeStringCalldata(t, "call1", "single_call1"),
 			Value:   (*hexutil.U256)(uint256.NewInt(0)),
 			GasUsed: 23421,
 			Type:    BroadcastCall,
@@ -83,7 +100,7 @@ func TestScriptBroadcast(t *testing.T) {
 		{
 			From:    coffeeAddr,
 			To:      scriptAddr,
-			Input:   mustEncodeCalldata("call1", "startstop_call1"),
+			Input:   mustEncodeStringCalldata(t, "call1", "startstop_call1"),
 			Value:   (*hexutil.U256)(uint256.NewInt(0)),
 			GasUsed: 1521,
 			Type:    BroadcastCall,
@@ -92,7 +109,7 @@ func TestScriptBroadcast(t *testing.T) {
 		{
 			From:    coffeeAddr,
 			To:      scriptAddr,
-			Input:   mustEncodeCalldata("call2", "startstop_call2"),
+			Input:   mustEncodeStringCalldata(t, "call2", "startstop_call2"),
 			Value:   (*hexutil.U256)(uint256.NewInt(0)),
 			GasUsed: 1565,
 			Type:    BroadcastCall,
@@ -101,7 +118,7 @@ func TestScriptBroadcast(t *testing.T) {
 		{
 			From:    common.HexToAddress("0x1234"),
 			To:      scriptAddr,
-			Input:   mustEncodeCalldata("nested1", "nested"),
+			Input:   mustEncodeStringCalldata(t, "nested1", "nested"),
 			Value:   (*hexutil.U256)(uint256.NewInt(0)),
 			GasUsed: 2763,
 			Type:    BroadcastCall,
@@ -142,10 +159,11 @@ func TestScriptBroadcast(t *testing.T) {
 		broadcasts = append(broadcasts, broadcast)
 	}
 	h := NewHost(logger, af, nil, DefaultContext, WithBroadcastHook(hook), WithCreate2Deployer())
+	require.NoError(t, h.EnableCheats())
+
 	addr, err := h.LoadContract("ScriptExample.s.sol", "ScriptExample")
 	require.NoError(t, err)
-
-	require.NoError(t, h.EnableCheats())
+	h.AllowCheatcodes(addr)
 
 	input := bytes4("runBroadcast()")
 	returnData, _, err := h.Call(senderAddr, addr, input[:], DefaultFoundryGasLimit, uint256.NewInt(0))
@@ -168,3 +186,163 @@ func TestScriptBroadcast(t *testing.T) {
 	// address that will perform the send to the Create2Deployer.
 	require.EqualValues(t, 1, h.GetNonce(cafeAddr))
 }
+
+func TestScriptStateDump(t *testing.T) {
+	logger := testlog.Logger(t, log.LevelDebug)
+	af := foundry.OpenArtifactsDir("./testdata/test-artifacts")
+
+	h := NewHost(logger, af, nil, DefaultContext)
+	require.NoError(t, h.EnableCheats())
+
+	addr, err := h.LoadContract("ScriptExample.s.sol", "ScriptExample")
+	require.NoError(t, err)
+	h.AllowCheatcodes(addr)
+
+	counterStorageSlot := common.Hash{}
+
+	dump, err := h.StateDump()
+	require.NoError(t, err, "dump 1")
+	require.Contains(t, dump.Accounts, addr, "has contract")
+	require.NotContains(t, dump.Accounts[addr].Storage, counterStorageSlot, "not counted yet")
+
+	dat := mustEncodeStringCalldata(t, "call1", "call A")
+	returnData, _, err := h.Call(addresses.DefaultSenderAddr, addr, dat, DefaultFoundryGasLimit, uint256.NewInt(0))
+	require.NoError(t, err, "call A failed: %x", string(returnData))
+
+	dump, err = h.StateDump()
+	require.NoError(t, err, "dump 2")
+	require.Contains(t, dump.Accounts, addr, "has contract")
+	require.Equal(t, dump.Accounts[addr].Storage[counterStorageSlot], common.Hash{31: 1}, "counted to 1")
+
+	dat = mustEncodeStringCalldata(t, "call1", "call B")
+	returnData, _, err = h.Call(addresses.DefaultSenderAddr, addr, dat, DefaultFoundryGasLimit, uint256.NewInt(0))
+	require.NoError(t, err, "call B failed: %x", string(returnData))
+
+	dump, err = h.StateDump()
+	require.NoError(t, err, "dump 3")
+	require.Contains(t, dump.Accounts, addr, "has contract")
+	require.Equal(t, dump.Accounts[addr].Storage[counterStorageSlot], common.Hash{31: 2}, "counted to 2")
+}
+
+type forkConfig struct {
+	blockNum     uint64
+	stateRoot    common.Hash
+	blockHash    common.Hash
+	nonce        uint64
+	storageValue *big.Int
+	code         []byte
+	balance      uint64
+}
+
+func TestForkingScript(t *testing.T) {
+	logger := testlog.Logger(t, log.LevelInfo)
+	af := foundry.OpenArtifactsDir("./testdata/test-artifacts")
+
+	forkedContract, err := af.ReadArtifact("ScriptExample.s.sol", "ForkedContract")
+	require.NoError(t, err)
+	code := forkedContract.DeployedBytecode.Object
+
+	fork1Config := forkConfig{
+		blockNum:     12345,
+		stateRoot:    common.HexToHash("0x1111"),
+		blockHash:    common.HexToHash("0x2222"),
+		nonce:        12345,
+		storageValue: big.NewInt(1),
+		code:         code,
+		balance:      1,
+	}
+
+	fork2Config := forkConfig{
+		blockNum:     23456,
+		stateRoot:    common.HexToHash("0x3333"),
+		blockHash:    common.HexToHash("0x4444"),
+		nonce:        23456,
+		storageValue: big.NewInt(2),
+		code:         code,
+		balance:      2,
+	}
+
+	// Map of URL/alias to RPC client
+	rpcClients := map[string]*MockRPCClient{
+		"fork1": setupMockRPC(fork1Config),
+		"fork2": setupMockRPC(fork2Config),
+	}
+	forkHook := func(opts *ForkConfig) (forking.ForkSource, error) {
+		client, ok := rpcClients[opts.URLOrAlias]
+		if !ok {
+			return nil, fmt.Errorf("unknown fork URL/alias: %s", opts.URLOrAlias)
+		}
+		return forking.RPCSourceByNumber(opts.URLOrAlias, client, *opts.BlockNumber)
+	}
+
+	scriptContext := DefaultContext
+	h := NewHost(logger, af, nil, scriptContext, WithForkHook(forkHook))
+	require.NoError(t, h.EnableCheats())
+
+	addr, err := h.LoadContract("ScriptExample.s.sol", "ForkTester")
+	require.NoError(t, err)
+	h.AllowCheatcodes(addr)
+	// Make this script persistent so it doesn't call the fork RPC.
+	h.state.MakePersistent(addr)
+	t.Logf("allowing %s to access cheatcodes", addr)
+
+	input := bytes4("run()")
+	returnData, _, err := h.Call(scriptContext.Sender, addr, input[:], DefaultFoundryGasLimit, uint256.NewInt(0))
+	require.NoError(t, err, "call failed: %x", string(returnData))
+
+	for _, client := range rpcClients {
+		client.AssertExpectations(t)
+	}
+}
+
+// setupMockRPC creates a mock RPC client with the specified fork configuration
+func setupMockRPC(config forkConfig) *MockRPCClient {
+	mockRPC := new(MockRPCClient)
+	testAddr := common.HexToAddress("0x1234")
+
+	forkArgs := []any{testAddr, config.blockHash}
+
+	// Mock block header
+	mockRPC.On("CallContext", mock.Anything, mock.AnythingOfType("**forking.Header"),
+		"eth_getBlockByNumber", []any{hexutil.Uint64(config.blockNum), false}).
+		Run(func(args mock.Arguments) {
+			result := args.Get(1).(**forking.Header)
+			*result = &forking.Header{
+				StateRoot: config.stateRoot,
+				BlockHash: config.blockHash,
+			}
+		}).Return(nil).Once()
+
+	mockRPC.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.Uint64"),
+		"eth_getTransactionCount", forkArgs).
+		Run(func(args mock.Arguments) {
+			result := args.Get(1).(*hexutil.Uint64)
+			*result = hexutil.Uint64(config.nonce)
+		}).Return(nil)
+
+	// Mock balance
+	mockRPC.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.U256"),
+		"eth_getBalance", forkArgs).
+		Run(func(args mock.Arguments) {
+			result := args.Get(1).(*hexutil.U256)
+			*result = hexutil.U256(*uint256.NewInt(config.balance))
+		}).Return(nil)
+
+	// Mock contract code
+	mockRPC.On("CallContext", mock.Anything, mock.AnythingOfType("*hexutil.Bytes"),
+		"eth_getCode", forkArgs).
+		Run(func(args mock.Arguments) {
+			result := args.Get(1).(*hexutil.Bytes)
+			*result = config.code
+		}).Return(nil)
+
+	// Mock storage value
+	mockRPC.On("CallContext", mock.Anything, mock.AnythingOfType("*common.Hash"),
+		"eth_getStorageAt", []any{testAddr, common.Hash{}, config.blockHash}).
+		Run(func(args mock.Arguments) {
+			result := args.Get(1).(*common.Hash)
+			*result = common.BigToHash(config.storageValue)
+		}).Return(nil)
+
+	return mockRPC
+}
diff --git a/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol b/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
index f9ea6239d433..2f636afb2be3 100644
--- a/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
+++ b/op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
@@ -13,6 +13,10 @@ interface Vm {
     function startBroadcast(address msgSender) external;
     function startBroadcast() external;
     function stopBroadcast() external;
+    function getDeployedCode(string calldata artifactPath) external view returns (bytes memory runtimeBytecode);
+    function etch(address target, bytes calldata newRuntimeBytecode) external;
+    function allowCheatcodes(address account) external;
+    function createSelectFork(string calldata forkName, uint256 blockNumber) external returns (uint256);
 }
 
 // console is a minimal version of the console2 lib.
@@ -96,6 +100,13 @@ contract ScriptExample {
         vm.stopPrank();
         this.hello("from original again");
 
+        // vm.etch should not give cheatcode access, unless allowed to afterwards
+        address tmpNonceGetter = address(uint160(uint256(keccak256("temp nonce test getter"))));
+        vm.etch(tmpNonceGetter, vm.getDeployedCode("ScriptExample.s.sol:NonceGetter"));
+        vm.allowCheatcodes(tmpNonceGetter);
+        uint256 v = NonceGetter(tmpNonceGetter).getNonce(address(this));
+        console.log("nonce from nonce getter, no explicit access required with vm.etch:", v);
+
         console.log("done!");
     }
 
@@ -177,3 +188,44 @@ contract FooBar {
         foo = v;
     }
 }
+
+contract NonceGetter {
+    address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
+    Vm internal constant vm = Vm(VM_ADDRESS);
+
+    function getNonce(address _addr) public view returns (uint256) {
+        return vm.getNonce(_addr);
+    }
+}
+
+contract ForkedContract {
+    uint256 internal v;
+
+    constructor() {
+        v = 1;
+    }
+
+    function getValue() public view returns (uint256) {
+        return v;
+    }
+}
+
+contract ForkTester {
+    address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code"))));
+    Vm internal constant vm = Vm(VM_ADDRESS);
+
+    function run() external {
+        address testAddr = address(uint160(0x1234));
+        ForkedContract fc = ForkedContract(testAddr);
+
+        vm.createSelectFork("fork1", 12345);
+        require(vm.getNonce(testAddr) == 12345, "nonce should be 12345");
+        require(fc.getValue() == 1, "value should be 1");
+        require(testAddr.balance == uint256(1), "balance should be 1");
+
+        vm.createSelectFork("fork2", 23456);
+        require(vm.getNonce(testAddr) == 23456, "nonce should be 12345");
+        require(fc.getValue() == 2, "value should be 2");
+        require(testAddr.balance == uint256(2), "balance should be 2");
+    }
+}
\ No newline at end of file
diff --git a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/FooBar.json b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/FooBar.json
index ad4ac1569433..249588154e11 100644
--- a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/FooBar.json
+++ b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/FooBar.json
@@ -1 +1 @@
-{"abi":[{"type":"constructor","inputs":[{"name":"v","type":"uint256","internalType":"uint256"}],"stateMutability":"nonpayable"},{"type":"function","name":"foo","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"}],"bytecode":{"object":"0x608060405234801561001057600080fd5b506040516100b23803806100b283398101604081905261002f91610037565b600055610050565b60006020828403121561004957600080fd5b5051919050565b60548061005e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000a","sourceMap":"5902:96:0:-:0;;;5949:47;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;5982:3;:7;5902:96;;14:184:1;84:6;137:2;125:9;116:7;112:23;108:32;105:52;;;153:1;150;143:12;105:52;-1:-1:-1;176:16:1;;14:184;-1:-1:-1;14:184:1:o;:::-;5902:96:0;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000a","sourceMap":"5902:96:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5924:18;;;;;;;;;160:25:1;;;148:2;133:18;5924::0;;;;;;","linkReferences":{}},"methodIdentifiers":{"foo()":"c2985578"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"v\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"foo\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"FooBar\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3\",\"dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"v","type":"uint256"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"stateMutability":"view","type":"function","name":"foo","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"FooBar"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d","urls":["bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3","dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[{"astId":708,"contract":"scripts/ScriptExample.s.sol:FooBar","label":"foo","offset":0,"slot":"0","type":"t_uint256"}],"types":{"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":720,"exportedSymbols":{"FooBar":[719],"ScriptExample":[706],"Vm":[55],"console":[192]},"nodeType":"SourceUnit","src":"32:5967:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":55,"nodeType":"ContractDefinition","src":"120:616:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":55,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[55],"name":"Vm","nameLocation":"130:2:0","scope":720,"usedErrors":[]},{"id":192,"nodeType":"ContractDefinition","src":"791:1622:0","nodes":[{"id":61,"nodeType":"VariableDeclaration","src":"813:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"830:15:0","scope":192,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":56,"name":"address","nodeType":"ElementaryTypeName","src":"813:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":59,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"856:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":58,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"848:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":57,"name":"address","nodeType":"ElementaryTypeName","src":"848:7:0","typeDescriptions":{}}},"id":60,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"848:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":78,"nodeType":"FunctionDefinition","src":"906:221:0","nodes":[],"body":{"id":77,"nodeType":"Block","src":"1065:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1084:37:0","statements":[{"nodeType":"YulAssignment","src":"1098:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1107:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1098:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":67,"isOffset":false,"isSlot":false,"src":"1107:4:0","valueSize":1},{"declaration":74,"isOffset":false,"isSlot":false,"src":"1098:5:0","valueSize":1}],"id":76,"nodeType":"InlineAssembly","src":"1075:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"915:25:0","parameters":{"id":68,"nodeType":"ParameterList","parameters":[{"constant":false,"id":67,"mutability":"mutable","name":"fnIn","nameLocation":"987:4:0","nodeType":"VariableDeclaration","scope":78,"src":"950:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":66,"nodeType":"FunctionTypeName","parameterTypes":{"id":64,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":66,"src":"959:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":62,"name":"bytes","nodeType":"ElementaryTypeName","src":"959:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"958:14:0"},"returnParameterTypes":{"id":65,"nodeType":"ParameterList","parameters":[],"src":"987:0:0"},"src":"950:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"940:57:0"},"returnParameters":{"id":75,"nodeType":"ParameterList","parameters":[{"constant":false,"id":74,"mutability":"mutable","name":"fnOut","nameLocation":"1058:5:0","nodeType":"VariableDeclaration","scope":78,"src":"1021:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":73,"nodeType":"FunctionTypeName","parameterTypes":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":73,"src":"1030:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":69,"name":"bytes","nodeType":"ElementaryTypeName","src":"1030:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1029:14:0"},"returnParameterTypes":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"1058:0:0"},"src":"1021:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1020:44:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":90,"nodeType":"FunctionDefinition","src":"1133:133:0","nodes":[],"body":{"id":89,"nodeType":"Block","src":"1194:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":86,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":80,"src":"1251:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":84,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1230:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":83,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":78,"src":"1204:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":85,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":87,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":88,"nodeType":"ExpressionStatement","src":"1204:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1142:15:0","parameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"payload","nameLocation":"1171:7:0","nodeType":"VariableDeclaration","scope":90,"src":"1158:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":79,"name":"bytes","nodeType":"ElementaryTypeName","src":"1158:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1157:22:0"},"returnParameters":{"id":82,"nodeType":"ParameterList","parameters":[],"src":"1194:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1272:380:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1336:316:0","nodes":[],"statements":[{"assignments":[96],"declarations":[{"constant":false,"id":96,"mutability":"mutable","name":"payloadLength","nameLocation":"1354:13:0","nodeType":"VariableDeclaration","scope":105,"src":"1346:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":95,"name":"uint256","nodeType":"ElementaryTypeName","src":"1346:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":99,"initialValue":{"expression":{"id":97,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":92,"src":"1370:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":98,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1370:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1346:38:0"},{"assignments":[101],"declarations":[{"constant":false,"id":101,"mutability":"mutable","name":"consoleAddress","nameLocation":"1402:14:0","nodeType":"VariableDeclaration","scope":105,"src":"1394:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":100,"name":"address","nodeType":"ElementaryTypeName","src":"1394:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":103,"initialValue":{"id":102,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":61,"src":"1419:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1394:40:0"},{"AST":{"nodeType":"YulBlock","src":"1496:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1510:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1534:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1543:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1530:3:0"},"nodeType":"YulFunctionCall","src":"1530:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1514:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1559:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1579:3:0"},"nodeType":"YulFunctionCall","src":"1579:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1586:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1602:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1616:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1631:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"1634:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1568:10:0"},"nodeType":"YulFunctionCall","src":"1568:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1563:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":101,"isOffset":false,"isSlot":false,"src":"1586:14:0","valueSize":1},{"declaration":92,"isOffset":false,"isSlot":false,"src":"1534:7:0","valueSize":1},{"declaration":96,"isOffset":false,"isSlot":false,"src":"1616:13:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1487:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1281:19:0","parameters":{"id":93,"nodeType":"ParameterList","parameters":[{"constant":false,"id":92,"mutability":"mutable","name":"payload","nameLocation":"1314:7:0","nodeType":"VariableDeclaration","scope":106,"src":"1301:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":91,"name":"bytes","nodeType":"ElementaryTypeName","src":"1301:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1300:22:0"},"returnParameters":{"id":94,"nodeType":"ParameterList","parameters":[],"src":"1336:0:0"},"scope":192,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":120,"nodeType":"FunctionDefinition","src":"1658:121:0","nodes":[],"body":{"id":119,"nodeType":"Block","src":"1703:76:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":114,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1753:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":115,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1768:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":112,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1729:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":113,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1729:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":116,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1729:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":111,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1713:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":117,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1713:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":118,"nodeType":"ExpressionStatement","src":"1713:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1667:3:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"p0","nameLocation":"1685:2:0","nodeType":"VariableDeclaration","scope":120,"src":"1671:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":107,"name":"string","nodeType":"ElementaryTypeName","src":"1671:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"1670:18:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":137,"nodeType":"FunctionDefinition","src":"1785:139:0","nodes":[],"body":{"id":136,"nodeType":"Block","src":"1839:85:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":130,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1889:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":131,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":122,"src":"1909:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":132,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":124,"src":"1913:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":128,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1865:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":129,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1865:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":133,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1865:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":127,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1849:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":134,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1849:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":135,"nodeType":"ExpressionStatement","src":"1849:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1794:3:0","parameters":{"id":125,"nodeType":"ParameterList","parameters":[{"constant":false,"id":122,"mutability":"mutable","name":"p0","nameLocation":"1812:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1798:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":121,"name":"string","nodeType":"ElementaryTypeName","src":"1798:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":124,"mutability":"mutable","name":"p1","nameLocation":"1821:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1816:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":123,"name":"bool","nodeType":"ElementaryTypeName","src":"1816:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"1797:27:0"},"returnParameters":{"id":126,"nodeType":"ParameterList","parameters":[],"src":"1839:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":154,"nodeType":"FunctionDefinition","src":"1930:145:0","nodes":[],"body":{"id":153,"nodeType":"Block","src":"1987:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":147,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2037:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":148,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":139,"src":"2060:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":149,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":141,"src":"2064:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":145,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2013:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":146,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2013:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":150,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2013:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":144,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1997:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":151,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1997:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":152,"nodeType":"ExpressionStatement","src":"1997:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1939:3:0","parameters":{"id":142,"nodeType":"ParameterList","parameters":[{"constant":false,"id":139,"mutability":"mutable","name":"p0","nameLocation":"1957:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1943:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":138,"name":"string","nodeType":"ElementaryTypeName","src":"1943:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":141,"mutability":"mutable","name":"p1","nameLocation":"1969:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1961:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":140,"name":"uint256","nodeType":"ElementaryTypeName","src":"1961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1942:30:0"},"returnParameters":{"id":143,"nodeType":"ParameterList","parameters":[],"src":"1987:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":171,"nodeType":"FunctionDefinition","src":"2081:145:0","nodes":[],"body":{"id":170,"nodeType":"Block","src":"2138:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":164,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2188:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":165,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":156,"src":"2211:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":166,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":158,"src":"2215:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":162,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2164:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":163,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2164:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":167,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2164:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":161,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2148:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":168,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2148:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":169,"nodeType":"ExpressionStatement","src":"2148:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2090:3:0","parameters":{"id":159,"nodeType":"ParameterList","parameters":[{"constant":false,"id":156,"mutability":"mutable","name":"p0","nameLocation":"2108:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2094:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":155,"name":"string","nodeType":"ElementaryTypeName","src":"2094:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":158,"mutability":"mutable","name":"p1","nameLocation":"2120:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2112:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":157,"name":"address","nodeType":"ElementaryTypeName","src":"2112:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2093:30:0"},"returnParameters":{"id":160,"nodeType":"ParameterList","parameters":[],"src":"2138:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":191,"nodeType":"FunctionDefinition","src":"2232:179:0","nodes":[],"body":{"id":190,"nodeType":"Block","src":"2313:98:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":183,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2363:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":184,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":173,"src":"2392:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":185,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":175,"src":"2396:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":186,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":177,"src":"2400:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":181,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2339:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":182,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2339:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":187,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2339:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":180,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2323:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":188,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2323:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":189,"nodeType":"ExpressionStatement","src":"2323:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2241:3:0","parameters":{"id":178,"nodeType":"ParameterList","parameters":[{"constant":false,"id":173,"mutability":"mutable","name":"p0","nameLocation":"2259:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2245:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":172,"name":"string","nodeType":"ElementaryTypeName","src":"2245:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":175,"mutability":"mutable","name":"p1","nameLocation":"2277:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2263:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":174,"name":"string","nodeType":"ElementaryTypeName","src":"2263:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":177,"mutability":"mutable","name":"p2","nameLocation":"2295:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2281:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":176,"name":"string","nodeType":"ElementaryTypeName","src":"2281:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2244:54:0"},"returnParameters":{"id":179,"nodeType":"ParameterList","parameters":[],"src":"2313:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[192],"name":"console","nameLocation":"799:7:0","scope":720,"usedErrors":[]},{"id":706,"nodeType":"ContractDefinition","src":"2541:3359:0","nodes":[{"id":207,"nodeType":"VariableDeclaration","src":"2571:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"2597:10:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":194,"name":"address","nodeType":"ElementaryTypeName","src":"2571:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":202,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2644:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":201,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"2634:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":203,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2634:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":200,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2626:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":199,"name":"uint256","nodeType":"ElementaryTypeName","src":"2626:7:0","typeDescriptions":{}}},"id":204,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2626:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":198,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2618:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":197,"name":"uint160","nodeType":"ElementaryTypeName","src":"2618:7:0","typeDescriptions":{}}},"id":205,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2618:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":196,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2610:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":195,"name":"address","nodeType":"ElementaryTypeName","src":"2610:7:0","typeDescriptions":{}}},"id":206,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2610:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":213,"nodeType":"VariableDeclaration","src":"2671:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"2692:2:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"},"typeName":{"id":209,"nodeType":"UserDefinedTypeName","pathNode":{"id":208,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":55,"src":"2671:2:0"},"referencedDeclaration":55,"src":"2671:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"value":{"arguments":[{"id":211,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":207,"src":"2700:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":210,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":55,"src":"2697:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$55_$","typeString":"type(contract Vm)"}},"id":212,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2697:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"visibility":"internal"},{"id":215,"nodeType":"VariableDeclaration","src":"2775:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"2790:7:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":214,"name":"uint256","nodeType":"ElementaryTypeName","src":"2775:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":378,"nodeType":"FunctionDefinition","src":"2887:949:0","nodes":[],"body":{"id":377,"nodeType":"Block","src":"2909:927:0","nodes":[],"statements":[{"assignments":[220],"declarations":[{"constant":false,"id":220,"mutability":"mutable","name":"x","nameLocation":"2924:1:0","nodeType":"VariableDeclaration","scope":377,"src":"2919:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":219,"name":"bool","nodeType":"ElementaryTypeName","src":"2919:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":226,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":223,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2937:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":224,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"2953:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":221,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"2928:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":222,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"2928:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":225,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2928:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"2919:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2981:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":231,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3004:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":227,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"2969:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":229,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":137,"src":"2969:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":232,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2969:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":233,"nodeType":"ExpressionStatement","src":"2969:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":237,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3029:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":240,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3054:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":239,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3046:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":238,"name":"address","nodeType":"ElementaryTypeName","src":"3046:7:0","typeDescriptions":{}}},"id":241,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3046:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":234,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3017:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":236,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3017:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":242,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3017:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":243,"nodeType":"ExpressionStatement","src":"3017:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":247,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3082:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":252,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3120:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":251,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3112:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":250,"name":"address","nodeType":"ElementaryTypeName","src":"3112:7:0","typeDescriptions":{}}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3112:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":248,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3100:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":249,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3100:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":254,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3100:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":244,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3070:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":246,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3070:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":255,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3070:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":256,"nodeType":"ExpressionStatement","src":"3070:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":260,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3149:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":263,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3172:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3172:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":262,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3164:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":261,"name":"address","nodeType":"ElementaryTypeName","src":"3164:7:0","typeDescriptions":{}}},"id":265,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3164:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":257,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3137:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":259,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3137:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":266,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3137:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":267,"nodeType":"ExpressionStatement","src":"3137:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":271,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3206:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":276,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3242:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3242:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":275,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3234:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":274,"name":"address","nodeType":"ElementaryTypeName","src":"3234:7:0","typeDescriptions":{}}},"id":278,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3234:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":272,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3222:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":273,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3222:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":279,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3222:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":268,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3194:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3194:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":280,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3194:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":281,"nodeType":"ExpressionStatement","src":"3194:61:0"},{"assignments":[283],"declarations":[{"constant":false,"id":283,"mutability":"mutable","name":"json","nameLocation":"3280:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3266:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":282,"name":"string","nodeType":"ElementaryTypeName","src":"3266:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":285,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":284,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3287:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3266:55:0"},{"assignments":[290],"declarations":[{"constant":false,"id":290,"mutability":"mutable","name":"keys","nameLocation":"3347:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3331:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":288,"name":"string","nodeType":"ElementaryTypeName","src":"3331:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":289,"nodeType":"ArrayTypeName","src":"3331:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":296,"initialValue":{"arguments":[{"id":293,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":283,"src":"3371:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":294,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3377:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":291,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3354:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3354:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":295,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3354:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3331:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":300,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3414:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":301,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3422:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":303,"indexExpression":{"hexValue":"30","id":302,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3427:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3422:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":304,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3431:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":306,"indexExpression":{"hexValue":"31","id":305,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3436:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3431:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":297,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3402:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":299,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":191,"src":"3402:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3402:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":308,"nodeType":"ExpressionStatement","src":"3402:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3461:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":309,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3450:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":311,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3450:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":313,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3450:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":314,"nodeType":"ExpressionStatement","src":"3450:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3517:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":321,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3509:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":320,"name":"uint160","nodeType":"ElementaryTypeName","src":"3509:7:0","typeDescriptions":{}}},"id":323,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":319,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3501:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":318,"name":"address","nodeType":"ElementaryTypeName","src":"3501:7:0","typeDescriptions":{}}},"id":324,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3501:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":315,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3487:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":317,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"3487:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":325,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3487:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":326,"nodeType":"ExpressionStatement","src":"3487:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3545:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":327,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3534:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":329,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3534:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":331,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3534:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":332,"nodeType":"ExpressionStatement","src":"3534:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":336,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3582:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":339,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3617:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":340,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3617:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":338,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3609:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":337,"name":"address","nodeType":"ElementaryTypeName","src":"3609:7:0","typeDescriptions":{}}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3609:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":333,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3570:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3570:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":342,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3570:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":343,"nodeType":"ExpressionStatement","src":"3570:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":347,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3651:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":350,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3689:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3681:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":348,"name":"address","nodeType":"ElementaryTypeName","src":"3681:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":344,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3639:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":346,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3639:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":352,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3639:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":353,"nodeType":"ExpressionStatement","src":"3639:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":357,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3716:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":354,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3705:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":356,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3705:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":358,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3705:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":359,"nodeType":"ExpressionStatement","src":"3705:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":360,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3741:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":362,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"3741:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3741:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":364,"nodeType":"ExpressionStatement","src":"3741:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":368,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3776:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":365,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3765:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":367,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3765:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3765:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":370,"nodeType":"ExpressionStatement","src":"3765:33:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":374,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3821:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":371,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3809:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":373,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"3809:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":375,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3809:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":376,"nodeType":"ExpressionStatement","src":"3809:20:0"}]},"documentation":{"id":216,"nodeType":"StructuredDocumentation","src":"2804:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"2896:3:0","parameters":{"id":217,"nodeType":"ParameterList","parameters":[],"src":"2899:2:0"},"returnParameters":{"id":218,"nodeType":"ParameterList","parameters":[],"src":"2909:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":609,"nodeType":"FunctionDefinition","src":"3903:1258:0","nodes":[],"body":{"id":608,"nodeType":"Block","src":"3934:1227:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3956:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":392,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3999:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":391,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3991:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":390,"name":"address","nodeType":"ElementaryTypeName","src":"3991:7:0","typeDescriptions":{}}},"id":393,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3991:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3979:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":389,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3979:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":394,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3979:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":387,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3971:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":386,"name":"uint256","nodeType":"ElementaryTypeName","src":"3971:7:0","typeDescriptions":{}}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3971:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":382,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3944:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3944:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":396,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3944:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":397,"nodeType":"ExpressionStatement","src":"3944:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":401,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4030:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":398,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4018:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":400,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4018:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":402,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4018:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":403,"nodeType":"ExpressionStatement","src":"4018:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":404,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4057:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":406,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"4057:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":407,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4057:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":408,"nodeType":"ExpressionStatement","src":"4057:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4092:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":409,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4081:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":411,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4081:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":413,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4081:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":414,"nodeType":"ExpressionStatement","src":"4081:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":418,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4128:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":415,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4117:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":417,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4117:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4117:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":420,"nodeType":"ExpressionStatement","src":"4117:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":424,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4166:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":421,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4154:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":423,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4154:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":425,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4154:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":426,"nodeType":"ExpressionStatement","src":"4154:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":434,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4231:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":433,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4223:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":432,"name":"uint160","nodeType":"ElementaryTypeName","src":"4223:7:0","typeDescriptions":{}}},"id":435,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4223:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":431,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4215:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":430,"name":"address","nodeType":"ElementaryTypeName","src":"4215:7:0","typeDescriptions":{}}},"id":436,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4215:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":427,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4197:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":429,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4197:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":437,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4197:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":438,"nodeType":"ExpressionStatement","src":"4197:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":442,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4263:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":439,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4252:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":441,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4252:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":443,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4252:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":444,"nodeType":"ExpressionStatement","src":"4252:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":448,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4302:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":445,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4291:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4291:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":449,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4291:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":450,"nodeType":"ExpressionStatement","src":"4291:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":454,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4344:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":451,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4330:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":705,"src":"4330:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":455,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4330:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":456,"nodeType":"ExpressionStatement","src":"4330:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":457,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4371:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":459,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4371:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":460,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4371:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":461,"nodeType":"ExpressionStatement","src":"4371:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":465,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4410:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":462,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4399:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":464,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4399:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":466,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4399:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":467,"nodeType":"ExpressionStatement","src":"4399:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":471,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4451:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":468,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4439:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":470,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4439:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4439:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":473,"nodeType":"ExpressionStatement","src":"4439:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":481,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4512:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":480,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4504:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":479,"name":"uint160","nodeType":"ElementaryTypeName","src":"4504:7:0","typeDescriptions":{}}},"id":482,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4504:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":478,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4496:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":477,"name":"address","nodeType":"ElementaryTypeName","src":"4496:7:0","typeDescriptions":{}}},"id":483,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4496:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":474,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4478:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":476,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4478:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4478:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":485,"nodeType":"ExpressionStatement","src":"4478:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":489,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4544:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":486,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4531:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":488,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":678,"src":"4531:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":490,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4531:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":491,"nodeType":"ExpressionStatement","src":"4531:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":492,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4563:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":494,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4563:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4563:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":496,"nodeType":"ExpressionStatement","src":"4563:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":500,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4604:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":497,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4592:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":499,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4592:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4592:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":502,"nodeType":"ExpressionStatement","src":"4592:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":510,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4665:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4657:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":508,"name":"uint160","nodeType":"ElementaryTypeName","src":"4657:7:0","typeDescriptions":{}}},"id":511,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":507,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4649:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":506,"name":"address","nodeType":"ElementaryTypeName","src":"4649:7:0","typeDescriptions":{}}},"id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4649:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":503,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4636:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":505,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4636:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":513,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4636:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":514,"nodeType":"ExpressionStatement","src":"4636:40:0"},{"assignments":[517],"declarations":[{"constant":false,"id":517,"mutability":"mutable","name":"x","nameLocation":"4693:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4686:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":516,"nodeType":"UserDefinedTypeName","pathNode":{"id":515,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4686:6:0"},"referencedDeclaration":719,"src":"4686:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":523,"initialValue":{"arguments":[{"hexValue":"31323334","id":521,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4708:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":520,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4697:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":519,"nodeType":"UserDefinedTypeName","pathNode":{"id":518,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4701:6:0"},"referencedDeclaration":719,"src":"4701:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":522,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4697:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4686:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":529,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":525,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":517,"src":"4731:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":526,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4731:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4731:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":528,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4742:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4731:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":524,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4723:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":530,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4723:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":531,"nodeType":"ExpressionStatement","src":"4723:24:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":535,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4770:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":532,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4758:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":534,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4758:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":536,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4758:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":537,"nodeType":"ExpressionStatement","src":"4758:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":545,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4820:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":544,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4812:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":543,"name":"uint160","nodeType":"ElementaryTypeName","src":"4812:7:0","typeDescriptions":{}}},"id":546,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4812:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":542,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4804:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":541,"name":"address","nodeType":"ElementaryTypeName","src":"4804:7:0","typeDescriptions":{}}},"id":547,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4804:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":538,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4791:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":540,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4791:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4791:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":549,"nodeType":"ExpressionStatement","src":"4791:38:0"},{"assignments":[552],"declarations":[{"constant":false,"id":552,"mutability":"mutable","name":"y","nameLocation":"4846:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4839:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":551,"nodeType":"UserDefinedTypeName","pathNode":{"id":550,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4839:6:0"},"referencedDeclaration":719,"src":"4839:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":566,"initialValue":{"arguments":[{"hexValue":"31323334","id":564,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4889:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":555,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4850:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":554,"nodeType":"UserDefinedTypeName","pathNode":{"id":553,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4854:6:0"},"referencedDeclaration":719,"src":"4854:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":563,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4883:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":559,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4875:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":558,"name":"uint256","nodeType":"ElementaryTypeName","src":"4875:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4875:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":557,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4867:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":556,"name":"bytes32","nodeType":"ElementaryTypeName","src":"4867:7:0","typeDescriptions":{}}},"id":562,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4867:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"4850:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":565,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4850:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4839:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":568,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":552,"src":"4912:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":569,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4912:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":570,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4912:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":571,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4923:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4912:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":567,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4904:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4904:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"4904:24:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4950:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4938:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4938:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4938:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"4938:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5042:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5042:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":584,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5042:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":585,"nodeType":"ExpressionStatement","src":"5042:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5077:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":588,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5066:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":587,"nodeType":"UserDefinedTypeName","pathNode":{"id":586,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"5070:6:0"},"referencedDeclaration":719,"src":"5070:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":590,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5066:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":591,"nodeType":"ExpressionStatement","src":"5066:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":595,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5105:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":602,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5146:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":601,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5138:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":600,"name":"address","nodeType":"ElementaryTypeName","src":"5138:7:0","typeDescriptions":{}}},"id":603,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5138:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":598,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5126:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":599,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5126:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5126:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":597,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5118:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":596,"name":"uint256","nodeType":"ElementaryTypeName","src":"5118:7:0","typeDescriptions":{}}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5118:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":592,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5093:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":594,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"5093:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":606,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5093:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":607,"nodeType":"ExpressionStatement","src":"5093:61:0"}]},"documentation":{"id":379,"nodeType":"StructuredDocumentation","src":"3842:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"3912:12:0","parameters":{"id":380,"nodeType":"ParameterList","parameters":[],"src":"3924:2:0"},"returnParameters":{"id":381,"nodeType":"ParameterList","parameters":[],"src":"3934:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":633,"nodeType":"FunctionDefinition","src":"5256:143:0","nodes":[],"body":{"id":632,"nodeType":"Block","src":"5305:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":618,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":612,"src":"5327:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":615,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5315:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":617,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5315:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5315:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":620,"nodeType":"ExpressionStatement","src":"5315:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5352:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":627,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"5380:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":628,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"5380:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":626,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5372:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":625,"name":"address","nodeType":"ElementaryTypeName","src":"5372:7:0","typeDescriptions":{}}},"id":629,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5372:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":621,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5340:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":623,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"5340:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":630,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5340:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":631,"nodeType":"ExpressionStatement","src":"5340:52:0"}]},"documentation":{"id":610,"nodeType":"StructuredDocumentation","src":"5167:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"5265:5:0","parameters":{"id":613,"nodeType":"ParameterList","parameters":[{"constant":false,"id":612,"mutability":"mutable","name":"_v","nameLocation":"5287:2:0","nodeType":"VariableDeclaration","scope":633,"src":"5271:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":611,"name":"string","nodeType":"ElementaryTypeName","src":"5271:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5270:20:0"},"returnParameters":{"id":614,"nodeType":"ParameterList","parameters":[],"src":"5305:0:0"},"scope":706,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":648,"nodeType":"FunctionDefinition","src":"5405:95:0","nodes":[],"body":{"id":647,"nodeType":"Block","src":"5449:51:0","nodes":[],"statements":[{"expression":{"id":639,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5459:9:0","subExpression":{"id":638,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5459:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":640,"nodeType":"ExpressionStatement","src":"5459:9:0"},{"expression":{"arguments":[{"id":644,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":635,"src":"5490:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":641,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5478:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":643,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5478:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":645,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5478:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":646,"nodeType":"ExpressionStatement","src":"5478:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"5414:5:0","parameters":{"id":636,"nodeType":"ParameterList","parameters":[{"constant":false,"id":635,"mutability":"mutable","name":"_v","nameLocation":"5436:2:0","nodeType":"VariableDeclaration","scope":648,"src":"5420:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":634,"name":"string","nodeType":"ElementaryTypeName","src":"5420:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5419:20:0"},"returnParameters":{"id":637,"nodeType":"ParameterList","parameters":[],"src":"5449:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":663,"nodeType":"FunctionDefinition","src":"5506:95:0","nodes":[],"body":{"id":662,"nodeType":"Block","src":"5550:51:0","nodes":[],"statements":[{"expression":{"id":654,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5560:9:0","subExpression":{"id":653,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5560:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":655,"nodeType":"ExpressionStatement","src":"5560:9:0"},{"expression":{"arguments":[{"id":659,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":650,"src":"5591:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":656,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5579:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":658,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5579:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":660,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5579:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":661,"nodeType":"ExpressionStatement","src":"5579:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"5515:5:0","parameters":{"id":651,"nodeType":"ParameterList","parameters":[{"constant":false,"id":650,"mutability":"mutable","name":"_v","nameLocation":"5537:2:0","nodeType":"VariableDeclaration","scope":663,"src":"5521:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":649,"name":"string","nodeType":"ElementaryTypeName","src":"5521:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5520:20:0"},"returnParameters":{"id":652,"nodeType":"ParameterList","parameters":[],"src":"5550:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":678,"nodeType":"FunctionDefinition","src":"5607:98:0","nodes":[],"body":{"id":677,"nodeType":"Block","src":"5653:52:0","nodes":[],"statements":[{"expression":{"id":669,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5663:9:0","subExpression":{"id":668,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5663:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":670,"nodeType":"ExpressionStatement","src":"5663:9:0"},{"expression":{"arguments":[{"id":674,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":665,"src":"5695:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":671,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5682:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":673,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":693,"src":"5682:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":675,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5682:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":676,"nodeType":"ExpressionStatement","src":"5682:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"5616:7:0","parameters":{"id":666,"nodeType":"ParameterList","parameters":[{"constant":false,"id":665,"mutability":"mutable","name":"_v","nameLocation":"5640:2:0","nodeType":"VariableDeclaration","scope":678,"src":"5624:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":664,"name":"string","nodeType":"ElementaryTypeName","src":"5624:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5623:20:0"},"returnParameters":{"id":667,"nodeType":"ParameterList","parameters":[],"src":"5653:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":693,"nodeType":"FunctionDefinition","src":"5711:97:0","nodes":[],"body":{"id":692,"nodeType":"Block","src":"5757:51:0","nodes":[],"statements":[{"expression":{"id":684,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5767:9:0","subExpression":{"id":683,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5767:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":685,"nodeType":"ExpressionStatement","src":"5767:9:0"},{"expression":{"arguments":[{"id":689,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":680,"src":"5798:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":686,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5786:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":688,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5786:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":690,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5786:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":691,"nodeType":"ExpressionStatement","src":"5786:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"5720:7:0","parameters":{"id":681,"nodeType":"ParameterList","parameters":[{"constant":false,"id":680,"mutability":"mutable","name":"_v","nameLocation":"5744:2:0","nodeType":"VariableDeclaration","scope":693,"src":"5728:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":679,"name":"string","nodeType":"ElementaryTypeName","src":"5728:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5727:20:0"},"returnParameters":{"id":682,"nodeType":"ParameterList","parameters":[],"src":"5757:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":705,"nodeType":"FunctionDefinition","src":"5814:84:0","nodes":[],"body":{"id":704,"nodeType":"Block","src":"5866:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":701,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":695,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":698,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5876:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":700,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5876:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":702,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5876:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":703,"nodeType":"ExpressionStatement","src":"5876:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"5823:8:0","parameters":{"id":696,"nodeType":"ParameterList","parameters":[{"constant":false,"id":695,"mutability":"mutable","name":"_v","nameLocation":"5848:2:0","nodeType":"VariableDeclaration","scope":705,"src":"5832:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":694,"name":"string","nodeType":"ElementaryTypeName","src":"5832:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5831:20:0"},"returnParameters":{"id":697,"nodeType":"ParameterList","parameters":[],"src":"5866:0:0"},"scope":706,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[719],"contractKind":"contract","documentation":{"id":193,"nodeType":"StructuredDocumentation","src":"2415:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[706],"name":"ScriptExample","nameLocation":"2550:13:0","scope":720,"usedErrors":[]},{"id":719,"nodeType":"ContractDefinition","src":"5902:96:0","nodes":[{"id":708,"nodeType":"VariableDeclaration","src":"5924:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"5939:3:0","scope":719,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":707,"name":"uint256","nodeType":"ElementaryTypeName","src":"5924:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":718,"nodeType":"FunctionDefinition","src":"5949:47:0","nodes":[],"body":{"id":717,"nodeType":"Block","src":"5972:24:0","nodes":[],"statements":[{"expression":{"id":715,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":713,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":708,"src":"5982:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":714,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":710,"src":"5988:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"5982:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":716,"nodeType":"ExpressionStatement","src":"5982:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":711,"nodeType":"ParameterList","parameters":[{"constant":false,"id":710,"mutability":"mutable","name":"v","nameLocation":"5969:1:0","nodeType":"VariableDeclaration","scope":718,"src":"5961:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":709,"name":"uint256","nodeType":"ElementaryTypeName","src":"5961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"5960:11:0"},"returnParameters":{"id":712,"nodeType":"ParameterList","parameters":[],"src":"5972:0:0"},"scope":719,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[719],"name":"FooBar","nameLocation":"5911:6:0","scope":720,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
+{"abi":[{"type":"constructor","inputs":[{"name":"v","type":"uint256","internalType":"uint256"}],"stateMutability":"nonpayable"},{"type":"function","name":"foo","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"}],"bytecode":{"object":"0x608060405234801561001057600080fd5b506040516100b23803806100b283398101604081905261002f91610037565b600055610050565b60006020828403121561004957600080fd5b5051919050565b60548061005e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000a","sourceMap":"7037:96:0:-:0;;;7084:47;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;7117:3;:7;7037:96;;14:184:1;84:6;137:2;125:9;116:7;112:23;108:32;105:52;;;153:1;150;143:12;105:52;-1:-1:-1;176:16:1;;14:184;-1:-1:-1;14:184:1:o;:::-;7037:96:0;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000a","sourceMap":"7037:96:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7059:18;;;;;;;;;160:25:1;;;148:2;133:18;7059::0;;;;;;","linkReferences":{}},"methodIdentifiers":{"foo()":"c2985578"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"v\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"foo\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"FooBar\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28\",\"dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"uint256","name":"v","type":"uint256"}],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"stateMutability":"view","type":"function","name":"foo","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"FooBar"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da","urls":["bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28","dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[{"astId":788,"contract":"scripts/ScriptExample.s.sol:FooBar","label":"foo","offset":0,"slot":"0","type":"t_uint256"}],"types":{"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":969,"exportedSymbols":{"FooBar":[799],"ForkTester":[968],"ForkedContract":[852],"NonceGetter":[833],"ScriptExample":[786],"Vm":[83],"console":[220]},"nodeType":"SourceUnit","src":"32:8375:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":83,"nodeType":"ContractDefinition","src":"120:969:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":83,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":61,"nodeType":"FunctionDefinition","src":"739:108:0","nodes":[],"functionSelector":"3ebf73b4","implemented":false,"kind":"function","modifiers":[],"name":"getDeployedCode","nameLocation":"748:15:0","parameters":{"id":57,"nodeType":"ParameterList","parameters":[{"constant":false,"id":56,"mutability":"mutable","name":"artifactPath","nameLocation":"780:12:0","nodeType":"VariableDeclaration","scope":61,"src":"764:28:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":55,"name":"string","nodeType":"ElementaryTypeName","src":"764:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"763:30:0"},"returnParameters":{"id":60,"nodeType":"ParameterList","parameters":[{"constant":false,"id":59,"mutability":"mutable","name":"runtimeBytecode","nameLocation":"830:15:0","nodeType":"VariableDeclaration","scope":61,"src":"817:28:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":58,"name":"bytes","nodeType":"ElementaryTypeName","src":"817:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"816:30:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":68,"nodeType":"FunctionDefinition","src":"852:74:0","nodes":[],"functionSelector":"b4d6c782","implemented":false,"kind":"function","modifiers":[],"name":"etch","nameLocation":"861:4:0","parameters":{"id":66,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"target","nameLocation":"874:6:0","nodeType":"VariableDeclaration","scope":68,"src":"866:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":62,"name":"address","nodeType":"ElementaryTypeName","src":"866:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":65,"mutability":"mutable","name":"newRuntimeBytecode","nameLocation":"897:18:0","nodeType":"VariableDeclaration","scope":68,"src":"882:33:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":64,"name":"bytes","nodeType":"ElementaryTypeName","src":"882:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"865:51:0"},"returnParameters":{"id":67,"nodeType":"ParameterList","parameters":[],"src":"925:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":73,"nodeType":"FunctionDefinition","src":"931:51:0","nodes":[],"functionSelector":"ea060291","implemented":false,"kind":"function","modifiers":[],"name":"allowCheatcodes","nameLocation":"940:15:0","parameters":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"account","nameLocation":"964:7:0","nodeType":"VariableDeclaration","scope":73,"src":"956:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":69,"name":"address","nodeType":"ElementaryTypeName","src":"956:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"955:17:0"},"returnParameters":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"981:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":82,"nodeType":"FunctionDefinition","src":"987:100:0","nodes":[],"functionSelector":"71ee464d","implemented":false,"kind":"function","modifiers":[],"name":"createSelectFork","nameLocation":"996:16:0","parameters":{"id":78,"nodeType":"ParameterList","parameters":[{"constant":false,"id":75,"mutability":"mutable","name":"forkName","nameLocation":"1029:8:0","nodeType":"VariableDeclaration","scope":82,"src":"1013:24:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":74,"name":"string","nodeType":"ElementaryTypeName","src":"1013:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":77,"mutability":"mutable","name":"blockNumber","nameLocation":"1047:11:0","nodeType":"VariableDeclaration","scope":82,"src":"1039:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":76,"name":"uint256","nodeType":"ElementaryTypeName","src":"1039:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1012:47:0"},"returnParameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":82,"src":"1078:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":79,"name":"uint256","nodeType":"ElementaryTypeName","src":"1078:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1077:9:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[83],"name":"Vm","nameLocation":"130:2:0","scope":969,"usedErrors":[]},{"id":220,"nodeType":"ContractDefinition","src":"1144:1851:0","nodes":[{"id":89,"nodeType":"VariableDeclaration","src":"1166:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"1183:15:0","scope":220,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":84,"name":"address","nodeType":"ElementaryTypeName","src":"1166:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":87,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"1209:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":86,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"1201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":85,"name":"address","nodeType":"ElementaryTypeName","src":"1201:7:0","typeDescriptions":{}}},"id":88,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1201:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1259:235:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1432:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1451:37:0","statements":[{"nodeType":"YulAssignment","src":"1465:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1474:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1465:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":95,"isOffset":false,"isSlot":false,"src":"1474:4:0","valueSize":1},{"declaration":102,"isOffset":false,"isSlot":false,"src":"1465:5:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1442:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"1268:25:0","parameters":{"id":96,"nodeType":"ParameterList","parameters":[{"constant":false,"id":95,"mutability":"mutable","name":"fnIn","nameLocation":"1331:4:0","nodeType":"VariableDeclaration","scope":106,"src":"1294:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":94,"nodeType":"FunctionTypeName","parameterTypes":{"id":92,"nodeType":"ParameterList","parameters":[{"constant":false,"id":91,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":94,"src":"1303:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":90,"name":"bytes","nodeType":"ElementaryTypeName","src":"1303:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1302:14:0"},"returnParameterTypes":{"id":93,"nodeType":"ParameterList","parameters":[],"src":"1331:0:0"},"src":"1294:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"1293:43:0"},"returnParameters":{"id":103,"nodeType":"ParameterList","parameters":[{"constant":false,"id":102,"mutability":"mutable","name":"fnOut","nameLocation":"1421:5:0","nodeType":"VariableDeclaration","scope":106,"src":"1384:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":101,"nodeType":"FunctionTypeName","parameterTypes":{"id":99,"nodeType":"ParameterList","parameters":[{"constant":false,"id":98,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":101,"src":"1393:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":97,"name":"bytes","nodeType":"ElementaryTypeName","src":"1393:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1392:14:0"},"returnParameterTypes":{"id":100,"nodeType":"ParameterList","parameters":[],"src":"1421:0:0"},"src":"1384:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1383:44:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":118,"nodeType":"FunctionDefinition","src":"1500:133:0","nodes":[],"body":{"id":117,"nodeType":"Block","src":"1561:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":114,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1618:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":112,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":134,"src":"1597:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":111,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1571:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":113,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":115,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":116,"nodeType":"ExpressionStatement","src":"1571:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1509:15:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"payload","nameLocation":"1538:7:0","nodeType":"VariableDeclaration","scope":118,"src":"1525:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":107,"name":"bytes","nodeType":"ElementaryTypeName","src":"1525:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1524:22:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1561:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":134,"nodeType":"FunctionDefinition","src":"1639:380:0","nodes":[],"body":{"id":133,"nodeType":"Block","src":"1703:316:0","nodes":[],"statements":[{"assignments":[124],"declarations":[{"constant":false,"id":124,"mutability":"mutable","name":"payloadLength","nameLocation":"1721:13:0","nodeType":"VariableDeclaration","scope":133,"src":"1713:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":123,"name":"uint256","nodeType":"ElementaryTypeName","src":"1713:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":127,"initialValue":{"expression":{"id":125,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":120,"src":"1737:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":126,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1737:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1713:38:0"},{"assignments":[129],"declarations":[{"constant":false,"id":129,"mutability":"mutable","name":"consoleAddress","nameLocation":"1769:14:0","nodeType":"VariableDeclaration","scope":133,"src":"1761:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":128,"name":"address","nodeType":"ElementaryTypeName","src":"1761:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":131,"initialValue":{"id":130,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":89,"src":"1786:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1761:40:0"},{"AST":{"nodeType":"YulBlock","src":"1863:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1877:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1901:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1910:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1897:3:0"},"nodeType":"YulFunctionCall","src":"1897:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1881:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1926:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1946:3:0"},"nodeType":"YulFunctionCall","src":"1946:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1953:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1969:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1983:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1998:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"2001:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1935:10:0"},"nodeType":"YulFunctionCall","src":"1935:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1930:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":129,"isOffset":false,"isSlot":false,"src":"1953:14:0","valueSize":1},{"declaration":120,"isOffset":false,"isSlot":false,"src":"1901:7:0","valueSize":1},{"declaration":124,"isOffset":false,"isSlot":false,"src":"1983:13:0","valueSize":1}],"id":132,"nodeType":"InlineAssembly","src":"1854:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1648:19:0","parameters":{"id":121,"nodeType":"ParameterList","parameters":[{"constant":false,"id":120,"mutability":"mutable","name":"payload","nameLocation":"1681:7:0","nodeType":"VariableDeclaration","scope":134,"src":"1668:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":119,"name":"bytes","nodeType":"ElementaryTypeName","src":"1668:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1667:22:0"},"returnParameters":{"id":122,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":220,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":148,"nodeType":"FunctionDefinition","src":"2025:164:0","nodes":[],"body":{"id":147,"nodeType":"Block","src":"2070:119:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":142,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2120:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":143,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":136,"src":"2135:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":140,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2096:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":141,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2096:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":144,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2096:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":139,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2080:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":145,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2080:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":146,"nodeType":"ExpressionStatement","src":"2080:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2034:3:0","parameters":{"id":137,"nodeType":"ParameterList","parameters":[{"constant":false,"id":136,"mutability":"mutable","name":"p0","nameLocation":"2052:2:0","nodeType":"VariableDeclaration","scope":148,"src":"2038:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":135,"name":"string","nodeType":"ElementaryTypeName","src":"2038:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2037:18:0"},"returnParameters":{"id":138,"nodeType":"ParameterList","parameters":[],"src":"2070:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":165,"nodeType":"FunctionDefinition","src":"2195:182:0","nodes":[],"body":{"id":164,"nodeType":"Block","src":"2249:128:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":158,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2299:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":159,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":150,"src":"2319:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":160,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":152,"src":"2323:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":156,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2275:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":157,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2275:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":161,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2275:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":155,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2259:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":162,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2259:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":163,"nodeType":"ExpressionStatement","src":"2259:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2204:3:0","parameters":{"id":153,"nodeType":"ParameterList","parameters":[{"constant":false,"id":150,"mutability":"mutable","name":"p0","nameLocation":"2222:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2208:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":149,"name":"string","nodeType":"ElementaryTypeName","src":"2208:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":152,"mutability":"mutable","name":"p1","nameLocation":"2231:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2226:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":151,"name":"bool","nodeType":"ElementaryTypeName","src":"2226:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"2207:27:0"},"returnParameters":{"id":154,"nodeType":"ParameterList","parameters":[],"src":"2249:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":182,"nodeType":"FunctionDefinition","src":"2383:188:0","nodes":[],"body":{"id":181,"nodeType":"Block","src":"2440:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":175,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2490:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":176,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":167,"src":"2513:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":177,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":169,"src":"2517:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":173,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2466:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":174,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2466:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":178,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2466:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":172,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2450:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":179,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2450:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":180,"nodeType":"ExpressionStatement","src":"2450:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2392:3:0","parameters":{"id":170,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"mutability":"mutable","name":"p0","nameLocation":"2410:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2396:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":166,"name":"string","nodeType":"ElementaryTypeName","src":"2396:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":169,"mutability":"mutable","name":"p1","nameLocation":"2422:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2414:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":168,"name":"uint256","nodeType":"ElementaryTypeName","src":"2414:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"2395:30:0"},"returnParameters":{"id":171,"nodeType":"ParameterList","parameters":[],"src":"2440:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":199,"nodeType":"FunctionDefinition","src":"2577:188:0","nodes":[],"body":{"id":198,"nodeType":"Block","src":"2634:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":192,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2684:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":193,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":184,"src":"2707:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":194,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":186,"src":"2711:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":190,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2660:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":191,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2660:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":195,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2660:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":189,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2644:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":196,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2644:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":197,"nodeType":"ExpressionStatement","src":"2644:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2586:3:0","parameters":{"id":187,"nodeType":"ParameterList","parameters":[{"constant":false,"id":184,"mutability":"mutable","name":"p0","nameLocation":"2604:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2590:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":183,"name":"string","nodeType":"ElementaryTypeName","src":"2590:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":186,"mutability":"mutable","name":"p1","nameLocation":"2616:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2608:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":185,"name":"address","nodeType":"ElementaryTypeName","src":"2608:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2589:30:0"},"returnParameters":{"id":188,"nodeType":"ParameterList","parameters":[],"src":"2634:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":219,"nodeType":"FunctionDefinition","src":"2771:222:0","nodes":[],"body":{"id":218,"nodeType":"Block","src":"2852:141:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":211,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2902:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":212,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":201,"src":"2931:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":213,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":203,"src":"2935:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":214,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":205,"src":"2939:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":209,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2878:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":210,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2878:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":215,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2878:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":208,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2862:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":216,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2862:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":217,"nodeType":"ExpressionStatement","src":"2862:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2780:3:0","parameters":{"id":206,"nodeType":"ParameterList","parameters":[{"constant":false,"id":201,"mutability":"mutable","name":"p0","nameLocation":"2798:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2784:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":200,"name":"string","nodeType":"ElementaryTypeName","src":"2784:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":203,"mutability":"mutable","name":"p1","nameLocation":"2816:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2802:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":202,"name":"string","nodeType":"ElementaryTypeName","src":"2802:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":205,"mutability":"mutable","name":"p2","nameLocation":"2834:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2820:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":204,"name":"string","nodeType":"ElementaryTypeName","src":"2820:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2783:54:0"},"returnParameters":{"id":207,"nodeType":"ParameterList","parameters":[],"src":"2852:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[220],"name":"console","nameLocation":"1152:7:0","scope":969,"usedErrors":[]},{"id":786,"nodeType":"ContractDefinition","src":"3123:3912:0","nodes":[{"id":235,"nodeType":"VariableDeclaration","src":"3152:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"3178:10:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":222,"name":"address","nodeType":"ElementaryTypeName","src":"3152:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3225:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":229,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"3215:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":231,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3215:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":228,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3207:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":227,"name":"uint256","nodeType":"ElementaryTypeName","src":"3207:7:0","typeDescriptions":{}}},"id":232,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3207:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":226,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3199:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":225,"name":"uint160","nodeType":"ElementaryTypeName","src":"3199:7:0","typeDescriptions":{}}},"id":233,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3199:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":224,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3191:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":223,"name":"address","nodeType":"ElementaryTypeName","src":"3191:7:0","typeDescriptions":{}}},"id":234,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3191:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":241,"nodeType":"VariableDeclaration","src":"3252:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"3273:2:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":237,"nodeType":"UserDefinedTypeName","pathNode":{"id":236,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"3252:2:0"},"referencedDeclaration":83,"src":"3252:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":239,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":235,"src":"3281:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":238,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"3278:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":240,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3278:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":243,"nodeType":"VariableDeclaration","src":"3356:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"3371:7:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":242,"name":"uint256","nodeType":"ElementaryTypeName","src":"3356:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":456,"nodeType":"FunctionDefinition","src":"3468:1428:0","nodes":[],"body":{"id":455,"nodeType":"Block","src":"3490:1406:0","nodes":[],"statements":[{"assignments":[248],"declarations":[{"constant":false,"id":248,"mutability":"mutable","name":"x","nameLocation":"3505:1:0","nodeType":"VariableDeclaration","scope":455,"src":"3500:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":247,"name":"bool","nodeType":"ElementaryTypeName","src":"3500:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":254,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":251,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3518:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":252,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"3534:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":249,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3509:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":250,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"3509:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"3500:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":258,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3562:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":259,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":248,"src":"3585:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":255,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3550:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":257,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":165,"src":"3550:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":260,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3550:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":261,"nodeType":"ExpressionStatement","src":"3550:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":265,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3610:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":268,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3635:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":267,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3627:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":266,"name":"address","nodeType":"ElementaryTypeName","src":"3627:7:0","typeDescriptions":{}}},"id":269,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3627:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":262,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3598:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3598:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3598:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":271,"nodeType":"ExpressionStatement","src":"3598:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":275,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3663:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":280,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3701:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":279,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3693:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":278,"name":"address","nodeType":"ElementaryTypeName","src":"3693:7:0","typeDescriptions":{}}},"id":281,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3693:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":276,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3681:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3681:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":282,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":272,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3651:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":274,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3651:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":283,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3651:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":284,"nodeType":"ExpressionStatement","src":"3651:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":288,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3730:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":291,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3753:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3753:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":290,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3745:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":289,"name":"address","nodeType":"ElementaryTypeName","src":"3745:7:0","typeDescriptions":{}}},"id":293,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3745:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":285,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3718:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":287,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3718:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":294,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3718:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":295,"nodeType":"ExpressionStatement","src":"3718:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":299,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3787:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":304,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3823:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":305,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3823:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":303,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3815:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":302,"name":"address","nodeType":"ElementaryTypeName","src":"3815:7:0","typeDescriptions":{}}},"id":306,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3815:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":300,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3803:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":301,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3803:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3803:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":296,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3775:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":298,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3775:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":308,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3775:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":309,"nodeType":"ExpressionStatement","src":"3775:61:0"},{"assignments":[311],"declarations":[{"constant":false,"id":311,"mutability":"mutable","name":"json","nameLocation":"3861:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3847:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":310,"name":"string","nodeType":"ElementaryTypeName","src":"3847:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":313,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3868:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3847:55:0"},{"assignments":[318],"declarations":[{"constant":false,"id":318,"mutability":"mutable","name":"keys","nameLocation":"3928:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3912:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":316,"name":"string","nodeType":"ElementaryTypeName","src":"3912:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":317,"nodeType":"ArrayTypeName","src":"3912:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":324,"initialValue":{"arguments":[{"id":321,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":311,"src":"3952:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3958:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":319,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3935:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":320,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3935:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":323,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3935:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3912:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":328,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3995:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":329,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4003:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":331,"indexExpression":{"hexValue":"30","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4008:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4003:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":332,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4012:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":334,"indexExpression":{"hexValue":"31","id":333,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4017:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4012:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":325,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3983:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":327,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":219,"src":"3983:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3983:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":336,"nodeType":"ExpressionStatement","src":"3983:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":340,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4042:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":337,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4031:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":339,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4031:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4031:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":342,"nodeType":"ExpressionStatement","src":"4031:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":350,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4098:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4090:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":348,"name":"uint160","nodeType":"ElementaryTypeName","src":"4090:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4090:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":347,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4082:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":346,"name":"address","nodeType":"ElementaryTypeName","src":"4082:7:0","typeDescriptions":{}}},"id":352,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4082:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":343,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4068:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":345,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"4068:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":353,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4068:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":354,"nodeType":"ExpressionStatement","src":"4068:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":358,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4126:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":355,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4115:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":357,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4115:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":359,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4115:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":360,"nodeType":"ExpressionStatement","src":"4115:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":364,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4163:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":367,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"4198:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":368,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"4198:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":366,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4190:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":365,"name":"address","nodeType":"ElementaryTypeName","src":"4190:7:0","typeDescriptions":{}}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4190:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":361,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4151:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4151:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":370,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4151:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":371,"nodeType":"ExpressionStatement","src":"4151:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":375,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4232:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":378,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4270:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":377,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4262:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":376,"name":"address","nodeType":"ElementaryTypeName","src":"4262:7:0","typeDescriptions":{}}},"id":379,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4262:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":372,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4220:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":374,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4220:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":380,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4220:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":381,"nodeType":"ExpressionStatement","src":"4220:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4297:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":382,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4286:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4286:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":386,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4286:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":387,"nodeType":"ExpressionStatement","src":"4286:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4322:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":390,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"4322:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":391,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4322:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":392,"nodeType":"ExpressionStatement","src":"4322:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":396,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4357:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":393,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4346:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4346:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":397,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4346:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":398,"nodeType":"ExpressionStatement","src":"4346:33:0"},{"assignments":[400],"declarations":[{"constant":false,"id":400,"mutability":"mutable","name":"tmpNonceGetter","nameLocation":"4480:14:0","nodeType":"VariableDeclaration","scope":455,"src":"4472:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":399,"name":"address","nodeType":"ElementaryTypeName","src":"4472:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":413,"initialValue":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"74656d70206e6f6e6365207465737420676574746572","id":408,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4531:24:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""},"value":"temp nonce test getter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""}],"id":407,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"4521:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":409,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4521:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":406,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4513:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":405,"name":"uint256","nodeType":"ElementaryTypeName","src":"4513:7:0","typeDescriptions":{}}},"id":410,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4513:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":404,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4505:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":403,"name":"uint160","nodeType":"ElementaryTypeName","src":"4505:7:0","typeDescriptions":{}}},"id":411,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4505:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":402,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4497:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":401,"name":"address","nodeType":"ElementaryTypeName","src":"4497:7:0","typeDescriptions":{}}},"id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4497:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"4472:87:0"},{"expression":{"arguments":[{"id":417,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4577:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},{"arguments":[{"hexValue":"5363726970744578616d706c652e732e736f6c3a4e6f6e6365476574746572","id":420,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4612:33:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""},"value":"ScriptExample.s.sol:NonceGetter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""}],"expression":{"id":418,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4593:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getDeployedCode","nodeType":"MemberAccess","referencedDeclaration":61,"src":"4593:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) view external returns (bytes memory)"}},"id":421,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4593:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"},{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"expression":{"id":414,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4569:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":416,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"etch","nodeType":"MemberAccess","referencedDeclaration":68,"src":"4569:7:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$","typeString":"function (address,bytes memory) external"}},"id":422,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4569:78:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":423,"nodeType":"ExpressionStatement","src":"4569:78:0"},{"expression":{"arguments":[{"id":427,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4676:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":424,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4657:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":426,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"allowCheatcodes","nodeType":"MemberAccess","referencedDeclaration":73,"src":"4657:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":428,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":429,"nodeType":"ExpressionStatement","src":"4657:34:0"},{"assignments":[431],"declarations":[{"constant":false,"id":431,"mutability":"mutable","name":"v","nameLocation":"4709:1:0","nodeType":"VariableDeclaration","scope":455,"src":"4701:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":430,"name":"uint256","nodeType":"ElementaryTypeName","src":"4701:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":441,"initialValue":{"arguments":[{"arguments":[{"id":438,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4758:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":437,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4750:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":436,"name":"address","nodeType":"ElementaryTypeName","src":"4750:7:0","typeDescriptions":{}}},"id":439,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4750:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"arguments":[{"id":433,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4725:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":432,"name":"NonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":833,"src":"4713:11:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_NonceGetter_$833_$","typeString":"type(contract NonceGetter)"}},"id":434,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_NonceGetter_$833","typeString":"contract NonceGetter"}},"id":435,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":832,"src":"4713:36:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint256_$","typeString":"function (address) view external returns (uint256)"}},"id":440,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"4701:63:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683a","id":445,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4786:68:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},"value":"nonce from nonce getter, no explicit access required with vm.etch:"},{"id":446,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":431,"src":"4856:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":442,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4774:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":444,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"4774:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4774:84:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":448,"nodeType":"ExpressionStatement","src":"4774:84:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":452,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4881:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":449,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4869:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":451,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"4869:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4869:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":454,"nodeType":"ExpressionStatement","src":"4869:20:0"}]},"documentation":{"id":244,"nodeType":"StructuredDocumentation","src":"3385:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"3477:3:0","parameters":{"id":245,"nodeType":"ParameterList","parameters":[],"src":"3480:2:0"},"returnParameters":{"id":246,"nodeType":"ParameterList","parameters":[],"src":"3490:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":689,"nodeType":"FunctionDefinition","src":"4963:1333:0","nodes":[],"body":{"id":688,"nodeType":"Block","src":"4994:1302:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":463,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5016:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":470,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5059:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":469,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5051:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":468,"name":"address","nodeType":"ElementaryTypeName","src":"5051:7:0","typeDescriptions":{}}},"id":471,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5051:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":466,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5039:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":467,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5039:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5039:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":465,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5031:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":464,"name":"uint256","nodeType":"ElementaryTypeName","src":"5031:7:0","typeDescriptions":{}}},"id":473,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5031:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":460,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5004:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":462,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"5004:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":474,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5004:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":475,"nodeType":"ExpressionStatement","src":"5004:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":479,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5090:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":476,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5078:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":478,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5078:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":480,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5078:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":481,"nodeType":"ExpressionStatement","src":"5078:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":482,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5117:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5117:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":485,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5117:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":486,"nodeType":"ExpressionStatement","src":"5117:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":490,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5152:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":487,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5141:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":489,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5141:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":491,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5141:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":492,"nodeType":"ExpressionStatement","src":"5141:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":496,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5188:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":493,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5177:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5177:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":497,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5177:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":498,"nodeType":"ExpressionStatement","src":"5177:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":502,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5226:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":499,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5214:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5214:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":503,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5214:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":504,"nodeType":"ExpressionStatement","src":"5214:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5291:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":511,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5283:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":510,"name":"uint160","nodeType":"ElementaryTypeName","src":"5283:7:0","typeDescriptions":{}}},"id":513,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5283:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5275:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":508,"name":"address","nodeType":"ElementaryTypeName","src":"5275:7:0","typeDescriptions":{}}},"id":514,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5275:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":505,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5257:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":507,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5257:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":515,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5257:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":516,"nodeType":"ExpressionStatement","src":"5257:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":520,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5323:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":517,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5312:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":519,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5312:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":521,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5312:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":522,"nodeType":"ExpressionStatement","src":"5312:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":526,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5362:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":523,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5351:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":525,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5351:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5351:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":528,"nodeType":"ExpressionStatement","src":"5351:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":532,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5404:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":529,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5390:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":531,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":785,"src":"5390:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":533,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5390:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":534,"nodeType":"ExpressionStatement","src":"5390:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":535,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5431:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":537,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5431:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":538,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5431:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":539,"nodeType":"ExpressionStatement","src":"5431:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":543,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5470:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":540,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5459:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":542,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5459:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":544,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5459:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":545,"nodeType":"ExpressionStatement","src":"5459:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":549,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5511:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":546,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5499:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5499:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":550,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5499:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":551,"nodeType":"ExpressionStatement","src":"5499:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":559,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5572:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":558,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5564:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":557,"name":"uint160","nodeType":"ElementaryTypeName","src":"5564:7:0","typeDescriptions":{}}},"id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5564:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":556,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5556:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":555,"name":"address","nodeType":"ElementaryTypeName","src":"5556:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5556:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":552,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5538:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":554,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5538:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":562,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5538:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":563,"nodeType":"ExpressionStatement","src":"5538:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":567,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5604:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":564,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5591:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":566,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":758,"src":"5591:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":568,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5591:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":569,"nodeType":"ExpressionStatement","src":"5591:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":570,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5623:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5623:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5623:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"5623:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5664:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5652:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5652:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5652:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"5652:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":588,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5725:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":587,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5717:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":586,"name":"uint160","nodeType":"ElementaryTypeName","src":"5717:7:0","typeDescriptions":{}}},"id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5717:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":585,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5709:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":584,"name":"address","nodeType":"ElementaryTypeName","src":"5709:7:0","typeDescriptions":{}}},"id":590,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5709:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5696:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5696:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":591,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5696:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":592,"nodeType":"ExpressionStatement","src":"5696:40:0"},{"assignments":[595],"declarations":[{"constant":false,"id":595,"mutability":"mutable","name":"x","nameLocation":"5753:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5746:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":594,"nodeType":"UserDefinedTypeName","pathNode":{"id":593,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5746:6:0"},"referencedDeclaration":799,"src":"5746:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":601,"initialValue":{"arguments":[{"hexValue":"31323334","id":599,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5768:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":598,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5757:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":597,"nodeType":"UserDefinedTypeName","pathNode":{"id":596,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5761:6:0"},"referencedDeclaration":799,"src":"5761:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":600,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5757:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5746:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":607,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":603,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":595,"src":"5791:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"5791:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5791:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":606,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5802:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"5791:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323334","id":608,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5808:35:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""},"value":"FooBar: foo in create is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""}],"id":602,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"5783:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":609,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5783:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":610,"nodeType":"ExpressionStatement","src":"5783:61:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":614,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5867:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":611,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5855:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":613,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5855:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":615,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5855:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":616,"nodeType":"ExpressionStatement","src":"5855:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5917:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":623,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5909:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":622,"name":"uint160","nodeType":"ElementaryTypeName","src":"5909:7:0","typeDescriptions":{}}},"id":625,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5909:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":621,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5901:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":620,"name":"address","nodeType":"ElementaryTypeName","src":"5901:7:0","typeDescriptions":{}}},"id":626,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5901:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":617,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5888:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":627,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5888:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":628,"nodeType":"ExpressionStatement","src":"5888:38:0"},{"assignments":[631],"declarations":[{"constant":false,"id":631,"mutability":"mutable","name":"y","nameLocation":"5943:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5936:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":630,"nodeType":"UserDefinedTypeName","pathNode":{"id":629,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5936:6:0"},"referencedDeclaration":799,"src":"5936:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":645,"initialValue":{"arguments":[{"hexValue":"31323334","id":643,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5986:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":634,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5947:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":633,"nodeType":"UserDefinedTypeName","pathNode":{"id":632,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5951:6:0"},"referencedDeclaration":799,"src":"5951:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":642,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":639,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5980:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":638,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5972:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":637,"name":"uint256","nodeType":"ElementaryTypeName","src":"5972:7:0","typeDescriptions":{}}},"id":640,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5972:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":636,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5964:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":635,"name":"bytes32","nodeType":"ElementaryTypeName","src":"5964:7:0","typeDescriptions":{}}},"id":641,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5964:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"5947:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":644,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5947:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5936:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":651,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":647,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":631,"src":"6009:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":648,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"6009:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":649,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6009:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":650,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6020:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"6009:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e2063726561746532206973206e6f742031323334","id":652,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6026:36:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""},"value":"FooBar: foo in create2 is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""}],"id":646,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"6001:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":653,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6001:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":654,"nodeType":"ExpressionStatement","src":"6001:62:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":658,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6085:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":655,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6073:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":657,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6073:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":659,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6073:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":660,"nodeType":"ExpressionStatement","src":"6073:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":661,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6177:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":663,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"6177:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":664,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6177:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":665,"nodeType":"ExpressionStatement","src":"6177:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":669,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6212:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":668,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"6201:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":667,"nodeType":"UserDefinedTypeName","pathNode":{"id":666,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"6205:6:0"},"referencedDeclaration":799,"src":"6205:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":670,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6201:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":671,"nodeType":"ExpressionStatement","src":"6201:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":675,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6240:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":682,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6281:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":681,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6273:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":680,"name":"address","nodeType":"ElementaryTypeName","src":"6273:7:0","typeDescriptions":{}}},"id":683,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6273:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":678,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6261:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":679,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"6261:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":684,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6261:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":677,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6253:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":676,"name":"uint256","nodeType":"ElementaryTypeName","src":"6253:7:0","typeDescriptions":{}}},"id":685,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6253:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":672,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6228:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":674,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"6228:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":686,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6228:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":687,"nodeType":"ExpressionStatement","src":"6228:61:0"}]},"documentation":{"id":457,"nodeType":"StructuredDocumentation","src":"4902:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"4972:12:0","parameters":{"id":458,"nodeType":"ParameterList","parameters":[],"src":"4984:2:0"},"returnParameters":{"id":459,"nodeType":"ParameterList","parameters":[],"src":"4994:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":713,"nodeType":"FunctionDefinition","src":"6391:143:0","nodes":[],"body":{"id":712,"nodeType":"Block","src":"6440:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":698,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":692,"src":"6462:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":695,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6450:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":697,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6450:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":699,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6450:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":700,"nodeType":"ExpressionStatement","src":"6450:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":704,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6487:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":707,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"6515:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":708,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"6515:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":706,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6507:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":705,"name":"address","nodeType":"ElementaryTypeName","src":"6507:7:0","typeDescriptions":{}}},"id":709,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6507:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":701,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6475:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":703,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"6475:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":710,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6475:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":711,"nodeType":"ExpressionStatement","src":"6475:52:0"}]},"documentation":{"id":690,"nodeType":"StructuredDocumentation","src":"6302:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"6400:5:0","parameters":{"id":693,"nodeType":"ParameterList","parameters":[{"constant":false,"id":692,"mutability":"mutable","name":"_v","nameLocation":"6422:2:0","nodeType":"VariableDeclaration","scope":713,"src":"6406:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":691,"name":"string","nodeType":"ElementaryTypeName","src":"6406:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6405:20:0"},"returnParameters":{"id":694,"nodeType":"ParameterList","parameters":[],"src":"6440:0:0"},"scope":786,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":728,"nodeType":"FunctionDefinition","src":"6540:95:0","nodes":[],"body":{"id":727,"nodeType":"Block","src":"6584:51:0","nodes":[],"statements":[{"expression":{"id":719,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6594:9:0","subExpression":{"id":718,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6594:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":720,"nodeType":"ExpressionStatement","src":"6594:9:0"},{"expression":{"arguments":[{"id":724,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":715,"src":"6625:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":721,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6613:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":723,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6613:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":725,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6613:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":726,"nodeType":"ExpressionStatement","src":"6613:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"6549:5:0","parameters":{"id":716,"nodeType":"ParameterList","parameters":[{"constant":false,"id":715,"mutability":"mutable","name":"_v","nameLocation":"6571:2:0","nodeType":"VariableDeclaration","scope":728,"src":"6555:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":714,"name":"string","nodeType":"ElementaryTypeName","src":"6555:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6554:20:0"},"returnParameters":{"id":717,"nodeType":"ParameterList","parameters":[],"src":"6584:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":743,"nodeType":"FunctionDefinition","src":"6641:95:0","nodes":[],"body":{"id":742,"nodeType":"Block","src":"6685:51:0","nodes":[],"statements":[{"expression":{"id":734,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6695:9:0","subExpression":{"id":733,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6695:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":735,"nodeType":"ExpressionStatement","src":"6695:9:0"},{"expression":{"arguments":[{"id":739,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":730,"src":"6726:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":736,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6714:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":738,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6714:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":740,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6714:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":741,"nodeType":"ExpressionStatement","src":"6714:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"6650:5:0","parameters":{"id":731,"nodeType":"ParameterList","parameters":[{"constant":false,"id":730,"mutability":"mutable","name":"_v","nameLocation":"6672:2:0","nodeType":"VariableDeclaration","scope":743,"src":"6656:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":729,"name":"string","nodeType":"ElementaryTypeName","src":"6656:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6655:20:0"},"returnParameters":{"id":732,"nodeType":"ParameterList","parameters":[],"src":"6685:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":758,"nodeType":"FunctionDefinition","src":"6742:98:0","nodes":[],"body":{"id":757,"nodeType":"Block","src":"6788:52:0","nodes":[],"statements":[{"expression":{"id":749,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6798:9:0","subExpression":{"id":748,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6798:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":750,"nodeType":"ExpressionStatement","src":"6798:9:0"},{"expression":{"arguments":[{"id":754,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":745,"src":"6830:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":751,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6817:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":753,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":773,"src":"6817:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":755,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6817:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":756,"nodeType":"ExpressionStatement","src":"6817:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"6751:7:0","parameters":{"id":746,"nodeType":"ParameterList","parameters":[{"constant":false,"id":745,"mutability":"mutable","name":"_v","nameLocation":"6775:2:0","nodeType":"VariableDeclaration","scope":758,"src":"6759:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":744,"name":"string","nodeType":"ElementaryTypeName","src":"6759:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6758:20:0"},"returnParameters":{"id":747,"nodeType":"ParameterList","parameters":[],"src":"6788:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":773,"nodeType":"FunctionDefinition","src":"6846:97:0","nodes":[],"body":{"id":772,"nodeType":"Block","src":"6892:51:0","nodes":[],"statements":[{"expression":{"id":764,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6902:9:0","subExpression":{"id":763,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6902:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":765,"nodeType":"ExpressionStatement","src":"6902:9:0"},{"expression":{"arguments":[{"id":769,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":760,"src":"6933:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":766,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6921:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":768,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6921:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":770,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6921:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":771,"nodeType":"ExpressionStatement","src":"6921:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"6855:7:0","parameters":{"id":761,"nodeType":"ParameterList","parameters":[{"constant":false,"id":760,"mutability":"mutable","name":"_v","nameLocation":"6879:2:0","nodeType":"VariableDeclaration","scope":773,"src":"6863:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":759,"name":"string","nodeType":"ElementaryTypeName","src":"6863:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6862:20:0"},"returnParameters":{"id":762,"nodeType":"ParameterList","parameters":[],"src":"6892:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":785,"nodeType":"FunctionDefinition","src":"6949:84:0","nodes":[],"body":{"id":784,"nodeType":"Block","src":"7001:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":781,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":775,"src":"7023:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":778,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"7011:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":780,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"7011:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":782,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7011:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":783,"nodeType":"ExpressionStatement","src":"7011:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"6958:8:0","parameters":{"id":776,"nodeType":"ParameterList","parameters":[{"constant":false,"id":775,"mutability":"mutable","name":"_v","nameLocation":"6983:2:0","nodeType":"VariableDeclaration","scope":785,"src":"6967:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":774,"name":"string","nodeType":"ElementaryTypeName","src":"6967:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6966:20:0"},"returnParameters":{"id":777,"nodeType":"ParameterList","parameters":[],"src":"7001:0:0"},"scope":786,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[799],"contractKind":"contract","documentation":{"id":221,"nodeType":"StructuredDocumentation","src":"2997:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[786],"name":"ScriptExample","nameLocation":"3132:13:0","scope":969,"usedErrors":[]},{"id":799,"nodeType":"ContractDefinition","src":"7037:96:0","nodes":[{"id":788,"nodeType":"VariableDeclaration","src":"7059:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"7074:3:0","scope":799,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":787,"name":"uint256","nodeType":"ElementaryTypeName","src":"7059:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":798,"nodeType":"FunctionDefinition","src":"7084:47:0","nodes":[],"body":{"id":797,"nodeType":"Block","src":"7107:24:0","nodes":[],"statements":[{"expression":{"id":795,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":793,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":788,"src":"7117:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":794,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":790,"src":"7123:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"7117:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":796,"nodeType":"ExpressionStatement","src":"7117:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":791,"nodeType":"ParameterList","parameters":[{"constant":false,"id":790,"mutability":"mutable","name":"v","nameLocation":"7104:1:0","nodeType":"VariableDeclaration","scope":798,"src":"7096:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":789,"name":"uint256","nodeType":"ElementaryTypeName","src":"7096:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7095:11:0"},"returnParameters":{"id":792,"nodeType":"ParameterList","parameters":[],"src":"7107:0:0"},"scope":799,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[799],"name":"FooBar","nameLocation":"7046:6:0","scope":969,"usedErrors":[]},{"id":833,"nodeType":"ContractDefinition","src":"7135:281:0","nodes":[{"id":813,"nodeType":"VariableDeclaration","src":"7162:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7188:10:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":800,"name":"address","nodeType":"ElementaryTypeName","src":"7162:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":808,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7235:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":807,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7225:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":809,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7225:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":806,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7217:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":805,"name":"uint256","nodeType":"ElementaryTypeName","src":"7217:7:0","typeDescriptions":{}}},"id":810,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7217:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":804,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7209:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":803,"name":"uint160","nodeType":"ElementaryTypeName","src":"7209:7:0","typeDescriptions":{}}},"id":811,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7209:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":802,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":801,"name":"address","nodeType":"ElementaryTypeName","src":"7201:7:0","typeDescriptions":{}}},"id":812,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7201:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":819,"nodeType":"VariableDeclaration","src":"7262:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7283:2:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":815,"nodeType":"UserDefinedTypeName","pathNode":{"id":814,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7262:2:0"},"referencedDeclaration":83,"src":"7262:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":817,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":813,"src":"7291:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":816,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7288:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":818,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7288:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":832,"nodeType":"FunctionDefinition","src":"7309:105:0","nodes":[],"body":{"id":831,"nodeType":"Block","src":"7372:42:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":828,"name":"_addr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":821,"src":"7401:5:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":826,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":819,"src":"7389:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":827,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7389:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":829,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7389:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"functionReturnParameters":825,"id":830,"nodeType":"Return","src":"7382:25:0"}]},"functionSelector":"2d0335ab","implemented":true,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"7318:8:0","parameters":{"id":822,"nodeType":"ParameterList","parameters":[{"constant":false,"id":821,"mutability":"mutable","name":"_addr","nameLocation":"7335:5:0","nodeType":"VariableDeclaration","scope":832,"src":"7327:13:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":820,"name":"address","nodeType":"ElementaryTypeName","src":"7327:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"7326:15:0"},"returnParameters":{"id":825,"nodeType":"ParameterList","parameters":[{"constant":false,"id":824,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":832,"src":"7363:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":823,"name":"uint256","nodeType":"ElementaryTypeName","src":"7363:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7362:9:0"},"scope":833,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"NonceGetter","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[833],"name":"NonceGetter","nameLocation":"7144:11:0","scope":969,"usedErrors":[]},{"id":852,"nodeType":"ContractDefinition","src":"7418:174:0","nodes":[{"id":835,"nodeType":"VariableDeclaration","src":"7448:18:0","nodes":[],"constant":false,"mutability":"mutable","name":"v","nameLocation":"7465:1:0","scope":852,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":834,"name":"uint256","nodeType":"ElementaryTypeName","src":"7448:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"id":843,"nodeType":"FunctionDefinition","src":"7473:36:0","nodes":[],"body":{"id":842,"nodeType":"Block","src":"7487:22:0","nodes":[],"statements":[{"expression":{"id":840,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":838,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7497:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"hexValue":"31","id":839,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7501:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"7497:5:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":841,"nodeType":"ExpressionStatement","src":"7497:5:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":836,"nodeType":"ParameterList","parameters":[],"src":"7484:2:0"},"returnParameters":{"id":837,"nodeType":"ParameterList","parameters":[],"src":"7487:0:0"},"scope":852,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":851,"nodeType":"FunctionDefinition","src":"7515:75:0","nodes":[],"body":{"id":850,"nodeType":"Block","src":"7565:25:0","nodes":[],"statements":[{"expression":{"id":848,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7582:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"functionReturnParameters":847,"id":849,"nodeType":"Return","src":"7575:8:0"}]},"functionSelector":"20965255","implemented":true,"kind":"function","modifiers":[],"name":"getValue","nameLocation":"7524:8:0","parameters":{"id":844,"nodeType":"ParameterList","parameters":[],"src":"7532:2:0"},"returnParameters":{"id":847,"nodeType":"ParameterList","parameters":[{"constant":false,"id":846,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":851,"src":"7556:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":845,"name":"uint256","nodeType":"ElementaryTypeName","src":"7556:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7555:9:0"},"scope":852,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkedContract","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[852],"name":"ForkedContract","nameLocation":"7427:14:0","scope":969,"usedErrors":[]},{"id":968,"nodeType":"ContractDefinition","src":"7594:813:0","nodes":[{"id":866,"nodeType":"VariableDeclaration","src":"7620:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7646:10:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":853,"name":"address","nodeType":"ElementaryTypeName","src":"7620:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":861,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7693:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":860,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7683:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":862,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7683:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":859,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7675:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":858,"name":"uint256","nodeType":"ElementaryTypeName","src":"7675:7:0","typeDescriptions":{}}},"id":863,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7675:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":857,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7667:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":856,"name":"uint160","nodeType":"ElementaryTypeName","src":"7667:7:0","typeDescriptions":{}}},"id":864,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7667:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":855,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7659:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":854,"name":"address","nodeType":"ElementaryTypeName","src":"7659:7:0","typeDescriptions":{}}},"id":865,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7659:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":872,"nodeType":"VariableDeclaration","src":"7720:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7741:2:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":868,"nodeType":"UserDefinedTypeName","pathNode":{"id":867,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7720:2:0"},"referencedDeclaration":83,"src":"7720:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":870,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":866,"src":"7749:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":869,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7746:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":871,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7746:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":967,"nodeType":"FunctionDefinition","src":"7767:638:0","nodes":[],"body":{"id":966,"nodeType":"Block","src":"7791:614:0","nodes":[],"statements":[{"assignments":[876],"declarations":[{"constant":false,"id":876,"mutability":"mutable","name":"testAddr","nameLocation":"7809:8:0","nodeType":"VariableDeclaration","scope":966,"src":"7801:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":875,"name":"address","nodeType":"ElementaryTypeName","src":"7801:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":884,"initialValue":{"arguments":[{"arguments":[{"hexValue":"307831323334","id":881,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7836:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":880,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7828:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":879,"name":"uint160","nodeType":"ElementaryTypeName","src":"7828:7:0","typeDescriptions":{}}},"id":882,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7828:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":878,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7820:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":877,"name":"address","nodeType":"ElementaryTypeName","src":"7820:7:0","typeDescriptions":{}}},"id":883,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7820:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"7801:43:0"},{"assignments":[887],"declarations":[{"constant":false,"id":887,"mutability":"mutable","name":"fc","nameLocation":"7869:2:0","nodeType":"VariableDeclaration","scope":966,"src":"7854:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"},"typeName":{"id":886,"nodeType":"UserDefinedTypeName","pathNode":{"id":885,"name":"ForkedContract","nodeType":"IdentifierPath","referencedDeclaration":852,"src":"7854:14:0"},"referencedDeclaration":852,"src":"7854:14:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"visibility":"internal"}],"id":891,"initialValue":{"arguments":[{"id":889,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7889:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":888,"name":"ForkedContract","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":852,"src":"7874:14:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_ForkedContract_$852_$","typeString":"type(contract ForkedContract)"}},"id":890,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7874:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"nodeType":"VariableDeclarationStatement","src":"7854:44:0"},{"expression":{"arguments":[{"hexValue":"666f726b31","id":895,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7929:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},"value":"fork1"},{"hexValue":"3132333435","id":896,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7938:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"}],"expression":{"id":892,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7909:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":894,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"7909:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":897,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7909:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":898,"nodeType":"ExpressionStatement","src":"7909:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":905,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":902,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7974:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":900,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7962:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":901,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7962:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":903,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7962:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3132333435","id":904,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7987:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"},"src":"7962:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":906,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7994:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":899,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"7954:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":907,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7954:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":908,"nodeType":"ExpressionStatement","src":"7954:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":914,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":910,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8036:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":911,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8036:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":912,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8036:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31","id":913,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8053:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"8036:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652031","id":915,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8056:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""},"value":"value should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""}],"id":909,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8028:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":916,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8028:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":917,"nodeType":"ExpressionStatement","src":"8028:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":925,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":919,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8094:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":920,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8094:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"31","id":923,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8122:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"}],"id":922,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8114:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":921,"name":"uint256","nodeType":"ElementaryTypeName","src":"8114:7:0","typeDescriptions":{}}},"id":924,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8114:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8094:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652031","id":926,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8126:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""},"value":"balance should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""}],"id":918,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8086:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":927,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8086:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":928,"nodeType":"ExpressionStatement","src":"8086:62:0"},{"expression":{"arguments":[{"hexValue":"666f726b32","id":932,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8179:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},"value":"fork2"},{"hexValue":"3233343536","id":933,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8188:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"}],"expression":{"id":929,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8159:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":931,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"8159:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":934,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8159:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":935,"nodeType":"ExpressionStatement","src":"8159:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":942,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":939,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8224:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":937,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8212:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":938,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"8212:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":940,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8212:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3233343536","id":941,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8237:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"},"src":"8212:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":943,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8244:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":936,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8204:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":944,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8204:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":945,"nodeType":"ExpressionStatement","src":"8204:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":951,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":947,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8286:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":948,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8286:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":949,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8286:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"32","id":950,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8303:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"},"src":"8286:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652032","id":952,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8306:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""},"value":"value should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""}],"id":946,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8278:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":953,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8278:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":954,"nodeType":"ExpressionStatement","src":"8278:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":962,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":956,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8344:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":957,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8344:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"32","id":960,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8372:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"}],"id":959,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8364:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":958,"name":"uint256","nodeType":"ElementaryTypeName","src":"8364:7:0","typeDescriptions":{}}},"id":961,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8364:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8344:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652032","id":963,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8376:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""},"value":"balance should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""}],"id":955,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8336:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":964,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8336:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":965,"nodeType":"ExpressionStatement","src":"8336:62:0"}]},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"7776:3:0","parameters":{"id":873,"nodeType":"ParameterList","parameters":[],"src":"7779:2:0"},"returnParameters":{"id":874,"nodeType":"ParameterList","parameters":[],"src":"7791:0:0"},"scope":968,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkTester","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[968],"name":"ForkTester","nameLocation":"7603:10:0","scope":969,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkTester.json b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkTester.json
new file mode 100644
index 000000000000..94470339ecce
--- /dev/null
+++ b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkTester.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"run","inputs":[],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x608060405234801561001057600080fd5b5061070c806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c8063c040622614610030575b600080fd5b61003861003a565b005b604080517f71ee464d0000000000000000000000000000000000000000000000000000000081526004810191909152600560448201527f666f726b3100000000000000000000000000000000000000000000000000000060648201526130396024820152611234908190737109709ecfa91a80626ff3989d68f67f5b1dd12d906371ee464d906084016020604051808303816000875af11580156100e2573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010691906106b5565b506040517f2d0335ab00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83166004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401602060405180830381865afa158015610185573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a991906106ce565b67ffffffffffffffff1661303914610222576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f6e6f6e63652073686f756c64206265203132333435000000000000000000000060448201526064015b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1663209652556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561026d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029191906106b5565b6001146102fa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f76616c75652073686f756c6420626520310000000000000000000000000000006044820152606401610219565b60018273ffffffffffffffffffffffffffffffffffffffff16311461037b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f62616c616e63652073686f756c642062652031000000000000000000000000006044820152606401610219565b604080517f71ee464d0000000000000000000000000000000000000000000000000000000081526004810191909152600560448201527f666f726b320000000000000000000000000000000000000000000000000000006064820152615ba06024820152737109709ecfa91a80626ff3989d68f67f5b1dd12d906371ee464d906084016020604051808303816000875af115801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906106b5565b506040517f2d0335ab00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83166004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401602060405180830381865afa1580156104c0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104e491906106ce565b67ffffffffffffffff16615ba014610558576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f6e6f6e63652073686f756c6420626520313233343500000000000000000000006044820152606401610219565b8073ffffffffffffffffffffffffffffffffffffffff1663209652556040518163ffffffff1660e01b8152600401602060405180830381865afa1580156105a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c791906106b5565b600214610630576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f76616c75652073686f756c6420626520320000000000000000000000000000006044820152606401610219565b60028273ffffffffffffffffffffffffffffffffffffffff1631146106b1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f62616c616e63652073686f756c642062652032000000000000000000000000006044820152606401610219565b5050565b6000602082840312156106c757600080fd5b5051919050565b6000602082840312156106e057600080fd5b815167ffffffffffffffff811681146106f857600080fd5b939250505056fea164736f6c634300080f000a","sourceMap":"7594:813:0:-:0;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x608060405234801561001057600080fd5b506004361061002b5760003560e01c8063c040622614610030575b600080fd5b61003861003a565b005b604080517f71ee464d0000000000000000000000000000000000000000000000000000000081526004810191909152600560448201527f666f726b3100000000000000000000000000000000000000000000000000000060648201526130396024820152611234908190737109709ecfa91a80626ff3989d68f67f5b1dd12d906371ee464d906084016020604051808303816000875af11580156100e2573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010691906106b5565b506040517f2d0335ab00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83166004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401602060405180830381865afa158015610185573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a991906106ce565b67ffffffffffffffff1661303914610222576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f6e6f6e63652073686f756c64206265203132333435000000000000000000000060448201526064015b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1663209652556040518163ffffffff1660e01b8152600401602060405180830381865afa15801561026d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061029191906106b5565b6001146102fa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f76616c75652073686f756c6420626520310000000000000000000000000000006044820152606401610219565b60018273ffffffffffffffffffffffffffffffffffffffff16311461037b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f62616c616e63652073686f756c642062652031000000000000000000000000006044820152606401610219565b604080517f71ee464d0000000000000000000000000000000000000000000000000000000081526004810191909152600560448201527f666f726b320000000000000000000000000000000000000000000000000000006064820152615ba06024820152737109709ecfa91a80626ff3989d68f67f5b1dd12d906371ee464d906084016020604051808303816000875af115801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906106b5565b506040517f2d0335ab00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83166004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401602060405180830381865afa1580156104c0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104e491906106ce565b67ffffffffffffffff16615ba014610558576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601560248201527f6e6f6e63652073686f756c6420626520313233343500000000000000000000006044820152606401610219565b8073ffffffffffffffffffffffffffffffffffffffff1663209652556040518163ffffffff1660e01b8152600401602060405180830381865afa1580156105a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105c791906106b5565b600214610630576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601160248201527f76616c75652073686f756c6420626520320000000000000000000000000000006044820152606401610219565b60028273ffffffffffffffffffffffffffffffffffffffff1631146106b1576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f62616c616e63652073686f756c642062652032000000000000000000000000006044820152606401610219565b5050565b6000602082840312156106c757600080fd5b5051919050565b6000602082840312156106e057600080fd5b815167ffffffffffffffff811681146106f857600080fd5b939250505056fea164736f6c634300080f000a","sourceMap":"7594:813:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7767:638;;;:::i;:::-;;;7909:35;;;;;;;;;238:21:1;;;;295:1;275:18;;;268:29;333:7;313:18;;;306:35;7938:5:0;393:20:1;;;386:36;7836:6:0;;;;7909:19;;;;358::1;;7909:35:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;7962:21:0;;;;;798:42:1;786:55;;7962:21:0;;;768:74:1;7962:11:0;;;;741:18:1;;7962:21:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;:30;;7987:5;7962:30;7954:64;;;;;;;1348:2:1;7954:64:0;;;1330:21:1;1387:2;1367:18;;;1360:30;1426:23;1406:18;;;1399:51;1467:18;;7954:64:0;;;;;;;;;8036:2;:11;;;:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;8053:1;8036:18;8028:48;;;;;;;1698:2:1;8028:48:0;;;1680:21:1;1737:2;1717:18;;;1710:30;1776:19;1756:18;;;1749:47;1813:18;;8028:48:0;1496:341:1;8028:48:0;8122:1;8094:8;:16;;;:30;8086:62;;;;;;;2044:2:1;8086:62:0;;;2026:21:1;2083:2;2063:18;;;2056:30;2122:21;2102:18;;;2095:49;2161:18;;8086:62:0;1842:343:1;8086:62:0;8159:35;;;;;;;;;2414:21:1;;;;2471:1;2451:18;;;2444:29;2509:7;2489:18;;;2482:35;8188:5:0;2569:20:1;;;2562:36;8159:19:0;;;;2534::1;;8159:35:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;-1:-1:-1;8212:21:0;;;;;798:42:1;786:55;;8212:21:0;;;768:74:1;8212:11:0;;;;741:18:1;;8212:21:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;:30;;8237:5;8212:30;8204:64;;;;;;;1348:2:1;8204:64:0;;;1330:21:1;1387:2;1367:18;;;1360:30;1426:23;1406:18;;;1399:51;1467:18;;8204:64:0;1146:345:1;8204:64:0;8286:2;:11;;;:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;8303:1;8286:18;8278:48;;;;;;;2811:2:1;8278:48:0;;;2793:21:1;2850:2;2830:18;;;2823:30;2889:19;2869:18;;;2862:47;2926:18;;8278:48:0;2609:341:1;8278:48:0;8372:1;8344:8;:16;;;:30;8336:62;;;;;;;3157:2:1;8336:62:0;;;3139:21:1;3196:2;3176:18;;;3169:30;3235:21;3215:18;;;3208:49;3274:18;;8336:62:0;2955:343:1;8336:62:0;7791:614;;7767:638::o;433:184:1:-;503:6;556:2;544:9;535:7;531:23;527:32;524:52;;;572:1;569;562:12;524:52;-1:-1:-1;595:16:1;;433:184;-1:-1:-1;433:184:1:o;853:288::-;922:6;975:2;963:9;954:7;950:23;946:32;943:52;;;991:1;988;981:12;943:52;1023:9;1017:16;1073:18;1066:5;1062:30;1055:5;1052:41;1042:69;;1107:1;1104;1097:12;1042:69;1130:5;853:288;-1:-1:-1;;;853:288:1:o","linkReferences":{}},"methodIdentifiers":{"run()":"c0406226"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"run\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"ForkTester\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28\",\"dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"run"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"ForkTester"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da","urls":["bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28","dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":969,"exportedSymbols":{"FooBar":[799],"ForkTester":[968],"ForkedContract":[852],"NonceGetter":[833],"ScriptExample":[786],"Vm":[83],"console":[220]},"nodeType":"SourceUnit","src":"32:8375:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":83,"nodeType":"ContractDefinition","src":"120:969:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":83,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":61,"nodeType":"FunctionDefinition","src":"739:108:0","nodes":[],"functionSelector":"3ebf73b4","implemented":false,"kind":"function","modifiers":[],"name":"getDeployedCode","nameLocation":"748:15:0","parameters":{"id":57,"nodeType":"ParameterList","parameters":[{"constant":false,"id":56,"mutability":"mutable","name":"artifactPath","nameLocation":"780:12:0","nodeType":"VariableDeclaration","scope":61,"src":"764:28:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":55,"name":"string","nodeType":"ElementaryTypeName","src":"764:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"763:30:0"},"returnParameters":{"id":60,"nodeType":"ParameterList","parameters":[{"constant":false,"id":59,"mutability":"mutable","name":"runtimeBytecode","nameLocation":"830:15:0","nodeType":"VariableDeclaration","scope":61,"src":"817:28:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":58,"name":"bytes","nodeType":"ElementaryTypeName","src":"817:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"816:30:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":68,"nodeType":"FunctionDefinition","src":"852:74:0","nodes":[],"functionSelector":"b4d6c782","implemented":false,"kind":"function","modifiers":[],"name":"etch","nameLocation":"861:4:0","parameters":{"id":66,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"target","nameLocation":"874:6:0","nodeType":"VariableDeclaration","scope":68,"src":"866:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":62,"name":"address","nodeType":"ElementaryTypeName","src":"866:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":65,"mutability":"mutable","name":"newRuntimeBytecode","nameLocation":"897:18:0","nodeType":"VariableDeclaration","scope":68,"src":"882:33:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":64,"name":"bytes","nodeType":"ElementaryTypeName","src":"882:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"865:51:0"},"returnParameters":{"id":67,"nodeType":"ParameterList","parameters":[],"src":"925:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":73,"nodeType":"FunctionDefinition","src":"931:51:0","nodes":[],"functionSelector":"ea060291","implemented":false,"kind":"function","modifiers":[],"name":"allowCheatcodes","nameLocation":"940:15:0","parameters":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"account","nameLocation":"964:7:0","nodeType":"VariableDeclaration","scope":73,"src":"956:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":69,"name":"address","nodeType":"ElementaryTypeName","src":"956:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"955:17:0"},"returnParameters":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"981:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":82,"nodeType":"FunctionDefinition","src":"987:100:0","nodes":[],"functionSelector":"71ee464d","implemented":false,"kind":"function","modifiers":[],"name":"createSelectFork","nameLocation":"996:16:0","parameters":{"id":78,"nodeType":"ParameterList","parameters":[{"constant":false,"id":75,"mutability":"mutable","name":"forkName","nameLocation":"1029:8:0","nodeType":"VariableDeclaration","scope":82,"src":"1013:24:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":74,"name":"string","nodeType":"ElementaryTypeName","src":"1013:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":77,"mutability":"mutable","name":"blockNumber","nameLocation":"1047:11:0","nodeType":"VariableDeclaration","scope":82,"src":"1039:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":76,"name":"uint256","nodeType":"ElementaryTypeName","src":"1039:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1012:47:0"},"returnParameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":82,"src":"1078:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":79,"name":"uint256","nodeType":"ElementaryTypeName","src":"1078:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1077:9:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[83],"name":"Vm","nameLocation":"130:2:0","scope":969,"usedErrors":[]},{"id":220,"nodeType":"ContractDefinition","src":"1144:1851:0","nodes":[{"id":89,"nodeType":"VariableDeclaration","src":"1166:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"1183:15:0","scope":220,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":84,"name":"address","nodeType":"ElementaryTypeName","src":"1166:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":87,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"1209:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":86,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"1201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":85,"name":"address","nodeType":"ElementaryTypeName","src":"1201:7:0","typeDescriptions":{}}},"id":88,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1201:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1259:235:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1432:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1451:37:0","statements":[{"nodeType":"YulAssignment","src":"1465:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1474:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1465:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":95,"isOffset":false,"isSlot":false,"src":"1474:4:0","valueSize":1},{"declaration":102,"isOffset":false,"isSlot":false,"src":"1465:5:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1442:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"1268:25:0","parameters":{"id":96,"nodeType":"ParameterList","parameters":[{"constant":false,"id":95,"mutability":"mutable","name":"fnIn","nameLocation":"1331:4:0","nodeType":"VariableDeclaration","scope":106,"src":"1294:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":94,"nodeType":"FunctionTypeName","parameterTypes":{"id":92,"nodeType":"ParameterList","parameters":[{"constant":false,"id":91,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":94,"src":"1303:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":90,"name":"bytes","nodeType":"ElementaryTypeName","src":"1303:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1302:14:0"},"returnParameterTypes":{"id":93,"nodeType":"ParameterList","parameters":[],"src":"1331:0:0"},"src":"1294:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"1293:43:0"},"returnParameters":{"id":103,"nodeType":"ParameterList","parameters":[{"constant":false,"id":102,"mutability":"mutable","name":"fnOut","nameLocation":"1421:5:0","nodeType":"VariableDeclaration","scope":106,"src":"1384:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":101,"nodeType":"FunctionTypeName","parameterTypes":{"id":99,"nodeType":"ParameterList","parameters":[{"constant":false,"id":98,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":101,"src":"1393:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":97,"name":"bytes","nodeType":"ElementaryTypeName","src":"1393:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1392:14:0"},"returnParameterTypes":{"id":100,"nodeType":"ParameterList","parameters":[],"src":"1421:0:0"},"src":"1384:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1383:44:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":118,"nodeType":"FunctionDefinition","src":"1500:133:0","nodes":[],"body":{"id":117,"nodeType":"Block","src":"1561:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":114,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1618:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":112,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":134,"src":"1597:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":111,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1571:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":113,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":115,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":116,"nodeType":"ExpressionStatement","src":"1571:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1509:15:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"payload","nameLocation":"1538:7:0","nodeType":"VariableDeclaration","scope":118,"src":"1525:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":107,"name":"bytes","nodeType":"ElementaryTypeName","src":"1525:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1524:22:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1561:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":134,"nodeType":"FunctionDefinition","src":"1639:380:0","nodes":[],"body":{"id":133,"nodeType":"Block","src":"1703:316:0","nodes":[],"statements":[{"assignments":[124],"declarations":[{"constant":false,"id":124,"mutability":"mutable","name":"payloadLength","nameLocation":"1721:13:0","nodeType":"VariableDeclaration","scope":133,"src":"1713:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":123,"name":"uint256","nodeType":"ElementaryTypeName","src":"1713:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":127,"initialValue":{"expression":{"id":125,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":120,"src":"1737:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":126,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1737:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1713:38:0"},{"assignments":[129],"declarations":[{"constant":false,"id":129,"mutability":"mutable","name":"consoleAddress","nameLocation":"1769:14:0","nodeType":"VariableDeclaration","scope":133,"src":"1761:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":128,"name":"address","nodeType":"ElementaryTypeName","src":"1761:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":131,"initialValue":{"id":130,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":89,"src":"1786:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1761:40:0"},{"AST":{"nodeType":"YulBlock","src":"1863:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1877:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1901:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1910:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1897:3:0"},"nodeType":"YulFunctionCall","src":"1897:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1881:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1926:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1946:3:0"},"nodeType":"YulFunctionCall","src":"1946:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1953:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1969:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1983:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1998:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"2001:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1935:10:0"},"nodeType":"YulFunctionCall","src":"1935:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1930:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":129,"isOffset":false,"isSlot":false,"src":"1953:14:0","valueSize":1},{"declaration":120,"isOffset":false,"isSlot":false,"src":"1901:7:0","valueSize":1},{"declaration":124,"isOffset":false,"isSlot":false,"src":"1983:13:0","valueSize":1}],"id":132,"nodeType":"InlineAssembly","src":"1854:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1648:19:0","parameters":{"id":121,"nodeType":"ParameterList","parameters":[{"constant":false,"id":120,"mutability":"mutable","name":"payload","nameLocation":"1681:7:0","nodeType":"VariableDeclaration","scope":134,"src":"1668:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":119,"name":"bytes","nodeType":"ElementaryTypeName","src":"1668:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1667:22:0"},"returnParameters":{"id":122,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":220,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":148,"nodeType":"FunctionDefinition","src":"2025:164:0","nodes":[],"body":{"id":147,"nodeType":"Block","src":"2070:119:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":142,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2120:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":143,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":136,"src":"2135:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":140,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2096:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":141,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2096:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":144,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2096:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":139,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2080:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":145,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2080:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":146,"nodeType":"ExpressionStatement","src":"2080:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2034:3:0","parameters":{"id":137,"nodeType":"ParameterList","parameters":[{"constant":false,"id":136,"mutability":"mutable","name":"p0","nameLocation":"2052:2:0","nodeType":"VariableDeclaration","scope":148,"src":"2038:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":135,"name":"string","nodeType":"ElementaryTypeName","src":"2038:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2037:18:0"},"returnParameters":{"id":138,"nodeType":"ParameterList","parameters":[],"src":"2070:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":165,"nodeType":"FunctionDefinition","src":"2195:182:0","nodes":[],"body":{"id":164,"nodeType":"Block","src":"2249:128:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":158,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2299:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":159,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":150,"src":"2319:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":160,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":152,"src":"2323:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":156,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2275:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":157,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2275:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":161,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2275:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":155,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2259:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":162,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2259:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":163,"nodeType":"ExpressionStatement","src":"2259:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2204:3:0","parameters":{"id":153,"nodeType":"ParameterList","parameters":[{"constant":false,"id":150,"mutability":"mutable","name":"p0","nameLocation":"2222:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2208:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":149,"name":"string","nodeType":"ElementaryTypeName","src":"2208:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":152,"mutability":"mutable","name":"p1","nameLocation":"2231:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2226:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":151,"name":"bool","nodeType":"ElementaryTypeName","src":"2226:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"2207:27:0"},"returnParameters":{"id":154,"nodeType":"ParameterList","parameters":[],"src":"2249:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":182,"nodeType":"FunctionDefinition","src":"2383:188:0","nodes":[],"body":{"id":181,"nodeType":"Block","src":"2440:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":175,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2490:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":176,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":167,"src":"2513:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":177,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":169,"src":"2517:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":173,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2466:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":174,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2466:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":178,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2466:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":172,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2450:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":179,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2450:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":180,"nodeType":"ExpressionStatement","src":"2450:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2392:3:0","parameters":{"id":170,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"mutability":"mutable","name":"p0","nameLocation":"2410:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2396:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":166,"name":"string","nodeType":"ElementaryTypeName","src":"2396:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":169,"mutability":"mutable","name":"p1","nameLocation":"2422:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2414:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":168,"name":"uint256","nodeType":"ElementaryTypeName","src":"2414:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"2395:30:0"},"returnParameters":{"id":171,"nodeType":"ParameterList","parameters":[],"src":"2440:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":199,"nodeType":"FunctionDefinition","src":"2577:188:0","nodes":[],"body":{"id":198,"nodeType":"Block","src":"2634:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":192,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2684:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":193,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":184,"src":"2707:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":194,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":186,"src":"2711:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":190,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2660:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":191,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2660:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":195,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2660:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":189,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2644:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":196,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2644:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":197,"nodeType":"ExpressionStatement","src":"2644:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2586:3:0","parameters":{"id":187,"nodeType":"ParameterList","parameters":[{"constant":false,"id":184,"mutability":"mutable","name":"p0","nameLocation":"2604:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2590:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":183,"name":"string","nodeType":"ElementaryTypeName","src":"2590:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":186,"mutability":"mutable","name":"p1","nameLocation":"2616:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2608:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":185,"name":"address","nodeType":"ElementaryTypeName","src":"2608:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2589:30:0"},"returnParameters":{"id":188,"nodeType":"ParameterList","parameters":[],"src":"2634:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":219,"nodeType":"FunctionDefinition","src":"2771:222:0","nodes":[],"body":{"id":218,"nodeType":"Block","src":"2852:141:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":211,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2902:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":212,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":201,"src":"2931:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":213,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":203,"src":"2935:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":214,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":205,"src":"2939:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":209,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2878:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":210,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2878:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":215,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2878:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":208,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2862:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":216,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2862:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":217,"nodeType":"ExpressionStatement","src":"2862:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2780:3:0","parameters":{"id":206,"nodeType":"ParameterList","parameters":[{"constant":false,"id":201,"mutability":"mutable","name":"p0","nameLocation":"2798:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2784:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":200,"name":"string","nodeType":"ElementaryTypeName","src":"2784:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":203,"mutability":"mutable","name":"p1","nameLocation":"2816:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2802:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":202,"name":"string","nodeType":"ElementaryTypeName","src":"2802:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":205,"mutability":"mutable","name":"p2","nameLocation":"2834:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2820:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":204,"name":"string","nodeType":"ElementaryTypeName","src":"2820:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2783:54:0"},"returnParameters":{"id":207,"nodeType":"ParameterList","parameters":[],"src":"2852:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[220],"name":"console","nameLocation":"1152:7:0","scope":969,"usedErrors":[]},{"id":786,"nodeType":"ContractDefinition","src":"3123:3912:0","nodes":[{"id":235,"nodeType":"VariableDeclaration","src":"3152:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"3178:10:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":222,"name":"address","nodeType":"ElementaryTypeName","src":"3152:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3225:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":229,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"3215:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":231,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3215:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":228,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3207:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":227,"name":"uint256","nodeType":"ElementaryTypeName","src":"3207:7:0","typeDescriptions":{}}},"id":232,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3207:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":226,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3199:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":225,"name":"uint160","nodeType":"ElementaryTypeName","src":"3199:7:0","typeDescriptions":{}}},"id":233,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3199:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":224,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3191:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":223,"name":"address","nodeType":"ElementaryTypeName","src":"3191:7:0","typeDescriptions":{}}},"id":234,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3191:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":241,"nodeType":"VariableDeclaration","src":"3252:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"3273:2:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":237,"nodeType":"UserDefinedTypeName","pathNode":{"id":236,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"3252:2:0"},"referencedDeclaration":83,"src":"3252:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":239,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":235,"src":"3281:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":238,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"3278:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":240,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3278:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":243,"nodeType":"VariableDeclaration","src":"3356:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"3371:7:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":242,"name":"uint256","nodeType":"ElementaryTypeName","src":"3356:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":456,"nodeType":"FunctionDefinition","src":"3468:1428:0","nodes":[],"body":{"id":455,"nodeType":"Block","src":"3490:1406:0","nodes":[],"statements":[{"assignments":[248],"declarations":[{"constant":false,"id":248,"mutability":"mutable","name":"x","nameLocation":"3505:1:0","nodeType":"VariableDeclaration","scope":455,"src":"3500:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":247,"name":"bool","nodeType":"ElementaryTypeName","src":"3500:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":254,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":251,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3518:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":252,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"3534:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":249,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3509:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":250,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"3509:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"3500:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":258,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3562:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":259,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":248,"src":"3585:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":255,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3550:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":257,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":165,"src":"3550:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":260,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3550:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":261,"nodeType":"ExpressionStatement","src":"3550:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":265,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3610:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":268,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3635:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":267,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3627:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":266,"name":"address","nodeType":"ElementaryTypeName","src":"3627:7:0","typeDescriptions":{}}},"id":269,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3627:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":262,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3598:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3598:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3598:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":271,"nodeType":"ExpressionStatement","src":"3598:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":275,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3663:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":280,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3701:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":279,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3693:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":278,"name":"address","nodeType":"ElementaryTypeName","src":"3693:7:0","typeDescriptions":{}}},"id":281,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3693:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":276,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3681:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3681:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":282,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":272,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3651:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":274,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3651:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":283,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3651:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":284,"nodeType":"ExpressionStatement","src":"3651:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":288,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3730:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":291,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3753:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3753:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":290,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3745:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":289,"name":"address","nodeType":"ElementaryTypeName","src":"3745:7:0","typeDescriptions":{}}},"id":293,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3745:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":285,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3718:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":287,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3718:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":294,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3718:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":295,"nodeType":"ExpressionStatement","src":"3718:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":299,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3787:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":304,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3823:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":305,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3823:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":303,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3815:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":302,"name":"address","nodeType":"ElementaryTypeName","src":"3815:7:0","typeDescriptions":{}}},"id":306,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3815:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":300,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3803:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":301,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3803:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3803:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":296,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3775:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":298,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3775:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":308,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3775:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":309,"nodeType":"ExpressionStatement","src":"3775:61:0"},{"assignments":[311],"declarations":[{"constant":false,"id":311,"mutability":"mutable","name":"json","nameLocation":"3861:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3847:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":310,"name":"string","nodeType":"ElementaryTypeName","src":"3847:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":313,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3868:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3847:55:0"},{"assignments":[318],"declarations":[{"constant":false,"id":318,"mutability":"mutable","name":"keys","nameLocation":"3928:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3912:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":316,"name":"string","nodeType":"ElementaryTypeName","src":"3912:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":317,"nodeType":"ArrayTypeName","src":"3912:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":324,"initialValue":{"arguments":[{"id":321,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":311,"src":"3952:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3958:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":319,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3935:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":320,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3935:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":323,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3935:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3912:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":328,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3995:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":329,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4003:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":331,"indexExpression":{"hexValue":"30","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4008:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4003:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":332,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4012:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":334,"indexExpression":{"hexValue":"31","id":333,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4017:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4012:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":325,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3983:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":327,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":219,"src":"3983:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3983:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":336,"nodeType":"ExpressionStatement","src":"3983:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":340,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4042:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":337,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4031:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":339,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4031:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4031:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":342,"nodeType":"ExpressionStatement","src":"4031:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":350,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4098:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4090:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":348,"name":"uint160","nodeType":"ElementaryTypeName","src":"4090:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4090:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":347,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4082:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":346,"name":"address","nodeType":"ElementaryTypeName","src":"4082:7:0","typeDescriptions":{}}},"id":352,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4082:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":343,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4068:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":345,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"4068:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":353,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4068:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":354,"nodeType":"ExpressionStatement","src":"4068:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":358,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4126:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":355,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4115:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":357,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4115:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":359,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4115:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":360,"nodeType":"ExpressionStatement","src":"4115:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":364,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4163:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":367,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"4198:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":368,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"4198:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":366,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4190:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":365,"name":"address","nodeType":"ElementaryTypeName","src":"4190:7:0","typeDescriptions":{}}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4190:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":361,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4151:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4151:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":370,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4151:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":371,"nodeType":"ExpressionStatement","src":"4151:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":375,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4232:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":378,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4270:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":377,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4262:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":376,"name":"address","nodeType":"ElementaryTypeName","src":"4262:7:0","typeDescriptions":{}}},"id":379,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4262:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":372,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4220:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":374,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4220:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":380,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4220:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":381,"nodeType":"ExpressionStatement","src":"4220:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4297:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":382,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4286:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4286:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":386,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4286:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":387,"nodeType":"ExpressionStatement","src":"4286:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4322:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":390,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"4322:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":391,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4322:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":392,"nodeType":"ExpressionStatement","src":"4322:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":396,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4357:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":393,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4346:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4346:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":397,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4346:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":398,"nodeType":"ExpressionStatement","src":"4346:33:0"},{"assignments":[400],"declarations":[{"constant":false,"id":400,"mutability":"mutable","name":"tmpNonceGetter","nameLocation":"4480:14:0","nodeType":"VariableDeclaration","scope":455,"src":"4472:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":399,"name":"address","nodeType":"ElementaryTypeName","src":"4472:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":413,"initialValue":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"74656d70206e6f6e6365207465737420676574746572","id":408,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4531:24:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""},"value":"temp nonce test getter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""}],"id":407,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"4521:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":409,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4521:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":406,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4513:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":405,"name":"uint256","nodeType":"ElementaryTypeName","src":"4513:7:0","typeDescriptions":{}}},"id":410,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4513:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":404,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4505:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":403,"name":"uint160","nodeType":"ElementaryTypeName","src":"4505:7:0","typeDescriptions":{}}},"id":411,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4505:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":402,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4497:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":401,"name":"address","nodeType":"ElementaryTypeName","src":"4497:7:0","typeDescriptions":{}}},"id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4497:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"4472:87:0"},{"expression":{"arguments":[{"id":417,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4577:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},{"arguments":[{"hexValue":"5363726970744578616d706c652e732e736f6c3a4e6f6e6365476574746572","id":420,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4612:33:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""},"value":"ScriptExample.s.sol:NonceGetter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""}],"expression":{"id":418,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4593:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getDeployedCode","nodeType":"MemberAccess","referencedDeclaration":61,"src":"4593:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) view external returns (bytes memory)"}},"id":421,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4593:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"},{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"expression":{"id":414,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4569:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":416,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"etch","nodeType":"MemberAccess","referencedDeclaration":68,"src":"4569:7:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$","typeString":"function (address,bytes memory) external"}},"id":422,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4569:78:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":423,"nodeType":"ExpressionStatement","src":"4569:78:0"},{"expression":{"arguments":[{"id":427,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4676:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":424,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4657:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":426,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"allowCheatcodes","nodeType":"MemberAccess","referencedDeclaration":73,"src":"4657:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":428,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":429,"nodeType":"ExpressionStatement","src":"4657:34:0"},{"assignments":[431],"declarations":[{"constant":false,"id":431,"mutability":"mutable","name":"v","nameLocation":"4709:1:0","nodeType":"VariableDeclaration","scope":455,"src":"4701:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":430,"name":"uint256","nodeType":"ElementaryTypeName","src":"4701:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":441,"initialValue":{"arguments":[{"arguments":[{"id":438,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4758:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":437,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4750:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":436,"name":"address","nodeType":"ElementaryTypeName","src":"4750:7:0","typeDescriptions":{}}},"id":439,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4750:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"arguments":[{"id":433,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4725:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":432,"name":"NonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":833,"src":"4713:11:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_NonceGetter_$833_$","typeString":"type(contract NonceGetter)"}},"id":434,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_NonceGetter_$833","typeString":"contract NonceGetter"}},"id":435,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":832,"src":"4713:36:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint256_$","typeString":"function (address) view external returns (uint256)"}},"id":440,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"4701:63:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683a","id":445,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4786:68:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},"value":"nonce from nonce getter, no explicit access required with vm.etch:"},{"id":446,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":431,"src":"4856:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":442,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4774:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":444,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"4774:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4774:84:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":448,"nodeType":"ExpressionStatement","src":"4774:84:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":452,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4881:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":449,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4869:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":451,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"4869:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4869:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":454,"nodeType":"ExpressionStatement","src":"4869:20:0"}]},"documentation":{"id":244,"nodeType":"StructuredDocumentation","src":"3385:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"3477:3:0","parameters":{"id":245,"nodeType":"ParameterList","parameters":[],"src":"3480:2:0"},"returnParameters":{"id":246,"nodeType":"ParameterList","parameters":[],"src":"3490:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":689,"nodeType":"FunctionDefinition","src":"4963:1333:0","nodes":[],"body":{"id":688,"nodeType":"Block","src":"4994:1302:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":463,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5016:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":470,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5059:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":469,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5051:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":468,"name":"address","nodeType":"ElementaryTypeName","src":"5051:7:0","typeDescriptions":{}}},"id":471,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5051:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":466,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5039:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":467,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5039:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5039:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":465,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5031:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":464,"name":"uint256","nodeType":"ElementaryTypeName","src":"5031:7:0","typeDescriptions":{}}},"id":473,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5031:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":460,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5004:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":462,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"5004:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":474,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5004:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":475,"nodeType":"ExpressionStatement","src":"5004:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":479,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5090:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":476,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5078:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":478,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5078:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":480,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5078:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":481,"nodeType":"ExpressionStatement","src":"5078:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":482,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5117:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5117:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":485,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5117:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":486,"nodeType":"ExpressionStatement","src":"5117:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":490,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5152:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":487,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5141:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":489,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5141:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":491,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5141:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":492,"nodeType":"ExpressionStatement","src":"5141:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":496,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5188:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":493,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5177:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5177:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":497,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5177:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":498,"nodeType":"ExpressionStatement","src":"5177:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":502,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5226:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":499,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5214:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5214:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":503,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5214:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":504,"nodeType":"ExpressionStatement","src":"5214:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5291:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":511,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5283:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":510,"name":"uint160","nodeType":"ElementaryTypeName","src":"5283:7:0","typeDescriptions":{}}},"id":513,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5283:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5275:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":508,"name":"address","nodeType":"ElementaryTypeName","src":"5275:7:0","typeDescriptions":{}}},"id":514,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5275:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":505,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5257:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":507,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5257:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":515,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5257:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":516,"nodeType":"ExpressionStatement","src":"5257:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":520,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5323:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":517,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5312:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":519,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5312:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":521,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5312:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":522,"nodeType":"ExpressionStatement","src":"5312:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":526,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5362:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":523,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5351:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":525,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5351:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5351:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":528,"nodeType":"ExpressionStatement","src":"5351:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":532,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5404:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":529,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5390:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":531,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":785,"src":"5390:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":533,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5390:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":534,"nodeType":"ExpressionStatement","src":"5390:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":535,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5431:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":537,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5431:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":538,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5431:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":539,"nodeType":"ExpressionStatement","src":"5431:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":543,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5470:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":540,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5459:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":542,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5459:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":544,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5459:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":545,"nodeType":"ExpressionStatement","src":"5459:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":549,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5511:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":546,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5499:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5499:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":550,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5499:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":551,"nodeType":"ExpressionStatement","src":"5499:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":559,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5572:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":558,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5564:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":557,"name":"uint160","nodeType":"ElementaryTypeName","src":"5564:7:0","typeDescriptions":{}}},"id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5564:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":556,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5556:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":555,"name":"address","nodeType":"ElementaryTypeName","src":"5556:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5556:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":552,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5538:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":554,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5538:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":562,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5538:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":563,"nodeType":"ExpressionStatement","src":"5538:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":567,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5604:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":564,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5591:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":566,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":758,"src":"5591:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":568,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5591:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":569,"nodeType":"ExpressionStatement","src":"5591:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":570,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5623:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5623:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5623:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"5623:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5664:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5652:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5652:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5652:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"5652:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":588,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5725:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":587,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5717:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":586,"name":"uint160","nodeType":"ElementaryTypeName","src":"5717:7:0","typeDescriptions":{}}},"id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5717:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":585,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5709:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":584,"name":"address","nodeType":"ElementaryTypeName","src":"5709:7:0","typeDescriptions":{}}},"id":590,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5709:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5696:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5696:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":591,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5696:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":592,"nodeType":"ExpressionStatement","src":"5696:40:0"},{"assignments":[595],"declarations":[{"constant":false,"id":595,"mutability":"mutable","name":"x","nameLocation":"5753:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5746:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":594,"nodeType":"UserDefinedTypeName","pathNode":{"id":593,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5746:6:0"},"referencedDeclaration":799,"src":"5746:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":601,"initialValue":{"arguments":[{"hexValue":"31323334","id":599,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5768:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":598,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5757:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":597,"nodeType":"UserDefinedTypeName","pathNode":{"id":596,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5761:6:0"},"referencedDeclaration":799,"src":"5761:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":600,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5757:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5746:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":607,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":603,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":595,"src":"5791:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"5791:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5791:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":606,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5802:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"5791:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323334","id":608,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5808:35:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""},"value":"FooBar: foo in create is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""}],"id":602,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"5783:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":609,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5783:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":610,"nodeType":"ExpressionStatement","src":"5783:61:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":614,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5867:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":611,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5855:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":613,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5855:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":615,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5855:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":616,"nodeType":"ExpressionStatement","src":"5855:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5917:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":623,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5909:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":622,"name":"uint160","nodeType":"ElementaryTypeName","src":"5909:7:0","typeDescriptions":{}}},"id":625,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5909:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":621,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5901:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":620,"name":"address","nodeType":"ElementaryTypeName","src":"5901:7:0","typeDescriptions":{}}},"id":626,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5901:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":617,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5888:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":627,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5888:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":628,"nodeType":"ExpressionStatement","src":"5888:38:0"},{"assignments":[631],"declarations":[{"constant":false,"id":631,"mutability":"mutable","name":"y","nameLocation":"5943:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5936:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":630,"nodeType":"UserDefinedTypeName","pathNode":{"id":629,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5936:6:0"},"referencedDeclaration":799,"src":"5936:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":645,"initialValue":{"arguments":[{"hexValue":"31323334","id":643,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5986:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":634,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5947:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":633,"nodeType":"UserDefinedTypeName","pathNode":{"id":632,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5951:6:0"},"referencedDeclaration":799,"src":"5951:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":642,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":639,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5980:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":638,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5972:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":637,"name":"uint256","nodeType":"ElementaryTypeName","src":"5972:7:0","typeDescriptions":{}}},"id":640,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5972:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":636,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5964:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":635,"name":"bytes32","nodeType":"ElementaryTypeName","src":"5964:7:0","typeDescriptions":{}}},"id":641,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5964:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"5947:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":644,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5947:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5936:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":651,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":647,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":631,"src":"6009:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":648,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"6009:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":649,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6009:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":650,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6020:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"6009:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e2063726561746532206973206e6f742031323334","id":652,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6026:36:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""},"value":"FooBar: foo in create2 is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""}],"id":646,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"6001:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":653,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6001:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":654,"nodeType":"ExpressionStatement","src":"6001:62:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":658,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6085:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":655,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6073:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":657,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6073:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":659,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6073:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":660,"nodeType":"ExpressionStatement","src":"6073:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":661,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6177:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":663,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"6177:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":664,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6177:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":665,"nodeType":"ExpressionStatement","src":"6177:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":669,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6212:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":668,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"6201:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":667,"nodeType":"UserDefinedTypeName","pathNode":{"id":666,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"6205:6:0"},"referencedDeclaration":799,"src":"6205:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":670,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6201:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":671,"nodeType":"ExpressionStatement","src":"6201:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":675,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6240:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":682,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6281:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":681,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6273:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":680,"name":"address","nodeType":"ElementaryTypeName","src":"6273:7:0","typeDescriptions":{}}},"id":683,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6273:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":678,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6261:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":679,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"6261:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":684,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6261:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":677,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6253:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":676,"name":"uint256","nodeType":"ElementaryTypeName","src":"6253:7:0","typeDescriptions":{}}},"id":685,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6253:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":672,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6228:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":674,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"6228:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":686,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6228:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":687,"nodeType":"ExpressionStatement","src":"6228:61:0"}]},"documentation":{"id":457,"nodeType":"StructuredDocumentation","src":"4902:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"4972:12:0","parameters":{"id":458,"nodeType":"ParameterList","parameters":[],"src":"4984:2:0"},"returnParameters":{"id":459,"nodeType":"ParameterList","parameters":[],"src":"4994:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":713,"nodeType":"FunctionDefinition","src":"6391:143:0","nodes":[],"body":{"id":712,"nodeType":"Block","src":"6440:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":698,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":692,"src":"6462:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":695,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6450:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":697,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6450:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":699,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6450:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":700,"nodeType":"ExpressionStatement","src":"6450:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":704,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6487:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":707,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"6515:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":708,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"6515:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":706,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6507:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":705,"name":"address","nodeType":"ElementaryTypeName","src":"6507:7:0","typeDescriptions":{}}},"id":709,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6507:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":701,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6475:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":703,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"6475:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":710,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6475:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":711,"nodeType":"ExpressionStatement","src":"6475:52:0"}]},"documentation":{"id":690,"nodeType":"StructuredDocumentation","src":"6302:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"6400:5:0","parameters":{"id":693,"nodeType":"ParameterList","parameters":[{"constant":false,"id":692,"mutability":"mutable","name":"_v","nameLocation":"6422:2:0","nodeType":"VariableDeclaration","scope":713,"src":"6406:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":691,"name":"string","nodeType":"ElementaryTypeName","src":"6406:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6405:20:0"},"returnParameters":{"id":694,"nodeType":"ParameterList","parameters":[],"src":"6440:0:0"},"scope":786,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":728,"nodeType":"FunctionDefinition","src":"6540:95:0","nodes":[],"body":{"id":727,"nodeType":"Block","src":"6584:51:0","nodes":[],"statements":[{"expression":{"id":719,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6594:9:0","subExpression":{"id":718,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6594:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":720,"nodeType":"ExpressionStatement","src":"6594:9:0"},{"expression":{"arguments":[{"id":724,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":715,"src":"6625:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":721,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6613:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":723,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6613:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":725,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6613:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":726,"nodeType":"ExpressionStatement","src":"6613:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"6549:5:0","parameters":{"id":716,"nodeType":"ParameterList","parameters":[{"constant":false,"id":715,"mutability":"mutable","name":"_v","nameLocation":"6571:2:0","nodeType":"VariableDeclaration","scope":728,"src":"6555:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":714,"name":"string","nodeType":"ElementaryTypeName","src":"6555:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6554:20:0"},"returnParameters":{"id":717,"nodeType":"ParameterList","parameters":[],"src":"6584:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":743,"nodeType":"FunctionDefinition","src":"6641:95:0","nodes":[],"body":{"id":742,"nodeType":"Block","src":"6685:51:0","nodes":[],"statements":[{"expression":{"id":734,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6695:9:0","subExpression":{"id":733,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6695:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":735,"nodeType":"ExpressionStatement","src":"6695:9:0"},{"expression":{"arguments":[{"id":739,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":730,"src":"6726:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":736,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6714:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":738,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6714:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":740,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6714:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":741,"nodeType":"ExpressionStatement","src":"6714:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"6650:5:0","parameters":{"id":731,"nodeType":"ParameterList","parameters":[{"constant":false,"id":730,"mutability":"mutable","name":"_v","nameLocation":"6672:2:0","nodeType":"VariableDeclaration","scope":743,"src":"6656:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":729,"name":"string","nodeType":"ElementaryTypeName","src":"6656:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6655:20:0"},"returnParameters":{"id":732,"nodeType":"ParameterList","parameters":[],"src":"6685:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":758,"nodeType":"FunctionDefinition","src":"6742:98:0","nodes":[],"body":{"id":757,"nodeType":"Block","src":"6788:52:0","nodes":[],"statements":[{"expression":{"id":749,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6798:9:0","subExpression":{"id":748,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6798:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":750,"nodeType":"ExpressionStatement","src":"6798:9:0"},{"expression":{"arguments":[{"id":754,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":745,"src":"6830:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":751,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6817:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":753,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":773,"src":"6817:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":755,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6817:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":756,"nodeType":"ExpressionStatement","src":"6817:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"6751:7:0","parameters":{"id":746,"nodeType":"ParameterList","parameters":[{"constant":false,"id":745,"mutability":"mutable","name":"_v","nameLocation":"6775:2:0","nodeType":"VariableDeclaration","scope":758,"src":"6759:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":744,"name":"string","nodeType":"ElementaryTypeName","src":"6759:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6758:20:0"},"returnParameters":{"id":747,"nodeType":"ParameterList","parameters":[],"src":"6788:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":773,"nodeType":"FunctionDefinition","src":"6846:97:0","nodes":[],"body":{"id":772,"nodeType":"Block","src":"6892:51:0","nodes":[],"statements":[{"expression":{"id":764,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6902:9:0","subExpression":{"id":763,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6902:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":765,"nodeType":"ExpressionStatement","src":"6902:9:0"},{"expression":{"arguments":[{"id":769,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":760,"src":"6933:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":766,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6921:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":768,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6921:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":770,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6921:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":771,"nodeType":"ExpressionStatement","src":"6921:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"6855:7:0","parameters":{"id":761,"nodeType":"ParameterList","parameters":[{"constant":false,"id":760,"mutability":"mutable","name":"_v","nameLocation":"6879:2:0","nodeType":"VariableDeclaration","scope":773,"src":"6863:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":759,"name":"string","nodeType":"ElementaryTypeName","src":"6863:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6862:20:0"},"returnParameters":{"id":762,"nodeType":"ParameterList","parameters":[],"src":"6892:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":785,"nodeType":"FunctionDefinition","src":"6949:84:0","nodes":[],"body":{"id":784,"nodeType":"Block","src":"7001:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":781,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":775,"src":"7023:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":778,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"7011:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":780,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"7011:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":782,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7011:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":783,"nodeType":"ExpressionStatement","src":"7011:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"6958:8:0","parameters":{"id":776,"nodeType":"ParameterList","parameters":[{"constant":false,"id":775,"mutability":"mutable","name":"_v","nameLocation":"6983:2:0","nodeType":"VariableDeclaration","scope":785,"src":"6967:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":774,"name":"string","nodeType":"ElementaryTypeName","src":"6967:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6966:20:0"},"returnParameters":{"id":777,"nodeType":"ParameterList","parameters":[],"src":"7001:0:0"},"scope":786,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[799],"contractKind":"contract","documentation":{"id":221,"nodeType":"StructuredDocumentation","src":"2997:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[786],"name":"ScriptExample","nameLocation":"3132:13:0","scope":969,"usedErrors":[]},{"id":799,"nodeType":"ContractDefinition","src":"7037:96:0","nodes":[{"id":788,"nodeType":"VariableDeclaration","src":"7059:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"7074:3:0","scope":799,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":787,"name":"uint256","nodeType":"ElementaryTypeName","src":"7059:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":798,"nodeType":"FunctionDefinition","src":"7084:47:0","nodes":[],"body":{"id":797,"nodeType":"Block","src":"7107:24:0","nodes":[],"statements":[{"expression":{"id":795,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":793,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":788,"src":"7117:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":794,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":790,"src":"7123:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"7117:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":796,"nodeType":"ExpressionStatement","src":"7117:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":791,"nodeType":"ParameterList","parameters":[{"constant":false,"id":790,"mutability":"mutable","name":"v","nameLocation":"7104:1:0","nodeType":"VariableDeclaration","scope":798,"src":"7096:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":789,"name":"uint256","nodeType":"ElementaryTypeName","src":"7096:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7095:11:0"},"returnParameters":{"id":792,"nodeType":"ParameterList","parameters":[],"src":"7107:0:0"},"scope":799,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[799],"name":"FooBar","nameLocation":"7046:6:0","scope":969,"usedErrors":[]},{"id":833,"nodeType":"ContractDefinition","src":"7135:281:0","nodes":[{"id":813,"nodeType":"VariableDeclaration","src":"7162:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7188:10:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":800,"name":"address","nodeType":"ElementaryTypeName","src":"7162:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":808,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7235:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":807,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7225:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":809,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7225:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":806,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7217:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":805,"name":"uint256","nodeType":"ElementaryTypeName","src":"7217:7:0","typeDescriptions":{}}},"id":810,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7217:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":804,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7209:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":803,"name":"uint160","nodeType":"ElementaryTypeName","src":"7209:7:0","typeDescriptions":{}}},"id":811,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7209:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":802,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":801,"name":"address","nodeType":"ElementaryTypeName","src":"7201:7:0","typeDescriptions":{}}},"id":812,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7201:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":819,"nodeType":"VariableDeclaration","src":"7262:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7283:2:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":815,"nodeType":"UserDefinedTypeName","pathNode":{"id":814,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7262:2:0"},"referencedDeclaration":83,"src":"7262:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":817,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":813,"src":"7291:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":816,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7288:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":818,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7288:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":832,"nodeType":"FunctionDefinition","src":"7309:105:0","nodes":[],"body":{"id":831,"nodeType":"Block","src":"7372:42:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":828,"name":"_addr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":821,"src":"7401:5:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":826,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":819,"src":"7389:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":827,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7389:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":829,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7389:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"functionReturnParameters":825,"id":830,"nodeType":"Return","src":"7382:25:0"}]},"functionSelector":"2d0335ab","implemented":true,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"7318:8:0","parameters":{"id":822,"nodeType":"ParameterList","parameters":[{"constant":false,"id":821,"mutability":"mutable","name":"_addr","nameLocation":"7335:5:0","nodeType":"VariableDeclaration","scope":832,"src":"7327:13:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":820,"name":"address","nodeType":"ElementaryTypeName","src":"7327:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"7326:15:0"},"returnParameters":{"id":825,"nodeType":"ParameterList","parameters":[{"constant":false,"id":824,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":832,"src":"7363:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":823,"name":"uint256","nodeType":"ElementaryTypeName","src":"7363:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7362:9:0"},"scope":833,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"NonceGetter","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[833],"name":"NonceGetter","nameLocation":"7144:11:0","scope":969,"usedErrors":[]},{"id":852,"nodeType":"ContractDefinition","src":"7418:174:0","nodes":[{"id":835,"nodeType":"VariableDeclaration","src":"7448:18:0","nodes":[],"constant":false,"mutability":"mutable","name":"v","nameLocation":"7465:1:0","scope":852,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":834,"name":"uint256","nodeType":"ElementaryTypeName","src":"7448:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"id":843,"nodeType":"FunctionDefinition","src":"7473:36:0","nodes":[],"body":{"id":842,"nodeType":"Block","src":"7487:22:0","nodes":[],"statements":[{"expression":{"id":840,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":838,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7497:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"hexValue":"31","id":839,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7501:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"7497:5:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":841,"nodeType":"ExpressionStatement","src":"7497:5:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":836,"nodeType":"ParameterList","parameters":[],"src":"7484:2:0"},"returnParameters":{"id":837,"nodeType":"ParameterList","parameters":[],"src":"7487:0:0"},"scope":852,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":851,"nodeType":"FunctionDefinition","src":"7515:75:0","nodes":[],"body":{"id":850,"nodeType":"Block","src":"7565:25:0","nodes":[],"statements":[{"expression":{"id":848,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7582:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"functionReturnParameters":847,"id":849,"nodeType":"Return","src":"7575:8:0"}]},"functionSelector":"20965255","implemented":true,"kind":"function","modifiers":[],"name":"getValue","nameLocation":"7524:8:0","parameters":{"id":844,"nodeType":"ParameterList","parameters":[],"src":"7532:2:0"},"returnParameters":{"id":847,"nodeType":"ParameterList","parameters":[{"constant":false,"id":846,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":851,"src":"7556:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":845,"name":"uint256","nodeType":"ElementaryTypeName","src":"7556:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7555:9:0"},"scope":852,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkedContract","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[852],"name":"ForkedContract","nameLocation":"7427:14:0","scope":969,"usedErrors":[]},{"id":968,"nodeType":"ContractDefinition","src":"7594:813:0","nodes":[{"id":866,"nodeType":"VariableDeclaration","src":"7620:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7646:10:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":853,"name":"address","nodeType":"ElementaryTypeName","src":"7620:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":861,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7693:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":860,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7683:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":862,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7683:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":859,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7675:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":858,"name":"uint256","nodeType":"ElementaryTypeName","src":"7675:7:0","typeDescriptions":{}}},"id":863,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7675:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":857,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7667:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":856,"name":"uint160","nodeType":"ElementaryTypeName","src":"7667:7:0","typeDescriptions":{}}},"id":864,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7667:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":855,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7659:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":854,"name":"address","nodeType":"ElementaryTypeName","src":"7659:7:0","typeDescriptions":{}}},"id":865,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7659:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":872,"nodeType":"VariableDeclaration","src":"7720:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7741:2:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":868,"nodeType":"UserDefinedTypeName","pathNode":{"id":867,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7720:2:0"},"referencedDeclaration":83,"src":"7720:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":870,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":866,"src":"7749:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":869,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7746:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":871,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7746:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":967,"nodeType":"FunctionDefinition","src":"7767:638:0","nodes":[],"body":{"id":966,"nodeType":"Block","src":"7791:614:0","nodes":[],"statements":[{"assignments":[876],"declarations":[{"constant":false,"id":876,"mutability":"mutable","name":"testAddr","nameLocation":"7809:8:0","nodeType":"VariableDeclaration","scope":966,"src":"7801:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":875,"name":"address","nodeType":"ElementaryTypeName","src":"7801:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":884,"initialValue":{"arguments":[{"arguments":[{"hexValue":"307831323334","id":881,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7836:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":880,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7828:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":879,"name":"uint160","nodeType":"ElementaryTypeName","src":"7828:7:0","typeDescriptions":{}}},"id":882,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7828:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":878,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7820:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":877,"name":"address","nodeType":"ElementaryTypeName","src":"7820:7:0","typeDescriptions":{}}},"id":883,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7820:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"7801:43:0"},{"assignments":[887],"declarations":[{"constant":false,"id":887,"mutability":"mutable","name":"fc","nameLocation":"7869:2:0","nodeType":"VariableDeclaration","scope":966,"src":"7854:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"},"typeName":{"id":886,"nodeType":"UserDefinedTypeName","pathNode":{"id":885,"name":"ForkedContract","nodeType":"IdentifierPath","referencedDeclaration":852,"src":"7854:14:0"},"referencedDeclaration":852,"src":"7854:14:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"visibility":"internal"}],"id":891,"initialValue":{"arguments":[{"id":889,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7889:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":888,"name":"ForkedContract","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":852,"src":"7874:14:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_ForkedContract_$852_$","typeString":"type(contract ForkedContract)"}},"id":890,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7874:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"nodeType":"VariableDeclarationStatement","src":"7854:44:0"},{"expression":{"arguments":[{"hexValue":"666f726b31","id":895,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7929:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},"value":"fork1"},{"hexValue":"3132333435","id":896,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7938:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"}],"expression":{"id":892,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7909:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":894,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"7909:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":897,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7909:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":898,"nodeType":"ExpressionStatement","src":"7909:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":905,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":902,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7974:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":900,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7962:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":901,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7962:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":903,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7962:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3132333435","id":904,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7987:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"},"src":"7962:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":906,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7994:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":899,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"7954:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":907,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7954:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":908,"nodeType":"ExpressionStatement","src":"7954:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":914,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":910,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8036:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":911,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8036:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":912,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8036:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31","id":913,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8053:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"8036:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652031","id":915,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8056:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""},"value":"value should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""}],"id":909,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8028:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":916,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8028:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":917,"nodeType":"ExpressionStatement","src":"8028:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":925,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":919,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8094:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":920,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8094:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"31","id":923,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8122:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"}],"id":922,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8114:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":921,"name":"uint256","nodeType":"ElementaryTypeName","src":"8114:7:0","typeDescriptions":{}}},"id":924,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8114:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8094:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652031","id":926,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8126:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""},"value":"balance should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""}],"id":918,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8086:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":927,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8086:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":928,"nodeType":"ExpressionStatement","src":"8086:62:0"},{"expression":{"arguments":[{"hexValue":"666f726b32","id":932,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8179:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},"value":"fork2"},{"hexValue":"3233343536","id":933,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8188:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"}],"expression":{"id":929,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8159:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":931,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"8159:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":934,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8159:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":935,"nodeType":"ExpressionStatement","src":"8159:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":942,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":939,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8224:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":937,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8212:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":938,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"8212:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":940,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8212:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3233343536","id":941,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8237:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"},"src":"8212:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":943,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8244:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":936,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8204:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":944,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8204:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":945,"nodeType":"ExpressionStatement","src":"8204:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":951,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":947,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8286:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":948,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8286:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":949,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8286:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"32","id":950,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8303:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"},"src":"8286:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652032","id":952,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8306:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""},"value":"value should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""}],"id":946,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8278:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":953,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8278:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":954,"nodeType":"ExpressionStatement","src":"8278:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":962,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":956,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8344:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":957,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8344:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"32","id":960,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8372:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"}],"id":959,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8364:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":958,"name":"uint256","nodeType":"ElementaryTypeName","src":"8364:7:0","typeDescriptions":{}}},"id":961,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8364:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8344:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652032","id":963,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8376:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""},"value":"balance should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""}],"id":955,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8336:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":964,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8336:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":965,"nodeType":"ExpressionStatement","src":"8336:62:0"}]},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"7776:3:0","parameters":{"id":873,"nodeType":"ParameterList","parameters":[],"src":"7779:2:0"},"returnParameters":{"id":874,"nodeType":"ParameterList","parameters":[],"src":"7791:0:0"},"scope":968,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkTester","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[968],"name":"ForkTester","nameLocation":"7603:10:0","scope":969,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkedContract.json b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkedContract.json
new file mode 100644
index 000000000000..b2c69de3ffbc
--- /dev/null
+++ b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ForkedContract.json
@@ -0,0 +1 @@
+{"abi":[{"type":"constructor","inputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"getValue","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"}],"bytecode":{"object":"0x6080604052348015600f57600080fd5b506001600055604f8060226000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c80632096525514602d575b600080fd5b60005460405190815260200160405180910390f3fea164736f6c634300080f000a","sourceMap":"7418:174:0:-:0;;;7473:36;;;;;;;;;-1:-1:-1;7501:1:0;7497;:5;7418:174;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x6080604052348015600f57600080fd5b506004361060285760003560e01c80632096525514602d575b600080fd5b60005460405190815260200160405180910390f3fea164736f6c634300080f000a","sourceMap":"7418:174:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7515:75;7556:7;7582:1;7515:75;;160:25:1;;;148:2;133:18;7515:75:0;;;;;;","linkReferences":{}},"methodIdentifiers":{"getValue()":"20965255"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"getValue\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"ForkedContract\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28\",\"dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"stateMutability":"view","type":"function","name":"getValue","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"ForkedContract"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da","urls":["bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28","dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[{"astId":835,"contract":"scripts/ScriptExample.s.sol:ForkedContract","label":"v","offset":0,"slot":"0","type":"t_uint256"}],"types":{"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":969,"exportedSymbols":{"FooBar":[799],"ForkTester":[968],"ForkedContract":[852],"NonceGetter":[833],"ScriptExample":[786],"Vm":[83],"console":[220]},"nodeType":"SourceUnit","src":"32:8375:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":83,"nodeType":"ContractDefinition","src":"120:969:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":83,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":61,"nodeType":"FunctionDefinition","src":"739:108:0","nodes":[],"functionSelector":"3ebf73b4","implemented":false,"kind":"function","modifiers":[],"name":"getDeployedCode","nameLocation":"748:15:0","parameters":{"id":57,"nodeType":"ParameterList","parameters":[{"constant":false,"id":56,"mutability":"mutable","name":"artifactPath","nameLocation":"780:12:0","nodeType":"VariableDeclaration","scope":61,"src":"764:28:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":55,"name":"string","nodeType":"ElementaryTypeName","src":"764:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"763:30:0"},"returnParameters":{"id":60,"nodeType":"ParameterList","parameters":[{"constant":false,"id":59,"mutability":"mutable","name":"runtimeBytecode","nameLocation":"830:15:0","nodeType":"VariableDeclaration","scope":61,"src":"817:28:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":58,"name":"bytes","nodeType":"ElementaryTypeName","src":"817:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"816:30:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":68,"nodeType":"FunctionDefinition","src":"852:74:0","nodes":[],"functionSelector":"b4d6c782","implemented":false,"kind":"function","modifiers":[],"name":"etch","nameLocation":"861:4:0","parameters":{"id":66,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"target","nameLocation":"874:6:0","nodeType":"VariableDeclaration","scope":68,"src":"866:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":62,"name":"address","nodeType":"ElementaryTypeName","src":"866:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":65,"mutability":"mutable","name":"newRuntimeBytecode","nameLocation":"897:18:0","nodeType":"VariableDeclaration","scope":68,"src":"882:33:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":64,"name":"bytes","nodeType":"ElementaryTypeName","src":"882:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"865:51:0"},"returnParameters":{"id":67,"nodeType":"ParameterList","parameters":[],"src":"925:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":73,"nodeType":"FunctionDefinition","src":"931:51:0","nodes":[],"functionSelector":"ea060291","implemented":false,"kind":"function","modifiers":[],"name":"allowCheatcodes","nameLocation":"940:15:0","parameters":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"account","nameLocation":"964:7:0","nodeType":"VariableDeclaration","scope":73,"src":"956:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":69,"name":"address","nodeType":"ElementaryTypeName","src":"956:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"955:17:0"},"returnParameters":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"981:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":82,"nodeType":"FunctionDefinition","src":"987:100:0","nodes":[],"functionSelector":"71ee464d","implemented":false,"kind":"function","modifiers":[],"name":"createSelectFork","nameLocation":"996:16:0","parameters":{"id":78,"nodeType":"ParameterList","parameters":[{"constant":false,"id":75,"mutability":"mutable","name":"forkName","nameLocation":"1029:8:0","nodeType":"VariableDeclaration","scope":82,"src":"1013:24:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":74,"name":"string","nodeType":"ElementaryTypeName","src":"1013:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":77,"mutability":"mutable","name":"blockNumber","nameLocation":"1047:11:0","nodeType":"VariableDeclaration","scope":82,"src":"1039:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":76,"name":"uint256","nodeType":"ElementaryTypeName","src":"1039:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1012:47:0"},"returnParameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":82,"src":"1078:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":79,"name":"uint256","nodeType":"ElementaryTypeName","src":"1078:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1077:9:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[83],"name":"Vm","nameLocation":"130:2:0","scope":969,"usedErrors":[]},{"id":220,"nodeType":"ContractDefinition","src":"1144:1851:0","nodes":[{"id":89,"nodeType":"VariableDeclaration","src":"1166:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"1183:15:0","scope":220,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":84,"name":"address","nodeType":"ElementaryTypeName","src":"1166:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":87,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"1209:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":86,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"1201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":85,"name":"address","nodeType":"ElementaryTypeName","src":"1201:7:0","typeDescriptions":{}}},"id":88,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1201:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1259:235:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1432:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1451:37:0","statements":[{"nodeType":"YulAssignment","src":"1465:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1474:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1465:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":95,"isOffset":false,"isSlot":false,"src":"1474:4:0","valueSize":1},{"declaration":102,"isOffset":false,"isSlot":false,"src":"1465:5:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1442:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"1268:25:0","parameters":{"id":96,"nodeType":"ParameterList","parameters":[{"constant":false,"id":95,"mutability":"mutable","name":"fnIn","nameLocation":"1331:4:0","nodeType":"VariableDeclaration","scope":106,"src":"1294:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":94,"nodeType":"FunctionTypeName","parameterTypes":{"id":92,"nodeType":"ParameterList","parameters":[{"constant":false,"id":91,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":94,"src":"1303:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":90,"name":"bytes","nodeType":"ElementaryTypeName","src":"1303:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1302:14:0"},"returnParameterTypes":{"id":93,"nodeType":"ParameterList","parameters":[],"src":"1331:0:0"},"src":"1294:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"1293:43:0"},"returnParameters":{"id":103,"nodeType":"ParameterList","parameters":[{"constant":false,"id":102,"mutability":"mutable","name":"fnOut","nameLocation":"1421:5:0","nodeType":"VariableDeclaration","scope":106,"src":"1384:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":101,"nodeType":"FunctionTypeName","parameterTypes":{"id":99,"nodeType":"ParameterList","parameters":[{"constant":false,"id":98,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":101,"src":"1393:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":97,"name":"bytes","nodeType":"ElementaryTypeName","src":"1393:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1392:14:0"},"returnParameterTypes":{"id":100,"nodeType":"ParameterList","parameters":[],"src":"1421:0:0"},"src":"1384:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1383:44:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":118,"nodeType":"FunctionDefinition","src":"1500:133:0","nodes":[],"body":{"id":117,"nodeType":"Block","src":"1561:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":114,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1618:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":112,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":134,"src":"1597:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":111,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1571:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":113,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":115,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":116,"nodeType":"ExpressionStatement","src":"1571:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1509:15:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"payload","nameLocation":"1538:7:0","nodeType":"VariableDeclaration","scope":118,"src":"1525:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":107,"name":"bytes","nodeType":"ElementaryTypeName","src":"1525:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1524:22:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1561:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":134,"nodeType":"FunctionDefinition","src":"1639:380:0","nodes":[],"body":{"id":133,"nodeType":"Block","src":"1703:316:0","nodes":[],"statements":[{"assignments":[124],"declarations":[{"constant":false,"id":124,"mutability":"mutable","name":"payloadLength","nameLocation":"1721:13:0","nodeType":"VariableDeclaration","scope":133,"src":"1713:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":123,"name":"uint256","nodeType":"ElementaryTypeName","src":"1713:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":127,"initialValue":{"expression":{"id":125,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":120,"src":"1737:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":126,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1737:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1713:38:0"},{"assignments":[129],"declarations":[{"constant":false,"id":129,"mutability":"mutable","name":"consoleAddress","nameLocation":"1769:14:0","nodeType":"VariableDeclaration","scope":133,"src":"1761:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":128,"name":"address","nodeType":"ElementaryTypeName","src":"1761:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":131,"initialValue":{"id":130,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":89,"src":"1786:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1761:40:0"},{"AST":{"nodeType":"YulBlock","src":"1863:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1877:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1901:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1910:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1897:3:0"},"nodeType":"YulFunctionCall","src":"1897:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1881:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1926:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1946:3:0"},"nodeType":"YulFunctionCall","src":"1946:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1953:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1969:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1983:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1998:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"2001:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1935:10:0"},"nodeType":"YulFunctionCall","src":"1935:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1930:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":129,"isOffset":false,"isSlot":false,"src":"1953:14:0","valueSize":1},{"declaration":120,"isOffset":false,"isSlot":false,"src":"1901:7:0","valueSize":1},{"declaration":124,"isOffset":false,"isSlot":false,"src":"1983:13:0","valueSize":1}],"id":132,"nodeType":"InlineAssembly","src":"1854:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1648:19:0","parameters":{"id":121,"nodeType":"ParameterList","parameters":[{"constant":false,"id":120,"mutability":"mutable","name":"payload","nameLocation":"1681:7:0","nodeType":"VariableDeclaration","scope":134,"src":"1668:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":119,"name":"bytes","nodeType":"ElementaryTypeName","src":"1668:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1667:22:0"},"returnParameters":{"id":122,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":220,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":148,"nodeType":"FunctionDefinition","src":"2025:164:0","nodes":[],"body":{"id":147,"nodeType":"Block","src":"2070:119:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":142,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2120:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":143,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":136,"src":"2135:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":140,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2096:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":141,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2096:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":144,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2096:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":139,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2080:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":145,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2080:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":146,"nodeType":"ExpressionStatement","src":"2080:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2034:3:0","parameters":{"id":137,"nodeType":"ParameterList","parameters":[{"constant":false,"id":136,"mutability":"mutable","name":"p0","nameLocation":"2052:2:0","nodeType":"VariableDeclaration","scope":148,"src":"2038:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":135,"name":"string","nodeType":"ElementaryTypeName","src":"2038:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2037:18:0"},"returnParameters":{"id":138,"nodeType":"ParameterList","parameters":[],"src":"2070:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":165,"nodeType":"FunctionDefinition","src":"2195:182:0","nodes":[],"body":{"id":164,"nodeType":"Block","src":"2249:128:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":158,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2299:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":159,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":150,"src":"2319:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":160,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":152,"src":"2323:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":156,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2275:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":157,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2275:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":161,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2275:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":155,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2259:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":162,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2259:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":163,"nodeType":"ExpressionStatement","src":"2259:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2204:3:0","parameters":{"id":153,"nodeType":"ParameterList","parameters":[{"constant":false,"id":150,"mutability":"mutable","name":"p0","nameLocation":"2222:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2208:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":149,"name":"string","nodeType":"ElementaryTypeName","src":"2208:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":152,"mutability":"mutable","name":"p1","nameLocation":"2231:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2226:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":151,"name":"bool","nodeType":"ElementaryTypeName","src":"2226:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"2207:27:0"},"returnParameters":{"id":154,"nodeType":"ParameterList","parameters":[],"src":"2249:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":182,"nodeType":"FunctionDefinition","src":"2383:188:0","nodes":[],"body":{"id":181,"nodeType":"Block","src":"2440:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":175,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2490:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":176,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":167,"src":"2513:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":177,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":169,"src":"2517:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":173,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2466:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":174,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2466:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":178,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2466:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":172,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2450:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":179,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2450:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":180,"nodeType":"ExpressionStatement","src":"2450:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2392:3:0","parameters":{"id":170,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"mutability":"mutable","name":"p0","nameLocation":"2410:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2396:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":166,"name":"string","nodeType":"ElementaryTypeName","src":"2396:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":169,"mutability":"mutable","name":"p1","nameLocation":"2422:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2414:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":168,"name":"uint256","nodeType":"ElementaryTypeName","src":"2414:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"2395:30:0"},"returnParameters":{"id":171,"nodeType":"ParameterList","parameters":[],"src":"2440:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":199,"nodeType":"FunctionDefinition","src":"2577:188:0","nodes":[],"body":{"id":198,"nodeType":"Block","src":"2634:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":192,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2684:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":193,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":184,"src":"2707:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":194,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":186,"src":"2711:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":190,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2660:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":191,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2660:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":195,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2660:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":189,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2644:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":196,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2644:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":197,"nodeType":"ExpressionStatement","src":"2644:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2586:3:0","parameters":{"id":187,"nodeType":"ParameterList","parameters":[{"constant":false,"id":184,"mutability":"mutable","name":"p0","nameLocation":"2604:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2590:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":183,"name":"string","nodeType":"ElementaryTypeName","src":"2590:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":186,"mutability":"mutable","name":"p1","nameLocation":"2616:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2608:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":185,"name":"address","nodeType":"ElementaryTypeName","src":"2608:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2589:30:0"},"returnParameters":{"id":188,"nodeType":"ParameterList","parameters":[],"src":"2634:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":219,"nodeType":"FunctionDefinition","src":"2771:222:0","nodes":[],"body":{"id":218,"nodeType":"Block","src":"2852:141:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":211,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2902:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":212,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":201,"src":"2931:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":213,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":203,"src":"2935:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":214,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":205,"src":"2939:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":209,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2878:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":210,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2878:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":215,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2878:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":208,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2862:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":216,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2862:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":217,"nodeType":"ExpressionStatement","src":"2862:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2780:3:0","parameters":{"id":206,"nodeType":"ParameterList","parameters":[{"constant":false,"id":201,"mutability":"mutable","name":"p0","nameLocation":"2798:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2784:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":200,"name":"string","nodeType":"ElementaryTypeName","src":"2784:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":203,"mutability":"mutable","name":"p1","nameLocation":"2816:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2802:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":202,"name":"string","nodeType":"ElementaryTypeName","src":"2802:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":205,"mutability":"mutable","name":"p2","nameLocation":"2834:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2820:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":204,"name":"string","nodeType":"ElementaryTypeName","src":"2820:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2783:54:0"},"returnParameters":{"id":207,"nodeType":"ParameterList","parameters":[],"src":"2852:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[220],"name":"console","nameLocation":"1152:7:0","scope":969,"usedErrors":[]},{"id":786,"nodeType":"ContractDefinition","src":"3123:3912:0","nodes":[{"id":235,"nodeType":"VariableDeclaration","src":"3152:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"3178:10:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":222,"name":"address","nodeType":"ElementaryTypeName","src":"3152:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3225:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":229,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"3215:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":231,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3215:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":228,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3207:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":227,"name":"uint256","nodeType":"ElementaryTypeName","src":"3207:7:0","typeDescriptions":{}}},"id":232,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3207:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":226,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3199:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":225,"name":"uint160","nodeType":"ElementaryTypeName","src":"3199:7:0","typeDescriptions":{}}},"id":233,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3199:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":224,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3191:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":223,"name":"address","nodeType":"ElementaryTypeName","src":"3191:7:0","typeDescriptions":{}}},"id":234,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3191:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":241,"nodeType":"VariableDeclaration","src":"3252:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"3273:2:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":237,"nodeType":"UserDefinedTypeName","pathNode":{"id":236,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"3252:2:0"},"referencedDeclaration":83,"src":"3252:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":239,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":235,"src":"3281:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":238,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"3278:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":240,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3278:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":243,"nodeType":"VariableDeclaration","src":"3356:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"3371:7:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":242,"name":"uint256","nodeType":"ElementaryTypeName","src":"3356:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":456,"nodeType":"FunctionDefinition","src":"3468:1428:0","nodes":[],"body":{"id":455,"nodeType":"Block","src":"3490:1406:0","nodes":[],"statements":[{"assignments":[248],"declarations":[{"constant":false,"id":248,"mutability":"mutable","name":"x","nameLocation":"3505:1:0","nodeType":"VariableDeclaration","scope":455,"src":"3500:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":247,"name":"bool","nodeType":"ElementaryTypeName","src":"3500:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":254,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":251,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3518:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":252,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"3534:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":249,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3509:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":250,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"3509:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"3500:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":258,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3562:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":259,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":248,"src":"3585:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":255,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3550:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":257,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":165,"src":"3550:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":260,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3550:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":261,"nodeType":"ExpressionStatement","src":"3550:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":265,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3610:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":268,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3635:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":267,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3627:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":266,"name":"address","nodeType":"ElementaryTypeName","src":"3627:7:0","typeDescriptions":{}}},"id":269,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3627:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":262,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3598:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3598:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3598:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":271,"nodeType":"ExpressionStatement","src":"3598:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":275,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3663:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":280,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3701:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":279,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3693:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":278,"name":"address","nodeType":"ElementaryTypeName","src":"3693:7:0","typeDescriptions":{}}},"id":281,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3693:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":276,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3681:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3681:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":282,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":272,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3651:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":274,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3651:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":283,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3651:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":284,"nodeType":"ExpressionStatement","src":"3651:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":288,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3730:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":291,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3753:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3753:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":290,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3745:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":289,"name":"address","nodeType":"ElementaryTypeName","src":"3745:7:0","typeDescriptions":{}}},"id":293,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3745:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":285,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3718:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":287,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3718:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":294,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3718:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":295,"nodeType":"ExpressionStatement","src":"3718:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":299,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3787:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":304,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3823:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":305,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3823:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":303,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3815:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":302,"name":"address","nodeType":"ElementaryTypeName","src":"3815:7:0","typeDescriptions":{}}},"id":306,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3815:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":300,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3803:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":301,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3803:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3803:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":296,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3775:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":298,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3775:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":308,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3775:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":309,"nodeType":"ExpressionStatement","src":"3775:61:0"},{"assignments":[311],"declarations":[{"constant":false,"id":311,"mutability":"mutable","name":"json","nameLocation":"3861:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3847:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":310,"name":"string","nodeType":"ElementaryTypeName","src":"3847:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":313,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3868:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3847:55:0"},{"assignments":[318],"declarations":[{"constant":false,"id":318,"mutability":"mutable","name":"keys","nameLocation":"3928:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3912:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":316,"name":"string","nodeType":"ElementaryTypeName","src":"3912:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":317,"nodeType":"ArrayTypeName","src":"3912:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":324,"initialValue":{"arguments":[{"id":321,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":311,"src":"3952:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3958:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":319,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3935:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":320,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3935:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":323,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3935:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3912:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":328,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3995:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":329,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4003:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":331,"indexExpression":{"hexValue":"30","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4008:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4003:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":332,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4012:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":334,"indexExpression":{"hexValue":"31","id":333,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4017:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4012:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":325,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3983:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":327,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":219,"src":"3983:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3983:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":336,"nodeType":"ExpressionStatement","src":"3983:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":340,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4042:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":337,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4031:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":339,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4031:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4031:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":342,"nodeType":"ExpressionStatement","src":"4031:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":350,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4098:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4090:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":348,"name":"uint160","nodeType":"ElementaryTypeName","src":"4090:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4090:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":347,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4082:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":346,"name":"address","nodeType":"ElementaryTypeName","src":"4082:7:0","typeDescriptions":{}}},"id":352,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4082:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":343,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4068:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":345,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"4068:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":353,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4068:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":354,"nodeType":"ExpressionStatement","src":"4068:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":358,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4126:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":355,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4115:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":357,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4115:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":359,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4115:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":360,"nodeType":"ExpressionStatement","src":"4115:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":364,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4163:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":367,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"4198:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":368,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"4198:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":366,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4190:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":365,"name":"address","nodeType":"ElementaryTypeName","src":"4190:7:0","typeDescriptions":{}}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4190:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":361,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4151:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4151:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":370,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4151:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":371,"nodeType":"ExpressionStatement","src":"4151:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":375,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4232:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":378,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4270:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":377,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4262:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":376,"name":"address","nodeType":"ElementaryTypeName","src":"4262:7:0","typeDescriptions":{}}},"id":379,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4262:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":372,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4220:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":374,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4220:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":380,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4220:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":381,"nodeType":"ExpressionStatement","src":"4220:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4297:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":382,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4286:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4286:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":386,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4286:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":387,"nodeType":"ExpressionStatement","src":"4286:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4322:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":390,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"4322:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":391,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4322:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":392,"nodeType":"ExpressionStatement","src":"4322:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":396,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4357:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":393,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4346:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4346:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":397,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4346:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":398,"nodeType":"ExpressionStatement","src":"4346:33:0"},{"assignments":[400],"declarations":[{"constant":false,"id":400,"mutability":"mutable","name":"tmpNonceGetter","nameLocation":"4480:14:0","nodeType":"VariableDeclaration","scope":455,"src":"4472:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":399,"name":"address","nodeType":"ElementaryTypeName","src":"4472:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":413,"initialValue":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"74656d70206e6f6e6365207465737420676574746572","id":408,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4531:24:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""},"value":"temp nonce test getter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""}],"id":407,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"4521:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":409,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4521:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":406,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4513:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":405,"name":"uint256","nodeType":"ElementaryTypeName","src":"4513:7:0","typeDescriptions":{}}},"id":410,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4513:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":404,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4505:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":403,"name":"uint160","nodeType":"ElementaryTypeName","src":"4505:7:0","typeDescriptions":{}}},"id":411,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4505:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":402,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4497:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":401,"name":"address","nodeType":"ElementaryTypeName","src":"4497:7:0","typeDescriptions":{}}},"id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4497:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"4472:87:0"},{"expression":{"arguments":[{"id":417,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4577:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},{"arguments":[{"hexValue":"5363726970744578616d706c652e732e736f6c3a4e6f6e6365476574746572","id":420,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4612:33:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""},"value":"ScriptExample.s.sol:NonceGetter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""}],"expression":{"id":418,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4593:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getDeployedCode","nodeType":"MemberAccess","referencedDeclaration":61,"src":"4593:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) view external returns (bytes memory)"}},"id":421,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4593:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"},{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"expression":{"id":414,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4569:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":416,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"etch","nodeType":"MemberAccess","referencedDeclaration":68,"src":"4569:7:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$","typeString":"function (address,bytes memory) external"}},"id":422,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4569:78:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":423,"nodeType":"ExpressionStatement","src":"4569:78:0"},{"expression":{"arguments":[{"id":427,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4676:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":424,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4657:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":426,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"allowCheatcodes","nodeType":"MemberAccess","referencedDeclaration":73,"src":"4657:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":428,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":429,"nodeType":"ExpressionStatement","src":"4657:34:0"},{"assignments":[431],"declarations":[{"constant":false,"id":431,"mutability":"mutable","name":"v","nameLocation":"4709:1:0","nodeType":"VariableDeclaration","scope":455,"src":"4701:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":430,"name":"uint256","nodeType":"ElementaryTypeName","src":"4701:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":441,"initialValue":{"arguments":[{"arguments":[{"id":438,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4758:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":437,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4750:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":436,"name":"address","nodeType":"ElementaryTypeName","src":"4750:7:0","typeDescriptions":{}}},"id":439,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4750:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"arguments":[{"id":433,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4725:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":432,"name":"NonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":833,"src":"4713:11:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_NonceGetter_$833_$","typeString":"type(contract NonceGetter)"}},"id":434,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_NonceGetter_$833","typeString":"contract NonceGetter"}},"id":435,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":832,"src":"4713:36:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint256_$","typeString":"function (address) view external returns (uint256)"}},"id":440,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"4701:63:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683a","id":445,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4786:68:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},"value":"nonce from nonce getter, no explicit access required with vm.etch:"},{"id":446,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":431,"src":"4856:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":442,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4774:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":444,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"4774:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4774:84:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":448,"nodeType":"ExpressionStatement","src":"4774:84:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":452,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4881:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":449,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4869:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":451,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"4869:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4869:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":454,"nodeType":"ExpressionStatement","src":"4869:20:0"}]},"documentation":{"id":244,"nodeType":"StructuredDocumentation","src":"3385:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"3477:3:0","parameters":{"id":245,"nodeType":"ParameterList","parameters":[],"src":"3480:2:0"},"returnParameters":{"id":246,"nodeType":"ParameterList","parameters":[],"src":"3490:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":689,"nodeType":"FunctionDefinition","src":"4963:1333:0","nodes":[],"body":{"id":688,"nodeType":"Block","src":"4994:1302:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":463,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5016:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":470,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5059:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":469,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5051:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":468,"name":"address","nodeType":"ElementaryTypeName","src":"5051:7:0","typeDescriptions":{}}},"id":471,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5051:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":466,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5039:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":467,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5039:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5039:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":465,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5031:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":464,"name":"uint256","nodeType":"ElementaryTypeName","src":"5031:7:0","typeDescriptions":{}}},"id":473,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5031:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":460,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5004:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":462,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"5004:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":474,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5004:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":475,"nodeType":"ExpressionStatement","src":"5004:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":479,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5090:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":476,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5078:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":478,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5078:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":480,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5078:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":481,"nodeType":"ExpressionStatement","src":"5078:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":482,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5117:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5117:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":485,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5117:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":486,"nodeType":"ExpressionStatement","src":"5117:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":490,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5152:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":487,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5141:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":489,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5141:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":491,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5141:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":492,"nodeType":"ExpressionStatement","src":"5141:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":496,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5188:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":493,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5177:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5177:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":497,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5177:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":498,"nodeType":"ExpressionStatement","src":"5177:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":502,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5226:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":499,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5214:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5214:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":503,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5214:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":504,"nodeType":"ExpressionStatement","src":"5214:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5291:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":511,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5283:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":510,"name":"uint160","nodeType":"ElementaryTypeName","src":"5283:7:0","typeDescriptions":{}}},"id":513,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5283:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5275:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":508,"name":"address","nodeType":"ElementaryTypeName","src":"5275:7:0","typeDescriptions":{}}},"id":514,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5275:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":505,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5257:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":507,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5257:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":515,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5257:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":516,"nodeType":"ExpressionStatement","src":"5257:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":520,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5323:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":517,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5312:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":519,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5312:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":521,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5312:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":522,"nodeType":"ExpressionStatement","src":"5312:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":526,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5362:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":523,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5351:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":525,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5351:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5351:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":528,"nodeType":"ExpressionStatement","src":"5351:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":532,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5404:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":529,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5390:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":531,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":785,"src":"5390:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":533,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5390:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":534,"nodeType":"ExpressionStatement","src":"5390:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":535,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5431:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":537,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5431:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":538,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5431:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":539,"nodeType":"ExpressionStatement","src":"5431:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":543,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5470:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":540,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5459:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":542,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5459:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":544,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5459:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":545,"nodeType":"ExpressionStatement","src":"5459:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":549,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5511:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":546,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5499:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5499:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":550,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5499:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":551,"nodeType":"ExpressionStatement","src":"5499:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":559,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5572:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":558,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5564:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":557,"name":"uint160","nodeType":"ElementaryTypeName","src":"5564:7:0","typeDescriptions":{}}},"id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5564:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":556,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5556:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":555,"name":"address","nodeType":"ElementaryTypeName","src":"5556:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5556:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":552,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5538:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":554,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5538:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":562,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5538:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":563,"nodeType":"ExpressionStatement","src":"5538:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":567,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5604:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":564,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5591:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":566,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":758,"src":"5591:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":568,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5591:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":569,"nodeType":"ExpressionStatement","src":"5591:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":570,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5623:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5623:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5623:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"5623:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5664:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5652:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5652:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5652:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"5652:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":588,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5725:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":587,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5717:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":586,"name":"uint160","nodeType":"ElementaryTypeName","src":"5717:7:0","typeDescriptions":{}}},"id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5717:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":585,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5709:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":584,"name":"address","nodeType":"ElementaryTypeName","src":"5709:7:0","typeDescriptions":{}}},"id":590,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5709:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5696:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5696:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":591,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5696:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":592,"nodeType":"ExpressionStatement","src":"5696:40:0"},{"assignments":[595],"declarations":[{"constant":false,"id":595,"mutability":"mutable","name":"x","nameLocation":"5753:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5746:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":594,"nodeType":"UserDefinedTypeName","pathNode":{"id":593,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5746:6:0"},"referencedDeclaration":799,"src":"5746:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":601,"initialValue":{"arguments":[{"hexValue":"31323334","id":599,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5768:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":598,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5757:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":597,"nodeType":"UserDefinedTypeName","pathNode":{"id":596,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5761:6:0"},"referencedDeclaration":799,"src":"5761:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":600,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5757:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5746:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":607,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":603,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":595,"src":"5791:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"5791:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5791:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":606,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5802:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"5791:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323334","id":608,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5808:35:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""},"value":"FooBar: foo in create is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""}],"id":602,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"5783:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":609,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5783:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":610,"nodeType":"ExpressionStatement","src":"5783:61:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":614,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5867:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":611,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5855:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":613,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5855:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":615,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5855:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":616,"nodeType":"ExpressionStatement","src":"5855:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5917:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":623,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5909:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":622,"name":"uint160","nodeType":"ElementaryTypeName","src":"5909:7:0","typeDescriptions":{}}},"id":625,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5909:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":621,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5901:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":620,"name":"address","nodeType":"ElementaryTypeName","src":"5901:7:0","typeDescriptions":{}}},"id":626,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5901:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":617,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5888:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":627,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5888:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":628,"nodeType":"ExpressionStatement","src":"5888:38:0"},{"assignments":[631],"declarations":[{"constant":false,"id":631,"mutability":"mutable","name":"y","nameLocation":"5943:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5936:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":630,"nodeType":"UserDefinedTypeName","pathNode":{"id":629,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5936:6:0"},"referencedDeclaration":799,"src":"5936:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":645,"initialValue":{"arguments":[{"hexValue":"31323334","id":643,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5986:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":634,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5947:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":633,"nodeType":"UserDefinedTypeName","pathNode":{"id":632,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5951:6:0"},"referencedDeclaration":799,"src":"5951:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":642,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":639,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5980:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":638,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5972:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":637,"name":"uint256","nodeType":"ElementaryTypeName","src":"5972:7:0","typeDescriptions":{}}},"id":640,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5972:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":636,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5964:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":635,"name":"bytes32","nodeType":"ElementaryTypeName","src":"5964:7:0","typeDescriptions":{}}},"id":641,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5964:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"5947:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":644,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5947:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5936:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":651,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":647,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":631,"src":"6009:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":648,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"6009:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":649,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6009:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":650,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6020:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"6009:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e2063726561746532206973206e6f742031323334","id":652,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6026:36:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""},"value":"FooBar: foo in create2 is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""}],"id":646,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"6001:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":653,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6001:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":654,"nodeType":"ExpressionStatement","src":"6001:62:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":658,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6085:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":655,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6073:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":657,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6073:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":659,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6073:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":660,"nodeType":"ExpressionStatement","src":"6073:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":661,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6177:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":663,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"6177:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":664,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6177:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":665,"nodeType":"ExpressionStatement","src":"6177:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":669,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6212:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":668,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"6201:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":667,"nodeType":"UserDefinedTypeName","pathNode":{"id":666,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"6205:6:0"},"referencedDeclaration":799,"src":"6205:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":670,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6201:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":671,"nodeType":"ExpressionStatement","src":"6201:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":675,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6240:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":682,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6281:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":681,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6273:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":680,"name":"address","nodeType":"ElementaryTypeName","src":"6273:7:0","typeDescriptions":{}}},"id":683,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6273:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":678,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6261:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":679,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"6261:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":684,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6261:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":677,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6253:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":676,"name":"uint256","nodeType":"ElementaryTypeName","src":"6253:7:0","typeDescriptions":{}}},"id":685,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6253:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":672,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6228:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":674,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"6228:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":686,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6228:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":687,"nodeType":"ExpressionStatement","src":"6228:61:0"}]},"documentation":{"id":457,"nodeType":"StructuredDocumentation","src":"4902:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"4972:12:0","parameters":{"id":458,"nodeType":"ParameterList","parameters":[],"src":"4984:2:0"},"returnParameters":{"id":459,"nodeType":"ParameterList","parameters":[],"src":"4994:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":713,"nodeType":"FunctionDefinition","src":"6391:143:0","nodes":[],"body":{"id":712,"nodeType":"Block","src":"6440:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":698,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":692,"src":"6462:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":695,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6450:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":697,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6450:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":699,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6450:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":700,"nodeType":"ExpressionStatement","src":"6450:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":704,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6487:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":707,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"6515:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":708,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"6515:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":706,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6507:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":705,"name":"address","nodeType":"ElementaryTypeName","src":"6507:7:0","typeDescriptions":{}}},"id":709,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6507:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":701,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6475:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":703,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"6475:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":710,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6475:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":711,"nodeType":"ExpressionStatement","src":"6475:52:0"}]},"documentation":{"id":690,"nodeType":"StructuredDocumentation","src":"6302:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"6400:5:0","parameters":{"id":693,"nodeType":"ParameterList","parameters":[{"constant":false,"id":692,"mutability":"mutable","name":"_v","nameLocation":"6422:2:0","nodeType":"VariableDeclaration","scope":713,"src":"6406:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":691,"name":"string","nodeType":"ElementaryTypeName","src":"6406:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6405:20:0"},"returnParameters":{"id":694,"nodeType":"ParameterList","parameters":[],"src":"6440:0:0"},"scope":786,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":728,"nodeType":"FunctionDefinition","src":"6540:95:0","nodes":[],"body":{"id":727,"nodeType":"Block","src":"6584:51:0","nodes":[],"statements":[{"expression":{"id":719,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6594:9:0","subExpression":{"id":718,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6594:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":720,"nodeType":"ExpressionStatement","src":"6594:9:0"},{"expression":{"arguments":[{"id":724,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":715,"src":"6625:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":721,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6613:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":723,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6613:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":725,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6613:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":726,"nodeType":"ExpressionStatement","src":"6613:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"6549:5:0","parameters":{"id":716,"nodeType":"ParameterList","parameters":[{"constant":false,"id":715,"mutability":"mutable","name":"_v","nameLocation":"6571:2:0","nodeType":"VariableDeclaration","scope":728,"src":"6555:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":714,"name":"string","nodeType":"ElementaryTypeName","src":"6555:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6554:20:0"},"returnParameters":{"id":717,"nodeType":"ParameterList","parameters":[],"src":"6584:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":743,"nodeType":"FunctionDefinition","src":"6641:95:0","nodes":[],"body":{"id":742,"nodeType":"Block","src":"6685:51:0","nodes":[],"statements":[{"expression":{"id":734,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6695:9:0","subExpression":{"id":733,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6695:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":735,"nodeType":"ExpressionStatement","src":"6695:9:0"},{"expression":{"arguments":[{"id":739,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":730,"src":"6726:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":736,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6714:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":738,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6714:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":740,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6714:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":741,"nodeType":"ExpressionStatement","src":"6714:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"6650:5:0","parameters":{"id":731,"nodeType":"ParameterList","parameters":[{"constant":false,"id":730,"mutability":"mutable","name":"_v","nameLocation":"6672:2:0","nodeType":"VariableDeclaration","scope":743,"src":"6656:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":729,"name":"string","nodeType":"ElementaryTypeName","src":"6656:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6655:20:0"},"returnParameters":{"id":732,"nodeType":"ParameterList","parameters":[],"src":"6685:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":758,"nodeType":"FunctionDefinition","src":"6742:98:0","nodes":[],"body":{"id":757,"nodeType":"Block","src":"6788:52:0","nodes":[],"statements":[{"expression":{"id":749,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6798:9:0","subExpression":{"id":748,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6798:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":750,"nodeType":"ExpressionStatement","src":"6798:9:0"},{"expression":{"arguments":[{"id":754,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":745,"src":"6830:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":751,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6817:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":753,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":773,"src":"6817:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":755,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6817:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":756,"nodeType":"ExpressionStatement","src":"6817:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"6751:7:0","parameters":{"id":746,"nodeType":"ParameterList","parameters":[{"constant":false,"id":745,"mutability":"mutable","name":"_v","nameLocation":"6775:2:0","nodeType":"VariableDeclaration","scope":758,"src":"6759:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":744,"name":"string","nodeType":"ElementaryTypeName","src":"6759:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6758:20:0"},"returnParameters":{"id":747,"nodeType":"ParameterList","parameters":[],"src":"6788:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":773,"nodeType":"FunctionDefinition","src":"6846:97:0","nodes":[],"body":{"id":772,"nodeType":"Block","src":"6892:51:0","nodes":[],"statements":[{"expression":{"id":764,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6902:9:0","subExpression":{"id":763,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6902:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":765,"nodeType":"ExpressionStatement","src":"6902:9:0"},{"expression":{"arguments":[{"id":769,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":760,"src":"6933:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":766,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6921:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":768,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6921:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":770,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6921:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":771,"nodeType":"ExpressionStatement","src":"6921:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"6855:7:0","parameters":{"id":761,"nodeType":"ParameterList","parameters":[{"constant":false,"id":760,"mutability":"mutable","name":"_v","nameLocation":"6879:2:0","nodeType":"VariableDeclaration","scope":773,"src":"6863:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":759,"name":"string","nodeType":"ElementaryTypeName","src":"6863:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6862:20:0"},"returnParameters":{"id":762,"nodeType":"ParameterList","parameters":[],"src":"6892:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":785,"nodeType":"FunctionDefinition","src":"6949:84:0","nodes":[],"body":{"id":784,"nodeType":"Block","src":"7001:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":781,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":775,"src":"7023:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":778,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"7011:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":780,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"7011:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":782,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7011:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":783,"nodeType":"ExpressionStatement","src":"7011:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"6958:8:0","parameters":{"id":776,"nodeType":"ParameterList","parameters":[{"constant":false,"id":775,"mutability":"mutable","name":"_v","nameLocation":"6983:2:0","nodeType":"VariableDeclaration","scope":785,"src":"6967:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":774,"name":"string","nodeType":"ElementaryTypeName","src":"6967:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6966:20:0"},"returnParameters":{"id":777,"nodeType":"ParameterList","parameters":[],"src":"7001:0:0"},"scope":786,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[799],"contractKind":"contract","documentation":{"id":221,"nodeType":"StructuredDocumentation","src":"2997:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[786],"name":"ScriptExample","nameLocation":"3132:13:0","scope":969,"usedErrors":[]},{"id":799,"nodeType":"ContractDefinition","src":"7037:96:0","nodes":[{"id":788,"nodeType":"VariableDeclaration","src":"7059:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"7074:3:0","scope":799,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":787,"name":"uint256","nodeType":"ElementaryTypeName","src":"7059:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":798,"nodeType":"FunctionDefinition","src":"7084:47:0","nodes":[],"body":{"id":797,"nodeType":"Block","src":"7107:24:0","nodes":[],"statements":[{"expression":{"id":795,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":793,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":788,"src":"7117:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":794,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":790,"src":"7123:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"7117:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":796,"nodeType":"ExpressionStatement","src":"7117:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":791,"nodeType":"ParameterList","parameters":[{"constant":false,"id":790,"mutability":"mutable","name":"v","nameLocation":"7104:1:0","nodeType":"VariableDeclaration","scope":798,"src":"7096:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":789,"name":"uint256","nodeType":"ElementaryTypeName","src":"7096:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7095:11:0"},"returnParameters":{"id":792,"nodeType":"ParameterList","parameters":[],"src":"7107:0:0"},"scope":799,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[799],"name":"FooBar","nameLocation":"7046:6:0","scope":969,"usedErrors":[]},{"id":833,"nodeType":"ContractDefinition","src":"7135:281:0","nodes":[{"id":813,"nodeType":"VariableDeclaration","src":"7162:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7188:10:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":800,"name":"address","nodeType":"ElementaryTypeName","src":"7162:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":808,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7235:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":807,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7225:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":809,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7225:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":806,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7217:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":805,"name":"uint256","nodeType":"ElementaryTypeName","src":"7217:7:0","typeDescriptions":{}}},"id":810,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7217:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":804,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7209:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":803,"name":"uint160","nodeType":"ElementaryTypeName","src":"7209:7:0","typeDescriptions":{}}},"id":811,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7209:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":802,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":801,"name":"address","nodeType":"ElementaryTypeName","src":"7201:7:0","typeDescriptions":{}}},"id":812,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7201:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":819,"nodeType":"VariableDeclaration","src":"7262:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7283:2:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":815,"nodeType":"UserDefinedTypeName","pathNode":{"id":814,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7262:2:0"},"referencedDeclaration":83,"src":"7262:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":817,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":813,"src":"7291:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":816,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7288:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":818,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7288:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":832,"nodeType":"FunctionDefinition","src":"7309:105:0","nodes":[],"body":{"id":831,"nodeType":"Block","src":"7372:42:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":828,"name":"_addr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":821,"src":"7401:5:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":826,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":819,"src":"7389:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":827,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7389:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":829,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7389:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"functionReturnParameters":825,"id":830,"nodeType":"Return","src":"7382:25:0"}]},"functionSelector":"2d0335ab","implemented":true,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"7318:8:0","parameters":{"id":822,"nodeType":"ParameterList","parameters":[{"constant":false,"id":821,"mutability":"mutable","name":"_addr","nameLocation":"7335:5:0","nodeType":"VariableDeclaration","scope":832,"src":"7327:13:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":820,"name":"address","nodeType":"ElementaryTypeName","src":"7327:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"7326:15:0"},"returnParameters":{"id":825,"nodeType":"ParameterList","parameters":[{"constant":false,"id":824,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":832,"src":"7363:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":823,"name":"uint256","nodeType":"ElementaryTypeName","src":"7363:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7362:9:0"},"scope":833,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"NonceGetter","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[833],"name":"NonceGetter","nameLocation":"7144:11:0","scope":969,"usedErrors":[]},{"id":852,"nodeType":"ContractDefinition","src":"7418:174:0","nodes":[{"id":835,"nodeType":"VariableDeclaration","src":"7448:18:0","nodes":[],"constant":false,"mutability":"mutable","name":"v","nameLocation":"7465:1:0","scope":852,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":834,"name":"uint256","nodeType":"ElementaryTypeName","src":"7448:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"id":843,"nodeType":"FunctionDefinition","src":"7473:36:0","nodes":[],"body":{"id":842,"nodeType":"Block","src":"7487:22:0","nodes":[],"statements":[{"expression":{"id":840,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":838,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7497:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"hexValue":"31","id":839,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7501:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"7497:5:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":841,"nodeType":"ExpressionStatement","src":"7497:5:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":836,"nodeType":"ParameterList","parameters":[],"src":"7484:2:0"},"returnParameters":{"id":837,"nodeType":"ParameterList","parameters":[],"src":"7487:0:0"},"scope":852,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":851,"nodeType":"FunctionDefinition","src":"7515:75:0","nodes":[],"body":{"id":850,"nodeType":"Block","src":"7565:25:0","nodes":[],"statements":[{"expression":{"id":848,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7582:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"functionReturnParameters":847,"id":849,"nodeType":"Return","src":"7575:8:0"}]},"functionSelector":"20965255","implemented":true,"kind":"function","modifiers":[],"name":"getValue","nameLocation":"7524:8:0","parameters":{"id":844,"nodeType":"ParameterList","parameters":[],"src":"7532:2:0"},"returnParameters":{"id":847,"nodeType":"ParameterList","parameters":[{"constant":false,"id":846,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":851,"src":"7556:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":845,"name":"uint256","nodeType":"ElementaryTypeName","src":"7556:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7555:9:0"},"scope":852,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkedContract","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[852],"name":"ForkedContract","nameLocation":"7427:14:0","scope":969,"usedErrors":[]},{"id":968,"nodeType":"ContractDefinition","src":"7594:813:0","nodes":[{"id":866,"nodeType":"VariableDeclaration","src":"7620:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7646:10:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":853,"name":"address","nodeType":"ElementaryTypeName","src":"7620:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":861,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7693:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":860,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7683:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":862,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7683:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":859,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7675:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":858,"name":"uint256","nodeType":"ElementaryTypeName","src":"7675:7:0","typeDescriptions":{}}},"id":863,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7675:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":857,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7667:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":856,"name":"uint160","nodeType":"ElementaryTypeName","src":"7667:7:0","typeDescriptions":{}}},"id":864,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7667:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":855,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7659:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":854,"name":"address","nodeType":"ElementaryTypeName","src":"7659:7:0","typeDescriptions":{}}},"id":865,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7659:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":872,"nodeType":"VariableDeclaration","src":"7720:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7741:2:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":868,"nodeType":"UserDefinedTypeName","pathNode":{"id":867,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7720:2:0"},"referencedDeclaration":83,"src":"7720:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":870,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":866,"src":"7749:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":869,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7746:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":871,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7746:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":967,"nodeType":"FunctionDefinition","src":"7767:638:0","nodes":[],"body":{"id":966,"nodeType":"Block","src":"7791:614:0","nodes":[],"statements":[{"assignments":[876],"declarations":[{"constant":false,"id":876,"mutability":"mutable","name":"testAddr","nameLocation":"7809:8:0","nodeType":"VariableDeclaration","scope":966,"src":"7801:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":875,"name":"address","nodeType":"ElementaryTypeName","src":"7801:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":884,"initialValue":{"arguments":[{"arguments":[{"hexValue":"307831323334","id":881,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7836:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":880,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7828:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":879,"name":"uint160","nodeType":"ElementaryTypeName","src":"7828:7:0","typeDescriptions":{}}},"id":882,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7828:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":878,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7820:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":877,"name":"address","nodeType":"ElementaryTypeName","src":"7820:7:0","typeDescriptions":{}}},"id":883,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7820:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"7801:43:0"},{"assignments":[887],"declarations":[{"constant":false,"id":887,"mutability":"mutable","name":"fc","nameLocation":"7869:2:0","nodeType":"VariableDeclaration","scope":966,"src":"7854:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"},"typeName":{"id":886,"nodeType":"UserDefinedTypeName","pathNode":{"id":885,"name":"ForkedContract","nodeType":"IdentifierPath","referencedDeclaration":852,"src":"7854:14:0"},"referencedDeclaration":852,"src":"7854:14:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"visibility":"internal"}],"id":891,"initialValue":{"arguments":[{"id":889,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7889:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":888,"name":"ForkedContract","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":852,"src":"7874:14:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_ForkedContract_$852_$","typeString":"type(contract ForkedContract)"}},"id":890,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7874:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"nodeType":"VariableDeclarationStatement","src":"7854:44:0"},{"expression":{"arguments":[{"hexValue":"666f726b31","id":895,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7929:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},"value":"fork1"},{"hexValue":"3132333435","id":896,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7938:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"}],"expression":{"id":892,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7909:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":894,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"7909:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":897,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7909:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":898,"nodeType":"ExpressionStatement","src":"7909:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":905,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":902,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7974:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":900,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7962:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":901,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7962:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":903,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7962:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3132333435","id":904,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7987:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"},"src":"7962:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":906,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7994:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":899,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"7954:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":907,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7954:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":908,"nodeType":"ExpressionStatement","src":"7954:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":914,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":910,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8036:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":911,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8036:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":912,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8036:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31","id":913,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8053:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"8036:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652031","id":915,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8056:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""},"value":"value should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""}],"id":909,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8028:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":916,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8028:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":917,"nodeType":"ExpressionStatement","src":"8028:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":925,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":919,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8094:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":920,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8094:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"31","id":923,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8122:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"}],"id":922,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8114:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":921,"name":"uint256","nodeType":"ElementaryTypeName","src":"8114:7:0","typeDescriptions":{}}},"id":924,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8114:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8094:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652031","id":926,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8126:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""},"value":"balance should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""}],"id":918,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8086:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":927,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8086:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":928,"nodeType":"ExpressionStatement","src":"8086:62:0"},{"expression":{"arguments":[{"hexValue":"666f726b32","id":932,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8179:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},"value":"fork2"},{"hexValue":"3233343536","id":933,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8188:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"}],"expression":{"id":929,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8159:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":931,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"8159:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":934,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8159:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":935,"nodeType":"ExpressionStatement","src":"8159:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":942,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":939,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8224:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":937,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8212:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":938,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"8212:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":940,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8212:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3233343536","id":941,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8237:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"},"src":"8212:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":943,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8244:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":936,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8204:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":944,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8204:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":945,"nodeType":"ExpressionStatement","src":"8204:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":951,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":947,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8286:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":948,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8286:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":949,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8286:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"32","id":950,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8303:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"},"src":"8286:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652032","id":952,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8306:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""},"value":"value should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""}],"id":946,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8278:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":953,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8278:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":954,"nodeType":"ExpressionStatement","src":"8278:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":962,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":956,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8344:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":957,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8344:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"32","id":960,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8372:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"}],"id":959,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8364:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":958,"name":"uint256","nodeType":"ElementaryTypeName","src":"8364:7:0","typeDescriptions":{}}},"id":961,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8364:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8344:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652032","id":963,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8376:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""},"value":"balance should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""}],"id":955,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8336:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":964,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8336:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":965,"nodeType":"ExpressionStatement","src":"8336:62:0"}]},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"7776:3:0","parameters":{"id":873,"nodeType":"ParameterList","parameters":[],"src":"7779:2:0"},"returnParameters":{"id":874,"nodeType":"ParameterList","parameters":[],"src":"7791:0:0"},"scope":968,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkTester","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[968],"name":"ForkTester","nameLocation":"7603:10:0","scope":969,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/NonceGetter.json b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/NonceGetter.json
new file mode 100644
index 000000000000..5e6afe60d710
--- /dev/null
+++ b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/NonceGetter.json
@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"getNonce","inputs":[{"name":"_addr","type":"address","internalType":"address"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"}],"bytecode":{"object":"0x608060405234801561001057600080fd5b5061017e806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80632d0335ab14610030575b600080fd5b61004361003e36600461010a565b610055565b60405190815260200160405180910390f35b6040517f2d0335ab00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82166004820152600090737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401602060405180830381865afa1580156100d6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100fa9190610147565b67ffffffffffffffff1692915050565b60006020828403121561011c57600080fd5b813573ffffffffffffffffffffffffffffffffffffffff8116811461014057600080fd5b9392505050565b60006020828403121561015957600080fd5b815167ffffffffffffffff8116811461014057600080fdfea164736f6c634300080f000a","sourceMap":"7135:281:0:-:0;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x608060405234801561001057600080fd5b506004361061002b5760003560e01c80632d0335ab14610030575b600080fd5b61004361003e36600461010a565b610055565b60405190815260200160405180910390f35b6040517f2d0335ab00000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff82166004820152600090737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401602060405180830381865afa1580156100d6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100fa9190610147565b67ffffffffffffffff1692915050565b60006020828403121561011c57600080fd5b813573ffffffffffffffffffffffffffffffffffffffff8116811461014057600080fd5b9392505050565b60006020828403121561015957600080fd5b815167ffffffffffffffff8116811461014057600080fdfea164736f6c634300080f000a","sourceMap":"7135:281:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;7309:105;;;;;;:::i;:::-;;:::i;:::-;;;474:25:1;;;462:2;447:18;7309:105:0;;;;;;;;7389:18;;;;;686:42:1;674:55;;7389:18:0;;;656:74:1;7363:7:0;;7389:11;;;;629:18:1;;7389::0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;7382:25;;;7309:105;-1:-1:-1;;7309:105:0:o;14:309:1:-;73:6;126:2;114:9;105:7;101:23;97:32;94:52;;;142:1;139;132:12;94:52;181:9;168:23;231:42;224:5;220:54;213:5;210:65;200:93;;289:1;286;279:12;200:93;312:5;14:309;-1:-1:-1;;;14:309:1:o;741:288::-;810:6;863:2;851:9;842:7;838:23;834:32;831:52;;;879:1;876;869:12;831:52;911:9;905:16;961:18;954:5;950:30;943:5;940:41;930:69;;995:1;992;985:12","linkReferences":{}},"methodIdentifiers":{"getNonce(address)":"2d0335ab"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_addr\",\"type\":\"address\"}],\"name\":\"getNonce\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"NonceGetter\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28\",\"dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"address","name":"_addr","type":"address"}],"stateMutability":"view","type":"function","name":"getNonce","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"NonceGetter"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da","urls":["bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28","dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":969,"exportedSymbols":{"FooBar":[799],"ForkTester":[968],"ForkedContract":[852],"NonceGetter":[833],"ScriptExample":[786],"Vm":[83],"console":[220]},"nodeType":"SourceUnit","src":"32:8375:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":83,"nodeType":"ContractDefinition","src":"120:969:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":83,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":61,"nodeType":"FunctionDefinition","src":"739:108:0","nodes":[],"functionSelector":"3ebf73b4","implemented":false,"kind":"function","modifiers":[],"name":"getDeployedCode","nameLocation":"748:15:0","parameters":{"id":57,"nodeType":"ParameterList","parameters":[{"constant":false,"id":56,"mutability":"mutable","name":"artifactPath","nameLocation":"780:12:0","nodeType":"VariableDeclaration","scope":61,"src":"764:28:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":55,"name":"string","nodeType":"ElementaryTypeName","src":"764:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"763:30:0"},"returnParameters":{"id":60,"nodeType":"ParameterList","parameters":[{"constant":false,"id":59,"mutability":"mutable","name":"runtimeBytecode","nameLocation":"830:15:0","nodeType":"VariableDeclaration","scope":61,"src":"817:28:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":58,"name":"bytes","nodeType":"ElementaryTypeName","src":"817:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"816:30:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":68,"nodeType":"FunctionDefinition","src":"852:74:0","nodes":[],"functionSelector":"b4d6c782","implemented":false,"kind":"function","modifiers":[],"name":"etch","nameLocation":"861:4:0","parameters":{"id":66,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"target","nameLocation":"874:6:0","nodeType":"VariableDeclaration","scope":68,"src":"866:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":62,"name":"address","nodeType":"ElementaryTypeName","src":"866:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":65,"mutability":"mutable","name":"newRuntimeBytecode","nameLocation":"897:18:0","nodeType":"VariableDeclaration","scope":68,"src":"882:33:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":64,"name":"bytes","nodeType":"ElementaryTypeName","src":"882:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"865:51:0"},"returnParameters":{"id":67,"nodeType":"ParameterList","parameters":[],"src":"925:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":73,"nodeType":"FunctionDefinition","src":"931:51:0","nodes":[],"functionSelector":"ea060291","implemented":false,"kind":"function","modifiers":[],"name":"allowCheatcodes","nameLocation":"940:15:0","parameters":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"account","nameLocation":"964:7:0","nodeType":"VariableDeclaration","scope":73,"src":"956:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":69,"name":"address","nodeType":"ElementaryTypeName","src":"956:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"955:17:0"},"returnParameters":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"981:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":82,"nodeType":"FunctionDefinition","src":"987:100:0","nodes":[],"functionSelector":"71ee464d","implemented":false,"kind":"function","modifiers":[],"name":"createSelectFork","nameLocation":"996:16:0","parameters":{"id":78,"nodeType":"ParameterList","parameters":[{"constant":false,"id":75,"mutability":"mutable","name":"forkName","nameLocation":"1029:8:0","nodeType":"VariableDeclaration","scope":82,"src":"1013:24:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":74,"name":"string","nodeType":"ElementaryTypeName","src":"1013:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":77,"mutability":"mutable","name":"blockNumber","nameLocation":"1047:11:0","nodeType":"VariableDeclaration","scope":82,"src":"1039:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":76,"name":"uint256","nodeType":"ElementaryTypeName","src":"1039:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1012:47:0"},"returnParameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":82,"src":"1078:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":79,"name":"uint256","nodeType":"ElementaryTypeName","src":"1078:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1077:9:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[83],"name":"Vm","nameLocation":"130:2:0","scope":969,"usedErrors":[]},{"id":220,"nodeType":"ContractDefinition","src":"1144:1851:0","nodes":[{"id":89,"nodeType":"VariableDeclaration","src":"1166:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"1183:15:0","scope":220,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":84,"name":"address","nodeType":"ElementaryTypeName","src":"1166:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":87,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"1209:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":86,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"1201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":85,"name":"address","nodeType":"ElementaryTypeName","src":"1201:7:0","typeDescriptions":{}}},"id":88,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1201:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1259:235:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1432:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1451:37:0","statements":[{"nodeType":"YulAssignment","src":"1465:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1474:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1465:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":95,"isOffset":false,"isSlot":false,"src":"1474:4:0","valueSize":1},{"declaration":102,"isOffset":false,"isSlot":false,"src":"1465:5:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1442:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"1268:25:0","parameters":{"id":96,"nodeType":"ParameterList","parameters":[{"constant":false,"id":95,"mutability":"mutable","name":"fnIn","nameLocation":"1331:4:0","nodeType":"VariableDeclaration","scope":106,"src":"1294:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":94,"nodeType":"FunctionTypeName","parameterTypes":{"id":92,"nodeType":"ParameterList","parameters":[{"constant":false,"id":91,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":94,"src":"1303:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":90,"name":"bytes","nodeType":"ElementaryTypeName","src":"1303:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1302:14:0"},"returnParameterTypes":{"id":93,"nodeType":"ParameterList","parameters":[],"src":"1331:0:0"},"src":"1294:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"1293:43:0"},"returnParameters":{"id":103,"nodeType":"ParameterList","parameters":[{"constant":false,"id":102,"mutability":"mutable","name":"fnOut","nameLocation":"1421:5:0","nodeType":"VariableDeclaration","scope":106,"src":"1384:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":101,"nodeType":"FunctionTypeName","parameterTypes":{"id":99,"nodeType":"ParameterList","parameters":[{"constant":false,"id":98,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":101,"src":"1393:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":97,"name":"bytes","nodeType":"ElementaryTypeName","src":"1393:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1392:14:0"},"returnParameterTypes":{"id":100,"nodeType":"ParameterList","parameters":[],"src":"1421:0:0"},"src":"1384:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1383:44:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":118,"nodeType":"FunctionDefinition","src":"1500:133:0","nodes":[],"body":{"id":117,"nodeType":"Block","src":"1561:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":114,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1618:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":112,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":134,"src":"1597:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":111,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1571:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":113,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":115,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":116,"nodeType":"ExpressionStatement","src":"1571:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1509:15:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"payload","nameLocation":"1538:7:0","nodeType":"VariableDeclaration","scope":118,"src":"1525:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":107,"name":"bytes","nodeType":"ElementaryTypeName","src":"1525:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1524:22:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1561:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":134,"nodeType":"FunctionDefinition","src":"1639:380:0","nodes":[],"body":{"id":133,"nodeType":"Block","src":"1703:316:0","nodes":[],"statements":[{"assignments":[124],"declarations":[{"constant":false,"id":124,"mutability":"mutable","name":"payloadLength","nameLocation":"1721:13:0","nodeType":"VariableDeclaration","scope":133,"src":"1713:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":123,"name":"uint256","nodeType":"ElementaryTypeName","src":"1713:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":127,"initialValue":{"expression":{"id":125,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":120,"src":"1737:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":126,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1737:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1713:38:0"},{"assignments":[129],"declarations":[{"constant":false,"id":129,"mutability":"mutable","name":"consoleAddress","nameLocation":"1769:14:0","nodeType":"VariableDeclaration","scope":133,"src":"1761:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":128,"name":"address","nodeType":"ElementaryTypeName","src":"1761:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":131,"initialValue":{"id":130,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":89,"src":"1786:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1761:40:0"},{"AST":{"nodeType":"YulBlock","src":"1863:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1877:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1901:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1910:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1897:3:0"},"nodeType":"YulFunctionCall","src":"1897:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1881:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1926:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1946:3:0"},"nodeType":"YulFunctionCall","src":"1946:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1953:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1969:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1983:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1998:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"2001:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1935:10:0"},"nodeType":"YulFunctionCall","src":"1935:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1930:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":129,"isOffset":false,"isSlot":false,"src":"1953:14:0","valueSize":1},{"declaration":120,"isOffset":false,"isSlot":false,"src":"1901:7:0","valueSize":1},{"declaration":124,"isOffset":false,"isSlot":false,"src":"1983:13:0","valueSize":1}],"id":132,"nodeType":"InlineAssembly","src":"1854:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1648:19:0","parameters":{"id":121,"nodeType":"ParameterList","parameters":[{"constant":false,"id":120,"mutability":"mutable","name":"payload","nameLocation":"1681:7:0","nodeType":"VariableDeclaration","scope":134,"src":"1668:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":119,"name":"bytes","nodeType":"ElementaryTypeName","src":"1668:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1667:22:0"},"returnParameters":{"id":122,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":220,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":148,"nodeType":"FunctionDefinition","src":"2025:164:0","nodes":[],"body":{"id":147,"nodeType":"Block","src":"2070:119:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":142,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2120:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":143,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":136,"src":"2135:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":140,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2096:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":141,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2096:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":144,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2096:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":139,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2080:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":145,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2080:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":146,"nodeType":"ExpressionStatement","src":"2080:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2034:3:0","parameters":{"id":137,"nodeType":"ParameterList","parameters":[{"constant":false,"id":136,"mutability":"mutable","name":"p0","nameLocation":"2052:2:0","nodeType":"VariableDeclaration","scope":148,"src":"2038:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":135,"name":"string","nodeType":"ElementaryTypeName","src":"2038:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2037:18:0"},"returnParameters":{"id":138,"nodeType":"ParameterList","parameters":[],"src":"2070:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":165,"nodeType":"FunctionDefinition","src":"2195:182:0","nodes":[],"body":{"id":164,"nodeType":"Block","src":"2249:128:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":158,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2299:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":159,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":150,"src":"2319:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":160,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":152,"src":"2323:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":156,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2275:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":157,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2275:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":161,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2275:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":155,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2259:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":162,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2259:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":163,"nodeType":"ExpressionStatement","src":"2259:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2204:3:0","parameters":{"id":153,"nodeType":"ParameterList","parameters":[{"constant":false,"id":150,"mutability":"mutable","name":"p0","nameLocation":"2222:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2208:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":149,"name":"string","nodeType":"ElementaryTypeName","src":"2208:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":152,"mutability":"mutable","name":"p1","nameLocation":"2231:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2226:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":151,"name":"bool","nodeType":"ElementaryTypeName","src":"2226:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"2207:27:0"},"returnParameters":{"id":154,"nodeType":"ParameterList","parameters":[],"src":"2249:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":182,"nodeType":"FunctionDefinition","src":"2383:188:0","nodes":[],"body":{"id":181,"nodeType":"Block","src":"2440:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":175,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2490:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":176,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":167,"src":"2513:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":177,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":169,"src":"2517:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":173,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2466:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":174,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2466:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":178,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2466:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":172,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2450:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":179,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2450:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":180,"nodeType":"ExpressionStatement","src":"2450:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2392:3:0","parameters":{"id":170,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"mutability":"mutable","name":"p0","nameLocation":"2410:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2396:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":166,"name":"string","nodeType":"ElementaryTypeName","src":"2396:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":169,"mutability":"mutable","name":"p1","nameLocation":"2422:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2414:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":168,"name":"uint256","nodeType":"ElementaryTypeName","src":"2414:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"2395:30:0"},"returnParameters":{"id":171,"nodeType":"ParameterList","parameters":[],"src":"2440:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":199,"nodeType":"FunctionDefinition","src":"2577:188:0","nodes":[],"body":{"id":198,"nodeType":"Block","src":"2634:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":192,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2684:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":193,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":184,"src":"2707:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":194,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":186,"src":"2711:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":190,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2660:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":191,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2660:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":195,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2660:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":189,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2644:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":196,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2644:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":197,"nodeType":"ExpressionStatement","src":"2644:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2586:3:0","parameters":{"id":187,"nodeType":"ParameterList","parameters":[{"constant":false,"id":184,"mutability":"mutable","name":"p0","nameLocation":"2604:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2590:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":183,"name":"string","nodeType":"ElementaryTypeName","src":"2590:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":186,"mutability":"mutable","name":"p1","nameLocation":"2616:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2608:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":185,"name":"address","nodeType":"ElementaryTypeName","src":"2608:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2589:30:0"},"returnParameters":{"id":188,"nodeType":"ParameterList","parameters":[],"src":"2634:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":219,"nodeType":"FunctionDefinition","src":"2771:222:0","nodes":[],"body":{"id":218,"nodeType":"Block","src":"2852:141:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":211,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2902:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":212,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":201,"src":"2931:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":213,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":203,"src":"2935:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":214,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":205,"src":"2939:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":209,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2878:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":210,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2878:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":215,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2878:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":208,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2862:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":216,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2862:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":217,"nodeType":"ExpressionStatement","src":"2862:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2780:3:0","parameters":{"id":206,"nodeType":"ParameterList","parameters":[{"constant":false,"id":201,"mutability":"mutable","name":"p0","nameLocation":"2798:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2784:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":200,"name":"string","nodeType":"ElementaryTypeName","src":"2784:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":203,"mutability":"mutable","name":"p1","nameLocation":"2816:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2802:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":202,"name":"string","nodeType":"ElementaryTypeName","src":"2802:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":205,"mutability":"mutable","name":"p2","nameLocation":"2834:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2820:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":204,"name":"string","nodeType":"ElementaryTypeName","src":"2820:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2783:54:0"},"returnParameters":{"id":207,"nodeType":"ParameterList","parameters":[],"src":"2852:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[220],"name":"console","nameLocation":"1152:7:0","scope":969,"usedErrors":[]},{"id":786,"nodeType":"ContractDefinition","src":"3123:3912:0","nodes":[{"id":235,"nodeType":"VariableDeclaration","src":"3152:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"3178:10:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":222,"name":"address","nodeType":"ElementaryTypeName","src":"3152:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3225:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":229,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"3215:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":231,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3215:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":228,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3207:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":227,"name":"uint256","nodeType":"ElementaryTypeName","src":"3207:7:0","typeDescriptions":{}}},"id":232,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3207:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":226,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3199:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":225,"name":"uint160","nodeType":"ElementaryTypeName","src":"3199:7:0","typeDescriptions":{}}},"id":233,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3199:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":224,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3191:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":223,"name":"address","nodeType":"ElementaryTypeName","src":"3191:7:0","typeDescriptions":{}}},"id":234,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3191:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":241,"nodeType":"VariableDeclaration","src":"3252:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"3273:2:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":237,"nodeType":"UserDefinedTypeName","pathNode":{"id":236,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"3252:2:0"},"referencedDeclaration":83,"src":"3252:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":239,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":235,"src":"3281:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":238,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"3278:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":240,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3278:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":243,"nodeType":"VariableDeclaration","src":"3356:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"3371:7:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":242,"name":"uint256","nodeType":"ElementaryTypeName","src":"3356:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":456,"nodeType":"FunctionDefinition","src":"3468:1428:0","nodes":[],"body":{"id":455,"nodeType":"Block","src":"3490:1406:0","nodes":[],"statements":[{"assignments":[248],"declarations":[{"constant":false,"id":248,"mutability":"mutable","name":"x","nameLocation":"3505:1:0","nodeType":"VariableDeclaration","scope":455,"src":"3500:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":247,"name":"bool","nodeType":"ElementaryTypeName","src":"3500:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":254,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":251,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3518:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":252,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"3534:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":249,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3509:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":250,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"3509:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"3500:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":258,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3562:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":259,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":248,"src":"3585:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":255,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3550:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":257,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":165,"src":"3550:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":260,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3550:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":261,"nodeType":"ExpressionStatement","src":"3550:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":265,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3610:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":268,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3635:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":267,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3627:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":266,"name":"address","nodeType":"ElementaryTypeName","src":"3627:7:0","typeDescriptions":{}}},"id":269,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3627:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":262,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3598:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3598:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3598:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":271,"nodeType":"ExpressionStatement","src":"3598:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":275,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3663:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":280,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3701:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":279,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3693:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":278,"name":"address","nodeType":"ElementaryTypeName","src":"3693:7:0","typeDescriptions":{}}},"id":281,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3693:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":276,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3681:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3681:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":282,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":272,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3651:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":274,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3651:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":283,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3651:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":284,"nodeType":"ExpressionStatement","src":"3651:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":288,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3730:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":291,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3753:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3753:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":290,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3745:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":289,"name":"address","nodeType":"ElementaryTypeName","src":"3745:7:0","typeDescriptions":{}}},"id":293,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3745:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":285,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3718:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":287,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3718:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":294,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3718:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":295,"nodeType":"ExpressionStatement","src":"3718:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":299,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3787:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":304,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3823:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":305,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3823:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":303,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3815:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":302,"name":"address","nodeType":"ElementaryTypeName","src":"3815:7:0","typeDescriptions":{}}},"id":306,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3815:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":300,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3803:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":301,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3803:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3803:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":296,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3775:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":298,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3775:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":308,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3775:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":309,"nodeType":"ExpressionStatement","src":"3775:61:0"},{"assignments":[311],"declarations":[{"constant":false,"id":311,"mutability":"mutable","name":"json","nameLocation":"3861:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3847:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":310,"name":"string","nodeType":"ElementaryTypeName","src":"3847:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":313,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3868:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3847:55:0"},{"assignments":[318],"declarations":[{"constant":false,"id":318,"mutability":"mutable","name":"keys","nameLocation":"3928:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3912:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":316,"name":"string","nodeType":"ElementaryTypeName","src":"3912:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":317,"nodeType":"ArrayTypeName","src":"3912:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":324,"initialValue":{"arguments":[{"id":321,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":311,"src":"3952:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3958:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":319,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3935:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":320,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3935:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":323,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3935:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3912:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":328,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3995:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":329,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4003:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":331,"indexExpression":{"hexValue":"30","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4008:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4003:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":332,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4012:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":334,"indexExpression":{"hexValue":"31","id":333,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4017:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4012:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":325,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3983:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":327,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":219,"src":"3983:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3983:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":336,"nodeType":"ExpressionStatement","src":"3983:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":340,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4042:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":337,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4031:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":339,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4031:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4031:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":342,"nodeType":"ExpressionStatement","src":"4031:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":350,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4098:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4090:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":348,"name":"uint160","nodeType":"ElementaryTypeName","src":"4090:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4090:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":347,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4082:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":346,"name":"address","nodeType":"ElementaryTypeName","src":"4082:7:0","typeDescriptions":{}}},"id":352,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4082:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":343,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4068:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":345,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"4068:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":353,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4068:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":354,"nodeType":"ExpressionStatement","src":"4068:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":358,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4126:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":355,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4115:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":357,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4115:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":359,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4115:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":360,"nodeType":"ExpressionStatement","src":"4115:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":364,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4163:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":367,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"4198:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":368,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"4198:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":366,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4190:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":365,"name":"address","nodeType":"ElementaryTypeName","src":"4190:7:0","typeDescriptions":{}}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4190:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":361,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4151:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4151:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":370,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4151:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":371,"nodeType":"ExpressionStatement","src":"4151:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":375,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4232:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":378,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4270:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":377,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4262:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":376,"name":"address","nodeType":"ElementaryTypeName","src":"4262:7:0","typeDescriptions":{}}},"id":379,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4262:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":372,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4220:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":374,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4220:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":380,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4220:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":381,"nodeType":"ExpressionStatement","src":"4220:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4297:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":382,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4286:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4286:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":386,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4286:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":387,"nodeType":"ExpressionStatement","src":"4286:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4322:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":390,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"4322:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":391,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4322:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":392,"nodeType":"ExpressionStatement","src":"4322:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":396,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4357:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":393,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4346:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4346:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":397,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4346:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":398,"nodeType":"ExpressionStatement","src":"4346:33:0"},{"assignments":[400],"declarations":[{"constant":false,"id":400,"mutability":"mutable","name":"tmpNonceGetter","nameLocation":"4480:14:0","nodeType":"VariableDeclaration","scope":455,"src":"4472:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":399,"name":"address","nodeType":"ElementaryTypeName","src":"4472:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":413,"initialValue":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"74656d70206e6f6e6365207465737420676574746572","id":408,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4531:24:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""},"value":"temp nonce test getter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""}],"id":407,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"4521:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":409,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4521:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":406,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4513:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":405,"name":"uint256","nodeType":"ElementaryTypeName","src":"4513:7:0","typeDescriptions":{}}},"id":410,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4513:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":404,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4505:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":403,"name":"uint160","nodeType":"ElementaryTypeName","src":"4505:7:0","typeDescriptions":{}}},"id":411,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4505:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":402,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4497:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":401,"name":"address","nodeType":"ElementaryTypeName","src":"4497:7:0","typeDescriptions":{}}},"id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4497:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"4472:87:0"},{"expression":{"arguments":[{"id":417,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4577:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},{"arguments":[{"hexValue":"5363726970744578616d706c652e732e736f6c3a4e6f6e6365476574746572","id":420,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4612:33:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""},"value":"ScriptExample.s.sol:NonceGetter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""}],"expression":{"id":418,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4593:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getDeployedCode","nodeType":"MemberAccess","referencedDeclaration":61,"src":"4593:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) view external returns (bytes memory)"}},"id":421,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4593:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"},{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"expression":{"id":414,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4569:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":416,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"etch","nodeType":"MemberAccess","referencedDeclaration":68,"src":"4569:7:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$","typeString":"function (address,bytes memory) external"}},"id":422,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4569:78:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":423,"nodeType":"ExpressionStatement","src":"4569:78:0"},{"expression":{"arguments":[{"id":427,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4676:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":424,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4657:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":426,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"allowCheatcodes","nodeType":"MemberAccess","referencedDeclaration":73,"src":"4657:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":428,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":429,"nodeType":"ExpressionStatement","src":"4657:34:0"},{"assignments":[431],"declarations":[{"constant":false,"id":431,"mutability":"mutable","name":"v","nameLocation":"4709:1:0","nodeType":"VariableDeclaration","scope":455,"src":"4701:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":430,"name":"uint256","nodeType":"ElementaryTypeName","src":"4701:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":441,"initialValue":{"arguments":[{"arguments":[{"id":438,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4758:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":437,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4750:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":436,"name":"address","nodeType":"ElementaryTypeName","src":"4750:7:0","typeDescriptions":{}}},"id":439,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4750:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"arguments":[{"id":433,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4725:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":432,"name":"NonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":833,"src":"4713:11:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_NonceGetter_$833_$","typeString":"type(contract NonceGetter)"}},"id":434,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_NonceGetter_$833","typeString":"contract NonceGetter"}},"id":435,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":832,"src":"4713:36:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint256_$","typeString":"function (address) view external returns (uint256)"}},"id":440,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"4701:63:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683a","id":445,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4786:68:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},"value":"nonce from nonce getter, no explicit access required with vm.etch:"},{"id":446,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":431,"src":"4856:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":442,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4774:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":444,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"4774:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4774:84:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":448,"nodeType":"ExpressionStatement","src":"4774:84:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":452,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4881:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":449,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4869:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":451,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"4869:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4869:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":454,"nodeType":"ExpressionStatement","src":"4869:20:0"}]},"documentation":{"id":244,"nodeType":"StructuredDocumentation","src":"3385:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"3477:3:0","parameters":{"id":245,"nodeType":"ParameterList","parameters":[],"src":"3480:2:0"},"returnParameters":{"id":246,"nodeType":"ParameterList","parameters":[],"src":"3490:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":689,"nodeType":"FunctionDefinition","src":"4963:1333:0","nodes":[],"body":{"id":688,"nodeType":"Block","src":"4994:1302:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":463,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5016:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":470,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5059:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":469,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5051:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":468,"name":"address","nodeType":"ElementaryTypeName","src":"5051:7:0","typeDescriptions":{}}},"id":471,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5051:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":466,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5039:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":467,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5039:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5039:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":465,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5031:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":464,"name":"uint256","nodeType":"ElementaryTypeName","src":"5031:7:0","typeDescriptions":{}}},"id":473,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5031:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":460,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5004:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":462,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"5004:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":474,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5004:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":475,"nodeType":"ExpressionStatement","src":"5004:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":479,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5090:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":476,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5078:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":478,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5078:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":480,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5078:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":481,"nodeType":"ExpressionStatement","src":"5078:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":482,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5117:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5117:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":485,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5117:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":486,"nodeType":"ExpressionStatement","src":"5117:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":490,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5152:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":487,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5141:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":489,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5141:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":491,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5141:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":492,"nodeType":"ExpressionStatement","src":"5141:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":496,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5188:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":493,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5177:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5177:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":497,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5177:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":498,"nodeType":"ExpressionStatement","src":"5177:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":502,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5226:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":499,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5214:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5214:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":503,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5214:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":504,"nodeType":"ExpressionStatement","src":"5214:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5291:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":511,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5283:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":510,"name":"uint160","nodeType":"ElementaryTypeName","src":"5283:7:0","typeDescriptions":{}}},"id":513,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5283:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5275:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":508,"name":"address","nodeType":"ElementaryTypeName","src":"5275:7:0","typeDescriptions":{}}},"id":514,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5275:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":505,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5257:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":507,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5257:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":515,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5257:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":516,"nodeType":"ExpressionStatement","src":"5257:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":520,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5323:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":517,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5312:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":519,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5312:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":521,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5312:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":522,"nodeType":"ExpressionStatement","src":"5312:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":526,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5362:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":523,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5351:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":525,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5351:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5351:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":528,"nodeType":"ExpressionStatement","src":"5351:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":532,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5404:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":529,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5390:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":531,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":785,"src":"5390:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":533,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5390:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":534,"nodeType":"ExpressionStatement","src":"5390:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":535,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5431:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":537,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5431:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":538,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5431:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":539,"nodeType":"ExpressionStatement","src":"5431:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":543,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5470:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":540,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5459:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":542,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5459:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":544,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5459:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":545,"nodeType":"ExpressionStatement","src":"5459:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":549,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5511:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":546,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5499:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5499:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":550,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5499:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":551,"nodeType":"ExpressionStatement","src":"5499:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":559,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5572:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":558,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5564:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":557,"name":"uint160","nodeType":"ElementaryTypeName","src":"5564:7:0","typeDescriptions":{}}},"id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5564:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":556,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5556:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":555,"name":"address","nodeType":"ElementaryTypeName","src":"5556:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5556:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":552,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5538:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":554,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5538:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":562,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5538:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":563,"nodeType":"ExpressionStatement","src":"5538:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":567,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5604:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":564,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5591:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":566,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":758,"src":"5591:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":568,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5591:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":569,"nodeType":"ExpressionStatement","src":"5591:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":570,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5623:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5623:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5623:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"5623:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5664:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5652:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5652:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5652:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"5652:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":588,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5725:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":587,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5717:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":586,"name":"uint160","nodeType":"ElementaryTypeName","src":"5717:7:0","typeDescriptions":{}}},"id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5717:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":585,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5709:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":584,"name":"address","nodeType":"ElementaryTypeName","src":"5709:7:0","typeDescriptions":{}}},"id":590,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5709:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5696:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5696:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":591,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5696:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":592,"nodeType":"ExpressionStatement","src":"5696:40:0"},{"assignments":[595],"declarations":[{"constant":false,"id":595,"mutability":"mutable","name":"x","nameLocation":"5753:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5746:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":594,"nodeType":"UserDefinedTypeName","pathNode":{"id":593,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5746:6:0"},"referencedDeclaration":799,"src":"5746:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":601,"initialValue":{"arguments":[{"hexValue":"31323334","id":599,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5768:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":598,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5757:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":597,"nodeType":"UserDefinedTypeName","pathNode":{"id":596,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5761:6:0"},"referencedDeclaration":799,"src":"5761:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":600,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5757:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5746:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":607,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":603,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":595,"src":"5791:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"5791:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5791:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":606,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5802:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"5791:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323334","id":608,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5808:35:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""},"value":"FooBar: foo in create is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""}],"id":602,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"5783:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":609,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5783:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":610,"nodeType":"ExpressionStatement","src":"5783:61:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":614,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5867:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":611,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5855:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":613,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5855:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":615,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5855:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":616,"nodeType":"ExpressionStatement","src":"5855:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5917:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":623,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5909:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":622,"name":"uint160","nodeType":"ElementaryTypeName","src":"5909:7:0","typeDescriptions":{}}},"id":625,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5909:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":621,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5901:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":620,"name":"address","nodeType":"ElementaryTypeName","src":"5901:7:0","typeDescriptions":{}}},"id":626,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5901:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":617,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5888:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":627,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5888:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":628,"nodeType":"ExpressionStatement","src":"5888:38:0"},{"assignments":[631],"declarations":[{"constant":false,"id":631,"mutability":"mutable","name":"y","nameLocation":"5943:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5936:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":630,"nodeType":"UserDefinedTypeName","pathNode":{"id":629,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5936:6:0"},"referencedDeclaration":799,"src":"5936:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":645,"initialValue":{"arguments":[{"hexValue":"31323334","id":643,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5986:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":634,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5947:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":633,"nodeType":"UserDefinedTypeName","pathNode":{"id":632,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5951:6:0"},"referencedDeclaration":799,"src":"5951:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":642,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":639,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5980:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":638,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5972:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":637,"name":"uint256","nodeType":"ElementaryTypeName","src":"5972:7:0","typeDescriptions":{}}},"id":640,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5972:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":636,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5964:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":635,"name":"bytes32","nodeType":"ElementaryTypeName","src":"5964:7:0","typeDescriptions":{}}},"id":641,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5964:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"5947:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":644,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5947:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5936:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":651,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":647,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":631,"src":"6009:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":648,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"6009:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":649,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6009:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":650,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6020:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"6009:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e2063726561746532206973206e6f742031323334","id":652,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6026:36:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""},"value":"FooBar: foo in create2 is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""}],"id":646,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"6001:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":653,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6001:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":654,"nodeType":"ExpressionStatement","src":"6001:62:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":658,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6085:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":655,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6073:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":657,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6073:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":659,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6073:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":660,"nodeType":"ExpressionStatement","src":"6073:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":661,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6177:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":663,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"6177:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":664,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6177:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":665,"nodeType":"ExpressionStatement","src":"6177:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":669,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6212:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":668,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"6201:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":667,"nodeType":"UserDefinedTypeName","pathNode":{"id":666,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"6205:6:0"},"referencedDeclaration":799,"src":"6205:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":670,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6201:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":671,"nodeType":"ExpressionStatement","src":"6201:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":675,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6240:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":682,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6281:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":681,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6273:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":680,"name":"address","nodeType":"ElementaryTypeName","src":"6273:7:0","typeDescriptions":{}}},"id":683,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6273:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":678,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6261:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":679,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"6261:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":684,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6261:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":677,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6253:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":676,"name":"uint256","nodeType":"ElementaryTypeName","src":"6253:7:0","typeDescriptions":{}}},"id":685,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6253:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":672,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6228:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":674,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"6228:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":686,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6228:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":687,"nodeType":"ExpressionStatement","src":"6228:61:0"}]},"documentation":{"id":457,"nodeType":"StructuredDocumentation","src":"4902:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"4972:12:0","parameters":{"id":458,"nodeType":"ParameterList","parameters":[],"src":"4984:2:0"},"returnParameters":{"id":459,"nodeType":"ParameterList","parameters":[],"src":"4994:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":713,"nodeType":"FunctionDefinition","src":"6391:143:0","nodes":[],"body":{"id":712,"nodeType":"Block","src":"6440:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":698,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":692,"src":"6462:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":695,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6450:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":697,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6450:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":699,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6450:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":700,"nodeType":"ExpressionStatement","src":"6450:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":704,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6487:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":707,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"6515:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":708,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"6515:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":706,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6507:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":705,"name":"address","nodeType":"ElementaryTypeName","src":"6507:7:0","typeDescriptions":{}}},"id":709,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6507:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":701,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6475:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":703,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"6475:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":710,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6475:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":711,"nodeType":"ExpressionStatement","src":"6475:52:0"}]},"documentation":{"id":690,"nodeType":"StructuredDocumentation","src":"6302:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"6400:5:0","parameters":{"id":693,"nodeType":"ParameterList","parameters":[{"constant":false,"id":692,"mutability":"mutable","name":"_v","nameLocation":"6422:2:0","nodeType":"VariableDeclaration","scope":713,"src":"6406:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":691,"name":"string","nodeType":"ElementaryTypeName","src":"6406:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6405:20:0"},"returnParameters":{"id":694,"nodeType":"ParameterList","parameters":[],"src":"6440:0:0"},"scope":786,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":728,"nodeType":"FunctionDefinition","src":"6540:95:0","nodes":[],"body":{"id":727,"nodeType":"Block","src":"6584:51:0","nodes":[],"statements":[{"expression":{"id":719,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6594:9:0","subExpression":{"id":718,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6594:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":720,"nodeType":"ExpressionStatement","src":"6594:9:0"},{"expression":{"arguments":[{"id":724,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":715,"src":"6625:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":721,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6613:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":723,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6613:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":725,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6613:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":726,"nodeType":"ExpressionStatement","src":"6613:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"6549:5:0","parameters":{"id":716,"nodeType":"ParameterList","parameters":[{"constant":false,"id":715,"mutability":"mutable","name":"_v","nameLocation":"6571:2:0","nodeType":"VariableDeclaration","scope":728,"src":"6555:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":714,"name":"string","nodeType":"ElementaryTypeName","src":"6555:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6554:20:0"},"returnParameters":{"id":717,"nodeType":"ParameterList","parameters":[],"src":"6584:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":743,"nodeType":"FunctionDefinition","src":"6641:95:0","nodes":[],"body":{"id":742,"nodeType":"Block","src":"6685:51:0","nodes":[],"statements":[{"expression":{"id":734,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6695:9:0","subExpression":{"id":733,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6695:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":735,"nodeType":"ExpressionStatement","src":"6695:9:0"},{"expression":{"arguments":[{"id":739,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":730,"src":"6726:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":736,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6714:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":738,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6714:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":740,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6714:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":741,"nodeType":"ExpressionStatement","src":"6714:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"6650:5:0","parameters":{"id":731,"nodeType":"ParameterList","parameters":[{"constant":false,"id":730,"mutability":"mutable","name":"_v","nameLocation":"6672:2:0","nodeType":"VariableDeclaration","scope":743,"src":"6656:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":729,"name":"string","nodeType":"ElementaryTypeName","src":"6656:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6655:20:0"},"returnParameters":{"id":732,"nodeType":"ParameterList","parameters":[],"src":"6685:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":758,"nodeType":"FunctionDefinition","src":"6742:98:0","nodes":[],"body":{"id":757,"nodeType":"Block","src":"6788:52:0","nodes":[],"statements":[{"expression":{"id":749,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6798:9:0","subExpression":{"id":748,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6798:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":750,"nodeType":"ExpressionStatement","src":"6798:9:0"},{"expression":{"arguments":[{"id":754,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":745,"src":"6830:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":751,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6817:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":753,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":773,"src":"6817:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":755,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6817:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":756,"nodeType":"ExpressionStatement","src":"6817:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"6751:7:0","parameters":{"id":746,"nodeType":"ParameterList","parameters":[{"constant":false,"id":745,"mutability":"mutable","name":"_v","nameLocation":"6775:2:0","nodeType":"VariableDeclaration","scope":758,"src":"6759:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":744,"name":"string","nodeType":"ElementaryTypeName","src":"6759:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6758:20:0"},"returnParameters":{"id":747,"nodeType":"ParameterList","parameters":[],"src":"6788:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":773,"nodeType":"FunctionDefinition","src":"6846:97:0","nodes":[],"body":{"id":772,"nodeType":"Block","src":"6892:51:0","nodes":[],"statements":[{"expression":{"id":764,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6902:9:0","subExpression":{"id":763,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6902:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":765,"nodeType":"ExpressionStatement","src":"6902:9:0"},{"expression":{"arguments":[{"id":769,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":760,"src":"6933:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":766,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6921:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":768,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6921:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":770,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6921:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":771,"nodeType":"ExpressionStatement","src":"6921:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"6855:7:0","parameters":{"id":761,"nodeType":"ParameterList","parameters":[{"constant":false,"id":760,"mutability":"mutable","name":"_v","nameLocation":"6879:2:0","nodeType":"VariableDeclaration","scope":773,"src":"6863:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":759,"name":"string","nodeType":"ElementaryTypeName","src":"6863:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6862:20:0"},"returnParameters":{"id":762,"nodeType":"ParameterList","parameters":[],"src":"6892:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":785,"nodeType":"FunctionDefinition","src":"6949:84:0","nodes":[],"body":{"id":784,"nodeType":"Block","src":"7001:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":781,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":775,"src":"7023:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":778,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"7011:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":780,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"7011:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":782,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7011:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":783,"nodeType":"ExpressionStatement","src":"7011:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"6958:8:0","parameters":{"id":776,"nodeType":"ParameterList","parameters":[{"constant":false,"id":775,"mutability":"mutable","name":"_v","nameLocation":"6983:2:0","nodeType":"VariableDeclaration","scope":785,"src":"6967:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":774,"name":"string","nodeType":"ElementaryTypeName","src":"6967:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6966:20:0"},"returnParameters":{"id":777,"nodeType":"ParameterList","parameters":[],"src":"7001:0:0"},"scope":786,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[799],"contractKind":"contract","documentation":{"id":221,"nodeType":"StructuredDocumentation","src":"2997:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[786],"name":"ScriptExample","nameLocation":"3132:13:0","scope":969,"usedErrors":[]},{"id":799,"nodeType":"ContractDefinition","src":"7037:96:0","nodes":[{"id":788,"nodeType":"VariableDeclaration","src":"7059:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"7074:3:0","scope":799,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":787,"name":"uint256","nodeType":"ElementaryTypeName","src":"7059:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":798,"nodeType":"FunctionDefinition","src":"7084:47:0","nodes":[],"body":{"id":797,"nodeType":"Block","src":"7107:24:0","nodes":[],"statements":[{"expression":{"id":795,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":793,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":788,"src":"7117:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":794,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":790,"src":"7123:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"7117:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":796,"nodeType":"ExpressionStatement","src":"7117:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":791,"nodeType":"ParameterList","parameters":[{"constant":false,"id":790,"mutability":"mutable","name":"v","nameLocation":"7104:1:0","nodeType":"VariableDeclaration","scope":798,"src":"7096:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":789,"name":"uint256","nodeType":"ElementaryTypeName","src":"7096:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7095:11:0"},"returnParameters":{"id":792,"nodeType":"ParameterList","parameters":[],"src":"7107:0:0"},"scope":799,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[799],"name":"FooBar","nameLocation":"7046:6:0","scope":969,"usedErrors":[]},{"id":833,"nodeType":"ContractDefinition","src":"7135:281:0","nodes":[{"id":813,"nodeType":"VariableDeclaration","src":"7162:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7188:10:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":800,"name":"address","nodeType":"ElementaryTypeName","src":"7162:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":808,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7235:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":807,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7225:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":809,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7225:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":806,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7217:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":805,"name":"uint256","nodeType":"ElementaryTypeName","src":"7217:7:0","typeDescriptions":{}}},"id":810,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7217:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":804,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7209:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":803,"name":"uint160","nodeType":"ElementaryTypeName","src":"7209:7:0","typeDescriptions":{}}},"id":811,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7209:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":802,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":801,"name":"address","nodeType":"ElementaryTypeName","src":"7201:7:0","typeDescriptions":{}}},"id":812,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7201:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":819,"nodeType":"VariableDeclaration","src":"7262:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7283:2:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":815,"nodeType":"UserDefinedTypeName","pathNode":{"id":814,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7262:2:0"},"referencedDeclaration":83,"src":"7262:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":817,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":813,"src":"7291:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":816,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7288:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":818,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7288:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":832,"nodeType":"FunctionDefinition","src":"7309:105:0","nodes":[],"body":{"id":831,"nodeType":"Block","src":"7372:42:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":828,"name":"_addr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":821,"src":"7401:5:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":826,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":819,"src":"7389:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":827,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7389:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":829,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7389:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"functionReturnParameters":825,"id":830,"nodeType":"Return","src":"7382:25:0"}]},"functionSelector":"2d0335ab","implemented":true,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"7318:8:0","parameters":{"id":822,"nodeType":"ParameterList","parameters":[{"constant":false,"id":821,"mutability":"mutable","name":"_addr","nameLocation":"7335:5:0","nodeType":"VariableDeclaration","scope":832,"src":"7327:13:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":820,"name":"address","nodeType":"ElementaryTypeName","src":"7327:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"7326:15:0"},"returnParameters":{"id":825,"nodeType":"ParameterList","parameters":[{"constant":false,"id":824,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":832,"src":"7363:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":823,"name":"uint256","nodeType":"ElementaryTypeName","src":"7363:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7362:9:0"},"scope":833,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"NonceGetter","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[833],"name":"NonceGetter","nameLocation":"7144:11:0","scope":969,"usedErrors":[]},{"id":852,"nodeType":"ContractDefinition","src":"7418:174:0","nodes":[{"id":835,"nodeType":"VariableDeclaration","src":"7448:18:0","nodes":[],"constant":false,"mutability":"mutable","name":"v","nameLocation":"7465:1:0","scope":852,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":834,"name":"uint256","nodeType":"ElementaryTypeName","src":"7448:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"id":843,"nodeType":"FunctionDefinition","src":"7473:36:0","nodes":[],"body":{"id":842,"nodeType":"Block","src":"7487:22:0","nodes":[],"statements":[{"expression":{"id":840,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":838,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7497:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"hexValue":"31","id":839,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7501:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"7497:5:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":841,"nodeType":"ExpressionStatement","src":"7497:5:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":836,"nodeType":"ParameterList","parameters":[],"src":"7484:2:0"},"returnParameters":{"id":837,"nodeType":"ParameterList","parameters":[],"src":"7487:0:0"},"scope":852,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":851,"nodeType":"FunctionDefinition","src":"7515:75:0","nodes":[],"body":{"id":850,"nodeType":"Block","src":"7565:25:0","nodes":[],"statements":[{"expression":{"id":848,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7582:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"functionReturnParameters":847,"id":849,"nodeType":"Return","src":"7575:8:0"}]},"functionSelector":"20965255","implemented":true,"kind":"function","modifiers":[],"name":"getValue","nameLocation":"7524:8:0","parameters":{"id":844,"nodeType":"ParameterList","parameters":[],"src":"7532:2:0"},"returnParameters":{"id":847,"nodeType":"ParameterList","parameters":[{"constant":false,"id":846,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":851,"src":"7556:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":845,"name":"uint256","nodeType":"ElementaryTypeName","src":"7556:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7555:9:0"},"scope":852,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkedContract","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[852],"name":"ForkedContract","nameLocation":"7427:14:0","scope":969,"usedErrors":[]},{"id":968,"nodeType":"ContractDefinition","src":"7594:813:0","nodes":[{"id":866,"nodeType":"VariableDeclaration","src":"7620:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7646:10:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":853,"name":"address","nodeType":"ElementaryTypeName","src":"7620:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":861,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7693:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":860,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7683:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":862,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7683:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":859,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7675:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":858,"name":"uint256","nodeType":"ElementaryTypeName","src":"7675:7:0","typeDescriptions":{}}},"id":863,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7675:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":857,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7667:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":856,"name":"uint160","nodeType":"ElementaryTypeName","src":"7667:7:0","typeDescriptions":{}}},"id":864,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7667:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":855,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7659:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":854,"name":"address","nodeType":"ElementaryTypeName","src":"7659:7:0","typeDescriptions":{}}},"id":865,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7659:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":872,"nodeType":"VariableDeclaration","src":"7720:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7741:2:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":868,"nodeType":"UserDefinedTypeName","pathNode":{"id":867,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7720:2:0"},"referencedDeclaration":83,"src":"7720:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":870,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":866,"src":"7749:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":869,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7746:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":871,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7746:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":967,"nodeType":"FunctionDefinition","src":"7767:638:0","nodes":[],"body":{"id":966,"nodeType":"Block","src":"7791:614:0","nodes":[],"statements":[{"assignments":[876],"declarations":[{"constant":false,"id":876,"mutability":"mutable","name":"testAddr","nameLocation":"7809:8:0","nodeType":"VariableDeclaration","scope":966,"src":"7801:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":875,"name":"address","nodeType":"ElementaryTypeName","src":"7801:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":884,"initialValue":{"arguments":[{"arguments":[{"hexValue":"307831323334","id":881,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7836:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":880,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7828:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":879,"name":"uint160","nodeType":"ElementaryTypeName","src":"7828:7:0","typeDescriptions":{}}},"id":882,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7828:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":878,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7820:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":877,"name":"address","nodeType":"ElementaryTypeName","src":"7820:7:0","typeDescriptions":{}}},"id":883,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7820:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"7801:43:0"},{"assignments":[887],"declarations":[{"constant":false,"id":887,"mutability":"mutable","name":"fc","nameLocation":"7869:2:0","nodeType":"VariableDeclaration","scope":966,"src":"7854:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"},"typeName":{"id":886,"nodeType":"UserDefinedTypeName","pathNode":{"id":885,"name":"ForkedContract","nodeType":"IdentifierPath","referencedDeclaration":852,"src":"7854:14:0"},"referencedDeclaration":852,"src":"7854:14:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"visibility":"internal"}],"id":891,"initialValue":{"arguments":[{"id":889,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7889:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":888,"name":"ForkedContract","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":852,"src":"7874:14:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_ForkedContract_$852_$","typeString":"type(contract ForkedContract)"}},"id":890,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7874:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"nodeType":"VariableDeclarationStatement","src":"7854:44:0"},{"expression":{"arguments":[{"hexValue":"666f726b31","id":895,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7929:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},"value":"fork1"},{"hexValue":"3132333435","id":896,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7938:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"}],"expression":{"id":892,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7909:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":894,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"7909:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":897,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7909:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":898,"nodeType":"ExpressionStatement","src":"7909:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":905,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":902,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7974:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":900,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7962:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":901,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7962:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":903,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7962:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3132333435","id":904,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7987:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"},"src":"7962:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":906,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7994:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":899,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"7954:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":907,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7954:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":908,"nodeType":"ExpressionStatement","src":"7954:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":914,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":910,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8036:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":911,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8036:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":912,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8036:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31","id":913,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8053:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"8036:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652031","id":915,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8056:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""},"value":"value should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""}],"id":909,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8028:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":916,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8028:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":917,"nodeType":"ExpressionStatement","src":"8028:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":925,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":919,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8094:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":920,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8094:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"31","id":923,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8122:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"}],"id":922,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8114:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":921,"name":"uint256","nodeType":"ElementaryTypeName","src":"8114:7:0","typeDescriptions":{}}},"id":924,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8114:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8094:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652031","id":926,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8126:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""},"value":"balance should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""}],"id":918,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8086:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":927,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8086:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":928,"nodeType":"ExpressionStatement","src":"8086:62:0"},{"expression":{"arguments":[{"hexValue":"666f726b32","id":932,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8179:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},"value":"fork2"},{"hexValue":"3233343536","id":933,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8188:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"}],"expression":{"id":929,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8159:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":931,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"8159:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":934,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8159:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":935,"nodeType":"ExpressionStatement","src":"8159:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":942,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":939,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8224:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":937,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8212:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":938,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"8212:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":940,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8212:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3233343536","id":941,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8237:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"},"src":"8212:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":943,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8244:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":936,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8204:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":944,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8204:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":945,"nodeType":"ExpressionStatement","src":"8204:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":951,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":947,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8286:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":948,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8286:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":949,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8286:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"32","id":950,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8303:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"},"src":"8286:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652032","id":952,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8306:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""},"value":"value should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""}],"id":946,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8278:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":953,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8278:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":954,"nodeType":"ExpressionStatement","src":"8278:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":962,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":956,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8344:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":957,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8344:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"32","id":960,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8372:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"}],"id":959,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8364:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":958,"name":"uint256","nodeType":"ElementaryTypeName","src":"8364:7:0","typeDescriptions":{}}},"id":961,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8364:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8344:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652032","id":963,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8376:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""},"value":"balance should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""}],"id":955,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8336:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":964,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8336:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":965,"nodeType":"ExpressionStatement","src":"8336:62:0"}]},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"7776:3:0","parameters":{"id":873,"nodeType":"ParameterList","parameters":[],"src":"7779:2:0"},"returnParameters":{"id":874,"nodeType":"ParameterList","parameters":[],"src":"7791:0:0"},"scope":968,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkTester","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[968],"name":"ForkTester","nameLocation":"7603:10:0","scope":969,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ScriptExample.json b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ScriptExample.json
index 09a0bf47f02d..0fd610c4725c 100644
--- a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ScriptExample.json
+++ b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/ScriptExample.json
@@ -1 +1 @@
-{"abi":[{"type":"function","name":"call1","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"call2","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"callPure","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"pure"},{"type":"function","name":"counter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"hello","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"view"},{"type":"function","name":"nested1","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"nested2","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"run","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"runBroadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x608060405234801561001057600080fd5b5061202a806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a35760003560e01c8063a76ccdfa11610076578063bef03abc1161005b578063bef03abc14610111578063c040622614610119578063dbf1282f146100c357600080fd5b8063a76ccdfa146100eb578063a777d0dc146100fe57600080fd5b806361bc221a146100a85780637e79255d146100c35780637f8b915c146100d85780638d3ef7ca146100c3575b600080fd5b6100b160005481565b60405190815260200160405180910390f35b6100d66100d1366004611a60565b610121565b005b6100d66100e6366004611a60565b610178565b6100d66100f9366004611a60565b6101b7565b6100d661010c366004611a60565b61023f565b6100d66102bd565b6100d6610f54565b60008054908061013083611ad2565b919050555061017482828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061175b92505050565b5050565b61017482828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061175b92505050565b6000805490806101c683611ad2565b90915550506040517fdbf1282f000000000000000000000000000000000000000000000000000000008152309063dbf1282f906102099085908590600401611b31565b600060405180830381600087803b15801561022357600080fd5b505af1158015610237573d6000803e3d6000fd5b505050505050565b61027e82828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061175b92505050565b6101746040518060400160405280601081526020017f68656c6c6f206d73672e73656e64657200000000000000000000000000000000815250336117ed565b604080518082018252600b81527f6e6f6e6365207374617274000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526103909190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab906024015b602060405180830381865afa15801561035d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103819190611b7e565b67ffffffffffffffff1661187e565b6103ce6040518060400160405280600e81526020017f74657374696e672073696e676c6500000000000000000000000000000000000081525061175b565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561043957600080fd5b505af115801561044d573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3100000000000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156104d057600080fd5b505af11580156104e4573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3200000000000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561056757600080fd5b505af115801561057b573d6000803e3d6000fd5b505050506105bd6040518060400160405280601281526020017f74657374696e672073746172742f73746f70000000000000000000000000000081525061175b565b6040517f7fec2a8d00000000000000000000000000000000000000000000000000000000815262c0ffee6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b15801561062557600080fd5b505af1158015610639573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3100000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156106bc57600080fd5b505af11580156106d0573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3200000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561075357600080fd5b505af1158015610767573d6000803e3d6000fd5b50506040517f7f8b915c00000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f737461727473746f705f707572650000000000000000000000000000000000006044820152309250637f8b915c915060640160006040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561086b57600080fd5b505af115801561087f573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3300000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b15801561090257600080fd5b505af1158015610916573d6000803e3d6000fd5b505050506109586040518060400160405280600e81526020017f74657374696e67206e657374656400000000000000000000000000000000000081525061175b565b6040517f7fec2a8d0000000000000000000000000000000000000000000000000000000081526112346004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b1580156109bf57600080fd5b505af11580156109d3573d6000803e3d6000fd5b50506040517fa76ccdfa00000000000000000000000000000000000000000000000000000000815260206004820152600660248201527f6e65737465640000000000000000000000000000000000000000000000000000604482015230925063a76ccdfa9150606401600060405180830381600087803b158015610a5657600080fd5b505af1158015610a6a573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610ad957600080fd5b505af1158015610aed573d6000803e3d6000fd5b50505050610b2f6040518060400160405280601381526020017f636f6e7472616374206465706c6f796d656e740000000000000000000000000081525061175b565b6040517fe6962cdb000000000000000000000000000000000000000000000000000000008152621234566004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610b9757600080fd5b505af1158015610bab573d6000803e3d6000fd5b5050505060006104d2604051610bc090611a54565b908152602001604051809103906000f080158015610be2573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c549190611baf565b6104d214610c6157600080fd5b610c9f6040518060400160405280600881526020017f637265617465203200000000000000000000000000000000000000000000000081525061175b565b6040517fe6962cdb00000000000000000000000000000000000000000000000000000000815261cafe6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610d0657600080fd5b505af1158015610d1a573d6000803e3d6000fd5b505050506000602a60001b6104d2604051610d3490611a54565b9081526020018190604051809103906000f5905080158015610d5a573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610da8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dcc9190611baf565b6104d214610dd957600080fd5b610e176040518060400160405280600581526020017f646f6e652100000000000000000000000000000000000000000000000000000081525061175b565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610e8257600080fd5b505af1158015610e96573d6000803e3d6000fd5b505050506104d2604051610ea990611a54565b908152602001604051809103906000f080158015610ecb573d6000803e3d6000fd5b5050604080518082018252600981527f6e6f6e636520656e640000000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526101749190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b604080517f4777f3cf0000000000000000000000000000000000000000000000000000000081526004810191909152600c60448201527f4558414d504c455f424f4f4c0000000000000000000000000000000000000000606482015260006024820181905290737109709ecfa91a80626ff3989d68f67f5b1dd12d90634777f3cf90608401602060405180830381865afa158015610ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101a9190611bc8565b905061105b6040518060400160405280601381526020017f626f6f6c2076616c75652066726f6d20656e76000000000000000000000000008152508261190f565b61109a6040518060400160405280600d81526020017f636f6e7472616374206164647200000000000000000000000000000000000000815250306117ed565b604080518082018252600e81527f636f6e7472616374206e6f6e6365000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526111219190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b6111606040518060400160405280600b81526020017f73656e6465722061646472000000000000000000000000000000000000000000815250336117ed565b604080518082018252600c81527f73656e646572206e6f6e63650000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523360048201526111e79190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b60408051808201825260208082527f7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d9082015290517f213e4198000000000000000000000000000000000000000000000000000000008152600090737109709ecfa91a80626ff3989d68f67f5b1dd12d9063213e41989061126c908590600401611c64565b600060405180830381865afa158015611289573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526112cf9190810190611d34565b90506113456040518060400160405280600481526020017f6b657973000000000000000000000000000000000000000000000000000000008152508260008151811061131d5761131d611e68565b60200260200101518360018151811061133857611338611e68565b60200260200101516119a0565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600d60248201527f66726f6d206f726967696e616c000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156113c257600080fd5b505afa1580156113d6573d6000803e3d6000fd5b50506040517f06447d5600000000000000000000000000000000000000000000000000000000815260426004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d92506306447d569150602401600060405180830381600087803b15801561144057600080fd5b505af1158015611454573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b20310000000000000000000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b1580156114d557600080fd5b505afa1580156114e9573d6000803e3d6000fd5b5050505061152c6040518060400160405280601781526020017f706172656e742073636f7065206d73672e73656e646572000000000000000000815250336117ed565b61156b6040518060400160405280601a81526020017f706172656e742073636f706520636f6e74726163742e61646472000000000000815250306117ed565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b203200000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156115e857600080fd5b505afa1580156115fc573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166390c5013b6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561166b57600080fd5b505af115801561167f573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f66726f6d206f726967696e616c20616761696e00000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b15801561170057600080fd5b505afa158015611714573d6000803e3d6000fd5b505050506117566040518060400160405280600581526020017f646f6e652100000000000000000000000000000000000000000000000000000081525061175b565b505050565b6117ea8160405160240161176f9190611e97565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f41304fac00000000000000000000000000000000000000000000000000000000179052611a2f565b50565b6101748282604051602401611803929190611eaa565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f319af33300000000000000000000000000000000000000000000000000000000179052611a2f565b6101748282604051602401611894929190611ee2565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb60e72cc00000000000000000000000000000000000000000000000000000000179052611a2f565b6101748282604051602401611925929190611f04565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fc3b5563500000000000000000000000000000000000000000000000000000000179052611a2f565b6117568383836040516024016119b893929190611f28565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f2ced7cef000000000000000000000000000000000000000000000000000000001790525b6117ea8180516a636f6e736f6c652e6c6f67602083016000808483855afa5050505050565b60b280611f6c83390190565b60008060208385031215611a7357600080fd5b823567ffffffffffffffff80821115611a8b57600080fd5b818501915085601f830112611a9f57600080fd5b813581811115611aae57600080fd5b866020828501011115611ac057600080fd5b60209290920196919550909350505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611b2a577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b5060010190565b60208152816020820152818360408301376000818301604090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b600060208284031215611b9057600080fd5b815167ffffffffffffffff81168114611ba857600080fd5b9392505050565b600060208284031215611bc157600080fd5b5051919050565b600060208284031215611bda57600080fd5b81518015158114611ba857600080fd5b60005b83811015611c05578181015183820152602001611bed565b83811115611c14576000848401525b50505050565b60008151808452611c32816020860160208601611bea565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b604081526000611c776040830184611c1a565b8281036020840152600c81527f2e726f6f745f6b65795b305d000000000000000000000000000000000000000060208201526040810191505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715611d2c57611d2c611cb6565b604052919050565b60006020808385031215611d4757600080fd5b825167ffffffffffffffff80821115611d5f57600080fd5b8185019150601f8681840112611d7457600080fd5b825182811115611d8657611d86611cb6565b8060051b611d95868201611ce5565b918252848101860191868101908a841115611daf57600080fd5b87870192505b83831015611e5a57825186811115611dcd5760008081fd5b8701603f81018c13611ddf5760008081fd5b88810151604088821115611df557611df5611cb6565b611e248b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08a85011601611ce5565b8281528e82848601011115611e395760008081fd5b611e48838d8301848701611bea565b85525050509187019190870190611db5565b9a9950505050505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b602081526000611ba86020830184611c1a565b604081526000611ebd6040830185611c1a565b905073ffffffffffffffffffffffffffffffffffffffff831660208301529392505050565b604081526000611ef56040830185611c1a565b90508260208301529392505050565b604081526000611f176040830185611c1a565b905082151560208301529392505050565b606081526000611f3b6060830186611c1a565b8281036020840152611f4d8186611c1a565b90508281036040840152611f618185611c1a565b969550505050505056fe608060405234801561001057600080fd5b506040516100b23803806100b283398101604081905261002f91610037565b600055610050565b60006020828403121561004957600080fd5b5051919050565b60548061005e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000aa164736f6c634300080f000a","sourceMap":"2541:3359:0:-:0;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x608060405234801561001057600080fd5b50600436106100a35760003560e01c8063a76ccdfa11610076578063bef03abc1161005b578063bef03abc14610111578063c040622614610119578063dbf1282f146100c357600080fd5b8063a76ccdfa146100eb578063a777d0dc146100fe57600080fd5b806361bc221a146100a85780637e79255d146100c35780637f8b915c146100d85780638d3ef7ca146100c3575b600080fd5b6100b160005481565b60405190815260200160405180910390f35b6100d66100d1366004611a60565b610121565b005b6100d66100e6366004611a60565b610178565b6100d66100f9366004611a60565b6101b7565b6100d661010c366004611a60565b61023f565b6100d66102bd565b6100d6610f54565b60008054908061013083611ad2565b919050555061017482828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061175b92505050565b5050565b61017482828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061175b92505050565b6000805490806101c683611ad2565b90915550506040517fdbf1282f000000000000000000000000000000000000000000000000000000008152309063dbf1282f906102099085908590600401611b31565b600060405180830381600087803b15801561022357600080fd5b505af1158015610237573d6000803e3d6000fd5b505050505050565b61027e82828080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061175b92505050565b6101746040518060400160405280601081526020017f68656c6c6f206d73672e73656e64657200000000000000000000000000000000815250336117ed565b604080518082018252600b81527f6e6f6e6365207374617274000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526103909190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab906024015b602060405180830381865afa15801561035d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103819190611b7e565b67ffffffffffffffff1661187e565b6103ce6040518060400160405280600e81526020017f74657374696e672073696e676c6500000000000000000000000000000000000081525061175b565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561043957600080fd5b505af115801561044d573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3100000000000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156104d057600080fd5b505af11580156104e4573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3200000000000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561056757600080fd5b505af115801561057b573d6000803e3d6000fd5b505050506105bd6040518060400160405280601281526020017f74657374696e672073746172742f73746f70000000000000000000000000000081525061175b565b6040517f7fec2a8d00000000000000000000000000000000000000000000000000000000815262c0ffee6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b15801561062557600080fd5b505af1158015610639573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3100000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156106bc57600080fd5b505af11580156106d0573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3200000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561075357600080fd5b505af1158015610767573d6000803e3d6000fd5b50506040517f7f8b915c00000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f737461727473746f705f707572650000000000000000000000000000000000006044820152309250637f8b915c915060640160006040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561086b57600080fd5b505af115801561087f573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3300000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b15801561090257600080fd5b505af1158015610916573d6000803e3d6000fd5b505050506109586040518060400160405280600e81526020017f74657374696e67206e657374656400000000000000000000000000000000000081525061175b565b6040517f7fec2a8d0000000000000000000000000000000000000000000000000000000081526112346004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b1580156109bf57600080fd5b505af11580156109d3573d6000803e3d6000fd5b50506040517fa76ccdfa00000000000000000000000000000000000000000000000000000000815260206004820152600660248201527f6e65737465640000000000000000000000000000000000000000000000000000604482015230925063a76ccdfa9150606401600060405180830381600087803b158015610a5657600080fd5b505af1158015610a6a573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610ad957600080fd5b505af1158015610aed573d6000803e3d6000fd5b50505050610b2f6040518060400160405280601381526020017f636f6e7472616374206465706c6f796d656e740000000000000000000000000081525061175b565b6040517fe6962cdb000000000000000000000000000000000000000000000000000000008152621234566004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610b9757600080fd5b505af1158015610bab573d6000803e3d6000fd5b5050505060006104d2604051610bc090611a54565b908152602001604051809103906000f080158015610be2573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c549190611baf565b6104d214610c6157600080fd5b610c9f6040518060400160405280600881526020017f637265617465203200000000000000000000000000000000000000000000000081525061175b565b6040517fe6962cdb00000000000000000000000000000000000000000000000000000000815261cafe6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610d0657600080fd5b505af1158015610d1a573d6000803e3d6000fd5b505050506000602a60001b6104d2604051610d3490611a54565b9081526020018190604051809103906000f5905080158015610d5a573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610da8573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dcc9190611baf565b6104d214610dd957600080fd5b610e176040518060400160405280600581526020017f646f6e652100000000000000000000000000000000000000000000000000000081525061175b565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610e8257600080fd5b505af1158015610e96573d6000803e3d6000fd5b505050506104d2604051610ea990611a54565b908152602001604051809103906000f080158015610ecb573d6000803e3d6000fd5b5050604080518082018252600981527f6e6f6e636520656e640000000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526101749190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b604080517f4777f3cf0000000000000000000000000000000000000000000000000000000081526004810191909152600c60448201527f4558414d504c455f424f4f4c0000000000000000000000000000000000000000606482015260006024820181905290737109709ecfa91a80626ff3989d68f67f5b1dd12d90634777f3cf90608401602060405180830381865afa158015610ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061101a9190611bc8565b905061105b6040518060400160405280601381526020017f626f6f6c2076616c75652066726f6d20656e76000000000000000000000000008152508261190f565b61109a6040518060400160405280600d81526020017f636f6e7472616374206164647200000000000000000000000000000000000000815250306117ed565b604080518082018252600e81527f636f6e7472616374206e6f6e6365000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526111219190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b6111606040518060400160405280600b81526020017f73656e6465722061646472000000000000000000000000000000000000000000815250336117ed565b604080518082018252600c81527f73656e646572206e6f6e63650000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523360048201526111e79190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b60408051808201825260208082527f7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d9082015290517f213e4198000000000000000000000000000000000000000000000000000000008152600090737109709ecfa91a80626ff3989d68f67f5b1dd12d9063213e41989061126c908590600401611c64565b600060405180830381865afa158015611289573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526112cf9190810190611d34565b90506113456040518060400160405280600481526020017f6b657973000000000000000000000000000000000000000000000000000000008152508260008151811061131d5761131d611e68565b60200260200101518360018151811061133857611338611e68565b60200260200101516119a0565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600d60248201527f66726f6d206f726967696e616c000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156113c257600080fd5b505afa1580156113d6573d6000803e3d6000fd5b50506040517f06447d5600000000000000000000000000000000000000000000000000000000815260426004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d92506306447d569150602401600060405180830381600087803b15801561144057600080fd5b505af1158015611454573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b20310000000000000000000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b1580156114d557600080fd5b505afa1580156114e9573d6000803e3d6000fd5b5050505061152c6040518060400160405280601781526020017f706172656e742073636f7065206d73672e73656e646572000000000000000000815250336117ed565b61156b6040518060400160405280601a81526020017f706172656e742073636f706520636f6e74726163742e61646472000000000000815250306117ed565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b203200000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156115e857600080fd5b505afa1580156115fc573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166390c5013b6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561166b57600080fd5b505af115801561167f573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f66726f6d206f726967696e616c20616761696e00000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b15801561170057600080fd5b505afa158015611714573d6000803e3d6000fd5b505050506117566040518060400160405280600581526020017f646f6e652100000000000000000000000000000000000000000000000000000081525061175b565b505050565b6117ea8160405160240161176f9190611e97565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f41304fac00000000000000000000000000000000000000000000000000000000179052611a2f565b50565b6101748282604051602401611803929190611eaa565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f319af33300000000000000000000000000000000000000000000000000000000179052611a2f565b6101748282604051602401611894929190611ee2565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb60e72cc00000000000000000000000000000000000000000000000000000000179052611a2f565b6101748282604051602401611925929190611f04565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fc3b5563500000000000000000000000000000000000000000000000000000000179052611a2f565b6117568383836040516024016119b893929190611f28565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f2ced7cef000000000000000000000000000000000000000000000000000000001790525b6117ea8180516a636f6e736f6c652e6c6f67602083016000808483855afa5050505050565b60b280611f6c83390190565b60008060208385031215611a7357600080fd5b823567ffffffffffffffff80821115611a8b57600080fd5b818501915085601f830112611a9f57600080fd5b813581811115611aae57600080fd5b866020828501011115611ac057600080fd5b60209290920196919550909350505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611b2a577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b5060010190565b60208152816020820152818360408301376000818301604090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b600060208284031215611b9057600080fd5b815167ffffffffffffffff81168114611ba857600080fd5b9392505050565b600060208284031215611bc157600080fd5b5051919050565b600060208284031215611bda57600080fd5b81518015158114611ba857600080fd5b60005b83811015611c05578181015183820152602001611bed565b83811115611c14576000848401525b50505050565b60008151808452611c32816020860160208601611bea565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b604081526000611c776040830184611c1a565b8281036020840152600c81527f2e726f6f745f6b65795b305d000000000000000000000000000000000000000060208201526040810191505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715611d2c57611d2c611cb6565b604052919050565b60006020808385031215611d4757600080fd5b825167ffffffffffffffff80821115611d5f57600080fd5b8185019150601f8681840112611d7457600080fd5b825182811115611d8657611d86611cb6565b8060051b611d95868201611ce5565b918252848101860191868101908a841115611daf57600080fd5b87870192505b83831015611e5a57825186811115611dcd5760008081fd5b8701603f81018c13611ddf5760008081fd5b88810151604088821115611df557611df5611cb6565b611e248b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08a85011601611ce5565b8281528e82848601011115611e395760008081fd5b611e48838d8301848701611bea565b85525050509187019190870190611db5565b9a9950505050505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b602081526000611ba86020830184611c1a565b604081526000611ebd6040830185611c1a565b905073ffffffffffffffffffffffffffffffffffffffff831660208301529392505050565b604081526000611ef56040830185611c1a565b90508260208301529392505050565b604081526000611f176040830185611c1a565b905082151560208301529392505050565b606081526000611f3b6060830186611c1a565b8281036020840152611f4d8186611c1a565b90508281036040840152611f618185611c1a565b969550505050505056fe608060405234801561001057600080fd5b506040516100b23803806100b283398101604081905261002f91610037565b600055610050565b60006020828403121561004957600080fd5b5051919050565b60548061005e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000aa164736f6c634300080f000a","sourceMap":"2541:3359:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2775:22;;;;;;;;;160:25:1;;;148:2;133:18;2775:22:0;;;;;;;5405:95;;;;;;:::i;:::-;;:::i;:::-;;5814:84;;;;;;:::i;:::-;;:::i;5607:98::-;;;;;;:::i;:::-;;:::i;5256:143::-;;;;;;:::i;:::-;;:::i;3903:1258::-;;;:::i;2887:949::-;;;:::i;5405:95::-;5459:7;:9;;;:7;:9;;;:::i;:::-;;;;;;5478:15;5490:2;;5478:15;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5478:11:0;;-1:-1:-1;;;5478:15:0:i;:::-;5405:95;;:::o;5814:84::-;5876:15;5888:2;;5876:15;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5876:11:0;;-1:-1:-1;;;5876:15:0:i;5607:98::-;5663:7;:9;;;:7;:9;;;:::i;:::-;;;;-1:-1:-1;;5682:16:0;;;;;:4;;:12;;:16;;5695:2;;;;5682:16;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5607:98;;:::o;5256:143::-;5315:15;5327:2;;5315:15;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;5315:11:0;;-1:-1:-1;;;5315:15:0:i;:::-;5340:52;;;;;;;;;;;;;;;;;;5380:10;5340:11;:52::i;3903:1258::-;3944:63;;;;;;;;;;;;;;;;3979:26;;;;;3999:4;3979:26;;;1747:74:1;3944:63:0;;;3979:11;;;;1720:18:1;;3979:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;3971:35;;3944:11;:63::i;:::-;4018:29;;;;;;;;;;;;;;;;;;:11;:29::i;:::-;2634:28;2626:37;;4057:12;;;:14;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4081:26:0;;;;;2327:2:1;4081:26:0;;;2309:21:1;2366:2;2346:18;;;2339:30;2405:14;2385:18;;;2378:42;4081:4:0;;-1:-1:-1;4081:10:0;;-1:-1:-1;2437:18:1;;4081:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4117:26:0;;;;;2668:2:1;4117:26:0;;;2650:21:1;2707:2;2687:18;;;2680:30;2746:14;2726:18;;;2719:42;4117:4:0;;-1:-1:-1;4117:10:0;;-1:-1:-1;2778:18:1;;4117:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4154:33;;;;;;;;;;;;;;;;;;:11;:33::i;:::-;4197:45;;;;;4231:8;4197:45;;;1747:74:1;4197:17:0;;;;1720:18:1;;4197:45:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4252:29:0;;;;;3009:2:1;4252:29:0;;;2991:21:1;3048:2;3028:18;;;3021:30;3087:17;3067:18;;;3060:45;4252:4:0;;-1:-1:-1;4252:10:0;;-1:-1:-1;3122:18:1;;4252:29:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4291:29:0;;;;;3353:2:1;4291:29:0;;;3335:21:1;3392:2;3372:18;;;3365:30;3431:17;3411:18;;;3404:45;4291:4:0;;-1:-1:-1;4291:10:0;;-1:-1:-1;3466:18:1;;4291:29:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4330:31:0;;;;;3697:2:1;4330:31:0;;;3679:21:1;3736:2;3716:18;;;3709:30;3775:16;3755:18;;;3748:44;4330:4:0;;-1:-1:-1;4330:13:0;;-1:-1:-1;3809:18:1;;4330:31:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2634:28;2626:37;;4371:16;;;:18;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4399:29:0;;;;;4040:2:1;4399:29:0;;;4022:21:1;4079:2;4059:18;;;4052:30;4118:17;4098:18;;;4091:45;4399:4:0;;-1:-1:-1;4399:10:0;;-1:-1:-1;4153:18:1;;4399:29:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4439;;;;;;;;;;;;;;;;;;:11;:29::i;:::-;4478:43;;;;;4512:6;4478:43;;;1747:74:1;4478:17:0;;;;1720:18:1;;4478:43:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4531:22:0;;;;;4384:2:1;4531:22:0;;;4366:21:1;4423:1;4403:18;;;4396:29;4461:8;4441:18;;;4434:36;4531:4:0;;-1:-1:-1;4531:12:0;;-1:-1:-1;4487:18:1;;4531:22:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2634:28;2626:37;;4563:16;;;:18;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4592:34;;;;;;;;;;;;;;;;;;:11;:34::i;:::-;4636:40;;;;;4665:8;4636:40;;;1747:74:1;4636:12:0;;;;1720:18:1;;4636:40:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4686:8;4708:4;4697:16;;;;;:::i;:::-;160:25:1;;;148:2;133:18;4697:16:0;;;;;;;;;;;;;;;;;;;;;;;4686:27;;4731:1;:5;;;:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;4742:4;4731:15;4723:24;;;;;;4758:23;;;;;;;;;;;;;;;;;;:11;:23::i;:::-;4791:38;;;;;4820:6;4791:38;;;1747:74:1;4791:12:0;;;;1720:18:1;;4791:38:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4839:8;4883:2;4867:20;;4889:4;4850:44;;;;;:::i;:::-;160:25:1;;;148:2;133:18;4850:44:0;;;;;;;;;;;;;;;;;;;;;;;;;;;4839:55;;4912:1;:5;;;:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;4923:4;4912:15;4904:24;;;;;;4938:20;;;;;;;;;;;;;;;;;;:11;:20::i;:::-;2634:28;2626:37;;5042:12;;;:14;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5077:4;5066:16;;;;;:::i;:::-;160:25:1;;;148:2;133:18;5066:16:0;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5093:61:0;;;;;;;;;;;;;;;;5126:26;;;;;5146:4;5126:26;;;1747:74:1;5093:61:0;;;5126:11;;;;1720:18:1;;5126:26:0;1601:226:1;2887:949:0;2928:31;;;;;;;;;5104:21:1;;;;5161:2;5141:18;;;5134:30;5200:14;5180:18;;;5173:42;2919:6:0;5267:20:1;;;5260:52;;;2919:6:0;2928:8;;;;5232:19:1;;2928:31:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;2919:40;;2969:37;;;;;;;;;;;;;;;;;;3004:1;2969:11;:37::i;:::-;3017:43;;;;;;;;;;;;;;;;;;3054:4;3017:11;:43::i;:::-;3070:57;;;;;;;;;;;;;;;;3100:26;;;;;3120:4;3100:26;;;1747:74:1;3070:57:0;;;3100:11;;;;1720:18:1;;3100:26:0;1601:226:1;3070:57:0;3137:47;;;;;;;;;;;;;;;;;;3172:10;3137:11;:47::i;:::-;3194:61;;;;;;;;;;;;;;;;3222:32;;;;;3242:10;3222:32;;;1747:74:1;3194:61:0;;;3222:11;;;;1720:18:1;;3222:32:0;1601:226:1;3194:61:0;3266:55;;;;;;;;;;;;;;;;;3354:38;;;;;3266:18;;3354:16;;;;:38;;3266:55;;3354:38;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;3331:61;;3402:37;;;;;;;;;;;;;;;;;;3422:4;3427:1;3422:7;;;;;;;;:::i;:::-;;;;;;;3431:4;3436:1;3431:7;;;;;;;;:::i;:::-;;;;;;;3402:11;:37::i;:::-;3450:27;;;;;9413:2:1;3450:27:0;;;9395:21:1;9452:2;9432:18;;;9425:30;9491:15;9471:18;;;9464:43;3450:4:0;;:10;;9524:18:1;;3450:27:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;3487:37:0;;;;;3517:4;3487:37;;;1747:74:1;3487:13:0;;-1:-1:-1;3487:13:0;;-1:-1:-1;1720:18:1;;3487:37:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;3534:26:0;;;;;9755:2:1;3534:26:0;;;9737:21:1;9794:2;9774:18;;;9767:30;9833:14;9813:18;;;9806:42;3534:4:0;;-1:-1:-1;3534:10:0;;-1:-1:-1;9865:18:1;;3534:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3570:59;;;;;;;;;;;;;;;;;;3617:10;3570:11;:59::i;:::-;3639:56;;;;;;;;;;;;;;;;;;3689:4;3639:11;:56::i;:::-;3705:26;;;;;10096:2:1;3705:26:0;;;10078:21:1;10135:2;10115:18;;;10108:30;10174:14;10154:18;;;10147:42;3705:4:0;;:10;;10206:18:1;;3705:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2634:28;2626:37;;3741:12;;;:14;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;3765:33:0;;;;;10437:2:1;3765:33:0;;;10419:21:1;10476:2;10456:18;;;10449:30;10515:21;10495:18;;;10488:49;3765:4:0;;-1:-1:-1;3765:10:0;;-1:-1:-1;10554:18:1;;3765:33:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3809:20;;;;;;;;;;;;;;;;;;:11;:20::i;:::-;2909:927;;;2887:949::o;1658:121::-;1713:59;1768:2;1729:42;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;1713:15;:59::i;:::-;1658:121;:::o;2081:145::-;2148:71;2211:2;2215;2164:54;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;2148:15;:71::i;1930:145::-;1997:71;2060:2;2064;2013:54;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;1997:15;:71::i;1785:139::-;1849:68;1909:2;1913;1865:51;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;1849:15;:68::i;2232:179::-;2323:81;2392:2;2396;2400;2339:64;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;1133:133;1204:55;1251:7;1370:14;;856:42;1543:2;1530:16;;1346:21;;1370:14;1530:16;856:42;1579:5;1568:68;1559:77;;1496:150;;1272:380;:::o;-1:-1:-1:-;;;;;;;;:::o;196:592:1:-;267:6;275;328:2;316:9;307:7;303:23;299:32;296:52;;;344:1;341;334:12;296:52;384:9;371:23;413:18;454:2;446:6;443:14;440:34;;;470:1;467;460:12;440:34;508:6;497:9;493:22;483:32;;553:7;546:4;542:2;538:13;534:27;524:55;;575:1;572;565:12;524:55;615:2;602:16;641:2;633:6;630:14;627:34;;;657:1;654;647:12;627:34;702:7;697:2;688:6;684:2;680:15;676:24;673:37;670:57;;;723:1;720;713:12;670:57;754:2;746:11;;;;;776:6;;-1:-1:-1;196:592:1;;-1:-1:-1;;;;196:592:1:o;793:349::-;832:3;863:66;856:5;853:77;850:257;;963:77;960:1;953:88;1064:4;1061:1;1054:15;1092:4;1089:1;1082:15;850:257;-1:-1:-1;1134:1:1;1123:13;;793:349::o;1147:449::-;1306:2;1295:9;1288:21;1345:6;1340:2;1329:9;1325:18;1318:34;1402:6;1394;1389:2;1378:9;1374:18;1361:48;1458:1;1429:22;;;1453:2;1425:31;;;1418:42;;;;1512:2;1500:15;;;1517:66;1496:88;1481:104;1477:113;;1147:449;-1:-1:-1;1147:449:1:o;1832:288::-;1901:6;1954:2;1942:9;1933:7;1929:23;1925:32;1922:52;;;1970:1;1967;1960:12;1922:52;2002:9;1996:16;2052:18;2045:5;2041:30;2034:5;2031:41;2021:69;;2086:1;2083;2076:12;2021:69;2109:5;1832:288;-1:-1:-1;;;1832:288:1:o;4709:184::-;4779:6;4832:2;4820:9;4811:7;4807:23;4803:32;4800:52;;;4848:1;4845;4838:12;4800:52;-1:-1:-1;4871:16:1;;4709:184;-1:-1:-1;4709:184:1:o;5323:277::-;5390:6;5443:2;5431:9;5422:7;5418:23;5414:32;5411:52;;;5459:1;5456;5449:12;5411:52;5491:9;5485:16;5544:5;5537:13;5530:21;5523:5;5520:32;5510:60;;5566:1;5563;5556:12;5605:258;5677:1;5687:113;5701:6;5698:1;5695:13;5687:113;;;5777:11;;;5771:18;5758:11;;;5751:39;5723:2;5716:10;5687:113;;;5818:6;5815:1;5812:13;5809:48;;;5853:1;5844:6;5839:3;5835:16;5828:27;5809:48;;5605:258;;;:::o;5868:317::-;5910:3;5948:5;5942:12;5975:6;5970:3;5963:19;5991:63;6047:6;6040:4;6035:3;6031:14;6024:4;6017:5;6013:16;5991:63;:::i;:::-;6099:2;6087:15;6104:66;6083:88;6074:98;;;;6174:4;6070:109;;5868:317;-1:-1:-1;;5868:317:1:o;6190:493::-;6440:2;6429:9;6422:21;6403:4;6466:45;6507:2;6496:9;6492:18;6484:6;6466:45;:::i;:::-;6559:9;6551:6;6547:22;6542:2;6531:9;6527:18;6520:50;6594:2;6586:6;6579:18;6630:14;6625:2;6617:6;6613:15;6606:39;6674:2;6666:6;6662:15;6654:23;;;6190:493;;;;:::o;6688:184::-;6740:77;6737:1;6730:88;6837:4;6834:1;6827:15;6861:4;6858:1;6851:15;6877:334;6948:2;6942:9;7004:2;6994:13;;7009:66;6990:86;6978:99;;7107:18;7092:34;;7128:22;;;7089:62;7086:88;;;7154:18;;:::i;:::-;7190:2;7183:22;6877:334;;-1:-1:-1;6877:334:1:o;7216:1801::-;7321:6;7352:2;7395;7383:9;7374:7;7370:23;7366:32;7363:52;;;7411:1;7408;7401:12;7363:52;7444:9;7438:16;7473:18;7514:2;7506:6;7503:14;7500:34;;;7530:1;7527;7520:12;7500:34;7568:6;7557:9;7553:22;7543:32;;7594:4;7634:7;7629:2;7625;7621:11;7617:25;7607:53;;7656:1;7653;7646:12;7607:53;7685:2;7679:9;7707:2;7703;7700:10;7697:36;;;7713:18;;:::i;:::-;7759:2;7756:1;7752:10;7782:28;7806:2;7802;7798:11;7782:28;:::i;:::-;7844:15;;;7914:11;;;7910:20;;;7875:12;;;;7942:19;;;7939:39;;;7974:1;7971;7964:12;7939:39;8006:2;8002;7998:11;7987:22;;8018:969;8034:6;8029:3;8026:15;8018:969;;;8113:3;8107:10;8149:2;8136:11;8133:19;8130:109;;;8193:1;8222:2;8218;8211:14;8130:109;8262:20;;8317:2;8309:11;;8305:25;-1:-1:-1;8295:123:1;;8372:1;8401:2;8397;8390:14;8295:123;8456:2;8452;8448:11;8442:18;8484:2;8510;8505:3;8502:11;8499:37;;;8516:18;;:::i;:::-;8562:111;8669:2;8600:66;8595:2;8590:3;8586:12;8582:85;8578:94;8562:111;:::i;:::-;8700:3;8693:5;8686:18;8747:7;8741:3;8735;8731:2;8727:12;8723:22;8720:35;8717:128;;;8797:1;8827:3;8822;8815:16;8717:128;8858:56;8910:3;8905:2;8898:5;8894:14;8888:3;8884:2;8880:12;8858:56;:::i;:::-;8927:18;;-1:-1:-1;;;8051:12:1;;;;8965;;;;8018:969;;;9006:5;7216:1801;-1:-1:-1;;;;;;;;;;7216:1801:1:o;9022:184::-;9074:77;9071:1;9064:88;9171:4;9168:1;9161:15;9195:4;9192:1;9185:15;10583:220;10732:2;10721:9;10714:21;10695:4;10752:45;10793:2;10782:9;10778:18;10770:6;10752:45;:::i;10808:340::-;10985:2;10974:9;10967:21;10948:4;11005:45;11046:2;11035:9;11031:18;11023:6;11005:45;:::i;:::-;10997:53;;11098:42;11090:6;11086:55;11081:2;11070:9;11066:18;11059:83;10808:340;;;;;:::o;11153:291::-;11330:2;11319:9;11312:21;11293:4;11350:45;11391:2;11380:9;11376:18;11368:6;11350:45;:::i;:::-;11342:53;;11431:6;11426:2;11415:9;11411:18;11404:34;11153:291;;;;;:::o;11449:301::-;11620:2;11609:9;11602:21;11583:4;11640:45;11681:2;11670:9;11666:18;11658:6;11640:45;:::i;:::-;11632:53;;11735:6;11728:14;11721:22;11716:2;11705:9;11701:18;11694:50;11449:301;;;;;:::o;11755:546::-;12000:2;11989:9;11982:21;11963:4;12026:45;12067:2;12056:9;12052:18;12044:6;12026:45;:::i;:::-;12119:9;12111:6;12107:22;12102:2;12091:9;12087:18;12080:50;12153:33;12179:6;12171;12153:33;:::i;:::-;12139:47;;12234:9;12226:6;12222:22;12217:2;12206:9;12202:18;12195:50;12262:33;12288:6;12280;12262:33;:::i;:::-;12254:41;11755:546;-1:-1:-1;;;;;;11755:546:1:o","linkReferences":{}},"methodIdentifiers":{"call1(string)":"7e79255d","call2(string)":"8d3ef7ca","callPure(string)":"7f8b915c","counter()":"61bc221a","hello(string)":"a777d0dc","nested1(string)":"a76ccdfa","nested2(string)":"dbf1282f","run()":"c0406226","runBroadcast()":"bef03abc"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"call1\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"call2\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"callPure\",\"outputs\":[],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"counter\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"hello\",\"outputs\":[],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"nested1\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"nested2\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"run\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"runBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"title\":\"ScriptExample\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"hello(string)\":{\"notice\":\"example external function, to force a CALL, and test vm.startPrank with.\"},\"run()\":{\"notice\":\"example function, runs through basic cheat-codes and console logs.\"},\"runBroadcast()\":{\"notice\":\"example function, to test vm.broadcast with.\"}},\"notice\":\"ScriptExample is an example script. The Go forge script code tests that it can run this.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"ScriptExample\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3\",\"dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"call1"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"call2"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"pure","type":"function","name":"callPure"},{"inputs":[],"stateMutability":"view","type":"function","name":"counter","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"view","type":"function","name":"hello"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"nested1"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"nested2"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"run"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"runBroadcast"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{"hello(string)":{"notice":"example external function, to force a CALL, and test vm.startPrank with."},"run()":{"notice":"example function, runs through basic cheat-codes and console logs."},"runBroadcast()":{"notice":"example function, to test vm.broadcast with."}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"ScriptExample"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d","urls":["bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3","dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[{"astId":215,"contract":"scripts/ScriptExample.s.sol:ScriptExample","label":"counter","offset":0,"slot":"0","type":"t_uint256"}],"types":{"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}},"userdoc":{"version":1,"kind":"user","methods":{"hello(string)":{"notice":"example external function, to force a CALL, and test vm.startPrank with."},"run()":{"notice":"example function, runs through basic cheat-codes and console logs."},"runBroadcast()":{"notice":"example function, to test vm.broadcast with."}},"notice":"ScriptExample is an example script. The Go forge script code tests that it can run this."},"devdoc":{"version":1,"kind":"dev","title":"ScriptExample"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":720,"exportedSymbols":{"FooBar":[719],"ScriptExample":[706],"Vm":[55],"console":[192]},"nodeType":"SourceUnit","src":"32:5967:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":55,"nodeType":"ContractDefinition","src":"120:616:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":55,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[55],"name":"Vm","nameLocation":"130:2:0","scope":720,"usedErrors":[]},{"id":192,"nodeType":"ContractDefinition","src":"791:1622:0","nodes":[{"id":61,"nodeType":"VariableDeclaration","src":"813:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"830:15:0","scope":192,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":56,"name":"address","nodeType":"ElementaryTypeName","src":"813:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":59,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"856:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":58,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"848:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":57,"name":"address","nodeType":"ElementaryTypeName","src":"848:7:0","typeDescriptions":{}}},"id":60,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"848:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":78,"nodeType":"FunctionDefinition","src":"906:221:0","nodes":[],"body":{"id":77,"nodeType":"Block","src":"1065:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1084:37:0","statements":[{"nodeType":"YulAssignment","src":"1098:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1107:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1098:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":67,"isOffset":false,"isSlot":false,"src":"1107:4:0","valueSize":1},{"declaration":74,"isOffset":false,"isSlot":false,"src":"1098:5:0","valueSize":1}],"id":76,"nodeType":"InlineAssembly","src":"1075:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"915:25:0","parameters":{"id":68,"nodeType":"ParameterList","parameters":[{"constant":false,"id":67,"mutability":"mutable","name":"fnIn","nameLocation":"987:4:0","nodeType":"VariableDeclaration","scope":78,"src":"950:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":66,"nodeType":"FunctionTypeName","parameterTypes":{"id":64,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":66,"src":"959:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":62,"name":"bytes","nodeType":"ElementaryTypeName","src":"959:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"958:14:0"},"returnParameterTypes":{"id":65,"nodeType":"ParameterList","parameters":[],"src":"987:0:0"},"src":"950:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"940:57:0"},"returnParameters":{"id":75,"nodeType":"ParameterList","parameters":[{"constant":false,"id":74,"mutability":"mutable","name":"fnOut","nameLocation":"1058:5:0","nodeType":"VariableDeclaration","scope":78,"src":"1021:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":73,"nodeType":"FunctionTypeName","parameterTypes":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":73,"src":"1030:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":69,"name":"bytes","nodeType":"ElementaryTypeName","src":"1030:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1029:14:0"},"returnParameterTypes":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"1058:0:0"},"src":"1021:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1020:44:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":90,"nodeType":"FunctionDefinition","src":"1133:133:0","nodes":[],"body":{"id":89,"nodeType":"Block","src":"1194:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":86,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":80,"src":"1251:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":84,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1230:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":83,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":78,"src":"1204:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":85,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":87,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":88,"nodeType":"ExpressionStatement","src":"1204:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1142:15:0","parameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"payload","nameLocation":"1171:7:0","nodeType":"VariableDeclaration","scope":90,"src":"1158:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":79,"name":"bytes","nodeType":"ElementaryTypeName","src":"1158:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1157:22:0"},"returnParameters":{"id":82,"nodeType":"ParameterList","parameters":[],"src":"1194:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1272:380:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1336:316:0","nodes":[],"statements":[{"assignments":[96],"declarations":[{"constant":false,"id":96,"mutability":"mutable","name":"payloadLength","nameLocation":"1354:13:0","nodeType":"VariableDeclaration","scope":105,"src":"1346:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":95,"name":"uint256","nodeType":"ElementaryTypeName","src":"1346:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":99,"initialValue":{"expression":{"id":97,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":92,"src":"1370:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":98,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1370:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1346:38:0"},{"assignments":[101],"declarations":[{"constant":false,"id":101,"mutability":"mutable","name":"consoleAddress","nameLocation":"1402:14:0","nodeType":"VariableDeclaration","scope":105,"src":"1394:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":100,"name":"address","nodeType":"ElementaryTypeName","src":"1394:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":103,"initialValue":{"id":102,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":61,"src":"1419:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1394:40:0"},{"AST":{"nodeType":"YulBlock","src":"1496:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1510:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1534:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1543:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1530:3:0"},"nodeType":"YulFunctionCall","src":"1530:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1514:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1559:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1579:3:0"},"nodeType":"YulFunctionCall","src":"1579:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1586:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1602:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1616:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1631:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"1634:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1568:10:0"},"nodeType":"YulFunctionCall","src":"1568:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1563:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":101,"isOffset":false,"isSlot":false,"src":"1586:14:0","valueSize":1},{"declaration":92,"isOffset":false,"isSlot":false,"src":"1534:7:0","valueSize":1},{"declaration":96,"isOffset":false,"isSlot":false,"src":"1616:13:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1487:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1281:19:0","parameters":{"id":93,"nodeType":"ParameterList","parameters":[{"constant":false,"id":92,"mutability":"mutable","name":"payload","nameLocation":"1314:7:0","nodeType":"VariableDeclaration","scope":106,"src":"1301:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":91,"name":"bytes","nodeType":"ElementaryTypeName","src":"1301:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1300:22:0"},"returnParameters":{"id":94,"nodeType":"ParameterList","parameters":[],"src":"1336:0:0"},"scope":192,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":120,"nodeType":"FunctionDefinition","src":"1658:121:0","nodes":[],"body":{"id":119,"nodeType":"Block","src":"1703:76:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":114,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1753:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":115,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1768:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":112,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1729:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":113,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1729:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":116,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1729:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":111,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1713:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":117,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1713:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":118,"nodeType":"ExpressionStatement","src":"1713:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1667:3:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"p0","nameLocation":"1685:2:0","nodeType":"VariableDeclaration","scope":120,"src":"1671:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":107,"name":"string","nodeType":"ElementaryTypeName","src":"1671:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"1670:18:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":137,"nodeType":"FunctionDefinition","src":"1785:139:0","nodes":[],"body":{"id":136,"nodeType":"Block","src":"1839:85:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":130,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1889:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":131,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":122,"src":"1909:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":132,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":124,"src":"1913:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":128,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1865:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":129,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1865:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":133,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1865:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":127,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1849:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":134,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1849:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":135,"nodeType":"ExpressionStatement","src":"1849:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1794:3:0","parameters":{"id":125,"nodeType":"ParameterList","parameters":[{"constant":false,"id":122,"mutability":"mutable","name":"p0","nameLocation":"1812:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1798:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":121,"name":"string","nodeType":"ElementaryTypeName","src":"1798:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":124,"mutability":"mutable","name":"p1","nameLocation":"1821:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1816:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":123,"name":"bool","nodeType":"ElementaryTypeName","src":"1816:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"1797:27:0"},"returnParameters":{"id":126,"nodeType":"ParameterList","parameters":[],"src":"1839:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":154,"nodeType":"FunctionDefinition","src":"1930:145:0","nodes":[],"body":{"id":153,"nodeType":"Block","src":"1987:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":147,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2037:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":148,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":139,"src":"2060:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":149,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":141,"src":"2064:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":145,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2013:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":146,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2013:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":150,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2013:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":144,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1997:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":151,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1997:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":152,"nodeType":"ExpressionStatement","src":"1997:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1939:3:0","parameters":{"id":142,"nodeType":"ParameterList","parameters":[{"constant":false,"id":139,"mutability":"mutable","name":"p0","nameLocation":"1957:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1943:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":138,"name":"string","nodeType":"ElementaryTypeName","src":"1943:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":141,"mutability":"mutable","name":"p1","nameLocation":"1969:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1961:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":140,"name":"uint256","nodeType":"ElementaryTypeName","src":"1961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1942:30:0"},"returnParameters":{"id":143,"nodeType":"ParameterList","parameters":[],"src":"1987:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":171,"nodeType":"FunctionDefinition","src":"2081:145:0","nodes":[],"body":{"id":170,"nodeType":"Block","src":"2138:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":164,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2188:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":165,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":156,"src":"2211:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":166,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":158,"src":"2215:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":162,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2164:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":163,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2164:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":167,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2164:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":161,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2148:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":168,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2148:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":169,"nodeType":"ExpressionStatement","src":"2148:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2090:3:0","parameters":{"id":159,"nodeType":"ParameterList","parameters":[{"constant":false,"id":156,"mutability":"mutable","name":"p0","nameLocation":"2108:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2094:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":155,"name":"string","nodeType":"ElementaryTypeName","src":"2094:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":158,"mutability":"mutable","name":"p1","nameLocation":"2120:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2112:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":157,"name":"address","nodeType":"ElementaryTypeName","src":"2112:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2093:30:0"},"returnParameters":{"id":160,"nodeType":"ParameterList","parameters":[],"src":"2138:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":191,"nodeType":"FunctionDefinition","src":"2232:179:0","nodes":[],"body":{"id":190,"nodeType":"Block","src":"2313:98:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":183,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2363:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":184,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":173,"src":"2392:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":185,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":175,"src":"2396:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":186,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":177,"src":"2400:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":181,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2339:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":182,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2339:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":187,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2339:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":180,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2323:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":188,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2323:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":189,"nodeType":"ExpressionStatement","src":"2323:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2241:3:0","parameters":{"id":178,"nodeType":"ParameterList","parameters":[{"constant":false,"id":173,"mutability":"mutable","name":"p0","nameLocation":"2259:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2245:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":172,"name":"string","nodeType":"ElementaryTypeName","src":"2245:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":175,"mutability":"mutable","name":"p1","nameLocation":"2277:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2263:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":174,"name":"string","nodeType":"ElementaryTypeName","src":"2263:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":177,"mutability":"mutable","name":"p2","nameLocation":"2295:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2281:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":176,"name":"string","nodeType":"ElementaryTypeName","src":"2281:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2244:54:0"},"returnParameters":{"id":179,"nodeType":"ParameterList","parameters":[],"src":"2313:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[192],"name":"console","nameLocation":"799:7:0","scope":720,"usedErrors":[]},{"id":706,"nodeType":"ContractDefinition","src":"2541:3359:0","nodes":[{"id":207,"nodeType":"VariableDeclaration","src":"2571:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"2597:10:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":194,"name":"address","nodeType":"ElementaryTypeName","src":"2571:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":202,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2644:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":201,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"2634:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":203,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2634:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":200,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2626:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":199,"name":"uint256","nodeType":"ElementaryTypeName","src":"2626:7:0","typeDescriptions":{}}},"id":204,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2626:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":198,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2618:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":197,"name":"uint160","nodeType":"ElementaryTypeName","src":"2618:7:0","typeDescriptions":{}}},"id":205,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2618:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":196,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2610:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":195,"name":"address","nodeType":"ElementaryTypeName","src":"2610:7:0","typeDescriptions":{}}},"id":206,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2610:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":213,"nodeType":"VariableDeclaration","src":"2671:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"2692:2:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"},"typeName":{"id":209,"nodeType":"UserDefinedTypeName","pathNode":{"id":208,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":55,"src":"2671:2:0"},"referencedDeclaration":55,"src":"2671:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"value":{"arguments":[{"id":211,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":207,"src":"2700:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":210,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":55,"src":"2697:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$55_$","typeString":"type(contract Vm)"}},"id":212,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2697:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"visibility":"internal"},{"id":215,"nodeType":"VariableDeclaration","src":"2775:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"2790:7:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":214,"name":"uint256","nodeType":"ElementaryTypeName","src":"2775:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":378,"nodeType":"FunctionDefinition","src":"2887:949:0","nodes":[],"body":{"id":377,"nodeType":"Block","src":"2909:927:0","nodes":[],"statements":[{"assignments":[220],"declarations":[{"constant":false,"id":220,"mutability":"mutable","name":"x","nameLocation":"2924:1:0","nodeType":"VariableDeclaration","scope":377,"src":"2919:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":219,"name":"bool","nodeType":"ElementaryTypeName","src":"2919:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":226,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":223,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2937:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":224,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"2953:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":221,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"2928:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":222,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"2928:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":225,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2928:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"2919:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2981:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":231,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3004:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":227,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"2969:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":229,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":137,"src":"2969:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":232,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2969:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":233,"nodeType":"ExpressionStatement","src":"2969:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":237,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3029:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":240,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3054:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":239,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3046:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":238,"name":"address","nodeType":"ElementaryTypeName","src":"3046:7:0","typeDescriptions":{}}},"id":241,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3046:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":234,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3017:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":236,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3017:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":242,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3017:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":243,"nodeType":"ExpressionStatement","src":"3017:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":247,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3082:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":252,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3120:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":251,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3112:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":250,"name":"address","nodeType":"ElementaryTypeName","src":"3112:7:0","typeDescriptions":{}}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3112:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":248,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3100:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":249,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3100:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":254,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3100:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":244,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3070:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":246,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3070:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":255,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3070:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":256,"nodeType":"ExpressionStatement","src":"3070:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":260,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3149:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":263,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3172:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3172:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":262,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3164:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":261,"name":"address","nodeType":"ElementaryTypeName","src":"3164:7:0","typeDescriptions":{}}},"id":265,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3164:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":257,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3137:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":259,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3137:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":266,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3137:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":267,"nodeType":"ExpressionStatement","src":"3137:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":271,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3206:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":276,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3242:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3242:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":275,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3234:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":274,"name":"address","nodeType":"ElementaryTypeName","src":"3234:7:0","typeDescriptions":{}}},"id":278,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3234:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":272,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3222:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":273,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3222:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":279,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3222:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":268,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3194:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3194:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":280,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3194:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":281,"nodeType":"ExpressionStatement","src":"3194:61:0"},{"assignments":[283],"declarations":[{"constant":false,"id":283,"mutability":"mutable","name":"json","nameLocation":"3280:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3266:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":282,"name":"string","nodeType":"ElementaryTypeName","src":"3266:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":285,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":284,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3287:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3266:55:0"},{"assignments":[290],"declarations":[{"constant":false,"id":290,"mutability":"mutable","name":"keys","nameLocation":"3347:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3331:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":288,"name":"string","nodeType":"ElementaryTypeName","src":"3331:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":289,"nodeType":"ArrayTypeName","src":"3331:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":296,"initialValue":{"arguments":[{"id":293,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":283,"src":"3371:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":294,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3377:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":291,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3354:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3354:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":295,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3354:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3331:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":300,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3414:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":301,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3422:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":303,"indexExpression":{"hexValue":"30","id":302,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3427:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3422:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":304,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3431:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":306,"indexExpression":{"hexValue":"31","id":305,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3436:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3431:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":297,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3402:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":299,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":191,"src":"3402:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3402:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":308,"nodeType":"ExpressionStatement","src":"3402:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3461:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":309,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3450:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":311,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3450:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":313,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3450:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":314,"nodeType":"ExpressionStatement","src":"3450:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3517:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":321,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3509:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":320,"name":"uint160","nodeType":"ElementaryTypeName","src":"3509:7:0","typeDescriptions":{}}},"id":323,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":319,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3501:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":318,"name":"address","nodeType":"ElementaryTypeName","src":"3501:7:0","typeDescriptions":{}}},"id":324,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3501:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":315,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3487:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":317,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"3487:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":325,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3487:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":326,"nodeType":"ExpressionStatement","src":"3487:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3545:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":327,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3534:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":329,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3534:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":331,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3534:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":332,"nodeType":"ExpressionStatement","src":"3534:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":336,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3582:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":339,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3617:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":340,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3617:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":338,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3609:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":337,"name":"address","nodeType":"ElementaryTypeName","src":"3609:7:0","typeDescriptions":{}}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3609:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":333,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3570:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3570:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":342,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3570:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":343,"nodeType":"ExpressionStatement","src":"3570:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":347,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3651:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":350,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3689:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3681:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":348,"name":"address","nodeType":"ElementaryTypeName","src":"3681:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":344,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3639:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":346,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3639:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":352,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3639:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":353,"nodeType":"ExpressionStatement","src":"3639:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":357,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3716:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":354,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3705:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":356,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3705:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":358,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3705:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":359,"nodeType":"ExpressionStatement","src":"3705:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":360,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3741:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":362,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"3741:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3741:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":364,"nodeType":"ExpressionStatement","src":"3741:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":368,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3776:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":365,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3765:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":367,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3765:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3765:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":370,"nodeType":"ExpressionStatement","src":"3765:33:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":374,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3821:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":371,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3809:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":373,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"3809:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":375,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3809:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":376,"nodeType":"ExpressionStatement","src":"3809:20:0"}]},"documentation":{"id":216,"nodeType":"StructuredDocumentation","src":"2804:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"2896:3:0","parameters":{"id":217,"nodeType":"ParameterList","parameters":[],"src":"2899:2:0"},"returnParameters":{"id":218,"nodeType":"ParameterList","parameters":[],"src":"2909:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":609,"nodeType":"FunctionDefinition","src":"3903:1258:0","nodes":[],"body":{"id":608,"nodeType":"Block","src":"3934:1227:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3956:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":392,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3999:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":391,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3991:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":390,"name":"address","nodeType":"ElementaryTypeName","src":"3991:7:0","typeDescriptions":{}}},"id":393,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3991:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3979:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":389,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3979:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":394,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3979:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":387,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3971:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":386,"name":"uint256","nodeType":"ElementaryTypeName","src":"3971:7:0","typeDescriptions":{}}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3971:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":382,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3944:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3944:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":396,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3944:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":397,"nodeType":"ExpressionStatement","src":"3944:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":401,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4030:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":398,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4018:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":400,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4018:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":402,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4018:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":403,"nodeType":"ExpressionStatement","src":"4018:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":404,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4057:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":406,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"4057:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":407,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4057:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":408,"nodeType":"ExpressionStatement","src":"4057:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4092:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":409,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4081:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":411,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4081:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":413,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4081:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":414,"nodeType":"ExpressionStatement","src":"4081:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":418,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4128:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":415,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4117:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":417,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4117:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4117:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":420,"nodeType":"ExpressionStatement","src":"4117:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":424,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4166:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":421,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4154:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":423,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4154:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":425,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4154:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":426,"nodeType":"ExpressionStatement","src":"4154:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":434,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4231:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":433,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4223:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":432,"name":"uint160","nodeType":"ElementaryTypeName","src":"4223:7:0","typeDescriptions":{}}},"id":435,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4223:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":431,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4215:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":430,"name":"address","nodeType":"ElementaryTypeName","src":"4215:7:0","typeDescriptions":{}}},"id":436,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4215:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":427,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4197:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":429,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4197:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":437,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4197:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":438,"nodeType":"ExpressionStatement","src":"4197:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":442,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4263:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":439,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4252:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":441,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4252:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":443,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4252:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":444,"nodeType":"ExpressionStatement","src":"4252:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":448,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4302:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":445,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4291:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4291:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":449,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4291:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":450,"nodeType":"ExpressionStatement","src":"4291:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":454,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4344:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":451,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4330:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":705,"src":"4330:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":455,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4330:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":456,"nodeType":"ExpressionStatement","src":"4330:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":457,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4371:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":459,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4371:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":460,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4371:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":461,"nodeType":"ExpressionStatement","src":"4371:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":465,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4410:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":462,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4399:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":464,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4399:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":466,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4399:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":467,"nodeType":"ExpressionStatement","src":"4399:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":471,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4451:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":468,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4439:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":470,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4439:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4439:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":473,"nodeType":"ExpressionStatement","src":"4439:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":481,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4512:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":480,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4504:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":479,"name":"uint160","nodeType":"ElementaryTypeName","src":"4504:7:0","typeDescriptions":{}}},"id":482,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4504:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":478,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4496:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":477,"name":"address","nodeType":"ElementaryTypeName","src":"4496:7:0","typeDescriptions":{}}},"id":483,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4496:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":474,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4478:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":476,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4478:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4478:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":485,"nodeType":"ExpressionStatement","src":"4478:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":489,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4544:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":486,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4531:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":488,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":678,"src":"4531:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":490,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4531:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":491,"nodeType":"ExpressionStatement","src":"4531:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":492,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4563:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":494,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4563:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4563:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":496,"nodeType":"ExpressionStatement","src":"4563:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":500,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4604:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":497,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4592:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":499,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4592:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4592:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":502,"nodeType":"ExpressionStatement","src":"4592:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":510,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4665:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4657:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":508,"name":"uint160","nodeType":"ElementaryTypeName","src":"4657:7:0","typeDescriptions":{}}},"id":511,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":507,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4649:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":506,"name":"address","nodeType":"ElementaryTypeName","src":"4649:7:0","typeDescriptions":{}}},"id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4649:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":503,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4636:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":505,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4636:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":513,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4636:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":514,"nodeType":"ExpressionStatement","src":"4636:40:0"},{"assignments":[517],"declarations":[{"constant":false,"id":517,"mutability":"mutable","name":"x","nameLocation":"4693:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4686:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":516,"nodeType":"UserDefinedTypeName","pathNode":{"id":515,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4686:6:0"},"referencedDeclaration":719,"src":"4686:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":523,"initialValue":{"arguments":[{"hexValue":"31323334","id":521,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4708:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":520,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4697:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":519,"nodeType":"UserDefinedTypeName","pathNode":{"id":518,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4701:6:0"},"referencedDeclaration":719,"src":"4701:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":522,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4697:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4686:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":529,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":525,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":517,"src":"4731:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":526,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4731:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4731:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":528,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4742:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4731:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":524,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4723:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":530,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4723:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":531,"nodeType":"ExpressionStatement","src":"4723:24:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":535,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4770:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":532,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4758:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":534,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4758:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":536,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4758:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":537,"nodeType":"ExpressionStatement","src":"4758:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":545,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4820:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":544,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4812:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":543,"name":"uint160","nodeType":"ElementaryTypeName","src":"4812:7:0","typeDescriptions":{}}},"id":546,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4812:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":542,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4804:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":541,"name":"address","nodeType":"ElementaryTypeName","src":"4804:7:0","typeDescriptions":{}}},"id":547,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4804:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":538,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4791:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":540,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4791:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4791:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":549,"nodeType":"ExpressionStatement","src":"4791:38:0"},{"assignments":[552],"declarations":[{"constant":false,"id":552,"mutability":"mutable","name":"y","nameLocation":"4846:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4839:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":551,"nodeType":"UserDefinedTypeName","pathNode":{"id":550,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4839:6:0"},"referencedDeclaration":719,"src":"4839:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":566,"initialValue":{"arguments":[{"hexValue":"31323334","id":564,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4889:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":555,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4850:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":554,"nodeType":"UserDefinedTypeName","pathNode":{"id":553,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4854:6:0"},"referencedDeclaration":719,"src":"4854:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":563,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4883:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":559,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4875:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":558,"name":"uint256","nodeType":"ElementaryTypeName","src":"4875:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4875:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":557,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4867:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":556,"name":"bytes32","nodeType":"ElementaryTypeName","src":"4867:7:0","typeDescriptions":{}}},"id":562,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4867:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"4850:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":565,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4850:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4839:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":568,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":552,"src":"4912:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":569,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4912:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":570,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4912:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":571,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4923:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4912:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":567,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4904:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4904:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"4904:24:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4950:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4938:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4938:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4938:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"4938:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5042:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5042:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":584,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5042:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":585,"nodeType":"ExpressionStatement","src":"5042:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5077:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":588,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5066:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":587,"nodeType":"UserDefinedTypeName","pathNode":{"id":586,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"5070:6:0"},"referencedDeclaration":719,"src":"5070:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":590,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5066:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":591,"nodeType":"ExpressionStatement","src":"5066:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":595,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5105:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":602,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5146:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":601,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5138:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":600,"name":"address","nodeType":"ElementaryTypeName","src":"5138:7:0","typeDescriptions":{}}},"id":603,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5138:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":598,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5126:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":599,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5126:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5126:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":597,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5118:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":596,"name":"uint256","nodeType":"ElementaryTypeName","src":"5118:7:0","typeDescriptions":{}}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5118:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":592,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5093:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":594,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"5093:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":606,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5093:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":607,"nodeType":"ExpressionStatement","src":"5093:61:0"}]},"documentation":{"id":379,"nodeType":"StructuredDocumentation","src":"3842:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"3912:12:0","parameters":{"id":380,"nodeType":"ParameterList","parameters":[],"src":"3924:2:0"},"returnParameters":{"id":381,"nodeType":"ParameterList","parameters":[],"src":"3934:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":633,"nodeType":"FunctionDefinition","src":"5256:143:0","nodes":[],"body":{"id":632,"nodeType":"Block","src":"5305:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":618,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":612,"src":"5327:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":615,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5315:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":617,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5315:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5315:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":620,"nodeType":"ExpressionStatement","src":"5315:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5352:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":627,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"5380:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":628,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"5380:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":626,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5372:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":625,"name":"address","nodeType":"ElementaryTypeName","src":"5372:7:0","typeDescriptions":{}}},"id":629,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5372:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":621,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5340:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":623,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"5340:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":630,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5340:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":631,"nodeType":"ExpressionStatement","src":"5340:52:0"}]},"documentation":{"id":610,"nodeType":"StructuredDocumentation","src":"5167:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"5265:5:0","parameters":{"id":613,"nodeType":"ParameterList","parameters":[{"constant":false,"id":612,"mutability":"mutable","name":"_v","nameLocation":"5287:2:0","nodeType":"VariableDeclaration","scope":633,"src":"5271:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":611,"name":"string","nodeType":"ElementaryTypeName","src":"5271:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5270:20:0"},"returnParameters":{"id":614,"nodeType":"ParameterList","parameters":[],"src":"5305:0:0"},"scope":706,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":648,"nodeType":"FunctionDefinition","src":"5405:95:0","nodes":[],"body":{"id":647,"nodeType":"Block","src":"5449:51:0","nodes":[],"statements":[{"expression":{"id":639,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5459:9:0","subExpression":{"id":638,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5459:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":640,"nodeType":"ExpressionStatement","src":"5459:9:0"},{"expression":{"arguments":[{"id":644,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":635,"src":"5490:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":641,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5478:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":643,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5478:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":645,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5478:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":646,"nodeType":"ExpressionStatement","src":"5478:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"5414:5:0","parameters":{"id":636,"nodeType":"ParameterList","parameters":[{"constant":false,"id":635,"mutability":"mutable","name":"_v","nameLocation":"5436:2:0","nodeType":"VariableDeclaration","scope":648,"src":"5420:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":634,"name":"string","nodeType":"ElementaryTypeName","src":"5420:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5419:20:0"},"returnParameters":{"id":637,"nodeType":"ParameterList","parameters":[],"src":"5449:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":663,"nodeType":"FunctionDefinition","src":"5506:95:0","nodes":[],"body":{"id":662,"nodeType":"Block","src":"5550:51:0","nodes":[],"statements":[{"expression":{"id":654,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5560:9:0","subExpression":{"id":653,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5560:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":655,"nodeType":"ExpressionStatement","src":"5560:9:0"},{"expression":{"arguments":[{"id":659,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":650,"src":"5591:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":656,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5579:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":658,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5579:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":660,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5579:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":661,"nodeType":"ExpressionStatement","src":"5579:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"5515:5:0","parameters":{"id":651,"nodeType":"ParameterList","parameters":[{"constant":false,"id":650,"mutability":"mutable","name":"_v","nameLocation":"5537:2:0","nodeType":"VariableDeclaration","scope":663,"src":"5521:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":649,"name":"string","nodeType":"ElementaryTypeName","src":"5521:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5520:20:0"},"returnParameters":{"id":652,"nodeType":"ParameterList","parameters":[],"src":"5550:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":678,"nodeType":"FunctionDefinition","src":"5607:98:0","nodes":[],"body":{"id":677,"nodeType":"Block","src":"5653:52:0","nodes":[],"statements":[{"expression":{"id":669,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5663:9:0","subExpression":{"id":668,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5663:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":670,"nodeType":"ExpressionStatement","src":"5663:9:0"},{"expression":{"arguments":[{"id":674,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":665,"src":"5695:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":671,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5682:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":673,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":693,"src":"5682:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":675,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5682:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":676,"nodeType":"ExpressionStatement","src":"5682:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"5616:7:0","parameters":{"id":666,"nodeType":"ParameterList","parameters":[{"constant":false,"id":665,"mutability":"mutable","name":"_v","nameLocation":"5640:2:0","nodeType":"VariableDeclaration","scope":678,"src":"5624:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":664,"name":"string","nodeType":"ElementaryTypeName","src":"5624:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5623:20:0"},"returnParameters":{"id":667,"nodeType":"ParameterList","parameters":[],"src":"5653:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":693,"nodeType":"FunctionDefinition","src":"5711:97:0","nodes":[],"body":{"id":692,"nodeType":"Block","src":"5757:51:0","nodes":[],"statements":[{"expression":{"id":684,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5767:9:0","subExpression":{"id":683,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5767:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":685,"nodeType":"ExpressionStatement","src":"5767:9:0"},{"expression":{"arguments":[{"id":689,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":680,"src":"5798:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":686,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5786:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":688,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5786:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":690,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5786:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":691,"nodeType":"ExpressionStatement","src":"5786:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"5720:7:0","parameters":{"id":681,"nodeType":"ParameterList","parameters":[{"constant":false,"id":680,"mutability":"mutable","name":"_v","nameLocation":"5744:2:0","nodeType":"VariableDeclaration","scope":693,"src":"5728:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":679,"name":"string","nodeType":"ElementaryTypeName","src":"5728:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5727:20:0"},"returnParameters":{"id":682,"nodeType":"ParameterList","parameters":[],"src":"5757:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":705,"nodeType":"FunctionDefinition","src":"5814:84:0","nodes":[],"body":{"id":704,"nodeType":"Block","src":"5866:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":701,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":695,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":698,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5876:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":700,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5876:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":702,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5876:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":703,"nodeType":"ExpressionStatement","src":"5876:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"5823:8:0","parameters":{"id":696,"nodeType":"ParameterList","parameters":[{"constant":false,"id":695,"mutability":"mutable","name":"_v","nameLocation":"5848:2:0","nodeType":"VariableDeclaration","scope":705,"src":"5832:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":694,"name":"string","nodeType":"ElementaryTypeName","src":"5832:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5831:20:0"},"returnParameters":{"id":697,"nodeType":"ParameterList","parameters":[],"src":"5866:0:0"},"scope":706,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[719],"contractKind":"contract","documentation":{"id":193,"nodeType":"StructuredDocumentation","src":"2415:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[706],"name":"ScriptExample","nameLocation":"2550:13:0","scope":720,"usedErrors":[]},{"id":719,"nodeType":"ContractDefinition","src":"5902:96:0","nodes":[{"id":708,"nodeType":"VariableDeclaration","src":"5924:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"5939:3:0","scope":719,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":707,"name":"uint256","nodeType":"ElementaryTypeName","src":"5924:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":718,"nodeType":"FunctionDefinition","src":"5949:47:0","nodes":[],"body":{"id":717,"nodeType":"Block","src":"5972:24:0","nodes":[],"statements":[{"expression":{"id":715,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":713,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":708,"src":"5982:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":714,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":710,"src":"5988:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"5982:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":716,"nodeType":"ExpressionStatement","src":"5982:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":711,"nodeType":"ParameterList","parameters":[{"constant":false,"id":710,"mutability":"mutable","name":"v","nameLocation":"5969:1:0","nodeType":"VariableDeclaration","scope":718,"src":"5961:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":709,"name":"uint256","nodeType":"ElementaryTypeName","src":"5961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"5960:11:0"},"returnParameters":{"id":712,"nodeType":"ParameterList","parameters":[],"src":"5972:0:0"},"scope":719,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[719],"name":"FooBar","nameLocation":"5911:6:0","scope":720,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
+{"abi":[{"type":"function","name":"call1","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"call2","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"callPure","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"pure"},{"type":"function","name":"counter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"hello","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"view"},{"type":"function","name":"nested1","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"nested2","inputs":[{"name":"_v","type":"string","internalType":"string"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"run","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"runBroadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x608060405234801561001057600080fd5b506124b2806100206000396000f3fe608060405234801561001057600080fd5b50600436106100a35760003560e01c8063a76ccdfa11610076578063bef03abc1161005b578063bef03abc14610111578063c040622614610119578063dbf1282f146100c357600080fd5b8063a76ccdfa146100eb578063a777d0dc146100fe57600080fd5b806361bc221a146100a85780637e79255d146100c35780637f8b915c146100d85780638d3ef7ca146100c3575b600080fd5b6100b160005481565b60405190815260200160405180910390f35b6100d66100d1366004611e15565b610121565b005b6100d66100e6366004611e15565b610178565b6100d66100f9366004611e15565b6101b7565b6100d661010c366004611e15565b61023f565b6100d66102bd565b6100d661105f565b60008054908061013083611e87565b919050555061017482828080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611b0792505050565b5050565b61017482828080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611b0792505050565b6000805490806101c683611e87565b90915550506040517fdbf1282f000000000000000000000000000000000000000000000000000000008152309063dbf1282f906102099085908590600401611ee6565b600060405180830381600087803b15801561022357600080fd5b505af1158015610237573d6000803e3d6000fd5b505050505050565b61027e82828080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611b0792505050565b6101746040518060400160405280601081526020017f68656c6c6f206d73672e73656e6465720000000000000000000000000000000081525033611b99565b604080518082018252600b81527f6e6f6e6365207374617274000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526103909190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab906024015b602060405180830381865afa15801561035d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103819190611f33565b67ffffffffffffffff16611c2a565b6103ce6040518060400160405280600e81526020017f74657374696e672073696e676c65000000000000000000000000000000000000815250611b07565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561043957600080fd5b505af115801561044d573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3100000000000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156104d057600080fd5b505af11580156104e4573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3200000000000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561056757600080fd5b505af115801561057b573d6000803e3d6000fd5b505050506105bd6040518060400160405280601281526020017f74657374696e672073746172742f73746f700000000000000000000000000000815250611b07565b6040517f7fec2a8d00000000000000000000000000000000000000000000000000000000815262c0ffee6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b15801561062557600080fd5b505af1158015610639573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3100000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156106bc57600080fd5b505af11580156106d0573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3200000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561075357600080fd5b505af1158015610767573d6000803e3d6000fd5b50506040517f7f8b915c00000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f737461727473746f705f707572650000000000000000000000000000000000006044820152309250637f8b915c915060640160006040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561086b57600080fd5b505af115801561087f573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3300000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b15801561090257600080fd5b505af1158015610916573d6000803e3d6000fd5b505050506109586040518060400160405280600e81526020017f74657374696e67206e6573746564000000000000000000000000000000000000815250611b07565b6040517f7fec2a8d0000000000000000000000000000000000000000000000000000000081526112346004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b1580156109bf57600080fd5b505af11580156109d3573d6000803e3d6000fd5b50506040517fa76ccdfa00000000000000000000000000000000000000000000000000000000815260206004820152600660248201527f6e65737465640000000000000000000000000000000000000000000000000000604482015230925063a76ccdfa9150606401600060405180830381600087803b158015610a5657600080fd5b505af1158015610a6a573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610ad957600080fd5b505af1158015610aed573d6000803e3d6000fd5b50505050610b2f6040518060400160405280601381526020017f636f6e7472616374206465706c6f796d656e7400000000000000000000000000815250611b07565b6040517fe6962cdb000000000000000000000000000000000000000000000000000000008152621234566004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610b9757600080fd5b505af1158015610bab573d6000803e3d6000fd5b5050505060006104d2604051610bc090611e09565b908152602001604051809103906000f080158015610be2573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c549190611f64565b6104d214610ce9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323360448201527f340000000000000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b610d276040518060400160405280600881526020017f6372656174652032000000000000000000000000000000000000000000000000815250611b07565b6040517fe6962cdb00000000000000000000000000000000000000000000000000000000815261cafe6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610d8e57600080fd5b505af1158015610da2573d6000803e3d6000fd5b505050506000602a60001b6104d2604051610dbc90611e09565b9081526020018190604051809103906000f5905080158015610de2573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e549190611f64565b6104d214610ee4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602260248201527f466f6f4261723a20666f6f20696e2063726561746532206973206e6f7420313260448201527f33340000000000000000000000000000000000000000000000000000000000006064820152608401610ce0565b610f226040518060400160405280600581526020017f646f6e6521000000000000000000000000000000000000000000000000000000815250611b07565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610f8d57600080fd5b505af1158015610fa1573d6000803e3d6000fd5b505050506104d2604051610fb490611e09565b908152602001604051809103906000f080158015610fd6573d6000803e3d6000fd5b5050604080518082018252600981527f6e6f6e636520656e640000000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526101749190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b604080517f4777f3cf0000000000000000000000000000000000000000000000000000000081526004810191909152600c60448201527f4558414d504c455f424f4f4c0000000000000000000000000000000000000000606482015260006024820181905290737109709ecfa91a80626ff3989d68f67f5b1dd12d90634777f3cf90608401602060405180830381865afa158015611101573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111259190611f7d565b90506111666040518060400160405280601381526020017f626f6f6c2076616c75652066726f6d20656e760000000000000000000000000081525082611cbb565b6111a56040518060400160405280600d81526020017f636f6e747261637420616464720000000000000000000000000000000000000081525030611b99565b604080518082018252600e81527f636f6e7472616374206e6f6e6365000000000000000000000000000000000000602082015290517f2d0335ab00000000000000000000000000000000000000000000000000000000815230600482015261122c9190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b61126b6040518060400160405280600b81526020017f73656e646572206164647200000000000000000000000000000000000000000081525033611b99565b604080518082018252600c81527f73656e646572206e6f6e63650000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523360048201526112f29190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b60408051808201825260208082527f7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d9082015290517f213e4198000000000000000000000000000000000000000000000000000000008152600090737109709ecfa91a80626ff3989d68f67f5b1dd12d9063213e419890611377908590600401612019565b600060405180830381865afa158015611394573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526113da9190810190612156565b90506114506040518060400160405280600481526020017f6b65797300000000000000000000000000000000000000000000000000000000815250826000815181106114285761142861222e565b6020026020010151836001815181106114435761144361222e565b6020026020010151611d4c565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600d60248201527f66726f6d206f726967696e616c000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156114cd57600080fd5b505afa1580156114e1573d6000803e3d6000fd5b50506040517f06447d5600000000000000000000000000000000000000000000000000000000815260426004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d92506306447d569150602401600060405180830381600087803b15801561154b57600080fd5b505af115801561155f573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b20310000000000000000000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b1580156115e057600080fd5b505afa1580156115f4573d6000803e3d6000fd5b505050506116376040518060400160405280601781526020017f706172656e742073636f7065206d73672e73656e64657200000000000000000081525033611b99565b6116766040518060400160405280601a81526020017f706172656e742073636f706520636f6e74726163742e6164647200000000000081525030611b99565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b203200000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156116f357600080fd5b505afa158015611707573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166390c5013b6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561177657600080fd5b505af115801561178a573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f66726f6d206f726967696e616c20616761696e00000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b15801561180b57600080fd5b505afa15801561181f573d6000803e3d6000fd5b50506040517f3ebf73b400000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f5363726970744578616d706c652e732e736f6c3a4e6f6e63654765747465720060448201527f12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a2529250737109709ecfa91a80626ff3989d68f67f5b1dd12d915063b4d6c7829083908390633ebf73b490606401600060405180830381865afa1580156118e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016820160405261192b919081019061225d565b6040518363ffffffff1660e01b81526004016119489291906122ae565b600060405180830381600087803b15801561196257600080fd5b505af1158015611976573d6000803e3d6000fd5b50506040517fea06029100000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84166004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d925063ea0602919150602401600060405180830381600087803b1580156119f557600080fd5b505af1158015611a09573d6000803e3d6000fd5b50506040517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526000925073ffffffffffffffffffffffffffffffffffffffff84169150632d0335ab90602401602060405180830381865afa158015611a7a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a9e9190611f64565b9050611ac26040518060800160405280604281526020016124646042913982611c2a565b611b006040518060400160405280600581526020017f646f6e6521000000000000000000000000000000000000000000000000000000815250611b07565b5050505050565b611b9681604051602401611b1b91906122dd565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f41304fac00000000000000000000000000000000000000000000000000000000179052611de4565b50565b6101748282604051602401611baf9291906122f0565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f319af33300000000000000000000000000000000000000000000000000000000179052611de4565b6101748282604051602401611c40929190612328565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb60e72cc00000000000000000000000000000000000000000000000000000000179052611de4565b6101748282604051602401611cd192919061234a565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fc3b5563500000000000000000000000000000000000000000000000000000000179052611de4565b611ddf838383604051602401611d649392919061236e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f2ced7cef00000000000000000000000000000000000000000000000000000000179052611de4565b505050565b611b968180516a636f6e736f6c652e6c6f67602083016000808483855afa5050505050565b60b2806123b283390190565b60008060208385031215611e2857600080fd5b823567ffffffffffffffff80821115611e4057600080fd5b818501915085601f830112611e5457600080fd5b813581811115611e6357600080fd5b866020828501011115611e7557600080fd5b60209290920196919550909350505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611edf577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b5060010190565b60208152816020820152818360408301376000818301604090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b600060208284031215611f4557600080fd5b815167ffffffffffffffff81168114611f5d57600080fd5b9392505050565b600060208284031215611f7657600080fd5b5051919050565b600060208284031215611f8f57600080fd5b81518015158114611f5d57600080fd5b60005b83811015611fba578181015183820152602001611fa2565b83811115611fc9576000848401525b50505050565b60008151808452611fe7816020860160208601611f9f565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60408152600061202c6040830184611fcf565b8281036020840152600c81527f2e726f6f745f6b65795b305d000000000000000000000000000000000000000060208201526040810191505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156120e1576120e161206b565b604052919050565b600067ffffffffffffffff8311156121035761210361206b565b61213460207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8601160161209a565b905082815283838301111561214857600080fd5b611f5d836020830184611f9f565b6000602080838503121561216957600080fd5b825167ffffffffffffffff8082111561218157600080fd5b818501915085601f83011261219557600080fd5b8151818111156121a7576121a761206b565b8060051b6121b685820161209a565b91825283810185019185810190898411156121d057600080fd5b86860192505b83831015612221578251858111156121ee5760008081fd5b8601603f81018b136122005760008081fd5b6122118b89830151604084016120e9565b83525091860191908601906121d6565b9998505050505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60006020828403121561226f57600080fd5b815167ffffffffffffffff81111561228657600080fd5b8201601f8101841361229757600080fd5b6122a6848251602084016120e9565b949350505050565b73ffffffffffffffffffffffffffffffffffffffff831681526040602082015260006122a66040830184611fcf565b602081526000611f5d6020830184611fcf565b6040815260006123036040830185611fcf565b905073ffffffffffffffffffffffffffffffffffffffff831660208301529392505050565b60408152600061233b6040830185611fcf565b90508260208301529392505050565b60408152600061235d6040830185611fcf565b905082151560208301529392505050565b6060815260006123816060830186611fcf565b82810360208401526123938186611fcf565b905082810360408401526123a78185611fcf565b969550505050505056fe608060405234801561001057600080fd5b506040516100b23803806100b283398101604081905261002f91610037565b600055610050565b60006020828403121561004957600080fd5b5051919050565b60548061005e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000a6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683aa164736f6c634300080f000a","sourceMap":"3123:3912:0:-:0;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x608060405234801561001057600080fd5b50600436106100a35760003560e01c8063a76ccdfa11610076578063bef03abc1161005b578063bef03abc14610111578063c040622614610119578063dbf1282f146100c357600080fd5b8063a76ccdfa146100eb578063a777d0dc146100fe57600080fd5b806361bc221a146100a85780637e79255d146100c35780637f8b915c146100d85780638d3ef7ca146100c3575b600080fd5b6100b160005481565b60405190815260200160405180910390f35b6100d66100d1366004611e15565b610121565b005b6100d66100e6366004611e15565b610178565b6100d66100f9366004611e15565b6101b7565b6100d661010c366004611e15565b61023f565b6100d66102bd565b6100d661105f565b60008054908061013083611e87565b919050555061017482828080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611b0792505050565b5050565b61017482828080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611b0792505050565b6000805490806101c683611e87565b90915550506040517fdbf1282f000000000000000000000000000000000000000000000000000000008152309063dbf1282f906102099085908590600401611ee6565b600060405180830381600087803b15801561022357600080fd5b505af1158015610237573d6000803e3d6000fd5b505050505050565b61027e82828080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250611b0792505050565b6101746040518060400160405280601081526020017f68656c6c6f206d73672e73656e6465720000000000000000000000000000000081525033611b99565b604080518082018252600b81527f6e6f6e6365207374617274000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526103909190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab906024015b602060405180830381865afa15801561035d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103819190611f33565b67ffffffffffffffff16611c2a565b6103ce6040518060400160405280600e81526020017f74657374696e672073696e676c65000000000000000000000000000000000000815250611b07565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561043957600080fd5b505af115801561044d573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3100000000000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156104d057600080fd5b505af11580156104e4573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f73696e676c655f63616c6c3200000000000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561056757600080fd5b505af115801561057b573d6000803e3d6000fd5b505050506105bd6040518060400160405280601281526020017f74657374696e672073746172742f73746f700000000000000000000000000000815250611b07565b6040517f7fec2a8d00000000000000000000000000000000000000000000000000000000815262c0ffee6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b15801561062557600080fd5b505af1158015610639573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3100000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b1580156106bc57600080fd5b505af11580156106d0573d6000803e3d6000fd5b50506040517f8d3ef7ca00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3200000000000000000000000000000000006044820152309250638d3ef7ca9150606401600060405180830381600087803b15801561075357600080fd5b505af1158015610767573d6000803e3d6000fd5b50506040517f7f8b915c00000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f737461727473746f705f707572650000000000000000000000000000000000006044820152309250637f8b915c915060640160006040518083038186803b1580156107e857600080fd5b505afa1580156107fc573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561086b57600080fd5b505af115801561087f573d6000803e3d6000fd5b50506040517f7e79255d00000000000000000000000000000000000000000000000000000000815260206004820152600f60248201527f737461727473746f705f63616c6c3300000000000000000000000000000000006044820152309250637e79255d9150606401600060405180830381600087803b15801561090257600080fd5b505af1158015610916573d6000803e3d6000fd5b505050506109586040518060400160405280600e81526020017f74657374696e67206e6573746564000000000000000000000000000000000000815250611b07565b6040517f7fec2a8d0000000000000000000000000000000000000000000000000000000081526112346004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d90637fec2a8d90602401600060405180830381600087803b1580156109bf57600080fd5b505af11580156109d3573d6000803e3d6000fd5b50506040517fa76ccdfa00000000000000000000000000000000000000000000000000000000815260206004820152600660248201527f6e65737465640000000000000000000000000000000000000000000000000000604482015230925063a76ccdfa9150606401600060405180830381600087803b158015610a5657600080fd5b505af1158015610a6a573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166376eadd366040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610ad957600080fd5b505af1158015610aed573d6000803e3d6000fd5b50505050610b2f6040518060400160405280601381526020017f636f6e7472616374206465706c6f796d656e7400000000000000000000000000815250611b07565b6040517fe6962cdb000000000000000000000000000000000000000000000000000000008152621234566004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610b9757600080fd5b505af1158015610bab573d6000803e3d6000fd5b5050505060006104d2604051610bc090611e09565b908152602001604051809103906000f080158015610be2573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c549190611f64565b6104d214610ce9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602160248201527f466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323360448201527f340000000000000000000000000000000000000000000000000000000000000060648201526084015b60405180910390fd5b610d276040518060400160405280600881526020017f6372656174652032000000000000000000000000000000000000000000000000815250611b07565b6040517fe6962cdb00000000000000000000000000000000000000000000000000000000815261cafe6004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d9063e6962cdb90602401600060405180830381600087803b158015610d8e57600080fd5b505af1158015610da2573d6000803e3d6000fd5b505050506000602a60001b6104d2604051610dbc90611e09565b9081526020018190604051809103906000f5905080158015610de2573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff1663c29855786040518163ffffffff1660e01b8152600401602060405180830381865afa158015610e30573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e549190611f64565b6104d214610ee4576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602260248201527f466f6f4261723a20666f6f20696e2063726561746532206973206e6f7420313260448201527f33340000000000000000000000000000000000000000000000000000000000006064820152608401610ce0565b610f226040518060400160405280600581526020017f646f6e6521000000000000000000000000000000000000000000000000000000815250611b07565b7f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff1663afc980406040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610f8d57600080fd5b505af1158015610fa1573d6000803e3d6000fd5b505050506104d2604051610fb490611e09565b908152602001604051809103906000f080158015610fd6573d6000803e3d6000fd5b5050604080518082018252600981527f6e6f6e636520656e640000000000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526101749190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b604080517f4777f3cf0000000000000000000000000000000000000000000000000000000081526004810191909152600c60448201527f4558414d504c455f424f4f4c0000000000000000000000000000000000000000606482015260006024820181905290737109709ecfa91a80626ff3989d68f67f5b1dd12d90634777f3cf90608401602060405180830381865afa158015611101573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111259190611f7d565b90506111666040518060400160405280601381526020017f626f6f6c2076616c75652066726f6d20656e760000000000000000000000000081525082611cbb565b6111a56040518060400160405280600d81526020017f636f6e747261637420616464720000000000000000000000000000000000000081525030611b99565b604080518082018252600e81527f636f6e7472616374206e6f6e6365000000000000000000000000000000000000602082015290517f2d0335ab00000000000000000000000000000000000000000000000000000000815230600482015261122c9190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b61126b6040518060400160405280600b81526020017f73656e646572206164647200000000000000000000000000000000000000000081525033611b99565b604080518082018252600c81527f73656e646572206e6f6e63650000000000000000000000000000000000000000602082015290517f2d0335ab0000000000000000000000000000000000000000000000000000000081523360048201526112f29190737109709ecfa91a80626ff3989d68f67f5b1dd12d90632d0335ab90602401610340565b60408051808201825260208082527f7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d9082015290517f213e4198000000000000000000000000000000000000000000000000000000008152600090737109709ecfa91a80626ff3989d68f67f5b1dd12d9063213e419890611377908590600401612019565b600060405180830381865afa158015611394573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe01682016040526113da9190810190612156565b90506114506040518060400160405280600481526020017f6b65797300000000000000000000000000000000000000000000000000000000815250826000815181106114285761142861222e565b6020026020010151836001815181106114435761144361222e565b6020026020010151611d4c565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600d60248201527f66726f6d206f726967696e616c000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156114cd57600080fd5b505afa1580156114e1573d6000803e3d6000fd5b50506040517f06447d5600000000000000000000000000000000000000000000000000000000815260426004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d92506306447d569150602401600060405180830381600087803b15801561154b57600080fd5b505af115801561155f573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b20310000000000000000000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b1580156115e057600080fd5b505afa1580156115f4573d6000803e3d6000fd5b505050506116376040518060400160405280601781526020017f706172656e742073636f7065206d73672e73656e64657200000000000000000081525033611b99565b6116766040518060400160405280601a81526020017f706172656e742073636f706520636f6e74726163742e6164647200000000000081525030611b99565b6040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152600c60248201527f66726f6d207072616e6b203200000000000000000000000000000000000000006044820152309063a777d0dc9060640160006040518083038186803b1580156116f357600080fd5b505afa158015611707573d6000803e3d6000fd5b505050507f885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d60001c73ffffffffffffffffffffffffffffffffffffffff166390c5013b6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561177657600080fd5b505af115801561178a573d6000803e3d6000fd5b50506040517fa777d0dc00000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f66726f6d206f726967696e616c20616761696e00000000000000000000000000604482015230925063a777d0dc915060640160006040518083038186803b15801561180b57600080fd5b505afa15801561181f573d6000803e3d6000fd5b50506040517f3ebf73b400000000000000000000000000000000000000000000000000000000815260206004820152601f60248201527f5363726970744578616d706c652e732e736f6c3a4e6f6e63654765747465720060448201527f12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a2529250737109709ecfa91a80626ff3989d68f67f5b1dd12d915063b4d6c7829083908390633ebf73b490606401600060405180830381865afa1580156118e5573d6000803e3d6000fd5b505050506040513d6000823e601f3d9081017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016820160405261192b919081019061225d565b6040518363ffffffff1660e01b81526004016119489291906122ae565b600060405180830381600087803b15801561196257600080fd5b505af1158015611976573d6000803e3d6000fd5b50506040517fea06029100000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff84166004820152737109709ecfa91a80626ff3989d68f67f5b1dd12d925063ea0602919150602401600060405180830381600087803b1580156119f557600080fd5b505af1158015611a09573d6000803e3d6000fd5b50506040517f2d0335ab0000000000000000000000000000000000000000000000000000000081523060048201526000925073ffffffffffffffffffffffffffffffffffffffff84169150632d0335ab90602401602060405180830381865afa158015611a7a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a9e9190611f64565b9050611ac26040518060800160405280604281526020016124646042913982611c2a565b611b006040518060400160405280600581526020017f646f6e6521000000000000000000000000000000000000000000000000000000815250611b07565b5050505050565b611b9681604051602401611b1b91906122dd565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f41304fac00000000000000000000000000000000000000000000000000000000179052611de4565b50565b6101748282604051602401611baf9291906122f0565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f319af33300000000000000000000000000000000000000000000000000000000179052611de4565b6101748282604051602401611c40929190612328565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fb60e72cc00000000000000000000000000000000000000000000000000000000179052611de4565b6101748282604051602401611cd192919061234a565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167fc3b5563500000000000000000000000000000000000000000000000000000000179052611de4565b611ddf838383604051602401611d649392919061236e565b604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08184030181529190526020810180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f2ced7cef00000000000000000000000000000000000000000000000000000000179052611de4565b505050565b611b968180516a636f6e736f6c652e6c6f67602083016000808483855afa5050505050565b60b2806123b283390190565b60008060208385031215611e2857600080fd5b823567ffffffffffffffff80821115611e4057600080fd5b818501915085601f830112611e5457600080fd5b813581811115611e6357600080fd5b866020828501011115611e7557600080fd5b60209290920196919550909350505050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203611edf577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b5060010190565b60208152816020820152818360408301376000818301604090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b600060208284031215611f4557600080fd5b815167ffffffffffffffff81168114611f5d57600080fd5b9392505050565b600060208284031215611f7657600080fd5b5051919050565b600060208284031215611f8f57600080fd5b81518015158114611f5d57600080fd5b60005b83811015611fba578181015183820152602001611fa2565b83811115611fc9576000848401525b50505050565b60008151808452611fe7816020860160208601611f9f565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b60408152600061202c6040830184611fcf565b8281036020840152600c81527f2e726f6f745f6b65795b305d000000000000000000000000000000000000000060208201526040810191505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff811182821017156120e1576120e161206b565b604052919050565b600067ffffffffffffffff8311156121035761210361206b565b61213460207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8601160161209a565b905082815283838301111561214857600080fd5b611f5d836020830184611f9f565b6000602080838503121561216957600080fd5b825167ffffffffffffffff8082111561218157600080fd5b818501915085601f83011261219557600080fd5b8151818111156121a7576121a761206b565b8060051b6121b685820161209a565b91825283810185019185810190898411156121d057600080fd5b86860192505b83831015612221578251858111156121ee5760008081fd5b8601603f81018b136122005760008081fd5b6122118b89830151604084016120e9565b83525091860191908601906121d6565b9998505050505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60006020828403121561226f57600080fd5b815167ffffffffffffffff81111561228657600080fd5b8201601f8101841361229757600080fd5b6122a6848251602084016120e9565b949350505050565b73ffffffffffffffffffffffffffffffffffffffff831681526040602082015260006122a66040830184611fcf565b602081526000611f5d6020830184611fcf565b6040815260006123036040830185611fcf565b905073ffffffffffffffffffffffffffffffffffffffff831660208301529392505050565b60408152600061233b6040830185611fcf565b90508260208301529392505050565b60408152600061235d6040830185611fcf565b905082151560208301529392505050565b6060815260006123816060830186611fcf565b82810360208401526123938186611fcf565b905082810360408401526123a78185611fcf565b969550505050505056fe608060405234801561001057600080fd5b506040516100b23803806100b283398101604081905261002f91610037565b600055610050565b60006020828403121561004957600080fd5b5051919050565b60548061005e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063c298557814602d575b600080fd5b603560005481565b60405190815260200160405180910390f3fea164736f6c634300080f000a6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683aa164736f6c634300080f000a","sourceMap":"3123:3912:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3356:22;;;;;;;;;160:25:1;;;148:2;133:18;3356:22:0;;;;;;;6540:95;;;;;;:::i;:::-;;:::i;:::-;;6949:84;;;;;;:::i;:::-;;:::i;6742:98::-;;;;;;:::i;:::-;;:::i;6391:143::-;;;;;;:::i;:::-;;:::i;4963:1333::-;;;:::i;3468:1428::-;;;:::i;6540:95::-;6594:7;:9;;;:7;:9;;;:::i;:::-;;;;;;6613:15;6625:2;;6613:15;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;6613:11:0;;-1:-1:-1;;;6613:15:0:i;:::-;6540:95;;:::o;6949:84::-;7011:15;7023:2;;7011:15;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;7011:11:0;;-1:-1:-1;;;7011:15:0:i;6742:98::-;6798:7;:9;;;:7;:9;;;:::i;:::-;;;;-1:-1:-1;;6817:16:0;;;;;:4;;:12;;:16;;6830:2;;;;6817:16;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6742:98;;:::o;6391:143::-;6450:15;6462:2;;6450:15;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;6450:11:0;;-1:-1:-1;;;6450:15:0:i;:::-;6475:52;;;;;;;;;;;;;;;;;;6515:10;6475:11;:52::i;4963:1333::-;5004:63;;;;;;;;;;;;;;;;5039:26;;;;;5059:4;5039:26;;;1747:74:1;5004:63:0;;;5039:11;;;;1720:18:1;;5039:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;5031:35;;5004:11;:63::i;:::-;5078:29;;;;;;;;;;;;;;;;;;:11;:29::i;:::-;3215:28;3207:37;;5117:12;;;:14;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5141:26:0;;;;;2327:2:1;5141:26:0;;;2309:21:1;2366:2;2346:18;;;2339:30;2405:14;2385:18;;;2378:42;5141:4:0;;-1:-1:-1;5141:10:0;;-1:-1:-1;2437:18:1;;5141:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5177:26:0;;;;;2668:2:1;5177:26:0;;;2650:21:1;2707:2;2687:18;;;2680:30;2746:14;2726:18;;;2719:42;5177:4:0;;-1:-1:-1;5177:10:0;;-1:-1:-1;2778:18:1;;5177:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5214:33;;;;;;;;;;;;;;;;;;:11;:33::i;:::-;5257:45;;;;;5291:8;5257:45;;;1747:74:1;5257:17:0;;;;1720:18:1;;5257:45:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5312:29:0;;;;;3009:2:1;5312:29:0;;;2991:21:1;3048:2;3028:18;;;3021:30;3087:17;3067:18;;;3060:45;5312:4:0;;-1:-1:-1;5312:10:0;;-1:-1:-1;3122:18:1;;5312:29:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5351:29:0;;;;;3353:2:1;5351:29:0;;;3335:21:1;3392:2;3372:18;;;3365:30;3431:17;3411:18;;;3404:45;5351:4:0;;-1:-1:-1;5351:10:0;;-1:-1:-1;3466:18:1;;5351:29:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5390:31:0;;;;;3697:2:1;5390:31:0;;;3679:21:1;3736:2;3716:18;;;3709:30;3775:16;3755:18;;;3748:44;5390:4:0;;-1:-1:-1;5390:13:0;;-1:-1:-1;3809:18:1;;5390:31:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3215:28;3207:37;;5431:16;;;:18;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5459:29:0;;;;;4040:2:1;5459:29:0;;;4022:21:1;4079:2;4059:18;;;4052:30;4118:17;4098:18;;;4091:45;5459:4:0;;-1:-1:-1;5459:10:0;;-1:-1:-1;4153:18:1;;5459:29:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5499;;;;;;;;;;;;;;;;;;:11;:29::i;:::-;5538:43;;;;;5572:6;5538:43;;;1747:74:1;5538:17:0;;;;1720:18:1;;5538:43:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;5591:22:0;;;;;4384:2:1;5591:22:0;;;4366:21:1;4423:1;4403:18;;;4396:29;4461:8;4441:18;;;4434:36;5591:4:0;;-1:-1:-1;5591:12:0;;-1:-1:-1;4487:18:1;;5591:22:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3215:28;3207:37;;5623:16;;;:18;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5652:34;;;;;;;;;;;;;;;;;;:11;:34::i;:::-;5696:40;;;;;5725:8;5696:40;;;1747:74:1;5696:12:0;;;;1720:18:1;;5696:40:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5746:8;5768:4;5757:16;;;;;:::i;:::-;160:25:1;;;148:2;133:18;5757:16:0;;;;;;;;;;;;;;;;;;;;;;;5746:27;;5791:1;:5;;;:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;5802:4;5791:15;5783:61;;;;;;;5100:2:1;5783:61:0;;;5082:21:1;5139:2;5119:18;;;5112:30;5178:34;5158:18;;;5151:62;5249:3;5229:18;;;5222:31;5270:19;;5783:61:0;;;;;;;;;5855:23;;;;;;;;;;;;;;;;;;:11;:23::i;:::-;5888:38;;;;;5917:6;5888:38;;;1747:74:1;5888:12:0;;;;1720:18:1;;5888:38:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5936:8;5980:2;5964:20;;5986:4;5947:44;;;;;:::i;:::-;160:25:1;;;148:2;133:18;5947:44:0;;;;;;;;;;;;;;;;;;;;;;;;;;;5936:55;;6009:1;:5;;;:7;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;6020:4;6009:15;6001:62;;;;;;;5502:2:1;6001:62:0;;;5484:21:1;5541:2;5521:18;;;5514:30;5580:34;5560:18;;;5553:62;5651:4;5631:18;;;5624:32;5673:19;;6001:62:0;5300:398:1;6001:62:0;6073:20;;;;;;;;;;;;;;;;;;:11;:20::i;:::-;3215:28;3207:37;;6177:12;;;:14;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6212:4;6201:16;;;;;:::i;:::-;160:25:1;;;148:2;133:18;6201:16:0;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;6228:61:0;;;;;;;;;;;;;;;;6261:26;;;;;6281:4;6261:26;;;1747:74:1;6228:61:0;;;6261:11;;;;1720:18:1;;6261:26:0;1601:226:1;3468:1428:0;3509:31;;;;;;;;;5909:21:1;;;;5966:2;5946:18;;;5939:30;6005:14;5985:18;;;5978:42;3500:6:0;6072:20:1;;;6065:52;;;3500:6:0;3509:8;;;;6037:19:1;;3509:31:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;3500:40;;3550:37;;;;;;;;;;;;;;;;;;3585:1;3550:11;:37::i;:::-;3598:43;;;;;;;;;;;;;;;;;;3635:4;3598:11;:43::i;:::-;3651:57;;;;;;;;;;;;;;;;3681:26;;;;;3701:4;3681:26;;;1747:74:1;3651:57:0;;;3681:11;;;;1720:18:1;;3681:26:0;1601:226:1;3651:57:0;3718:47;;;;;;;;;;;;;;;;;;3753:10;3718:11;:47::i;:::-;3775:61;;;;;;;;;;;;;;;;3803:32;;;;;3823:10;3803:32;;;1747:74:1;3775:61:0;;;3803:11;;;;1720:18:1;;3803:32:0;1601:226:1;3775:61:0;3847:55;;;;;;;;;;;;;;;;;3935:38;;;;;3847:18;;3935:16;;;;:38;;3847:55;;3935:38;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;3912:61;;3983:37;;;;;;;;;;;;;;;;;;4003:4;4008:1;4003:7;;;;;;;;:::i;:::-;;;;;;;4012:4;4017:1;4012:7;;;;;;;;:::i;:::-;;;;;;;3983:11;:37::i;:::-;4031:27;;;;;10225:2:1;4031:27:0;;;10207:21:1;10264:2;10244:18;;;10237:30;10303:15;10283:18;;;10276:43;4031:4:0;;:10;;10336:18:1;;4031:27:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4068:37:0;;;;;4098:4;4068:37;;;1747:74:1;4068:13:0;;-1:-1:-1;4068:13:0;;-1:-1:-1;1720:18:1;;4068:37:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4115:26:0;;;;;10567:2:1;4115:26:0;;;10549:21:1;10606:2;10586:18;;;10579:30;10645:14;10625:18;;;10618:42;4115:4:0;;-1:-1:-1;4115:10:0;;-1:-1:-1;10677:18:1;;4115:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4151:59;;;;;;;;;;;;;;;;;;4198:10;4151:11;:59::i;:::-;4220:56;;;;;;;;;;;;;;;;;;4270:4;4220:11;:56::i;:::-;4286:26;;;;;10908:2:1;4286:26:0;;;10890:21:1;10947:2;10927:18;;;10920:30;10986:14;10966:18;;;10959:42;4286:4:0;;:10;;11018:18:1;;4286:26:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;3215:28;3207:37;;4322:12;;;:14;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4346:33:0;;;;;11249:2:1;4346:33:0;;;11231:21:1;11288:2;11268:18;;;11261:30;11327:21;11307:18;;;11300:49;4346:4:0;;-1:-1:-1;4346:10:0;;-1:-1:-1;11366:18:1;;4346:33:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4593:53:0;;;;;11597:2:1;4593:53:0;;;11579:21:1;11636:2;11616:18;;;11609:30;11675:33;11655:18;;;11648:61;4521:35:0;;-1:-1:-1;4569:7:0;;-1:-1:-1;4569:7:0;;4521:35;;4569:7;;4593:18;;11726::1;;4593:53:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;4569:78;;;;;;;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4657:34:0;;;;;1777:42:1;1765:55;;4657:34:0;;;1747:74:1;4657:18:0;;-1:-1:-1;4657:18:0;;-1:-1:-1;1720:18:1;;4657:34:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;4713:51:0;;;;;4758:4;4713:51;;;1747:74:1;4701:9:0;;-1:-1:-1;4713:36:0;;;;-1:-1:-1;4713:36:0;;1720:18:1;;4713:51:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::i;:::-;4701:63;;4774:84;;;;;;;;;;;;;;;;;;4856:1;4774:11;:84::i;:::-;4869:20;;;;;;;;;;;;;;;;;;:11;:20::i;:::-;3490:1406;;;;;3468:1428::o;2025:164::-;2080:59;2135:2;2096:42;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;2080:15;:59::i;:::-;2025:164;:::o;2577:188::-;2644:71;2707:2;2711;2660:54;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;2644:15;:71::i;2383:188::-;2450:71;2513:2;2517;2466:54;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;2450:15;:71::i;2195:182::-;2259:68;2319:2;2323;2275:51;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;2259:15;:68::i;2771:222::-;2862:81;2931:2;2935;2939;2878:64;;;;;;;;;;:::i;:::-;;;;;;;;;;;;;;;;;;;;;;;;;2862:15;:81::i;:::-;2771:222;;;:::o;1500:133::-;1571:55;1618:7;1737:14;;1209:42;1910:2;1897:16;;1713:21;;1737:14;1897:16;1209:42;1946:5;1935:68;1926:77;;1863:150;;1639:380;:::o;-1:-1:-1:-;;;;;;;;:::o;196:592:1:-;267:6;275;328:2;316:9;307:7;303:23;299:32;296:52;;;344:1;341;334:12;296:52;384:9;371:23;413:18;454:2;446:6;443:14;440:34;;;470:1;467;460:12;440:34;508:6;497:9;493:22;483:32;;553:7;546:4;542:2;538:13;534:27;524:55;;575:1;572;565:12;524:55;615:2;602:16;641:2;633:6;630:14;627:34;;;657:1;654;647:12;627:34;702:7;697:2;688:6;684:2;680:15;676:24;673:37;670:57;;;723:1;720;713:12;670:57;754:2;746:11;;;;;776:6;;-1:-1:-1;196:592:1;;-1:-1:-1;;;;196:592:1:o;793:349::-;832:3;863:66;856:5;853:77;850:257;;963:77;960:1;953:88;1064:4;1061:1;1054:15;1092:4;1089:1;1082:15;850:257;-1:-1:-1;1134:1:1;1123:13;;793:349::o;1147:449::-;1306:2;1295:9;1288:21;1345:6;1340:2;1329:9;1325:18;1318:34;1402:6;1394;1389:2;1378:9;1374:18;1361:48;1458:1;1429:22;;;1453:2;1425:31;;;1418:42;;;;1512:2;1500:15;;;1517:66;1496:88;1481:104;1477:113;;1147:449;-1:-1:-1;1147:449:1:o;1832:288::-;1901:6;1954:2;1942:9;1933:7;1929:23;1925:32;1922:52;;;1970:1;1967;1960:12;1922:52;2002:9;1996:16;2052:18;2045:5;2041:30;2034:5;2031:41;2021:69;;2086:1;2083;2076:12;2021:69;2109:5;1832:288;-1:-1:-1;;;1832:288:1:o;4709:184::-;4779:6;4832:2;4820:9;4811:7;4807:23;4803:32;4800:52;;;4848:1;4845;4838:12;4800:52;-1:-1:-1;4871:16:1;;4709:184;-1:-1:-1;4709:184:1:o;6128:277::-;6195:6;6248:2;6236:9;6227:7;6223:23;6219:32;6216:52;;;6264:1;6261;6254:12;6216:52;6296:9;6290:16;6349:5;6342:13;6335:21;6328:5;6325:32;6315:60;;6371:1;6368;6361:12;6410:258;6482:1;6492:113;6506:6;6503:1;6500:13;6492:113;;;6582:11;;;6576:18;6563:11;;;6556:39;6528:2;6521:10;6492:113;;;6623:6;6620:1;6617:13;6614:48;;;6658:1;6649:6;6644:3;6640:16;6633:27;6614:48;;6410:258;;;:::o;6673:317::-;6715:3;6753:5;6747:12;6780:6;6775:3;6768:19;6796:63;6852:6;6845:4;6840:3;6836:14;6829:4;6822:5;6818:16;6796:63;:::i;:::-;6904:2;6892:15;6909:66;6888:88;6879:98;;;;6979:4;6875:109;;6673:317;-1:-1:-1;;6673:317:1:o;6995:493::-;7245:2;7234:9;7227:21;7208:4;7271:45;7312:2;7301:9;7297:18;7289:6;7271:45;:::i;:::-;7364:9;7356:6;7352:22;7347:2;7336:9;7332:18;7325:50;7399:2;7391:6;7384:18;7435:14;7430:2;7422:6;7418:15;7411:39;7479:2;7471:6;7467:15;7459:23;;;6995:493;;;;:::o;7493:184::-;7545:77;7542:1;7535:88;7642:4;7639:1;7632:15;7666:4;7663:1;7656:15;7682:334;7753:2;7747:9;7809:2;7799:13;;7814:66;7795:86;7783:99;;7912:18;7897:34;;7933:22;;;7894:62;7891:88;;;7959:18;;:::i;:::-;7995:2;7988:22;7682:334;;-1:-1:-1;7682:334:1:o;8021:437::-;8097:5;8131:18;8123:6;8120:30;8117:56;;;8153:18;;:::i;:::-;8191:116;8301:4;8232:66;8227:2;8219:6;8215:15;8211:88;8207:99;8191:116;:::i;:::-;8182:125;;8330:6;8323:5;8316:21;8370:3;8361:6;8356:3;8352:16;8349:25;8346:45;;;8387:1;8384;8377:12;8346:45;8400:52;8445:6;8438:4;8431:5;8427:16;8422:3;8400:52;:::i;8463:1366::-;8568:6;8599:2;8642;8630:9;8621:7;8617:23;8613:32;8610:52;;;8658:1;8655;8648:12;8610:52;8691:9;8685:16;8720:18;8761:2;8753:6;8750:14;8747:34;;;8777:1;8774;8767:12;8747:34;8815:6;8804:9;8800:22;8790:32;;8860:7;8853:4;8849:2;8845:13;8841:27;8831:55;;8882:1;8879;8872:12;8831:55;8911:2;8905:9;8933:2;8929;8926:10;8923:36;;;8939:18;;:::i;:::-;8985:2;8982:1;8978:10;9008:28;9032:2;9028;9024:11;9008:28;:::i;:::-;9070:15;;;9140:11;;;9136:20;;;9101:12;;;;9168:19;;;9165:39;;;9200:1;9197;9190:12;9165:39;9232:2;9228;9224:11;9213:22;;9244:555;9260:6;9255:3;9252:15;9244:555;;;9339:3;9333:10;9375:2;9362:11;9359:19;9356:109;;;9419:1;9448:2;9444;9437:14;9356:109;9488:20;;9543:2;9535:11;;9531:25;-1:-1:-1;9521:123:1;;9598:1;9627:2;9623;9616:14;9521:123;9669:87;9748:7;9742:2;9738;9734:11;9728:18;9723:2;9719;9715:11;9669:87;:::i;:::-;9657:100;;-1:-1:-1;9277:12:1;;;;9777;;;;9244:555;;;9818:5;8463:1366;-1:-1:-1;;;;;;;;;8463:1366:1:o;9834:184::-;9886:77;9883:1;9876:88;9983:4;9980:1;9973:15;10007:4;10004:1;9997:15;11755:458;11834:6;11887:2;11875:9;11866:7;11862:23;11858:32;11855:52;;;11903:1;11900;11893:12;11855:52;11936:9;11930:16;11969:18;11961:6;11958:30;11955:50;;;12001:1;11998;11991:12;11955:50;12024:22;;12077:4;12069:13;;12065:27;-1:-1:-1;12055:55:1;;12106:1;12103;12096:12;12055:55;12129:78;12199:7;12194:2;12188:9;12183:2;12179;12175:11;12129:78;:::i;:::-;12119:88;11755:458;-1:-1:-1;;;;11755:458:1:o;12218:338::-;12405:42;12397:6;12393:55;12382:9;12375:74;12485:2;12480;12469:9;12465:18;12458:30;12356:4;12505:45;12546:2;12535:9;12531:18;12523:6;12505:45;:::i;12561:220::-;12710:2;12699:9;12692:21;12673:4;12730:45;12771:2;12760:9;12756:18;12748:6;12730:45;:::i;12786:340::-;12963:2;12952:9;12945:21;12926:4;12983:45;13024:2;13013:9;13009:18;13001:6;12983:45;:::i;:::-;12975:53;;13076:42;13068:6;13064:55;13059:2;13048:9;13044:18;13037:83;12786:340;;;;;:::o;13131:291::-;13308:2;13297:9;13290:21;13271:4;13328:45;13369:2;13358:9;13354:18;13346:6;13328:45;:::i;:::-;13320:53;;13409:6;13404:2;13393:9;13389:18;13382:34;13131:291;;;;;:::o;13427:301::-;13598:2;13587:9;13580:21;13561:4;13618:45;13659:2;13648:9;13644:18;13636:6;13618:45;:::i;:::-;13610:53;;13713:6;13706:14;13699:22;13694:2;13683:9;13679:18;13672:50;13427:301;;;;;:::o;13733:546::-;13978:2;13967:9;13960:21;13941:4;14004:45;14045:2;14034:9;14030:18;14022:6;14004:45;:::i;:::-;14097:9;14089:6;14085:22;14080:2;14069:9;14065:18;14058:50;14131:33;14157:6;14149;14131:33;:::i;:::-;14117:47;;14212:9;14204:6;14200:22;14195:2;14184:9;14180:18;14173:50;14240:33;14266:6;14258;14240:33;:::i;:::-;14232:41;13733:546;-1:-1:-1;;;;;;13733:546:1:o","linkReferences":{}},"methodIdentifiers":{"call1(string)":"7e79255d","call2(string)":"8d3ef7ca","callPure(string)":"7f8b915c","counter()":"61bc221a","hello(string)":"a777d0dc","nested1(string)":"a76ccdfa","nested2(string)":"dbf1282f","run()":"c0406226","runBroadcast()":"bef03abc"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"call1\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"call2\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"callPure\",\"outputs\":[],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"counter\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"hello\",\"outputs\":[],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"nested1\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"_v\",\"type\":\"string\"}],\"name\":\"nested2\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"run\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"runBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"title\":\"ScriptExample\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{\"hello(string)\":{\"notice\":\"example external function, to force a CALL, and test vm.startPrank with.\"},\"run()\":{\"notice\":\"example function, runs through basic cheat-codes and console logs.\"},\"runBroadcast()\":{\"notice\":\"example function, to test vm.broadcast with.\"}},\"notice\":\"ScriptExample is an example script. The Go forge script code tests that it can run this.\",\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"ScriptExample\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28\",\"dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"call1"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"call2"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"pure","type":"function","name":"callPure"},{"inputs":[],"stateMutability":"view","type":"function","name":"counter","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"view","type":"function","name":"hello"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"nested1"},{"inputs":[{"internalType":"string","name":"_v","type":"string"}],"stateMutability":"nonpayable","type":"function","name":"nested2"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"run"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"runBroadcast"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{"hello(string)":{"notice":"example external function, to force a CALL, and test vm.startPrank with."},"run()":{"notice":"example function, runs through basic cheat-codes and console logs."},"runBroadcast()":{"notice":"example function, to test vm.broadcast with."}},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"ScriptExample"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da","urls":["bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28","dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[{"astId":243,"contract":"scripts/ScriptExample.s.sol:ScriptExample","label":"counter","offset":0,"slot":"0","type":"t_uint256"}],"types":{"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}},"userdoc":{"version":1,"kind":"user","methods":{"hello(string)":{"notice":"example external function, to force a CALL, and test vm.startPrank with."},"run()":{"notice":"example function, runs through basic cheat-codes and console logs."},"runBroadcast()":{"notice":"example function, to test vm.broadcast with."}},"notice":"ScriptExample is an example script. The Go forge script code tests that it can run this."},"devdoc":{"version":1,"kind":"dev","title":"ScriptExample"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":969,"exportedSymbols":{"FooBar":[799],"ForkTester":[968],"ForkedContract":[852],"NonceGetter":[833],"ScriptExample":[786],"Vm":[83],"console":[220]},"nodeType":"SourceUnit","src":"32:8375:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":83,"nodeType":"ContractDefinition","src":"120:969:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":83,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":61,"nodeType":"FunctionDefinition","src":"739:108:0","nodes":[],"functionSelector":"3ebf73b4","implemented":false,"kind":"function","modifiers":[],"name":"getDeployedCode","nameLocation":"748:15:0","parameters":{"id":57,"nodeType":"ParameterList","parameters":[{"constant":false,"id":56,"mutability":"mutable","name":"artifactPath","nameLocation":"780:12:0","nodeType":"VariableDeclaration","scope":61,"src":"764:28:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":55,"name":"string","nodeType":"ElementaryTypeName","src":"764:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"763:30:0"},"returnParameters":{"id":60,"nodeType":"ParameterList","parameters":[{"constant":false,"id":59,"mutability":"mutable","name":"runtimeBytecode","nameLocation":"830:15:0","nodeType":"VariableDeclaration","scope":61,"src":"817:28:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":58,"name":"bytes","nodeType":"ElementaryTypeName","src":"817:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"816:30:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":68,"nodeType":"FunctionDefinition","src":"852:74:0","nodes":[],"functionSelector":"b4d6c782","implemented":false,"kind":"function","modifiers":[],"name":"etch","nameLocation":"861:4:0","parameters":{"id":66,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"target","nameLocation":"874:6:0","nodeType":"VariableDeclaration","scope":68,"src":"866:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":62,"name":"address","nodeType":"ElementaryTypeName","src":"866:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":65,"mutability":"mutable","name":"newRuntimeBytecode","nameLocation":"897:18:0","nodeType":"VariableDeclaration","scope":68,"src":"882:33:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":64,"name":"bytes","nodeType":"ElementaryTypeName","src":"882:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"865:51:0"},"returnParameters":{"id":67,"nodeType":"ParameterList","parameters":[],"src":"925:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":73,"nodeType":"FunctionDefinition","src":"931:51:0","nodes":[],"functionSelector":"ea060291","implemented":false,"kind":"function","modifiers":[],"name":"allowCheatcodes","nameLocation":"940:15:0","parameters":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"account","nameLocation":"964:7:0","nodeType":"VariableDeclaration","scope":73,"src":"956:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":69,"name":"address","nodeType":"ElementaryTypeName","src":"956:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"955:17:0"},"returnParameters":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"981:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":82,"nodeType":"FunctionDefinition","src":"987:100:0","nodes":[],"functionSelector":"71ee464d","implemented":false,"kind":"function","modifiers":[],"name":"createSelectFork","nameLocation":"996:16:0","parameters":{"id":78,"nodeType":"ParameterList","parameters":[{"constant":false,"id":75,"mutability":"mutable","name":"forkName","nameLocation":"1029:8:0","nodeType":"VariableDeclaration","scope":82,"src":"1013:24:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":74,"name":"string","nodeType":"ElementaryTypeName","src":"1013:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":77,"mutability":"mutable","name":"blockNumber","nameLocation":"1047:11:0","nodeType":"VariableDeclaration","scope":82,"src":"1039:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":76,"name":"uint256","nodeType":"ElementaryTypeName","src":"1039:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1012:47:0"},"returnParameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":82,"src":"1078:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":79,"name":"uint256","nodeType":"ElementaryTypeName","src":"1078:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1077:9:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[83],"name":"Vm","nameLocation":"130:2:0","scope":969,"usedErrors":[]},{"id":220,"nodeType":"ContractDefinition","src":"1144:1851:0","nodes":[{"id":89,"nodeType":"VariableDeclaration","src":"1166:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"1183:15:0","scope":220,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":84,"name":"address","nodeType":"ElementaryTypeName","src":"1166:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":87,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"1209:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":86,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"1201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":85,"name":"address","nodeType":"ElementaryTypeName","src":"1201:7:0","typeDescriptions":{}}},"id":88,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1201:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1259:235:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1432:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1451:37:0","statements":[{"nodeType":"YulAssignment","src":"1465:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1474:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1465:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":95,"isOffset":false,"isSlot":false,"src":"1474:4:0","valueSize":1},{"declaration":102,"isOffset":false,"isSlot":false,"src":"1465:5:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1442:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"1268:25:0","parameters":{"id":96,"nodeType":"ParameterList","parameters":[{"constant":false,"id":95,"mutability":"mutable","name":"fnIn","nameLocation":"1331:4:0","nodeType":"VariableDeclaration","scope":106,"src":"1294:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":94,"nodeType":"FunctionTypeName","parameterTypes":{"id":92,"nodeType":"ParameterList","parameters":[{"constant":false,"id":91,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":94,"src":"1303:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":90,"name":"bytes","nodeType":"ElementaryTypeName","src":"1303:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1302:14:0"},"returnParameterTypes":{"id":93,"nodeType":"ParameterList","parameters":[],"src":"1331:0:0"},"src":"1294:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"1293:43:0"},"returnParameters":{"id":103,"nodeType":"ParameterList","parameters":[{"constant":false,"id":102,"mutability":"mutable","name":"fnOut","nameLocation":"1421:5:0","nodeType":"VariableDeclaration","scope":106,"src":"1384:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":101,"nodeType":"FunctionTypeName","parameterTypes":{"id":99,"nodeType":"ParameterList","parameters":[{"constant":false,"id":98,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":101,"src":"1393:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":97,"name":"bytes","nodeType":"ElementaryTypeName","src":"1393:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1392:14:0"},"returnParameterTypes":{"id":100,"nodeType":"ParameterList","parameters":[],"src":"1421:0:0"},"src":"1384:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1383:44:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":118,"nodeType":"FunctionDefinition","src":"1500:133:0","nodes":[],"body":{"id":117,"nodeType":"Block","src":"1561:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":114,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1618:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":112,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":134,"src":"1597:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":111,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1571:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":113,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":115,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":116,"nodeType":"ExpressionStatement","src":"1571:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1509:15:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"payload","nameLocation":"1538:7:0","nodeType":"VariableDeclaration","scope":118,"src":"1525:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":107,"name":"bytes","nodeType":"ElementaryTypeName","src":"1525:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1524:22:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1561:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":134,"nodeType":"FunctionDefinition","src":"1639:380:0","nodes":[],"body":{"id":133,"nodeType":"Block","src":"1703:316:0","nodes":[],"statements":[{"assignments":[124],"declarations":[{"constant":false,"id":124,"mutability":"mutable","name":"payloadLength","nameLocation":"1721:13:0","nodeType":"VariableDeclaration","scope":133,"src":"1713:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":123,"name":"uint256","nodeType":"ElementaryTypeName","src":"1713:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":127,"initialValue":{"expression":{"id":125,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":120,"src":"1737:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":126,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1737:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1713:38:0"},{"assignments":[129],"declarations":[{"constant":false,"id":129,"mutability":"mutable","name":"consoleAddress","nameLocation":"1769:14:0","nodeType":"VariableDeclaration","scope":133,"src":"1761:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":128,"name":"address","nodeType":"ElementaryTypeName","src":"1761:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":131,"initialValue":{"id":130,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":89,"src":"1786:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1761:40:0"},{"AST":{"nodeType":"YulBlock","src":"1863:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1877:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1901:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1910:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1897:3:0"},"nodeType":"YulFunctionCall","src":"1897:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1881:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1926:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1946:3:0"},"nodeType":"YulFunctionCall","src":"1946:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1953:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1969:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1983:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1998:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"2001:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1935:10:0"},"nodeType":"YulFunctionCall","src":"1935:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1930:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":129,"isOffset":false,"isSlot":false,"src":"1953:14:0","valueSize":1},{"declaration":120,"isOffset":false,"isSlot":false,"src":"1901:7:0","valueSize":1},{"declaration":124,"isOffset":false,"isSlot":false,"src":"1983:13:0","valueSize":1}],"id":132,"nodeType":"InlineAssembly","src":"1854:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1648:19:0","parameters":{"id":121,"nodeType":"ParameterList","parameters":[{"constant":false,"id":120,"mutability":"mutable","name":"payload","nameLocation":"1681:7:0","nodeType":"VariableDeclaration","scope":134,"src":"1668:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":119,"name":"bytes","nodeType":"ElementaryTypeName","src":"1668:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1667:22:0"},"returnParameters":{"id":122,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":220,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":148,"nodeType":"FunctionDefinition","src":"2025:164:0","nodes":[],"body":{"id":147,"nodeType":"Block","src":"2070:119:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":142,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2120:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":143,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":136,"src":"2135:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":140,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2096:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":141,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2096:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":144,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2096:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":139,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2080:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":145,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2080:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":146,"nodeType":"ExpressionStatement","src":"2080:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2034:3:0","parameters":{"id":137,"nodeType":"ParameterList","parameters":[{"constant":false,"id":136,"mutability":"mutable","name":"p0","nameLocation":"2052:2:0","nodeType":"VariableDeclaration","scope":148,"src":"2038:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":135,"name":"string","nodeType":"ElementaryTypeName","src":"2038:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2037:18:0"},"returnParameters":{"id":138,"nodeType":"ParameterList","parameters":[],"src":"2070:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":165,"nodeType":"FunctionDefinition","src":"2195:182:0","nodes":[],"body":{"id":164,"nodeType":"Block","src":"2249:128:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":158,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2299:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":159,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":150,"src":"2319:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":160,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":152,"src":"2323:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":156,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2275:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":157,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2275:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":161,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2275:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":155,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2259:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":162,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2259:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":163,"nodeType":"ExpressionStatement","src":"2259:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2204:3:0","parameters":{"id":153,"nodeType":"ParameterList","parameters":[{"constant":false,"id":150,"mutability":"mutable","name":"p0","nameLocation":"2222:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2208:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":149,"name":"string","nodeType":"ElementaryTypeName","src":"2208:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":152,"mutability":"mutable","name":"p1","nameLocation":"2231:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2226:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":151,"name":"bool","nodeType":"ElementaryTypeName","src":"2226:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"2207:27:0"},"returnParameters":{"id":154,"nodeType":"ParameterList","parameters":[],"src":"2249:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":182,"nodeType":"FunctionDefinition","src":"2383:188:0","nodes":[],"body":{"id":181,"nodeType":"Block","src":"2440:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":175,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2490:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":176,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":167,"src":"2513:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":177,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":169,"src":"2517:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":173,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2466:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":174,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2466:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":178,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2466:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":172,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2450:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":179,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2450:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":180,"nodeType":"ExpressionStatement","src":"2450:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2392:3:0","parameters":{"id":170,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"mutability":"mutable","name":"p0","nameLocation":"2410:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2396:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":166,"name":"string","nodeType":"ElementaryTypeName","src":"2396:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":169,"mutability":"mutable","name":"p1","nameLocation":"2422:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2414:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":168,"name":"uint256","nodeType":"ElementaryTypeName","src":"2414:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"2395:30:0"},"returnParameters":{"id":171,"nodeType":"ParameterList","parameters":[],"src":"2440:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":199,"nodeType":"FunctionDefinition","src":"2577:188:0","nodes":[],"body":{"id":198,"nodeType":"Block","src":"2634:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":192,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2684:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":193,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":184,"src":"2707:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":194,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":186,"src":"2711:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":190,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2660:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":191,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2660:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":195,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2660:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":189,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2644:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":196,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2644:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":197,"nodeType":"ExpressionStatement","src":"2644:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2586:3:0","parameters":{"id":187,"nodeType":"ParameterList","parameters":[{"constant":false,"id":184,"mutability":"mutable","name":"p0","nameLocation":"2604:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2590:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":183,"name":"string","nodeType":"ElementaryTypeName","src":"2590:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":186,"mutability":"mutable","name":"p1","nameLocation":"2616:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2608:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":185,"name":"address","nodeType":"ElementaryTypeName","src":"2608:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2589:30:0"},"returnParameters":{"id":188,"nodeType":"ParameterList","parameters":[],"src":"2634:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":219,"nodeType":"FunctionDefinition","src":"2771:222:0","nodes":[],"body":{"id":218,"nodeType":"Block","src":"2852:141:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":211,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2902:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":212,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":201,"src":"2931:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":213,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":203,"src":"2935:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":214,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":205,"src":"2939:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":209,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2878:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":210,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2878:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":215,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2878:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":208,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2862:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":216,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2862:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":217,"nodeType":"ExpressionStatement","src":"2862:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2780:3:0","parameters":{"id":206,"nodeType":"ParameterList","parameters":[{"constant":false,"id":201,"mutability":"mutable","name":"p0","nameLocation":"2798:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2784:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":200,"name":"string","nodeType":"ElementaryTypeName","src":"2784:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":203,"mutability":"mutable","name":"p1","nameLocation":"2816:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2802:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":202,"name":"string","nodeType":"ElementaryTypeName","src":"2802:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":205,"mutability":"mutable","name":"p2","nameLocation":"2834:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2820:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":204,"name":"string","nodeType":"ElementaryTypeName","src":"2820:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2783:54:0"},"returnParameters":{"id":207,"nodeType":"ParameterList","parameters":[],"src":"2852:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[220],"name":"console","nameLocation":"1152:7:0","scope":969,"usedErrors":[]},{"id":786,"nodeType":"ContractDefinition","src":"3123:3912:0","nodes":[{"id":235,"nodeType":"VariableDeclaration","src":"3152:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"3178:10:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":222,"name":"address","nodeType":"ElementaryTypeName","src":"3152:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3225:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":229,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"3215:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":231,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3215:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":228,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3207:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":227,"name":"uint256","nodeType":"ElementaryTypeName","src":"3207:7:0","typeDescriptions":{}}},"id":232,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3207:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":226,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3199:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":225,"name":"uint160","nodeType":"ElementaryTypeName","src":"3199:7:0","typeDescriptions":{}}},"id":233,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3199:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":224,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3191:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":223,"name":"address","nodeType":"ElementaryTypeName","src":"3191:7:0","typeDescriptions":{}}},"id":234,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3191:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":241,"nodeType":"VariableDeclaration","src":"3252:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"3273:2:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":237,"nodeType":"UserDefinedTypeName","pathNode":{"id":236,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"3252:2:0"},"referencedDeclaration":83,"src":"3252:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":239,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":235,"src":"3281:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":238,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"3278:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":240,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3278:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":243,"nodeType":"VariableDeclaration","src":"3356:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"3371:7:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":242,"name":"uint256","nodeType":"ElementaryTypeName","src":"3356:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":456,"nodeType":"FunctionDefinition","src":"3468:1428:0","nodes":[],"body":{"id":455,"nodeType":"Block","src":"3490:1406:0","nodes":[],"statements":[{"assignments":[248],"declarations":[{"constant":false,"id":248,"mutability":"mutable","name":"x","nameLocation":"3505:1:0","nodeType":"VariableDeclaration","scope":455,"src":"3500:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":247,"name":"bool","nodeType":"ElementaryTypeName","src":"3500:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":254,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":251,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3518:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":252,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"3534:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":249,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3509:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":250,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"3509:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"3500:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":258,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3562:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":259,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":248,"src":"3585:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":255,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3550:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":257,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":165,"src":"3550:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":260,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3550:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":261,"nodeType":"ExpressionStatement","src":"3550:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":265,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3610:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":268,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3635:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":267,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3627:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":266,"name":"address","nodeType":"ElementaryTypeName","src":"3627:7:0","typeDescriptions":{}}},"id":269,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3627:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":262,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3598:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3598:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3598:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":271,"nodeType":"ExpressionStatement","src":"3598:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":275,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3663:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":280,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3701:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":279,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3693:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":278,"name":"address","nodeType":"ElementaryTypeName","src":"3693:7:0","typeDescriptions":{}}},"id":281,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3693:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":276,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3681:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3681:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":282,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":272,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3651:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":274,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3651:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":283,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3651:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":284,"nodeType":"ExpressionStatement","src":"3651:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":288,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3730:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":291,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3753:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3753:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":290,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3745:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":289,"name":"address","nodeType":"ElementaryTypeName","src":"3745:7:0","typeDescriptions":{}}},"id":293,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3745:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":285,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3718:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":287,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3718:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":294,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3718:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":295,"nodeType":"ExpressionStatement","src":"3718:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":299,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3787:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":304,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3823:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":305,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3823:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":303,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3815:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":302,"name":"address","nodeType":"ElementaryTypeName","src":"3815:7:0","typeDescriptions":{}}},"id":306,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3815:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":300,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3803:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":301,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3803:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3803:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":296,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3775:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":298,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3775:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":308,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3775:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":309,"nodeType":"ExpressionStatement","src":"3775:61:0"},{"assignments":[311],"declarations":[{"constant":false,"id":311,"mutability":"mutable","name":"json","nameLocation":"3861:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3847:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":310,"name":"string","nodeType":"ElementaryTypeName","src":"3847:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":313,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3868:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3847:55:0"},{"assignments":[318],"declarations":[{"constant":false,"id":318,"mutability":"mutable","name":"keys","nameLocation":"3928:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3912:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":316,"name":"string","nodeType":"ElementaryTypeName","src":"3912:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":317,"nodeType":"ArrayTypeName","src":"3912:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":324,"initialValue":{"arguments":[{"id":321,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":311,"src":"3952:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3958:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":319,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3935:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":320,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3935:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":323,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3935:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3912:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":328,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3995:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":329,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4003:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":331,"indexExpression":{"hexValue":"30","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4008:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4003:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":332,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4012:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":334,"indexExpression":{"hexValue":"31","id":333,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4017:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4012:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":325,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3983:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":327,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":219,"src":"3983:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3983:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":336,"nodeType":"ExpressionStatement","src":"3983:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":340,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4042:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":337,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4031:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":339,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4031:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4031:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":342,"nodeType":"ExpressionStatement","src":"4031:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":350,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4098:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4090:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":348,"name":"uint160","nodeType":"ElementaryTypeName","src":"4090:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4090:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":347,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4082:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":346,"name":"address","nodeType":"ElementaryTypeName","src":"4082:7:0","typeDescriptions":{}}},"id":352,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4082:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":343,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4068:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":345,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"4068:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":353,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4068:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":354,"nodeType":"ExpressionStatement","src":"4068:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":358,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4126:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":355,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4115:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":357,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4115:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":359,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4115:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":360,"nodeType":"ExpressionStatement","src":"4115:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":364,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4163:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":367,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"4198:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":368,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"4198:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":366,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4190:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":365,"name":"address","nodeType":"ElementaryTypeName","src":"4190:7:0","typeDescriptions":{}}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4190:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":361,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4151:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4151:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":370,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4151:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":371,"nodeType":"ExpressionStatement","src":"4151:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":375,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4232:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":378,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4270:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":377,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4262:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":376,"name":"address","nodeType":"ElementaryTypeName","src":"4262:7:0","typeDescriptions":{}}},"id":379,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4262:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":372,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4220:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":374,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4220:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":380,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4220:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":381,"nodeType":"ExpressionStatement","src":"4220:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4297:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":382,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4286:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4286:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":386,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4286:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":387,"nodeType":"ExpressionStatement","src":"4286:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4322:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":390,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"4322:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":391,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4322:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":392,"nodeType":"ExpressionStatement","src":"4322:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":396,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4357:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":393,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4346:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4346:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":397,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4346:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":398,"nodeType":"ExpressionStatement","src":"4346:33:0"},{"assignments":[400],"declarations":[{"constant":false,"id":400,"mutability":"mutable","name":"tmpNonceGetter","nameLocation":"4480:14:0","nodeType":"VariableDeclaration","scope":455,"src":"4472:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":399,"name":"address","nodeType":"ElementaryTypeName","src":"4472:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":413,"initialValue":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"74656d70206e6f6e6365207465737420676574746572","id":408,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4531:24:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""},"value":"temp nonce test getter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""}],"id":407,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"4521:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":409,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4521:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":406,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4513:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":405,"name":"uint256","nodeType":"ElementaryTypeName","src":"4513:7:0","typeDescriptions":{}}},"id":410,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4513:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":404,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4505:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":403,"name":"uint160","nodeType":"ElementaryTypeName","src":"4505:7:0","typeDescriptions":{}}},"id":411,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4505:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":402,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4497:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":401,"name":"address","nodeType":"ElementaryTypeName","src":"4497:7:0","typeDescriptions":{}}},"id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4497:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"4472:87:0"},{"expression":{"arguments":[{"id":417,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4577:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},{"arguments":[{"hexValue":"5363726970744578616d706c652e732e736f6c3a4e6f6e6365476574746572","id":420,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4612:33:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""},"value":"ScriptExample.s.sol:NonceGetter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""}],"expression":{"id":418,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4593:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getDeployedCode","nodeType":"MemberAccess","referencedDeclaration":61,"src":"4593:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) view external returns (bytes memory)"}},"id":421,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4593:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"},{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"expression":{"id":414,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4569:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":416,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"etch","nodeType":"MemberAccess","referencedDeclaration":68,"src":"4569:7:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$","typeString":"function (address,bytes memory) external"}},"id":422,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4569:78:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":423,"nodeType":"ExpressionStatement","src":"4569:78:0"},{"expression":{"arguments":[{"id":427,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4676:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":424,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4657:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":426,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"allowCheatcodes","nodeType":"MemberAccess","referencedDeclaration":73,"src":"4657:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":428,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":429,"nodeType":"ExpressionStatement","src":"4657:34:0"},{"assignments":[431],"declarations":[{"constant":false,"id":431,"mutability":"mutable","name":"v","nameLocation":"4709:1:0","nodeType":"VariableDeclaration","scope":455,"src":"4701:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":430,"name":"uint256","nodeType":"ElementaryTypeName","src":"4701:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":441,"initialValue":{"arguments":[{"arguments":[{"id":438,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4758:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":437,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4750:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":436,"name":"address","nodeType":"ElementaryTypeName","src":"4750:7:0","typeDescriptions":{}}},"id":439,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4750:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"arguments":[{"id":433,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4725:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":432,"name":"NonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":833,"src":"4713:11:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_NonceGetter_$833_$","typeString":"type(contract NonceGetter)"}},"id":434,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_NonceGetter_$833","typeString":"contract NonceGetter"}},"id":435,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":832,"src":"4713:36:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint256_$","typeString":"function (address) view external returns (uint256)"}},"id":440,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"4701:63:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683a","id":445,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4786:68:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},"value":"nonce from nonce getter, no explicit access required with vm.etch:"},{"id":446,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":431,"src":"4856:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":442,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4774:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":444,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"4774:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4774:84:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":448,"nodeType":"ExpressionStatement","src":"4774:84:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":452,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4881:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":449,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4869:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":451,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"4869:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4869:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":454,"nodeType":"ExpressionStatement","src":"4869:20:0"}]},"documentation":{"id":244,"nodeType":"StructuredDocumentation","src":"3385:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"3477:3:0","parameters":{"id":245,"nodeType":"ParameterList","parameters":[],"src":"3480:2:0"},"returnParameters":{"id":246,"nodeType":"ParameterList","parameters":[],"src":"3490:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":689,"nodeType":"FunctionDefinition","src":"4963:1333:0","nodes":[],"body":{"id":688,"nodeType":"Block","src":"4994:1302:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":463,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5016:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":470,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5059:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":469,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5051:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":468,"name":"address","nodeType":"ElementaryTypeName","src":"5051:7:0","typeDescriptions":{}}},"id":471,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5051:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":466,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5039:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":467,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5039:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5039:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":465,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5031:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":464,"name":"uint256","nodeType":"ElementaryTypeName","src":"5031:7:0","typeDescriptions":{}}},"id":473,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5031:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":460,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5004:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":462,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"5004:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":474,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5004:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":475,"nodeType":"ExpressionStatement","src":"5004:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":479,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5090:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":476,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5078:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":478,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5078:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":480,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5078:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":481,"nodeType":"ExpressionStatement","src":"5078:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":482,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5117:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5117:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":485,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5117:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":486,"nodeType":"ExpressionStatement","src":"5117:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":490,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5152:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":487,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5141:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":489,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5141:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":491,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5141:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":492,"nodeType":"ExpressionStatement","src":"5141:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":496,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5188:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":493,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5177:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5177:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":497,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5177:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":498,"nodeType":"ExpressionStatement","src":"5177:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":502,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5226:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":499,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5214:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5214:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":503,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5214:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":504,"nodeType":"ExpressionStatement","src":"5214:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5291:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":511,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5283:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":510,"name":"uint160","nodeType":"ElementaryTypeName","src":"5283:7:0","typeDescriptions":{}}},"id":513,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5283:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5275:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":508,"name":"address","nodeType":"ElementaryTypeName","src":"5275:7:0","typeDescriptions":{}}},"id":514,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5275:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":505,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5257:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":507,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5257:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":515,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5257:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":516,"nodeType":"ExpressionStatement","src":"5257:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":520,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5323:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":517,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5312:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":519,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5312:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":521,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5312:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":522,"nodeType":"ExpressionStatement","src":"5312:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":526,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5362:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":523,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5351:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":525,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5351:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5351:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":528,"nodeType":"ExpressionStatement","src":"5351:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":532,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5404:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":529,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5390:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":531,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":785,"src":"5390:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":533,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5390:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":534,"nodeType":"ExpressionStatement","src":"5390:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":535,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5431:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":537,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5431:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":538,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5431:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":539,"nodeType":"ExpressionStatement","src":"5431:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":543,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5470:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":540,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5459:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":542,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5459:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":544,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5459:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":545,"nodeType":"ExpressionStatement","src":"5459:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":549,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5511:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":546,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5499:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5499:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":550,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5499:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":551,"nodeType":"ExpressionStatement","src":"5499:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":559,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5572:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":558,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5564:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":557,"name":"uint160","nodeType":"ElementaryTypeName","src":"5564:7:0","typeDescriptions":{}}},"id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5564:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":556,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5556:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":555,"name":"address","nodeType":"ElementaryTypeName","src":"5556:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5556:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":552,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5538:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":554,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5538:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":562,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5538:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":563,"nodeType":"ExpressionStatement","src":"5538:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":567,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5604:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":564,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5591:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":566,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":758,"src":"5591:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":568,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5591:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":569,"nodeType":"ExpressionStatement","src":"5591:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":570,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5623:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5623:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5623:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"5623:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5664:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5652:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5652:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5652:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"5652:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":588,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5725:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":587,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5717:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":586,"name":"uint160","nodeType":"ElementaryTypeName","src":"5717:7:0","typeDescriptions":{}}},"id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5717:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":585,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5709:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":584,"name":"address","nodeType":"ElementaryTypeName","src":"5709:7:0","typeDescriptions":{}}},"id":590,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5709:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5696:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5696:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":591,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5696:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":592,"nodeType":"ExpressionStatement","src":"5696:40:0"},{"assignments":[595],"declarations":[{"constant":false,"id":595,"mutability":"mutable","name":"x","nameLocation":"5753:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5746:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":594,"nodeType":"UserDefinedTypeName","pathNode":{"id":593,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5746:6:0"},"referencedDeclaration":799,"src":"5746:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":601,"initialValue":{"arguments":[{"hexValue":"31323334","id":599,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5768:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":598,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5757:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":597,"nodeType":"UserDefinedTypeName","pathNode":{"id":596,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5761:6:0"},"referencedDeclaration":799,"src":"5761:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":600,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5757:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5746:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":607,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":603,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":595,"src":"5791:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"5791:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5791:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":606,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5802:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"5791:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323334","id":608,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5808:35:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""},"value":"FooBar: foo in create is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""}],"id":602,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"5783:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":609,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5783:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":610,"nodeType":"ExpressionStatement","src":"5783:61:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":614,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5867:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":611,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5855:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":613,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5855:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":615,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5855:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":616,"nodeType":"ExpressionStatement","src":"5855:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5917:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":623,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5909:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":622,"name":"uint160","nodeType":"ElementaryTypeName","src":"5909:7:0","typeDescriptions":{}}},"id":625,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5909:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":621,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5901:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":620,"name":"address","nodeType":"ElementaryTypeName","src":"5901:7:0","typeDescriptions":{}}},"id":626,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5901:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":617,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5888:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":627,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5888:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":628,"nodeType":"ExpressionStatement","src":"5888:38:0"},{"assignments":[631],"declarations":[{"constant":false,"id":631,"mutability":"mutable","name":"y","nameLocation":"5943:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5936:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":630,"nodeType":"UserDefinedTypeName","pathNode":{"id":629,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5936:6:0"},"referencedDeclaration":799,"src":"5936:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":645,"initialValue":{"arguments":[{"hexValue":"31323334","id":643,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5986:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":634,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5947:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":633,"nodeType":"UserDefinedTypeName","pathNode":{"id":632,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5951:6:0"},"referencedDeclaration":799,"src":"5951:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":642,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":639,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5980:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":638,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5972:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":637,"name":"uint256","nodeType":"ElementaryTypeName","src":"5972:7:0","typeDescriptions":{}}},"id":640,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5972:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":636,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5964:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":635,"name":"bytes32","nodeType":"ElementaryTypeName","src":"5964:7:0","typeDescriptions":{}}},"id":641,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5964:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"5947:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":644,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5947:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5936:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":651,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":647,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":631,"src":"6009:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":648,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"6009:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":649,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6009:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":650,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6020:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"6009:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e2063726561746532206973206e6f742031323334","id":652,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6026:36:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""},"value":"FooBar: foo in create2 is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""}],"id":646,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"6001:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":653,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6001:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":654,"nodeType":"ExpressionStatement","src":"6001:62:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":658,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6085:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":655,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6073:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":657,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6073:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":659,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6073:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":660,"nodeType":"ExpressionStatement","src":"6073:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":661,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6177:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":663,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"6177:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":664,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6177:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":665,"nodeType":"ExpressionStatement","src":"6177:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":669,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6212:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":668,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"6201:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":667,"nodeType":"UserDefinedTypeName","pathNode":{"id":666,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"6205:6:0"},"referencedDeclaration":799,"src":"6205:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":670,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6201:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":671,"nodeType":"ExpressionStatement","src":"6201:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":675,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6240:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":682,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6281:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":681,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6273:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":680,"name":"address","nodeType":"ElementaryTypeName","src":"6273:7:0","typeDescriptions":{}}},"id":683,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6273:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":678,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6261:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":679,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"6261:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":684,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6261:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":677,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6253:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":676,"name":"uint256","nodeType":"ElementaryTypeName","src":"6253:7:0","typeDescriptions":{}}},"id":685,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6253:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":672,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6228:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":674,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"6228:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":686,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6228:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":687,"nodeType":"ExpressionStatement","src":"6228:61:0"}]},"documentation":{"id":457,"nodeType":"StructuredDocumentation","src":"4902:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"4972:12:0","parameters":{"id":458,"nodeType":"ParameterList","parameters":[],"src":"4984:2:0"},"returnParameters":{"id":459,"nodeType":"ParameterList","parameters":[],"src":"4994:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":713,"nodeType":"FunctionDefinition","src":"6391:143:0","nodes":[],"body":{"id":712,"nodeType":"Block","src":"6440:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":698,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":692,"src":"6462:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":695,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6450:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":697,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6450:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":699,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6450:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":700,"nodeType":"ExpressionStatement","src":"6450:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":704,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6487:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":707,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"6515:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":708,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"6515:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":706,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6507:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":705,"name":"address","nodeType":"ElementaryTypeName","src":"6507:7:0","typeDescriptions":{}}},"id":709,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6507:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":701,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6475:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":703,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"6475:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":710,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6475:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":711,"nodeType":"ExpressionStatement","src":"6475:52:0"}]},"documentation":{"id":690,"nodeType":"StructuredDocumentation","src":"6302:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"6400:5:0","parameters":{"id":693,"nodeType":"ParameterList","parameters":[{"constant":false,"id":692,"mutability":"mutable","name":"_v","nameLocation":"6422:2:0","nodeType":"VariableDeclaration","scope":713,"src":"6406:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":691,"name":"string","nodeType":"ElementaryTypeName","src":"6406:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6405:20:0"},"returnParameters":{"id":694,"nodeType":"ParameterList","parameters":[],"src":"6440:0:0"},"scope":786,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":728,"nodeType":"FunctionDefinition","src":"6540:95:0","nodes":[],"body":{"id":727,"nodeType":"Block","src":"6584:51:0","nodes":[],"statements":[{"expression":{"id":719,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6594:9:0","subExpression":{"id":718,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6594:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":720,"nodeType":"ExpressionStatement","src":"6594:9:0"},{"expression":{"arguments":[{"id":724,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":715,"src":"6625:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":721,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6613:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":723,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6613:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":725,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6613:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":726,"nodeType":"ExpressionStatement","src":"6613:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"6549:5:0","parameters":{"id":716,"nodeType":"ParameterList","parameters":[{"constant":false,"id":715,"mutability":"mutable","name":"_v","nameLocation":"6571:2:0","nodeType":"VariableDeclaration","scope":728,"src":"6555:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":714,"name":"string","nodeType":"ElementaryTypeName","src":"6555:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6554:20:0"},"returnParameters":{"id":717,"nodeType":"ParameterList","parameters":[],"src":"6584:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":743,"nodeType":"FunctionDefinition","src":"6641:95:0","nodes":[],"body":{"id":742,"nodeType":"Block","src":"6685:51:0","nodes":[],"statements":[{"expression":{"id":734,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6695:9:0","subExpression":{"id":733,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6695:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":735,"nodeType":"ExpressionStatement","src":"6695:9:0"},{"expression":{"arguments":[{"id":739,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":730,"src":"6726:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":736,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6714:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":738,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6714:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":740,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6714:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":741,"nodeType":"ExpressionStatement","src":"6714:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"6650:5:0","parameters":{"id":731,"nodeType":"ParameterList","parameters":[{"constant":false,"id":730,"mutability":"mutable","name":"_v","nameLocation":"6672:2:0","nodeType":"VariableDeclaration","scope":743,"src":"6656:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":729,"name":"string","nodeType":"ElementaryTypeName","src":"6656:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6655:20:0"},"returnParameters":{"id":732,"nodeType":"ParameterList","parameters":[],"src":"6685:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":758,"nodeType":"FunctionDefinition","src":"6742:98:0","nodes":[],"body":{"id":757,"nodeType":"Block","src":"6788:52:0","nodes":[],"statements":[{"expression":{"id":749,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6798:9:0","subExpression":{"id":748,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6798:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":750,"nodeType":"ExpressionStatement","src":"6798:9:0"},{"expression":{"arguments":[{"id":754,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":745,"src":"6830:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":751,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6817:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":753,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":773,"src":"6817:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":755,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6817:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":756,"nodeType":"ExpressionStatement","src":"6817:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"6751:7:0","parameters":{"id":746,"nodeType":"ParameterList","parameters":[{"constant":false,"id":745,"mutability":"mutable","name":"_v","nameLocation":"6775:2:0","nodeType":"VariableDeclaration","scope":758,"src":"6759:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":744,"name":"string","nodeType":"ElementaryTypeName","src":"6759:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6758:20:0"},"returnParameters":{"id":747,"nodeType":"ParameterList","parameters":[],"src":"6788:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":773,"nodeType":"FunctionDefinition","src":"6846:97:0","nodes":[],"body":{"id":772,"nodeType":"Block","src":"6892:51:0","nodes":[],"statements":[{"expression":{"id":764,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6902:9:0","subExpression":{"id":763,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6902:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":765,"nodeType":"ExpressionStatement","src":"6902:9:0"},{"expression":{"arguments":[{"id":769,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":760,"src":"6933:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":766,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6921:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":768,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6921:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":770,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6921:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":771,"nodeType":"ExpressionStatement","src":"6921:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"6855:7:0","parameters":{"id":761,"nodeType":"ParameterList","parameters":[{"constant":false,"id":760,"mutability":"mutable","name":"_v","nameLocation":"6879:2:0","nodeType":"VariableDeclaration","scope":773,"src":"6863:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":759,"name":"string","nodeType":"ElementaryTypeName","src":"6863:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6862:20:0"},"returnParameters":{"id":762,"nodeType":"ParameterList","parameters":[],"src":"6892:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":785,"nodeType":"FunctionDefinition","src":"6949:84:0","nodes":[],"body":{"id":784,"nodeType":"Block","src":"7001:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":781,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":775,"src":"7023:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":778,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"7011:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":780,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"7011:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":782,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7011:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":783,"nodeType":"ExpressionStatement","src":"7011:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"6958:8:0","parameters":{"id":776,"nodeType":"ParameterList","parameters":[{"constant":false,"id":775,"mutability":"mutable","name":"_v","nameLocation":"6983:2:0","nodeType":"VariableDeclaration","scope":785,"src":"6967:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":774,"name":"string","nodeType":"ElementaryTypeName","src":"6967:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6966:20:0"},"returnParameters":{"id":777,"nodeType":"ParameterList","parameters":[],"src":"7001:0:0"},"scope":786,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[799],"contractKind":"contract","documentation":{"id":221,"nodeType":"StructuredDocumentation","src":"2997:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[786],"name":"ScriptExample","nameLocation":"3132:13:0","scope":969,"usedErrors":[]},{"id":799,"nodeType":"ContractDefinition","src":"7037:96:0","nodes":[{"id":788,"nodeType":"VariableDeclaration","src":"7059:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"7074:3:0","scope":799,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":787,"name":"uint256","nodeType":"ElementaryTypeName","src":"7059:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":798,"nodeType":"FunctionDefinition","src":"7084:47:0","nodes":[],"body":{"id":797,"nodeType":"Block","src":"7107:24:0","nodes":[],"statements":[{"expression":{"id":795,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":793,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":788,"src":"7117:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":794,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":790,"src":"7123:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"7117:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":796,"nodeType":"ExpressionStatement","src":"7117:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":791,"nodeType":"ParameterList","parameters":[{"constant":false,"id":790,"mutability":"mutable","name":"v","nameLocation":"7104:1:0","nodeType":"VariableDeclaration","scope":798,"src":"7096:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":789,"name":"uint256","nodeType":"ElementaryTypeName","src":"7096:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7095:11:0"},"returnParameters":{"id":792,"nodeType":"ParameterList","parameters":[],"src":"7107:0:0"},"scope":799,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[799],"name":"FooBar","nameLocation":"7046:6:0","scope":969,"usedErrors":[]},{"id":833,"nodeType":"ContractDefinition","src":"7135:281:0","nodes":[{"id":813,"nodeType":"VariableDeclaration","src":"7162:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7188:10:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":800,"name":"address","nodeType":"ElementaryTypeName","src":"7162:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":808,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7235:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":807,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7225:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":809,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7225:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":806,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7217:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":805,"name":"uint256","nodeType":"ElementaryTypeName","src":"7217:7:0","typeDescriptions":{}}},"id":810,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7217:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":804,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7209:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":803,"name":"uint160","nodeType":"ElementaryTypeName","src":"7209:7:0","typeDescriptions":{}}},"id":811,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7209:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":802,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":801,"name":"address","nodeType":"ElementaryTypeName","src":"7201:7:0","typeDescriptions":{}}},"id":812,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7201:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":819,"nodeType":"VariableDeclaration","src":"7262:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7283:2:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":815,"nodeType":"UserDefinedTypeName","pathNode":{"id":814,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7262:2:0"},"referencedDeclaration":83,"src":"7262:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":817,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":813,"src":"7291:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":816,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7288:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":818,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7288:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":832,"nodeType":"FunctionDefinition","src":"7309:105:0","nodes":[],"body":{"id":831,"nodeType":"Block","src":"7372:42:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":828,"name":"_addr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":821,"src":"7401:5:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":826,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":819,"src":"7389:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":827,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7389:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":829,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7389:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"functionReturnParameters":825,"id":830,"nodeType":"Return","src":"7382:25:0"}]},"functionSelector":"2d0335ab","implemented":true,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"7318:8:0","parameters":{"id":822,"nodeType":"ParameterList","parameters":[{"constant":false,"id":821,"mutability":"mutable","name":"_addr","nameLocation":"7335:5:0","nodeType":"VariableDeclaration","scope":832,"src":"7327:13:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":820,"name":"address","nodeType":"ElementaryTypeName","src":"7327:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"7326:15:0"},"returnParameters":{"id":825,"nodeType":"ParameterList","parameters":[{"constant":false,"id":824,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":832,"src":"7363:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":823,"name":"uint256","nodeType":"ElementaryTypeName","src":"7363:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7362:9:0"},"scope":833,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"NonceGetter","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[833],"name":"NonceGetter","nameLocation":"7144:11:0","scope":969,"usedErrors":[]},{"id":852,"nodeType":"ContractDefinition","src":"7418:174:0","nodes":[{"id":835,"nodeType":"VariableDeclaration","src":"7448:18:0","nodes":[],"constant":false,"mutability":"mutable","name":"v","nameLocation":"7465:1:0","scope":852,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":834,"name":"uint256","nodeType":"ElementaryTypeName","src":"7448:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"id":843,"nodeType":"FunctionDefinition","src":"7473:36:0","nodes":[],"body":{"id":842,"nodeType":"Block","src":"7487:22:0","nodes":[],"statements":[{"expression":{"id":840,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":838,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7497:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"hexValue":"31","id":839,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7501:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"7497:5:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":841,"nodeType":"ExpressionStatement","src":"7497:5:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":836,"nodeType":"ParameterList","parameters":[],"src":"7484:2:0"},"returnParameters":{"id":837,"nodeType":"ParameterList","parameters":[],"src":"7487:0:0"},"scope":852,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":851,"nodeType":"FunctionDefinition","src":"7515:75:0","nodes":[],"body":{"id":850,"nodeType":"Block","src":"7565:25:0","nodes":[],"statements":[{"expression":{"id":848,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7582:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"functionReturnParameters":847,"id":849,"nodeType":"Return","src":"7575:8:0"}]},"functionSelector":"20965255","implemented":true,"kind":"function","modifiers":[],"name":"getValue","nameLocation":"7524:8:0","parameters":{"id":844,"nodeType":"ParameterList","parameters":[],"src":"7532:2:0"},"returnParameters":{"id":847,"nodeType":"ParameterList","parameters":[{"constant":false,"id":846,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":851,"src":"7556:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":845,"name":"uint256","nodeType":"ElementaryTypeName","src":"7556:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7555:9:0"},"scope":852,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkedContract","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[852],"name":"ForkedContract","nameLocation":"7427:14:0","scope":969,"usedErrors":[]},{"id":968,"nodeType":"ContractDefinition","src":"7594:813:0","nodes":[{"id":866,"nodeType":"VariableDeclaration","src":"7620:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7646:10:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":853,"name":"address","nodeType":"ElementaryTypeName","src":"7620:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":861,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7693:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":860,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7683:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":862,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7683:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":859,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7675:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":858,"name":"uint256","nodeType":"ElementaryTypeName","src":"7675:7:0","typeDescriptions":{}}},"id":863,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7675:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":857,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7667:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":856,"name":"uint160","nodeType":"ElementaryTypeName","src":"7667:7:0","typeDescriptions":{}}},"id":864,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7667:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":855,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7659:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":854,"name":"address","nodeType":"ElementaryTypeName","src":"7659:7:0","typeDescriptions":{}}},"id":865,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7659:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":872,"nodeType":"VariableDeclaration","src":"7720:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7741:2:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":868,"nodeType":"UserDefinedTypeName","pathNode":{"id":867,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7720:2:0"},"referencedDeclaration":83,"src":"7720:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":870,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":866,"src":"7749:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":869,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7746:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":871,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7746:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":967,"nodeType":"FunctionDefinition","src":"7767:638:0","nodes":[],"body":{"id":966,"nodeType":"Block","src":"7791:614:0","nodes":[],"statements":[{"assignments":[876],"declarations":[{"constant":false,"id":876,"mutability":"mutable","name":"testAddr","nameLocation":"7809:8:0","nodeType":"VariableDeclaration","scope":966,"src":"7801:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":875,"name":"address","nodeType":"ElementaryTypeName","src":"7801:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":884,"initialValue":{"arguments":[{"arguments":[{"hexValue":"307831323334","id":881,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7836:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":880,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7828:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":879,"name":"uint160","nodeType":"ElementaryTypeName","src":"7828:7:0","typeDescriptions":{}}},"id":882,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7828:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":878,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7820:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":877,"name":"address","nodeType":"ElementaryTypeName","src":"7820:7:0","typeDescriptions":{}}},"id":883,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7820:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"7801:43:0"},{"assignments":[887],"declarations":[{"constant":false,"id":887,"mutability":"mutable","name":"fc","nameLocation":"7869:2:0","nodeType":"VariableDeclaration","scope":966,"src":"7854:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"},"typeName":{"id":886,"nodeType":"UserDefinedTypeName","pathNode":{"id":885,"name":"ForkedContract","nodeType":"IdentifierPath","referencedDeclaration":852,"src":"7854:14:0"},"referencedDeclaration":852,"src":"7854:14:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"visibility":"internal"}],"id":891,"initialValue":{"arguments":[{"id":889,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7889:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":888,"name":"ForkedContract","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":852,"src":"7874:14:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_ForkedContract_$852_$","typeString":"type(contract ForkedContract)"}},"id":890,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7874:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"nodeType":"VariableDeclarationStatement","src":"7854:44:0"},{"expression":{"arguments":[{"hexValue":"666f726b31","id":895,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7929:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},"value":"fork1"},{"hexValue":"3132333435","id":896,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7938:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"}],"expression":{"id":892,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7909:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":894,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"7909:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":897,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7909:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":898,"nodeType":"ExpressionStatement","src":"7909:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":905,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":902,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7974:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":900,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7962:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":901,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7962:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":903,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7962:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3132333435","id":904,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7987:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"},"src":"7962:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":906,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7994:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":899,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"7954:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":907,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7954:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":908,"nodeType":"ExpressionStatement","src":"7954:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":914,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":910,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8036:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":911,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8036:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":912,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8036:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31","id":913,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8053:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"8036:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652031","id":915,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8056:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""},"value":"value should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""}],"id":909,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8028:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":916,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8028:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":917,"nodeType":"ExpressionStatement","src":"8028:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":925,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":919,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8094:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":920,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8094:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"31","id":923,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8122:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"}],"id":922,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8114:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":921,"name":"uint256","nodeType":"ElementaryTypeName","src":"8114:7:0","typeDescriptions":{}}},"id":924,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8114:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8094:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652031","id":926,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8126:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""},"value":"balance should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""}],"id":918,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8086:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":927,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8086:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":928,"nodeType":"ExpressionStatement","src":"8086:62:0"},{"expression":{"arguments":[{"hexValue":"666f726b32","id":932,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8179:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},"value":"fork2"},{"hexValue":"3233343536","id":933,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8188:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"}],"expression":{"id":929,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8159:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":931,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"8159:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":934,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8159:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":935,"nodeType":"ExpressionStatement","src":"8159:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":942,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":939,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8224:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":937,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8212:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":938,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"8212:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":940,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8212:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3233343536","id":941,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8237:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"},"src":"8212:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":943,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8244:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":936,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8204:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":944,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8204:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":945,"nodeType":"ExpressionStatement","src":"8204:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":951,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":947,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8286:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":948,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8286:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":949,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8286:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"32","id":950,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8303:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"},"src":"8286:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652032","id":952,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8306:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""},"value":"value should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""}],"id":946,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8278:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":953,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8278:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":954,"nodeType":"ExpressionStatement","src":"8278:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":962,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":956,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8344:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":957,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8344:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"32","id":960,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8372:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"}],"id":959,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8364:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":958,"name":"uint256","nodeType":"ElementaryTypeName","src":"8364:7:0","typeDescriptions":{}}},"id":961,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8364:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8344:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652032","id":963,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8376:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""},"value":"balance should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""}],"id":955,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8336:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":964,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8336:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":965,"nodeType":"ExpressionStatement","src":"8336:62:0"}]},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"7776:3:0","parameters":{"id":873,"nodeType":"ParameterList","parameters":[],"src":"7779:2:0"},"returnParameters":{"id":874,"nodeType":"ParameterList","parameters":[],"src":"7791:0:0"},"scope":968,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkTester","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[968],"name":"ForkTester","nameLocation":"7603:10:0","scope":969,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/Vm.json b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/Vm.json
index 34175684c5aa..386172712744 100644
--- a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/Vm.json
+++ b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/Vm.json
@@ -1 +1 @@
-{"abi":[{"type":"function","name":"broadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"broadcast","inputs":[{"name":"msgSender","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"envOr","inputs":[{"name":"name","type":"string","internalType":"string"},{"name":"defaultValue","type":"bool","internalType":"bool"}],"outputs":[{"name":"value","type":"bool","internalType":"bool"}],"stateMutability":"view"},{"type":"function","name":"getNonce","inputs":[{"name":"account","type":"address","internalType":"address"}],"outputs":[{"name":"nonce","type":"uint64","internalType":"uint64"}],"stateMutability":"view"},{"type":"function","name":"parseJsonKeys","inputs":[{"name":"json","type":"string","internalType":"string"},{"name":"key","type":"string","internalType":"string"}],"outputs":[{"name":"keys","type":"string[]","internalType":"string[]"}],"stateMutability":"pure"},{"type":"function","name":"startBroadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"startBroadcast","inputs":[{"name":"msgSender","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"startPrank","inputs":[{"name":"msgSender","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"stopBroadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"stopPrank","inputs":[],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"broadcast()":"afc98040","broadcast(address)":"e6962cdb","envOr(string,bool)":"4777f3cf","getNonce(address)":"2d0335ab","parseJsonKeys(string,string)":"213e4198","startBroadcast()":"7fb5297f","startBroadcast(address)":"7fec2a8d","startPrank(address)":"06447d56","stopBroadcast()":"76eadd36","stopPrank()":"90c5013b"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"broadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"msgSender\",\"type\":\"address\"}],\"name\":\"broadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"name\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"defaultValue\",\"type\":\"bool\"}],\"name\":\"envOr\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"value\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"getNonce\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"json\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"key\",\"type\":\"string\"}],\"name\":\"parseJsonKeys\",\"outputs\":[{\"internalType\":\"string[]\",\"name\":\"keys\",\"type\":\"string[]\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"startBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"msgSender\",\"type\":\"address\"}],\"name\":\"startBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"msgSender\",\"type\":\"address\"}],\"name\":\"startPrank\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"stopBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"stopPrank\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"Vm\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3\",\"dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"broadcast"},{"inputs":[{"internalType":"address","name":"msgSender","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"broadcast"},{"inputs":[{"internalType":"string","name":"name","type":"string"},{"internalType":"bool","name":"defaultValue","type":"bool"}],"stateMutability":"view","type":"function","name":"envOr","outputs":[{"internalType":"bool","name":"value","type":"bool"}]},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"stateMutability":"view","type":"function","name":"getNonce","outputs":[{"internalType":"uint64","name":"nonce","type":"uint64"}]},{"inputs":[{"internalType":"string","name":"json","type":"string"},{"internalType":"string","name":"key","type":"string"}],"stateMutability":"pure","type":"function","name":"parseJsonKeys","outputs":[{"internalType":"string[]","name":"keys","type":"string[]"}]},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"startBroadcast"},{"inputs":[{"internalType":"address","name":"msgSender","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"startBroadcast"},{"inputs":[{"internalType":"address","name":"msgSender","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"startPrank"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"stopBroadcast"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"stopPrank"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"Vm"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d","urls":["bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3","dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":720,"exportedSymbols":{"FooBar":[719],"ScriptExample":[706],"Vm":[55],"console":[192]},"nodeType":"SourceUnit","src":"32:5967:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":55,"nodeType":"ContractDefinition","src":"120:616:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":55,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[55],"name":"Vm","nameLocation":"130:2:0","scope":720,"usedErrors":[]},{"id":192,"nodeType":"ContractDefinition","src":"791:1622:0","nodes":[{"id":61,"nodeType":"VariableDeclaration","src":"813:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"830:15:0","scope":192,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":56,"name":"address","nodeType":"ElementaryTypeName","src":"813:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":59,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"856:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":58,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"848:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":57,"name":"address","nodeType":"ElementaryTypeName","src":"848:7:0","typeDescriptions":{}}},"id":60,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"848:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":78,"nodeType":"FunctionDefinition","src":"906:221:0","nodes":[],"body":{"id":77,"nodeType":"Block","src":"1065:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1084:37:0","statements":[{"nodeType":"YulAssignment","src":"1098:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1107:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1098:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":67,"isOffset":false,"isSlot":false,"src":"1107:4:0","valueSize":1},{"declaration":74,"isOffset":false,"isSlot":false,"src":"1098:5:0","valueSize":1}],"id":76,"nodeType":"InlineAssembly","src":"1075:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"915:25:0","parameters":{"id":68,"nodeType":"ParameterList","parameters":[{"constant":false,"id":67,"mutability":"mutable","name":"fnIn","nameLocation":"987:4:0","nodeType":"VariableDeclaration","scope":78,"src":"950:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":66,"nodeType":"FunctionTypeName","parameterTypes":{"id":64,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":66,"src":"959:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":62,"name":"bytes","nodeType":"ElementaryTypeName","src":"959:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"958:14:0"},"returnParameterTypes":{"id":65,"nodeType":"ParameterList","parameters":[],"src":"987:0:0"},"src":"950:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"940:57:0"},"returnParameters":{"id":75,"nodeType":"ParameterList","parameters":[{"constant":false,"id":74,"mutability":"mutable","name":"fnOut","nameLocation":"1058:5:0","nodeType":"VariableDeclaration","scope":78,"src":"1021:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":73,"nodeType":"FunctionTypeName","parameterTypes":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":73,"src":"1030:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":69,"name":"bytes","nodeType":"ElementaryTypeName","src":"1030:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1029:14:0"},"returnParameterTypes":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"1058:0:0"},"src":"1021:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1020:44:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":90,"nodeType":"FunctionDefinition","src":"1133:133:0","nodes":[],"body":{"id":89,"nodeType":"Block","src":"1194:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":86,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":80,"src":"1251:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":84,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1230:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":83,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":78,"src":"1204:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":85,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":87,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":88,"nodeType":"ExpressionStatement","src":"1204:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1142:15:0","parameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"payload","nameLocation":"1171:7:0","nodeType":"VariableDeclaration","scope":90,"src":"1158:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":79,"name":"bytes","nodeType":"ElementaryTypeName","src":"1158:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1157:22:0"},"returnParameters":{"id":82,"nodeType":"ParameterList","parameters":[],"src":"1194:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1272:380:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1336:316:0","nodes":[],"statements":[{"assignments":[96],"declarations":[{"constant":false,"id":96,"mutability":"mutable","name":"payloadLength","nameLocation":"1354:13:0","nodeType":"VariableDeclaration","scope":105,"src":"1346:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":95,"name":"uint256","nodeType":"ElementaryTypeName","src":"1346:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":99,"initialValue":{"expression":{"id":97,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":92,"src":"1370:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":98,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1370:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1346:38:0"},{"assignments":[101],"declarations":[{"constant":false,"id":101,"mutability":"mutable","name":"consoleAddress","nameLocation":"1402:14:0","nodeType":"VariableDeclaration","scope":105,"src":"1394:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":100,"name":"address","nodeType":"ElementaryTypeName","src":"1394:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":103,"initialValue":{"id":102,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":61,"src":"1419:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1394:40:0"},{"AST":{"nodeType":"YulBlock","src":"1496:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1510:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1534:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1543:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1530:3:0"},"nodeType":"YulFunctionCall","src":"1530:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1514:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1559:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1579:3:0"},"nodeType":"YulFunctionCall","src":"1579:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1586:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1602:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1616:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1631:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"1634:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1568:10:0"},"nodeType":"YulFunctionCall","src":"1568:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1563:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":101,"isOffset":false,"isSlot":false,"src":"1586:14:0","valueSize":1},{"declaration":92,"isOffset":false,"isSlot":false,"src":"1534:7:0","valueSize":1},{"declaration":96,"isOffset":false,"isSlot":false,"src":"1616:13:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1487:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1281:19:0","parameters":{"id":93,"nodeType":"ParameterList","parameters":[{"constant":false,"id":92,"mutability":"mutable","name":"payload","nameLocation":"1314:7:0","nodeType":"VariableDeclaration","scope":106,"src":"1301:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":91,"name":"bytes","nodeType":"ElementaryTypeName","src":"1301:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1300:22:0"},"returnParameters":{"id":94,"nodeType":"ParameterList","parameters":[],"src":"1336:0:0"},"scope":192,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":120,"nodeType":"FunctionDefinition","src":"1658:121:0","nodes":[],"body":{"id":119,"nodeType":"Block","src":"1703:76:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":114,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1753:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":115,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1768:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":112,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1729:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":113,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1729:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":116,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1729:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":111,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1713:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":117,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1713:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":118,"nodeType":"ExpressionStatement","src":"1713:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1667:3:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"p0","nameLocation":"1685:2:0","nodeType":"VariableDeclaration","scope":120,"src":"1671:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":107,"name":"string","nodeType":"ElementaryTypeName","src":"1671:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"1670:18:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":137,"nodeType":"FunctionDefinition","src":"1785:139:0","nodes":[],"body":{"id":136,"nodeType":"Block","src":"1839:85:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":130,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1889:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":131,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":122,"src":"1909:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":132,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":124,"src":"1913:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":128,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1865:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":129,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1865:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":133,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1865:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":127,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1849:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":134,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1849:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":135,"nodeType":"ExpressionStatement","src":"1849:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1794:3:0","parameters":{"id":125,"nodeType":"ParameterList","parameters":[{"constant":false,"id":122,"mutability":"mutable","name":"p0","nameLocation":"1812:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1798:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":121,"name":"string","nodeType":"ElementaryTypeName","src":"1798:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":124,"mutability":"mutable","name":"p1","nameLocation":"1821:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1816:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":123,"name":"bool","nodeType":"ElementaryTypeName","src":"1816:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"1797:27:0"},"returnParameters":{"id":126,"nodeType":"ParameterList","parameters":[],"src":"1839:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":154,"nodeType":"FunctionDefinition","src":"1930:145:0","nodes":[],"body":{"id":153,"nodeType":"Block","src":"1987:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":147,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2037:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":148,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":139,"src":"2060:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":149,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":141,"src":"2064:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":145,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2013:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":146,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2013:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":150,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2013:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":144,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1997:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":151,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1997:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":152,"nodeType":"ExpressionStatement","src":"1997:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1939:3:0","parameters":{"id":142,"nodeType":"ParameterList","parameters":[{"constant":false,"id":139,"mutability":"mutable","name":"p0","nameLocation":"1957:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1943:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":138,"name":"string","nodeType":"ElementaryTypeName","src":"1943:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":141,"mutability":"mutable","name":"p1","nameLocation":"1969:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1961:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":140,"name":"uint256","nodeType":"ElementaryTypeName","src":"1961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1942:30:0"},"returnParameters":{"id":143,"nodeType":"ParameterList","parameters":[],"src":"1987:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":171,"nodeType":"FunctionDefinition","src":"2081:145:0","nodes":[],"body":{"id":170,"nodeType":"Block","src":"2138:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":164,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2188:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":165,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":156,"src":"2211:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":166,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":158,"src":"2215:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":162,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2164:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":163,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2164:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":167,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2164:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":161,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2148:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":168,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2148:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":169,"nodeType":"ExpressionStatement","src":"2148:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2090:3:0","parameters":{"id":159,"nodeType":"ParameterList","parameters":[{"constant":false,"id":156,"mutability":"mutable","name":"p0","nameLocation":"2108:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2094:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":155,"name":"string","nodeType":"ElementaryTypeName","src":"2094:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":158,"mutability":"mutable","name":"p1","nameLocation":"2120:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2112:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":157,"name":"address","nodeType":"ElementaryTypeName","src":"2112:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2093:30:0"},"returnParameters":{"id":160,"nodeType":"ParameterList","parameters":[],"src":"2138:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":191,"nodeType":"FunctionDefinition","src":"2232:179:0","nodes":[],"body":{"id":190,"nodeType":"Block","src":"2313:98:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":183,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2363:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":184,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":173,"src":"2392:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":185,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":175,"src":"2396:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":186,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":177,"src":"2400:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":181,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2339:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":182,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2339:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":187,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2339:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":180,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2323:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":188,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2323:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":189,"nodeType":"ExpressionStatement","src":"2323:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2241:3:0","parameters":{"id":178,"nodeType":"ParameterList","parameters":[{"constant":false,"id":173,"mutability":"mutable","name":"p0","nameLocation":"2259:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2245:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":172,"name":"string","nodeType":"ElementaryTypeName","src":"2245:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":175,"mutability":"mutable","name":"p1","nameLocation":"2277:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2263:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":174,"name":"string","nodeType":"ElementaryTypeName","src":"2263:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":177,"mutability":"mutable","name":"p2","nameLocation":"2295:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2281:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":176,"name":"string","nodeType":"ElementaryTypeName","src":"2281:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2244:54:0"},"returnParameters":{"id":179,"nodeType":"ParameterList","parameters":[],"src":"2313:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[192],"name":"console","nameLocation":"799:7:0","scope":720,"usedErrors":[]},{"id":706,"nodeType":"ContractDefinition","src":"2541:3359:0","nodes":[{"id":207,"nodeType":"VariableDeclaration","src":"2571:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"2597:10:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":194,"name":"address","nodeType":"ElementaryTypeName","src":"2571:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":202,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2644:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":201,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"2634:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":203,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2634:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":200,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2626:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":199,"name":"uint256","nodeType":"ElementaryTypeName","src":"2626:7:0","typeDescriptions":{}}},"id":204,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2626:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":198,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2618:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":197,"name":"uint160","nodeType":"ElementaryTypeName","src":"2618:7:0","typeDescriptions":{}}},"id":205,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2618:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":196,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2610:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":195,"name":"address","nodeType":"ElementaryTypeName","src":"2610:7:0","typeDescriptions":{}}},"id":206,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2610:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":213,"nodeType":"VariableDeclaration","src":"2671:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"2692:2:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"},"typeName":{"id":209,"nodeType":"UserDefinedTypeName","pathNode":{"id":208,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":55,"src":"2671:2:0"},"referencedDeclaration":55,"src":"2671:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"value":{"arguments":[{"id":211,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":207,"src":"2700:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":210,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":55,"src":"2697:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$55_$","typeString":"type(contract Vm)"}},"id":212,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2697:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"visibility":"internal"},{"id":215,"nodeType":"VariableDeclaration","src":"2775:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"2790:7:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":214,"name":"uint256","nodeType":"ElementaryTypeName","src":"2775:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":378,"nodeType":"FunctionDefinition","src":"2887:949:0","nodes":[],"body":{"id":377,"nodeType":"Block","src":"2909:927:0","nodes":[],"statements":[{"assignments":[220],"declarations":[{"constant":false,"id":220,"mutability":"mutable","name":"x","nameLocation":"2924:1:0","nodeType":"VariableDeclaration","scope":377,"src":"2919:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":219,"name":"bool","nodeType":"ElementaryTypeName","src":"2919:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":226,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":223,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2937:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":224,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"2953:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":221,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"2928:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":222,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"2928:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":225,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2928:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"2919:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2981:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":231,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3004:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":227,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"2969:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":229,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":137,"src":"2969:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":232,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2969:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":233,"nodeType":"ExpressionStatement","src":"2969:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":237,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3029:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":240,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3054:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":239,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3046:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":238,"name":"address","nodeType":"ElementaryTypeName","src":"3046:7:0","typeDescriptions":{}}},"id":241,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3046:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":234,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3017:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":236,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3017:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":242,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3017:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":243,"nodeType":"ExpressionStatement","src":"3017:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":247,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3082:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":252,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3120:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":251,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3112:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":250,"name":"address","nodeType":"ElementaryTypeName","src":"3112:7:0","typeDescriptions":{}}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3112:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":248,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3100:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":249,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3100:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":254,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3100:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":244,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3070:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":246,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3070:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":255,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3070:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":256,"nodeType":"ExpressionStatement","src":"3070:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":260,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3149:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":263,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3172:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3172:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":262,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3164:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":261,"name":"address","nodeType":"ElementaryTypeName","src":"3164:7:0","typeDescriptions":{}}},"id":265,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3164:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":257,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3137:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":259,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3137:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":266,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3137:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":267,"nodeType":"ExpressionStatement","src":"3137:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":271,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3206:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":276,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3242:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3242:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":275,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3234:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":274,"name":"address","nodeType":"ElementaryTypeName","src":"3234:7:0","typeDescriptions":{}}},"id":278,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3234:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":272,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3222:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":273,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3222:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":279,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3222:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":268,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3194:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3194:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":280,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3194:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":281,"nodeType":"ExpressionStatement","src":"3194:61:0"},{"assignments":[283],"declarations":[{"constant":false,"id":283,"mutability":"mutable","name":"json","nameLocation":"3280:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3266:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":282,"name":"string","nodeType":"ElementaryTypeName","src":"3266:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":285,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":284,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3287:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3266:55:0"},{"assignments":[290],"declarations":[{"constant":false,"id":290,"mutability":"mutable","name":"keys","nameLocation":"3347:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3331:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":288,"name":"string","nodeType":"ElementaryTypeName","src":"3331:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":289,"nodeType":"ArrayTypeName","src":"3331:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":296,"initialValue":{"arguments":[{"id":293,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":283,"src":"3371:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":294,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3377:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":291,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3354:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3354:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":295,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3354:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3331:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":300,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3414:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":301,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3422:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":303,"indexExpression":{"hexValue":"30","id":302,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3427:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3422:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":304,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3431:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":306,"indexExpression":{"hexValue":"31","id":305,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3436:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3431:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":297,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3402:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":299,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":191,"src":"3402:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3402:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":308,"nodeType":"ExpressionStatement","src":"3402:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3461:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":309,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3450:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":311,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3450:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":313,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3450:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":314,"nodeType":"ExpressionStatement","src":"3450:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3517:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":321,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3509:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":320,"name":"uint160","nodeType":"ElementaryTypeName","src":"3509:7:0","typeDescriptions":{}}},"id":323,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":319,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3501:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":318,"name":"address","nodeType":"ElementaryTypeName","src":"3501:7:0","typeDescriptions":{}}},"id":324,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3501:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":315,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3487:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":317,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"3487:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":325,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3487:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":326,"nodeType":"ExpressionStatement","src":"3487:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3545:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":327,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3534:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":329,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3534:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":331,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3534:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":332,"nodeType":"ExpressionStatement","src":"3534:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":336,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3582:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":339,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3617:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":340,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3617:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":338,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3609:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":337,"name":"address","nodeType":"ElementaryTypeName","src":"3609:7:0","typeDescriptions":{}}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3609:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":333,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3570:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3570:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":342,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3570:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":343,"nodeType":"ExpressionStatement","src":"3570:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":347,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3651:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":350,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3689:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3681:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":348,"name":"address","nodeType":"ElementaryTypeName","src":"3681:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":344,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3639:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":346,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3639:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":352,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3639:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":353,"nodeType":"ExpressionStatement","src":"3639:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":357,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3716:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":354,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3705:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":356,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3705:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":358,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3705:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":359,"nodeType":"ExpressionStatement","src":"3705:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":360,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3741:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":362,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"3741:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3741:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":364,"nodeType":"ExpressionStatement","src":"3741:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":368,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3776:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":365,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3765:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":367,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3765:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3765:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":370,"nodeType":"ExpressionStatement","src":"3765:33:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":374,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3821:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":371,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3809:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":373,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"3809:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":375,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3809:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":376,"nodeType":"ExpressionStatement","src":"3809:20:0"}]},"documentation":{"id":216,"nodeType":"StructuredDocumentation","src":"2804:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"2896:3:0","parameters":{"id":217,"nodeType":"ParameterList","parameters":[],"src":"2899:2:0"},"returnParameters":{"id":218,"nodeType":"ParameterList","parameters":[],"src":"2909:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":609,"nodeType":"FunctionDefinition","src":"3903:1258:0","nodes":[],"body":{"id":608,"nodeType":"Block","src":"3934:1227:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3956:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":392,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3999:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":391,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3991:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":390,"name":"address","nodeType":"ElementaryTypeName","src":"3991:7:0","typeDescriptions":{}}},"id":393,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3991:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3979:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":389,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3979:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":394,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3979:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":387,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3971:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":386,"name":"uint256","nodeType":"ElementaryTypeName","src":"3971:7:0","typeDescriptions":{}}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3971:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":382,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3944:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3944:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":396,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3944:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":397,"nodeType":"ExpressionStatement","src":"3944:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":401,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4030:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":398,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4018:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":400,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4018:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":402,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4018:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":403,"nodeType":"ExpressionStatement","src":"4018:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":404,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4057:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":406,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"4057:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":407,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4057:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":408,"nodeType":"ExpressionStatement","src":"4057:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4092:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":409,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4081:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":411,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4081:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":413,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4081:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":414,"nodeType":"ExpressionStatement","src":"4081:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":418,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4128:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":415,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4117:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":417,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4117:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4117:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":420,"nodeType":"ExpressionStatement","src":"4117:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":424,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4166:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":421,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4154:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":423,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4154:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":425,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4154:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":426,"nodeType":"ExpressionStatement","src":"4154:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":434,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4231:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":433,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4223:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":432,"name":"uint160","nodeType":"ElementaryTypeName","src":"4223:7:0","typeDescriptions":{}}},"id":435,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4223:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":431,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4215:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":430,"name":"address","nodeType":"ElementaryTypeName","src":"4215:7:0","typeDescriptions":{}}},"id":436,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4215:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":427,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4197:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":429,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4197:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":437,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4197:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":438,"nodeType":"ExpressionStatement","src":"4197:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":442,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4263:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":439,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4252:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":441,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4252:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":443,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4252:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":444,"nodeType":"ExpressionStatement","src":"4252:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":448,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4302:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":445,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4291:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4291:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":449,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4291:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":450,"nodeType":"ExpressionStatement","src":"4291:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":454,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4344:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":451,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4330:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":705,"src":"4330:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":455,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4330:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":456,"nodeType":"ExpressionStatement","src":"4330:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":457,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4371:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":459,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4371:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":460,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4371:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":461,"nodeType":"ExpressionStatement","src":"4371:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":465,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4410:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":462,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4399:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":464,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4399:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":466,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4399:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":467,"nodeType":"ExpressionStatement","src":"4399:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":471,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4451:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":468,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4439:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":470,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4439:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4439:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":473,"nodeType":"ExpressionStatement","src":"4439:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":481,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4512:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":480,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4504:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":479,"name":"uint160","nodeType":"ElementaryTypeName","src":"4504:7:0","typeDescriptions":{}}},"id":482,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4504:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":478,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4496:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":477,"name":"address","nodeType":"ElementaryTypeName","src":"4496:7:0","typeDescriptions":{}}},"id":483,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4496:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":474,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4478:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":476,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4478:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4478:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":485,"nodeType":"ExpressionStatement","src":"4478:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":489,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4544:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":486,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4531:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":488,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":678,"src":"4531:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":490,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4531:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":491,"nodeType":"ExpressionStatement","src":"4531:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":492,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4563:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":494,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4563:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4563:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":496,"nodeType":"ExpressionStatement","src":"4563:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":500,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4604:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":497,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4592:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":499,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4592:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4592:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":502,"nodeType":"ExpressionStatement","src":"4592:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":510,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4665:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4657:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":508,"name":"uint160","nodeType":"ElementaryTypeName","src":"4657:7:0","typeDescriptions":{}}},"id":511,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":507,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4649:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":506,"name":"address","nodeType":"ElementaryTypeName","src":"4649:7:0","typeDescriptions":{}}},"id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4649:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":503,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4636:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":505,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4636:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":513,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4636:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":514,"nodeType":"ExpressionStatement","src":"4636:40:0"},{"assignments":[517],"declarations":[{"constant":false,"id":517,"mutability":"mutable","name":"x","nameLocation":"4693:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4686:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":516,"nodeType":"UserDefinedTypeName","pathNode":{"id":515,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4686:6:0"},"referencedDeclaration":719,"src":"4686:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":523,"initialValue":{"arguments":[{"hexValue":"31323334","id":521,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4708:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":520,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4697:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":519,"nodeType":"UserDefinedTypeName","pathNode":{"id":518,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4701:6:0"},"referencedDeclaration":719,"src":"4701:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":522,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4697:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4686:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":529,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":525,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":517,"src":"4731:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":526,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4731:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4731:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":528,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4742:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4731:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":524,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4723:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":530,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4723:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":531,"nodeType":"ExpressionStatement","src":"4723:24:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":535,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4770:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":532,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4758:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":534,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4758:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":536,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4758:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":537,"nodeType":"ExpressionStatement","src":"4758:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":545,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4820:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":544,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4812:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":543,"name":"uint160","nodeType":"ElementaryTypeName","src":"4812:7:0","typeDescriptions":{}}},"id":546,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4812:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":542,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4804:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":541,"name":"address","nodeType":"ElementaryTypeName","src":"4804:7:0","typeDescriptions":{}}},"id":547,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4804:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":538,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4791:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":540,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4791:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4791:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":549,"nodeType":"ExpressionStatement","src":"4791:38:0"},{"assignments":[552],"declarations":[{"constant":false,"id":552,"mutability":"mutable","name":"y","nameLocation":"4846:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4839:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":551,"nodeType":"UserDefinedTypeName","pathNode":{"id":550,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4839:6:0"},"referencedDeclaration":719,"src":"4839:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":566,"initialValue":{"arguments":[{"hexValue":"31323334","id":564,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4889:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":555,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4850:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":554,"nodeType":"UserDefinedTypeName","pathNode":{"id":553,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4854:6:0"},"referencedDeclaration":719,"src":"4854:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":563,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4883:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":559,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4875:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":558,"name":"uint256","nodeType":"ElementaryTypeName","src":"4875:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4875:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":557,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4867:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":556,"name":"bytes32","nodeType":"ElementaryTypeName","src":"4867:7:0","typeDescriptions":{}}},"id":562,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4867:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"4850:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":565,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4850:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4839:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":568,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":552,"src":"4912:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":569,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4912:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":570,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4912:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":571,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4923:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4912:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":567,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4904:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4904:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"4904:24:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4950:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4938:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4938:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4938:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"4938:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5042:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5042:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":584,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5042:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":585,"nodeType":"ExpressionStatement","src":"5042:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5077:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":588,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5066:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":587,"nodeType":"UserDefinedTypeName","pathNode":{"id":586,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"5070:6:0"},"referencedDeclaration":719,"src":"5070:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":590,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5066:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":591,"nodeType":"ExpressionStatement","src":"5066:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":595,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5105:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":602,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5146:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":601,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5138:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":600,"name":"address","nodeType":"ElementaryTypeName","src":"5138:7:0","typeDescriptions":{}}},"id":603,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5138:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":598,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5126:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":599,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5126:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5126:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":597,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5118:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":596,"name":"uint256","nodeType":"ElementaryTypeName","src":"5118:7:0","typeDescriptions":{}}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5118:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":592,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5093:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":594,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"5093:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":606,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5093:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":607,"nodeType":"ExpressionStatement","src":"5093:61:0"}]},"documentation":{"id":379,"nodeType":"StructuredDocumentation","src":"3842:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"3912:12:0","parameters":{"id":380,"nodeType":"ParameterList","parameters":[],"src":"3924:2:0"},"returnParameters":{"id":381,"nodeType":"ParameterList","parameters":[],"src":"3934:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":633,"nodeType":"FunctionDefinition","src":"5256:143:0","nodes":[],"body":{"id":632,"nodeType":"Block","src":"5305:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":618,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":612,"src":"5327:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":615,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5315:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":617,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5315:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5315:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":620,"nodeType":"ExpressionStatement","src":"5315:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5352:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":627,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"5380:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":628,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"5380:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":626,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5372:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":625,"name":"address","nodeType":"ElementaryTypeName","src":"5372:7:0","typeDescriptions":{}}},"id":629,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5372:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":621,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5340:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":623,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"5340:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":630,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5340:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":631,"nodeType":"ExpressionStatement","src":"5340:52:0"}]},"documentation":{"id":610,"nodeType":"StructuredDocumentation","src":"5167:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"5265:5:0","parameters":{"id":613,"nodeType":"ParameterList","parameters":[{"constant":false,"id":612,"mutability":"mutable","name":"_v","nameLocation":"5287:2:0","nodeType":"VariableDeclaration","scope":633,"src":"5271:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":611,"name":"string","nodeType":"ElementaryTypeName","src":"5271:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5270:20:0"},"returnParameters":{"id":614,"nodeType":"ParameterList","parameters":[],"src":"5305:0:0"},"scope":706,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":648,"nodeType":"FunctionDefinition","src":"5405:95:0","nodes":[],"body":{"id":647,"nodeType":"Block","src":"5449:51:0","nodes":[],"statements":[{"expression":{"id":639,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5459:9:0","subExpression":{"id":638,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5459:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":640,"nodeType":"ExpressionStatement","src":"5459:9:0"},{"expression":{"arguments":[{"id":644,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":635,"src":"5490:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":641,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5478:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":643,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5478:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":645,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5478:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":646,"nodeType":"ExpressionStatement","src":"5478:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"5414:5:0","parameters":{"id":636,"nodeType":"ParameterList","parameters":[{"constant":false,"id":635,"mutability":"mutable","name":"_v","nameLocation":"5436:2:0","nodeType":"VariableDeclaration","scope":648,"src":"5420:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":634,"name":"string","nodeType":"ElementaryTypeName","src":"5420:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5419:20:0"},"returnParameters":{"id":637,"nodeType":"ParameterList","parameters":[],"src":"5449:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":663,"nodeType":"FunctionDefinition","src":"5506:95:0","nodes":[],"body":{"id":662,"nodeType":"Block","src":"5550:51:0","nodes":[],"statements":[{"expression":{"id":654,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5560:9:0","subExpression":{"id":653,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5560:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":655,"nodeType":"ExpressionStatement","src":"5560:9:0"},{"expression":{"arguments":[{"id":659,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":650,"src":"5591:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":656,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5579:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":658,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5579:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":660,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5579:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":661,"nodeType":"ExpressionStatement","src":"5579:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"5515:5:0","parameters":{"id":651,"nodeType":"ParameterList","parameters":[{"constant":false,"id":650,"mutability":"mutable","name":"_v","nameLocation":"5537:2:0","nodeType":"VariableDeclaration","scope":663,"src":"5521:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":649,"name":"string","nodeType":"ElementaryTypeName","src":"5521:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5520:20:0"},"returnParameters":{"id":652,"nodeType":"ParameterList","parameters":[],"src":"5550:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":678,"nodeType":"FunctionDefinition","src":"5607:98:0","nodes":[],"body":{"id":677,"nodeType":"Block","src":"5653:52:0","nodes":[],"statements":[{"expression":{"id":669,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5663:9:0","subExpression":{"id":668,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5663:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":670,"nodeType":"ExpressionStatement","src":"5663:9:0"},{"expression":{"arguments":[{"id":674,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":665,"src":"5695:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":671,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5682:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":673,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":693,"src":"5682:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":675,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5682:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":676,"nodeType":"ExpressionStatement","src":"5682:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"5616:7:0","parameters":{"id":666,"nodeType":"ParameterList","parameters":[{"constant":false,"id":665,"mutability":"mutable","name":"_v","nameLocation":"5640:2:0","nodeType":"VariableDeclaration","scope":678,"src":"5624:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":664,"name":"string","nodeType":"ElementaryTypeName","src":"5624:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5623:20:0"},"returnParameters":{"id":667,"nodeType":"ParameterList","parameters":[],"src":"5653:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":693,"nodeType":"FunctionDefinition","src":"5711:97:0","nodes":[],"body":{"id":692,"nodeType":"Block","src":"5757:51:0","nodes":[],"statements":[{"expression":{"id":684,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5767:9:0","subExpression":{"id":683,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5767:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":685,"nodeType":"ExpressionStatement","src":"5767:9:0"},{"expression":{"arguments":[{"id":689,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":680,"src":"5798:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":686,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5786:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":688,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5786:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":690,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5786:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":691,"nodeType":"ExpressionStatement","src":"5786:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"5720:7:0","parameters":{"id":681,"nodeType":"ParameterList","parameters":[{"constant":false,"id":680,"mutability":"mutable","name":"_v","nameLocation":"5744:2:0","nodeType":"VariableDeclaration","scope":693,"src":"5728:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":679,"name":"string","nodeType":"ElementaryTypeName","src":"5728:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5727:20:0"},"returnParameters":{"id":682,"nodeType":"ParameterList","parameters":[],"src":"5757:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":705,"nodeType":"FunctionDefinition","src":"5814:84:0","nodes":[],"body":{"id":704,"nodeType":"Block","src":"5866:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":701,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":695,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":698,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5876:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":700,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5876:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":702,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5876:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":703,"nodeType":"ExpressionStatement","src":"5876:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"5823:8:0","parameters":{"id":696,"nodeType":"ParameterList","parameters":[{"constant":false,"id":695,"mutability":"mutable","name":"_v","nameLocation":"5848:2:0","nodeType":"VariableDeclaration","scope":705,"src":"5832:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":694,"name":"string","nodeType":"ElementaryTypeName","src":"5832:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5831:20:0"},"returnParameters":{"id":697,"nodeType":"ParameterList","parameters":[],"src":"5866:0:0"},"scope":706,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[719],"contractKind":"contract","documentation":{"id":193,"nodeType":"StructuredDocumentation","src":"2415:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[706],"name":"ScriptExample","nameLocation":"2550:13:0","scope":720,"usedErrors":[]},{"id":719,"nodeType":"ContractDefinition","src":"5902:96:0","nodes":[{"id":708,"nodeType":"VariableDeclaration","src":"5924:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"5939:3:0","scope":719,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":707,"name":"uint256","nodeType":"ElementaryTypeName","src":"5924:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":718,"nodeType":"FunctionDefinition","src":"5949:47:0","nodes":[],"body":{"id":717,"nodeType":"Block","src":"5972:24:0","nodes":[],"statements":[{"expression":{"id":715,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":713,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":708,"src":"5982:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":714,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":710,"src":"5988:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"5982:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":716,"nodeType":"ExpressionStatement","src":"5982:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":711,"nodeType":"ParameterList","parameters":[{"constant":false,"id":710,"mutability":"mutable","name":"v","nameLocation":"5969:1:0","nodeType":"VariableDeclaration","scope":718,"src":"5961:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":709,"name":"uint256","nodeType":"ElementaryTypeName","src":"5961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"5960:11:0"},"returnParameters":{"id":712,"nodeType":"ParameterList","parameters":[],"src":"5972:0:0"},"scope":719,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[719],"name":"FooBar","nameLocation":"5911:6:0","scope":720,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
+{"abi":[{"type":"function","name":"allowCheatcodes","inputs":[{"name":"account","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"broadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"broadcast","inputs":[{"name":"msgSender","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"createSelectFork","inputs":[{"name":"forkName","type":"string","internalType":"string"},{"name":"blockNumber","type":"uint256","internalType":"uint256"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"nonpayable"},{"type":"function","name":"envOr","inputs":[{"name":"name","type":"string","internalType":"string"},{"name":"defaultValue","type":"bool","internalType":"bool"}],"outputs":[{"name":"value","type":"bool","internalType":"bool"}],"stateMutability":"view"},{"type":"function","name":"etch","inputs":[{"name":"target","type":"address","internalType":"address"},{"name":"newRuntimeBytecode","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"getDeployedCode","inputs":[{"name":"artifactPath","type":"string","internalType":"string"}],"outputs":[{"name":"runtimeBytecode","type":"bytes","internalType":"bytes"}],"stateMutability":"view"},{"type":"function","name":"getNonce","inputs":[{"name":"account","type":"address","internalType":"address"}],"outputs":[{"name":"nonce","type":"uint64","internalType":"uint64"}],"stateMutability":"view"},{"type":"function","name":"parseJsonKeys","inputs":[{"name":"json","type":"string","internalType":"string"},{"name":"key","type":"string","internalType":"string"}],"outputs":[{"name":"keys","type":"string[]","internalType":"string[]"}],"stateMutability":"pure"},{"type":"function","name":"startBroadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"startBroadcast","inputs":[{"name":"msgSender","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"startPrank","inputs":[{"name":"msgSender","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"stopBroadcast","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"stopPrank","inputs":[],"outputs":[],"stateMutability":"nonpayable"}],"bytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"deployedBytecode":{"object":"0x","sourceMap":"","linkReferences":{}},"methodIdentifiers":{"allowCheatcodes(address)":"ea060291","broadcast()":"afc98040","broadcast(address)":"e6962cdb","createSelectFork(string,uint256)":"71ee464d","envOr(string,bool)":"4777f3cf","etch(address,bytes)":"b4d6c782","getDeployedCode(string)":"3ebf73b4","getNonce(address)":"2d0335ab","parseJsonKeys(string,string)":"213e4198","startBroadcast()":"7fb5297f","startBroadcast(address)":"7fec2a8d","startPrank(address)":"06447d56","stopBroadcast()":"76eadd36","stopPrank()":"90c5013b"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"allowCheatcodes\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"broadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"msgSender\",\"type\":\"address\"}],\"name\":\"broadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"forkName\",\"type\":\"string\"},{\"internalType\":\"uint256\",\"name\":\"blockNumber\",\"type\":\"uint256\"}],\"name\":\"createSelectFork\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"name\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"defaultValue\",\"type\":\"bool\"}],\"name\":\"envOr\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"value\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"newRuntimeBytecode\",\"type\":\"bytes\"}],\"name\":\"etch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"artifactPath\",\"type\":\"string\"}],\"name\":\"getDeployedCode\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"runtimeBytecode\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"account\",\"type\":\"address\"}],\"name\":\"getNonce\",\"outputs\":[{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"json\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"key\",\"type\":\"string\"}],\"name\":\"parseJsonKeys\",\"outputs\":[{\"internalType\":\"string[]\",\"name\":\"keys\",\"type\":\"string[]\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"startBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"msgSender\",\"type\":\"address\"}],\"name\":\"startBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"msgSender\",\"type\":\"address\"}],\"name\":\"startPrank\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"stopBroadcast\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"stopPrank\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"Vm\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28\",\"dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"address","name":"account","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"allowCheatcodes"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"broadcast"},{"inputs":[{"internalType":"address","name":"msgSender","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"broadcast"},{"inputs":[{"internalType":"string","name":"forkName","type":"string"},{"internalType":"uint256","name":"blockNumber","type":"uint256"}],"stateMutability":"nonpayable","type":"function","name":"createSelectFork","outputs":[{"internalType":"uint256","name":"","type":"uint256"}]},{"inputs":[{"internalType":"string","name":"name","type":"string"},{"internalType":"bool","name":"defaultValue","type":"bool"}],"stateMutability":"view","type":"function","name":"envOr","outputs":[{"internalType":"bool","name":"value","type":"bool"}]},{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"bytes","name":"newRuntimeBytecode","type":"bytes"}],"stateMutability":"nonpayable","type":"function","name":"etch"},{"inputs":[{"internalType":"string","name":"artifactPath","type":"string"}],"stateMutability":"view","type":"function","name":"getDeployedCode","outputs":[{"internalType":"bytes","name":"runtimeBytecode","type":"bytes"}]},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"stateMutability":"view","type":"function","name":"getNonce","outputs":[{"internalType":"uint64","name":"nonce","type":"uint64"}]},{"inputs":[{"internalType":"string","name":"json","type":"string"},{"internalType":"string","name":"key","type":"string"}],"stateMutability":"pure","type":"function","name":"parseJsonKeys","outputs":[{"internalType":"string[]","name":"keys","type":"string[]"}]},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"startBroadcast"},{"inputs":[{"internalType":"address","name":"msgSender","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"startBroadcast"},{"inputs":[{"internalType":"address","name":"msgSender","type":"address"}],"stateMutability":"nonpayable","type":"function","name":"startPrank"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"stopBroadcast"},{"inputs":[],"stateMutability":"nonpayable","type":"function","name":"stopPrank"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"Vm"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da","urls":["bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28","dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":969,"exportedSymbols":{"FooBar":[799],"ForkTester":[968],"ForkedContract":[852],"NonceGetter":[833],"ScriptExample":[786],"Vm":[83],"console":[220]},"nodeType":"SourceUnit","src":"32:8375:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":83,"nodeType":"ContractDefinition","src":"120:969:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":83,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":61,"nodeType":"FunctionDefinition","src":"739:108:0","nodes":[],"functionSelector":"3ebf73b4","implemented":false,"kind":"function","modifiers":[],"name":"getDeployedCode","nameLocation":"748:15:0","parameters":{"id":57,"nodeType":"ParameterList","parameters":[{"constant":false,"id":56,"mutability":"mutable","name":"artifactPath","nameLocation":"780:12:0","nodeType":"VariableDeclaration","scope":61,"src":"764:28:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":55,"name":"string","nodeType":"ElementaryTypeName","src":"764:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"763:30:0"},"returnParameters":{"id":60,"nodeType":"ParameterList","parameters":[{"constant":false,"id":59,"mutability":"mutable","name":"runtimeBytecode","nameLocation":"830:15:0","nodeType":"VariableDeclaration","scope":61,"src":"817:28:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":58,"name":"bytes","nodeType":"ElementaryTypeName","src":"817:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"816:30:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":68,"nodeType":"FunctionDefinition","src":"852:74:0","nodes":[],"functionSelector":"b4d6c782","implemented":false,"kind":"function","modifiers":[],"name":"etch","nameLocation":"861:4:0","parameters":{"id":66,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"target","nameLocation":"874:6:0","nodeType":"VariableDeclaration","scope":68,"src":"866:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":62,"name":"address","nodeType":"ElementaryTypeName","src":"866:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":65,"mutability":"mutable","name":"newRuntimeBytecode","nameLocation":"897:18:0","nodeType":"VariableDeclaration","scope":68,"src":"882:33:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":64,"name":"bytes","nodeType":"ElementaryTypeName","src":"882:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"865:51:0"},"returnParameters":{"id":67,"nodeType":"ParameterList","parameters":[],"src":"925:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":73,"nodeType":"FunctionDefinition","src":"931:51:0","nodes":[],"functionSelector":"ea060291","implemented":false,"kind":"function","modifiers":[],"name":"allowCheatcodes","nameLocation":"940:15:0","parameters":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"account","nameLocation":"964:7:0","nodeType":"VariableDeclaration","scope":73,"src":"956:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":69,"name":"address","nodeType":"ElementaryTypeName","src":"956:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"955:17:0"},"returnParameters":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"981:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":82,"nodeType":"FunctionDefinition","src":"987:100:0","nodes":[],"functionSelector":"71ee464d","implemented":false,"kind":"function","modifiers":[],"name":"createSelectFork","nameLocation":"996:16:0","parameters":{"id":78,"nodeType":"ParameterList","parameters":[{"constant":false,"id":75,"mutability":"mutable","name":"forkName","nameLocation":"1029:8:0","nodeType":"VariableDeclaration","scope":82,"src":"1013:24:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":74,"name":"string","nodeType":"ElementaryTypeName","src":"1013:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":77,"mutability":"mutable","name":"blockNumber","nameLocation":"1047:11:0","nodeType":"VariableDeclaration","scope":82,"src":"1039:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":76,"name":"uint256","nodeType":"ElementaryTypeName","src":"1039:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1012:47:0"},"returnParameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":82,"src":"1078:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":79,"name":"uint256","nodeType":"ElementaryTypeName","src":"1078:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1077:9:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[83],"name":"Vm","nameLocation":"130:2:0","scope":969,"usedErrors":[]},{"id":220,"nodeType":"ContractDefinition","src":"1144:1851:0","nodes":[{"id":89,"nodeType":"VariableDeclaration","src":"1166:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"1183:15:0","scope":220,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":84,"name":"address","nodeType":"ElementaryTypeName","src":"1166:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":87,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"1209:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":86,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"1201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":85,"name":"address","nodeType":"ElementaryTypeName","src":"1201:7:0","typeDescriptions":{}}},"id":88,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1201:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1259:235:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1432:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1451:37:0","statements":[{"nodeType":"YulAssignment","src":"1465:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1474:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1465:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":95,"isOffset":false,"isSlot":false,"src":"1474:4:0","valueSize":1},{"declaration":102,"isOffset":false,"isSlot":false,"src":"1465:5:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1442:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"1268:25:0","parameters":{"id":96,"nodeType":"ParameterList","parameters":[{"constant":false,"id":95,"mutability":"mutable","name":"fnIn","nameLocation":"1331:4:0","nodeType":"VariableDeclaration","scope":106,"src":"1294:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":94,"nodeType":"FunctionTypeName","parameterTypes":{"id":92,"nodeType":"ParameterList","parameters":[{"constant":false,"id":91,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":94,"src":"1303:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":90,"name":"bytes","nodeType":"ElementaryTypeName","src":"1303:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1302:14:0"},"returnParameterTypes":{"id":93,"nodeType":"ParameterList","parameters":[],"src":"1331:0:0"},"src":"1294:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"1293:43:0"},"returnParameters":{"id":103,"nodeType":"ParameterList","parameters":[{"constant":false,"id":102,"mutability":"mutable","name":"fnOut","nameLocation":"1421:5:0","nodeType":"VariableDeclaration","scope":106,"src":"1384:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":101,"nodeType":"FunctionTypeName","parameterTypes":{"id":99,"nodeType":"ParameterList","parameters":[{"constant":false,"id":98,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":101,"src":"1393:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":97,"name":"bytes","nodeType":"ElementaryTypeName","src":"1393:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1392:14:0"},"returnParameterTypes":{"id":100,"nodeType":"ParameterList","parameters":[],"src":"1421:0:0"},"src":"1384:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1383:44:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":118,"nodeType":"FunctionDefinition","src":"1500:133:0","nodes":[],"body":{"id":117,"nodeType":"Block","src":"1561:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":114,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1618:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":112,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":134,"src":"1597:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":111,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1571:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":113,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":115,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":116,"nodeType":"ExpressionStatement","src":"1571:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1509:15:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"payload","nameLocation":"1538:7:0","nodeType":"VariableDeclaration","scope":118,"src":"1525:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":107,"name":"bytes","nodeType":"ElementaryTypeName","src":"1525:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1524:22:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1561:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":134,"nodeType":"FunctionDefinition","src":"1639:380:0","nodes":[],"body":{"id":133,"nodeType":"Block","src":"1703:316:0","nodes":[],"statements":[{"assignments":[124],"declarations":[{"constant":false,"id":124,"mutability":"mutable","name":"payloadLength","nameLocation":"1721:13:0","nodeType":"VariableDeclaration","scope":133,"src":"1713:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":123,"name":"uint256","nodeType":"ElementaryTypeName","src":"1713:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":127,"initialValue":{"expression":{"id":125,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":120,"src":"1737:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":126,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1737:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1713:38:0"},{"assignments":[129],"declarations":[{"constant":false,"id":129,"mutability":"mutable","name":"consoleAddress","nameLocation":"1769:14:0","nodeType":"VariableDeclaration","scope":133,"src":"1761:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":128,"name":"address","nodeType":"ElementaryTypeName","src":"1761:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":131,"initialValue":{"id":130,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":89,"src":"1786:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1761:40:0"},{"AST":{"nodeType":"YulBlock","src":"1863:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1877:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1901:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1910:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1897:3:0"},"nodeType":"YulFunctionCall","src":"1897:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1881:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1926:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1946:3:0"},"nodeType":"YulFunctionCall","src":"1946:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1953:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1969:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1983:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1998:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"2001:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1935:10:0"},"nodeType":"YulFunctionCall","src":"1935:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1930:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":129,"isOffset":false,"isSlot":false,"src":"1953:14:0","valueSize":1},{"declaration":120,"isOffset":false,"isSlot":false,"src":"1901:7:0","valueSize":1},{"declaration":124,"isOffset":false,"isSlot":false,"src":"1983:13:0","valueSize":1}],"id":132,"nodeType":"InlineAssembly","src":"1854:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1648:19:0","parameters":{"id":121,"nodeType":"ParameterList","parameters":[{"constant":false,"id":120,"mutability":"mutable","name":"payload","nameLocation":"1681:7:0","nodeType":"VariableDeclaration","scope":134,"src":"1668:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":119,"name":"bytes","nodeType":"ElementaryTypeName","src":"1668:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1667:22:0"},"returnParameters":{"id":122,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":220,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":148,"nodeType":"FunctionDefinition","src":"2025:164:0","nodes":[],"body":{"id":147,"nodeType":"Block","src":"2070:119:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":142,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2120:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":143,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":136,"src":"2135:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":140,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2096:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":141,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2096:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":144,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2096:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":139,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2080:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":145,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2080:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":146,"nodeType":"ExpressionStatement","src":"2080:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2034:3:0","parameters":{"id":137,"nodeType":"ParameterList","parameters":[{"constant":false,"id":136,"mutability":"mutable","name":"p0","nameLocation":"2052:2:0","nodeType":"VariableDeclaration","scope":148,"src":"2038:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":135,"name":"string","nodeType":"ElementaryTypeName","src":"2038:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2037:18:0"},"returnParameters":{"id":138,"nodeType":"ParameterList","parameters":[],"src":"2070:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":165,"nodeType":"FunctionDefinition","src":"2195:182:0","nodes":[],"body":{"id":164,"nodeType":"Block","src":"2249:128:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":158,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2299:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":159,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":150,"src":"2319:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":160,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":152,"src":"2323:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":156,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2275:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":157,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2275:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":161,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2275:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":155,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2259:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":162,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2259:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":163,"nodeType":"ExpressionStatement","src":"2259:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2204:3:0","parameters":{"id":153,"nodeType":"ParameterList","parameters":[{"constant":false,"id":150,"mutability":"mutable","name":"p0","nameLocation":"2222:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2208:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":149,"name":"string","nodeType":"ElementaryTypeName","src":"2208:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":152,"mutability":"mutable","name":"p1","nameLocation":"2231:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2226:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":151,"name":"bool","nodeType":"ElementaryTypeName","src":"2226:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"2207:27:0"},"returnParameters":{"id":154,"nodeType":"ParameterList","parameters":[],"src":"2249:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":182,"nodeType":"FunctionDefinition","src":"2383:188:0","nodes":[],"body":{"id":181,"nodeType":"Block","src":"2440:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":175,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2490:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":176,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":167,"src":"2513:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":177,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":169,"src":"2517:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":173,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2466:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":174,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2466:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":178,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2466:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":172,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2450:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":179,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2450:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":180,"nodeType":"ExpressionStatement","src":"2450:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2392:3:0","parameters":{"id":170,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"mutability":"mutable","name":"p0","nameLocation":"2410:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2396:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":166,"name":"string","nodeType":"ElementaryTypeName","src":"2396:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":169,"mutability":"mutable","name":"p1","nameLocation":"2422:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2414:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":168,"name":"uint256","nodeType":"ElementaryTypeName","src":"2414:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"2395:30:0"},"returnParameters":{"id":171,"nodeType":"ParameterList","parameters":[],"src":"2440:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":199,"nodeType":"FunctionDefinition","src":"2577:188:0","nodes":[],"body":{"id":198,"nodeType":"Block","src":"2634:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":192,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2684:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":193,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":184,"src":"2707:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":194,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":186,"src":"2711:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":190,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2660:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":191,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2660:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":195,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2660:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":189,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2644:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":196,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2644:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":197,"nodeType":"ExpressionStatement","src":"2644:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2586:3:0","parameters":{"id":187,"nodeType":"ParameterList","parameters":[{"constant":false,"id":184,"mutability":"mutable","name":"p0","nameLocation":"2604:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2590:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":183,"name":"string","nodeType":"ElementaryTypeName","src":"2590:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":186,"mutability":"mutable","name":"p1","nameLocation":"2616:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2608:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":185,"name":"address","nodeType":"ElementaryTypeName","src":"2608:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2589:30:0"},"returnParameters":{"id":188,"nodeType":"ParameterList","parameters":[],"src":"2634:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":219,"nodeType":"FunctionDefinition","src":"2771:222:0","nodes":[],"body":{"id":218,"nodeType":"Block","src":"2852:141:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":211,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2902:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":212,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":201,"src":"2931:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":213,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":203,"src":"2935:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":214,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":205,"src":"2939:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":209,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2878:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":210,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2878:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":215,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2878:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":208,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2862:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":216,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2862:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":217,"nodeType":"ExpressionStatement","src":"2862:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2780:3:0","parameters":{"id":206,"nodeType":"ParameterList","parameters":[{"constant":false,"id":201,"mutability":"mutable","name":"p0","nameLocation":"2798:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2784:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":200,"name":"string","nodeType":"ElementaryTypeName","src":"2784:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":203,"mutability":"mutable","name":"p1","nameLocation":"2816:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2802:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":202,"name":"string","nodeType":"ElementaryTypeName","src":"2802:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":205,"mutability":"mutable","name":"p2","nameLocation":"2834:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2820:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":204,"name":"string","nodeType":"ElementaryTypeName","src":"2820:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2783:54:0"},"returnParameters":{"id":207,"nodeType":"ParameterList","parameters":[],"src":"2852:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[220],"name":"console","nameLocation":"1152:7:0","scope":969,"usedErrors":[]},{"id":786,"nodeType":"ContractDefinition","src":"3123:3912:0","nodes":[{"id":235,"nodeType":"VariableDeclaration","src":"3152:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"3178:10:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":222,"name":"address","nodeType":"ElementaryTypeName","src":"3152:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3225:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":229,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"3215:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":231,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3215:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":228,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3207:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":227,"name":"uint256","nodeType":"ElementaryTypeName","src":"3207:7:0","typeDescriptions":{}}},"id":232,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3207:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":226,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3199:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":225,"name":"uint160","nodeType":"ElementaryTypeName","src":"3199:7:0","typeDescriptions":{}}},"id":233,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3199:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":224,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3191:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":223,"name":"address","nodeType":"ElementaryTypeName","src":"3191:7:0","typeDescriptions":{}}},"id":234,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3191:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":241,"nodeType":"VariableDeclaration","src":"3252:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"3273:2:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":237,"nodeType":"UserDefinedTypeName","pathNode":{"id":236,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"3252:2:0"},"referencedDeclaration":83,"src":"3252:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":239,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":235,"src":"3281:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":238,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"3278:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":240,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3278:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":243,"nodeType":"VariableDeclaration","src":"3356:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"3371:7:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":242,"name":"uint256","nodeType":"ElementaryTypeName","src":"3356:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":456,"nodeType":"FunctionDefinition","src":"3468:1428:0","nodes":[],"body":{"id":455,"nodeType":"Block","src":"3490:1406:0","nodes":[],"statements":[{"assignments":[248],"declarations":[{"constant":false,"id":248,"mutability":"mutable","name":"x","nameLocation":"3505:1:0","nodeType":"VariableDeclaration","scope":455,"src":"3500:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":247,"name":"bool","nodeType":"ElementaryTypeName","src":"3500:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":254,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":251,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3518:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":252,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"3534:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":249,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3509:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":250,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"3509:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"3500:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":258,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3562:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":259,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":248,"src":"3585:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":255,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3550:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":257,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":165,"src":"3550:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":260,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3550:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":261,"nodeType":"ExpressionStatement","src":"3550:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":265,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3610:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":268,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3635:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":267,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3627:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":266,"name":"address","nodeType":"ElementaryTypeName","src":"3627:7:0","typeDescriptions":{}}},"id":269,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3627:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":262,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3598:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3598:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3598:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":271,"nodeType":"ExpressionStatement","src":"3598:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":275,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3663:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":280,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3701:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":279,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3693:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":278,"name":"address","nodeType":"ElementaryTypeName","src":"3693:7:0","typeDescriptions":{}}},"id":281,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3693:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":276,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3681:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3681:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":282,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":272,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3651:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":274,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3651:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":283,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3651:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":284,"nodeType":"ExpressionStatement","src":"3651:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":288,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3730:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":291,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3753:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3753:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":290,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3745:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":289,"name":"address","nodeType":"ElementaryTypeName","src":"3745:7:0","typeDescriptions":{}}},"id":293,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3745:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":285,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3718:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":287,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3718:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":294,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3718:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":295,"nodeType":"ExpressionStatement","src":"3718:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":299,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3787:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":304,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3823:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":305,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3823:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":303,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3815:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":302,"name":"address","nodeType":"ElementaryTypeName","src":"3815:7:0","typeDescriptions":{}}},"id":306,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3815:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":300,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3803:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":301,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3803:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3803:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":296,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3775:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":298,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3775:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":308,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3775:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":309,"nodeType":"ExpressionStatement","src":"3775:61:0"},{"assignments":[311],"declarations":[{"constant":false,"id":311,"mutability":"mutable","name":"json","nameLocation":"3861:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3847:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":310,"name":"string","nodeType":"ElementaryTypeName","src":"3847:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":313,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3868:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3847:55:0"},{"assignments":[318],"declarations":[{"constant":false,"id":318,"mutability":"mutable","name":"keys","nameLocation":"3928:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3912:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":316,"name":"string","nodeType":"ElementaryTypeName","src":"3912:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":317,"nodeType":"ArrayTypeName","src":"3912:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":324,"initialValue":{"arguments":[{"id":321,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":311,"src":"3952:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3958:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":319,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3935:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":320,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3935:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":323,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3935:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3912:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":328,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3995:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":329,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4003:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":331,"indexExpression":{"hexValue":"30","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4008:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4003:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":332,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4012:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":334,"indexExpression":{"hexValue":"31","id":333,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4017:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4012:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":325,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3983:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":327,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":219,"src":"3983:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3983:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":336,"nodeType":"ExpressionStatement","src":"3983:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":340,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4042:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":337,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4031:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":339,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4031:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4031:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":342,"nodeType":"ExpressionStatement","src":"4031:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":350,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4098:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4090:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":348,"name":"uint160","nodeType":"ElementaryTypeName","src":"4090:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4090:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":347,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4082:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":346,"name":"address","nodeType":"ElementaryTypeName","src":"4082:7:0","typeDescriptions":{}}},"id":352,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4082:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":343,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4068:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":345,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"4068:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":353,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4068:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":354,"nodeType":"ExpressionStatement","src":"4068:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":358,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4126:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":355,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4115:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":357,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4115:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":359,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4115:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":360,"nodeType":"ExpressionStatement","src":"4115:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":364,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4163:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":367,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"4198:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":368,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"4198:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":366,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4190:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":365,"name":"address","nodeType":"ElementaryTypeName","src":"4190:7:0","typeDescriptions":{}}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4190:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":361,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4151:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4151:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":370,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4151:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":371,"nodeType":"ExpressionStatement","src":"4151:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":375,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4232:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":378,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4270:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":377,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4262:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":376,"name":"address","nodeType":"ElementaryTypeName","src":"4262:7:0","typeDescriptions":{}}},"id":379,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4262:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":372,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4220:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":374,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4220:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":380,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4220:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":381,"nodeType":"ExpressionStatement","src":"4220:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4297:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":382,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4286:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4286:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":386,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4286:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":387,"nodeType":"ExpressionStatement","src":"4286:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4322:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":390,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"4322:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":391,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4322:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":392,"nodeType":"ExpressionStatement","src":"4322:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":396,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4357:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":393,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4346:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4346:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":397,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4346:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":398,"nodeType":"ExpressionStatement","src":"4346:33:0"},{"assignments":[400],"declarations":[{"constant":false,"id":400,"mutability":"mutable","name":"tmpNonceGetter","nameLocation":"4480:14:0","nodeType":"VariableDeclaration","scope":455,"src":"4472:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":399,"name":"address","nodeType":"ElementaryTypeName","src":"4472:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":413,"initialValue":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"74656d70206e6f6e6365207465737420676574746572","id":408,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4531:24:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""},"value":"temp nonce test getter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""}],"id":407,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"4521:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":409,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4521:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":406,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4513:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":405,"name":"uint256","nodeType":"ElementaryTypeName","src":"4513:7:0","typeDescriptions":{}}},"id":410,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4513:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":404,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4505:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":403,"name":"uint160","nodeType":"ElementaryTypeName","src":"4505:7:0","typeDescriptions":{}}},"id":411,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4505:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":402,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4497:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":401,"name":"address","nodeType":"ElementaryTypeName","src":"4497:7:0","typeDescriptions":{}}},"id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4497:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"4472:87:0"},{"expression":{"arguments":[{"id":417,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4577:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},{"arguments":[{"hexValue":"5363726970744578616d706c652e732e736f6c3a4e6f6e6365476574746572","id":420,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4612:33:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""},"value":"ScriptExample.s.sol:NonceGetter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""}],"expression":{"id":418,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4593:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getDeployedCode","nodeType":"MemberAccess","referencedDeclaration":61,"src":"4593:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) view external returns (bytes memory)"}},"id":421,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4593:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"},{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"expression":{"id":414,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4569:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":416,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"etch","nodeType":"MemberAccess","referencedDeclaration":68,"src":"4569:7:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$","typeString":"function (address,bytes memory) external"}},"id":422,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4569:78:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":423,"nodeType":"ExpressionStatement","src":"4569:78:0"},{"expression":{"arguments":[{"id":427,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4676:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":424,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4657:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":426,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"allowCheatcodes","nodeType":"MemberAccess","referencedDeclaration":73,"src":"4657:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":428,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":429,"nodeType":"ExpressionStatement","src":"4657:34:0"},{"assignments":[431],"declarations":[{"constant":false,"id":431,"mutability":"mutable","name":"v","nameLocation":"4709:1:0","nodeType":"VariableDeclaration","scope":455,"src":"4701:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":430,"name":"uint256","nodeType":"ElementaryTypeName","src":"4701:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":441,"initialValue":{"arguments":[{"arguments":[{"id":438,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4758:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":437,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4750:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":436,"name":"address","nodeType":"ElementaryTypeName","src":"4750:7:0","typeDescriptions":{}}},"id":439,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4750:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"arguments":[{"id":433,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4725:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":432,"name":"NonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":833,"src":"4713:11:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_NonceGetter_$833_$","typeString":"type(contract NonceGetter)"}},"id":434,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_NonceGetter_$833","typeString":"contract NonceGetter"}},"id":435,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":832,"src":"4713:36:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint256_$","typeString":"function (address) view external returns (uint256)"}},"id":440,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"4701:63:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683a","id":445,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4786:68:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},"value":"nonce from nonce getter, no explicit access required with vm.etch:"},{"id":446,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":431,"src":"4856:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":442,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4774:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":444,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"4774:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4774:84:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":448,"nodeType":"ExpressionStatement","src":"4774:84:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":452,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4881:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":449,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4869:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":451,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"4869:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4869:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":454,"nodeType":"ExpressionStatement","src":"4869:20:0"}]},"documentation":{"id":244,"nodeType":"StructuredDocumentation","src":"3385:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"3477:3:0","parameters":{"id":245,"nodeType":"ParameterList","parameters":[],"src":"3480:2:0"},"returnParameters":{"id":246,"nodeType":"ParameterList","parameters":[],"src":"3490:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":689,"nodeType":"FunctionDefinition","src":"4963:1333:0","nodes":[],"body":{"id":688,"nodeType":"Block","src":"4994:1302:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":463,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5016:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":470,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5059:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":469,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5051:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":468,"name":"address","nodeType":"ElementaryTypeName","src":"5051:7:0","typeDescriptions":{}}},"id":471,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5051:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":466,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5039:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":467,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5039:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5039:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":465,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5031:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":464,"name":"uint256","nodeType":"ElementaryTypeName","src":"5031:7:0","typeDescriptions":{}}},"id":473,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5031:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":460,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5004:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":462,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"5004:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":474,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5004:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":475,"nodeType":"ExpressionStatement","src":"5004:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":479,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5090:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":476,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5078:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":478,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5078:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":480,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5078:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":481,"nodeType":"ExpressionStatement","src":"5078:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":482,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5117:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5117:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":485,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5117:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":486,"nodeType":"ExpressionStatement","src":"5117:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":490,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5152:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":487,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5141:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":489,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5141:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":491,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5141:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":492,"nodeType":"ExpressionStatement","src":"5141:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":496,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5188:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":493,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5177:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5177:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":497,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5177:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":498,"nodeType":"ExpressionStatement","src":"5177:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":502,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5226:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":499,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5214:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5214:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":503,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5214:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":504,"nodeType":"ExpressionStatement","src":"5214:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5291:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":511,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5283:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":510,"name":"uint160","nodeType":"ElementaryTypeName","src":"5283:7:0","typeDescriptions":{}}},"id":513,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5283:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5275:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":508,"name":"address","nodeType":"ElementaryTypeName","src":"5275:7:0","typeDescriptions":{}}},"id":514,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5275:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":505,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5257:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":507,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5257:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":515,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5257:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":516,"nodeType":"ExpressionStatement","src":"5257:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":520,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5323:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":517,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5312:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":519,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5312:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":521,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5312:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":522,"nodeType":"ExpressionStatement","src":"5312:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":526,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5362:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":523,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5351:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":525,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5351:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5351:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":528,"nodeType":"ExpressionStatement","src":"5351:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":532,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5404:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":529,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5390:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":531,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":785,"src":"5390:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":533,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5390:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":534,"nodeType":"ExpressionStatement","src":"5390:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":535,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5431:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":537,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5431:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":538,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5431:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":539,"nodeType":"ExpressionStatement","src":"5431:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":543,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5470:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":540,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5459:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":542,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5459:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":544,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5459:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":545,"nodeType":"ExpressionStatement","src":"5459:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":549,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5511:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":546,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5499:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5499:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":550,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5499:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":551,"nodeType":"ExpressionStatement","src":"5499:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":559,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5572:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":558,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5564:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":557,"name":"uint160","nodeType":"ElementaryTypeName","src":"5564:7:0","typeDescriptions":{}}},"id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5564:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":556,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5556:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":555,"name":"address","nodeType":"ElementaryTypeName","src":"5556:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5556:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":552,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5538:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":554,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5538:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":562,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5538:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":563,"nodeType":"ExpressionStatement","src":"5538:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":567,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5604:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":564,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5591:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":566,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":758,"src":"5591:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":568,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5591:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":569,"nodeType":"ExpressionStatement","src":"5591:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":570,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5623:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5623:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5623:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"5623:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5664:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5652:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5652:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5652:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"5652:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":588,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5725:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":587,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5717:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":586,"name":"uint160","nodeType":"ElementaryTypeName","src":"5717:7:0","typeDescriptions":{}}},"id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5717:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":585,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5709:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":584,"name":"address","nodeType":"ElementaryTypeName","src":"5709:7:0","typeDescriptions":{}}},"id":590,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5709:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5696:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5696:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":591,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5696:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":592,"nodeType":"ExpressionStatement","src":"5696:40:0"},{"assignments":[595],"declarations":[{"constant":false,"id":595,"mutability":"mutable","name":"x","nameLocation":"5753:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5746:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":594,"nodeType":"UserDefinedTypeName","pathNode":{"id":593,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5746:6:0"},"referencedDeclaration":799,"src":"5746:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":601,"initialValue":{"arguments":[{"hexValue":"31323334","id":599,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5768:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":598,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5757:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":597,"nodeType":"UserDefinedTypeName","pathNode":{"id":596,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5761:6:0"},"referencedDeclaration":799,"src":"5761:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":600,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5757:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5746:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":607,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":603,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":595,"src":"5791:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"5791:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5791:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":606,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5802:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"5791:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323334","id":608,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5808:35:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""},"value":"FooBar: foo in create is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""}],"id":602,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"5783:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":609,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5783:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":610,"nodeType":"ExpressionStatement","src":"5783:61:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":614,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5867:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":611,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5855:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":613,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5855:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":615,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5855:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":616,"nodeType":"ExpressionStatement","src":"5855:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5917:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":623,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5909:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":622,"name":"uint160","nodeType":"ElementaryTypeName","src":"5909:7:0","typeDescriptions":{}}},"id":625,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5909:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":621,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5901:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":620,"name":"address","nodeType":"ElementaryTypeName","src":"5901:7:0","typeDescriptions":{}}},"id":626,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5901:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":617,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5888:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":627,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5888:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":628,"nodeType":"ExpressionStatement","src":"5888:38:0"},{"assignments":[631],"declarations":[{"constant":false,"id":631,"mutability":"mutable","name":"y","nameLocation":"5943:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5936:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":630,"nodeType":"UserDefinedTypeName","pathNode":{"id":629,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5936:6:0"},"referencedDeclaration":799,"src":"5936:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":645,"initialValue":{"arguments":[{"hexValue":"31323334","id":643,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5986:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":634,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5947:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":633,"nodeType":"UserDefinedTypeName","pathNode":{"id":632,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5951:6:0"},"referencedDeclaration":799,"src":"5951:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":642,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":639,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5980:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":638,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5972:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":637,"name":"uint256","nodeType":"ElementaryTypeName","src":"5972:7:0","typeDescriptions":{}}},"id":640,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5972:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":636,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5964:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":635,"name":"bytes32","nodeType":"ElementaryTypeName","src":"5964:7:0","typeDescriptions":{}}},"id":641,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5964:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"5947:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":644,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5947:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5936:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":651,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":647,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":631,"src":"6009:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":648,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"6009:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":649,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6009:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":650,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6020:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"6009:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e2063726561746532206973206e6f742031323334","id":652,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6026:36:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""},"value":"FooBar: foo in create2 is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""}],"id":646,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"6001:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":653,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6001:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":654,"nodeType":"ExpressionStatement","src":"6001:62:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":658,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6085:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":655,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6073:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":657,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6073:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":659,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6073:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":660,"nodeType":"ExpressionStatement","src":"6073:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":661,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6177:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":663,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"6177:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":664,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6177:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":665,"nodeType":"ExpressionStatement","src":"6177:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":669,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6212:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":668,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"6201:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":667,"nodeType":"UserDefinedTypeName","pathNode":{"id":666,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"6205:6:0"},"referencedDeclaration":799,"src":"6205:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":670,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6201:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":671,"nodeType":"ExpressionStatement","src":"6201:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":675,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6240:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":682,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6281:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":681,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6273:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":680,"name":"address","nodeType":"ElementaryTypeName","src":"6273:7:0","typeDescriptions":{}}},"id":683,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6273:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":678,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6261:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":679,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"6261:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":684,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6261:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":677,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6253:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":676,"name":"uint256","nodeType":"ElementaryTypeName","src":"6253:7:0","typeDescriptions":{}}},"id":685,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6253:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":672,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6228:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":674,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"6228:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":686,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6228:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":687,"nodeType":"ExpressionStatement","src":"6228:61:0"}]},"documentation":{"id":457,"nodeType":"StructuredDocumentation","src":"4902:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"4972:12:0","parameters":{"id":458,"nodeType":"ParameterList","parameters":[],"src":"4984:2:0"},"returnParameters":{"id":459,"nodeType":"ParameterList","parameters":[],"src":"4994:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":713,"nodeType":"FunctionDefinition","src":"6391:143:0","nodes":[],"body":{"id":712,"nodeType":"Block","src":"6440:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":698,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":692,"src":"6462:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":695,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6450:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":697,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6450:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":699,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6450:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":700,"nodeType":"ExpressionStatement","src":"6450:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":704,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6487:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":707,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"6515:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":708,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"6515:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":706,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6507:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":705,"name":"address","nodeType":"ElementaryTypeName","src":"6507:7:0","typeDescriptions":{}}},"id":709,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6507:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":701,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6475:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":703,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"6475:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":710,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6475:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":711,"nodeType":"ExpressionStatement","src":"6475:52:0"}]},"documentation":{"id":690,"nodeType":"StructuredDocumentation","src":"6302:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"6400:5:0","parameters":{"id":693,"nodeType":"ParameterList","parameters":[{"constant":false,"id":692,"mutability":"mutable","name":"_v","nameLocation":"6422:2:0","nodeType":"VariableDeclaration","scope":713,"src":"6406:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":691,"name":"string","nodeType":"ElementaryTypeName","src":"6406:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6405:20:0"},"returnParameters":{"id":694,"nodeType":"ParameterList","parameters":[],"src":"6440:0:0"},"scope":786,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":728,"nodeType":"FunctionDefinition","src":"6540:95:0","nodes":[],"body":{"id":727,"nodeType":"Block","src":"6584:51:0","nodes":[],"statements":[{"expression":{"id":719,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6594:9:0","subExpression":{"id":718,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6594:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":720,"nodeType":"ExpressionStatement","src":"6594:9:0"},{"expression":{"arguments":[{"id":724,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":715,"src":"6625:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":721,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6613:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":723,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6613:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":725,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6613:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":726,"nodeType":"ExpressionStatement","src":"6613:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"6549:5:0","parameters":{"id":716,"nodeType":"ParameterList","parameters":[{"constant":false,"id":715,"mutability":"mutable","name":"_v","nameLocation":"6571:2:0","nodeType":"VariableDeclaration","scope":728,"src":"6555:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":714,"name":"string","nodeType":"ElementaryTypeName","src":"6555:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6554:20:0"},"returnParameters":{"id":717,"nodeType":"ParameterList","parameters":[],"src":"6584:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":743,"nodeType":"FunctionDefinition","src":"6641:95:0","nodes":[],"body":{"id":742,"nodeType":"Block","src":"6685:51:0","nodes":[],"statements":[{"expression":{"id":734,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6695:9:0","subExpression":{"id":733,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6695:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":735,"nodeType":"ExpressionStatement","src":"6695:9:0"},{"expression":{"arguments":[{"id":739,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":730,"src":"6726:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":736,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6714:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":738,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6714:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":740,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6714:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":741,"nodeType":"ExpressionStatement","src":"6714:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"6650:5:0","parameters":{"id":731,"nodeType":"ParameterList","parameters":[{"constant":false,"id":730,"mutability":"mutable","name":"_v","nameLocation":"6672:2:0","nodeType":"VariableDeclaration","scope":743,"src":"6656:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":729,"name":"string","nodeType":"ElementaryTypeName","src":"6656:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6655:20:0"},"returnParameters":{"id":732,"nodeType":"ParameterList","parameters":[],"src":"6685:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":758,"nodeType":"FunctionDefinition","src":"6742:98:0","nodes":[],"body":{"id":757,"nodeType":"Block","src":"6788:52:0","nodes":[],"statements":[{"expression":{"id":749,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6798:9:0","subExpression":{"id":748,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6798:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":750,"nodeType":"ExpressionStatement","src":"6798:9:0"},{"expression":{"arguments":[{"id":754,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":745,"src":"6830:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":751,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6817:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":753,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":773,"src":"6817:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":755,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6817:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":756,"nodeType":"ExpressionStatement","src":"6817:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"6751:7:0","parameters":{"id":746,"nodeType":"ParameterList","parameters":[{"constant":false,"id":745,"mutability":"mutable","name":"_v","nameLocation":"6775:2:0","nodeType":"VariableDeclaration","scope":758,"src":"6759:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":744,"name":"string","nodeType":"ElementaryTypeName","src":"6759:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6758:20:0"},"returnParameters":{"id":747,"nodeType":"ParameterList","parameters":[],"src":"6788:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":773,"nodeType":"FunctionDefinition","src":"6846:97:0","nodes":[],"body":{"id":772,"nodeType":"Block","src":"6892:51:0","nodes":[],"statements":[{"expression":{"id":764,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6902:9:0","subExpression":{"id":763,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6902:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":765,"nodeType":"ExpressionStatement","src":"6902:9:0"},{"expression":{"arguments":[{"id":769,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":760,"src":"6933:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":766,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6921:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":768,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6921:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":770,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6921:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":771,"nodeType":"ExpressionStatement","src":"6921:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"6855:7:0","parameters":{"id":761,"nodeType":"ParameterList","parameters":[{"constant":false,"id":760,"mutability":"mutable","name":"_v","nameLocation":"6879:2:0","nodeType":"VariableDeclaration","scope":773,"src":"6863:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":759,"name":"string","nodeType":"ElementaryTypeName","src":"6863:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6862:20:0"},"returnParameters":{"id":762,"nodeType":"ParameterList","parameters":[],"src":"6892:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":785,"nodeType":"FunctionDefinition","src":"6949:84:0","nodes":[],"body":{"id":784,"nodeType":"Block","src":"7001:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":781,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":775,"src":"7023:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":778,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"7011:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":780,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"7011:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":782,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7011:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":783,"nodeType":"ExpressionStatement","src":"7011:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"6958:8:0","parameters":{"id":776,"nodeType":"ParameterList","parameters":[{"constant":false,"id":775,"mutability":"mutable","name":"_v","nameLocation":"6983:2:0","nodeType":"VariableDeclaration","scope":785,"src":"6967:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":774,"name":"string","nodeType":"ElementaryTypeName","src":"6967:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6966:20:0"},"returnParameters":{"id":777,"nodeType":"ParameterList","parameters":[],"src":"7001:0:0"},"scope":786,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[799],"contractKind":"contract","documentation":{"id":221,"nodeType":"StructuredDocumentation","src":"2997:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[786],"name":"ScriptExample","nameLocation":"3132:13:0","scope":969,"usedErrors":[]},{"id":799,"nodeType":"ContractDefinition","src":"7037:96:0","nodes":[{"id":788,"nodeType":"VariableDeclaration","src":"7059:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"7074:3:0","scope":799,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":787,"name":"uint256","nodeType":"ElementaryTypeName","src":"7059:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":798,"nodeType":"FunctionDefinition","src":"7084:47:0","nodes":[],"body":{"id":797,"nodeType":"Block","src":"7107:24:0","nodes":[],"statements":[{"expression":{"id":795,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":793,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":788,"src":"7117:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":794,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":790,"src":"7123:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"7117:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":796,"nodeType":"ExpressionStatement","src":"7117:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":791,"nodeType":"ParameterList","parameters":[{"constant":false,"id":790,"mutability":"mutable","name":"v","nameLocation":"7104:1:0","nodeType":"VariableDeclaration","scope":798,"src":"7096:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":789,"name":"uint256","nodeType":"ElementaryTypeName","src":"7096:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7095:11:0"},"returnParameters":{"id":792,"nodeType":"ParameterList","parameters":[],"src":"7107:0:0"},"scope":799,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[799],"name":"FooBar","nameLocation":"7046:6:0","scope":969,"usedErrors":[]},{"id":833,"nodeType":"ContractDefinition","src":"7135:281:0","nodes":[{"id":813,"nodeType":"VariableDeclaration","src":"7162:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7188:10:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":800,"name":"address","nodeType":"ElementaryTypeName","src":"7162:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":808,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7235:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":807,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7225:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":809,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7225:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":806,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7217:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":805,"name":"uint256","nodeType":"ElementaryTypeName","src":"7217:7:0","typeDescriptions":{}}},"id":810,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7217:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":804,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7209:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":803,"name":"uint160","nodeType":"ElementaryTypeName","src":"7209:7:0","typeDescriptions":{}}},"id":811,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7209:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":802,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":801,"name":"address","nodeType":"ElementaryTypeName","src":"7201:7:0","typeDescriptions":{}}},"id":812,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7201:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":819,"nodeType":"VariableDeclaration","src":"7262:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7283:2:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":815,"nodeType":"UserDefinedTypeName","pathNode":{"id":814,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7262:2:0"},"referencedDeclaration":83,"src":"7262:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":817,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":813,"src":"7291:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":816,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7288:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":818,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7288:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":832,"nodeType":"FunctionDefinition","src":"7309:105:0","nodes":[],"body":{"id":831,"nodeType":"Block","src":"7372:42:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":828,"name":"_addr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":821,"src":"7401:5:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":826,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":819,"src":"7389:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":827,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7389:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":829,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7389:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"functionReturnParameters":825,"id":830,"nodeType":"Return","src":"7382:25:0"}]},"functionSelector":"2d0335ab","implemented":true,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"7318:8:0","parameters":{"id":822,"nodeType":"ParameterList","parameters":[{"constant":false,"id":821,"mutability":"mutable","name":"_addr","nameLocation":"7335:5:0","nodeType":"VariableDeclaration","scope":832,"src":"7327:13:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":820,"name":"address","nodeType":"ElementaryTypeName","src":"7327:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"7326:15:0"},"returnParameters":{"id":825,"nodeType":"ParameterList","parameters":[{"constant":false,"id":824,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":832,"src":"7363:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":823,"name":"uint256","nodeType":"ElementaryTypeName","src":"7363:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7362:9:0"},"scope":833,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"NonceGetter","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[833],"name":"NonceGetter","nameLocation":"7144:11:0","scope":969,"usedErrors":[]},{"id":852,"nodeType":"ContractDefinition","src":"7418:174:0","nodes":[{"id":835,"nodeType":"VariableDeclaration","src":"7448:18:0","nodes":[],"constant":false,"mutability":"mutable","name":"v","nameLocation":"7465:1:0","scope":852,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":834,"name":"uint256","nodeType":"ElementaryTypeName","src":"7448:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"id":843,"nodeType":"FunctionDefinition","src":"7473:36:0","nodes":[],"body":{"id":842,"nodeType":"Block","src":"7487:22:0","nodes":[],"statements":[{"expression":{"id":840,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":838,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7497:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"hexValue":"31","id":839,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7501:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"7497:5:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":841,"nodeType":"ExpressionStatement","src":"7497:5:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":836,"nodeType":"ParameterList","parameters":[],"src":"7484:2:0"},"returnParameters":{"id":837,"nodeType":"ParameterList","parameters":[],"src":"7487:0:0"},"scope":852,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":851,"nodeType":"FunctionDefinition","src":"7515:75:0","nodes":[],"body":{"id":850,"nodeType":"Block","src":"7565:25:0","nodes":[],"statements":[{"expression":{"id":848,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7582:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"functionReturnParameters":847,"id":849,"nodeType":"Return","src":"7575:8:0"}]},"functionSelector":"20965255","implemented":true,"kind":"function","modifiers":[],"name":"getValue","nameLocation":"7524:8:0","parameters":{"id":844,"nodeType":"ParameterList","parameters":[],"src":"7532:2:0"},"returnParameters":{"id":847,"nodeType":"ParameterList","parameters":[{"constant":false,"id":846,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":851,"src":"7556:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":845,"name":"uint256","nodeType":"ElementaryTypeName","src":"7556:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7555:9:0"},"scope":852,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkedContract","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[852],"name":"ForkedContract","nameLocation":"7427:14:0","scope":969,"usedErrors":[]},{"id":968,"nodeType":"ContractDefinition","src":"7594:813:0","nodes":[{"id":866,"nodeType":"VariableDeclaration","src":"7620:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7646:10:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":853,"name":"address","nodeType":"ElementaryTypeName","src":"7620:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":861,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7693:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":860,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7683:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":862,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7683:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":859,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7675:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":858,"name":"uint256","nodeType":"ElementaryTypeName","src":"7675:7:0","typeDescriptions":{}}},"id":863,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7675:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":857,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7667:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":856,"name":"uint160","nodeType":"ElementaryTypeName","src":"7667:7:0","typeDescriptions":{}}},"id":864,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7667:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":855,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7659:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":854,"name":"address","nodeType":"ElementaryTypeName","src":"7659:7:0","typeDescriptions":{}}},"id":865,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7659:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":872,"nodeType":"VariableDeclaration","src":"7720:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7741:2:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":868,"nodeType":"UserDefinedTypeName","pathNode":{"id":867,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7720:2:0"},"referencedDeclaration":83,"src":"7720:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":870,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":866,"src":"7749:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":869,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7746:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":871,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7746:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":967,"nodeType":"FunctionDefinition","src":"7767:638:0","nodes":[],"body":{"id":966,"nodeType":"Block","src":"7791:614:0","nodes":[],"statements":[{"assignments":[876],"declarations":[{"constant":false,"id":876,"mutability":"mutable","name":"testAddr","nameLocation":"7809:8:0","nodeType":"VariableDeclaration","scope":966,"src":"7801:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":875,"name":"address","nodeType":"ElementaryTypeName","src":"7801:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":884,"initialValue":{"arguments":[{"arguments":[{"hexValue":"307831323334","id":881,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7836:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":880,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7828:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":879,"name":"uint160","nodeType":"ElementaryTypeName","src":"7828:7:0","typeDescriptions":{}}},"id":882,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7828:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":878,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7820:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":877,"name":"address","nodeType":"ElementaryTypeName","src":"7820:7:0","typeDescriptions":{}}},"id":883,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7820:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"7801:43:0"},{"assignments":[887],"declarations":[{"constant":false,"id":887,"mutability":"mutable","name":"fc","nameLocation":"7869:2:0","nodeType":"VariableDeclaration","scope":966,"src":"7854:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"},"typeName":{"id":886,"nodeType":"UserDefinedTypeName","pathNode":{"id":885,"name":"ForkedContract","nodeType":"IdentifierPath","referencedDeclaration":852,"src":"7854:14:0"},"referencedDeclaration":852,"src":"7854:14:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"visibility":"internal"}],"id":891,"initialValue":{"arguments":[{"id":889,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7889:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":888,"name":"ForkedContract","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":852,"src":"7874:14:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_ForkedContract_$852_$","typeString":"type(contract ForkedContract)"}},"id":890,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7874:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"nodeType":"VariableDeclarationStatement","src":"7854:44:0"},{"expression":{"arguments":[{"hexValue":"666f726b31","id":895,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7929:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},"value":"fork1"},{"hexValue":"3132333435","id":896,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7938:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"}],"expression":{"id":892,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7909:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":894,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"7909:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":897,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7909:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":898,"nodeType":"ExpressionStatement","src":"7909:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":905,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":902,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7974:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":900,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7962:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":901,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7962:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":903,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7962:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3132333435","id":904,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7987:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"},"src":"7962:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":906,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7994:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":899,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"7954:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":907,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7954:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":908,"nodeType":"ExpressionStatement","src":"7954:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":914,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":910,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8036:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":911,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8036:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":912,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8036:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31","id":913,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8053:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"8036:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652031","id":915,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8056:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""},"value":"value should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""}],"id":909,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8028:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":916,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8028:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":917,"nodeType":"ExpressionStatement","src":"8028:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":925,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":919,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8094:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":920,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8094:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"31","id":923,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8122:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"}],"id":922,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8114:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":921,"name":"uint256","nodeType":"ElementaryTypeName","src":"8114:7:0","typeDescriptions":{}}},"id":924,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8114:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8094:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652031","id":926,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8126:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""},"value":"balance should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""}],"id":918,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8086:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":927,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8086:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":928,"nodeType":"ExpressionStatement","src":"8086:62:0"},{"expression":{"arguments":[{"hexValue":"666f726b32","id":932,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8179:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},"value":"fork2"},{"hexValue":"3233343536","id":933,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8188:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"}],"expression":{"id":929,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8159:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":931,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"8159:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":934,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8159:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":935,"nodeType":"ExpressionStatement","src":"8159:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":942,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":939,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8224:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":937,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8212:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":938,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"8212:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":940,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8212:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3233343536","id":941,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8237:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"},"src":"8212:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":943,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8244:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":936,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8204:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":944,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8204:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":945,"nodeType":"ExpressionStatement","src":"8204:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":951,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":947,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8286:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":948,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8286:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":949,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8286:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"32","id":950,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8303:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"},"src":"8286:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652032","id":952,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8306:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""},"value":"value should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""}],"id":946,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8278:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":953,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8278:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":954,"nodeType":"ExpressionStatement","src":"8278:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":962,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":956,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8344:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":957,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8344:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"32","id":960,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8372:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"}],"id":959,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8364:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":958,"name":"uint256","nodeType":"ElementaryTypeName","src":"8364:7:0","typeDescriptions":{}}},"id":961,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8364:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8344:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652032","id":963,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8376:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""},"value":"balance should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""}],"id":955,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8336:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":964,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8336:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":965,"nodeType":"ExpressionStatement","src":"8336:62:0"}]},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"7776:3:0","parameters":{"id":873,"nodeType":"ParameterList","parameters":[],"src":"7779:2:0"},"returnParameters":{"id":874,"nodeType":"ParameterList","parameters":[],"src":"7791:0:0"},"scope":968,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkTester","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[968],"name":"ForkTester","nameLocation":"7603:10:0","scope":969,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/console.json b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/console.json
index 390e798a4701..6ef800dd39d5 100644
--- a/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/console.json
+++ b/op-chain-ops/script/testdata/test-artifacts/ScriptExample.s.sol/console.json
@@ -1 +1 @@
-{"abi":[],"bytecode":{"object":"0x602d6037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea164736f6c634300080f000a","sourceMap":"791:1622:0:-:0;;;;;;;;;;;;;;;-1:-1:-1;;;791:1622:0;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x73000000000000000000000000000000000000000030146080604052600080fdfea164736f6c634300080f000a","sourceMap":"791:1622:0:-:0;;;;;;;;","linkReferences":{}},"methodIdentifiers":{},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"console\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3\",\"dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"console"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x8d1dfa41908e7ccc3a498a2a2aa51c5275bedbb904ce32d08f8598e36f896d8d","urls":["bzz-raw://5117bb7158363cae8b9dc0508d2852692fd36172f1c699ff680afbb5acebe1f3","dweb:/ipfs/QmQdahJ8SPKfJ4yea5Ge9qaj5qh1TxVffhHvaWytBaL95h"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":720,"exportedSymbols":{"FooBar":[719],"ScriptExample":[706],"Vm":[55],"console":[192]},"nodeType":"SourceUnit","src":"32:5967:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":55,"nodeType":"ContractDefinition","src":"120:616:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":55,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":55,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":55,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[55],"name":"Vm","nameLocation":"130:2:0","scope":720,"usedErrors":[]},{"id":192,"nodeType":"ContractDefinition","src":"791:1622:0","nodes":[{"id":61,"nodeType":"VariableDeclaration","src":"813:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"830:15:0","scope":192,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":56,"name":"address","nodeType":"ElementaryTypeName","src":"813:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":59,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"856:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":58,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"848:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":57,"name":"address","nodeType":"ElementaryTypeName","src":"848:7:0","typeDescriptions":{}}},"id":60,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"848:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":78,"nodeType":"FunctionDefinition","src":"906:221:0","nodes":[],"body":{"id":77,"nodeType":"Block","src":"1065:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1084:37:0","statements":[{"nodeType":"YulAssignment","src":"1098:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1107:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1098:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":67,"isOffset":false,"isSlot":false,"src":"1107:4:0","valueSize":1},{"declaration":74,"isOffset":false,"isSlot":false,"src":"1098:5:0","valueSize":1}],"id":76,"nodeType":"InlineAssembly","src":"1075:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"915:25:0","parameters":{"id":68,"nodeType":"ParameterList","parameters":[{"constant":false,"id":67,"mutability":"mutable","name":"fnIn","nameLocation":"987:4:0","nodeType":"VariableDeclaration","scope":78,"src":"950:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":66,"nodeType":"FunctionTypeName","parameterTypes":{"id":64,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":66,"src":"959:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":62,"name":"bytes","nodeType":"ElementaryTypeName","src":"959:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"958:14:0"},"returnParameterTypes":{"id":65,"nodeType":"ParameterList","parameters":[],"src":"987:0:0"},"src":"950:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"940:57:0"},"returnParameters":{"id":75,"nodeType":"ParameterList","parameters":[{"constant":false,"id":74,"mutability":"mutable","name":"fnOut","nameLocation":"1058:5:0","nodeType":"VariableDeclaration","scope":78,"src":"1021:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":73,"nodeType":"FunctionTypeName","parameterTypes":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":73,"src":"1030:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":69,"name":"bytes","nodeType":"ElementaryTypeName","src":"1030:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1029:14:0"},"returnParameterTypes":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"1058:0:0"},"src":"1021:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1020:44:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":90,"nodeType":"FunctionDefinition","src":"1133:133:0","nodes":[],"body":{"id":89,"nodeType":"Block","src":"1194:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":86,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":80,"src":"1251:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":84,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1230:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":83,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":78,"src":"1204:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":85,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":87,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1204:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":88,"nodeType":"ExpressionStatement","src":"1204:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1142:15:0","parameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"payload","nameLocation":"1171:7:0","nodeType":"VariableDeclaration","scope":90,"src":"1158:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":79,"name":"bytes","nodeType":"ElementaryTypeName","src":"1158:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1157:22:0"},"returnParameters":{"id":82,"nodeType":"ParameterList","parameters":[],"src":"1194:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1272:380:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1336:316:0","nodes":[],"statements":[{"assignments":[96],"declarations":[{"constant":false,"id":96,"mutability":"mutable","name":"payloadLength","nameLocation":"1354:13:0","nodeType":"VariableDeclaration","scope":105,"src":"1346:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":95,"name":"uint256","nodeType":"ElementaryTypeName","src":"1346:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":99,"initialValue":{"expression":{"id":97,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":92,"src":"1370:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":98,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1370:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1346:38:0"},{"assignments":[101],"declarations":[{"constant":false,"id":101,"mutability":"mutable","name":"consoleAddress","nameLocation":"1402:14:0","nodeType":"VariableDeclaration","scope":105,"src":"1394:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":100,"name":"address","nodeType":"ElementaryTypeName","src":"1394:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":103,"initialValue":{"id":102,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":61,"src":"1419:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1394:40:0"},{"AST":{"nodeType":"YulBlock","src":"1496:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1510:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1534:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1543:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1530:3:0"},"nodeType":"YulFunctionCall","src":"1530:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1514:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1559:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1579:3:0"},"nodeType":"YulFunctionCall","src":"1579:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1586:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1602:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1616:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1631:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"1634:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1568:10:0"},"nodeType":"YulFunctionCall","src":"1568:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1563:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":101,"isOffset":false,"isSlot":false,"src":"1586:14:0","valueSize":1},{"declaration":92,"isOffset":false,"isSlot":false,"src":"1534:7:0","valueSize":1},{"declaration":96,"isOffset":false,"isSlot":false,"src":"1616:13:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1487:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1281:19:0","parameters":{"id":93,"nodeType":"ParameterList","parameters":[{"constant":false,"id":92,"mutability":"mutable","name":"payload","nameLocation":"1314:7:0","nodeType":"VariableDeclaration","scope":106,"src":"1301:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":91,"name":"bytes","nodeType":"ElementaryTypeName","src":"1301:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1300:22:0"},"returnParameters":{"id":94,"nodeType":"ParameterList","parameters":[],"src":"1336:0:0"},"scope":192,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":120,"nodeType":"FunctionDefinition","src":"1658:121:0","nodes":[],"body":{"id":119,"nodeType":"Block","src":"1703:76:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":114,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1753:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":115,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1768:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":112,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1729:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":113,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1729:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":116,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1729:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":111,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1713:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":117,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1713:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":118,"nodeType":"ExpressionStatement","src":"1713:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1667:3:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"p0","nameLocation":"1685:2:0","nodeType":"VariableDeclaration","scope":120,"src":"1671:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":107,"name":"string","nodeType":"ElementaryTypeName","src":"1671:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"1670:18:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":137,"nodeType":"FunctionDefinition","src":"1785:139:0","nodes":[],"body":{"id":136,"nodeType":"Block","src":"1839:85:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":130,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"1889:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":131,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":122,"src":"1909:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":132,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":124,"src":"1913:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":128,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"1865:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":129,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"1865:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":133,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1865:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":127,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1849:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":134,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1849:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":135,"nodeType":"ExpressionStatement","src":"1849:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1794:3:0","parameters":{"id":125,"nodeType":"ParameterList","parameters":[{"constant":false,"id":122,"mutability":"mutable","name":"p0","nameLocation":"1812:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1798:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":121,"name":"string","nodeType":"ElementaryTypeName","src":"1798:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":124,"mutability":"mutable","name":"p1","nameLocation":"1821:2:0","nodeType":"VariableDeclaration","scope":137,"src":"1816:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":123,"name":"bool","nodeType":"ElementaryTypeName","src":"1816:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"1797:27:0"},"returnParameters":{"id":126,"nodeType":"ParameterList","parameters":[],"src":"1839:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":154,"nodeType":"FunctionDefinition","src":"1930:145:0","nodes":[],"body":{"id":153,"nodeType":"Block","src":"1987:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":147,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2037:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":148,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":139,"src":"2060:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":149,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":141,"src":"2064:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":145,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2013:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":146,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2013:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":150,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2013:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":144,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"1997:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":151,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1997:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":152,"nodeType":"ExpressionStatement","src":"1997:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"1939:3:0","parameters":{"id":142,"nodeType":"ParameterList","parameters":[{"constant":false,"id":139,"mutability":"mutable","name":"p0","nameLocation":"1957:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1943:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":138,"name":"string","nodeType":"ElementaryTypeName","src":"1943:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":141,"mutability":"mutable","name":"p1","nameLocation":"1969:2:0","nodeType":"VariableDeclaration","scope":154,"src":"1961:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":140,"name":"uint256","nodeType":"ElementaryTypeName","src":"1961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1942:30:0"},"returnParameters":{"id":143,"nodeType":"ParameterList","parameters":[],"src":"1987:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":171,"nodeType":"FunctionDefinition","src":"2081:145:0","nodes":[],"body":{"id":170,"nodeType":"Block","src":"2138:88:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":164,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2188:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":165,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":156,"src":"2211:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":166,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":158,"src":"2215:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":162,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2164:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":163,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2164:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":167,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2164:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":161,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2148:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":168,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2148:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":169,"nodeType":"ExpressionStatement","src":"2148:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2090:3:0","parameters":{"id":159,"nodeType":"ParameterList","parameters":[{"constant":false,"id":156,"mutability":"mutable","name":"p0","nameLocation":"2108:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2094:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":155,"name":"string","nodeType":"ElementaryTypeName","src":"2094:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":158,"mutability":"mutable","name":"p1","nameLocation":"2120:2:0","nodeType":"VariableDeclaration","scope":171,"src":"2112:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":157,"name":"address","nodeType":"ElementaryTypeName","src":"2112:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2093:30:0"},"returnParameters":{"id":160,"nodeType":"ParameterList","parameters":[],"src":"2138:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":191,"nodeType":"FunctionDefinition","src":"2232:179:0","nodes":[],"body":{"id":190,"nodeType":"Block","src":"2313:98:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":183,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2363:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":184,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":173,"src":"2392:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":185,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":175,"src":"2396:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":186,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":177,"src":"2400:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":181,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2339:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":182,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2339:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":187,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2339:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":180,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":90,"src":"2323:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":188,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2323:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":189,"nodeType":"ExpressionStatement","src":"2323:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2241:3:0","parameters":{"id":178,"nodeType":"ParameterList","parameters":[{"constant":false,"id":173,"mutability":"mutable","name":"p0","nameLocation":"2259:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2245:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":172,"name":"string","nodeType":"ElementaryTypeName","src":"2245:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":175,"mutability":"mutable","name":"p1","nameLocation":"2277:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2263:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":174,"name":"string","nodeType":"ElementaryTypeName","src":"2263:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":177,"mutability":"mutable","name":"p2","nameLocation":"2295:2:0","nodeType":"VariableDeclaration","scope":191,"src":"2281:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":176,"name":"string","nodeType":"ElementaryTypeName","src":"2281:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2244:54:0"},"returnParameters":{"id":179,"nodeType":"ParameterList","parameters":[],"src":"2313:0:0"},"scope":192,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[192],"name":"console","nameLocation":"799:7:0","scope":720,"usedErrors":[]},{"id":706,"nodeType":"ContractDefinition","src":"2541:3359:0","nodes":[{"id":207,"nodeType":"VariableDeclaration","src":"2571:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"2597:10:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":194,"name":"address","nodeType":"ElementaryTypeName","src":"2571:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":202,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2644:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":201,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"2634:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":203,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2634:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":200,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2626:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":199,"name":"uint256","nodeType":"ElementaryTypeName","src":"2626:7:0","typeDescriptions":{}}},"id":204,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2626:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":198,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2618:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":197,"name":"uint160","nodeType":"ElementaryTypeName","src":"2618:7:0","typeDescriptions":{}}},"id":205,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2618:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":196,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"2610:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":195,"name":"address","nodeType":"ElementaryTypeName","src":"2610:7:0","typeDescriptions":{}}},"id":206,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2610:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":213,"nodeType":"VariableDeclaration","src":"2671:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"2692:2:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"},"typeName":{"id":209,"nodeType":"UserDefinedTypeName","pathNode":{"id":208,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":55,"src":"2671:2:0"},"referencedDeclaration":55,"src":"2671:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"value":{"arguments":[{"id":211,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":207,"src":"2700:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":210,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":55,"src":"2697:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$55_$","typeString":"type(contract Vm)"}},"id":212,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2697:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"visibility":"internal"},{"id":215,"nodeType":"VariableDeclaration","src":"2775:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"2790:7:0","scope":706,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":214,"name":"uint256","nodeType":"ElementaryTypeName","src":"2775:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":378,"nodeType":"FunctionDefinition","src":"2887:949:0","nodes":[],"body":{"id":377,"nodeType":"Block","src":"2909:927:0","nodes":[],"statements":[{"assignments":[220],"declarations":[{"constant":false,"id":220,"mutability":"mutable","name":"x","nameLocation":"2924:1:0","nodeType":"VariableDeclaration","scope":377,"src":"2919:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":219,"name":"bool","nodeType":"ElementaryTypeName","src":"2919:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":226,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":223,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2937:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":224,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"2953:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":221,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"2928:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":222,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"2928:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":225,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2928:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"2919:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2981:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":231,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3004:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":227,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"2969:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":229,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":137,"src":"2969:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":232,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2969:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":233,"nodeType":"ExpressionStatement","src":"2969:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":237,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3029:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":240,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3054:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":239,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3046:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":238,"name":"address","nodeType":"ElementaryTypeName","src":"3046:7:0","typeDescriptions":{}}},"id":241,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3046:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":234,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3017:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":236,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3017:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":242,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3017:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":243,"nodeType":"ExpressionStatement","src":"3017:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":247,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3082:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":252,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3120:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":251,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3112:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":250,"name":"address","nodeType":"ElementaryTypeName","src":"3112:7:0","typeDescriptions":{}}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3112:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":248,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3100:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":249,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3100:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":254,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3100:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":244,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3070:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":246,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3070:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":255,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3070:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":256,"nodeType":"ExpressionStatement","src":"3070:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":260,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3149:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":263,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3172:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3172:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":262,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3164:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":261,"name":"address","nodeType":"ElementaryTypeName","src":"3164:7:0","typeDescriptions":{}}},"id":265,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3164:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":257,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3137:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":259,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3137:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":266,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3137:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":267,"nodeType":"ExpressionStatement","src":"3137:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":271,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3206:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":276,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3242:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3242:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":275,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3234:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":274,"name":"address","nodeType":"ElementaryTypeName","src":"3234:7:0","typeDescriptions":{}}},"id":278,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3234:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":272,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3222:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":273,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3222:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":279,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3222:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":268,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3194:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3194:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":280,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3194:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":281,"nodeType":"ExpressionStatement","src":"3194:61:0"},{"assignments":[283],"declarations":[{"constant":false,"id":283,"mutability":"mutable","name":"json","nameLocation":"3280:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3266:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":282,"name":"string","nodeType":"ElementaryTypeName","src":"3266:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":285,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":284,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3287:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3266:55:0"},{"assignments":[290],"declarations":[{"constant":false,"id":290,"mutability":"mutable","name":"keys","nameLocation":"3347:4:0","nodeType":"VariableDeclaration","scope":377,"src":"3331:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":288,"name":"string","nodeType":"ElementaryTypeName","src":"3331:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":289,"nodeType":"ArrayTypeName","src":"3331:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":296,"initialValue":{"arguments":[{"id":293,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":283,"src":"3371:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":294,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3377:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":291,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3354:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3354:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":295,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3354:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3331:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":300,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3414:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":301,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3422:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":303,"indexExpression":{"hexValue":"30","id":302,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3427:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3422:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":304,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":290,"src":"3431:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":306,"indexExpression":{"hexValue":"31","id":305,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3436:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"3431:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":297,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3402:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":299,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":191,"src":"3402:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3402:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":308,"nodeType":"ExpressionStatement","src":"3402:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3461:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":309,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3450:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":311,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3450:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":313,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3450:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":314,"nodeType":"ExpressionStatement","src":"3450:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"3517:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":321,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3509:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":320,"name":"uint160","nodeType":"ElementaryTypeName","src":"3509:7:0","typeDescriptions":{}}},"id":323,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":319,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3501:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":318,"name":"address","nodeType":"ElementaryTypeName","src":"3501:7:0","typeDescriptions":{}}},"id":324,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3501:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":315,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3487:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":317,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"3487:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":325,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3487:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":326,"nodeType":"ExpressionStatement","src":"3487:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3545:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":327,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3534:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":329,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3534:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":331,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3534:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":332,"nodeType":"ExpressionStatement","src":"3534:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":336,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3582:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":339,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3617:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":340,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3617:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":338,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3609:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":337,"name":"address","nodeType":"ElementaryTypeName","src":"3609:7:0","typeDescriptions":{}}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3609:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":333,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3570:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3570:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":342,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3570:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":343,"nodeType":"ExpressionStatement","src":"3570:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":347,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3651:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":350,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3689:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3681:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":348,"name":"address","nodeType":"ElementaryTypeName","src":"3681:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":344,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3639:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":346,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"3639:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":352,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3639:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":353,"nodeType":"ExpressionStatement","src":"3639:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":357,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3716:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":354,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3705:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":356,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3705:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":358,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3705:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":359,"nodeType":"ExpressionStatement","src":"3705:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":360,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3741:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":362,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"3741:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3741:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":364,"nodeType":"ExpressionStatement","src":"3741:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":368,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3776:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":365,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3765:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":367,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":633,"src":"3765:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3765:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":370,"nodeType":"ExpressionStatement","src":"3765:33:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":374,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3821:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":371,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3809:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":373,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"3809:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":375,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3809:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":376,"nodeType":"ExpressionStatement","src":"3809:20:0"}]},"documentation":{"id":216,"nodeType":"StructuredDocumentation","src":"2804:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"2896:3:0","parameters":{"id":217,"nodeType":"ParameterList","parameters":[],"src":"2899:2:0"},"returnParameters":{"id":218,"nodeType":"ParameterList","parameters":[],"src":"2909:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":609,"nodeType":"FunctionDefinition","src":"3903:1258:0","nodes":[],"body":{"id":608,"nodeType":"Block","src":"3934:1227:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3956:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":392,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3999:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":391,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3991:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":390,"name":"address","nodeType":"ElementaryTypeName","src":"3991:7:0","typeDescriptions":{}}},"id":393,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3991:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"3979:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":389,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3979:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":394,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3979:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":387,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3971:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":386,"name":"uint256","nodeType":"ElementaryTypeName","src":"3971:7:0","typeDescriptions":{}}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3971:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":382,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"3944:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"3944:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":396,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3944:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":397,"nodeType":"ExpressionStatement","src":"3944:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":401,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4030:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":398,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4018:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":400,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4018:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":402,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4018:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":403,"nodeType":"ExpressionStatement","src":"4018:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":404,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4057:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":406,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"4057:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":407,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4057:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":408,"nodeType":"ExpressionStatement","src":"4057:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4092:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":409,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4081:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":411,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4081:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":413,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4081:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":414,"nodeType":"ExpressionStatement","src":"4081:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":418,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4128:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":415,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4117:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":417,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4117:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4117:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":420,"nodeType":"ExpressionStatement","src":"4117:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":424,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4166:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":421,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4154:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":423,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4154:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":425,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4154:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":426,"nodeType":"ExpressionStatement","src":"4154:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":434,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4231:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":433,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4223:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":432,"name":"uint160","nodeType":"ElementaryTypeName","src":"4223:7:0","typeDescriptions":{}}},"id":435,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4223:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":431,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4215:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":430,"name":"address","nodeType":"ElementaryTypeName","src":"4215:7:0","typeDescriptions":{}}},"id":436,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4215:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":427,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4197:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":429,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4197:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":437,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4197:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":438,"nodeType":"ExpressionStatement","src":"4197:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":442,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4263:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":439,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4252:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":441,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4252:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":443,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4252:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":444,"nodeType":"ExpressionStatement","src":"4252:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":448,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4302:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":445,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4291:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":663,"src":"4291:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":449,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4291:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":450,"nodeType":"ExpressionStatement","src":"4291:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":454,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4344:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":451,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4330:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":705,"src":"4330:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":455,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4330:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":456,"nodeType":"ExpressionStatement","src":"4330:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":457,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4371:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":459,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4371:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":460,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4371:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":461,"nodeType":"ExpressionStatement","src":"4371:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":465,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4410:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":462,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4399:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":464,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":648,"src":"4399:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":466,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4399:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":467,"nodeType":"ExpressionStatement","src":"4399:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":471,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4451:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":468,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4439:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":470,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4439:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4439:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":473,"nodeType":"ExpressionStatement","src":"4439:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":481,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4512:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":480,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4504:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":479,"name":"uint160","nodeType":"ElementaryTypeName","src":"4504:7:0","typeDescriptions":{}}},"id":482,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4504:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":478,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4496:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":477,"name":"address","nodeType":"ElementaryTypeName","src":"4496:7:0","typeDescriptions":{}}},"id":483,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4496:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":474,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4478:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":476,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"4478:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4478:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":485,"nodeType":"ExpressionStatement","src":"4478:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":489,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4544:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":486,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4531:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":488,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":678,"src":"4531:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":490,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4531:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":491,"nodeType":"ExpressionStatement","src":"4531:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":492,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4563:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":494,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"4563:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4563:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":496,"nodeType":"ExpressionStatement","src":"4563:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":500,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4604:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":497,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4592:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":499,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4592:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4592:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":502,"nodeType":"ExpressionStatement","src":"4592:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":510,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4665:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4657:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":508,"name":"uint160","nodeType":"ElementaryTypeName","src":"4657:7:0","typeDescriptions":{}}},"id":511,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":507,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4649:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":506,"name":"address","nodeType":"ElementaryTypeName","src":"4649:7:0","typeDescriptions":{}}},"id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4649:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":503,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4636:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":505,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4636:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":513,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4636:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":514,"nodeType":"ExpressionStatement","src":"4636:40:0"},{"assignments":[517],"declarations":[{"constant":false,"id":517,"mutability":"mutable","name":"x","nameLocation":"4693:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4686:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":516,"nodeType":"UserDefinedTypeName","pathNode":{"id":515,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4686:6:0"},"referencedDeclaration":719,"src":"4686:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":523,"initialValue":{"arguments":[{"hexValue":"31323334","id":521,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4708:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":520,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4697:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":519,"nodeType":"UserDefinedTypeName","pathNode":{"id":518,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4701:6:0"},"referencedDeclaration":719,"src":"4701:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":522,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4697:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4686:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":529,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":525,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":517,"src":"4731:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":526,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4731:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4731:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":528,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4742:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4731:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":524,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4723:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":530,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4723:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":531,"nodeType":"ExpressionStatement","src":"4723:24:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":535,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4770:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":532,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4758:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":534,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4758:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":536,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4758:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":537,"nodeType":"ExpressionStatement","src":"4758:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":545,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4820:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":544,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4812:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":543,"name":"uint160","nodeType":"ElementaryTypeName","src":"4812:7:0","typeDescriptions":{}}},"id":546,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4812:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":542,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4804:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":541,"name":"address","nodeType":"ElementaryTypeName","src":"4804:7:0","typeDescriptions":{}}},"id":547,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4804:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":538,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"4791:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":540,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"4791:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4791:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":549,"nodeType":"ExpressionStatement","src":"4791:38:0"},{"assignments":[552],"declarations":[{"constant":false,"id":552,"mutability":"mutable","name":"y","nameLocation":"4846:1:0","nodeType":"VariableDeclaration","scope":608,"src":"4839:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"},"typeName":{"id":551,"nodeType":"UserDefinedTypeName","pathNode":{"id":550,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4839:6:0"},"referencedDeclaration":719,"src":"4839:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"visibility":"internal"}],"id":566,"initialValue":{"arguments":[{"hexValue":"31323334","id":564,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4889:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":555,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"4850:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":554,"nodeType":"UserDefinedTypeName","pathNode":{"id":553,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"4854:6:0"},"referencedDeclaration":719,"src":"4854:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":563,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4883:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":559,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4875:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":558,"name":"uint256","nodeType":"ElementaryTypeName","src":"4875:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4875:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":557,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4867:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":556,"name":"bytes32","nodeType":"ElementaryTypeName","src":"4867:7:0","typeDescriptions":{}}},"id":562,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4867:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"4850:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":565,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4850:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"4839:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":568,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":552,"src":"4912:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":569,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":708,"src":"4912:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":570,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4912:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":571,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4923:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"4912:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"}],"id":567,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"4904:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$returns$__$","typeString":"function (bool) pure"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4904:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"4904:24:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4950:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"4938:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"4938:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4938:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"4938:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5042:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5042:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":584,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5042:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":585,"nodeType":"ExpressionStatement","src":"5042:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5077:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":588,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5066:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$719_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":587,"nodeType":"UserDefinedTypeName","pathNode":{"id":586,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":719,"src":"5070:6:0"},"referencedDeclaration":719,"src":"5070:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}}},"id":590,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5066:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$719","typeString":"contract FooBar"}},"id":591,"nodeType":"ExpressionStatement","src":"5066:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":595,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5105:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":602,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5146:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}],"id":601,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5138:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":600,"name":"address","nodeType":"ElementaryTypeName","src":"5138:7:0","typeDescriptions":{}}},"id":603,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5138:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":598,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":213,"src":"5126:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$55","typeString":"contract Vm"}},"id":599,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5126:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5126:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":597,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5118:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":596,"name":"uint256","nodeType":"ElementaryTypeName","src":"5118:7:0","typeDescriptions":{}}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5118:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":592,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5093:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":594,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":154,"src":"5093:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":606,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5093:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":607,"nodeType":"ExpressionStatement","src":"5093:61:0"}]},"documentation":{"id":379,"nodeType":"StructuredDocumentation","src":"3842:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"3912:12:0","parameters":{"id":380,"nodeType":"ParameterList","parameters":[],"src":"3924:2:0"},"returnParameters":{"id":381,"nodeType":"ParameterList","parameters":[],"src":"3934:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":633,"nodeType":"FunctionDefinition","src":"5256:143:0","nodes":[],"body":{"id":632,"nodeType":"Block","src":"5305:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":618,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":612,"src":"5327:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":615,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5315:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":617,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5315:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5315:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":620,"nodeType":"ExpressionStatement","src":"5315:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5352:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":627,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"5380:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":628,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"5380:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":626,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5372:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":625,"name":"address","nodeType":"ElementaryTypeName","src":"5372:7:0","typeDescriptions":{}}},"id":629,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5372:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":621,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5340:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":623,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":171,"src":"5340:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":630,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5340:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":631,"nodeType":"ExpressionStatement","src":"5340:52:0"}]},"documentation":{"id":610,"nodeType":"StructuredDocumentation","src":"5167:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"5265:5:0","parameters":{"id":613,"nodeType":"ParameterList","parameters":[{"constant":false,"id":612,"mutability":"mutable","name":"_v","nameLocation":"5287:2:0","nodeType":"VariableDeclaration","scope":633,"src":"5271:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":611,"name":"string","nodeType":"ElementaryTypeName","src":"5271:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5270:20:0"},"returnParameters":{"id":614,"nodeType":"ParameterList","parameters":[],"src":"5305:0:0"},"scope":706,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":648,"nodeType":"FunctionDefinition","src":"5405:95:0","nodes":[],"body":{"id":647,"nodeType":"Block","src":"5449:51:0","nodes":[],"statements":[{"expression":{"id":639,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5459:9:0","subExpression":{"id":638,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5459:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":640,"nodeType":"ExpressionStatement","src":"5459:9:0"},{"expression":{"arguments":[{"id":644,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":635,"src":"5490:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":641,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5478:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":643,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5478:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":645,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5478:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":646,"nodeType":"ExpressionStatement","src":"5478:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"5414:5:0","parameters":{"id":636,"nodeType":"ParameterList","parameters":[{"constant":false,"id":635,"mutability":"mutable","name":"_v","nameLocation":"5436:2:0","nodeType":"VariableDeclaration","scope":648,"src":"5420:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":634,"name":"string","nodeType":"ElementaryTypeName","src":"5420:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5419:20:0"},"returnParameters":{"id":637,"nodeType":"ParameterList","parameters":[],"src":"5449:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":663,"nodeType":"FunctionDefinition","src":"5506:95:0","nodes":[],"body":{"id":662,"nodeType":"Block","src":"5550:51:0","nodes":[],"statements":[{"expression":{"id":654,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5560:9:0","subExpression":{"id":653,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5560:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":655,"nodeType":"ExpressionStatement","src":"5560:9:0"},{"expression":{"arguments":[{"id":659,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":650,"src":"5591:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":656,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5579:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":658,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5579:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":660,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5579:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":661,"nodeType":"ExpressionStatement","src":"5579:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"5515:5:0","parameters":{"id":651,"nodeType":"ParameterList","parameters":[{"constant":false,"id":650,"mutability":"mutable","name":"_v","nameLocation":"5537:2:0","nodeType":"VariableDeclaration","scope":663,"src":"5521:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":649,"name":"string","nodeType":"ElementaryTypeName","src":"5521:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5520:20:0"},"returnParameters":{"id":652,"nodeType":"ParameterList","parameters":[],"src":"5550:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":678,"nodeType":"FunctionDefinition","src":"5607:98:0","nodes":[],"body":{"id":677,"nodeType":"Block","src":"5653:52:0","nodes":[],"statements":[{"expression":{"id":669,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5663:9:0","subExpression":{"id":668,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5663:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":670,"nodeType":"ExpressionStatement","src":"5663:9:0"},{"expression":{"arguments":[{"id":674,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":665,"src":"5695:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":671,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5682:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$706","typeString":"contract ScriptExample"}},"id":673,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":693,"src":"5682:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":675,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5682:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":676,"nodeType":"ExpressionStatement","src":"5682:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"5616:7:0","parameters":{"id":666,"nodeType":"ParameterList","parameters":[{"constant":false,"id":665,"mutability":"mutable","name":"_v","nameLocation":"5640:2:0","nodeType":"VariableDeclaration","scope":678,"src":"5624:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":664,"name":"string","nodeType":"ElementaryTypeName","src":"5624:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5623:20:0"},"returnParameters":{"id":667,"nodeType":"ParameterList","parameters":[],"src":"5653:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":693,"nodeType":"FunctionDefinition","src":"5711:97:0","nodes":[],"body":{"id":692,"nodeType":"Block","src":"5757:51:0","nodes":[],"statements":[{"expression":{"id":684,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"5767:9:0","subExpression":{"id":683,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":215,"src":"5767:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":685,"nodeType":"ExpressionStatement","src":"5767:9:0"},{"expression":{"arguments":[{"id":689,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":680,"src":"5798:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":686,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5786:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":688,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5786:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":690,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5786:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":691,"nodeType":"ExpressionStatement","src":"5786:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"5720:7:0","parameters":{"id":681,"nodeType":"ParameterList","parameters":[{"constant":false,"id":680,"mutability":"mutable","name":"_v","nameLocation":"5744:2:0","nodeType":"VariableDeclaration","scope":693,"src":"5728:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":679,"name":"string","nodeType":"ElementaryTypeName","src":"5728:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5727:20:0"},"returnParameters":{"id":682,"nodeType":"ParameterList","parameters":[],"src":"5757:0:0"},"scope":706,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":705,"nodeType":"FunctionDefinition","src":"5814:84:0","nodes":[],"body":{"id":704,"nodeType":"Block","src":"5866:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":701,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":695,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":698,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":192,"src":"5876:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$192_$","typeString":"type(library console)"}},"id":700,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":120,"src":"5876:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":702,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5876:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":703,"nodeType":"ExpressionStatement","src":"5876:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"5823:8:0","parameters":{"id":696,"nodeType":"ParameterList","parameters":[{"constant":false,"id":695,"mutability":"mutable","name":"_v","nameLocation":"5848:2:0","nodeType":"VariableDeclaration","scope":705,"src":"5832:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":694,"name":"string","nodeType":"ElementaryTypeName","src":"5832:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"5831:20:0"},"returnParameters":{"id":697,"nodeType":"ParameterList","parameters":[],"src":"5866:0:0"},"scope":706,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[719],"contractKind":"contract","documentation":{"id":193,"nodeType":"StructuredDocumentation","src":"2415:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[706],"name":"ScriptExample","nameLocation":"2550:13:0","scope":720,"usedErrors":[]},{"id":719,"nodeType":"ContractDefinition","src":"5902:96:0","nodes":[{"id":708,"nodeType":"VariableDeclaration","src":"5924:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"5939:3:0","scope":719,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":707,"name":"uint256","nodeType":"ElementaryTypeName","src":"5924:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":718,"nodeType":"FunctionDefinition","src":"5949:47:0","nodes":[],"body":{"id":717,"nodeType":"Block","src":"5972:24:0","nodes":[],"statements":[{"expression":{"id":715,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":713,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":708,"src":"5982:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":714,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":710,"src":"5988:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"5982:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":716,"nodeType":"ExpressionStatement","src":"5982:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":711,"nodeType":"ParameterList","parameters":[{"constant":false,"id":710,"mutability":"mutable","name":"v","nameLocation":"5969:1:0","nodeType":"VariableDeclaration","scope":718,"src":"5961:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":709,"name":"uint256","nodeType":"ElementaryTypeName","src":"5961:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"5960:11:0"},"returnParameters":{"id":712,"nodeType":"ParameterList","parameters":[],"src":"5972:0:0"},"scope":719,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[719],"name":"FooBar","nameLocation":"5911:6:0","scope":720,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
+{"abi":[],"bytecode":{"object":"0x602d6037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea164736f6c634300080f000a","sourceMap":"1144:1851:0:-:0;;;;;;;;;;;;;;;-1:-1:-1;;;1144:1851:0;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x73000000000000000000000000000000000000000030146080604052600080fdfea164736f6c634300080f000a","sourceMap":"1144:1851:0:-:0;;;;;;;;","linkReferences":{}},"methodIdentifiers":{},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.15+commit.e14f2714\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"scripts/ScriptExample.s.sol\":\"console\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":999999},\"remappings\":[]},\"sources\":{\"scripts/ScriptExample.s.sol\":{\"keccak256\":\"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28\",\"dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.15+commit.e14f2714"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":[],"optimizer":{"enabled":true,"runs":999999},"metadata":{"bytecodeHash":"none"},"compilationTarget":{"scripts/ScriptExample.s.sol":"console"},"evmVersion":"london","libraries":{}},"sources":{"scripts/ScriptExample.s.sol":{"keccak256":"0x1fd8237b3b3dff6f5f0dcff6572ad225d40275cdf471b8f6bac1df896c0e56da","urls":["bzz-raw://0e60c01e0c609f4401cb66c7d10819321ca7aec52cfb8b688f57f5ae54ee9f28","dweb:/ipfs/QmXyqERiuKiVaUWmP4XVZXdJvhoPsFvbySF2WWJtKjgSy8"],"license":"MIT"}},"version":1},"storageLayout":{"storage":[],"types":{}},"userdoc":{"version":1,"kind":"user"},"devdoc":{"version":1,"kind":"dev"},"ast":{"absolutePath":"scripts/ScriptExample.s.sol","id":969,"exportedSymbols":{"FooBar":[799],"ForkTester":[968],"ForkedContract":[852],"NonceGetter":[833],"ScriptExample":[786],"Vm":[83],"console":[220]},"nodeType":"SourceUnit","src":"32:8375:0","nodes":[{"id":1,"nodeType":"PragmaDirective","src":"32:23:0","nodes":[],"literals":["solidity","0.8",".15"]},{"id":83,"nodeType":"ContractDefinition","src":"120:969:0","nodes":[{"id":10,"nodeType":"FunctionDefinition","src":"139:91:0","nodes":[],"functionSelector":"4777f3cf","implemented":false,"kind":"function","modifiers":[],"name":"envOr","nameLocation":"148:5:0","parameters":{"id":6,"nodeType":"ParameterList","parameters":[{"constant":false,"id":3,"mutability":"mutable","name":"name","nameLocation":"170:4:0","nodeType":"VariableDeclaration","scope":10,"src":"154:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":2,"name":"string","nodeType":"ElementaryTypeName","src":"154:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":5,"mutability":"mutable","name":"defaultValue","nameLocation":"181:12:0","nodeType":"VariableDeclaration","scope":10,"src":"176:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":4,"name":"bool","nodeType":"ElementaryTypeName","src":"176:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"153:41:0"},"returnParameters":{"id":9,"nodeType":"ParameterList","parameters":[{"constant":false,"id":8,"mutability":"mutable","name":"value","nameLocation":"223:5:0","nodeType":"VariableDeclaration","scope":10,"src":"218:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":7,"name":"bool","nodeType":"ElementaryTypeName","src":"218:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"217:12:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":17,"nodeType":"FunctionDefinition","src":"235:72:0","nodes":[],"functionSelector":"2d0335ab","implemented":false,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"244:8:0","parameters":{"id":13,"nodeType":"ParameterList","parameters":[{"constant":false,"id":12,"mutability":"mutable","name":"account","nameLocation":"261:7:0","nodeType":"VariableDeclaration","scope":17,"src":"253:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":11,"name":"address","nodeType":"ElementaryTypeName","src":"253:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"252:17:0"},"returnParameters":{"id":16,"nodeType":"ParameterList","parameters":[{"constant":false,"id":15,"mutability":"mutable","name":"nonce","nameLocation":"300:5:0","nodeType":"VariableDeclaration","scope":17,"src":"293:12:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":14,"name":"uint64","nodeType":"ElementaryTypeName","src":"293:6:0","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"}],"src":"292:14:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":27,"nodeType":"FunctionDefinition","src":"312:111:0","nodes":[],"functionSelector":"213e4198","implemented":false,"kind":"function","modifiers":[],"name":"parseJsonKeys","nameLocation":"321:13:0","parameters":{"id":22,"nodeType":"ParameterList","parameters":[{"constant":false,"id":19,"mutability":"mutable","name":"json","nameLocation":"351:4:0","nodeType":"VariableDeclaration","scope":27,"src":"335:20:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":18,"name":"string","nodeType":"ElementaryTypeName","src":"335:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":21,"mutability":"mutable","name":"key","nameLocation":"373:3:0","nodeType":"VariableDeclaration","scope":27,"src":"357:19:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":20,"name":"string","nodeType":"ElementaryTypeName","src":"357:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"334:43:0"},"returnParameters":{"id":26,"nodeType":"ParameterList","parameters":[{"constant":false,"id":25,"mutability":"mutable","name":"keys","nameLocation":"417:4:0","nodeType":"VariableDeclaration","scope":27,"src":"401:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":23,"name":"string","nodeType":"ElementaryTypeName","src":"401:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":24,"nodeType":"ArrayTypeName","src":"401:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"src":"400:22:0"},"scope":83,"stateMutability":"pure","virtual":false,"visibility":"external"},{"id":32,"nodeType":"FunctionDefinition","src":"428:48:0","nodes":[],"functionSelector":"06447d56","implemented":false,"kind":"function","modifiers":[],"name":"startPrank","nameLocation":"437:10:0","parameters":{"id":30,"nodeType":"ParameterList","parameters":[{"constant":false,"id":29,"mutability":"mutable","name":"msgSender","nameLocation":"456:9:0","nodeType":"VariableDeclaration","scope":32,"src":"448:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":28,"name":"address","nodeType":"ElementaryTypeName","src":"448:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"447:19:0"},"returnParameters":{"id":31,"nodeType":"ParameterList","parameters":[],"src":"475:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":35,"nodeType":"FunctionDefinition","src":"481:30:0","nodes":[],"functionSelector":"90c5013b","implemented":false,"kind":"function","modifiers":[],"name":"stopPrank","nameLocation":"490:9:0","parameters":{"id":33,"nodeType":"ParameterList","parameters":[],"src":"499:2:0"},"returnParameters":{"id":34,"nodeType":"ParameterList","parameters":[],"src":"510:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":38,"nodeType":"FunctionDefinition","src":"516:30:0","nodes":[],"functionSelector":"afc98040","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"525:9:0","parameters":{"id":36,"nodeType":"ParameterList","parameters":[],"src":"534:2:0"},"returnParameters":{"id":37,"nodeType":"ParameterList","parameters":[],"src":"545:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":43,"nodeType":"FunctionDefinition","src":"551:47:0","nodes":[],"functionSelector":"e6962cdb","implemented":false,"kind":"function","modifiers":[],"name":"broadcast","nameLocation":"560:9:0","parameters":{"id":41,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40,"mutability":"mutable","name":"msgSender","nameLocation":"578:9:0","nodeType":"VariableDeclaration","scope":43,"src":"570:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":39,"name":"address","nodeType":"ElementaryTypeName","src":"570:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"569:19:0"},"returnParameters":{"id":42,"nodeType":"ParameterList","parameters":[],"src":"597:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":48,"nodeType":"FunctionDefinition","src":"603:52:0","nodes":[],"functionSelector":"7fec2a8d","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"612:14:0","parameters":{"id":46,"nodeType":"ParameterList","parameters":[{"constant":false,"id":45,"mutability":"mutable","name":"msgSender","nameLocation":"635:9:0","nodeType":"VariableDeclaration","scope":48,"src":"627:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":44,"name":"address","nodeType":"ElementaryTypeName","src":"627:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"626:19:0"},"returnParameters":{"id":47,"nodeType":"ParameterList","parameters":[],"src":"654:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":51,"nodeType":"FunctionDefinition","src":"660:35:0","nodes":[],"functionSelector":"7fb5297f","implemented":false,"kind":"function","modifiers":[],"name":"startBroadcast","nameLocation":"669:14:0","parameters":{"id":49,"nodeType":"ParameterList","parameters":[],"src":"683:2:0"},"returnParameters":{"id":50,"nodeType":"ParameterList","parameters":[],"src":"694:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":54,"nodeType":"FunctionDefinition","src":"700:34:0","nodes":[],"functionSelector":"76eadd36","implemented":false,"kind":"function","modifiers":[],"name":"stopBroadcast","nameLocation":"709:13:0","parameters":{"id":52,"nodeType":"ParameterList","parameters":[],"src":"722:2:0"},"returnParameters":{"id":53,"nodeType":"ParameterList","parameters":[],"src":"733:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":61,"nodeType":"FunctionDefinition","src":"739:108:0","nodes":[],"functionSelector":"3ebf73b4","implemented":false,"kind":"function","modifiers":[],"name":"getDeployedCode","nameLocation":"748:15:0","parameters":{"id":57,"nodeType":"ParameterList","parameters":[{"constant":false,"id":56,"mutability":"mutable","name":"artifactPath","nameLocation":"780:12:0","nodeType":"VariableDeclaration","scope":61,"src":"764:28:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":55,"name":"string","nodeType":"ElementaryTypeName","src":"764:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"763:30:0"},"returnParameters":{"id":60,"nodeType":"ParameterList","parameters":[{"constant":false,"id":59,"mutability":"mutable","name":"runtimeBytecode","nameLocation":"830:15:0","nodeType":"VariableDeclaration","scope":61,"src":"817:28:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":58,"name":"bytes","nodeType":"ElementaryTypeName","src":"817:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"816:30:0"},"scope":83,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":68,"nodeType":"FunctionDefinition","src":"852:74:0","nodes":[],"functionSelector":"b4d6c782","implemented":false,"kind":"function","modifiers":[],"name":"etch","nameLocation":"861:4:0","parameters":{"id":66,"nodeType":"ParameterList","parameters":[{"constant":false,"id":63,"mutability":"mutable","name":"target","nameLocation":"874:6:0","nodeType":"VariableDeclaration","scope":68,"src":"866:14:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":62,"name":"address","nodeType":"ElementaryTypeName","src":"866:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":65,"mutability":"mutable","name":"newRuntimeBytecode","nameLocation":"897:18:0","nodeType":"VariableDeclaration","scope":68,"src":"882:33:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_bytes_calldata_ptr","typeString":"bytes"},"typeName":{"id":64,"name":"bytes","nodeType":"ElementaryTypeName","src":"882:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"865:51:0"},"returnParameters":{"id":67,"nodeType":"ParameterList","parameters":[],"src":"925:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":73,"nodeType":"FunctionDefinition","src":"931:51:0","nodes":[],"functionSelector":"ea060291","implemented":false,"kind":"function","modifiers":[],"name":"allowCheatcodes","nameLocation":"940:15:0","parameters":{"id":71,"nodeType":"ParameterList","parameters":[{"constant":false,"id":70,"mutability":"mutable","name":"account","nameLocation":"964:7:0","nodeType":"VariableDeclaration","scope":73,"src":"956:15:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":69,"name":"address","nodeType":"ElementaryTypeName","src":"956:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"955:17:0"},"returnParameters":{"id":72,"nodeType":"ParameterList","parameters":[],"src":"981:0:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":82,"nodeType":"FunctionDefinition","src":"987:100:0","nodes":[],"functionSelector":"71ee464d","implemented":false,"kind":"function","modifiers":[],"name":"createSelectFork","nameLocation":"996:16:0","parameters":{"id":78,"nodeType":"ParameterList","parameters":[{"constant":false,"id":75,"mutability":"mutable","name":"forkName","nameLocation":"1029:8:0","nodeType":"VariableDeclaration","scope":82,"src":"1013:24:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":74,"name":"string","nodeType":"ElementaryTypeName","src":"1013:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":77,"mutability":"mutable","name":"blockNumber","nameLocation":"1047:11:0","nodeType":"VariableDeclaration","scope":82,"src":"1039:19:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":76,"name":"uint256","nodeType":"ElementaryTypeName","src":"1039:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1012:47:0"},"returnParameters":{"id":81,"nodeType":"ParameterList","parameters":[{"constant":false,"id":80,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":82,"src":"1078:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":79,"name":"uint256","nodeType":"ElementaryTypeName","src":"1078:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"1077:9:0"},"scope":83,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"Vm","contractDependencies":[],"contractKind":"interface","fullyImplemented":false,"linearizedBaseContracts":[83],"name":"Vm","nameLocation":"130:2:0","scope":969,"usedErrors":[]},{"id":220,"nodeType":"ContractDefinition","src":"1144:1851:0","nodes":[{"id":89,"nodeType":"VariableDeclaration","src":"1166:86:0","nodes":[],"constant":true,"mutability":"constant","name":"CONSOLE_ADDRESS","nameLocation":"1183:15:0","scope":220,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":84,"name":"address","nodeType":"ElementaryTypeName","src":"1166:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"hexValue":"307830303030303030303030303030303030303036333646366537333646366336353265366336663637","id":87,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"1209:42:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"value":"0x000000000000000000636F6e736F6c652e6c6f67"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":86,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"1201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":85,"name":"address","nodeType":"ElementaryTypeName","src":"1201:7:0","typeDescriptions":{}}},"id":88,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1201:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":106,"nodeType":"FunctionDefinition","src":"1259:235:0","nodes":[],"body":{"id":105,"nodeType":"Block","src":"1432:62:0","nodes":[],"statements":[{"AST":{"nodeType":"YulBlock","src":"1451:37:0","statements":[{"nodeType":"YulAssignment","src":"1465:13:0","value":{"name":"fnIn","nodeType":"YulIdentifier","src":"1474:4:0"},"variableNames":[{"name":"fnOut","nodeType":"YulIdentifier","src":"1465:5:0"}]}]},"evmVersion":"london","externalReferences":[{"declaration":95,"isOffset":false,"isSlot":false,"src":"1474:4:0","valueSize":1},{"declaration":102,"isOffset":false,"isSlot":false,"src":"1465:5:0","valueSize":1}],"id":104,"nodeType":"InlineAssembly","src":"1442:46:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_castLogPayloadViewToPure","nameLocation":"1268:25:0","parameters":{"id":96,"nodeType":"ParameterList","parameters":[{"constant":false,"id":95,"mutability":"mutable","name":"fnIn","nameLocation":"1331:4:0","nodeType":"VariableDeclaration","scope":106,"src":"1294:41:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"typeName":{"id":94,"nodeType":"FunctionTypeName","parameterTypes":{"id":92,"nodeType":"ParameterList","parameters":[{"constant":false,"id":91,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":94,"src":"1303:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":90,"name":"bytes","nodeType":"ElementaryTypeName","src":"1303:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1302:14:0"},"returnParameterTypes":{"id":93,"nodeType":"ParameterList","parameters":[],"src":"1331:0:0"},"src":"1294:41:0","stateMutability":"view","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) view"},"visibility":"internal"},"visibility":"internal"}],"src":"1293:43:0"},"returnParameters":{"id":103,"nodeType":"ParameterList","parameters":[{"constant":false,"id":102,"mutability":"mutable","name":"fnOut","nameLocation":"1421:5:0","nodeType":"VariableDeclaration","scope":106,"src":"1384:42:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"typeName":{"id":101,"nodeType":"FunctionTypeName","parameterTypes":{"id":99,"nodeType":"ParameterList","parameters":[{"constant":false,"id":98,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":101,"src":"1393:12:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":97,"name":"bytes","nodeType":"ElementaryTypeName","src":"1393:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1392:14:0"},"returnParameterTypes":{"id":100,"nodeType":"ParameterList","parameters":[],"src":"1421:0:0"},"src":"1384:42:0","stateMutability":"pure","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes) pure"},"visibility":"internal"},"visibility":"internal"}],"src":"1383:44:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":118,"nodeType":"FunctionDefinition","src":"1500:133:0","nodes":[],"body":{"id":117,"nodeType":"Block","src":"1561:72:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":114,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":108,"src":"1618:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"arguments":[{"id":112,"name":"_sendLogPayloadView","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":134,"src":"1597:19:0","typeDescriptions":{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_function_internal_view$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) view"}],"id":111,"name":"_castLogPayloadViewToPure","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":106,"src":"1571:25:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_function_internal_view$_t_bytes_memory_ptr_$returns$__$_$returns$_t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$_$","typeString":"function (function (bytes memory) view) pure returns (function (bytes memory) pure)"}},"id":113,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":115,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"1571:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":116,"nodeType":"ExpressionStatement","src":"1571:55:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayload","nameLocation":"1509:15:0","parameters":{"id":109,"nodeType":"ParameterList","parameters":[{"constant":false,"id":108,"mutability":"mutable","name":"payload","nameLocation":"1538:7:0","nodeType":"VariableDeclaration","scope":118,"src":"1525:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":107,"name":"bytes","nodeType":"ElementaryTypeName","src":"1525:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1524:22:0"},"returnParameters":{"id":110,"nodeType":"ParameterList","parameters":[],"src":"1561:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":134,"nodeType":"FunctionDefinition","src":"1639:380:0","nodes":[],"body":{"id":133,"nodeType":"Block","src":"1703:316:0","nodes":[],"statements":[{"assignments":[124],"declarations":[{"constant":false,"id":124,"mutability":"mutable","name":"payloadLength","nameLocation":"1721:13:0","nodeType":"VariableDeclaration","scope":133,"src":"1713:21:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":123,"name":"uint256","nodeType":"ElementaryTypeName","src":"1713:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":127,"initialValue":{"expression":{"id":125,"name":"payload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":120,"src":"1737:7:0","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}},"id":126,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"length","nodeType":"MemberAccess","src":"1737:14:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"1713:38:0"},{"assignments":[129],"declarations":[{"constant":false,"id":129,"mutability":"mutable","name":"consoleAddress","nameLocation":"1769:14:0","nodeType":"VariableDeclaration","scope":133,"src":"1761:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":128,"name":"address","nodeType":"ElementaryTypeName","src":"1761:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":131,"initialValue":{"id":130,"name":"CONSOLE_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":89,"src":"1786:15:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"1761:40:0"},{"AST":{"nodeType":"YulBlock","src":"1863:150:0","statements":[{"nodeType":"YulVariableDeclaration","src":"1877:36:0","value":{"arguments":[{"name":"payload","nodeType":"YulIdentifier","src":"1901:7:0"},{"kind":"number","nodeType":"YulLiteral","src":"1910:2:0","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1897:3:0"},"nodeType":"YulFunctionCall","src":"1897:16:0"},"variables":[{"name":"payloadStart","nodeType":"YulTypedName","src":"1881:12:0","type":""}]},{"nodeType":"YulVariableDeclaration","src":"1926:77:0","value":{"arguments":[{"arguments":[],"functionName":{"name":"gas","nodeType":"YulIdentifier","src":"1946:3:0"},"nodeType":"YulFunctionCall","src":"1946:5:0"},{"name":"consoleAddress","nodeType":"YulIdentifier","src":"1953:14:0"},{"name":"payloadStart","nodeType":"YulIdentifier","src":"1969:12:0"},{"name":"payloadLength","nodeType":"YulIdentifier","src":"1983:13:0"},{"kind":"number","nodeType":"YulLiteral","src":"1998:1:0","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"2001:1:0","type":"","value":"0"}],"functionName":{"name":"staticcall","nodeType":"YulIdentifier","src":"1935:10:0"},"nodeType":"YulFunctionCall","src":"1935:68:0"},"variables":[{"name":"r","nodeType":"YulTypedName","src":"1930:1:0","type":""}]}]},"documentation":"@solidity memory-safe-assembly","evmVersion":"london","externalReferences":[{"declaration":129,"isOffset":false,"isSlot":false,"src":"1953:14:0","valueSize":1},{"declaration":120,"isOffset":false,"isSlot":false,"src":"1901:7:0","valueSize":1},{"declaration":124,"isOffset":false,"isSlot":false,"src":"1983:13:0","valueSize":1}],"id":132,"nodeType":"InlineAssembly","src":"1854:159:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"_sendLogPayloadView","nameLocation":"1648:19:0","parameters":{"id":121,"nodeType":"ParameterList","parameters":[{"constant":false,"id":120,"mutability":"mutable","name":"payload","nameLocation":"1681:7:0","nodeType":"VariableDeclaration","scope":134,"src":"1668:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes"},"typeName":{"id":119,"name":"bytes","nodeType":"ElementaryTypeName","src":"1668:5:0","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"src":"1667:22:0"},"returnParameters":{"id":122,"nodeType":"ParameterList","parameters":[],"src":"1703:0:0"},"scope":220,"stateMutability":"view","virtual":false,"visibility":"private"},{"id":148,"nodeType":"FunctionDefinition","src":"2025:164:0","nodes":[],"body":{"id":147,"nodeType":"Block","src":"2070:119:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e6729","id":142,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2120:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},"value":"log(string)"},{"id":143,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":136,"src":"2135:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_41304facd9323d75b11bcdd609cb38effffdb05710f7caf0e9b16c6d9d709f50","typeString":"literal_string \"log(string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":140,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2096:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":141,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2096:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":144,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2096:42:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":139,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2080:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":145,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2080:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":146,"nodeType":"ExpressionStatement","src":"2080:59:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2034:3:0","parameters":{"id":137,"nodeType":"ParameterList","parameters":[{"constant":false,"id":136,"mutability":"mutable","name":"p0","nameLocation":"2052:2:0","nodeType":"VariableDeclaration","scope":148,"src":"2038:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":135,"name":"string","nodeType":"ElementaryTypeName","src":"2038:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2037:18:0"},"returnParameters":{"id":138,"nodeType":"ParameterList","parameters":[],"src":"2070:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":165,"nodeType":"FunctionDefinition","src":"2195:182:0","nodes":[],"body":{"id":164,"nodeType":"Block","src":"2249:128:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c626f6f6c29","id":158,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2299:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},"value":"log(string,bool)"},{"id":159,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":150,"src":"2319:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":160,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":152,"src":"2323:2:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_c3b556354c088fbb43886eb83c2a04bc7089663f964d22be308197a236f5b870","typeString":"literal_string \"log(string,bool)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":156,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2275:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":157,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2275:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":161,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2275:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":155,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2259:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":162,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2259:68:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":163,"nodeType":"ExpressionStatement","src":"2259:68:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2204:3:0","parameters":{"id":153,"nodeType":"ParameterList","parameters":[{"constant":false,"id":150,"mutability":"mutable","name":"p0","nameLocation":"2222:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2208:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":149,"name":"string","nodeType":"ElementaryTypeName","src":"2208:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":152,"mutability":"mutable","name":"p1","nameLocation":"2231:2:0","nodeType":"VariableDeclaration","scope":165,"src":"2226:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":151,"name":"bool","nodeType":"ElementaryTypeName","src":"2226:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"2207:27:0"},"returnParameters":{"id":154,"nodeType":"ParameterList","parameters":[],"src":"2249:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":182,"nodeType":"FunctionDefinition","src":"2383:188:0","nodes":[],"body":{"id":181,"nodeType":"Block","src":"2440:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c75696e7432353629","id":175,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2490:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},"value":"log(string,uint256)"},{"id":176,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":167,"src":"2513:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":177,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":169,"src":"2517:2:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b60e72ccf6d57ab53eb84d7e94a9545806ed7f93c4d5673f11a64f03471e584e","typeString":"literal_string \"log(string,uint256)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":173,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2466:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":174,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2466:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":178,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2466:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":172,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2450:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":179,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2450:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":180,"nodeType":"ExpressionStatement","src":"2450:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2392:3:0","parameters":{"id":170,"nodeType":"ParameterList","parameters":[{"constant":false,"id":167,"mutability":"mutable","name":"p0","nameLocation":"2410:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2396:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":166,"name":"string","nodeType":"ElementaryTypeName","src":"2396:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":169,"mutability":"mutable","name":"p1","nameLocation":"2422:2:0","nodeType":"VariableDeclaration","scope":182,"src":"2414:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":168,"name":"uint256","nodeType":"ElementaryTypeName","src":"2414:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"2395:30:0"},"returnParameters":{"id":171,"nodeType":"ParameterList","parameters":[],"src":"2440:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":199,"nodeType":"FunctionDefinition","src":"2577:188:0","nodes":[],"body":{"id":198,"nodeType":"Block","src":"2634:131:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c6164647265737329","id":192,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2684:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},"value":"log(string,address)"},{"id":193,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":184,"src":"2707:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":194,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":186,"src":"2711:2:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_319af333460570a1937bf195dd33445c0d0951c59127da6f1f038b9fdce3fd72","typeString":"literal_string \"log(string,address)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":190,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2660:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":191,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2660:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":195,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2660:54:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":189,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2644:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":196,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2644:71:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":197,"nodeType":"ExpressionStatement","src":"2644:71:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2586:3:0","parameters":{"id":187,"nodeType":"ParameterList","parameters":[{"constant":false,"id":184,"mutability":"mutable","name":"p0","nameLocation":"2604:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2590:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":183,"name":"string","nodeType":"ElementaryTypeName","src":"2590:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":186,"mutability":"mutable","name":"p1","nameLocation":"2616:2:0","nodeType":"VariableDeclaration","scope":199,"src":"2608:10:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":185,"name":"address","nodeType":"ElementaryTypeName","src":"2608:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"2589:30:0"},"returnParameters":{"id":188,"nodeType":"ParameterList","parameters":[],"src":"2634:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"},{"id":219,"nodeType":"FunctionDefinition","src":"2771:222:0","nodes":[],"body":{"id":218,"nodeType":"Block","src":"2852:141:0","nodes":[],"statements":[{"expression":{"arguments":[{"arguments":[{"hexValue":"6c6f6728737472696e672c737472696e672c737472696e6729","id":211,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"2902:27:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},"value":"log(string,string,string)"},{"id":212,"name":"p0","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":201,"src":"2931:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":213,"name":"p1","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":203,"src":"2935:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"id":214,"name":"p2","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":205,"src":"2939:2:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2ced7cef693312206c21f0e92e3b54e2e16bf33db5eec350c78866822c665e1f","typeString":"literal_string \"log(string,string,string)\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":209,"name":"abi","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-1,"src":"2878:3:0","typeDescriptions":{"typeIdentifier":"t_magic_abi","typeString":"abi"}},"id":210,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberName":"encodeWithSignature","nodeType":"MemberAccess","src":"2878:23:0","typeDescriptions":{"typeIdentifier":"t_function_abiencodewithsignature_pure$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) pure returns (bytes memory)"}},"id":215,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2878:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"id":208,"name":"_sendLogPayload","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":118,"src":"2862:15:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_bytes_memory_ptr_$returns$__$","typeString":"function (bytes memory) pure"}},"id":216,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"2862:81:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":217,"nodeType":"ExpressionStatement","src":"2862:81:0"}]},"implemented":true,"kind":"function","modifiers":[],"name":"log","nameLocation":"2780:3:0","parameters":{"id":206,"nodeType":"ParameterList","parameters":[{"constant":false,"id":201,"mutability":"mutable","name":"p0","nameLocation":"2798:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2784:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":200,"name":"string","nodeType":"ElementaryTypeName","src":"2784:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":203,"mutability":"mutable","name":"p1","nameLocation":"2816:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2802:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":202,"name":"string","nodeType":"ElementaryTypeName","src":"2802:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"},{"constant":false,"id":205,"mutability":"mutable","name":"p2","nameLocation":"2834:2:0","nodeType":"VariableDeclaration","scope":219,"src":"2820:16:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":204,"name":"string","nodeType":"ElementaryTypeName","src":"2820:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"2783:54:0"},"returnParameters":{"id":207,"nodeType":"ParameterList","parameters":[],"src":"2852:0:0"},"scope":220,"stateMutability":"pure","virtual":false,"visibility":"internal"}],"abstract":false,"baseContracts":[],"canonicalName":"console","contractDependencies":[],"contractKind":"library","fullyImplemented":true,"linearizedBaseContracts":[220],"name":"console","nameLocation":"1152:7:0","scope":969,"usedErrors":[]},{"id":786,"nodeType":"ContractDefinition","src":"3123:3912:0","nodes":[{"id":235,"nodeType":"VariableDeclaration","src":"3152:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"3178:10:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":222,"name":"address","nodeType":"ElementaryTypeName","src":"3152:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":230,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3225:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":229,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"3215:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":231,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3215:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":228,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3207:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":227,"name":"uint256","nodeType":"ElementaryTypeName","src":"3207:7:0","typeDescriptions":{}}},"id":232,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3207:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":226,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3199:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":225,"name":"uint160","nodeType":"ElementaryTypeName","src":"3199:7:0","typeDescriptions":{}}},"id":233,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3199:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":224,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3191:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":223,"name":"address","nodeType":"ElementaryTypeName","src":"3191:7:0","typeDescriptions":{}}},"id":234,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3191:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":241,"nodeType":"VariableDeclaration","src":"3252:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"3273:2:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":237,"nodeType":"UserDefinedTypeName","pathNode":{"id":236,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"3252:2:0"},"referencedDeclaration":83,"src":"3252:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":239,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":235,"src":"3281:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":238,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"3278:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":240,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3278:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":243,"nodeType":"VariableDeclaration","src":"3356:22:0","nodes":[],"constant":false,"functionSelector":"61bc221a","mutability":"mutable","name":"counter","nameLocation":"3371:7:0","scope":786,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":242,"name":"uint256","nodeType":"ElementaryTypeName","src":"3356:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":456,"nodeType":"FunctionDefinition","src":"3468:1428:0","nodes":[],"body":{"id":455,"nodeType":"Block","src":"3490:1406:0","nodes":[],"statements":[{"assignments":[248],"declarations":[{"constant":false,"id":248,"mutability":"mutable","name":"x","nameLocation":"3505:1:0","nodeType":"VariableDeclaration","scope":455,"src":"3500:6:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":247,"name":"bool","nodeType":"ElementaryTypeName","src":"3500:4:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"id":254,"initialValue":{"arguments":[{"hexValue":"4558414d504c455f424f4f4c","id":251,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3518:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},"value":"EXAMPLE_BOOL"},{"hexValue":"66616c7365","id":252,"isConstant":false,"isLValue":false,"isPure":true,"kind":"bool","lValueRequested":false,"nodeType":"Literal","src":"3534:5:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"value":"false"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a634dae177a0e138ae7aaa2afae347412e148992e88c7aabd33ee71be146cb7f","typeString":"literal_string \"EXAMPLE_BOOL\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":249,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3509:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":250,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"envOr","nodeType":"MemberAccess","referencedDeclaration":10,"src":"3509:8:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$_t_bool_$returns$_t_bool_$","typeString":"function (string memory,bool) view external returns (bool)"}},"id":253,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3509:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"nodeType":"VariableDeclarationStatement","src":"3500:40:0"},{"expression":{"arguments":[{"hexValue":"626f6f6c2076616c75652066726f6d20656e76","id":258,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3562:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},"value":"bool value from env"},{"id":259,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":248,"src":"3585:1:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5a607d0b5a1295325aa8901721d78ba402601bba6f62cebdd5235dd0204a590b","typeString":"literal_string \"bool value from env\""},{"typeIdentifier":"t_bool","typeString":"bool"}],"expression":{"id":255,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3550:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":257,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":165,"src":"3550:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_bool_$returns$__$","typeString":"function (string memory,bool) pure"}},"id":260,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3550:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":261,"nodeType":"ExpressionStatement","src":"3550:37:0"},{"expression":{"arguments":[{"hexValue":"636f6e74726163742061646472","id":265,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3610:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},"value":"contract addr"},{"arguments":[{"id":268,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3635:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":267,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3627:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":266,"name":"address","nodeType":"ElementaryTypeName","src":"3627:7:0","typeDescriptions":{}}},"id":269,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3627:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa50728770d00fe8f6a0592f3565bbfaf063ee4077f1f5bbc003d091d33cd0c4","typeString":"literal_string \"contract addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":262,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3598:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":264,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3598:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":270,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3598:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":271,"nodeType":"ExpressionStatement","src":"3598:43:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206e6f6e6365","id":275,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3663:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},"value":"contract nonce"},{"arguments":[{"arguments":[{"id":280,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"3701:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":279,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3693:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":278,"name":"address","nodeType":"ElementaryTypeName","src":"3693:7:0","typeDescriptions":{}}},"id":281,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3693:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":276,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3681:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":277,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3681:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":282,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3681:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_3a23091615a5de8c0a35ffd8857a37e2c4e0b72f3ef8a34d6caf65efcd562e2f","typeString":"literal_string \"contract nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":272,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3651:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":274,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3651:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":283,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3651:57:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":284,"nodeType":"ExpressionStatement","src":"3651:57:0"},{"expression":{"arguments":[{"hexValue":"73656e6465722061646472","id":288,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3730:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},"value":"sender addr"},{"arguments":[{"expression":{"id":291,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3753:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":292,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3753:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":290,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3745:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":289,"name":"address","nodeType":"ElementaryTypeName","src":"3745:7:0","typeDescriptions":{}}},"id":293,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3745:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8125ca2decf812b25b65606ff16dad37cb198ff0433485a7926e50feafacfc35","typeString":"literal_string \"sender addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":285,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3718:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":287,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"3718:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":294,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3718:47:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":295,"nodeType":"ExpressionStatement","src":"3718:47:0"},{"expression":{"arguments":[{"hexValue":"73656e646572206e6f6e6365","id":299,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3787:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},"value":"sender nonce"},{"arguments":[{"arguments":[{"expression":{"id":304,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"3823:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":305,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"3823:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":303,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"3815:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":302,"name":"address","nodeType":"ElementaryTypeName","src":"3815:7:0","typeDescriptions":{}}},"id":306,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3815:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":300,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3803:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":301,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"3803:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":307,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3803:32:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_db7deb43f2f9e0404016de53b7e64c4976b54149581f7534daae2551e8cf4e40","typeString":"literal_string \"sender nonce\""},{"typeIdentifier":"t_uint64","typeString":"uint64"}],"expression":{"id":296,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3775:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":298,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"3775:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":308,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3775:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":309,"nodeType":"ExpressionStatement","src":"3775:61:0"},{"assignments":[311],"declarations":[{"constant":false,"id":311,"mutability":"mutable","name":"json","nameLocation":"3861:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3847:18:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string"},"typeName":{"id":310,"name":"string","nodeType":"ElementaryTypeName","src":"3847:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"id":313,"initialValue":{"hexValue":"7b22726f6f745f6b6579223a205b7b2261223a20312c202262223a20327d5d7d","id":312,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3868:34:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_e95522e99766888d0261f55bd1eae5e3f3e26eaf009a16e2433eafaf0a4ecdf2","typeString":"literal_string \"{\"root_key\": [{\"a\": 1, \"b\": 2}]}\""},"value":"{\"root_key\": [{\"a\": 1, \"b\": 2}]}"},"nodeType":"VariableDeclarationStatement","src":"3847:55:0"},{"assignments":[318],"declarations":[{"constant":false,"id":318,"mutability":"mutable","name":"keys","nameLocation":"3928:4:0","nodeType":"VariableDeclaration","scope":455,"src":"3912:20:0","stateVariable":false,"storageLocation":"memory","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string[]"},"typeName":{"baseType":{"id":316,"name":"string","nodeType":"ElementaryTypeName","src":"3912:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"id":317,"nodeType":"ArrayTypeName","src":"3912:8:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_storage_$dyn_storage_ptr","typeString":"string[]"}},"visibility":"internal"}],"id":324,"initialValue":{"arguments":[{"id":321,"name":"json","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":311,"src":"3952:4:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"hexValue":"2e726f6f745f6b65795b305d","id":322,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3958:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""},"value":".root_key[0]"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_stringliteral_d82f67100edb80050915e1ec4b565c9a8319a22efb1075e1298b7bb60101d266","typeString":"literal_string \".root_key[0]\""}],"expression":{"id":319,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"3935:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":320,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"parseJsonKeys","nodeType":"MemberAccess","referencedDeclaration":27,"src":"3935:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$_t_array$_t_string_memory_ptr_$dyn_memory_ptr_$","typeString":"function (string memory,string memory) pure external returns (string memory[] memory)"}},"id":323,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3935:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"nodeType":"VariableDeclarationStatement","src":"3912:61:0"},{"expression":{"arguments":[{"hexValue":"6b657973","id":328,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"3995:6:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},"value":"keys"},{"baseExpression":{"id":329,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4003:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":331,"indexExpression":{"hexValue":"30","id":330,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4008:1:0","typeDescriptions":{"typeIdentifier":"t_rational_0_by_1","typeString":"int_const 0"},"value":"0"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4003:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}},{"baseExpression":{"id":332,"name":"keys","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":318,"src":"4012:4:0","typeDescriptions":{"typeIdentifier":"t_array$_t_string_memory_ptr_$dyn_memory_ptr","typeString":"string memory[] memory"}},"id":334,"indexExpression":{"hexValue":"31","id":333,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4017:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"isConstant":false,"isLValue":true,"isPure":false,"lValueRequested":false,"nodeType":"IndexAccess","src":"4012:7:0","typeDescriptions":{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f29790a80c4ce5f42f59892f424f9c92856c6b656c3378e2cf305b260c6f4195","typeString":"literal_string \"keys\""},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"},{"typeIdentifier":"t_string_memory_ptr","typeString":"string memory"}],"expression":{"id":325,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"3983:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":327,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":219,"src":"3983:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_string_memory_ptr_$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory,string memory,string memory) pure"}},"id":335,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"3983:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":336,"nodeType":"ExpressionStatement","src":"3983:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c","id":340,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4042:15:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""},"value":"from original"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_77928970c8757d110f3c23e003246f49e0de890480ba9717ba659b2f56f316b2","typeString":"literal_string \"from original\""}],"expression":{"id":337,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4031:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":339,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4031:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":341,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4031:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":342,"nodeType":"ExpressionStatement","src":"4031:27:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"30783432","id":350,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"4098:4:0","typeDescriptions":{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"},"value":"0x42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_66_by_1","typeString":"int_const 66"}],"id":349,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4090:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":348,"name":"uint160","nodeType":"ElementaryTypeName","src":"4090:7:0","typeDescriptions":{}}},"id":351,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4090:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":347,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4082:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":346,"name":"address","nodeType":"ElementaryTypeName","src":"4082:7:0","typeDescriptions":{}}},"id":352,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4082:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":343,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4068:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":345,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startPrank","nodeType":"MemberAccess","referencedDeclaration":32,"src":"4068:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":353,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4068:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":354,"nodeType":"ExpressionStatement","src":"4068:37:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2031","id":358,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4126:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""},"value":"from prank 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_42b34abfe37a8b0add910cda7b4a379e6538fa7a1dcafce47a02bd38f6c88e2a","typeString":"literal_string \"from prank 1\""}],"expression":{"id":355,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4115:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":357,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4115:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":359,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4115:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":360,"nodeType":"ExpressionStatement","src":"4115:26:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f7065206d73672e73656e646572","id":364,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4163:25:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},"value":"parent scope msg.sender"},{"arguments":[{"expression":{"id":367,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"4198:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":368,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"4198:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":366,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4190:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":365,"name":"address","nodeType":"ElementaryTypeName","src":"4190:7:0","typeDescriptions":{}}},"id":369,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4190:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_83ec9246154d8845de47aafc5c2865c9985d2efe84472c27283879f2fbf5cc94","typeString":"literal_string \"parent scope msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":361,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4151:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":363,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4151:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":370,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4151:59:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":371,"nodeType":"ExpressionStatement","src":"4151:59:0"},{"expression":{"arguments":[{"hexValue":"706172656e742073636f706520636f6e74726163742e61646472","id":375,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4232:28:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},"value":"parent scope contract.addr"},{"arguments":[{"id":378,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4270:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":377,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4262:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":376,"name":"address","nodeType":"ElementaryTypeName","src":"4262:7:0","typeDescriptions":{}}},"id":379,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4262:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_97df66250e0b2b48f0ec8d0e01eb1b8ca012d95f1572895622aa1ea433e5570f","typeString":"literal_string \"parent scope contract.addr\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":372,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4220:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":374,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"4220:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":380,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4220:56:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":381,"nodeType":"ExpressionStatement","src":"4220:56:0"},{"expression":{"arguments":[{"hexValue":"66726f6d207072616e6b2032","id":385,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4297:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""},"value":"from prank 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_a38a34f8cad750a79aa097a92971f8f405b51ee9d53d25c5b14fc129ba3684bb","typeString":"literal_string \"from prank 2\""}],"expression":{"id":382,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4286:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":384,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4286:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":386,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4286:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":387,"nodeType":"ExpressionStatement","src":"4286:26:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":388,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4322:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":390,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopPrank","nodeType":"MemberAccess","referencedDeclaration":35,"src":"4322:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":391,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4322:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":392,"nodeType":"ExpressionStatement","src":"4322:14:0"},{"expression":{"arguments":[{"hexValue":"66726f6d206f726967696e616c20616761696e","id":396,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4357:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""},"value":"from original again"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_0c805c6579e20a9c4c8e11aeab23330910a9f2da629191dc119d1730e8ed6860","typeString":"literal_string \"from original again\""}],"expression":{"id":393,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4346:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":395,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"hello","nodeType":"MemberAccess","referencedDeclaration":713,"src":"4346:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) view external"}},"id":397,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4346:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":398,"nodeType":"ExpressionStatement","src":"4346:33:0"},{"assignments":[400],"declarations":[{"constant":false,"id":400,"mutability":"mutable","name":"tmpNonceGetter","nameLocation":"4480:14:0","nodeType":"VariableDeclaration","scope":455,"src":"4472:22:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":399,"name":"address","nodeType":"ElementaryTypeName","src":"4472:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":413,"initialValue":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"74656d70206e6f6e6365207465737420676574746572","id":408,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4531:24:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""},"value":"temp nonce test getter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_12520bf22cf2eb7252f13fda2b7eb7ddaed1b3456e20c8008c714c7ba4d9a252","typeString":"literal_string \"temp nonce test getter\""}],"id":407,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"4521:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":409,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4521:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":406,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4513:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":405,"name":"uint256","nodeType":"ElementaryTypeName","src":"4513:7:0","typeDescriptions":{}}},"id":410,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4513:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":404,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4505:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":403,"name":"uint160","nodeType":"ElementaryTypeName","src":"4505:7:0","typeDescriptions":{}}},"id":411,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4505:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":402,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4497:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":401,"name":"address","nodeType":"ElementaryTypeName","src":"4497:7:0","typeDescriptions":{}}},"id":412,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4497:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"4472:87:0"},{"expression":{"arguments":[{"id":417,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4577:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},{"arguments":[{"hexValue":"5363726970744578616d706c652e732e736f6c3a4e6f6e6365476574746572","id":420,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4612:33:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""},"value":"ScriptExample.s.sol:NonceGetter"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_6ff7ab2e79e6b7d182bbfccfe7f8e2118d655ff1b4bf1a4f4ed2eab0f3f8c825","typeString":"literal_string \"ScriptExample.s.sol:NonceGetter\""}],"expression":{"id":418,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4593:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":419,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getDeployedCode","nodeType":"MemberAccess","referencedDeclaration":61,"src":"4593:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_string_memory_ptr_$returns$_t_bytes_memory_ptr_$","typeString":"function (string memory) view external returns (bytes memory)"}},"id":421,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4593:53:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"},{"typeIdentifier":"t_bytes_memory_ptr","typeString":"bytes memory"}],"expression":{"id":414,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4569:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":416,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"etch","nodeType":"MemberAccess","referencedDeclaration":68,"src":"4569:7:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$_t_bytes_memory_ptr_$returns$__$","typeString":"function (address,bytes memory) external"}},"id":422,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4569:78:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":423,"nodeType":"ExpressionStatement","src":"4569:78:0"},{"expression":{"arguments":[{"id":427,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4676:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":424,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"4657:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":426,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"allowCheatcodes","nodeType":"MemberAccess","referencedDeclaration":73,"src":"4657:18:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":428,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4657:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":429,"nodeType":"ExpressionStatement","src":"4657:34:0"},{"assignments":[431],"declarations":[{"constant":false,"id":431,"mutability":"mutable","name":"v","nameLocation":"4709:1:0","nodeType":"VariableDeclaration","scope":455,"src":"4701:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":430,"name":"uint256","nodeType":"ElementaryTypeName","src":"4701:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"id":441,"initialValue":{"arguments":[{"arguments":[{"id":438,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"4758:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":437,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"4750:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":436,"name":"address","nodeType":"ElementaryTypeName","src":"4750:7:0","typeDescriptions":{}}},"id":439,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4750:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"arguments":[{"id":433,"name":"tmpNonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":400,"src":"4725:14:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":432,"name":"NonceGetter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":833,"src":"4713:11:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_NonceGetter_$833_$","typeString":"type(contract NonceGetter)"}},"id":434,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:27:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_NonceGetter_$833","typeString":"contract NonceGetter"}},"id":435,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":832,"src":"4713:36:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint256_$","typeString":"function (address) view external returns (uint256)"}},"id":440,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4713:51:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"VariableDeclarationStatement","src":"4701:63:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e63652066726f6d206e6f6e6365206765747465722c206e6f206578706c6963697420616363657373207265717569726564207769746820766d2e657463683a","id":445,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4786:68:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},"value":"nonce from nonce getter, no explicit access required with vm.etch:"},{"id":446,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":431,"src":"4856:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_afafcfffb72f22a98864f79a750e1a4a41d7dd81365e873e06ff57a1a9f42b11","typeString":"literal_string \"nonce from nonce getter, no explicit access required with vm.etch:\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":442,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4774:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":444,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"4774:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":447,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4774:84:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":448,"nodeType":"ExpressionStatement","src":"4774:84:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":452,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"4881:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":449,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"4869:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":451,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"4869:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":453,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"4869:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":454,"nodeType":"ExpressionStatement","src":"4869:20:0"}]},"documentation":{"id":244,"nodeType":"StructuredDocumentation","src":"3385:78:0","text":"@notice example function, runs through basic cheat-codes and console logs."},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"3477:3:0","parameters":{"id":245,"nodeType":"ParameterList","parameters":[],"src":"3480:2:0"},"returnParameters":{"id":246,"nodeType":"ParameterList","parameters":[],"src":"3490:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":689,"nodeType":"FunctionDefinition","src":"4963:1333:0","nodes":[],"body":{"id":688,"nodeType":"Block","src":"4994:1302:0","nodes":[],"statements":[{"expression":{"arguments":[{"hexValue":"6e6f6e6365207374617274","id":463,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5016:13:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},"value":"nonce start"},{"arguments":[{"arguments":[{"arguments":[{"id":470,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5059:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":469,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5051:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":468,"name":"address","nodeType":"ElementaryTypeName","src":"5051:7:0","typeDescriptions":{}}},"id":471,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5051:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":466,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5039:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":467,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"5039:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":472,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5039:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":465,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5031:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":464,"name":"uint256","nodeType":"ElementaryTypeName","src":"5031:7:0","typeDescriptions":{}}},"id":473,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5031:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_71efc69b9a13b6bc1e9a14d766ff01c79022262c6daa6532fb5dfb14f8511a20","typeString":"literal_string \"nonce start\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":460,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5004:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":462,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"5004:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":474,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5004:63:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":475,"nodeType":"ExpressionStatement","src":"5004:63:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073696e676c65","id":479,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5090:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""},"value":"testing single"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b75103528423218e7569082dad569ed0d2ce7c0ac770c0812b220e2d369fe474","typeString":"literal_string \"testing single\""}],"expression":{"id":476,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5078:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":478,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5078:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":480,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5078:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":481,"nodeType":"ExpressionStatement","src":"5078:29:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":482,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5117:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":484,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"5117:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":485,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5117:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":486,"nodeType":"ExpressionStatement","src":"5117:14:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c31","id":490,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5152:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""},"value":"single_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_5e1cad6d7a968cfacf2731373e1248ffb11f4886bced66a02a6de1a67ac8f777","typeString":"literal_string \"single_call1\""}],"expression":{"id":487,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5141:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":489,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5141:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":491,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5141:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":492,"nodeType":"ExpressionStatement","src":"5141:26:0"},{"expression":{"arguments":[{"hexValue":"73696e676c655f63616c6c32","id":496,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5188:14:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""},"value":"single_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b37ddaf5d00ad9e6371de3fb71b91eef731fae1e86b768666380f7d44e1ada25","typeString":"literal_string \"single_call2\""}],"expression":{"id":493,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5177:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":495,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5177:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":497,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5177:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":498,"nodeType":"ExpressionStatement","src":"5177:26:0"},{"expression":{"arguments":[{"hexValue":"74657374696e672073746172742f73746f70","id":502,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5226:20:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""},"value":"testing start/stop"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_778e886e3a1c3c5096aca76228832105f3f9269f362effd0e8ce3737787cb784","typeString":"literal_string \"testing start/stop\""}],"expression":{"id":499,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5214:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":501,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5214:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":503,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5214:33:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":504,"nodeType":"ExpressionStatement","src":"5214:33:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078633066666565","id":512,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5291:8:0","typeDescriptions":{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"},"value":"0xc0ffee"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_12648430_by_1","typeString":"int_const 12648430"}],"id":511,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5283:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":510,"name":"uint160","nodeType":"ElementaryTypeName","src":"5283:7:0","typeDescriptions":{}}},"id":513,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5283:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":509,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5275:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":508,"name":"address","nodeType":"ElementaryTypeName","src":"5275:7:0","typeDescriptions":{}}},"id":514,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5275:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":505,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5257:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":507,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5257:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":515,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5257:45:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":516,"nodeType":"ExpressionStatement","src":"5257:45:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c31","id":520,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5323:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""},"value":"startstop_call1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_2fc2682edf10ed478ee3b9a190f6b1c88bb492b300935ce44545a1613cf8f041","typeString":"literal_string \"startstop_call1\""}],"expression":{"id":517,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5312:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":519,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5312:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":521,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5312:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":522,"nodeType":"ExpressionStatement","src":"5312:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c32","id":526,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5362:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""},"value":"startstop_call2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_1a6fd77f04b28bf45d6d0e2dd4c65c0bbfeba174f849e43bb67ebca1c019cda4","typeString":"literal_string \"startstop_call2\""}],"expression":{"id":523,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5351:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":525,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call2","nodeType":"MemberAccess","referencedDeclaration":743,"src":"5351:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":527,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5351:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":528,"nodeType":"ExpressionStatement","src":"5351:29:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f70757265","id":532,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5404:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""},"value":"startstop_pure"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6e9eb1efd186b1d92b54da45026aa97a178e6eaffdf9dbf9f666fc751fb0ff9","typeString":"literal_string \"startstop_pure\""}],"expression":{"id":529,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5390:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":531,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"callPure","nodeType":"MemberAccess","referencedDeclaration":785,"src":"5390:13:0","typeDescriptions":{"typeIdentifier":"t_function_external_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure external"}},"id":533,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5390:31:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":534,"nodeType":"ExpressionStatement","src":"5390:31:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":535,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5431:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":537,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5431:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":538,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5431:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":539,"nodeType":"ExpressionStatement","src":"5431:18:0"},{"expression":{"arguments":[{"hexValue":"737461727473746f705f63616c6c33","id":543,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5470:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""},"value":"startstop_call3"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_8eb502bfdc4adda22bd960aa2ae13ce4c0ed8cc3b3791ed65e321a38cdd36f72","typeString":"literal_string \"startstop_call3\""}],"expression":{"id":540,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5459:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":542,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"call1","nodeType":"MemberAccess","referencedDeclaration":728,"src":"5459:10:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":544,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5459:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":545,"nodeType":"ExpressionStatement","src":"5459:29:0"},{"expression":{"arguments":[{"hexValue":"74657374696e67206e6573746564","id":549,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5511:16:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""},"value":"testing nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_f92f19f7a5b5b9ce341188bf4e15925f184cdb5ac135c4846ced718f259dbde5","typeString":"literal_string \"testing nested\""}],"expression":{"id":546,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5499:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":548,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5499:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":550,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5499:29:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":551,"nodeType":"ExpressionStatement","src":"5499:29:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307831323334","id":559,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5572:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":558,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5564:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":557,"name":"uint160","nodeType":"ElementaryTypeName","src":"5564:7:0","typeDescriptions":{}}},"id":560,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5564:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":556,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5556:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":555,"name":"address","nodeType":"ElementaryTypeName","src":"5556:7:0","typeDescriptions":{}}},"id":561,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5556:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":552,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5538:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":554,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"startBroadcast","nodeType":"MemberAccess","referencedDeclaration":48,"src":"5538:17:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":562,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5538:43:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":563,"nodeType":"ExpressionStatement","src":"5538:43:0"},{"expression":{"arguments":[{"hexValue":"6e6573746564","id":567,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5604:8:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""},"value":"nested"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4d5b14044d78fbf0c9dd8b9c49e35f09ee5a6f5b1b3b8117b5d0e15c8dd2cb09","typeString":"literal_string \"nested\""}],"expression":{"id":564,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"5591:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":566,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested1","nodeType":"MemberAccess","referencedDeclaration":758,"src":"5591:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":568,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5591:22:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":569,"nodeType":"ExpressionStatement","src":"5591:22:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":570,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5623:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":572,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"stopBroadcast","nodeType":"MemberAccess","referencedDeclaration":54,"src":"5623:16:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":573,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5623:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":574,"nodeType":"ExpressionStatement","src":"5623:18:0"},{"expression":{"arguments":[{"hexValue":"636f6e7472616374206465706c6f796d656e74","id":578,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5664:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""},"value":"contract deployment"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_aaf9be86adf9b6872d87eed3526f7c55f3c5d61f4e4dd6d55ef2fcbb8ad0bd57","typeString":"literal_string \"contract deployment\""}],"expression":{"id":575,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5652:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":577,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5652:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":579,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5652:34:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":580,"nodeType":"ExpressionStatement","src":"5652:34:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"3078313233343536","id":588,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5725:8:0","typeDescriptions":{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"},"value":"0x123456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1193046_by_1","typeString":"int_const 1193046"}],"id":587,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5717:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":586,"name":"uint160","nodeType":"ElementaryTypeName","src":"5717:7:0","typeDescriptions":{}}},"id":589,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5717:17:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":585,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5709:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":584,"name":"address","nodeType":"ElementaryTypeName","src":"5709:7:0","typeDescriptions":{}}},"id":590,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5709:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":581,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5696:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":583,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5696:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":591,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5696:40:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":592,"nodeType":"ExpressionStatement","src":"5696:40:0"},{"assignments":[595],"declarations":[{"constant":false,"id":595,"mutability":"mutable","name":"x","nameLocation":"5753:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5746:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":594,"nodeType":"UserDefinedTypeName","pathNode":{"id":593,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5746:6:0"},"referencedDeclaration":799,"src":"5746:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":601,"initialValue":{"arguments":[{"hexValue":"31323334","id":599,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5768:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":598,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5757:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":597,"nodeType":"UserDefinedTypeName","pathNode":{"id":596,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5761:6:0"},"referencedDeclaration":799,"src":"5761:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":600,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5757:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5746:27:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":607,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":603,"name":"x","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":595,"src":"5791:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":604,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"5791:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":605,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5791:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":606,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5802:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"5791:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e20637265617465206973206e6f742031323334","id":608,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5808:35:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""},"value":"FooBar: foo in create is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_cf44a206a1b0f98235522779025d2df914f464e764b8c79ccaa1efde72c4831c","typeString":"literal_string \"FooBar: foo in create is not 1234\""}],"id":602,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"5783:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":609,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5783:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":610,"nodeType":"ExpressionStatement","src":"5783:61:0"},{"expression":{"arguments":[{"hexValue":"6372656174652032","id":614,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"5867:10:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""},"value":"create 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_4411d6d4ffcd00382a95255a63761e69de9810e1236042a5c64948a7b6c04daa","typeString":"literal_string \"create 2\""}],"expression":{"id":611,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"5855:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":613,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"5855:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":615,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5855:23:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":616,"nodeType":"ExpressionStatement","src":"5855:23:0"},{"expression":{"arguments":[{"arguments":[{"arguments":[{"hexValue":"307863616665","id":624,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5917:6:0","typeDescriptions":{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"},"value":"0xcafe"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_51966_by_1","typeString":"int_const 51966"}],"id":623,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5909:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":622,"name":"uint160","nodeType":"ElementaryTypeName","src":"5909:7:0","typeDescriptions":{}}},"id":625,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5909:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":621,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5901:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":620,"name":"address","nodeType":"ElementaryTypeName","src":"5901:7:0","typeDescriptions":{}}},"id":626,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5901:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":617,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"5888:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":619,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":43,"src":"5888:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_address_$returns$__$","typeString":"function (address) external"}},"id":627,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5888:38:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":628,"nodeType":"ExpressionStatement","src":"5888:38:0"},{"assignments":[631],"declarations":[{"constant":false,"id":631,"mutability":"mutable","name":"y","nameLocation":"5943:1:0","nodeType":"VariableDeclaration","scope":688,"src":"5936:8:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"},"typeName":{"id":630,"nodeType":"UserDefinedTypeName","pathNode":{"id":629,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5936:6:0"},"referencedDeclaration":799,"src":"5936:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"visibility":"internal"}],"id":645,"initialValue":{"arguments":[{"hexValue":"31323334","id":643,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5986:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":634,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"5947:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":633,"nodeType":"UserDefinedTypeName","pathNode":{"id":632,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"5951:6:0"},"referencedDeclaration":799,"src":"5951:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":642,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"names":["salt"],"nodeType":"FunctionCallOptions","options":[{"arguments":[{"arguments":[{"hexValue":"3432","id":639,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"5980:2:0","typeDescriptions":{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"},"value":"42"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_42_by_1","typeString":"int_const 42"}],"id":638,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5972:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":637,"name":"uint256","nodeType":"ElementaryTypeName","src":"5972:7:0","typeDescriptions":{}}},"id":640,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5972:11:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":636,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"5964:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_bytes32_$","typeString":"type(bytes32)"},"typeName":{"id":635,"name":"bytes32","nodeType":"ElementaryTypeName","src":"5964:7:0","typeDescriptions":{}}},"id":641,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5964:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"src":"5947:38:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$salt","typeString":"function (uint256) returns (contract FooBar)"}},"id":644,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"5947:44:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"nodeType":"VariableDeclarationStatement","src":"5936:55:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":651,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":647,"name":"y","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":631,"src":"6009:1:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":648,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"foo","nodeType":"MemberAccess","referencedDeclaration":788,"src":"6009:5:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":649,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6009:7:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31323334","id":650,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6020:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"},"src":"6009:15:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"466f6f4261723a20666f6f20696e2063726561746532206973206e6f742031323334","id":652,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6026:36:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""},"value":"FooBar: foo in create2 is not 1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_a532f8073e029b895a819f6b1992843ca1cc824c13ad4c6484e05780ac0a57b9","typeString":"literal_string \"FooBar: foo in create2 is not 1234\""}],"id":646,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"6001:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":653,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6001:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":654,"nodeType":"ExpressionStatement","src":"6001:62:0"},{"expression":{"arguments":[{"hexValue":"646f6e6521","id":658,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6085:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""},"value":"done!"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_080382d5c9e9e7c5e3d1d33f5e7422740375955180fadff167d8130e0c35f3fc","typeString":"literal_string \"done!\""}],"expression":{"id":655,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6073:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":657,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6073:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":659,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6073:20:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":660,"nodeType":"ExpressionStatement","src":"6073:20:0"},{"expression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":661,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6177:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":663,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"broadcast","nodeType":"MemberAccess","referencedDeclaration":38,"src":"6177:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$__$returns$__$","typeString":"function () external"}},"id":664,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6177:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":665,"nodeType":"ExpressionStatement","src":"6177:14:0"},{"expression":{"arguments":[{"hexValue":"31323334","id":669,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"6212:4:0","typeDescriptions":{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"},"value":"1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1234_by_1","typeString":"int_const 1234"}],"id":668,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"NewExpression","src":"6201:10:0","typeDescriptions":{"typeIdentifier":"t_function_creation_nonpayable$_t_uint256_$returns$_t_contract$_FooBar_$799_$","typeString":"function (uint256) returns (contract FooBar)"},"typeName":{"id":667,"nodeType":"UserDefinedTypeName","pathNode":{"id":666,"name":"FooBar","nodeType":"IdentifierPath","referencedDeclaration":799,"src":"6205:6:0"},"referencedDeclaration":799,"src":"6205:6:0","typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}}},"id":670,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6201:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_FooBar_$799","typeString":"contract FooBar"}},"id":671,"nodeType":"ExpressionStatement","src":"6201:16:0"},{"expression":{"arguments":[{"hexValue":"6e6f6e636520656e64","id":675,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6240:11:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},"value":"nonce end"},{"arguments":[{"arguments":[{"arguments":[{"id":682,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6281:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}],"id":681,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6273:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":680,"name":"address","nodeType":"ElementaryTypeName","src":"6273:7:0","typeDescriptions":{}}},"id":683,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6273:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":678,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":241,"src":"6261:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":679,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"6261:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":684,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6261:26:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint64","typeString":"uint64"}],"id":677,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6253:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":676,"name":"uint256","nodeType":"ElementaryTypeName","src":"6253:7:0","typeDescriptions":{}}},"id":685,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6253:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_fa629e6661ad2a2bdb09cf9a3a276ce0d722482ae5c2887650751be0938847e8","typeString":"literal_string \"nonce end\""},{"typeIdentifier":"t_uint256","typeString":"uint256"}],"expression":{"id":672,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6228:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":674,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":182,"src":"6228:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_uint256_$returns$__$","typeString":"function (string memory,uint256) pure"}},"id":686,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6228:61:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":687,"nodeType":"ExpressionStatement","src":"6228:61:0"}]},"documentation":{"id":457,"nodeType":"StructuredDocumentation","src":"4902:56:0","text":"@notice example function, to test vm.broadcast with."},"functionSelector":"bef03abc","implemented":true,"kind":"function","modifiers":[],"name":"runBroadcast","nameLocation":"4972:12:0","parameters":{"id":458,"nodeType":"ParameterList","parameters":[],"src":"4984:2:0"},"returnParameters":{"id":459,"nodeType":"ParameterList","parameters":[],"src":"4994:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":713,"nodeType":"FunctionDefinition","src":"6391:143:0","nodes":[],"body":{"id":712,"nodeType":"Block","src":"6440:94:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":698,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":692,"src":"6462:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":695,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6450:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":697,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6450:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":699,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6450:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":700,"nodeType":"ExpressionStatement","src":"6450:15:0"},{"expression":{"arguments":[{"hexValue":"68656c6c6f206d73672e73656e646572","id":704,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"6487:18:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},"value":"hello msg.sender"},{"arguments":[{"expression":{"id":707,"name":"msg","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-15,"src":"6515:3:0","typeDescriptions":{"typeIdentifier":"t_magic_message","typeString":"msg"}},"id":708,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"sender","nodeType":"MemberAccess","src":"6515:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":706,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"6507:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":705,"name":"address","nodeType":"ElementaryTypeName","src":"6507:7:0","typeDescriptions":{}}},"id":709,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6507:19:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b3cc13bc51228b2c4c4334d82a4772908254dc0e1c512893dd16208ef13efb8e","typeString":"literal_string \"hello msg.sender\""},{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":701,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6475:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":703,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":199,"src":"6475:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$_t_address_$returns$__$","typeString":"function (string memory,address) pure"}},"id":710,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6475:52:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":711,"nodeType":"ExpressionStatement","src":"6475:52:0"}]},"documentation":{"id":690,"nodeType":"StructuredDocumentation","src":"6302:84:0","text":"@notice example external function, to force a CALL, and test vm.startPrank with."},"functionSelector":"a777d0dc","implemented":true,"kind":"function","modifiers":[],"name":"hello","nameLocation":"6400:5:0","parameters":{"id":693,"nodeType":"ParameterList","parameters":[{"constant":false,"id":692,"mutability":"mutable","name":"_v","nameLocation":"6422:2:0","nodeType":"VariableDeclaration","scope":713,"src":"6406:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":691,"name":"string","nodeType":"ElementaryTypeName","src":"6406:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6405:20:0"},"returnParameters":{"id":694,"nodeType":"ParameterList","parameters":[],"src":"6440:0:0"},"scope":786,"stateMutability":"view","virtual":false,"visibility":"external"},{"id":728,"nodeType":"FunctionDefinition","src":"6540:95:0","nodes":[],"body":{"id":727,"nodeType":"Block","src":"6584:51:0","nodes":[],"statements":[{"expression":{"id":719,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6594:9:0","subExpression":{"id":718,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6594:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":720,"nodeType":"ExpressionStatement","src":"6594:9:0"},{"expression":{"arguments":[{"id":724,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":715,"src":"6625:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":721,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6613:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":723,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6613:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":725,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6613:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":726,"nodeType":"ExpressionStatement","src":"6613:15:0"}]},"functionSelector":"7e79255d","implemented":true,"kind":"function","modifiers":[],"name":"call1","nameLocation":"6549:5:0","parameters":{"id":716,"nodeType":"ParameterList","parameters":[{"constant":false,"id":715,"mutability":"mutable","name":"_v","nameLocation":"6571:2:0","nodeType":"VariableDeclaration","scope":728,"src":"6555:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":714,"name":"string","nodeType":"ElementaryTypeName","src":"6555:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6554:20:0"},"returnParameters":{"id":717,"nodeType":"ParameterList","parameters":[],"src":"6584:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":743,"nodeType":"FunctionDefinition","src":"6641:95:0","nodes":[],"body":{"id":742,"nodeType":"Block","src":"6685:51:0","nodes":[],"statements":[{"expression":{"id":734,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6695:9:0","subExpression":{"id":733,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6695:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":735,"nodeType":"ExpressionStatement","src":"6695:9:0"},{"expression":{"arguments":[{"id":739,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":730,"src":"6726:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":736,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6714:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":738,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6714:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":740,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6714:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":741,"nodeType":"ExpressionStatement","src":"6714:15:0"}]},"functionSelector":"8d3ef7ca","implemented":true,"kind":"function","modifiers":[],"name":"call2","nameLocation":"6650:5:0","parameters":{"id":731,"nodeType":"ParameterList","parameters":[{"constant":false,"id":730,"mutability":"mutable","name":"_v","nameLocation":"6672:2:0","nodeType":"VariableDeclaration","scope":743,"src":"6656:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":729,"name":"string","nodeType":"ElementaryTypeName","src":"6656:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6655:20:0"},"returnParameters":{"id":732,"nodeType":"ParameterList","parameters":[],"src":"6685:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":758,"nodeType":"FunctionDefinition","src":"6742:98:0","nodes":[],"body":{"id":757,"nodeType":"Block","src":"6788:52:0","nodes":[],"statements":[{"expression":{"id":749,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6798:9:0","subExpression":{"id":748,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6798:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":750,"nodeType":"ExpressionStatement","src":"6798:9:0"},{"expression":{"arguments":[{"id":754,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":745,"src":"6830:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":751,"name":"this","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-28,"src":"6817:4:0","typeDescriptions":{"typeIdentifier":"t_contract$_ScriptExample_$786","typeString":"contract ScriptExample"}},"id":753,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"nested2","nodeType":"MemberAccess","referencedDeclaration":773,"src":"6817:12:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) external"}},"id":755,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6817:16:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":756,"nodeType":"ExpressionStatement","src":"6817:16:0"}]},"functionSelector":"a76ccdfa","implemented":true,"kind":"function","modifiers":[],"name":"nested1","nameLocation":"6751:7:0","parameters":{"id":746,"nodeType":"ParameterList","parameters":[{"constant":false,"id":745,"mutability":"mutable","name":"_v","nameLocation":"6775:2:0","nodeType":"VariableDeclaration","scope":758,"src":"6759:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":744,"name":"string","nodeType":"ElementaryTypeName","src":"6759:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6758:20:0"},"returnParameters":{"id":747,"nodeType":"ParameterList","parameters":[],"src":"6788:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":773,"nodeType":"FunctionDefinition","src":"6846:97:0","nodes":[],"body":{"id":772,"nodeType":"Block","src":"6892:51:0","nodes":[],"statements":[{"expression":{"id":764,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"nodeType":"UnaryOperation","operator":"++","prefix":false,"src":"6902:9:0","subExpression":{"id":763,"name":"counter","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":243,"src":"6902:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":765,"nodeType":"ExpressionStatement","src":"6902:9:0"},{"expression":{"arguments":[{"id":769,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":760,"src":"6933:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":766,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"6921:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":768,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"6921:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":770,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"6921:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":771,"nodeType":"ExpressionStatement","src":"6921:15:0"}]},"functionSelector":"dbf1282f","implemented":true,"kind":"function","modifiers":[],"name":"nested2","nameLocation":"6855:7:0","parameters":{"id":761,"nodeType":"ParameterList","parameters":[{"constant":false,"id":760,"mutability":"mutable","name":"_v","nameLocation":"6879:2:0","nodeType":"VariableDeclaration","scope":773,"src":"6863:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":759,"name":"string","nodeType":"ElementaryTypeName","src":"6863:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6862:20:0"},"returnParameters":{"id":762,"nodeType":"ParameterList","parameters":[],"src":"6892:0:0"},"scope":786,"stateMutability":"nonpayable","virtual":false,"visibility":"external"},{"id":785,"nodeType":"FunctionDefinition","src":"6949:84:0","nodes":[],"body":{"id":784,"nodeType":"Block","src":"7001:32:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":781,"name":"_v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":775,"src":"7023:2:0","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_string_calldata_ptr","typeString":"string calldata"}],"expression":{"id":778,"name":"console","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":220,"src":"7011:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_console_$220_$","typeString":"type(library console)"}},"id":780,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"log","nodeType":"MemberAccess","referencedDeclaration":148,"src":"7011:11:0","typeDescriptions":{"typeIdentifier":"t_function_internal_pure$_t_string_memory_ptr_$returns$__$","typeString":"function (string memory) pure"}},"id":782,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7011:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":783,"nodeType":"ExpressionStatement","src":"7011:15:0"}]},"functionSelector":"7f8b915c","implemented":true,"kind":"function","modifiers":[],"name":"callPure","nameLocation":"6958:8:0","parameters":{"id":776,"nodeType":"ParameterList","parameters":[{"constant":false,"id":775,"mutability":"mutable","name":"_v","nameLocation":"6983:2:0","nodeType":"VariableDeclaration","scope":785,"src":"6967:18:0","stateVariable":false,"storageLocation":"calldata","typeDescriptions":{"typeIdentifier":"t_string_calldata_ptr","typeString":"string"},"typeName":{"id":774,"name":"string","nodeType":"ElementaryTypeName","src":"6967:6:0","typeDescriptions":{"typeIdentifier":"t_string_storage_ptr","typeString":"string"}},"visibility":"internal"}],"src":"6966:20:0"},"returnParameters":{"id":777,"nodeType":"ParameterList","parameters":[],"src":"7001:0:0"},"scope":786,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ScriptExample","contractDependencies":[799],"contractKind":"contract","documentation":{"id":221,"nodeType":"StructuredDocumentation","src":"2997:126:0","text":"@title ScriptExample\n @notice ScriptExample is an example script. The Go forge script code tests that it can run this."},"fullyImplemented":true,"linearizedBaseContracts":[786],"name":"ScriptExample","nameLocation":"3132:13:0","scope":969,"usedErrors":[]},{"id":799,"nodeType":"ContractDefinition","src":"7037:96:0","nodes":[{"id":788,"nodeType":"VariableDeclaration","src":"7059:18:0","nodes":[],"constant":false,"functionSelector":"c2985578","mutability":"mutable","name":"foo","nameLocation":"7074:3:0","scope":799,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":787,"name":"uint256","nodeType":"ElementaryTypeName","src":"7059:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"public"},{"id":798,"nodeType":"FunctionDefinition","src":"7084:47:0","nodes":[],"body":{"id":797,"nodeType":"Block","src":"7107:24:0","nodes":[],"statements":[{"expression":{"id":795,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":793,"name":"foo","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":788,"src":"7117:3:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"id":794,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":790,"src":"7123:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"7117:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":796,"nodeType":"ExpressionStatement","src":"7117:7:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":791,"nodeType":"ParameterList","parameters":[{"constant":false,"id":790,"mutability":"mutable","name":"v","nameLocation":"7104:1:0","nodeType":"VariableDeclaration","scope":798,"src":"7096:9:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":789,"name":"uint256","nodeType":"ElementaryTypeName","src":"7096:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7095:11:0"},"returnParameters":{"id":792,"nodeType":"ParameterList","parameters":[],"src":"7107:0:0"},"scope":799,"stateMutability":"nonpayable","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"FooBar","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[799],"name":"FooBar","nameLocation":"7046:6:0","scope":969,"usedErrors":[]},{"id":833,"nodeType":"ContractDefinition","src":"7135:281:0","nodes":[{"id":813,"nodeType":"VariableDeclaration","src":"7162:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7188:10:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":800,"name":"address","nodeType":"ElementaryTypeName","src":"7162:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":808,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7235:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":807,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7225:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":809,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7225:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":806,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7217:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":805,"name":"uint256","nodeType":"ElementaryTypeName","src":"7217:7:0","typeDescriptions":{}}},"id":810,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7217:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":804,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7209:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":803,"name":"uint160","nodeType":"ElementaryTypeName","src":"7209:7:0","typeDescriptions":{}}},"id":811,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7209:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":802,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7201:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":801,"name":"address","nodeType":"ElementaryTypeName","src":"7201:7:0","typeDescriptions":{}}},"id":812,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7201:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":819,"nodeType":"VariableDeclaration","src":"7262:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7283:2:0","scope":833,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":815,"nodeType":"UserDefinedTypeName","pathNode":{"id":814,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7262:2:0"},"referencedDeclaration":83,"src":"7262:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":817,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":813,"src":"7291:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":816,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7288:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":818,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7288:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":832,"nodeType":"FunctionDefinition","src":"7309:105:0","nodes":[],"body":{"id":831,"nodeType":"Block","src":"7372:42:0","nodes":[],"statements":[{"expression":{"arguments":[{"id":828,"name":"_addr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":821,"src":"7401:5:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":826,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":819,"src":"7389:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":827,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7389:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":829,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7389:18:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"functionReturnParameters":825,"id":830,"nodeType":"Return","src":"7382:25:0"}]},"functionSelector":"2d0335ab","implemented":true,"kind":"function","modifiers":[],"name":"getNonce","nameLocation":"7318:8:0","parameters":{"id":822,"nodeType":"ParameterList","parameters":[{"constant":false,"id":821,"mutability":"mutable","name":"_addr","nameLocation":"7335:5:0","nodeType":"VariableDeclaration","scope":832,"src":"7327:13:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":820,"name":"address","nodeType":"ElementaryTypeName","src":"7327:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"7326:15:0"},"returnParameters":{"id":825,"nodeType":"ParameterList","parameters":[{"constant":false,"id":824,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":832,"src":"7363:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":823,"name":"uint256","nodeType":"ElementaryTypeName","src":"7363:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7362:9:0"},"scope":833,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"NonceGetter","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[833],"name":"NonceGetter","nameLocation":"7144:11:0","scope":969,"usedErrors":[]},{"id":852,"nodeType":"ContractDefinition","src":"7418:174:0","nodes":[{"id":835,"nodeType":"VariableDeclaration","src":"7448:18:0","nodes":[],"constant":false,"mutability":"mutable","name":"v","nameLocation":"7465:1:0","scope":852,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":834,"name":"uint256","nodeType":"ElementaryTypeName","src":"7448:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"},{"id":843,"nodeType":"FunctionDefinition","src":"7473:36:0","nodes":[],"body":{"id":842,"nodeType":"Block","src":"7487:22:0","nodes":[],"statements":[{"expression":{"id":840,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftHandSide":{"id":838,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7497:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"Assignment","operator":"=","rightHandSide":{"hexValue":"31","id":839,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7501:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"7497:5:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":841,"nodeType":"ExpressionStatement","src":"7497:5:0"}]},"implemented":true,"kind":"constructor","modifiers":[],"name":"","nameLocation":"-1:-1:-1","parameters":{"id":836,"nodeType":"ParameterList","parameters":[],"src":"7484:2:0"},"returnParameters":{"id":837,"nodeType":"ParameterList","parameters":[],"src":"7487:0:0"},"scope":852,"stateMutability":"nonpayable","virtual":false,"visibility":"public"},{"id":851,"nodeType":"FunctionDefinition","src":"7515:75:0","nodes":[],"body":{"id":850,"nodeType":"Block","src":"7565:25:0","nodes":[],"statements":[{"expression":{"id":848,"name":"v","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":835,"src":"7582:1:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"functionReturnParameters":847,"id":849,"nodeType":"Return","src":"7575:8:0"}]},"functionSelector":"20965255","implemented":true,"kind":"function","modifiers":[],"name":"getValue","nameLocation":"7524:8:0","parameters":{"id":844,"nodeType":"ParameterList","parameters":[],"src":"7532:2:0"},"returnParameters":{"id":847,"nodeType":"ParameterList","parameters":[{"constant":false,"id":846,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":851,"src":"7556:7:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"},"typeName":{"id":845,"name":"uint256","nodeType":"ElementaryTypeName","src":"7556:7:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"visibility":"internal"}],"src":"7555:9:0"},"scope":852,"stateMutability":"view","virtual":false,"visibility":"public"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkedContract","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[852],"name":"ForkedContract","nameLocation":"7427:14:0","scope":969,"usedErrors":[]},{"id":968,"nodeType":"ContractDefinition","src":"7594:813:0","nodes":[{"id":866,"nodeType":"VariableDeclaration","src":"7620:94:0","nodes":[],"constant":true,"mutability":"constant","name":"VM_ADDRESS","nameLocation":"7646:10:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":853,"name":"address","nodeType":"ElementaryTypeName","src":"7620:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"value":{"arguments":[{"arguments":[{"arguments":[{"arguments":[{"hexValue":"6865766d20636865617420636f6465","id":861,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7693:17:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""},"value":"hevm cheat code"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_885cb69240a935d632d79c317109709ecfa91a80626ff3989d68f67f5b1dd12d","typeString":"literal_string \"hevm cheat code\""}],"id":860,"name":"keccak256","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":-8,"src":"7683:9:0","typeDescriptions":{"typeIdentifier":"t_function_keccak256_pure$_t_bytes_memory_ptr_$returns$_t_bytes32_$","typeString":"function (bytes memory) pure returns (bytes32)"}},"id":862,"isConstant":false,"isLValue":false,"isPure":true,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7683:28:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_bytes32","typeString":"bytes32"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bytes32","typeString":"bytes32"}],"id":859,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7675:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":858,"name":"uint256","nodeType":"ElementaryTypeName","src":"7675:7:0","typeDescriptions":{}}},"id":863,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7675:37:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint256","typeString":"uint256"}],"id":857,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7667:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":856,"name":"uint160","nodeType":"ElementaryTypeName","src":"7667:7:0","typeDescriptions":{}}},"id":864,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7667:46:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":855,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7659:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":854,"name":"address","nodeType":"ElementaryTypeName","src":"7659:7:0","typeDescriptions":{}}},"id":865,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7659:55:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"id":872,"nodeType":"VariableDeclaration","src":"7720:40:0","nodes":[],"constant":true,"mutability":"constant","name":"vm","nameLocation":"7741:2:0","scope":968,"stateVariable":true,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"},"typeName":{"id":868,"nodeType":"UserDefinedTypeName","pathNode":{"id":867,"name":"Vm","nodeType":"IdentifierPath","referencedDeclaration":83,"src":"7720:2:0"},"referencedDeclaration":83,"src":"7720:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"value":{"arguments":[{"id":870,"name":"VM_ADDRESS","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":866,"src":"7749:10:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":869,"name":"Vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":83,"src":"7746:2:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_Vm_$83_$","typeString":"type(contract Vm)"}},"id":871,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7746:14:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"visibility":"internal"},{"id":967,"nodeType":"FunctionDefinition","src":"7767:638:0","nodes":[],"body":{"id":966,"nodeType":"Block","src":"7791:614:0","nodes":[],"statements":[{"assignments":[876],"declarations":[{"constant":false,"id":876,"mutability":"mutable","name":"testAddr","nameLocation":"7809:8:0","nodeType":"VariableDeclaration","scope":966,"src":"7801:16:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":875,"name":"address","nodeType":"ElementaryTypeName","src":"7801:7:0","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"id":884,"initialValue":{"arguments":[{"arguments":[{"hexValue":"307831323334","id":881,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7836:6:0","typeDescriptions":{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"},"value":"0x1234"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_4660_by_1","typeString":"int_const 4660"}],"id":880,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7828:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint160_$","typeString":"type(uint160)"},"typeName":{"id":879,"name":"uint160","nodeType":"ElementaryTypeName","src":"7828:7:0","typeDescriptions":{}}},"id":882,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7828:15:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint160","typeString":"uint160"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_uint160","typeString":"uint160"}],"id":878,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"7820:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_address_$","typeString":"type(address)"},"typeName":{"id":877,"name":"address","nodeType":"ElementaryTypeName","src":"7820:7:0","typeDescriptions":{}}},"id":883,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7820:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"VariableDeclarationStatement","src":"7801:43:0"},{"assignments":[887],"declarations":[{"constant":false,"id":887,"mutability":"mutable","name":"fc","nameLocation":"7869:2:0","nodeType":"VariableDeclaration","scope":966,"src":"7854:17:0","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"},"typeName":{"id":886,"nodeType":"UserDefinedTypeName","pathNode":{"id":885,"name":"ForkedContract","nodeType":"IdentifierPath","referencedDeclaration":852,"src":"7854:14:0"},"referencedDeclaration":852,"src":"7854:14:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"visibility":"internal"}],"id":891,"initialValue":{"arguments":[{"id":889,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7889:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"id":888,"name":"ForkedContract","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":852,"src":"7874:14:0","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_ForkedContract_$852_$","typeString":"type(contract ForkedContract)"}},"id":890,"isConstant":false,"isLValue":false,"isPure":false,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7874:24:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"nodeType":"VariableDeclarationStatement","src":"7854:44:0"},{"expression":{"arguments":[{"hexValue":"666f726b31","id":895,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7929:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},"value":"fork1"},{"hexValue":"3132333435","id":896,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7938:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_b6acbb7ba3bf910295048af2ccd655ff20a445d705d49fd56157c24aab14c1a1","typeString":"literal_string \"fork1\""},{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"}],"expression":{"id":892,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7909:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":894,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"7909:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":897,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7909:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":898,"nodeType":"ExpressionStatement","src":"7909:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":905,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":902,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"7974:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":900,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"7962:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":901,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"7962:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":903,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7962:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3132333435","id":904,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"7987:5:0","typeDescriptions":{"typeIdentifier":"t_rational_12345_by_1","typeString":"int_const 12345"},"value":"12345"},"src":"7962:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":906,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"7994:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":899,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"7954:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":907,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"7954:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":908,"nodeType":"ExpressionStatement","src":"7954:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":914,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":910,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8036:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":911,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8036:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":912,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8036:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"31","id":913,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8053:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"},"src":"8036:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652031","id":915,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8056:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""},"value":"value should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_244bd39a8f8426ed26a6cae45b2ada0383deda0bbc513dfe29f31ab8529d5c7a","typeString":"literal_string \"value should be 1\""}],"id":909,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8028:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":916,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8028:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":917,"nodeType":"ExpressionStatement","src":"8028:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":925,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":919,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8094:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":920,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8094:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"31","id":923,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8122:1:0","typeDescriptions":{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"},"value":"1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_1_by_1","typeString":"int_const 1"}],"id":922,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8114:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":921,"name":"uint256","nodeType":"ElementaryTypeName","src":"8114:7:0","typeDescriptions":{}}},"id":924,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8114:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8094:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652031","id":926,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8126:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""},"value":"balance should be 1"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675b86838b72d956fe80c51e424164ea5e48d46b089cf53543fefe5ee2c684bf","typeString":"literal_string \"balance should be 1\""}],"id":918,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8086:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":927,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8086:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":928,"nodeType":"ExpressionStatement","src":"8086:62:0"},{"expression":{"arguments":[{"hexValue":"666f726b32","id":932,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8179:7:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},"value":"fork2"},{"hexValue":"3233343536","id":933,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8188:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_stringliteral_261b052a4950a8ec6afce52cd61229704be48859b7177f79ca612a21277827f8","typeString":"literal_string \"fork2\""},{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"}],"expression":{"id":929,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8159:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":931,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"createSelectFork","nodeType":"MemberAccess","referencedDeclaration":82,"src":"8159:19:0","typeDescriptions":{"typeIdentifier":"t_function_external_nonpayable$_t_string_memory_ptr_$_t_uint256_$returns$_t_uint256_$","typeString":"function (string memory,uint256) external returns (uint256)"}},"id":934,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8159:35:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"id":935,"nodeType":"ExpressionStatement","src":"8159:35:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint64","typeString":"uint64"},"id":942,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[{"id":939,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8224:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}],"expression":{"argumentTypes":[{"typeIdentifier":"t_address","typeString":"address"}],"expression":{"id":937,"name":"vm","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":872,"src":"8212:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_Vm_$83","typeString":"contract Vm"}},"id":938,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getNonce","nodeType":"MemberAccess","referencedDeclaration":17,"src":"8212:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$_t_address_$returns$_t_uint64_$","typeString":"function (address) view external returns (uint64)"}},"id":940,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8212:21:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"3233343536","id":941,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8237:5:0","typeDescriptions":{"typeIdentifier":"t_rational_23456_by_1","typeString":"int_const 23456"},"value":"23456"},"src":"8212:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"6e6f6e63652073686f756c64206265203132333435","id":943,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8244:23:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""},"value":"nonce should be 12345"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_675408ff346f993e251ba3ee09efb90c23d0de302269ea6afde722ac077acbdb","typeString":"literal_string \"nonce should be 12345\""}],"id":936,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8204:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":944,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8204:64:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":945,"nodeType":"ExpressionStatement","src":"8204:64:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":951,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"arguments":[],"expression":{"argumentTypes":[],"expression":{"id":947,"name":"fc","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":887,"src":"8286:2:0","typeDescriptions":{"typeIdentifier":"t_contract$_ForkedContract_$852","typeString":"contract ForkedContract"}},"id":948,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"getValue","nodeType":"MemberAccess","referencedDeclaration":851,"src":"8286:11:0","typeDescriptions":{"typeIdentifier":"t_function_external_view$__$returns$_t_uint256_$","typeString":"function () view external returns (uint256)"}},"id":949,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8286:13:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"hexValue":"32","id":950,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8303:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"},"src":"8286:18:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"76616c75652073686f756c642062652032","id":952,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8306:19:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""},"value":"value should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_989f7bdcf9093cc756fd0c37255cb127d8c8369545d3f3456d0571522c208b6d","typeString":"literal_string \"value should be 2\""}],"id":946,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8278:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":953,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8278:48:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":954,"nodeType":"ExpressionStatement","src":"8278:48:0"},{"expression":{"arguments":[{"commonType":{"typeIdentifier":"t_uint256","typeString":"uint256"},"id":962,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"expression":{"id":956,"name":"testAddr","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":876,"src":"8344:8:0","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"id":957,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"memberName":"balance","nodeType":"MemberAccess","src":"8344:16:0","typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"arguments":[{"hexValue":"32","id":960,"isConstant":false,"isLValue":false,"isPure":true,"kind":"number","lValueRequested":false,"nodeType":"Literal","src":"8372:1:0","typeDescriptions":{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"},"value":"2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_rational_2_by_1","typeString":"int_const 2"}],"id":959,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"nodeType":"ElementaryTypeNameExpression","src":"8364:7:0","typeDescriptions":{"typeIdentifier":"t_type$_t_uint256_$","typeString":"type(uint256)"},"typeName":{"id":958,"name":"uint256","nodeType":"ElementaryTypeName","src":"8364:7:0","typeDescriptions":{}}},"id":961,"isConstant":false,"isLValue":false,"isPure":true,"kind":"typeConversion","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8364:10:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_uint256","typeString":"uint256"}},"src":"8344:30:0","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},{"hexValue":"62616c616e63652073686f756c642062652032","id":963,"isConstant":false,"isLValue":false,"isPure":true,"kind":"string","lValueRequested":false,"nodeType":"Literal","src":"8376:21:0","typeDescriptions":{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""},"value":"balance should be 2"}],"expression":{"argumentTypes":[{"typeIdentifier":"t_bool","typeString":"bool"},{"typeIdentifier":"t_stringliteral_4c35c4bb929f7c1c753e1326d2d04380b315ea3b8a63106213ab37dd0832958a","typeString":"literal_string \"balance should be 2\""}],"id":955,"name":"require","nodeType":"Identifier","overloadedDeclarations":[-18,-18],"referencedDeclaration":-18,"src":"8336:7:0","typeDescriptions":{"typeIdentifier":"t_function_require_pure$_t_bool_$_t_string_memory_ptr_$returns$__$","typeString":"function (bool,string memory) pure"}},"id":964,"isConstant":false,"isLValue":false,"isPure":false,"kind":"functionCall","lValueRequested":false,"names":[],"nodeType":"FunctionCall","src":"8336:62:0","tryCall":false,"typeDescriptions":{"typeIdentifier":"t_tuple$__$","typeString":"tuple()"}},"id":965,"nodeType":"ExpressionStatement","src":"8336:62:0"}]},"functionSelector":"c0406226","implemented":true,"kind":"function","modifiers":[],"name":"run","nameLocation":"7776:3:0","parameters":{"id":873,"nodeType":"ParameterList","parameters":[],"src":"7779:2:0"},"returnParameters":{"id":874,"nodeType":"ParameterList","parameters":[],"src":"7791:0:0"},"scope":968,"stateMutability":"nonpayable","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"ForkTester","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"linearizedBaseContracts":[968],"name":"ForkTester","nameLocation":"7603:10:0","scope":969,"usedErrors":[]}],"license":"MIT"},"id":0}
\ No newline at end of file
diff --git a/op-chain-ops/script/with.go b/op-chain-ops/script/with.go
index 00560d5a6b6e..d70762a61f8e 100644
--- a/op-chain-ops/script/with.go
+++ b/op-chain-ops/script/with.go
@@ -3,6 +3,8 @@ package script
 import (
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
+
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -26,10 +28,13 @@ func WithScript[B any](h *Host, name string, contract string) (b *B, cleanup fun
 		return nil, nil, fmt.Errorf("could not load script artifact: %w", err)
 	}
 
-	deployer := ScriptDeployer
+	deployer := addresses.ScriptDeployer
 	deployNonce := h.state.GetNonce(deployer)
 	// compute address of script contract to be deployed
 	addr := crypto.CreateAddress(deployer, deployNonce)
+	h.Label(addr, contract)
+	h.AllowCheatcodes(addr)      // before constructor execution, give our script cheatcode access
+	h.state.MakePersistent(addr) // scripts are persistent across forks
 
 	// init bindings (with ABI check)
 	bindings, err := MakeBindings[B](h.ScriptBackendFn(addr), func(abiDef string) bool {
@@ -51,7 +56,6 @@ func WithScript[B any](h *Host, name string, contract string) (b *B, cleanup fun
 		return nil, nil, fmt.Errorf("deployed to unexpected address %s, expected %s", deployedAddr, addr)
 	}
 	h.RememberArtifact(addr, artifact, contract)
-	h.Label(addr, contract)
 	return bindings, func() {
 		h.Wipe(addr)
 	}, nil

From 2acb4973cbce8709a15d009b050e9abd701bfcf8 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 13 Nov 2024 13:29:24 +0100
Subject: [PATCH 173/451] cleanup (#12913)

---
 .../contracts-bedrock/scripts/checks/check-semver-diff.sh   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh b/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
index 62872e1e73d8..70304f641690 100755
--- a/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
+++ b/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
@@ -23,10 +23,8 @@ fi
 
 # Get the upstream semver-lock.json.
 if ! git show origin/develop:packages/contracts-bedrock/snapshots/semver-lock.json > "$temp_dir/upstream_semver_lock.json" 2>/dev/null; then
-    if ! git show origin/develop:packages/contracts-bedrock/semver-lock.json > "$temp_dir/upstream_semver_lock.json" 2>/dev/null; then
-        echo "❌ Error: Could not find semver-lock.json in either snapshots/ or root directory of develop branch"
-        exit 1
-    fi
+      echo "❌ Error: Could not find semver-lock.json in the snapshots/ directory of develop branch"
+      exit 1
 fi
 
 # Copy the local semver-lock.json.

From f549204b026c604f6f56de82504f44c725ef081d Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Wed, 13 Nov 2024 17:57:46 +0100
Subject: [PATCH 174/451] Prepare Holocene testnet & devnet release (#12917)

---
 go.mod                          |  4 +--
 go.sum                          |  8 ++---
 op-node/chaincfg/chains_test.go | 64 ++++++++++++++++-----------------
 op-node/rollup/superchain.go    |  2 +-
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/go.mod b/go.mod
index d077cf6a8bb0..d1be77ddc0e1 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/crate-crypto/go-kzg-4844 v1.0.0
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
-	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac
+	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241113154227-e72c6311f6e7
 	github.com/ethereum/go-ethereum v1.14.11
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
@@ -250,7 +250,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101411.1-rc.6
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.2-rc.1
 
 //replace github.com/ethereum/go-ethereum => ../go-ethereum
 
diff --git a/go.sum b/go.sum
index d9f532807675..5eabf529b0df 100644
--- a/go.sum
+++ b/go.sum
@@ -187,10 +187,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.1-rc.6 h1:VvUBIVFbnU9486CWHa9Js5XYY3o6OsdQcI8gE3XjCDE=
-github.com/ethereum-optimism/op-geth v1.101411.1-rc.6/go.mod h1:7S4pp8KHBmEmKkRjL1BPOc6jY9hW+64YeMUjR3RVLw4=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac h1:hCIrLuOPV3FJfMDvXeOhCC3uQNvFoMIIlkT2mN2cfeg=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac/go.mod h1:XaVXL9jg8BcyOeugECgIUGa9Y3DjYJj71RHmb5qon6M=
+github.com/ethereum-optimism/op-geth v1.101411.2-rc.1 h1:v314tR5EzG+QNE9aLf+goWCDsTT+RT2EsdOOlJT6CwM=
+github.com/ethereum-optimism/op-geth v1.101411.2-rc.1/go.mod h1:RrPkuqfeIXkW28lQJwc5AG/BKbhkHRXPD5YezeeK4w8=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241113154227-e72c6311f6e7 h1:Mbgsp5T52F2pEULHccLr4NtnT6cKnJgabpAPlTfPxrk=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241113154227-e72c6311f6e7/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
 github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=
diff --git a/op-node/chaincfg/chains_test.go b/op-node/chaincfg/chains_test.go
index 7499aa4ba3ee..bd9956253cd5 100644
--- a/op-node/chaincfg/chains_test.go
+++ b/op-node/chaincfg/chains_test.go
@@ -89,22 +89,22 @@ var sepoliaCfg = rollup.Config{
 			GasLimit:    30000000,
 		},
 	},
-	BlockTime:              2,
-	MaxSequencerDrift:      600,
-	SeqWindowSize:          3600,
-	ChannelTimeoutBedrock:  300,
-	L1ChainID:              big.NewInt(11155111),
-	L2ChainID:              big.NewInt(11155420),
-	BatchInboxAddress:      common.HexToAddress("0xff00000000000000000000000000000011155420"),
-	DepositContractAddress: common.HexToAddress("0x16fc5058f25648194471939df75cf27a2fdc48bc"),
-	L1SystemConfigAddress:  common.HexToAddress("0x034edd2a225f7f429a63e0f1d2084b9e0a93b538"),
-	RegolithTime:           u64Ptr(0),
-	CanyonTime:             u64Ptr(1699981200),
-	DeltaTime:              u64Ptr(1703203200),
-	EcotoneTime:            u64Ptr(1708534800),
-	FjordTime:              u64Ptr(1716998400),
-	GraniteTime:            u64Ptr(1723478400),
-	// HoloceneTime: TBD
+	BlockTime:               2,
+	MaxSequencerDrift:       600,
+	SeqWindowSize:           3600,
+	ChannelTimeoutBedrock:   300,
+	L1ChainID:               big.NewInt(11155111),
+	L2ChainID:               big.NewInt(11155420),
+	BatchInboxAddress:       common.HexToAddress("0xff00000000000000000000000000000011155420"),
+	DepositContractAddress:  common.HexToAddress("0x16fc5058f25648194471939df75cf27a2fdc48bc"),
+	L1SystemConfigAddress:   common.HexToAddress("0x034edd2a225f7f429a63e0f1d2084b9e0a93b538"),
+	RegolithTime:            u64Ptr(0),
+	CanyonTime:              u64Ptr(1699981200),
+	DeltaTime:               u64Ptr(1703203200),
+	EcotoneTime:             u64Ptr(1708534800),
+	FjordTime:               u64Ptr(1716998400),
+	GraniteTime:             u64Ptr(1723478400),
+	HoloceneTime:            u64Ptr(1732633200),
 	ProtocolVersionsAddress: common.HexToAddress("0x79ADD5713B383DAa0a138d3C4780C7A1804a8090"),
 }
 
@@ -126,22 +126,22 @@ var sepoliaDev0Cfg = rollup.Config{
 			GasLimit:    30000000,
 		},
 	},
-	BlockTime:              2,
-	MaxSequencerDrift:      600,
-	SeqWindowSize:          3600,
-	ChannelTimeoutBedrock:  300,
-	L1ChainID:              big.NewInt(11155111),
-	L2ChainID:              big.NewInt(11155421),
-	BatchInboxAddress:      common.HexToAddress("0xff00000000000000000000000000000011155421"),
-	DepositContractAddress: common.HexToAddress("0x76114bd29dFcC7a9892240D317E6c7C2A281Ffc6"),
-	L1SystemConfigAddress:  common.HexToAddress("0xa6b72407e2dc9EBF84b839B69A24C88929cf20F7"),
-	RegolithTime:           u64Ptr(0),
-	CanyonTime:             u64Ptr(0),
-	DeltaTime:              u64Ptr(0),
-	EcotoneTime:            u64Ptr(1706634000),
-	FjordTime:              u64Ptr(1715961600),
-	GraniteTime:            u64Ptr(1723046400),
-	// HoloceneTime: TBD
+	BlockTime:               2,
+	MaxSequencerDrift:       600,
+	SeqWindowSize:           3600,
+	ChannelTimeoutBedrock:   300,
+	L1ChainID:               big.NewInt(11155111),
+	L2ChainID:               big.NewInt(11155421),
+	BatchInboxAddress:       common.HexToAddress("0xff00000000000000000000000000000011155421"),
+	DepositContractAddress:  common.HexToAddress("0x76114bd29dFcC7a9892240D317E6c7C2A281Ffc6"),
+	L1SystemConfigAddress:   common.HexToAddress("0xa6b72407e2dc9EBF84b839B69A24C88929cf20F7"),
+	RegolithTime:            u64Ptr(0),
+	CanyonTime:              u64Ptr(0),
+	DeltaTime:               u64Ptr(0),
+	EcotoneTime:             u64Ptr(1706634000),
+	FjordTime:               u64Ptr(1715961600),
+	GraniteTime:             u64Ptr(1723046400),
+	HoloceneTime:            u64Ptr(1731682800),
 	ProtocolVersionsAddress: common.HexToAddress("0x252CbE9517F731C618961D890D534183822dcC8d"),
 }
 
diff --git a/op-node/rollup/superchain.go b/op-node/rollup/superchain.go
index e4ca043011a2..577a8dab7cea 100644
--- a/op-node/rollup/superchain.go
+++ b/op-node/rollup/superchain.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum-optimism/superchain-registry/superchain"
 )
 
-var OPStackSupport = params.ProtocolVersionV0{Build: [8]byte{}, Major: 8, Minor: 0, Patch: 0, PreRelease: 0}.Encode()
+var OPStackSupport = params.ProtocolVersionV0{Build: [8]byte{}, Major: 9, Minor: 0, Patch: 0, PreRelease: 1}.Encode()
 
 // LoadOPStackRollupConfig loads the rollup configuration of the requested chain ID from the superchain-registry.
 // Some chains may require a SystemConfigProvider to retrieve any values not part of the registry.

From 012398cd9287d468fcfcc6b18420597c623b1a7d Mon Sep 17 00:00:00 2001
From: Chen Kai <281165273grape@gmail.com>
Date: Thu, 14 Nov 2024 06:51:46 +0700
Subject: [PATCH 175/451] Feat: Add sll/srl/sra/sllv/srlv/srav/jr/jalr/bne/beq
 mips test (#12808)

* feat:add bne test

Signed-off-by: Chen Kai <281165273grape@gmail.com>

* feat:Add sll/srl/sra/sllv/srlv/srav/jr/jalr/beq/bne mips test

Signed-off-by: Chen Kai <281165273grape@gmail.com>

* Apply suggestions from code review

Co-authored-by: mbaxter <meredith.a.baxter@gmail.com>

* fix:add code review suggestion

Signed-off-by: Chen Kai <281165273grape@gmail.com>

---------

Signed-off-by: Chen Kai <281165273grape@gmail.com>
Co-authored-by: mbaxter <meredith.a.baxter@gmail.com>
---
 cannon/mipsevm/tests/evm_common_test.go | 133 ++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index 6845fb07d59a..34a71b6a1b0d 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -413,6 +413,139 @@ func TestEVM_SingleStep_MthiMtlo(t *testing.T) {
 	}
 }
 
+func TestEVM_SingleStep_BeqBne(t *testing.T) {
+	versions := GetMipsVersionTestCases(t)
+	cases := []struct {
+		name   string
+		imm    uint32
+		opcode uint32
+		rs     Word
+		rt     Word
+	}{
+		{name: "bne", opcode: uint32(0x5), imm: uint32(0x10), rs: Word(0xaa), rt: Word(0xdeadbeef)},       // bne $t0, $t1, 16
+		{name: "beq", opcode: uint32(0x4), imm: uint32(0x10), rs: Word(0xdeadbeef), rt: Word(0xdeadbeef)}, // beq $t0, $t1, 16
+	}
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
+				state := goVm.GetState()
+				rsReg := uint32(9)
+				rtReg := uint32(8)
+				insn := tt.opcode<<26 | rsReg<<21 | rtReg<<16 | tt.imm
+				state.GetRegistersRef()[rtReg] = tt.rt
+				state.GetRegistersRef()[rsReg] = tt.rs
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
+				step := state.GetStep()
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.Step = state.GetStep() + 1
+				expected.PC = state.GetCpu().NextPC
+				expected.NextPC = state.GetCpu().NextPC + Word(tt.imm<<2)
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+			})
+		}
+	}
+
+}
+
+func TestEVM_SingleStep_SlSr(t *testing.T) {
+	versions := GetMipsVersionTestCases(t)
+	cases := []struct {
+		name      string
+		rs        Word
+		rt        Word
+		rsReg     uint32
+		funct     uint16
+		expectVal Word
+	}{
+		{name: "sll", funct: uint16(4) << 6, rt: Word(0x20), rsReg: uint32(0x0), expectVal: Word(0x20) << uint8(4)},                         // sll t0, t1, 3
+		{name: "srl", funct: uint16(4)<<6 | 2, rt: Word(0x20), rsReg: uint32(0x0), expectVal: Word(0x20) >> uint8(4)},                       // srl t0, t1, 3
+		{name: "sra", funct: uint16(4)<<6 | 3, rt: Word(0x80_00_00_20), rsReg: uint32(0x0), expectVal: signExtend64(0xF8_00_00_02)},         // sra t0, t1, 3
+		{name: "sllv", funct: uint16(4), rt: Word(0x20), rs: Word(4), rsReg: uint32(0xa), expectVal: Word(0x20) << Word(4)},                 // sllv t0, t1, t2
+		{name: "srlv", funct: uint16(6), rt: Word(0x20_00), rs: Word(4), rsReg: uint32(0xa), expectVal: Word(0x20_00) >> Word(4)},           // srlv t0, t1, t2
+		{name: "srav", funct: uint16(7), rt: Word(0xdeafbeef), rs: Word(12), rsReg: uint32(0xa), expectVal: signExtend64(Word(0xfffdeafb))}, // srav t0, t1, t2
+	}
+
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
+				state := goVm.GetState()
+				var insn uint32
+				rtReg := uint32(0x9)
+				rdReg := uint32(0x8)
+				insn = tt.rsReg<<21 | rtReg<<16 | rdReg<<11 | uint32(tt.funct)
+				state.GetRegistersRef()[rtReg] = tt.rt
+				state.GetRegistersRef()[tt.rsReg] = tt.rs
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
+				step := state.GetStep()
+
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.ExpectStep()
+
+				expected.Registers[rdReg] = tt.expectVal
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+			})
+		}
+	}
+}
+
+func TestEVM_SingleStep_JrJalr(t *testing.T) {
+	versions := GetMipsVersionTestCases(t)
+	cases := []struct {
+		name       string
+		funct      uint16
+		rdReg      uint32
+		expectLink bool
+	}{
+		{name: "jr", funct: uint16(0x8), rdReg: uint32(0)},                       // jr t0
+		{name: "jalr", funct: uint16(0x9), rdReg: uint32(0x9), expectLink: true}, // jalr t1, t0
+	}
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)), testutil.WithPC(0), testutil.WithNextPC(4))
+				state := goVm.GetState()
+				rsReg := uint32(8)
+				insn := rsReg<<21 | tt.rdReg<<11 | uint32(tt.funct)
+				state.GetRegistersRef()[rsReg] = Word(0x34)
+				testutil.StoreInstruction(state.GetMemory(), 0, insn)
+				step := state.GetStep()
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.Step = state.GetStep() + 1
+				expected.PC = state.GetCpu().NextPC
+				expected.NextPC = state.GetRegistersRef()[rsReg]
+				if tt.expectLink {
+					expected.Registers[tt.rdReg] = state.GetPC() + 8
+				}
+
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+			})
+		}
+	}
+}
+
 func TestEVM_MMap(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {

From fa9ffcff224d0d75f595e6db087e0f8277ca9905 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Thu, 14 Nov 2024 08:09:05 +0700
Subject: [PATCH 176/451] op-program: Add 1.4.0-rc.1 to list of op-program
 releases. (#12920)

---
 op-program/prestates/releases.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/op-program/prestates/releases.json b/op-program/prestates/releases.json
index 9345be39006b..63c54a0ba589 100644
--- a/op-program/prestates/releases.json
+++ b/op-program/prestates/releases.json
@@ -1,4 +1,8 @@
 [
+  {
+    "version": "1.4.0-rc.1",
+    "hash": "0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe"
+  },
   {
     "version": "1.3.1",
     "hash": "0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c",

From 2ef3a124794e27327b8c95f889724050c53363b9 Mon Sep 17 00:00:00 2001
From: Raffaele <151576068+raffaele-oplabs@users.noreply.github.com>
Date: Thu, 14 Nov 2024 15:41:44 +0100
Subject: [PATCH 177/451] removing unused action (#12927)

---
 .github/actions/setup/action.yml | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .github/actions/setup/action.yml

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
deleted file mode 100644
index 4c8918566485..000000000000
--- a/.github/actions/setup/action.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: Setup
-description: Common setup steps used by our workflows
-runs:
-  using: composite
-  steps:
-    - name: Setup foundry
-      uses: foundry-rs/foundry-toolchain@v1

From ae78b73dffbc2bb47ad10b812265db036a0797c3 Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Thu, 14 Nov 2024 10:19:43 -0500
Subject: [PATCH 178/451] cannon: Add differential tests for lui/clo/clz
 (#12906)

* cannon: Add differential tests for lui instruction

* cannon: Add clo, clz differential tests
---
 cannon/mipsevm/tests/evm_common_test.go | 87 +++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/cannon/mipsevm/tests/evm_common_test.go b/cannon/mipsevm/tests/evm_common_test.go
index 34a71b6a1b0d..cac15fb074e1 100644
--- a/cannon/mipsevm/tests/evm_common_test.go
+++ b/cannon/mipsevm/tests/evm_common_test.go
@@ -248,6 +248,93 @@ func TestEVM_SingleStep_LoadStore32(t *testing.T) {
 	testLoadStore(t, cases)
 }
 
+func TestEVM_SingleStep_Lui(t *testing.T) {
+	versions := GetMipsVersionTestCases(t)
+
+	cases := []struct {
+		name     string
+		rtReg    uint32
+		imm      uint32
+		expectRt Word
+	}{
+		{name: "lui unsigned", rtReg: 5, imm: 0x1234, expectRt: 0x1234_0000},
+		{name: "lui signed", rtReg: 7, imm: 0x8765, expectRt: signExtend64(0x8765_0000)},
+	}
+
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)))
+				state := goVm.GetState()
+				insn := 0b1111<<26 | uint32(tt.rtReg)<<16 | (tt.imm & 0xFFFF)
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
+				step := state.GetStep()
+
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.ExpectStep()
+				expected.Registers[tt.rtReg] = tt.expectRt
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+			})
+		}
+	}
+}
+
+func TestEVM_SingleStep_CloClz(t *testing.T) {
+	versions := GetMipsVersionTestCases(t)
+
+	rsReg := uint32(5)
+	rdReg := uint32(6)
+	cases := []struct {
+		name           string
+		rs             Word
+		expectedResult Word
+		funct          uint32
+	}{
+		{name: "clo", rs: 0xFFFF_FFFE, expectedResult: 31, funct: 0b10_0001},
+		{name: "clo", rs: 0xE000_0000, expectedResult: 3, funct: 0b10_0001},
+		{name: "clo", rs: 0x8000_0000, expectedResult: 1, funct: 0b10_0001},
+		{name: "clo, sign-extended", rs: signExtend64(0x8000_0000), expectedResult: 1, funct: 0b10_0001},
+		{name: "clo, sign-extended", rs: signExtend64(0xF800_0000), expectedResult: 5, funct: 0b10_0001},
+		{name: "clz", rs: 0x1, expectedResult: 31, funct: 0b10_0000},
+		{name: "clz", rs: 0x1000_0000, expectedResult: 3, funct: 0b10_0000},
+		{name: "clz", rs: 0x8000_0000, expectedResult: 0, funct: 0b10_0000},
+		{name: "clz, sign-extended", rs: signExtend64(0x8000_0000), expectedResult: 0, funct: 0b10_0000},
+	}
+
+	for _, v := range versions {
+		for i, tt := range cases {
+			testName := fmt.Sprintf("%v (%v)", tt.name, v.Name)
+			t.Run(testName, func(t *testing.T) {
+				// Set up state
+				goVm := v.VMFactory(nil, os.Stdout, os.Stderr, testutil.CreateLogger(), testutil.WithRandomization(int64(i)))
+				state := goVm.GetState()
+				insn := 0b01_1100<<26 | rsReg<<21 | rdReg<<11 | tt.funct
+				testutil.StoreInstruction(state.GetMemory(), state.GetPC(), insn)
+				state.GetRegistersRef()[rsReg] = tt.rs
+				step := state.GetStep()
+
+				// Setup expectations
+				expected := testutil.NewExpectedState(state)
+				expected.ExpectStep()
+				expected.Registers[rdReg] = tt.expectedResult
+				stepWitness, err := goVm.Step(true)
+				require.NoError(t, err)
+
+				// Check expectations
+				expected.Validate(t, state)
+				testutil.ValidateEVM(t, stepWitness, step, goVm, v.StateHashFn, v.Contracts)
+			})
+		}
+	}
+}
+
 func TestEVM_SingleStep_MovzMovn(t *testing.T) {
 	versions := GetMipsVersionTestCases(t)
 	cases := []struct {

From 50564d430460a4dc7b63787814bd322751660f4a Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 14 Nov 2024 12:19:08 -0700
Subject: [PATCH 179/451] op-deployer: Support forking live chains (#12918)

---
 op-chain-ops/script/cheatcodes_forking.go     |  10 +-
 op-chain-ops/script/forking/db.go             |   4 +-
 op-chain-ops/script/forking/state.go          |  18 +-
 op-chain-ops/script/script.go                 |  13 +-
 op-chain-ops/script/script_test.go            |   4 +-
 op-chain-ops/script/with.go                   |   4 +-
 op-deployer/pkg/deployer/apply.go             | 222 ++++++++++-------
 .../pkg/deployer/bootstrap/delayed_weth.go    |   2 +-
 .../pkg/deployer/bootstrap/dispute_game.go    |   2 +-
 op-deployer/pkg/deployer/bootstrap/mips.go    |   2 +-
 op-deployer/pkg/deployer/bootstrap/opcm.go    |   2 +-
 op-deployer/pkg/deployer/inspect/semvers.go   |   1 -
 .../deployer/integration_test/apply_test.go   | 208 +++++-----------
 op-deployer/pkg/deployer/opcm/alt_da_test.go  |   1 -
 .../pkg/deployer/opcm/delayed_weth_test.go    |   1 -
 .../pkg/deployer/opcm/deployOutput_v160.json  |  77 ------
 .../pkg/deployer/opcm/dispute_game_test.go    |   1 -
 op-deployer/pkg/deployer/opcm/mips_test.go    |   1 -
 op-deployer/pkg/deployer/opcm/opchain.go      | 224 +++---------------
 op-deployer/pkg/deployer/pipeline/env.go      |   1 -
 .../pkg/deployer/pipeline/implementations.go  |   2 -
 .../pkg/deployer/pipeline/l2genesis.go        |  15 +-
 op-deployer/pkg/deployer/pipeline/opchain.go  | 214 +++--------------
 op-deployer/pkg/deployer/standard/standard.go |   2 +-
 op-deployer/pkg/env/host.go                   |  12 +-
 .../scripts/deploy/DeployOPChain.s.sol        |   2 +-
 .../deploy/ReadImplementationAddresses.s.sol  | 166 +++++++++++++
 .../scripts/ops/publish-artifacts.sh          |   9 +-
 28 files changed, 483 insertions(+), 737 deletions(-)
 delete mode 100644 op-deployer/pkg/deployer/opcm/deployOutput_v160.json
 create mode 100644 packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol

diff --git a/op-chain-ops/script/cheatcodes_forking.go b/op-chain-ops/script/cheatcodes_forking.go
index a1f30c7a11b9..44ba66f8a958 100644
--- a/op-chain-ops/script/cheatcodes_forking.go
+++ b/op-chain-ops/script/cheatcodes_forking.go
@@ -53,15 +53,7 @@ func (c *CheatCodesPrecompile) CreateSelectFork_84d52b7a(urlOrAlias string, txHa
 // createSelectFork implements vm.createSelectFork:
 // https://book.getfoundry.sh/cheatcodes/create-select-fork
 func (c *CheatCodesPrecompile) createSelectFork(opts ...ForkOption) (*big.Int, error) {
-	src, err := c.h.onFork(opts...)
-	if err != nil {
-		return nil, fmt.Errorf("failed to setup fork source: %w", err)
-	}
-	id, err := c.h.state.CreateSelectFork(src)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create-select fork: %w", err)
-	}
-	return id.U256().ToBig(), nil
+	return c.h.CreateSelectFork(opts...)
 }
 
 // ActiveFork implements vm.activeFork:
diff --git a/op-chain-ops/script/forking/db.go b/op-chain-ops/script/forking/db.go
index 6a40b4310d95..0a073500d247 100644
--- a/op-chain-ops/script/forking/db.go
+++ b/op-chain-ops/script/forking/db.go
@@ -53,7 +53,9 @@ func NewForkDB(source ForkSource) *ForkDB {
 // fakeRoot is just a marker; every account we load into the fork-db has this storage-root.
 // When opening a storage-trie, we sanity-check we have this root, or an empty trie.
 // And then just return the same global trie view for storage reads/writes.
-var fakeRoot = common.Hash{0: 42}
+// It needs to be set to EmptyRootHash to avoid contract collision errors when
+// deploying contracts, since Geth checks the storage root prior to deployment.
+var fakeRoot = types.EmptyRootHash
 
 func (f *ForkDB) OpenTrie(root common.Hash) (state.Trie, error) {
 	if f.active.stateRoot != root {
diff --git a/op-chain-ops/script/forking/state.go b/op-chain-ops/script/forking/state.go
index 5370179423ab..c3b6da1e3236 100644
--- a/op-chain-ops/script/forking/state.go
+++ b/op-chain-ops/script/forking/state.go
@@ -54,8 +54,6 @@ func NewForkableState(base VMStateDB) *ForkableState {
 			addresses.DefaultSenderAddr: ForkID{},
 			addresses.VMAddr:            ForkID{},
 			addresses.ConsoleAddr:       ForkID{},
-			addresses.ScriptDeployer:    ForkID{},
-			addresses.ForgeDeployer:     ForkID{},
 		},
 		fallback:  base,
 		idCounter: 0,
@@ -194,11 +192,27 @@ func (fst *ForkableState) MakePersistent(addr common.Address) {
 	fst.persistent[addr] = fst.activeFork
 }
 
+// MakeExcluded excludes an account from forking. This is useful for things like scripts, which
+// should always use the fallback state.
+func (fst *ForkableState) MakeExcluded(addr common.Address) {
+	fst.persistent[addr] = ForkID{}
+}
+
 // RevokePersistent is like vm.revokePersistent, it undoes a previous vm.makePersistent.
 func (fst *ForkableState) RevokePersistent(addr common.Address) {
 	delete(fst.persistent, addr)
 }
 
+// RevokeExcluded undoes MakeExcluded. It will panic if the account was marked as
+// persistent in a different fork.
+func (fst *ForkableState) RevokeExcluded(addr common.Address) {
+	forkID, ok := fst.persistent[addr]
+	if ok && forkID != (ForkID{}) {
+		panic(fmt.Sprintf("cannot revoke excluded account %s since it was made persistent in fork %q", addr, forkID))
+	}
+	delete(fst.persistent, addr)
+}
+
 // IsPersistent is like vm.isPersistent, it checks if an account persists across forks.
 func (fst *ForkableState) IsPersistent(addr common.Address) bool {
 	_, ok := fst.persistent[addr]
diff --git a/op-chain-ops/script/script.go b/op-chain-ops/script/script.go
index e5630d0783c5..3ce493487f77 100644
--- a/op-chain-ops/script/script.go
+++ b/op-chain-ops/script/script.go
@@ -9,7 +9,6 @@ import (
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script/addresses"
-
 	"github.com/holiman/uint256"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
@@ -850,3 +849,15 @@ func (h *Host) RememberOnLabel(label, srcFile, contract string) error {
 	})
 	return nil
 }
+
+func (h *Host) CreateSelectFork(opts ...ForkOption) (*big.Int, error) {
+	src, err := h.onFork(opts...)
+	if err != nil {
+		return nil, fmt.Errorf("failed to setup fork source: %w", err)
+	}
+	id, err := h.state.CreateSelectFork(src)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create-select fork: %w", err)
+	}
+	return id.U256().ToBig(), nil
+}
diff --git a/op-chain-ops/script/script_test.go b/op-chain-ops/script/script_test.go
index dbeef794fe37..48949347b63d 100644
--- a/op-chain-ops/script/script_test.go
+++ b/op-chain-ops/script/script_test.go
@@ -282,8 +282,8 @@ func TestForkingScript(t *testing.T) {
 	addr, err := h.LoadContract("ScriptExample.s.sol", "ForkTester")
 	require.NoError(t, err)
 	h.AllowCheatcodes(addr)
-	// Make this script persistent so it doesn't call the fork RPC.
-	h.state.MakePersistent(addr)
+	// Make this script excluded so it doesn't call the fork RPC.
+	h.state.MakeExcluded(addr)
 	t.Logf("allowing %s to access cheatcodes", addr)
 
 	input := bytes4("run()")
diff --git a/op-chain-ops/script/with.go b/op-chain-ops/script/with.go
index d70762a61f8e..0823bf9b7fbd 100644
--- a/op-chain-ops/script/with.go
+++ b/op-chain-ops/script/with.go
@@ -33,8 +33,8 @@ func WithScript[B any](h *Host, name string, contract string) (b *B, cleanup fun
 	// compute address of script contract to be deployed
 	addr := crypto.CreateAddress(deployer, deployNonce)
 	h.Label(addr, contract)
-	h.AllowCheatcodes(addr)      // before constructor execution, give our script cheatcode access
-	h.state.MakePersistent(addr) // scripts are persistent across forks
+	h.AllowCheatcodes(addr)    // before constructor execution, give our script cheatcode access
+	h.state.MakeExcluded(addr) // scripts are persistent across forks
 
 	// init bindings (with ABI check)
 	bindings, err := MakeBindings[B](h.ScriptBackendFn(addr), func(abiDef string) bool {
diff --git a/op-deployer/pkg/deployer/apply.go b/op-deployer/pkg/deployer/apply.go
index bdfd5c55ea1e..f02716c655a5 100644
--- a/op-deployer/pkg/deployer/apply.go
+++ b/op-deployer/pkg/deployer/apply.go
@@ -7,11 +7,15 @@ import (
 	"math/big"
 	"strings"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
+	"github.com/ethereum/go-ethereum/rpc"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 	"github.com/ethereum/go-ethereum/common"
 
@@ -104,50 +108,43 @@ func Apply(ctx context.Context, cfg ApplyConfig) error {
 		return fmt.Errorf("failed to read state: %w", err)
 	}
 
-	var l1Client *ethclient.Client
-	var deployer common.Address
-	var bcaster broadcaster.Broadcaster
-	var startingNonce uint64
-	if intent.DeploymentStrategy == state.DeploymentStrategyLive {
-		if err := cfg.CheckLive(); err != nil {
-			return fmt.Errorf("invalid config for apply: %w", err)
-		}
-
-		l1Client, err = ethclient.Dial(cfg.L1RPCUrl)
-		if err != nil {
-			return fmt.Errorf("failed to connect to L1 RPC: %w", err)
-		}
+	if err := ApplyPipeline(ctx, ApplyPipelineOpts{
+		L1RPCUrl:           cfg.L1RPCUrl,
+		DeployerPrivateKey: cfg.privateKeyECDSA,
+		Intent:             intent,
+		State:              st,
+		Logger:             cfg.Logger,
+		StateWriter:        pipeline.WorkdirStateWriter(cfg.Workdir),
+	}); err != nil {
+		return err
+	}
 
-		chainID, err := l1Client.ChainID(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to get chain ID: %w", err)
-		}
+	return nil
+}
 
-		signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
-		deployer = crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
+type pipelineStage struct {
+	name  string
+	apply func() error
+}
 
-		bcaster, err = broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
-			Logger:  cfg.Logger,
-			ChainID: new(big.Int).SetUint64(intent.L1ChainID),
-			Client:  l1Client,
-			Signer:  signer,
-			From:    deployer,
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create broadcaster: %w", err)
-		}
+type ApplyPipelineOpts struct {
+	L1RPCUrl           string
+	DeployerPrivateKey *ecdsa.PrivateKey
+	Intent             *state.Intent
+	State              *state.State
+	Logger             log.Logger
+	StateWriter        pipeline.StateWriter
+}
 
-		startingNonce, err = l1Client.NonceAt(ctx, deployer, nil)
-		if err != nil {
-			return fmt.Errorf("failed to get starting nonce: %w", err)
-		}
-	} else {
-		deployer = common.Address{0x01}
-		bcaster = broadcaster.NoopBroadcaster()
-	}
+func ApplyPipeline(
+	ctx context.Context,
+	opts ApplyPipelineOpts,
+) error {
+	intent := opts.Intent
+	st := opts.State
 
 	progressor := func(curr, total int64) {
-		cfg.Logger.Info("artifacts download progress", "current", curr, "total", total)
+		opts.Logger.Info("artifacts download progress", "current", curr, "total", total)
 	}
 
 	l1ArtifactsFS, cleanupL1, err := artifacts.Download(ctx, intent.L1ContractsLocator, progressor)
@@ -156,7 +153,7 @@ func Apply(ctx context.Context, cfg ApplyConfig) error {
 	}
 	defer func() {
 		if err := cleanupL1(); err != nil {
-			cfg.Logger.Warn("failed to clean up L1 artifacts", "err", err)
+			opts.Logger.Warn("failed to clean up L1 artifacts", "err", err)
 		}
 	}()
 
@@ -166,7 +163,7 @@ func Apply(ctx context.Context, cfg ApplyConfig) error {
 	}
 	defer func() {
 		if err := cleanupL2(); err != nil {
-			cfg.Logger.Warn("failed to clean up L2 artifacts", "err", err)
+			opts.Logger.Warn("failed to clean up L2 artifacts", "err", err)
 		}
 	}()
 
@@ -175,52 +172,101 @@ func Apply(ctx context.Context, cfg ApplyConfig) error {
 		L2: l2ArtifactsFS,
 	}
 
-	l1Host, err := env.DefaultScriptHost(bcaster, cfg.Logger, deployer, bundle.L1, startingNonce)
-	if err != nil {
-		return fmt.Errorf("failed to create L1 script host: %w", err)
+	var deployer common.Address
+	var bcaster broadcaster.Broadcaster
+	var l1Client *ethclient.Client
+	var l1Host *script.Host
+	if intent.DeploymentStrategy == state.DeploymentStrategyLive {
+		l1RPC, err := rpc.Dial(opts.L1RPCUrl)
+		if err != nil {
+			return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		}
+
+		l1Client = ethclient.NewClient(l1RPC)
+
+		chainID, err := l1Client.ChainID(ctx)
+		if err != nil {
+			return fmt.Errorf("failed to get chain ID: %w", err)
+		}
+
+		signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(opts.DeployerPrivateKey, chainID))
+		deployer = crypto.PubkeyToAddress(opts.DeployerPrivateKey.PublicKey)
+
+		bcaster, err = broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+			Logger:  opts.Logger,
+			ChainID: new(big.Int).SetUint64(intent.L1ChainID),
+			Client:  l1Client,
+			Signer:  signer,
+			From:    deployer,
+		})
+		if err != nil {
+			return fmt.Errorf("failed to create broadcaster: %w", err)
+		}
+
+		l1Host, err = env.DefaultScriptHost(
+			bcaster,
+			opts.Logger,
+			deployer,
+			bundle.L1,
+			script.WithForkHook(func(cfg *script.ForkConfig) (forking.ForkSource, error) {
+				src, err := forking.RPCSourceByNumber(cfg.URLOrAlias, l1RPC, *cfg.BlockNumber)
+				if err != nil {
+					return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
+				}
+				return forking.Cache(src), nil
+			}),
+		)
+		if err != nil {
+			return fmt.Errorf("failed to create L1 script host: %w", err)
+		}
+
+		latest, err := l1Client.HeaderByNumber(ctx, nil)
+		if err != nil {
+			return fmt.Errorf("failed to get latest block: %w", err)
+		}
+
+		if _, err := l1Host.CreateSelectFork(
+			script.ForkWithURLOrAlias("main"),
+			script.ForkWithBlockNumberU256(latest.Number),
+		); err != nil {
+			return fmt.Errorf("failed to select fork: %w", err)
+		}
+	} else {
+		deployer = common.Address{0x01}
+		bcaster = broadcaster.NoopBroadcaster()
+		l1Host, err = env.DefaultScriptHost(
+			bcaster,
+			opts.Logger,
+			deployer,
+			bundle.L1,
+		)
+		if err != nil {
+			return fmt.Errorf("failed to create L1 script host: %w", err)
+		}
 	}
 
-	env := &pipeline.Env{
-		StateWriter:  pipeline.WorkdirStateWriter(cfg.Workdir),
+	pEnv := &pipeline.Env{
+		StateWriter:  opts.StateWriter,
 		L1ScriptHost: l1Host,
 		L1Client:     l1Client,
-		Logger:       cfg.Logger,
+		Logger:       opts.Logger,
 		Broadcaster:  bcaster,
 		Deployer:     deployer,
 	}
 
-	if err := ApplyPipeline(ctx, env, bundle, intent, st); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type pipelineStage struct {
-	name  string
-	apply func() error
-}
-
-func ApplyPipeline(
-	ctx context.Context,
-	env *pipeline.Env,
-	bundle pipeline.ArtifactsBundle,
-	intent *state.Intent,
-	st *state.State,
-) error {
 	pline := []pipelineStage{
 		{"init", func() error {
 			if intent.DeploymentStrategy == state.DeploymentStrategyLive {
-				return pipeline.InitLiveStrategy(ctx, env, intent, st)
+				return pipeline.InitLiveStrategy(ctx, pEnv, intent, st)
 			} else {
-				return pipeline.InitGenesisStrategy(env, intent, st)
+				return pipeline.InitGenesisStrategy(pEnv, intent, st)
 			}
 		}},
 		{"deploy-superchain", func() error {
-			return pipeline.DeploySuperchain(env, intent, st)
+			return pipeline.DeploySuperchain(pEnv, intent, st)
 		}},
 		{"deploy-implementations", func() error {
-			return pipeline.DeployImplementations(env, intent, st)
+			return pipeline.DeployImplementations(pEnv, intent, st)
 		}},
 	}
 
@@ -230,21 +276,17 @@ func ApplyPipeline(
 		pline = append(pline, pipelineStage{
 			fmt.Sprintf("deploy-opchain-%s", chainID.Hex()),
 			func() error {
-				if intent.DeploymentStrategy == state.DeploymentStrategyLive {
-					return pipeline.DeployOPChainLiveStrategy(ctx, env, bundle, intent, st, chainID)
-				} else {
-					return pipeline.DeployOPChainGenesisStrategy(env, intent, st, chainID)
-				}
+				return pipeline.DeployOPChain(pEnv, intent, st, chainID)
 			},
 		}, pipelineStage{
 			fmt.Sprintf("deploy-alt-da-%s", chainID.Hex()),
 			func() error {
-				return pipeline.DeployAltDA(env, intent, st, chainID)
+				return pipeline.DeployAltDA(pEnv, intent, st, chainID)
 			},
 		}, pipelineStage{
 			fmt.Sprintf("generate-l2-genesis-%s", chainID.Hex()),
 			func() error {
-				return pipeline.GenerateL2Genesis(env, intent, bundle, st, chainID)
+				return pipeline.GenerateL2Genesis(pEnv, intent, bundle, st, chainID)
 			},
 		})
 	}
@@ -257,9 +299,9 @@ func ApplyPipeline(
 			fmt.Sprintf("set-start-block-%s", chainID.Hex()),
 			func() error {
 				if intent.DeploymentStrategy == state.DeploymentStrategyLive {
-					return pipeline.SetStartBlockLiveStrategy(ctx, env, st, chainID)
+					return pipeline.SetStartBlockLiveStrategy(ctx, pEnv, st, chainID)
 				} else {
-					return pipeline.SetStartBlockGenesisStrategy(env, st, chainID)
+					return pipeline.SetStartBlockGenesisStrategy(pEnv, st, chainID)
 				}
 			},
 		})
@@ -271,23 +313,27 @@ func ApplyPipeline(
 		if err := stage.apply(); err != nil {
 			return fmt.Errorf("error in pipeline stage apply: %w", err)
 		}
-		dump, err := env.L1ScriptHost.StateDump()
-		if err != nil {
-			return fmt.Errorf("failed to dump state: %w", err)
-		}
-		st.L1StateDump = &state.GzipData[foundry.ForgeAllocs]{
-			Data: dump,
+
+		if intent.DeploymentStrategy == state.DeploymentStrategyGenesis {
+			dump, err := pEnv.L1ScriptHost.StateDump()
+			if err != nil {
+				return fmt.Errorf("failed to dump state: %w", err)
+			}
+			st.L1StateDump = &state.GzipData[foundry.ForgeAllocs]{
+				Data: dump,
+			}
 		}
-		if _, err := env.Broadcaster.Broadcast(ctx); err != nil {
+
+		if _, err := pEnv.Broadcaster.Broadcast(ctx); err != nil {
 			return fmt.Errorf("failed to broadcast stage %s: %w", stage.name, err)
 		}
-		if err := env.StateWriter.WriteState(st); err != nil {
+		if err := pEnv.StateWriter.WriteState(st); err != nil {
 			return fmt.Errorf("failed to write state: %w", err)
 		}
 	}
 
 	st.AppliedIntent = intent
-	if err := env.StateWriter.WriteState(st); err != nil {
+	if err := pEnv.StateWriter.WriteState(st); err != nil {
 		return fmt.Errorf("failed to write state: %w", err)
 	}
 
diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index 1e6e10535f87..451b0741f245 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -159,11 +159,11 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		lgr,
 		chainDeployer,
 		artifactsFS,
-		nonce,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
+	host.SetNonce(chainDeployer, nonce)
 
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
index 2b17a35be7bb..d3efe36f9ca8 100644
--- a/op-deployer/pkg/deployer/bootstrap/dispute_game.go
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -162,11 +162,11 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		lgr,
 		chainDeployer,
 		artifactsFS,
-		nonce,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
+	host.SetNonce(chainDeployer, nonce)
 
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
diff --git a/op-deployer/pkg/deployer/bootstrap/mips.go b/op-deployer/pkg/deployer/bootstrap/mips.go
index 42abae208eb5..efc1fd1c6e04 100644
--- a/op-deployer/pkg/deployer/bootstrap/mips.go
+++ b/op-deployer/pkg/deployer/bootstrap/mips.go
@@ -157,11 +157,11 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 		lgr,
 		chainDeployer,
 		artifactsFS,
-		nonce,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
+	host.SetNonce(chainDeployer, nonce)
 
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
diff --git a/op-deployer/pkg/deployer/bootstrap/opcm.go b/op-deployer/pkg/deployer/bootstrap/opcm.go
index d584d6975f41..2f5976f304ad 100644
--- a/op-deployer/pkg/deployer/bootstrap/opcm.go
+++ b/op-deployer/pkg/deployer/bootstrap/opcm.go
@@ -193,11 +193,11 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 		lgr,
 		chainDeployer,
 		artifactsFS,
-		nonce,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
+	host.SetNonce(chainDeployer, nonce)
 
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
diff --git a/op-deployer/pkg/deployer/inspect/semvers.go b/op-deployer/pkg/deployer/inspect/semvers.go
index 7c8e4ce9f3dd..da666096ee18 100644
--- a/op-deployer/pkg/deployer/inspect/semvers.go
+++ b/op-deployer/pkg/deployer/inspect/semvers.go
@@ -72,7 +72,6 @@ func L2SemversCLI(cliCtx *cli.Context) error {
 		l,
 		common.Address{19: 0x01},
 		artifactsFS,
-		0,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index fa59c49dc8ac..215687c5cfc0 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -3,6 +3,7 @@ package integration_test
 import (
 	"bytes"
 	"context"
+	"crypto/rand"
 	"encoding/hex"
 	"fmt"
 	"log/slog"
@@ -17,19 +18,13 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
-
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
-	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/log"
-
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
+	"github.com/ethereum/go-ethereum/crypto"
 
 	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
 
@@ -37,7 +32,6 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
-	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
 	"github.com/ethereum-optimism/optimism/op-service/predeploys"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum-optimism/optimism/op-service/testutils/kurtosisutil"
@@ -106,36 +100,25 @@ func TestEndToEndApply(t *testing.T) {
 	require.NoError(t, err)
 	pk, err := dk.Secret(depKey)
 	require.NoError(t, err)
-	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(pk, l1ChainID))
 
 	l2ChainID1 := uint256.NewInt(1)
 	l2ChainID2 := uint256.NewInt(2)
 
-	deployerAddr, err := dk.Address(depKey)
-	require.NoError(t, err)
-
 	loc, _ := testutil.LocalArtifacts(t)
-
-	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
-		Logger:  log.NewLogger(log.DiscardHandler()),
-		ChainID: l1ChainID,
-		Client:  l1Client,
-		Signer:  signer,
-		From:    deployerAddr,
-	})
-	require.NoError(t, err)
-
-	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	cg := ethClientCodeGetter(ctx, l1Client)
 
 	t.Run("initial chain", func(t *testing.T) {
 		require.NoError(t, deployer.ApplyPipeline(
 			ctx,
-			env,
-			bundle,
-			intent,
-			st,
+			deployer.ApplyPipelineOpts{
+				L1RPCUrl:           rpcURL,
+				DeployerPrivateKey: pk,
+				Intent:             intent,
+				State:              st,
+				Logger:             lgr,
+				StateWriter:        pipeline.NoopStateWriter(),
+			},
 		))
 
 		validateSuperchainDeployment(t, st, cg)
@@ -145,15 +128,18 @@ func TestEndToEndApply(t *testing.T) {
 	t.Run("subsequent chain", func(t *testing.T) {
 		// create a new environment with wiped state to ensure we can continue using the
 		// state from the previous deployment
-		env, bundle, _ = createEnv(t, lgr, l1Client, bcaster, deployerAddr)
 		intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID2))
 
 		require.NoError(t, deployer.ApplyPipeline(
 			ctx,
-			env,
-			bundle,
-			intent,
-			st,
+			deployer.ApplyPipelineOpts{
+				L1RPCUrl:           rpcURL,
+				DeployerPrivateKey: pk,
+				Intent:             intent,
+				State:              st,
+				Logger:             lgr,
+				StateWriter:        pipeline.NoopStateWriter(),
+			},
 		))
 
 		validateOPChainDeployment(t, cg, st, intent)
@@ -191,24 +177,11 @@ func TestApplyExistingOPCM(t *testing.T) {
 	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
 	require.NoError(t, err)
 	// index 0 from Anvil's test set
-	priv, err := crypto.HexToECDSA("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
+	pk, err := crypto.HexToECDSA("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
 	require.NoError(t, err)
-	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(priv, l1ChainID))
-	deployerAddr := common.HexToAddress("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266")
 
 	l2ChainID := uint256.NewInt(1)
 
-	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
-		Logger:  lgr,
-		ChainID: l1ChainID,
-		Client:  l1Client,
-		Signer:  signer,
-		From:    deployerAddr,
-	})
-	require.NoError(t, err)
-
-	env, bundle, _ := createEnv(t, lgr, l1Client, bcaster, deployerAddr)
-
 	intent, st := newIntent(
 		t,
 		l1ChainID,
@@ -217,13 +190,20 @@ func TestApplyExistingOPCM(t *testing.T) {
 		artifacts.DefaultL1ContractsLocator,
 		artifacts.DefaultL2ContractsLocator,
 	)
+	// Define a new create2 salt to avoid contract address collisions
+	_, err = rand.Read(st.Create2Salt[:])
+	require.NoError(t, err)
 
 	require.NoError(t, deployer.ApplyPipeline(
 		ctx,
-		env,
-		bundle,
-		intent,
-		st,
+		deployer.ApplyPipelineOpts{
+			L1RPCUrl:           runner.RPCUrl(),
+			DeployerPrivateKey: pk,
+			Intent:             intent,
+			State:              st,
+			Logger:             lgr,
+			StateWriter:        pipeline.NoopStateWriter(),
+		},
 	))
 
 	validateOPChainDeployment(t, ethClientCodeGetter(ctx, l1Client), st, intent)
@@ -236,18 +216,12 @@ func TestL2BlockTimeOverride(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	env, bundle, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t)
 	intent.GlobalDeployOverrides = map[string]interface{}{
 		"l2BlockTime": float64(3),
 	}
 
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
+	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
 
 	cfg, err := state.CombineDeployConfig(intent, intent.Chains[0], st, st.Chains[0])
 	require.NoError(t, err)
@@ -260,16 +234,9 @@ func TestApplyGenesisStrategy(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	env, bundle, intent, st := setupGenesisChain(t)
-	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
+	opts, intent, st := setupGenesisChain(t)
 
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
+	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
 
 	cg := stateDumpCodeGetter(st)
 	validateSuperchainDeployment(t, st, cg)
@@ -287,7 +254,7 @@ func TestProofParamOverrides(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	env, bundle, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t)
 	intent.GlobalDeployOverrides = map[string]any{
 		"withdrawalDelaySeconds":                  standard.WithdrawalDelaySeconds + 1,
 		"minProposalSizeBytes":                    standard.MinProposalSizeBytes + 1,
@@ -304,13 +271,7 @@ func TestProofParamOverrides(t *testing.T) {
 		"dangerouslyAllowCustomDisputeParameters": true,
 	}
 
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
+	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
 
 	allocs := st.L1StateDump.Data.Accounts
 	chainState := st.Chains[0]
@@ -390,16 +351,10 @@ func TestInteropDeployment(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	env, bundle, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t)
 	intent.UseInterop = true
 
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
+	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
 
 	chainState := st.Chains[0]
 	depManagerSlot := common.HexToHash("0x1708e077affb93e89be2665fb0fb72581be66f84dc00d25fed755ae911905b1c")
@@ -414,7 +369,7 @@ func TestAltDADeployment(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	env, bundle, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t)
 	altDACfg := genesis.AltDADeployConfig{
 		UseAltDA:                   true,
 		DACommitmentType:           altda.KeccakCommitmentString,
@@ -425,13 +380,7 @@ func TestAltDADeployment(t *testing.T) {
 	}
 	intent.Chains[0].DangerousAltDAConfig = altDACfg
 
-	require.NoError(t, deployer.ApplyPipeline(
-		ctx,
-		env,
-		bundle,
-		intent,
-		st,
-	))
+	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
 
 	chainState := st.Chains[0]
 	require.NotEmpty(t, chainState.DataAvailabilityChallengeProxyAddress)
@@ -450,23 +399,9 @@ func TestAltDADeployment(t *testing.T) {
 func TestInvalidL2Genesis(t *testing.T) {
 	op_e2e.InitParallel(t)
 
-	lgr := testlog.Logger(t, slog.LevelDebug)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	depKey := new(deployerKey)
-	l1ChainID := big.NewInt(77799777)
-	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
-	require.NoError(t, err)
-
-	l2ChainID1 := uint256.NewInt(1)
-
-	deployerAddr, err := dk.Address(depKey)
-	require.NoError(t, err)
-
-	loc, _ := testutil.LocalArtifacts(t)
-
 	// these tests were generated by grepping all usages of the deploy
 	// config in L2Genesis.s.sol.
 	tests := []struct {
@@ -512,26 +447,18 @@ func TestInvalidL2Genesis(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
-			intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
-			intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
+			opts, intent, _ := setupGenesisChain(t)
 			intent.DeploymentStrategy = state.DeploymentStrategyGenesis
 			intent.GlobalDeployOverrides = tt.overrides
 
-			err := deployer.ApplyPipeline(
-				ctx,
-				env,
-				bundle,
-				intent,
-				st,
-			)
+			err := deployer.ApplyPipeline(ctx, opts)
 			require.Error(t, err)
 			require.ErrorContains(t, err, "failed to combine L2 init config")
 		})
 	}
 }
 
-func setupGenesisChain(t *testing.T) (*pipeline.Env, pipeline.ArtifactsBundle, *state.Intent, *state.State) {
+func setupGenesisChain(t *testing.T) (deployer.ApplyPipelineOpts, *state.Intent, *state.State) {
 	lgr := testlog.Logger(t, slog.LevelDebug)
 
 	depKey := new(deployerKey)
@@ -541,51 +468,24 @@ func setupGenesisChain(t *testing.T) (*pipeline.Env, pipeline.ArtifactsBundle, *
 
 	l2ChainID1 := uint256.NewInt(1)
 
-	deployerAddr, err := dk.Address(depKey)
+	priv, err := dk.Secret(depKey)
 	require.NoError(t, err)
 
 	loc, _ := testutil.LocalArtifacts(t)
 
-	env, bundle, _ := createEnv(t, lgr, nil, broadcaster.NoopBroadcaster(), deployerAddr)
 	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
 	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
 	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
-	return env, bundle, intent, st
-}
-
-func createEnv(
-	t *testing.T,
-	lgr log.Logger,
-	l1Client *ethclient.Client,
-	bcaster broadcaster.Broadcaster,
-	deployerAddr common.Address,
-) (*pipeline.Env, pipeline.ArtifactsBundle, *script.Host) {
-	_, artifactsFS := testutil.LocalArtifacts(t)
-
-	host, err := env.DefaultScriptHost(
-		bcaster,
-		lgr,
-		deployerAddr,
-		artifactsFS,
-		0,
-	)
-	require.NoError(t, err)
-
-	env := &pipeline.Env{
-		StateWriter:  pipeline.NoopStateWriter(),
-		L1ScriptHost: host,
-		L1Client:     l1Client,
-		Broadcaster:  bcaster,
-		Deployer:     deployerAddr,
-		Logger:       lgr,
-	}
 
-	bundle := pipeline.ArtifactsBundle{
-		L1: artifactsFS,
-		L2: artifactsFS,
+	opts := deployer.ApplyPipelineOpts{
+		DeployerPrivateKey: priv,
+		Intent:             intent,
+		State:              st,
+		Logger:             lgr,
+		StateWriter:        pipeline.NoopStateWriter(),
 	}
 
-	return env, bundle, host
+	return opts, intent, st
 }
 
 func addrFor(t *testing.T, dk *devkeys.MnemonicDevKeys, key devkeys.Key) common.Address {
diff --git a/op-deployer/pkg/deployer/opcm/alt_da_test.go b/op-deployer/pkg/deployer/opcm/alt_da_test.go
index 20b93907ebea..97e2b485b900 100644
--- a/op-deployer/pkg/deployer/opcm/alt_da_test.go
+++ b/op-deployer/pkg/deployer/opcm/alt_da_test.go
@@ -21,7 +21,6 @@ func TestDeployAltDA(t *testing.T) {
 		testlog.Logger(t, log.LevelInfo),
 		common.Address{'D'},
 		artifacts,
-		0,
 	)
 	require.NoError(t, err)
 
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth_test.go b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
index 98ca7ab6996b..071afe89fdbe 100644
--- a/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
@@ -22,7 +22,6 @@ func TestDeployDelayedWETH(t *testing.T) {
 		testlog.Logger(t, log.LevelInfo),
 		common.Address{'D'},
 		artifacts,
-		0,
 	)
 	require.NoError(t, err)
 
diff --git a/op-deployer/pkg/deployer/opcm/deployOutput_v160.json b/op-deployer/pkg/deployer/opcm/deployOutput_v160.json
deleted file mode 100644
index 888e28a102f8..000000000000
--- a/op-deployer/pkg/deployer/opcm/deployOutput_v160.json
+++ /dev/null
@@ -1,77 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "decodeOutput",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "output",
-        "indexed": false,
-        "type": "tuple",
-        "components": [
-          {
-            "name": "opChainProxyAdmin",
-            "type": "address"
-          },
-          {
-            "name": "addressManager",
-            "type": "address"
-          },
-          {
-            "name": "l1ERC721BridgeProxy",
-            "type": "address"
-          },
-          {
-            "name": "systemConfigProxy",
-            "type": "address"
-          },
-          {
-            "name": "optimismMintableERC20FactoryProxy",
-            "type": "address"
-          },
-          {
-            "name": "l1StandardBridgeProxy",
-            "type": "address"
-          },
-          {
-            "name": "l1CrossDomainMessengerProxy",
-            "type": "address"
-          },
-          {
-            "name": "optimismPortalProxy",
-            "type": "address"
-          },
-          {
-            "name": "disputeGameFactoryProxy",
-            "type": "address"
-          },
-          {
-            "name": "anchorStateRegistryProxy",
-            "type": "address"
-          },
-          {
-            "name": "anchorStateRegistryImpl",
-            "type": "address"
-          },
-          {
-            "name": "faultDisputeGame",
-            "type": "address",
-            "internalType": "contract FaultDisputeGame"
-          },
-          {
-            "name": "permissionedDisputeGame",
-            "type": "address"
-          },
-          {
-            "name": "delayedWETHPermissionedGameProxy",
-            "type": "address"
-          },
-          {
-            "name": "delayedWETHPermissionlessGameProxy",
-            "type": "address"
-          }
-        ]
-      }
-    ]
-  }
-]
\ No newline at end of file
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game_test.go b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
index d31f94f8d83b..f39849be4403 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game_test.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
@@ -21,7 +21,6 @@ func TestDeployDisputeGame(t *testing.T) {
 		testlog.Logger(t, log.LevelInfo),
 		common.Address{'D'},
 		artifacts,
-		0,
 	)
 	require.NoError(t, err)
 
diff --git a/op-deployer/pkg/deployer/opcm/mips_test.go b/op-deployer/pkg/deployer/opcm/mips_test.go
index 04f8d93ae9bd..848b46356525 100644
--- a/op-deployer/pkg/deployer/opcm/mips_test.go
+++ b/op-deployer/pkg/deployer/opcm/mips_test.go
@@ -20,7 +20,6 @@ func TestDeployMIPS(t *testing.T) {
 		testlog.Logger(t, log.LevelInfo),
 		common.Address{'D'},
 		artifacts,
-		0,
 	)
 	require.NoError(t, err)
 
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index 537765ce5154..1e1b468a417f 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -1,22 +1,12 @@
 package opcm
 
 import (
-	"context"
+	_ "embed"
 	"fmt"
 	"math/big"
-	"strings"
-
-	_ "embed"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
-
-	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
-	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/holiman/uint256"
 )
 
 // PermissionedGameStartingAnchorRoots is a root of bytes32(hex"dead") for the permissioned game at block 0,
@@ -25,48 +15,6 @@ var PermissionedGameStartingAnchorRoots = []byte{
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xde, 0xad, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 }
 
-// opcmRolesBase is an internal struct used to pass the roles to OPCM. See opcmDeployInputV160 for more info.
-type opcmRolesBase struct {
-	OpChainProxyAdminOwner common.Address
-	SystemConfigOwner      common.Address
-	Batcher                common.Address
-	UnsafeBlockSigner      common.Address
-	Proposer               common.Address
-	Challenger             common.Address
-}
-
-type opcmDeployInputBase struct {
-	BasefeeScalar           uint32
-	BlobBasefeeScalar       uint32
-	L2ChainId               *big.Int
-	StartingAnchorRoots     []byte
-	SaltMixer               string
-	GasLimit                uint64
-	DisputeGameType         uint32
-	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     *big.Int
-	DisputeSplitDepth       *big.Int
-	DisputeClockExtension   uint64
-	DisputeMaxClockDuration uint64
-}
-
-// opcmDeployInputV160 is the input struct for the deploy method of the OPStackManager contract. We
-// define a separate struct here to match what the OPSM contract expects.
-type opcmDeployInputV160 struct {
-	opcmDeployInputBase
-	Roles opcmRolesBase
-}
-
-type opcmRolesIsthmus struct {
-	opcmRolesBase
-	FeeAdmin common.Address
-}
-
-type opcmDeployInputIsthmus struct {
-	opcmDeployInputBase
-	Roles opcmRolesIsthmus
-}
-
 type DeployOPChainInputV160 struct {
 	OpChainProxyAdminOwner common.Address
 	SystemConfigOwner      common.Address
@@ -99,49 +47,11 @@ func (input *DeployOPChainInputV160) StartingAnchorRoots() []byte {
 	return PermissionedGameStartingAnchorRoots
 }
 
-func DeployOPChainInputV160DeployCalldata(input DeployOPChainInputV160) any {
-	return opcmDeployInputV160{
-		Roles: opcmRolesBase{
-			OpChainProxyAdminOwner: input.OpChainProxyAdminOwner,
-			SystemConfigOwner:      input.SystemConfigOwner,
-			Batcher:                input.Batcher,
-			UnsafeBlockSigner:      input.UnsafeBlockSigner,
-			Proposer:               input.Proposer,
-			Challenger:             input.Challenger,
-		},
-		opcmDeployInputBase: opcmDeployInputBase{
-			BasefeeScalar:           input.BasefeeScalar,
-			BlobBasefeeScalar:       input.BlobBaseFeeScalar,
-			L2ChainId:               input.L2ChainId,
-			StartingAnchorRoots:     input.StartingAnchorRoots(),
-			SaltMixer:               input.SaltMixer,
-			GasLimit:                input.GasLimit,
-			DisputeGameType:         input.DisputeGameType,
-			DisputeAbsolutePrestate: input.DisputeAbsolutePrestate,
-			DisputeMaxGameDepth:     new(big.Int).SetUint64(input.DisputeMaxGameDepth),
-			DisputeSplitDepth:       new(big.Int).SetUint64(input.DisputeSplitDepth),
-			DisputeClockExtension:   input.DisputeClockExtension,
-			DisputeMaxClockDuration: input.DisputeMaxClockDuration,
-		},
-	}
-}
-
 type DeployOPChainInputIsthmus struct {
 	DeployOPChainInputV160
 	SystemConfigFeeAdmin common.Address
 }
 
-func DeployOPChainInputIsthmusDeployCalldata(input DeployOPChainInputIsthmus) any {
-	v160Data := DeployOPChainInputV160DeployCalldata(input.DeployOPChainInputV160).(opcmDeployInputV160)
-	return opcmDeployInputIsthmus{
-		Roles: opcmRolesIsthmus{
-			opcmRolesBase: v160Data.Roles,
-			FeeAdmin:      input.SystemConfigFeeAdmin,
-		},
-		opcmDeployInputBase: v160Data.opcmDeployInputBase,
-	}
-}
-
 type DeployOPChainOutput struct {
 	OpChainProxyAdmin                 common.Address
 	AddressManager                    common.Address
@@ -210,116 +120,58 @@ func deployOPChain[T any](host *script.Host, input T) (DeployOPChainOutput, erro
 	return dco, nil
 }
 
-// decodeOutputABIJSONV160 defines an ABI for a fake method called "decodeOutput" that returns the
-// DeployOutput struct. This allows the code in the deployer to decode directly into a struct
-// using Geth's ABI library.
-//
-//go:embed deployOutput_v160.json
-var decodeOutputABIJSONV160 string
-
-var decodeOutputABIV160 abi.ABI
-
-func DeployOPChainRawV160(
-	ctx context.Context,
-	l1 *ethclient.Client,
-	bcast broadcaster.Broadcaster,
-	deployer common.Address,
-	artifacts foundry.StatDirFs,
-	input DeployOPChainInputV160,
-) (DeployOPChainOutput, error) {
-	return deployOPChainRaw(ctx, l1, bcast, deployer, artifacts, input.OpcmProxy, DeployOPChainInputV160DeployCalldata(input))
+type ReadImplementationAddressesInput struct {
+	DeployOPChainOutput
+	OpcmProxy common.Address
+	Release   string
 }
 
-func DeployOPChainRawIsthmus(
-	ctx context.Context,
-	l1 *ethclient.Client,
-	bcast broadcaster.Broadcaster,
-	deployer common.Address,
-	artifacts foundry.StatDirFs,
-	input DeployOPChainInputIsthmus,
-) (DeployOPChainOutput, error) {
-	return deployOPChainRaw(ctx, l1, bcast, deployer, artifacts, input.OpcmProxy, DeployOPChainInputIsthmusDeployCalldata(input))
+type ReadImplementationAddressesOutput struct {
+	DelayedWETH                  common.Address
+	OptimismPortal               common.Address
+	SystemConfig                 common.Address
+	L1CrossDomainMessenger       common.Address
+	L1ERC721Bridge               common.Address
+	L1StandardBridge             common.Address
+	OptimismMintableERC20Factory common.Address
+	DisputeGameFactory           common.Address
+	MipsSingleton                common.Address
+	PreimageOracleSingleton      common.Address
 }
 
-// DeployOPChainRaw deploys an OP Chain using a raw call to a pre-deployed OPSM contract.
-func deployOPChainRaw(
-	ctx context.Context,
-	l1 *ethclient.Client,
-	bcast broadcaster.Broadcaster,
-	deployer common.Address,
-	artifacts foundry.StatDirFs,
-	opcmProxyAddress common.Address,
-	input any,
-) (DeployOPChainOutput, error) {
-	var out DeployOPChainOutput
+type ReadImplementationAddressesScript struct {
+	Run func(input, output common.Address) error
+}
 
-	artifactsFS := &foundry.ArtifactsFS{FS: artifacts}
-	opcmArtifacts, err := artifactsFS.ReadArtifact("OPContractsManager.sol", "OPContractsManager")
-	if err != nil {
-		return out, fmt.Errorf("failed to read OPStackManager artifact: %w", err)
-	}
+func ReadImplementationAddresses(host *script.Host, input ReadImplementationAddressesInput) (ReadImplementationAddressesOutput, error) {
+	var rio ReadImplementationAddressesOutput
+	inputAddr := host.NewScriptAddress()
+	outputAddr := host.NewScriptAddress()
 
-	opcmABI := opcmArtifacts.ABI
-	calldata, err := opcmABI.Pack("deploy", input)
+	cleanupInput, err := script.WithPrecompileAtAddress[*ReadImplementationAddressesInput](host, inputAddr, &input)
 	if err != nil {
-		return out, fmt.Errorf("failed to pack deploy input: %w", err)
+		return rio, fmt.Errorf("failed to insert ReadImplementationAddressesInput precompile: %w", err)
 	}
+	defer cleanupInput()
+	host.Label(inputAddr, "ReadImplementationAddressesInput")
 
-	nonce, err := l1.NonceAt(ctx, deployer, nil)
+	cleanupOutput, err := script.WithPrecompileAtAddress[*ReadImplementationAddressesOutput](host, outputAddr, &rio,
+		script.WithFieldSetter[*ReadImplementationAddressesOutput])
 	if err != nil {
-		return out, fmt.Errorf("failed to read nonce: %w", err)
+		return rio, fmt.Errorf("failed to insert ReadImplementationAddressesOutput precompile: %w", err)
 	}
+	defer cleanupOutput()
+	host.Label(outputAddr, "ReadImplementationAddressesOutput")
 
-	bcast.Hook(script.Broadcast{
-		From:  deployer,
-		To:    opcmProxyAddress,
-		Input: calldata,
-		Value: (*hexutil.U256)(uint256.NewInt(0)),
-		// use hardcoded 19MM gas for now since this is roughly what we've seen this deployment cost.
-		GasUsed: 19_000_000,
-		Type:    script.BroadcastCall,
-		Nonce:   nonce,
-	})
-
-	results, err := bcast.Broadcast(ctx)
+	deployScript, cleanupDeploy, err := script.WithScript[ReadImplementationAddressesScript](host, "ReadImplementationAddresses.s.sol", "ReadImplementationAddresses")
 	if err != nil {
-		return out, fmt.Errorf("failed to broadcast OP chain deployment: %w", err)
+		return rio, fmt.Errorf("failed to load ReadImplementationAddresses script: %w", err)
 	}
+	defer cleanupDeploy()
 
-	deployedEvent := opcmABI.Events["Deployed"]
-	res := results[0]
-
-	for _, log := range res.Receipt.Logs {
-		if log.Topics[0] != deployedEvent.ID {
-			continue
-		}
-
-		type EventData struct {
-			DeployOutput []byte
-		}
-		var data EventData
-		if err := opcmABI.UnpackIntoInterface(&data, "Deployed", log.Data); err != nil {
-			return out, fmt.Errorf("failed to unpack Deployed event: %w", err)
-		}
-
-		type OutputData struct {
-			Output DeployOPChainOutput
-		}
-		var outData OutputData
-		if err := decodeOutputABIV160.UnpackIntoInterface(&outData, "decodeOutput", data.DeployOutput); err != nil {
-			return out, fmt.Errorf("failed to unpack DeployOutput: %w", err)
-		}
-
-		return outData.Output, nil
+	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+		return rio, fmt.Errorf("failed to run ReadImplementationAddresses script: %w", err)
 	}
 
-	return out, fmt.Errorf("failed to find Deployed event")
-}
-
-func init() {
-	var err error
-	decodeOutputABIV160, err = abi.JSON(strings.NewReader(decodeOutputABIJSONV160))
-	if err != nil {
-		panic(fmt.Sprintf("failed to parse decodeOutput ABI: %v", err))
-	}
+	return rio, nil
 }
diff --git a/op-deployer/pkg/deployer/pipeline/env.go b/op-deployer/pkg/deployer/pipeline/env.go
index 0b6ca536dd8b..20d8daaf76fa 100644
--- a/op-deployer/pkg/deployer/pipeline/env.go
+++ b/op-deployer/pkg/deployer/pipeline/env.go
@@ -23,7 +23,6 @@ type Env struct {
 	L1ScriptHost *script.Host
 	L1Client     *ethclient.Client
 	Broadcaster  broadcaster.Broadcaster
-	Host         *script.Host
 	Deployer     common.Address
 	Logger       log.Logger
 }
diff --git a/op-deployer/pkg/deployer/pipeline/implementations.go b/op-deployer/pkg/deployer/pipeline/implementations.go
index 9da1d4a900a5..47ea91fbe963 100644
--- a/op-deployer/pkg/deployer/pipeline/implementations.go
+++ b/op-deployer/pkg/deployer/pipeline/implementations.go
@@ -58,8 +58,6 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 		return fmt.Errorf("error merging proof params from overrides: %w", err)
 	}
 
-	env.L1ScriptHost.ImportState(st.L1StateDump.Data)
-
 	dio, err := opcm.DeployImplementations(
 		env.L1ScriptHost,
 		opcm.DeployImplementationsInput{
diff --git a/op-deployer/pkg/deployer/pipeline/l2genesis.go b/op-deployer/pkg/deployer/pipeline/l2genesis.go
index a5dabefd8e84..945cb5af8ff0 100644
--- a/op-deployer/pkg/deployer/pipeline/l2genesis.go
+++ b/op-deployer/pkg/deployer/pipeline/l2genesis.go
@@ -3,7 +3,7 @@ package pipeline
 import (
 	"fmt"
 
-	env2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
@@ -13,8 +13,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-func GenerateL2Genesis(env *Env, intent *state.Intent, bundle ArtifactsBundle, st *state.State, chainID common.Hash) error {
-	lgr := env.Logger.New("stage", "generate-l2-genesis")
+func GenerateL2Genesis(pEnv *Env, intent *state.Intent, bundle ArtifactsBundle, st *state.State, chainID common.Hash) error {
+	lgr := pEnv.Logger.New("stage", "generate-l2-genesis")
 
 	thisIntent, err := intent.Chain(chainID)
 	if err != nil {
@@ -38,12 +38,11 @@ func GenerateL2Genesis(env *Env, intent *state.Intent, bundle ArtifactsBundle, s
 		return fmt.Errorf("failed to combine L2 init config: %w", err)
 	}
 
-	host, err := env2.DefaultScriptHost(
+	host, err := env.DefaultScriptHost(
 		broadcaster.NoopBroadcaster(),
-		env.Logger,
-		env.Deployer,
+		pEnv.Logger,
+		pEnv.Deployer,
 		bundle.L2,
-		0,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create L2 script host: %w", err)
@@ -60,7 +59,7 @@ func GenerateL2Genesis(env *Env, intent *state.Intent, bundle ArtifactsBundle, s
 		return fmt.Errorf("failed to call L2Genesis script: %w", err)
 	}
 
-	host.Wipe(env.Deployer)
+	host.Wipe(pEnv.Deployer)
 
 	dump, err := host.StateDump()
 	if err != nil {
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index 59e5d214cf4f..a49848883cea 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -1,25 +1,18 @@
 package pipeline
 
 import (
-	"context"
-	"encoding/hex"
-	"errors"
 	"fmt"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
-
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
 )
 
-func DeployOPChainLiveStrategy(ctx context.Context, env *Env, bundle ArtifactsBundle, intent *state.Intent, st *state.State, chainID common.Hash) error {
-	lgr := env.Logger.New("stage", "deploy-opchain", "strategy", "live")
+func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID common.Hash) error {
+	lgr := env.Logger.New("stage", "deploy-opchain")
 
 	if !shouldDeployOPChain(st, chainID) {
 		lgr.Info("opchain deployment not needed")
@@ -31,6 +24,7 @@ func DeployOPChainLiveStrategy(ctx context.Context, env *Env, bundle ArtifactsBu
 		return fmt.Errorf("failed to get chain intent: %w", err)
 	}
 
+	var opcmAddr common.Address
 	var deployFunc func() (opcm.DeployOPChainOutput, error)
 	switch intent.L1ContractsLocator.Tag {
 	case standard.ContractsV160Tag, standard.ContractsV170Beta1L2Tag:
@@ -40,13 +34,8 @@ func DeployOPChainLiveStrategy(ctx context.Context, env *Env, bundle ArtifactsBu
 				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
 			}
 
-			return opcm.DeployOPChainRawV160(ctx,
-				env.L1Client,
-				env.Broadcaster,
-				env.Deployer,
-				bundle.L1,
-				input,
-			)
+			opcmAddr = input.OpcmProxy
+			return opcm.DeployOPChainV160(env.L1ScriptHost, input)
 		}
 	default:
 		deployFunc = func() (opcm.DeployOPChainOutput, error) {
@@ -55,165 +44,47 @@ func DeployOPChainLiveStrategy(ctx context.Context, env *Env, bundle ArtifactsBu
 				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
 			}
 
-			return opcm.DeployOPChainRawIsthmus(ctx,
-				env.L1Client,
-				env.Broadcaster,
-				env.Deployer,
-				bundle.L1,
-				input,
-			)
+			opcmAddr = input.OpcmProxy
+			return opcm.DeployOPChainIsthmus(env.L1ScriptHost, input)
 		}
 	}
 
 	var dco opcm.DeployOPChainOutput
-	lgr.Info("deploying OP chain using existing OPCM", "id", chainID.Hex(), "opcmAddress", st.ImplementationsDeployment.OpcmProxyAddress.Hex())
+	lgr.Info("deploying OP chain using local allocs", "id", chainID.Hex())
 	dco, err = deployFunc()
 	if err != nil {
 		return fmt.Errorf("error deploying OP chain: %w", err)
 	}
 
 	st.Chains = append(st.Chains, makeChainState(chainID, dco))
-	opcmProxyAddress := st.ImplementationsDeployment.OpcmProxyAddress
-	err = conditionallySetImplementationAddresses(ctx, env.L1Client, intent, st, dco, opcmProxyAddress)
-	if err != nil {
-		return fmt.Errorf("failed to set implementation addresses: %w", err)
-	}
-
-	return nil
-}
-
-// Only try to set the implementation addresses if we reused existing implementations from a release tag.
-// The reason why these addresses could be empty is because only DeployOPChain.s.sol is invoked as part of the pipeline.
-func conditionallySetImplementationAddresses(ctx context.Context, client *ethclient.Client, intent *state.Intent, st *state.State, dco opcm.DeployOPChainOutput, opcmProxyAddress common.Address) error {
-	if !intent.L1ContractsLocator.IsTag() {
-		return nil
-	}
-
-	block, err := client.BlockByNumber(ctx, nil)
-	if err != nil {
-		return fmt.Errorf("failed to get latest block by number: %w", err)
-	}
-	currentBlockHash := block.Hash()
-
-	errCh := make(chan error, 8)
-
-	setImplementationAddressTasks := []func(){
-		func() {
-			setEIP1967ImplementationAddress(ctx, client, errCh, dco.DelayedWETHPermissionedGameProxy, currentBlockHash, &st.ImplementationsDeployment.DelayedWETHImplAddress)
-		},
-		func() {
-			setEIP1967ImplementationAddress(ctx, client, errCh, dco.OptimismPortalProxy, currentBlockHash, &st.ImplementationsDeployment.OptimismPortalImplAddress)
-		},
-		func() {
-			setEIP1967ImplementationAddress(ctx, client, errCh, dco.SystemConfigProxy, currentBlockHash, &st.ImplementationsDeployment.SystemConfigImplAddress)
-		},
-		func() {
-			setRDPImplementationAddress(ctx, client, errCh, dco.AddressManager, &st.ImplementationsDeployment.L1CrossDomainMessengerImplAddress, "OVM_L1CrossDomainMessenger")
-		},
-		func() {
-			setEIP1967ImplementationAddress(ctx, client, errCh, dco.L1ERC721BridgeProxy, currentBlockHash, &st.ImplementationsDeployment.L1ERC721BridgeImplAddress)
-		},
-		func() {
-			setEIP1967ImplementationAddress(ctx, client, errCh, dco.L1StandardBridgeProxy, currentBlockHash, &st.ImplementationsDeployment.L1StandardBridgeImplAddress)
-		},
-		func() {
-			setEIP1967ImplementationAddress(ctx, client, errCh, dco.OptimismMintableERC20FactoryProxy, currentBlockHash, &st.ImplementationsDeployment.OptimismMintableERC20FactoryImplAddress)
-		},
-		func() {
-			setEIP1967ImplementationAddress(ctx, client, errCh, dco.DisputeGameFactoryProxy, currentBlockHash, &st.ImplementationsDeployment.DisputeGameFactoryImplAddress)
-		},
-		func() {
-			setMipsSingletonAddress(ctx, client, intent.L1ContractsLocator, errCh, opcmProxyAddress, &st.ImplementationsDeployment.MipsSingletonAddress)
-			setPreimageOracleAddress(ctx, client, errCh, st.ImplementationsDeployment.MipsSingletonAddress, &st.ImplementationsDeployment.PreimageOracleSingletonAddress)
-		},
-	}
-
-	for _, task := range setImplementationAddressTasks {
-		go task()
-	}
-
-	var lastTaskErr error
-	for i := 0; i < len(setImplementationAddressTasks); i++ {
-		taskErr := <-errCh
-		if taskErr != nil {
-			lastTaskErr = taskErr
-		}
-	}
-	if lastTaskErr != nil {
-		return fmt.Errorf("failed to set implementation addresses: %w", lastTaskErr)
-	}
-
-	return nil
-}
-
-func setMipsSingletonAddress(ctx context.Context, client *ethclient.Client, l1ArtifactsLocator *artifacts.Locator, errCh chan error, opcmProxyAddress common.Address, singletonAddress *common.Address) {
-	if !l1ArtifactsLocator.IsTag() {
-		errCh <- errors.New("L1 contracts locator is not a tag, cannot set MIPS singleton address")
-		return
-	}
-	opcmContract := opcm.NewContract(opcmProxyAddress, client)
-	mipsSingletonAddress, err := opcmContract.GetOPCMImplementationAddress(ctx, l1ArtifactsLocator.Tag, "MIPS")
-
-	if err == nil {
-		*singletonAddress = mipsSingletonAddress
-	}
-	errCh <- err
-}
-
-func setPreimageOracleAddress(ctx context.Context, client *ethclient.Client, errCh chan error, mipsSingletonAddress common.Address, preimageOracleAddress *common.Address) {
-	opcmContract := opcm.NewContract(mipsSingletonAddress, client)
-	preimageOracle, err := opcmContract.GenericAddressGetter(ctx, "oracle")
-	if err == nil {
-		*preimageOracleAddress = preimageOracle
-	}
-	errCh <- err
-}
-
-func DeployOPChainGenesisStrategy(env *Env, intent *state.Intent, st *state.State, chainID common.Hash) error {
-	lgr := env.Logger.New("stage", "deploy-opchain", "strategy", "genesis")
 
-	if !shouldDeployOPChain(st, chainID) {
-		lgr.Info("opchain deployment not needed")
-		return nil
+	var release string
+	if intent.L1ContractsLocator.IsTag() {
+		release = intent.L1ContractsLocator.Tag
+	} else {
+		release = "dev"
 	}
 
-	thisIntent, err := intent.Chain(chainID)
-	if err != nil {
-		return fmt.Errorf("failed to get chain intent: %w", err)
+	readInput := opcm.ReadImplementationAddressesInput{
+		DeployOPChainOutput: dco,
+		OpcmProxy:           opcmAddr,
+		Release:             release,
 	}
-
-	var deployFunc func() (opcm.DeployOPChainOutput, error)
-	switch intent.L1ContractsLocator.Tag {
-	case standard.ContractsV160Tag, standard.ContractsV170Beta1L2Tag:
-		deployFunc = func() (opcm.DeployOPChainOutput, error) {
-			input, err := makeDCIV160(intent, thisIntent, chainID, st)
-			if err != nil {
-				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
-			}
-
-			return opcm.DeployOPChainV160(env.L1ScriptHost, input)
-		}
-	default:
-		deployFunc = func() (opcm.DeployOPChainOutput, error) {
-			input, err := makeDCIIsthmus(intent, thisIntent, chainID, st)
-			if err != nil {
-				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
-			}
-
-			return opcm.DeployOPChainIsthmus(env.L1ScriptHost, input)
-		}
-	}
-
-	env.L1ScriptHost.ImportState(st.L1StateDump.Data)
-
-	var dco opcm.DeployOPChainOutput
-	lgr.Info("deploying OP chain using local allocs", "id", chainID.Hex())
-	dco, err = deployFunc()
+	impls, err := opcm.ReadImplementationAddresses(env.L1ScriptHost, readInput)
 	if err != nil {
-		return fmt.Errorf("error deploying OP chain: %w", err)
+		return fmt.Errorf("failed to read implementation addresses: %w", err)
 	}
 
-	st.Chains = append(st.Chains, makeChainState(chainID, dco))
+	st.ImplementationsDeployment.DelayedWETHImplAddress = impls.DelayedWETH
+	st.ImplementationsDeployment.OptimismPortalImplAddress = impls.OptimismPortal
+	st.ImplementationsDeployment.SystemConfigImplAddress = impls.SystemConfig
+	st.ImplementationsDeployment.L1CrossDomainMessengerImplAddress = impls.L1CrossDomainMessenger
+	st.ImplementationsDeployment.L1ERC721BridgeImplAddress = impls.L1ERC721Bridge
+	st.ImplementationsDeployment.L1StandardBridgeImplAddress = impls.L1StandardBridge
+	st.ImplementationsDeployment.OptimismMintableERC20FactoryImplAddress = impls.OptimismMintableERC20Factory
+	st.ImplementationsDeployment.DisputeGameFactoryImplAddress = impls.DisputeGameFactory
+	st.ImplementationsDeployment.MipsSingletonAddress = impls.MipsSingleton
+	st.ImplementationsDeployment.PreimageOracleSingletonAddress = impls.PreimageOracleSingleton
 
 	return nil
 }
@@ -301,33 +172,6 @@ func makeChainState(chainID common.Hash, dco opcm.DeployOPChainOutput) *state.Ch
 	}
 }
 
-func setRDPImplementationAddress(ctx context.Context, client *ethclient.Client, errCh chan error, addressManager common.Address, implAddress *common.Address, getNameArg string) {
-	if *implAddress != (common.Address{}) {
-		errCh <- nil
-		return
-	}
-
-	addressManagerContract := opcm.NewContract(addressManager, client)
-	address, err := addressManagerContract.GetAddressByNameViaAddressManager(ctx, getNameArg)
-	if err == nil {
-		*implAddress = address
-	}
-	errCh <- err
-}
-
-func setEIP1967ImplementationAddress(ctx context.Context, client *ethclient.Client, errCh chan error, proxy common.Address, currentBlockHash common.Hash, implAddress *common.Address) {
-	if *implAddress != (common.Address{}) {
-		errCh <- nil
-		return
-	}
-
-	storageValue, err := client.StorageAtHash(ctx, proxy, genesis.ImplementationSlot, currentBlockHash)
-	if err == nil {
-		*implAddress = common.HexToAddress(hex.EncodeToString(storageValue))
-	}
-	errCh <- err
-}
-
 func shouldDeployOPChain(st *state.State, chainID common.Hash) bool {
 	for _, chain := range st.Chains {
 		if chain.ID == chainID {
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 78144ca1a7bf..2fb6de8c5bf7 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -172,7 +172,7 @@ func SystemOwnerAddrFor(chainID uint64) (common.Address, error) {
 func ArtifactsURLForTag(tag string) (*url.URL, error) {
 	switch tag {
 	case "op-contracts/v1.6.0":
-		return url.Parse(standardArtifactsURL("ee07c78c3d8d4cd8f7a933c050f5afeebaa281b57b226cc6f092b19de2a8d61f"))
+		return url.Parse(standardArtifactsURL("3a27c6dc0cb61b36feaac26def98c64b4a48ec8f5c5ba6965e8ae3157606043c"))
 	case "op-contracts/v1.7.0-beta.1+l2-contracts":
 		return url.Parse(standardArtifactsURL("b0fb1f6f674519d637cff39a22187a5993d7f81a6d7b7be6507a0b50a5e38597"))
 	default:
diff --git a/op-deployer/pkg/env/host.go b/op-deployer/pkg/env/host.go
index 04a0c4a172d6..61d30b4ce253 100644
--- a/op-deployer/pkg/env/host.go
+++ b/op-deployer/pkg/env/host.go
@@ -16,7 +16,7 @@ func DefaultScriptHost(
 	lgr log.Logger,
 	deployer common.Address,
 	artifacts foundry.StatDirFs,
-	startingNonce uint64,
+	additionalOpts ...script.HostOption,
 ) (*script.Host, error) {
 	scriptCtx := script.DefaultContext
 	scriptCtx.Sender = deployer
@@ -26,16 +26,16 @@ func DefaultScriptHost(
 		&foundry.ArtifactsFS{FS: artifacts},
 		nil,
 		scriptCtx,
-		script.WithBroadcastHook(bcaster.Hook),
-		script.WithIsolatedBroadcasts(),
-		script.WithCreate2Deployer(),
+		append([]script.HostOption{
+			script.WithBroadcastHook(bcaster.Hook),
+			script.WithIsolatedBroadcasts(),
+			script.WithCreate2Deployer(),
+		}, additionalOpts...)...,
 	)
 
 	if err := h.EnableCheats(); err != nil {
 		return nil, fmt.Errorf("failed to enable cheats: %w", err)
 	}
 
-	h.SetNonce(deployer, startingNonce)
-
 	return h, nil
 }
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
index 7a5d1f5cc6b2..eb3b346452e9 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
@@ -235,7 +235,7 @@ contract DeployOPChainOutput is BaseDeployIO {
     IDelayedWETH internal _delayedWETHPermissionedGameProxy;
     IDelayedWETH internal _delayedWETHPermissionlessGameProxy;
 
-    function set(bytes4 _sel, address _addr) public {
+    function set(bytes4 _sel, address _addr) public virtual {
         require(_addr != address(0), "DeployOPChainOutput: cannot set zero address");
         // forgefmt: disable-start
         if (_sel == this.opChainProxyAdmin.selector) _opChainProxyAdmin = IProxyAdmin(_addr) ;
diff --git a/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol b/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
new file mode 100644
index 000000000000..3992cf1cb657
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { Script } from "forge-std/Script.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+import { DeployOPChainOutput } from "scripts/deploy/DeployOPChain.s.sol";
+import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
+import { OPContractsManager } from "src/L1/OPContractsManager.sol";
+import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
+import { IStaticL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
+
+contract ReadImplementationAddressesInput is DeployOPChainOutput {
+    OPContractsManager internal _opcmProxy;
+    string internal _release;
+
+    function set(bytes4 _sel, address _addr) public override {
+        require(_addr != address(0), "ReadImplementationAddressesInput: cannot set zero address");
+        if (_sel == this.opcmProxy.selector) _opcmProxy = OPContractsManager(_addr);
+        else if (_sel == this.addressManager.selector) _addressManager = IAddressManager(_addr);
+        else super.set(_sel, _addr);
+    }
+
+    function set(bytes4 _sel, string memory _val) public {
+        if (_sel == this.release.selector) _release = _val;
+        else revert("ReadImplementationAddressesInput: unknown selector");
+    }
+
+    function opcmProxy() public view returns (OPContractsManager) {
+        DeployUtils.assertValidContractAddress(address(_opcmProxy));
+        return _opcmProxy;
+    }
+
+    function release() public view returns (string memory) {
+        require(bytes(_release).length != 0, "ReadImplementationAddressesInput: release not set");
+        return _release;
+    }
+}
+
+contract ReadImplementationAddressesOutput is BaseDeployIO {
+    address internal _delayedWETH;
+    address internal _optimismPortal;
+    address internal _systemConfig;
+    address internal _l1CrossDomainMessenger;
+    address internal _l1ERC721Bridge;
+    address internal _l1StandardBridge;
+    address internal _optimismMintableERC20Factory;
+    address internal _disputeGameFactory;
+    address internal _mipsSingleton;
+    address internal _preimageOracleSingleton;
+
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "ReadImplementationAddressesOutput: cannot set zero address");
+        if (_sel == this.delayedWETH.selector) _delayedWETH = _addr;
+        else if (_sel == this.optimismPortal.selector) _optimismPortal = _addr;
+        else if (_sel == this.systemConfig.selector) _systemConfig = _addr;
+        else if (_sel == this.l1CrossDomainMessenger.selector) _l1CrossDomainMessenger = _addr;
+        else if (_sel == this.l1ERC721Bridge.selector) _l1ERC721Bridge = _addr;
+        else if (_sel == this.l1StandardBridge.selector) _l1StandardBridge = _addr;
+        else if (_sel == this.optimismMintableERC20Factory.selector) _optimismMintableERC20Factory = _addr;
+        else if (_sel == this.disputeGameFactory.selector) _disputeGameFactory = _addr;
+        else if (_sel == this.mipsSingleton.selector) _mipsSingleton = _addr;
+        else if (_sel == this.preimageOracleSingleton.selector) _preimageOracleSingleton = _addr;
+        else revert("ReadImplementationAddressesOutput: unknown selector");
+    }
+
+    function delayedWETH() public view returns (address) {
+        require(_delayedWETH != address(0), "ReadImplementationAddressesOutput: delayedWETH not set");
+        return _delayedWETH;
+    }
+
+    function optimismPortal() public view returns (address) {
+        require(_optimismPortal != address(0), "ReadImplementationAddressesOutput: optimismPortal not set");
+        return _optimismPortal;
+    }
+
+    function systemConfig() public view returns (address) {
+        require(_systemConfig != address(0), "ReadImplementationAddressesOutput: systemConfig not set");
+        return _systemConfig;
+    }
+
+    function l1CrossDomainMessenger() public view returns (address) {
+        require(
+            _l1CrossDomainMessenger != address(0), "ReadImplementationAddressesOutput: l1CrossDomainMessenger not set"
+        );
+        return _l1CrossDomainMessenger;
+    }
+
+    function l1ERC721Bridge() public view returns (address) {
+        require(_l1ERC721Bridge != address(0), "ReadImplementationAddressesOutput: l1ERC721Bridge not set");
+        return _l1ERC721Bridge;
+    }
+
+    function l1StandardBridge() public view returns (address) {
+        require(_l1StandardBridge != address(0), "ReadImplementationAddressesOutput: l1StandardBridge not set");
+        return _l1StandardBridge;
+    }
+
+    function optimismMintableERC20Factory() public view returns (address) {
+        require(
+            _optimismMintableERC20Factory != address(0),
+            "ReadImplementationAddressesOutput: optimismMintableERC20Factory not set"
+        );
+        return _optimismMintableERC20Factory;
+    }
+
+    function disputeGameFactory() public view returns (address) {
+        require(_disputeGameFactory != address(0), "ReadImplementationAddressesOutput: disputeGameFactory not set");
+        return _disputeGameFactory;
+    }
+
+    function mipsSingleton() public view returns (address) {
+        require(_mipsSingleton != address(0), "ReadImplementationAddressesOutput: mipsSingleton not set");
+        return _mipsSingleton;
+    }
+
+    function preimageOracleSingleton() public view returns (address) {
+        require(
+            _preimageOracleSingleton != address(0), "ReadImplementationAddressesOutput: preimageOracleSingleton not set"
+        );
+        return _preimageOracleSingleton;
+    }
+}
+
+contract ReadImplementationAddresses is Script {
+    function run(ReadImplementationAddressesInput _rii, ReadImplementationAddressesOutput _rio) public {
+        address[6] memory eip1967Proxies = [
+            address(_rii.delayedWETHPermissionedGameProxy()),
+            address(_rii.optimismPortalProxy()),
+            address(_rii.systemConfigProxy()),
+            address(_rii.l1ERC721BridgeProxy()),
+            address(_rii.optimismMintableERC20FactoryProxy()),
+            address(_rii.disputeGameFactoryProxy())
+        ];
+
+        bytes4[6] memory sels = [
+            _rio.delayedWETH.selector,
+            _rio.optimismPortal.selector,
+            _rio.systemConfig.selector,
+            _rio.l1ERC721Bridge.selector,
+            _rio.optimismMintableERC20Factory.selector,
+            _rio.disputeGameFactory.selector
+        ];
+
+        for (uint256 i = 0; i < eip1967Proxies.length; i++) {
+            IProxy proxy = IProxy(payable(eip1967Proxies[i]));
+            vm.prank(address(0));
+            _rio.set(sels[i], proxy.implementation());
+        }
+
+        vm.prank(address(0));
+        address l1SBImpl = IStaticL1ChugSplashProxy(address(_rii.l1StandardBridgeProxy())).getImplementation();
+        vm.prank(address(0));
+        _rio.set(_rio.l1StandardBridge.selector, l1SBImpl);
+
+        (address mipsLogic,) = _rii.opcmProxy().implementations(_rii.release(), "MIPS");
+        _rio.set(_rio.mipsSingleton.selector, mipsLogic);
+
+        IAddressManager am = _rii.addressManager();
+        _rio.set(_rio.l1CrossDomainMessenger.selector, am.getAddress("OVM_L1CrossDomainMessenger"));
+
+        address preimageOracle = address(IMIPS(mipsLogic).oracle());
+        _rio.set(_rio.preimageOracleSingleton.selector, preimageOracle);
+    }
+}
diff --git a/packages/contracts-bedrock/scripts/ops/publish-artifacts.sh b/packages/contracts-bedrock/scripts/ops/publish-artifacts.sh
index 720e71ad9720..9e04ea8d0fdc 100644
--- a/packages/contracts-bedrock/scripts/ops/publish-artifacts.sh
+++ b/packages/contracts-bedrock/scripts/ops/publish-artifacts.sh
@@ -44,7 +44,11 @@ else
   tar="tar"
 fi
 
-"$tar" -czf "$archive_name" artifacts forge-artifacts cache
+rm -f COMMIT
+commit=$(git rev-parse HEAD)
+echo "$commit" > COMMIT
+
+"$tar" -czf "$archive_name" artifacts forge-artifacts cache COMMIT
 du -sh "$archive_name" | awk '{$1=$1};1' # trim leading whitespace
 echoerr "> Done."
 
@@ -52,4 +56,5 @@ echoerr "> Uploading artifacts to GCS..."
 gcloud storage cp "$archive_name" "gs://$DEPLOY_BUCKET/$archive_name"
 echoerr "> Done."
 
-rm "$archive_name"
\ No newline at end of file
+rm "$archive_name"
+rm COMMIT
\ No newline at end of file

From 2fecdde0d8ee5ef549a80ff47c679961dc82e4f9 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Fri, 15 Nov 2024 00:21:03 -0500
Subject: [PATCH 180/451] feat(ctb): Holocene upgrade package (#12878)

* feat(ctb): Holocene upgrade package

* lint

* lint

* add example env to sc-ops task

* fix

* reuse `SystemConfig` and `MIPS` impls optionally

* optionally deploy a new `DelayedWETH` proxy + impl

add check

* env lint

* add docker image to docker tag service

* kelvin idiot-proofing ask

* fetch standard config addresses for Holocene

* lint

* ajsutton review: Deploy separate DelayedWETH proxies for the FDG/PDG

* ajsutton review: Conditional FDG usage

* use contracts rc tag

* mds review

* split `SystemConfig` and proofs contracts upgrades

* add option to completely disclude the fault proof contracts

fix

* Update README

* verify

* deploy config

* fix contract tag

* README update

* semgrep
---
 docker-bake.hcl                               |  11 +
 ops/scripts/ci-docker-tag-op-stack-release.sh |   2 +-
 .../deploy-config/sepolia-devnet-0.json       |   2 +-
 .../scripts/upgrades/holocene/.env.example    |  93 +++++
 .../scripts/upgrades/holocene/.gitignore      |   2 +
 .../upgrades/holocene/DeployUpgrade.s.sol     | 337 ++++++++++++++++++
 .../scripts/upgrades/holocene/README.md       |  41 +++
 .../scripts/upgrades/holocene/justfile        |  26 ++
 .../upgrades/holocene/scripts/common.sh       | 131 +++++++
 .../upgrades/holocene/scripts/deploy.sh       |  46 +++
 .../scripts/upgrades/holocene/scripts/main.sh | 152 ++++++++
 .../holocene/scripts/proofs-bundle.sh         |  54 +++
 .../holocene/scripts/sc-ops-proofs.sh         |  47 +++
 .../holocene/scripts/sc-ops-sys-cfg.sh        |  38 ++
 .../holocene/scripts/sys-cfg-bundle.sh        |  35 ++
 .../templates/fdg_bundle_extension.json       |  29 ++
 .../proof_upgrade_bundle_template.json        |  38 ++
 .../templates/proofs-sc-ops-task/.env.example |   6 +
 .../templates/proofs-sc-ops-task/README.md    |  46 +++
 .../proofs-sc-ops-task/VALIDATION.md          |  24 ++
 .../sys-cfg-sc-ops-task/.env.example          |   6 +
 .../templates/sys-cfg-sc-ops-task/README.md   |  42 +++
 .../sys-cfg-sc-ops-task/VALIDATION.md         |  19 +
 .../sys_cfg_upgrade_bundle_template.json      |  38 ++
 .../upgrades/holocene/upgrade.dockerfile      |  62 ++++
 25 files changed, 1325 insertions(+), 2 deletions(-)
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/README.md
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/justfile
 create mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh
 create mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh
 create mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
 create mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
 create mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
 create mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
 create mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json
 create mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 5f7f311cefe4..b53c7add0f87 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -214,6 +214,17 @@ target "proofs-tools" {
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/proofs-tools:${tag}"]
 }
 
+target "holocene-deployer" {
+  dockerfile = "./packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile"
+  context = "./packages/contracts-bedrock/scripts/upgrades/holocene"
+  args = {
+    REV = "op-contracts/v1.8.0-rc.1"
+  }
+  target="holocene-deployer"
+  platforms = split(",", PLATFORMS)
+  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/holocene-deployer:${tag}"]
+}
+
 target "ci-builder" {
   dockerfile = "./ops/docker/ci-builder/Dockerfile"
   context = "."
diff --git a/ops/scripts/ci-docker-tag-op-stack-release.sh b/ops/scripts/ci-docker-tag-op-stack-release.sh
index 45dd92094994..1de86b749d32 100755
--- a/ops/scripts/ci-docker-tag-op-stack-release.sh
+++ b/ops/scripts/ci-docker-tag-op-stack-release.sh
@@ -6,7 +6,7 @@ DOCKER_REPO=$1
 GIT_TAG=$2
 GIT_SHA=$3
 
-IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder(-rust)?|da-server|proofs-tools|cannon|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true)
+IMAGE_NAME=$(echo "$GIT_TAG" | grep -Eow '^(ci-builder(-rust)?|da-server|proofs-tools|holocene-deployer|cannon|ufm-[a-z0-9\-]*|op-[a-z0-9\-]*)' || true)
 if [ -z "$IMAGE_NAME" ]; then
   echo "image name could not be parsed from git tag '$GIT_TAG'"
   exit 1
diff --git a/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json b/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json
index ff87fc4f8cbb..4239d10c3d07 100644
--- a/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json
+++ b/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json
@@ -65,7 +65,7 @@
   "eip1559Denominator": 250,
   "eip1559DenominatorCanyon": 250,
   "systemConfigStartBlock": 4071248,
-  "faultGameAbsolutePrestate": "0x0385c3f8ee78491001d92b90b07d0cf387b7b52ab9b83b4d87c994e92cf823ba",
+  "faultGameAbsolutePrestate": "0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe",
   "faultGameMaxDepth": 73,
   "faultGameClockExtension": 3600,
   "faultGameMaxClockDuration": 14400,
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example b/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
new file mode 100644
index 000000000000..02d67a4bad06
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
@@ -0,0 +1,93 @@
+##############################################
+#               ↓  Required  ↓               #
+##############################################
+
+# The network to deploy the contracts to.
+# Must be one of 'mainnet', 'sepolia'
+NETWORK=
+
+# Etherscan API key used to verify contract bytecode
+ETHERSCAN_API_KEY=
+
+# RPC URL for the L1 network that matches $NETWORK
+ETH_RPC_URL=
+
+# Private key used to deploy the new contracts for this upgrade
+PRIVATE_KEY=
+
+# Path to the deploy config JSON file
+DEPLOY_CONFIG_PATH=
+
+# Path to the folder where output artifacts will be stored
+OUTPUT_FOLDER_PATH=
+
+# Address of deployed `PreimageOracle` contract.
+PREIMAGE_ORACLE_ADDR=
+
+# Address of deployed `AnchorStateRegistry` proxy contract.
+ANCHOR_STATE_REGISTRY_PROXY_ADDR=
+
+# Address of the `SuperchainConfig` proxy contract.
+SUPERCHAIN_CONFIG_PROXY_ADDR=
+
+# Address of deployed `ProxyAdmin` contract.
+PROXY_ADMIN_ADDR=
+
+# Address of deployed `SystemConfig` proxy contract.
+SYSTEM_CONFIG_PROXY_ADDR=
+
+# Address of deployed `DisputeGameFactory` proxy contract.
+DISPUTE_GAME_FACTORY_PROXY_ADDR=
+
+# Whether or not to deploy and include any fault proof contracts in the upgrade.
+#
+# If 'true', the `PermissionedDisputeGame` contract will be deployed and included in the upgrade.
+# If 'false', the `PermissionedDisputeGame` contract will not be deployed or included in the upgrade.
+#
+# Must be one of 'true', 'false'
+# Cannot be 'false' if `USE_PERMISSIONLESS_FAULT_PROOFS` is 'true'
+USE_FAULT_PROOFS=true
+
+# Whether or not to deploy and include the `FaultDisputeGame` contract in the upgrade.
+#
+# If 'true', the `FaultDisputeGame` contract will be deployed and included in the upgrade.
+# If 'false', the `FaultDisputeGame` contract will not be deployed or included in the upgrade.
+#
+# Must be one of 'true', 'false'
+# Cannot be 'true' if `USE_FAULT_PROOFS` is 'false'
+USE_PERMISSIONLESS_FAULT_PROOFS=true
+
+###################################################
+#                 ↓  Optional  ↓                  #
+# Do not set if you don't know what you're doing. #
+###################################################
+
+# Address of the deployed `SystemConfig` implementation for Holocene.
+#
+# This implementation is reused across L2 deployments based on the L1 @ `ETH_RPC_URL`.
+# If you are not the first to deploy Holocene on this L1, this field should be set to
+# the existing deployment address.
+#
+# If this field is not set, the `superchain-registry` will be consulted for the implementation address.
+# If this field is set to the zero address, a new `SystemConfig` implementation will be deployed.
+SYSTEM_CONFIG_IMPL_ADDR=
+
+# Address of the deployed `MIPS` implementation for Holocene.
+#
+# This implementation is reused across L2 deployments based on the L1 @ `ETH_RPC_URL`.
+# If you are not the first to deploy Holocene on this L1, this field should be set to
+# the existing deployment address.
+#
+# If this field is not set, the `superchain-registry` will be consulted for the implementation address.
+# If this field is set to the zero address, a new `MIPS` implementation will be deployed.
+MIPS_IMPL_ADDR=
+
+# Address of deployed `DelayedWETH` implementation contract.
+#
+# This implementation is reused across L2 deployments based on the L1 @ `ETH_RPC_URL`.
+# If you are not the first to deploy permissionless fault proofs on L1, this field should be
+# set to the existing deployment address.
+#
+# If this field is not set, the `superchain-registry` will be consulted for the implementation address.
+# If this field is set to the zero address, a new `DelayedWETH` implementation will be deployed.
+DELAYED_WETH_IMPL_ADDR=
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore b/packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore
new file mode 100644
index 000000000000..442ed87d9304
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore
@@ -0,0 +1,2 @@
+# Environment
+.env
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol b/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
new file mode 100644
index 000000000000..8203e42b060c
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
@@ -0,0 +1,337 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+// Forge
+import { console2 as console } from "forge-std/console2.sol";
+
+// Scripts
+import { Deployer } from "scripts/deploy/Deployer.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+// Utils
+import { Claim, GameTypes, Duration } from "src/dispute/lib/Types.sol";
+
+// Interfaces
+import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import {
+    IFaultDisputeGame,
+    IBigStepper,
+    IAnchorStateRegistry,
+    IDelayedWETH
+} from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
+import { IMIPS, IPreimageOracle } from "src/cannon/interfaces/IMIPS.sol";
+
+/// @title DeployUpgrade
+/// @notice A deployment script for smart contract upgrades surrounding the Holocene hardfork.
+contract DeployUpgrade is Deployer {
+    /// @dev The entrypoint to the deployment script.
+    function deploy(
+        address _proxyAdmin,
+        address _superchainConfig,
+        address _systemConfigImpl,
+        address _mipsImpl,
+        address _delayedWETH,
+        address _preimageOracle,
+        address _anchorStateRegistry,
+        bool _useFaultProofs,
+        bool _usePermissionlessFaultProofs
+    )
+        public
+    {
+        // Shim the existing contracts that this upgrade is dependent on.
+        shim({
+            _proxyAdmin: _proxyAdmin,
+            _superchainConfig: _superchainConfig,
+            _systemConfigImpl: _systemConfigImpl,
+            _mipsImpl: _mipsImpl,
+            _delayedWETH: _delayedWETH,
+            _preimageOracle: _preimageOracle,
+            _anchorStateRegistry: _anchorStateRegistry
+        });
+
+        // Deploy conditional implementations.
+        if (_systemConfigImpl == address(0)) deploySystemConfigImplementation();
+
+        if (_useFaultProofs) {
+            if (_mipsImpl == address(0)) deployMIPSImplementation();
+            if (_delayedWETH == address(0)) deployDelayedWETH();
+
+            // Deploy:
+            // 1. New `DelayedWETH` proxy contracts for the `FaultDisputeGame` and `PermissionedDisputeGame`.
+            // 2. New `FaultDisputeGame` and `PermissionedDisputeGame` implementation contracts.
+            deployDelayedWETHProxy("PDG");
+            deployPermissionedDisputeGameImplementation();
+            if (_usePermissionlessFaultProofs) {
+                deployDelayedWETHProxy("FDG");
+                deployFaultDisputeGameImplementation();
+            }
+
+            // Run deployment checks.
+            checkMIPS();
+            checkPermissionedDisputeGame();
+            checkDelayedWETH("PDG");
+            if (_usePermissionlessFaultProofs) {
+                checkFaultDisputeGame();
+                checkDelayedWETH("FDG");
+            }
+        }
+
+        // Print the deployment summary.
+        printSummary();
+    }
+
+    /// @dev Shims the existing contracts that this upgrade is dependent on.
+    function shim(
+        address _proxyAdmin,
+        address _superchainConfig,
+        address _systemConfigImpl,
+        address _mipsImpl,
+        address _delayedWETH,
+        address _preimageOracle,
+        address _anchorStateRegistry
+    )
+        public
+    {
+        prankDeployment("ProxyAdmin", _proxyAdmin);
+        prankDeployment("SuperchainConfig", _superchainConfig);
+        if (_systemConfigImpl != address(0)) prankDeployment("SystemConfig", _systemConfigImpl);
+        if (_mipsImpl != address(0)) prankDeployment("MIPS", _mipsImpl);
+        if (_delayedWETH != address(0)) prankDeployment("DelayedWETH", _delayedWETH);
+        prankDeployment("PreimageOracle", _preimageOracle);
+        prankDeployment("AnchorStateRegistry", _anchorStateRegistry);
+    }
+
+    /// @dev Deploys the Holocene `SystemConfig` implementation contract.
+    function deploySystemConfigImplementation() public {
+        vm.broadcast(msg.sender);
+        address systemConfig = DeployUtils.create1(
+            "SystemConfig", DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfig.__constructor__, ()))
+        );
+        save("SystemConfig", systemConfig);
+    }
+
+    /// @dev Deploys the new `MIPS` implementation contract.
+    function deployMIPSImplementation() public {
+        vm.broadcast(msg.sender);
+        address mips = DeployUtils.create1({
+            _name: "MIPS",
+            _args: DeployUtils.encodeConstructor(
+                abi.encodeCall(IMIPS.__constructor__, (IPreimageOracle(mustGetAddress("PreimageOracle"))))
+            )
+        });
+        save("MIPS", mips);
+    }
+
+    /// @dev Checks if the `MIPS` contract is correctly configured.
+    function checkMIPS() public view {
+        IMIPS mips = IMIPS(mustGetAddress("MIPS"));
+        require(
+            address(mips.oracle()) == mustGetAddress("PreimageOracle"), "DeployHoloceneUpgrade: invalid MIPS oracle"
+        );
+    }
+
+    /// @dev Deploys the Holocene `FaultDisputeGame` implementation contract.
+    function deployFaultDisputeGameImplementation() public {
+        bytes memory constructorInput = abi.encodeCall(
+            IFaultDisputeGame.__constructor__,
+            (
+                GameTypes.CANNON,
+                Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
+                cfg.faultGameMaxDepth(),
+                cfg.faultGameSplitDepth(),
+                Duration.wrap(uint64(cfg.faultGameClockExtension())),
+                Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
+                IBigStepper(mustGetAddress("MIPS")),
+                IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyFDG"))),
+                IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
+                cfg.l2ChainID()
+            )
+        );
+
+        vm.broadcast(msg.sender);
+        address fdg = DeployUtils.create1("FaultDisputeGame", DeployUtils.encodeConstructor(constructorInput));
+        save("FaultDisputeGame", fdg);
+    }
+
+    /// @dev Checks if the `FaultDisputeGame` contract is correctly configured.
+    function checkFaultDisputeGame() public view {
+        IFaultDisputeGame fdg = IFaultDisputeGame(mustGetAddress("FaultDisputeGame"));
+        require(
+            fdg.gameType().raw() == GameTypes.CANNON.raw(), "DeployHoloceneUpgrade: invalid FaultDisputeGame gameType"
+        );
+        require(
+            fdg.absolutePrestate().raw() == bytes32(cfg.faultGameAbsolutePrestate()),
+            "DeployHoloceneUpgrade: invalid FaultDisputeGame absolutePrestate"
+        );
+        require(
+            fdg.maxGameDepth() == cfg.faultGameMaxDepth(), "DeployHoloceneUpgrade: invalid FaultDisputeGame maxDepth"
+        );
+        require(
+            fdg.splitDepth() == cfg.faultGameSplitDepth(), "DeployHoloceneUpgrade: invalid FaultDisputeGame splitDepth"
+        );
+        require(
+            fdg.clockExtension().raw() == cfg.faultGameClockExtension(),
+            "DeployHoloceneUpgrade: invalid FaultDisputeGame clockExtension"
+        );
+        require(
+            fdg.maxClockDuration().raw() == cfg.faultGameMaxClockDuration(),
+            "DeployHoloceneUpgrade: invalid FaultDisputeGame maxClockDuration"
+        );
+        require(address(fdg.vm()) == mustGetAddress("MIPS"), "DeployHoloceneUpgrade: invalid FaultDisputeGame MIPS");
+        require(
+            address(fdg.weth()) == mustGetAddress("DelayedWETHProxyFDG"),
+            "DeployHoloceneUpgrade: invalid FaultDisputeGame DelayedWETH"
+        );
+        require(
+            address(fdg.anchorStateRegistry()) == mustGetAddress("AnchorStateRegistry"),
+            "DeployHoloceneUpgrade: invalid FaultDisputeGame AnchorStateRegistry"
+        );
+        require(fdg.l2ChainId() == cfg.l2ChainID(), "DeployHoloceneUpgrade: invalid FaultDisputeGame l2ChainID");
+    }
+
+    /// @dev Deploys the Holocene `PermissionedDisputeGame` implementation contract.
+    function deployPermissionedDisputeGameImplementation() public {
+        bytes memory constructorInput = abi.encodeCall(
+            IPermissionedDisputeGame.__constructor__,
+            (
+                GameTypes.PERMISSIONED_CANNON,
+                Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
+                cfg.faultGameMaxDepth(),
+                cfg.faultGameSplitDepth(),
+                Duration.wrap(uint64(cfg.faultGameClockExtension())),
+                Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
+                IBigStepper(mustGetAddress("MIPS")),
+                IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyPDG"))),
+                IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
+                cfg.l2ChainID(),
+                cfg.l2OutputOracleProposer(),
+                cfg.l2OutputOracleChallenger()
+            )
+        );
+
+        vm.broadcast(msg.sender);
+        address fdg = DeployUtils.create1("PermissionedDisputeGame", DeployUtils.encodeConstructor(constructorInput));
+        save("PermissionedDisputeGame", fdg);
+    }
+
+    /// @dev Checks if the `PermissionedDisputeGame` contract is correctly configured.
+    function checkPermissionedDisputeGame() public view {
+        IPermissionedDisputeGame pdg = IPermissionedDisputeGame(mustGetAddress("PermissionedDisputeGame"));
+        require(
+            pdg.gameType().raw() == GameTypes.PERMISSIONED_CANNON.raw(),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame gameType"
+        );
+        require(
+            pdg.absolutePrestate().raw() == bytes32(cfg.faultGameAbsolutePrestate()),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame absolutePrestate"
+        );
+        require(
+            pdg.maxGameDepth() == cfg.faultGameMaxDepth(),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame maxDepth"
+        );
+        require(
+            pdg.splitDepth() == cfg.faultGameSplitDepth(),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame splitDepth"
+        );
+        require(
+            pdg.clockExtension().raw() == cfg.faultGameClockExtension(),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame clockExtension"
+        );
+        require(
+            pdg.maxClockDuration().raw() == cfg.faultGameMaxClockDuration(),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame maxClockDuration"
+        );
+        require(
+            address(pdg.vm()) == mustGetAddress("MIPS"), "DeployHoloceneUpgrade: invalid PermissionedDisputeGame MIPS"
+        );
+        require(
+            address(pdg.weth()) == mustGetAddress("DelayedWETHProxyPDG"),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame DelayedWETH"
+        );
+        require(
+            address(pdg.anchorStateRegistry()) == mustGetAddress("AnchorStateRegistry"),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame AnchorStateRegistry"
+        );
+        require(pdg.l2ChainId() == cfg.l2ChainID(), "DeployHoloceneUpgrade: invalid PermissionedDisputeGame l2ChainID");
+        require(
+            pdg.proposer() == cfg.l2OutputOracleProposer(),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame proposer"
+        );
+        require(
+            pdg.challenger() == cfg.l2OutputOracleChallenger(),
+            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame challenger"
+        );
+    }
+
+    /// @dev Deploys a new implementation of the `DelayedWETH` contract.
+    function deployDelayedWETH() public {
+        uint256 delay = cfg.faultGameWithdrawalDelay();
+
+        vm.broadcast(msg.sender);
+        address impl = DeployUtils.create1({
+            _name: "DelayedWETH",
+            _args: DeployUtils.encodeConstructor(abi.encodeCall(IDelayedWETH.__constructor__, (delay)))
+        });
+
+        // Save the new implementation address.
+        save("DelayedWETH", impl);
+    }
+
+    /// @dev Deploys a new proxy contract with a new `DelayedWETH` implementation.
+    function deployDelayedWETHProxy(string memory _variant) public {
+        address delayedWethOwner = cfg.finalSystemOwner();
+        address proxyAdmin = mustGetAddress("ProxyAdmin");
+        address impl = mustGetAddress("DelayedWETH");
+        ISuperchainConfig superchainConfig = ISuperchainConfig(mustGetAddress("SuperchainConfig"));
+        string memory finalName = string.concat("DelayedWETHProxy", _variant);
+
+        // Deploy the implementation and proxy contracts.
+        vm.broadcast(msg.sender);
+        IProxy proxy = IProxy(
+            DeployUtils.create1({
+                _name: "Proxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
+            })
+        );
+
+        // Upgrade the proxy to the implementation and initialize it.
+        vm.broadcast(msg.sender);
+        proxy.upgradeToAndCall(impl, abi.encodeCall(IDelayedWETH.initialize, (delayedWethOwner, superchainConfig)));
+
+        // Transfer the admin role of the proxy to the ProxyAdmin, now that we've upgraded
+        // and initialized the proxy.
+        vm.broadcast(msg.sender);
+        proxy.changeAdmin(proxyAdmin);
+
+        // Save the proxy address.
+        save(finalName, address(proxy));
+    }
+
+    /// @dev Checks if the `DelayedWETH` contract is correctly configured.
+    function checkDelayedWETH(string memory _variant) internal {
+        string memory finalName = string.concat("DelayedWETHProxy", _variant);
+        IDelayedWETH delayedWeth = IDelayedWETH(mustGetAddress(finalName));
+        require(
+            delayedWeth.delay() == cfg.faultGameWithdrawalDelay(), "DeployHoloceneUpgrade: invalid DelayedWETH delay"
+        );
+        require(
+            delayedWeth.config() == ISuperchainConfig(mustGetAddress("SuperchainConfig")),
+            "DeployHoloceneUpgrade: invalid DelayedWETH config"
+        );
+
+        vm.prank(mustGetAddress("ProxyAdmin"));
+        address admin = IProxy(payable(address(delayedWeth))).admin();
+        require(admin == mustGetAddress("ProxyAdmin"), "DeployHoloceneUpgrade: invalid DelayedWETH admin");
+    }
+
+    /// @dev Prints a summary of the deployment.
+    function printSummary() internal view {
+        console.log("1. SystemConfig: %s", mustGetAddress("SystemConfig"));
+        console.log("2. MIPS: %s", getAddress("MIPS"));
+        console.log("3. FaultDisputeGame: %s", getAddress("FaultDisputeGame"));
+        console.log("4. PermissionedDisputeGame: %s", getAddress("PermissionedDisputeGame"));
+    }
+}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/README.md b/packages/contracts-bedrock/scripts/upgrades/holocene/README.md
new file mode 100644
index 000000000000..f16127ffebbd
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/README.md
@@ -0,0 +1,41 @@
+# Holocene Upgrade
+
+This directory contains a repeatable task for:
+* upgrading an `op-contracts/v1.6.0` deployment to `op-contracts/v1.8.0`.
+* upgrading an `op-contracts/v1.3.0` deployment to `op-contracts/v1.8.0`, while retaining the `L2OutputOracle`.
+
+## Dependencies
+
+- [`docker`](https://docs.docker.com/engine/install/)
+- [`just`](https://github.com/casey/just)
+- [`foundry`](https://getfoundry.sh/)
+
+## Usage
+
+This script has several different modes of operation. Namely:
+1. Deploy and upgrade `op-contracts/1.6.0` -> `op-contracts/v1.8.0`
+  - Always upgrade the `SystemConfig`
+  - FP options:
+    - With permissionless fault proofs enabled (incl. `FaultDisputeGame`)
+    - With permissioned fault proofs enabled (excl. `FaultDisputeGame`)
+1. Deploy and upgrade `op-contracts/v1.3.0` -> `op-contracts/v1.8.0`, with the `L2OutputOracle` still active.
+  - Only upgrade the `SystemConfig`
+
+```sh
+# 1. Clone the monorepo and navigate to this directory.
+git clone git@github.com:ethereum-optimism/monorepo.git && \
+  cd monorepo/packages/contracts-bedrock/scripts/upgrades/holocene
+
+# 2. Set up the `.env` file
+#
+# Read the documentation carefully, and when in doubt, reach out to the OP Labs team.
+cp .env.example .env && vim .env
+
+# 3. Run the upgrade task.
+#
+#    This task will:
+#    - Deploy the new smart contract implementations.
+#    - Optionally, generate a safe upgrade bundle.
+#    - Optionally, generate a `superchain-ops` upgrade task.
+just run
+```
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/justfile b/packages/contracts-bedrock/scripts/upgrades/holocene/justfile
new file mode 100644
index 000000000000..08cdc771ac92
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/justfile
@@ -0,0 +1,26 @@
+# Default recipe to list help menu.
+default:
+  @just --list
+
+# Run the deployment / upgrade generation image. If the image is not present locally,
+# it will be built.
+run *args='':
+  #!/bin/bash
+  if [ ! "$(docker images -q op-holocene-upgrade:local 2> /dev/null)" ]; then
+    just build-image
+  fi
+
+  # Run the deployment.
+  docker run \
+    --rm \
+    -v $OUTPUT_FOLDER_PATH/:/output \
+    --env-file=.env \
+    op-holocene-upgrade:local {{args}}
+
+# Build the image locally.
+build-image:
+  docker build \
+  -t op-holocene-upgrade:local \
+  -f upgrade.dockerfile \
+  --build-arg REV=op-contracts/v1.8.0-rc.1 \
+  .
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh
new file mode 100755
index 000000000000..0f4e80b29c40
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh
@@ -0,0 +1,131 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Associative array to store cached TOML content for different URLs
+# Used by fetch_standard_address and fetch_superchain_config_address
+declare -A CACHED_TOML_CONTENT
+
+# error_handler
+#
+# Basic error handler
+error_handler() {
+  echo "Error occurred in ${BASH_SOURCE[1]} at line: ${BASH_LINENO[0]}"
+  echo "Error message: $BASH_COMMAND"
+  exit 1
+}
+
+# Register the error handler
+trap error_handler ERR
+
+# reqenv
+#
+# Checks if a specified environment variable is set.
+#
+# Arguments:
+#   $1 - The name of the environment variable to check
+#
+# Exits with status 1 if:
+#   - The specified environment variable is not set
+reqenv() {
+    if [ -z "$1" ]; then
+        echo "Error: $1 is not set"
+        exit 1
+    fi
+}
+
+# prompt
+#
+# Prompts the user for a yes/no response.
+#
+# Arguments:
+#   $1 - The prompt message
+#
+# Exits with status 1 if:
+#   - The user does not respond with 'y'
+#   - The process is interrupted
+prompt() {
+    read -p "$1 [Y/n] " -n 1 -r
+    echo
+    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+        [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
+        exit 1
+    fi
+}
+
+# fetch_standard_address
+#
+# Fetches the implementation address for a given contract from a TOML file.
+# The TOML file is downloaded from a URL specified in ADDRESSES_TOML_URL
+# environment variable. Results are cached to avoid repeated downloads.
+#
+# Arguments:
+#   $1 - Network name
+#   $2 - The release version
+#   $3 - The name of the contract to look up
+#
+# Returns:
+#   The implementation address of the specified contract
+#
+# Exits with status 1 if:
+#   - Failed to fetch the TOML file
+#   - The release version is not found in the TOML file
+#   - The implementation address for the specified contract is not found
+fetch_standard_address() {
+    local network_name="$1"
+    local release_version="$2"
+    local contract_name="$3"
+
+    # Determine the correct toml url
+    local toml_url="https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions"
+    if [ "$network_name" = "mainnet" ]; then
+        toml_url="$toml_url-mainnet.toml"
+    elif [ "$network_name" = "sepolia" ]; then
+        toml_url="$toml_url-sepolia.toml"
+    else
+        echo "Error: NETWORK must be set to 'mainnet' or 'sepolia'"
+        exit 1
+    fi
+
+    # Fetch the TOML file content from the URL if not already cached for this URL
+    if [ -z "${CACHED_TOML_CONTENT[$toml_url]:-}" ]; then
+        CACHED_TOML_CONTENT[$toml_url]=$(curl -s "$toml_url")
+        # shellcheck disable=SC2181
+        if [ $? -ne 0 ]; then
+            echo "Error: Failed to fetch TOML file from $toml_url"
+            exit 1
+        fi
+    fi
+
+    # Use the cached content for the current URL
+    local toml_content="${CACHED_TOML_CONTENT[$toml_url]}"
+
+    # Find the section for v1.6.0 release
+    # shellcheck disable=SC2155
+    local section_content=$(echo "$toml_content" | awk -v version="$release_version" '
+        $0 ~ "^\\[releases.\"op-contracts/v" version "\"\\]" {
+            flag=1;
+            next
+        }
+        flag && /^\[/ {
+            exit
+        }
+        flag {
+            print
+        }
+    ')
+    if [ -z "$section_content" ]; then
+        echo "Error: v$release_version release section not found in addresses TOML"
+        exit 1
+    fi
+
+    # Extract the implementation address for the specified contract
+    local regex="(address|implementation_address) = \"(0x[a-fA-F0-9]{40})\""
+    # shellcheck disable=SC2155
+    local data=$(echo "$section_content" | grep "${contract_name}")
+    if [[ $data =~ $regex ]]; then
+        echo "${BASH_REMATCH[2]}"
+    else
+        echo "Error: Implementation address for $contract_name not found in v$release_version release"
+        exit 1
+    fi
+}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh
new file mode 100755
index 000000000000..d1e15aa63e7f
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Grab the script directory
+SCRIPT_DIR=$(dirname "$0")
+
+# Load common.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/common.sh"
+
+# Check required environment variables
+reqenv "ETH_RPC_URL"
+reqenv "PRIVATE_KEY"
+reqenv "ETHERSCAN_API_KEY"
+reqenv "DEPLOY_CONFIG_PATH"
+reqenv "IMPL_SALT"
+
+# Check required address environment variables
+reqenv "PROXY_ADMIN_ADDR"
+reqenv "SUPERCHAIN_CONFIG_PROXY_ADDR"
+reqenv "PREIMAGE_ORACLE_ADDR"
+reqenv "ANCHOR_STATE_REGISTRY_PROXY_ADDR"
+reqenv "DELAYED_WETH_IMPL_ADDR"
+reqenv "SYSTEM_CONFIG_IMPL_ADDR"
+reqenv "MIPS_IMPL_ADDR"
+reqenv "USE_FAULT_PROOFS"
+reqenv "USE_PERMISSIONLESS_FAULT_PROOFS"
+
+# Run the upgrade script
+forge script DeployUpgrade.s.sol \
+  --rpc-url "$ETH_RPC_URL" \
+  --private-key "$PRIVATE_KEY" \
+  --etherscan-api-key "$ETHERSCAN_API_KEY" \
+  --sig "deploy(address,address,address,address,address,address,address,bool,bool)" \
+  "$PROXY_ADMIN_ADDR" \
+  "$SUPERCHAIN_CONFIG_PROXY_ADDR" \
+  "$SYSTEM_CONFIG_IMPL_ADDR" \
+  "$MIPS_IMPL_ADDR" \
+  "$DELAYED_WETH_IMPL_ADDR" \
+  "$PREIMAGE_ORACLE_ADDR" \
+  "$ANCHOR_STATE_REGISTRY_PROXY_ADDR" \
+  "$USE_FAULT_PROOFS" \
+  "$USE_PERMISSIONLESS_FAULT_PROOFS" \
+  --broadcast \
+  --verify \
+  --slow
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
new file mode 100755
index 000000000000..95fe1a43c231
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
@@ -0,0 +1,152 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Grab the script directory
+SCRIPT_DIR=$(dirname "$0")
+
+# Load common.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/common.sh"
+
+echo "
+⠄⢀⠀⠀⡐⠠⠀⢂⣠⡤⣤⣖⣤⣤⣄⢢⣤⣤⣤⡀⠄⠰⠀⠆⠀⠀⠠⠀⠆⠠⢀⠢⠐⠆⡀
+⠔⢀⠀⠄⡀⠔⢠⣾⣿⣿⣷⣿⣿⣿⣿⣷⣟⣛⣻⣿⣤⡠⢀⠆⢄⠂⠠⢠⠀⠄⠀⢠⠰⢄⠄
+⣈⠀⠐⡀⠀⠈⣾⣿⣿⣿⣿⡿⡿⣿⣿⣿⣿⡿⢿⣿⣿⣿⣦⠀⠂⠀⢈⠀⠁⠂⡀⢀⠠⠈⡀
+⠆⠈⠀⠄⣃⣼⣿⣿⣿⠿⡿⣿⣿⣷⣾⣷⣾⡾⣿⣿⣿⢿⡟⡇⠠⠁⠨⠐⠀⠃⠱⠊⠀⠀⠄
+⠐⣠⣶⣿⣿⣿⣿⣿⣿⣿⣾⣮⣛⢿⣿⡿⠘⣇⢯⣹⣶⣷⣿⣿⡄⠆⢐⠀⢄⠢⡒⠐⠠⢀⠂
+⢴⣿⣿⣿⣿⣿⣿⡿⠿⢿⣿⣿⣟⢿⣶⣾⣿⣧⢻⣿⢿⣿⣿⣿⠂⠈⢀⠈⡀⡁⢀⠉⢀⠀⠀
+⡜⣿⣿⣿⣿⣿⣿⣦⡻⠀⢨⣽⣿⣿⣿⣿⣿⣿⣦⡛⣾⣭⣃⣀⣦⠀⠨⠐⠀⠄⠃⠈⠀⠀⠁
+⣳⡘⣿⣿⣿⣿⣿⣿⣿⣿⣿⢛⣭⣿⣿⣿⣿⣿⣿⣿⢢⣿⣿⣿⣿⡇⢀⠲⠂⠄⢀⡐⠠⠐⠂
+⢣⠵⢹⣿⣿⣿⣿⣿⣿⣿⣿⣧⣛⣻⣿⣭⣿⣿⠻⢥⣿⣿⣿⣿⣿⣿⡄⠀⠁⡀⢀⢈⠀⢀⠁
+⡼⣹⡘⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⣟⣻⠿⠿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠁⠉⠐⠀⠂⠈
+⡷⣡⠧⢹⣿⣿⣿⣿⣿⣿⣗⣶⣾⣿⣿⣿⣿⣿⠮⢿⣿⣿⡿⠿⣿⣿⢀⣀⠂⡁⠐⢌⠐⡠⠁
+⢷⠡⠏⢧⢌⢻⣿⣿⣿⣟⣿⣿⣻⣿⡿⠿⣛⣵⢟⣭⡭⠥⠮⠕⣒⣒⣚⣮⣰⢤⣤⣄⣀⡠⠄
+⠁⠠⠀⠄⣏⢦⡙⣿⣿⣽⣟⣿⡟⣬⣾⣿⣿⣿⣾⣆⠭⠽⠶⢶⢶⣖⣶⣹⣖⡿⣿⣿⣿⣿⡆
+⠀⡁⠂⡟⡜⣦⢫⣌⠻⣷⣿⢏⣾⣿⣿⣿⢿⣿⢿⣿⣿⣿⣿⣿⠿⣛⣛⣛⠛⣭⣿⣿⢻⣽⡇
+⣏⠖⣮⢱⣋⢖⣣⢎⡳⢤⡅⣾⣿⢯⣷⡏⡖⣰⣝⣚⣙⣫⢍⡶⠷⣽⢭⣛⡇⠀⢰⣶⣾⣿⠀
+⡮⡝⢦⣓⢎⡳⡜⠎⠡⠁⢸⣿⣿⣿⣿⣁⢠⣿⡿⣿⡟⣎⣯⣽⣋⡷⣾⣹⡃⠀⢸⣿⣿⢿⠀
+⣳⠁⠀⡝⢮⣱⢹⠀⠂⠈⣿⣿⣿⣿⡻⣈⣸⣿⣙⢾⢿⣹⡶⣿⣼⣗⣻⡞⣡⠁⣼⣿⣿⣿⡀
+⡔⢦⢥⡛⣜⠦⣏⡄⡈⣸⢿⣿⡿⣽⢃⠇⣿⣧⡝⣟⡳⢾⣹⣟⡻⣾⣹⢣⠞⣄⣯⣿⣷⣿⡆
+   -*~ [ Grug Deployer mk2 ] ~*-
+       ~*- [ Holocene ] -*~
+"
+
+# Set variables from environment or error.
+export RELEASE="1.8.0"
+export NETWORK="${NETWORK:?NETWORK must be set}"
+export ETHERSCAN_API_KEY=${ETHERSCAN_API_KEY:?ETHERSCAN_API_KEY must be set}
+export ETH_RPC_URL=${ETH_RPC_URL:?ETH_RPC_URL must be set}
+export PRIVATE_KEY=${PRIVATE_KEY:?PRIVATE_KEY must be set}
+export BASE_DEPLOY_CONFIG_PATH=${DEPLOY_CONFIG_PATH:?DEPLOY_CONFIG_PATH must be set}
+export OUTPUT_FOLDER_PATH=${OUTPUT_FOLDER_PATH:?OUTPUT_FOLDER_PATH must be set}
+export SYSTEM_CONFIG_IMPL_ADDR=${SYSTEM_CONFIG_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "system_config")}
+export MIPS_IMPL_ADDR=${MIPS_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "mips")}
+export PREIMAGE_ORACLE_ADDR=${PREIMAGE_ORACLE_ADDR:?PREIMAGE_ORACLE_ADDR must be set}
+export ANCHOR_STATE_REGISTRY_PROXY_ADDR=${ANCHOR_STATE_REGISTRY_PROXY_ADDR:?ANCHOR_STATE_REGISTRY_PROXY_ADDR must be set}
+export DELAYED_WETH_IMPL_ADDR=${DELAYED_WETH_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "delayed_weth")}
+export PROXY_ADMIN_ADDR=${PROXY_ADMIN_ADDR:?PROXY_ADMIN_ADDR must be set}
+export SUPERCHAIN_CONFIG_PROXY_ADDR=${SUPERCHAIN_CONFIG_PROXY_ADDR:?SUPERCHAIN_CONFIG_ADDR must be set}
+export SYSTEM_CONFIG_PROXY_ADDR=${SYSTEM_CONFIG_PROXY_ADDR:?SYSTEM_CONFIG_PROXY_ADDR must be set}
+export DISPUTE_GAME_FACTORY_PROXY_ADDR=${DISPUTE_GAME_FACTORY_PROXY_ADDR:?DISPUTE_GAME_FACTORY_PROXY_ADDR must be set}
+export USE_FAULT_PROOFS=${USE_FAULT_PROOFS:?USE_FAULT_PROOFS must be set}
+export USE_PERMISSIONLESS_FAULT_PROOFS=${USE_PERMISSIONLESS_FAULT_PROOFS:?USE_PERMISSIONLESS_FAULT_PROOFS must be set}
+
+# Sanity check FP configuration.
+if [[ $USE_PERMISSIONLESS_FAULT_PROOFS == true && $USE_FAULT_PROOFS == false ]]; then
+    echo "Error: USE_PERMISSIONLESS_FAULT_PROOFS cannot be true if USE_FAULT_PROOFS is false"
+    exit 1
+fi
+
+# Make the output folder, if it doesn't exist
+mkdir -p "$OUTPUT_FOLDER_PATH"
+
+# Find the contracts-bedrock directory
+CONTRACTS_BEDROCK_DIR=$(pwd)
+while [[ "$CONTRACTS_BEDROCK_DIR" != "/" && "${CONTRACTS_BEDROCK_DIR##*/}" != "contracts-bedrock" ]]; do
+    CONTRACTS_BEDROCK_DIR=$(dirname "$CONTRACTS_BEDROCK_DIR")
+done
+
+# Error out if we couldn't find it for some reason
+if [[ "$CONTRACTS_BEDROCK_DIR" == "/" ]]; then
+    echo "Error: 'contracts-bedrock' directory not found"
+    exit 1
+fi
+
+# Set file paths from command-line arguments
+export DEPLOY_CONFIG_PATH="$CONTRACTS_BEDROCK_DIR/deploy-config/deploy-config.json"
+
+# Copy the files into the paths so that the script can actually access it
+cp "$BASE_DEPLOY_CONFIG_PATH" "$DEPLOY_CONFIG_PATH"
+
+# Run deploy.sh
+DEPLOY_LOG_PATH="$OUTPUT_FOLDER_PATH/deploy.log"
+if ! "$SCRIPT_DIR/deploy.sh" | tee "$DEPLOY_LOG_PATH"; then
+    echo "Error: deploy.sh failed"
+    exit 1
+fi
+
+# Extract the addresses from the deployment logs
+# shellcheck disable=2155
+export SYSTEM_CONFIG_IMPL=$(grep "1. SystemConfig:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
+# shellcheck disable=2155
+export MIPS_IMPL=$(grep "2. MIPS:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
+# shellcheck disable=2155
+export FDG_IMPL=$(grep "3. FaultDisputeGame:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
+# shellcheck disable=2155
+export PDG_IMPL=$(grep "4. PermissionedDisputeGame:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
+
+# Ensure that the addresses were extracted properly
+reqenv "SYSTEM_CONFIG_IMPL"
+reqenv "MIPS_IMPL"
+reqenv "FDG_IMPL"
+reqenv "PDG_IMPL"
+
+# Generate deployments.json with extracted addresses
+DEPLOYMENTS_JSON_PATH="$OUTPUT_FOLDER_PATH/deployments.json"
+cat << EOF > "$DEPLOYMENTS_JSON_PATH"
+{
+  "SystemConfig": "$SYSTEM_CONFIG_IMPL",
+  "MIPS": "$MIPS_IMPL",
+  "FaultDisputeGame": "$FDG_IMPL",
+  "PermissionedDisputeGame": "$PDG_IMPL"
+}
+EOF
+
+echo "✨ Deployed contracts and saved addresses to \"$DEPLOYMENTS_JSON_PATH\""
+
+# Print a message when the script exits
+trap 'echo "✨ Done. Artifacts are available in \"$OUTPUT_FOLDER_PATH\""' EXIT
+
+prompt "Generate safe upgrade bundle for SystemConfig?"
+
+# Generate the system config upgrade bundle
+if ! "$SCRIPT_DIR/sys-cfg-bundle.sh"; then
+    echo "Error: sys-cfg-bundle.sh failed"
+    exit 1
+fi
+
+prompt "Generate superchain-ops upgrade task for SystemConfig upgrade bundle?"
+
+# Generate the superchain-ops upgrade task
+if ! "$SCRIPT_DIR/sc-ops-sys-cfg.sh"; then
+    echo "Error: sc-ops-sys-cfg.sh failed"
+    exit 1
+fi
+
+if [[ $USE_FAULT_PROOFS == true ]]; then
+  prompt "Generate safe upgrade bundle for proofs contracts?"
+
+  # Generate the proofs contracts' upgrade bundle
+  if ! "$SCRIPT_DIR/proofs-bundle.sh"; then
+      echo "Error: proofs-bundle.sh failed"
+      exit 1
+  fi
+
+  prompt "Generate superchain-ops upgrade task for proofs contracts upgrade bundle?"
+
+  # Generate the superchain-ops upgrade task
+  if ! "$SCRIPT_DIR/sc-ops-proofs.sh"; then
+      echo "Error: sc-ops-proofs.sh failed"
+      exit 1
+  fi
+fi
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
new file mode 100755
index 000000000000..85295d3040f1
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Grab the script directory
+SCRIPT_DIR=$(dirname "$0")
+
+# Load common.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/common.sh"
+
+# Check the env
+reqenv "ETH_RPC_URL"
+reqenv "OUTPUT_FOLDER_PATH"
+reqenv "MIPS_IMPL"
+reqenv "FDG_IMPL"
+reqenv "PDG_IMPL"
+reqenv "DISPUTE_GAME_FACTORY_PROXY_ADDR"
+reqenv "USE_PERMISSIONLESS_FAULT_PROOFS"
+
+# Local environment
+BUNDLE_PATH="$OUTPUT_FOLDER_PATH/proofs_bundle.json"
+L1_CHAIN_ID=$(cast chain-id)
+
+# Copy the bundle template
+cp ./templates/proof_upgrade_bundle_template.json "$BUNDLE_PATH"
+
+# Tx 1: Upgrade PermissionedDisputeGame implementation
+TX_1_PAYLOAD=$(cast calldata "setImplementation(uint32,address)" 1 "$PDG_IMPL")
+
+# Tx 2: Upgrade FaultDisputeGame implementation
+TX_2_PAYLOAD=$(cast calldata "setImplementation(uint32,address)" 0 "$FDG_IMPL")
+
+# Replace variables
+sed -i '' "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
+sed -i '' "s/\$PDG_IMPL/$PDG_IMPL/g" "$BUNDLE_PATH"
+sed -i '' "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
+sed -i '' "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
+
+# Conditionally, if the FDG is being deployed, append the bundle extension
+if [ "$USE_PERMISSIONLESS_FAULT_PROOFS" == true ]; then
+  echo "✨ USE_PERMISSIONLESS_FAULT_PROOFS=true | Adding FDG deployment to upgrade bundle."
+  jq --argjson fdg_extension "$(cat ./templates/fdg_bundle_extension.json)" \
+    '.transactions += [$fdg_extension]' \
+    "$BUNDLE_PATH" > "$BUNDLE_PATH.tmp"
+  mv "$BUNDLE_PATH.tmp" "$BUNDLE_PATH"
+
+  # Replace variables
+  sed -i '' "s/\$FDG_IMPL/$FDG_IMPL/g" "$BUNDLE_PATH"
+  sed -i '' "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
+fi
+
+sed -i '' "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$BUNDLE_PATH"
+
+echo "✨ Generated proof contracts upgrade bundle at \"$BUNDLE_PATH\""
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
new file mode 100755
index 000000000000..d4ff18db5738
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Grab the script directory
+SCRIPT_DIR=$(dirname "$0")
+
+# Load common.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/common.sh"
+
+# Check required environment variables
+reqenv "OUTPUT_FOLDER_PATH"
+reqenv "MIPS_IMPL"
+reqenv "FDG_IMPL"
+reqenv "PDG_IMPL"
+reqenv "DISPUTE_GAME_FACTORY_PROXY_ADDR"
+
+# Create directory for the task
+TASK_DIR="$OUTPUT_FOLDER_PATH/proofs-sc-ops-task"
+mkdir -p "$TASK_DIR"
+
+# Copy the bundle and task template
+cp "$OUTPUT_FOLDER_PATH/proofs_bundle.json" "$TASK_DIR/input.json"
+cp -R "$SCRIPT_DIR/../templates/proofs-sc-ops-task/." "$TASK_DIR/"
+
+# Generate the task overview
+msup render -i "$TASK_DIR/input.json" -o "$TASK_DIR/OVERVIEW.md"
+
+# Generate the README
+sed -i '' "s/\$MIPS_IMPL/$MIPS_IMPL/g" "$TASK_DIR/README.md"
+sed -i '' "s/\$FDG_IMPL/$FDG_IMPL/g" "$TASK_DIR/README.md"
+sed -i '' "s/\$PDG_IMPL/$PDG_IMPL/g" "$TASK_DIR/README.md"
+
+# Generate the validation doc
+OLD_FDG=$(cast call "$DISPUTE_GAME_FACTORY_PROXY_ADDR" "gameImpls(uint32)" 0)
+OLD_PDG=$(cast call "$DISPUTE_GAME_FACTORY_PROXY_ADDR" "gameImpls(uint32)" 1)
+
+PADDED_OLD_FDG=$(cast 2u "$OLD_FDG")
+PADDED_OLD_PDG=$(cast 2u "$OLD_PDG")
+PADDED_FDG_IMPL=$(cast 2u "$FDG_IMPL")
+PADDED_PDG_IMPL=$(cast 2u "$PDG_IMPL")
+
+sed -i '' "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
+sed -i '' "s/\$OLD_FDG/$PADDED_OLD_FDG/g" "$TASK_DIR/VALIDATION.md"
+sed -i '' "s/\$FDG_IMPL/$PADDED_FDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
+sed -i '' "s/\$PDG_IMPL/$PADDED_PDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
+sed -i '' "s/\$OLD_PDG/$PADDED_OLD_PDG/g" "$TASK_DIR/VALIDATION.md"
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
new file mode 100755
index 000000000000..b0e4a57b32b7
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Grab the script directory
+SCRIPT_DIR=$(dirname "$0")
+
+# Load common.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/common.sh"
+
+# Check required environment variables
+reqenv "OUTPUT_FOLDER_PATH"
+reqenv "SYSTEM_CONFIG_IMPL"
+reqenv "SYSTEM_CONFIG_PROXY_ADDR"
+
+# Create directory for the task
+TASK_DIR="$OUTPUT_FOLDER_PATH/sys-cfg-sc-ops-task"
+mkdir -p "$TASK_DIR"
+
+# Copy the bundle and task template
+cp "$OUTPUT_FOLDER_PATH/sys_cfg_bundle.json" "$TASK_DIR/input.json"
+cp -R "$SCRIPT_DIR/../templates/sys-cfg-sc-ops-task/." "$TASK_DIR/"
+
+# Generate the task overview
+msup render -i "$TASK_DIR/input.json" -o "$TASK_DIR/OVERVIEW.md"
+
+# Generate the README
+sed -i '' "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$TASK_DIR/README.md"
+
+# Generate the validation doc
+OLD_SYS_CFG=$(cast impl "$SYSTEM_CONFIG_PROXY_ADDR")
+
+PADDED_OLD_SYS_CFG=$(cast 2u "$OLD_SYS_CFG")
+PADDED_SYS_CFG=$(cast 2u "$SYSTEM_CONFIG_IMPL")
+
+sed -i '' "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
+sed -i '' "s/\$OLD_SYS_CFG/$PADDED_OLD_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
+sed -i '' "s/\$SYSTEM_CONFIG_IMPL/$PADDED_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
new file mode 100755
index 000000000000..64c34088ebf5
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Grab the script directory
+SCRIPT_DIR=$(dirname "$0")
+
+# Load common.sh
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/common.sh"
+
+# Check the env
+reqenv "ETH_RPC_URL"
+reqenv "OUTPUT_FOLDER_PATH"
+reqenv "PROXY_ADMIN_ADDR"
+reqenv "SYSTEM_CONFIG_PROXY_ADDR"
+reqenv "SYSTEM_CONFIG_IMPL"
+
+# Local environment
+BUNDLE_PATH="$OUTPUT_FOLDER_PATH/sys_cfg_bundle.json"
+L1_CHAIN_ID=$(cast chain-id)
+
+# Copy the bundle template
+cp ./templates/sys_cfg_upgrade_bundle_template.json "$BUNDLE_PATH"
+
+# Tx 1: Upgrade SystemConfigProxy implementation
+TX_1_PAYLOAD=$(cast calldata "upgrade(address,address)" "$SYSTEM_CONFIG_PROXY_ADDR" "$SYSTEM_CONFIG_IMPL")
+
+# Replace variables
+sed -i '' "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
+sed -i '' "s/\$PROXY_ADMIN_ADDR/$PROXY_ADMIN_ADDR/g" "$BUNDLE_PATH"
+sed -i '' "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$BUNDLE_PATH"
+sed -i '' "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$BUNDLE_PATH"
+sed -i '' "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
+
+echo "✨ Generated SystemConfig upgrade bundle at \"$BUNDLE_PATH\""
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json
new file mode 100644
index 000000000000..fa6680496bdb
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json
@@ -0,0 +1,29 @@
+{
+  "metadata": {
+    "name": "Upgrade `CANNON` game type in `DisputeGameFactory`",
+    "description": "Upgrades the `CANNON` game type to the new Holocene deployment, with an updated version of `op-program` as the absolute prestate hash."
+  },
+  "to": "$DISPUTE_GAME_FACTORY_PROXY_ADDR",
+  "value": "0x0",
+  "data": "$TX_2_PAYLOAD",
+  "contractMethod": {
+    "type": "function",
+    "name": "setImplementation",
+    "inputs": [
+      {
+        "name": "_gameType",
+        "type": "uint32"
+      },
+      {
+        "name": "_impl",
+        "type": "address"
+      }
+    ],
+    "outputs": [],
+    "stateMutability": "nonpayable"
+  },
+  "contractInputsValues": {
+    "_gameType": "0",
+    "_impl": "$FDG_IMPL"
+  }
+}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json
new file mode 100644
index 000000000000..e74360f02a97
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json
@@ -0,0 +1,38 @@
+{
+  "chainId": $L1_CHAIN_ID,
+  "metadata": {
+    "name": "Holocene Hardfork - Proof Contract Upgrades",
+    "description": "Upgrades the `MIPS.sol`, `FaultDisputeGame.sol`, and `PermissionedDisputeGame.sol` contracts for Holocene."
+  },
+  "transactions": [
+    {
+      "metadata": {
+        "name": "Upgrade `PERMISSIONED_CANNON` game type in `DisputeGameFactory`",
+        "description": "Upgrades the `PERMISSIONED_CANNON` game type to the new Holocene deployment, with an updated version of `op-program` as the absolute prestate hash."
+      },
+      "to": "$DISPUTE_GAME_FACTORY_PROXY_ADDR",
+      "value": "0x0",
+      "data": "$TX_1_PAYLOAD",
+      "contractMethod": {
+        "type": "function",
+        "name": "setImplementation",
+        "inputs": [
+          {
+            "name": "_gameType",
+            "type": "uint32"
+          },
+          {
+            "name": "_impl",
+            "type": "address"
+          }
+        ],
+        "outputs": [],
+        "stateMutability": "nonpayable"
+      },
+      "contractInputsValues": {
+        "_gameType": "1",
+        "_impl": "$PDG_IMPL"
+      }
+    }
+  ]
+}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example
new file mode 100644
index 000000000000..ba2beff7f429
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example
@@ -0,0 +1,6 @@
+ETH_RPC_URL=
+SUPERCHAIN_CONFIG_ADDR=
+COUNCIL_SAFE=
+FOUNDATION_SAFE=
+OWNER_SAFE=
+SAFE_NONCE=
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md
new file mode 100644
index 000000000000..e2077747dba1
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md
@@ -0,0 +1,46 @@
+# Holocene Hardfork Upgrade
+
+Status: DRAFT, NOT READY TO SIGN
+
+## Objective
+
+Upgrades the Fault Proof contracts for the Holocene hardfork.
+
+The proposal was:
+
+- [ ] Posted on the governance forum.
+- [ ] Approved by Token House voting.
+- [ ] Not vetoed by the Citizens' house.
+- [ ] Executed on OP Mainnet.
+
+The governance proposal should be treated as the source of truth and used to verify the correctness of the onchain operations.
+
+Governance post of the upgrade can be found at <placeholder>.
+
+This upgrades the Fault Proof contracts in the
+[op-contracts/v1.8.0](https://github.com/ethereum-optimism/optimism/tree/op-contracts/v1.8.0-rc.1) release.
+
+## Pre-deployments
+
+- `MIPS` - `$MIPS_IMPL`
+- `FaultDisputeGame` - `$FDG_IMPL`
+- `PermissionedDisputeGame` - `$PDG_IMPL`
+
+## Simulation
+
+Please see the "Simulating and Verifying the Transaction" instructions in [NESTED.md](../../../NESTED.md).
+When simulating, ensure the logs say `Using script /your/path/to/superchain-ops/tasks/<path>/NestedSignFromJson.s.sol`.
+This ensures all safety checks are run. If the default `NestedSignFromJson.s.sol` script is shown (without the full path), something is wrong and the safety checks will not run.
+
+## State Validation
+
+Please see the instructions for [validation](./VALIDATION.md).
+
+## Execution
+
+This upgrade
+* Changes dispute game implementation of the `CANNON` and `PERMISSIONED_CANNON` game types to contain a `op-program` release for the Holocene hardfork, which contains
+  the Holocene fork implementation as well as a `ChainConfig` and `RollupConfig` for the L2 chain being upgraded.
+* Upgrades `MIPS.sol` to support the `F_GETFD` syscall, required by the golang 1.22+ runtime.
+
+See the [overview](./OVERVIEW.md) and `input.json` bundle for more details.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md
new file mode 100644
index 000000000000..50ba3ca106b4
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md
@@ -0,0 +1,24 @@
+# Validation
+
+This document can be used to validate the state diff resulting from the execution of the upgrade
+transaction.
+
+For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract:
+
+- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur.
+- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic.
+- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.
+
+## State Changes
+
+### `$DISPUTE_GAME_FACTORY_PROXY_ADDR` (`DisputeGameFactoryProxy`)
+
+- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b` <br/>
+  **Before**: `$OLD_FDG` <br/>
+  **After**: `$FDG_IMPL` <br/>
+  **Meaning**: Updates the CANNON game type implementation. Verify that the new implementation is set using `cast call $DISPUTE_GAME_FACTORY_PROXY_ADDR "gameImpls(uint32)(address)" 0`. Where `0` is the [`CANNON` game type](https://github.com/ethereum-optimism/optimism/blob/op-contracts/v1.4.0/packages/contracts-bedrock/src/dispute/lib/Types.sol#L28).
+
+- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e` <br/>
+  **Before**: `$OLD_PDG` <br/>
+  **After**: `$PDG_IMPL` <br/>
+  **Meaning**: Updates the PERMISSIONED_CANNON game type implementation. Verify that the new implementation is set using `cast call $DISPUTE_GAME_FACTORY_PROXY_ADDR "gameImpls(uint32)(address)" 1`. Where `1` is the [`PERMISSIONED_CANNON` game type](https://github.com/ethereum-optimism/optimism/blob/op-contracts/v1.4.0/packages/contracts-bedrock/src/dispute/lib/Types.sol#L31).
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example
new file mode 100644
index 000000000000..ba2beff7f429
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example
@@ -0,0 +1,6 @@
+ETH_RPC_URL=
+SUPERCHAIN_CONFIG_ADDR=
+COUNCIL_SAFE=
+FOUNDATION_SAFE=
+OWNER_SAFE=
+SAFE_NONCE=
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md
new file mode 100644
index 000000000000..740219586b80
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md
@@ -0,0 +1,42 @@
+# Holocene Hardfork Upgrade - `SystemConfig`
+
+Status: DRAFT, NOT READY TO SIGN
+
+## Objective
+
+Upgrades the `SystemConfig` for the Holocene hardfork.
+
+The proposal was:
+
+- [ ] Posted on the governance forum.
+- [ ] Approved by Token House voting.
+- [ ] Not vetoed by the Citizens' house.
+- [ ] Executed on OP Mainnet.
+
+The governance proposal should be treated as the source of truth and used to verify the correctness of the onchain operations.
+
+Governance post of the upgrade can be found at <placeholder>.
+
+This upgrades the `SystemConfig` in the
+[op-contracts/v1.8.0](https://github.com/ethereum-optimism/optimism/tree/op-contracts/v1.8.0-rc.1) release.
+
+## Pre-deployments
+
+- `SystemConfig` - `$SYSTEM_CONFIG_IMPL`
+
+## Simulation
+
+Please see the "Simulating and Verifying the Transaction" instructions in [NESTED.md](../../../NESTED.md).
+When simulating, ensure the logs say `Using script /your/path/to/superchain-ops/tasks/<path>/NestedSignFromJson.s.sol`.
+This ensures all safety checks are run. If the default `NestedSignFromJson.s.sol` script is shown (without the full path), something is wrong and the safety checks will not run.
+
+## State Validation
+
+Please see the instructions for [validation](./VALIDATION.md).
+
+## Execution
+
+This upgrade
+* Changes the implementation of the `SystemConfig` to hold EIP-1559 parameters for the
+
+See the [overview](./OVERVIEW.md) and `input.json` bundle for more details.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md
new file mode 100644
index 000000000000..3a5e7b67595a
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md
@@ -0,0 +1,19 @@
+# Validation
+
+This document can be used to validate the state diff resulting from the execution of the upgrade
+transaction.
+
+For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract:
+
+- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur.
+- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic.
+- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.
+
+## State Changes
+
+### `$SYSTEM_CONFIG_PROXY_ADDR` (`SystemConfigProxy`)
+
+- **Key**: `0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc`
+  **Before**: `$OLD_SYS_CFG`
+  **After**: `$SYSTEM_CONFIG_IMPL`
+  **Meaning**: Updates the `SystemConfig` proxy implementation.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json
new file mode 100644
index 000000000000..62746a51982f
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json
@@ -0,0 +1,38 @@
+{
+  "chainId": $L1_CHAIN_ID,
+  "metadata": {
+    "name": "Holocene Hardfork - SystemConfig Upgrade",
+    "description": "Upgrades the `SystemConfig.sol` contract for Holocene."
+  },
+  "transactions": [
+    {
+      "metadata": {
+        "name": "Upgrade `SystemConfig` proxy",
+        "description": "Upgrades the `SystemConfig` proxy to the new implementation, featuring configurable EIP-1559 parameters."
+      },
+      "to": "$PROXY_ADMIN_ADDR",
+      "value": "0x0",
+      "data": "$TX_1_PAYLOAD",
+      "contractMethod": {
+        "type": "function",
+        "name": "upgrade",
+        "inputs": [
+          {
+            "name": "_proxy",
+            "type": "address"
+          },
+          {
+            "name": "_implementation",
+            "type": "address"
+          }
+        ],
+        "outputs": [],
+        "stateMutability": "nonpayable"
+      },
+      "contractInputsValues": {
+        "_proxy": "$SYSTEM_CONFIG_PROXY_ADDR",
+        "_implementation": "$SYSTEM_CONFIG_IMPL"
+      }
+    }
+  ]
+}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile b/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile
new file mode 100644
index 000000000000..f91ff8dadd83
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile
@@ -0,0 +1,62 @@
+# Use a base image with necessary tools
+FROM ubuntu:20.04
+
+ARG REV
+
+# Install required packages
+RUN apt-get update && apt-get install -y \
+    git \
+    bash \
+    curl \
+    build-essential \
+    jq \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+# Install just
+RUN curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
+
+# Install msup
+RUN git clone https://github.com/clabby/msup.git && \
+  cd msup && \
+  cargo install --path .
+
+# Install foundryup
+RUN curl -L https://foundry.paradigm.xyz | bash
+ENV PATH="/root/.foundry/bin:${PATH}"
+
+# Set the working directory
+WORKDIR /app
+
+# Clone the repository
+RUN git clone https://github.com/ethereum-optimism/optimism.git .
+
+# Check out the target branch
+RUN git checkout $REV
+
+# Set the working directory to the root of the monorepo
+WORKDIR /app
+
+# Install correct foundry version
+RUN just update-foundry
+
+# Set the working directory to the root of the contracts package
+WORKDIR /app/packages/contracts-bedrock
+
+# Install dependencies
+RUN just install
+
+# Build the contracts package
+RUN forge build
+
+# Deliberately run the upgrade script with invalid args to trigger a build
+RUN forge script ./scripts/upgrades/holocene/DeployUpgrade.s.sol || true
+
+# Set the working directory to where upgrade.sh is located
+WORKDIR /app/packages/contracts-bedrock/scripts/upgrades/holocene
+
+# Set the entrypoint to the main.sh script
+ENTRYPOINT ["./scripts/main.sh"]

From 4a677e847c7528be92b2605e9b43ef2d024e2fcc Mon Sep 17 00:00:00 2001
From: Roberto Bayardo <roberto.bayardo@coinbase.com>
Date: Fri, 15 Nov 2024 00:30:02 -0800
Subject: [PATCH 181/451] bound duration spent in state publishing loop
 (#12909)

---
 op-batcher/batcher/driver.go | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 6d8b6eb9da1f..6e237b176d8d 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"math/big"
 	_ "net/http/pprof"
 	"sync"
@@ -430,7 +431,7 @@ func (l *BatchSubmitter) loop() {
 	defer ticker.Stop()
 
 	publishAndWait := func() {
-		l.publishStateToL1(queue, receiptsCh, daGroup)
+		l.publishStateToL1(queue, receiptsCh, daGroup, time.Duration(math.MaxInt64))
 		if !l.Txmgr.IsClosed() {
 			if l.Config.UseAltDA {
 				l.Log.Info("Waiting for altDA writes to complete...")
@@ -470,7 +471,7 @@ func (l *BatchSubmitter) loop() {
 				l.clearState(l.shutdownCtx)
 				continue
 			}
-			l.publishStateToL1(queue, receiptsCh, daGroup)
+			l.publishStateToL1(queue, receiptsCh, daGroup, l.Config.PollInterval)
 		case <-l.shutdownCtx.Done():
 			if l.Txmgr.IsClosed() {
 				l.Log.Info("Txmgr is closed, remaining channel data won't be sent")
@@ -614,9 +615,11 @@ func (l *BatchSubmitter) waitNodeSync() error {
 	return dial.WaitRollupSync(l.shutdownCtx, l.Log, rollupClient, l1TargetBlock, time.Second*12)
 }
 
-// publishStateToL1 queues up all pending TxData to be published to the L1, returning when there is
-// no more data to queue for publishing or if there was an error queing the data.
-func (l *BatchSubmitter) publishStateToL1(queue *txmgr.Queue[txRef], receiptsCh chan txmgr.TxReceipt[txRef], daGroup *errgroup.Group) {
+// publishStateToL1 queues up all pending TxData to be published to the L1, returning when there is no more data to
+// queue for publishing or if there was an error queing the data.  maxDuration tells this function to return from state
+// publishing after this amount of time has been exceeded even if there is more data remaining.
+func (l *BatchSubmitter) publishStateToL1(queue *txmgr.Queue[txRef], receiptsCh chan txmgr.TxReceipt[txRef], daGroup *errgroup.Group, maxDuration time.Duration) {
+	start := time.Now()
 	for {
 		// if the txmgr is closed, we stop the transaction sending
 		if l.Txmgr.IsClosed() {
@@ -634,6 +637,10 @@ func (l *BatchSubmitter) publishStateToL1(queue *txmgr.Queue[txRef], receiptsCh
 			}
 			return
 		}
+		if time.Since(start) > maxDuration {
+			l.Log.Warn("Aborting state publishing, max duration exceeded")
+			return
+		}
 	}
 }
 

From 6c4751c7fa2e3d010152ee4f78f7f1463d75c06c Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 15 Nov 2024 12:48:55 +0100
Subject: [PATCH 182/451] improve tests (#12936)

---
 .../test/L2/L2StandardBridge.t.sol            | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
index 86100b6e4d40..fb68ce093187 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
@@ -34,6 +34,7 @@ contract L2StandardBridge_Test is CommonTest {
         assertEq(address(impl.messenger()), Predeploys.L2_CROSS_DOMAIN_MESSENGER, "constructor zero check messenger");
         assertEq(address(impl.OTHER_BRIDGE()), address(0), "constructor zero check OTHER_BRIDGE");
         assertEq(address(impl.otherBridge()), address(0), "constructor zero check otherBridge");
+        assertEq(address(impl.l1TokenBridge()), address(0), "constructor zero check l1TokenBridge");
     }
 
     /// @dev Tests that the bridge is initialized correctly.
@@ -378,6 +379,12 @@ contract L2StandardBridge_BridgeERC20_Test is PreBridgeERC20 {
         assertEq(L2Token.balanceOf(alice), 0);
     }
 
+    function test_bridgeERC20_isNotCorrectTokenPair_reverts() external {
+        vm.expectRevert("StandardBridge: wrong remote token for Optimism Mintable ERC20 local token");
+        vm.prank(alice, alice);
+        l2StandardBridge.bridgeERC20(address(L2Token), address(BadL1Token), 100, 1000, hex"");
+    }
+
     function test_withdrawLegacyERC20_succeeds() external {
         _preBridgeERC20({ _isLegacy: true, _l2Token: address(LegacyL2Token) });
         l2StandardBridge.withdraw(address(LegacyL2Token), 100, 1000, hex"");
@@ -659,3 +666,43 @@ contract L2StandardBridge_FinalizeBridgeETH_Test is CommonTest {
         l2StandardBridge.finalizeBridgeETH(alice, alice, 1, hex"");
     }
 }
+
+contract L2StandardBridge_FinalizeBridgeERC20_Test is CommonTest {
+    /// @dev Tests that `finalizeBridgeERC20` succeeds.
+    function test_finalizeBridgeERC20_succeeds() external {
+        address messenger = address(l2StandardBridge.messenger());
+        address localToken = address(L2Token);
+        address remoteToken = address(L1Token);
+        vm.mockCall(
+            messenger,
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
+            abi.encode(address(l2StandardBridge.OTHER_BRIDGE()))
+        );
+        deal(localToken, messenger, 100, true);
+        vm.prank(messenger);
+
+        vm.expectEmit(true, true, true, true);
+        emit DepositFinalized(remoteToken, localToken, alice, alice, 100, hex"");
+
+        vm.expectEmit(true, true, true, true);
+        emit ERC20BridgeFinalized(localToken, remoteToken, alice, alice, 100, hex"");
+
+        l2StandardBridge.finalizeBridgeERC20(localToken, remoteToken, alice, alice, 100, hex"");
+    }
+
+    function test_finalizeBridgeERC20_isNotCorrectTokenPair_reverts() external {
+        address messenger = address(l2StandardBridge.messenger());
+        address localToken = address(L2Token);
+        address remoteToken = address(BadL1Token);
+        vm.mockCall(
+            messenger,
+            abi.encodeCall(ICrossDomainMessenger.xDomainMessageSender, ()),
+            abi.encode(address(l2StandardBridge.OTHER_BRIDGE()))
+        );
+        deal(localToken, messenger, 100, true);
+        vm.prank(messenger);
+
+        vm.expectRevert("StandardBridge: wrong remote token for Optimism Mintable ERC20 local token");
+        l2StandardBridge.finalizeBridgeERC20(localToken, remoteToken, alice, alice, 100, hex"");
+    }
+}

From be8c333344e78b33eb417781b66ae6ba8a461a7e Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 15 Nov 2024 12:49:01 +0100
Subject: [PATCH 183/451] improve tests (#12935)

---
 .../universal/OptimismMintableERC721.t.sol    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
index d22e0957a7df..dfe2234e0b64 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC721.t.sol
@@ -30,6 +30,7 @@ contract OptimismMintableERC721_Test is CommonTest {
         vm.label(address(L2NFT), "L2ERC721Token");
     }
 
+    /// @notice Tests that the constructor works as expected.
     function test_constructor_succeeds() external view {
         assertEq(L2NFT.name(), "L2NFT");
         assertEq(L2NFT.symbol(), "L2T");
@@ -41,6 +42,24 @@ contract OptimismMintableERC721_Test is CommonTest {
         assertEq(L2NFT.REMOTE_CHAIN_ID(), 1);
     }
 
+    /// @notice Tests that the bridge cannot be address(0) at construction time.
+    function test_constructor_bridgeAsAddress0_reverts() external {
+        vm.expectRevert("OptimismMintableERC721: bridge cannot be address(0)");
+        L2NFT = new OptimismMintableERC721(address(0), 1, address(L1NFT), "L2NFT", "L2T");
+    }
+
+    /// @notice Tests that the remote chain ID cannot be zero at construction time.
+    function test_constructor_remoteChainId0_reverts() external {
+        vm.expectRevert("OptimismMintableERC721: remote chain id cannot be zero");
+        L2NFT = new OptimismMintableERC721(address(l2ERC721Bridge), 0, address(L1NFT), "L2NFT", "L2T");
+    }
+
+    /// @notice Tests that the remote token cannot be address(0) at construction time.
+    function test_constructor_remoteTokenAsAddress0_reverts() external {
+        vm.expectRevert("OptimismMintableERC721: remote token cannot be address(0)");
+        L2NFT = new OptimismMintableERC721(address(l2ERC721Bridge), 1, address(0), "L2NFT", "L2T");
+    }
+
     /// @notice Ensure that the contract supports the expected interfaces.
     function test_supportsInterfaces_succeeds() external view {
         // Checks if the contract supports the IOptimismMintableERC721 interface.

From 2a40d226aceaa55536344cf27f1ac603cf974c86 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 15 Nov 2024 15:30:07 +0100
Subject: [PATCH 184/451] improve tests (#12937)

---
 packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol | 8 ++++++++
 packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
index 3949bf30f4eb..fd9d0d89b0f1 100644
--- a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
@@ -237,6 +237,14 @@ contract L1ERC721Bridge_Test is CommonTest {
         assertEq(localToken.ownerOf(tokenId), alice);
     }
 
+    /// @dev Tests that `bridgeERC721To` reverts if the to address is the zero address.
+    function test_bridgeERC721To_toZeroAddress_reverts() external {
+        // Bridge the token.
+        vm.prank(bob);
+        vm.expectRevert("ERC721Bridge: nft recipient cannot be address(0)");
+        l1ERC721Bridge.bridgeERC721To(address(localToken), address(remoteToken), address(0), tokenId, 1234, hex"5678");
+    }
+
     /// @dev Tests that the ERC721 bridge successfully finalizes a withdrawal.
     function test_finalizeBridgeERC721_succeeds() external {
         // Bridge the token.
diff --git a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
index 5e7798824c8d..b614711d101a 100644
--- a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
@@ -227,6 +227,14 @@ contract L2ERC721Bridge_Test is CommonTest {
         assertEq(localToken.ownerOf(tokenId), alice);
     }
 
+    /// @dev Tests that `bridgeERC721To` reverts if the to address is the zero address.
+    function test_bridgeERC721To_toZeroAddress_reverts() external {
+        // Bridge the token.
+        vm.prank(bob);
+        vm.expectRevert("ERC721Bridge: nft recipient cannot be address(0)");
+        l2ERC721Bridge.bridgeERC721To(address(localToken), address(remoteToken), address(0), tokenId, 1234, hex"5678");
+    }
+
     /// @dev Tests that `finalizeBridgeERC721` correctly finalizes a bridged token.
     function test_finalizeBridgeERC721_succeeds() external {
         // Bridge the token.

From 1a067802bbd753d09bfb0b9ee1ee6e51cb7366ce Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Fri, 15 Nov 2024 10:17:17 -0500
Subject: [PATCH 185/451] cannon: Expand state codec tests (#12908)

* cannon: Add version 3 state and enable detect test

* cannon: Get other DetectVersion tests running
---
 cannon/mipsevm/versions/detect_test.go        |  55 ++++++++++--------
 .../mipsevm/versions/testdata/states/3.bin.gz | Bin 0 -> 45 bytes
 2 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 cannon/mipsevm/versions/testdata/states/3.bin.gz

diff --git a/cannon/mipsevm/versions/detect_test.go b/cannon/mipsevm/versions/detect_test.go
index be849269fff9..bd1acd115eaf 100644
--- a/cannon/mipsevm/versions/detect_test.go
+++ b/cannon/mipsevm/versions/detect_test.go
@@ -7,10 +7,12 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/singlethreaded"
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
-	"github.com/stretchr/testify/require"
 )
 
 const statesPath = "testdata/states"
@@ -18,7 +20,7 @@ const statesPath = "testdata/states"
 //go:embed testdata/states
 var historicStates embed.FS
 
-func TestDetectVersion(t *testing.T) {
+func TestDetectVersion_fromFile(t *testing.T) {
 	testDetection := func(t *testing.T, version StateVersion, ext string) {
 		filename := strconv.Itoa(int(version)) + ext
 		dir := t.TempDir()
@@ -34,9 +36,6 @@ func TestDetectVersion(t *testing.T) {
 	// Iterate all known versions to ensure we have a test case to detect every state version
 	for _, version := range StateVersionTypes {
 		version := version
-		if version == VersionMultiThreaded64 {
-			t.Skip("TODO(#12205)")
-		}
 		t.Run(version.String(), func(t *testing.T) {
 			testDetection(t, version, ".bin.gz")
 		})
@@ -47,28 +46,38 @@ func TestDetectVersion(t *testing.T) {
 			})
 		}
 	}
+}
 
-	// Additionally, check that the latest supported versions write new states in a way that is detected correctly
-	t.Run("SingleThreadedBinary", func(t *testing.T) {
-		state, err := NewFromState(singlethreaded.CreateEmptyState())
-		require.NoError(t, err)
-		path := writeToFile(t, "state.bin.gz", state)
-		version, err := DetectVersion(path)
-		require.NoError(t, err)
-		require.Equal(t, VersionSingleThreaded2, version)
-	})
+// Check that the latest supported versions write new states in a way that is detected correctly
+func TestDetectVersion_singleThreadedBinary(t *testing.T) {
+	targetVersion := VersionSingleThreaded2
+	if !arch.IsMips32 {
+		t.Skip("Single-threaded states are not supported for 64-bit VMs")
+	}
 
-	t.Run("MultiThreadedBinary", func(t *testing.T) {
-		state, err := NewFromState(multithreaded.CreateEmptyState())
-		require.NoError(t, err)
-		path := writeToFile(t, "state.bin.gz", state)
-		version, err := DetectVersion(path)
-		require.NoError(t, err)
-		require.Equal(t, VersionMultiThreaded, version)
-	})
+	state, err := NewFromState(singlethreaded.CreateEmptyState())
+	require.NoError(t, err)
+	path := writeToFile(t, "state.bin.gz", state)
+	version, err := DetectVersion(path)
+	require.NoError(t, err)
+	require.Equal(t, targetVersion, version)
+}
+
+func TestDetectVersion_multiThreadedBinary(t *testing.T) {
+	targetVersion := VersionMultiThreaded
+	if !arch.IsMips32 {
+		targetVersion = VersionMultiThreaded64
+	}
+
+	state, err := NewFromState(multithreaded.CreateEmptyState())
+	require.NoError(t, err)
+	path := writeToFile(t, "state.bin.gz", state)
+	version, err := DetectVersion(path)
+	require.NoError(t, err)
+	require.Equal(t, targetVersion, version)
 }
 
-func TestDetectVersionInvalid(t *testing.T) {
+func TestDetectVersion_invalid(t *testing.T) {
 	t.Run("bad gzip", func(t *testing.T) {
 		dir := t.TempDir()
 		filename := "state.bin.gz"
diff --git a/cannon/mipsevm/versions/testdata/states/3.bin.gz b/cannon/mipsevm/versions/testdata/states/3.bin.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b6f6728313a7d5f908724a9674dd68549270c623
GIT binary patch
literal 45
wcmb2|=3oGW|4C^JWPk9p8rUgI^}2HM9dJ?>=i_Do%KrcV;pa7$!;B0J006)Yxc~qF

literal 0
HcmV?d00001


From b01b93eeb1191f575777280b86e6f6fb6cda577c Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Sat, 16 Nov 2024 00:10:56 +0700
Subject: [PATCH 186/451] feat: Remove DelayedVetoable (#12939)

---
 op-e2e/bindings/delayedvetoable.go            | 928 ------------------
 .../snapshots/abi/DelayedVetoable.json        | 207 ----
 .../snapshots/semver-lock.json                |   4 -
 .../storageLayout/DelayedVetoable.json        |  16 -
 .../src/L1/DelayedVetoable.sol                | 193 ----
 .../src/L1/interfaces/IDelayedVetoable.sol    |  23 -
 .../test/L1/DelayedVetoable.t.sol             | 262 -----
 .../test/universal/Specs.t.sol                |   8 -
 8 files changed, 1641 deletions(-)
 delete mode 100644 op-e2e/bindings/delayedvetoable.go
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/DelayedVetoable.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/DelayedVetoable.json
 delete mode 100644 packages/contracts-bedrock/src/L1/DelayedVetoable.sol
 delete mode 100644 packages/contracts-bedrock/src/L1/interfaces/IDelayedVetoable.sol
 delete mode 100644 packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol

diff --git a/op-e2e/bindings/delayedvetoable.go b/op-e2e/bindings/delayedvetoable.go
deleted file mode 100644
index 989bb0278d20..000000000000
--- a/op-e2e/bindings/delayedvetoable.go
+++ /dev/null
@@ -1,928 +0,0 @@
-// Code generated - DO NOT EDIT.
-// This file is a generated binding and any manual changes will be lost.
-
-package bindings
-
-import (
-	"errors"
-	"math/big"
-	"strings"
-
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var (
-	_ = errors.New
-	_ = big.NewInt
-	_ = strings.NewReader
-	_ = ethereum.NotFound
-	_ = bind.Bind
-	_ = common.Big1
-	_ = types.BloomLookup
-	_ = event.NewSubscription
-)
-
-// DelayedVetoableMetaData contains all meta data concerning the DelayedVetoable contract.
-var DelayedVetoableMetaData = &bind.MetaData{
-	ABI: "[{\"type\":\"constructor\",\"inputs\":[{\"name\":\"vetoer_\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"initiator_\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"target_\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"operatingDelay_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"fallback\",\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"delay\",\"inputs\":[],\"outputs\":[{\"name\":\"delay_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"initiator\",\"inputs\":[],\"outputs\":[{\"name\":\"initiator_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"queuedAt\",\"inputs\":[{\"name\":\"callHash\",\"type\":\"bytes32\",\"internalType\":\"bytes32\"}],\"outputs\":[{\"name\":\"queuedAt_\",\"type\":\"uint256\",\"internalType\":\"uint256\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"target\",\"inputs\":[],\"outputs\":[{\"name\":\"target_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"function\",\"name\":\"version\",\"inputs\":[],\"outputs\":[{\"name\":\"\",\"type\":\"string\",\"internalType\":\"string\"}],\"stateMutability\":\"view\"},{\"type\":\"function\",\"name\":\"vetoer\",\"inputs\":[],\"outputs\":[{\"name\":\"vetoer_\",\"type\":\"address\",\"internalType\":\"address\"}],\"stateMutability\":\"nonpayable\"},{\"type\":\"event\",\"name\":\"DelayActivated\",\"inputs\":[{\"name\":\"delay\",\"type\":\"uint256\",\"indexed\":false,\"internalType\":\"uint256\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Forwarded\",\"inputs\":[{\"name\":\"callHash\",\"type\":\"bytes32\",\"indexed\":true,\"internalType\":\"bytes32\"},{\"name\":\"data\",\"type\":\"bytes\",\"indexed\":false,\"internalType\":\"bytes\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Initiated\",\"inputs\":[{\"name\":\"callHash\",\"type\":\"bytes32\",\"indexed\":true,\"internalType\":\"bytes32\"},{\"name\":\"data\",\"type\":\"bytes\",\"indexed\":false,\"internalType\":\"bytes\"}],\"anonymous\":false},{\"type\":\"event\",\"name\":\"Vetoed\",\"inputs\":[{\"name\":\"callHash\",\"type\":\"bytes32\",\"indexed\":true,\"internalType\":\"bytes32\"},{\"name\":\"data\",\"type\":\"bytes\",\"indexed\":false,\"internalType\":\"bytes\"}],\"anonymous\":false},{\"type\":\"error\",\"name\":\"ForwardingEarly\",\"inputs\":[]},{\"type\":\"error\",\"name\":\"Unauthorized\",\"inputs\":[{\"name\":\"expected\",\"type\":\"address\",\"internalType\":\"address\"},{\"name\":\"actual\",\"type\":\"address\",\"internalType\":\"address\"}]}]",
-	Bin: "0x61010060405234801561001157600080fd5b506040516108ff3803806108ff8339810160408190526100309161006e565b6001600160a01b0393841660a05291831660c05290911660805260e0526100b9565b80516001600160a01b038116811461006957600080fd5b919050565b6000806000806080858703121561008457600080fd5b61008d85610052565b935061009b60208601610052565b92506100a960408601610052565b6060959095015193969295505050565b60805160a05160c05160e0516107dc610123600039600061023f01526000818161015f01528181610205015281816102cd0152818161045801526105050152600081816101a001528181610384015261059d01526000818161057101526105ff01526107dc6000f3fe608060405234801561001057600080fd5b50600436106100725760003560e01c8063b912de5d11610050578063b912de5d14610111578063d4b8399214610124578063d8bff4401461012c57610072565b806354fd4d501461007c5780635c39fcc1146100ce5780636a42b8f8146100fb575b61007a610134565b005b6100b86040518060400160405280600581526020017f312e302e3000000000000000000000000000000000000000000000000000000081525081565b6040516100c591906106a7565b60405180910390f35b6100d66104fb565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020016100c5565b610103610532565b6040519081526020016100c5565b61010361011f36600461071a565b610540565b6100d6610567565b6100d6610593565b361580156101425750600054155b15610298573373ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000000016148015906101c357503373ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001614155b1561023d576040517f295a81c100000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000001660048201523360248201526044015b60405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000060008190556040519081527febf28bfb587e28dfffd9173cf71c32ba5d3f0544a0117b5539c9b274a5bba2a89060200160405180910390a1565b600080366040516102aa929190610733565b60405190819003902090503373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161480156103065750600081815260016020526040902054155b1561036c5760005460000361031e5761031e816105bf565b6000818152600160205260408082204290555182917f87a332a414acbc7da074543639ce7ae02ff1ea72e88379da9f261b080beb5a139161036191903690610743565b60405180910390a250565b3373ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000161480156103be575060008181526001602052604090205415155b15610406576000818152600160205260408082208290555182917fbede6852c1d97d93ff557f676de76670cd0dec861e7fe8beb13aa0ba2b0ab0409161036191903690610743565b600081815260016020526040812054900361048b576040517f295a81c100000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000166004820152336024820152604401610234565b60008054828252600160205260409091205442916104a891610790565b11156104e0576040517f43dc986d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000818152600160205260408120556104f8816105bf565b50565b60003361052757507f000000000000000000000000000000000000000000000000000000000000000090565b61052f610134565b90565b600033610527575060005490565b60003361055a575060009081526001602052604090205490565b610562610134565b919050565b60003361052757507f000000000000000000000000000000000000000000000000000000000000000090565b60003361052757507f000000000000000000000000000000000000000000000000000000000000000090565b807f4c109d85bcd0bb5c735b4be850953d652afe4cd9aa2e0b1426a65a4dcb2e12296000366040516105f2929190610743565b60405180910390a26000807f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16600036604051610645929190610733565b6000604051808303816000865af19150503d8060008114610682576040519150601f19603f3d011682016040523d82523d6000602084013e610687565b606091505b50909250905081151560010361069f57805160208201f35b805160208201fd5b600060208083528351808285015260005b818110156106d4578581018301518582016040015282016106b8565b818111156106e6576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60006020828403121561072c57600080fd5b5035919050565b8183823760009101908152919050565b60208152816020820152818360408301376000818301604090810191909152601f9092017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0160101919050565b600082198211156107ca577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b50019056fea164736f6c634300080f000a",
-}
-
-// DelayedVetoableABI is the input ABI used to generate the binding from.
-// Deprecated: Use DelayedVetoableMetaData.ABI instead.
-var DelayedVetoableABI = DelayedVetoableMetaData.ABI
-
-// DelayedVetoableBin is the compiled bytecode used for deploying new contracts.
-// Deprecated: Use DelayedVetoableMetaData.Bin instead.
-var DelayedVetoableBin = DelayedVetoableMetaData.Bin
-
-// DeployDelayedVetoable deploys a new Ethereum contract, binding an instance of DelayedVetoable to it.
-func DeployDelayedVetoable(auth *bind.TransactOpts, backend bind.ContractBackend, vetoer_ common.Address, initiator_ common.Address, target_ common.Address, operatingDelay_ *big.Int) (common.Address, *types.Transaction, *DelayedVetoable, error) {
-	parsed, err := DelayedVetoableMetaData.GetAbi()
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	if parsed == nil {
-		return common.Address{}, nil, nil, errors.New("GetABI returned nil")
-	}
-
-	address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex(DelayedVetoableBin), backend, vetoer_, initiator_, target_, operatingDelay_)
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	return address, tx, &DelayedVetoable{DelayedVetoableCaller: DelayedVetoableCaller{contract: contract}, DelayedVetoableTransactor: DelayedVetoableTransactor{contract: contract}, DelayedVetoableFilterer: DelayedVetoableFilterer{contract: contract}}, nil
-}
-
-// DelayedVetoable is an auto generated Go binding around an Ethereum contract.
-type DelayedVetoable struct {
-	DelayedVetoableCaller     // Read-only binding to the contract
-	DelayedVetoableTransactor // Write-only binding to the contract
-	DelayedVetoableFilterer   // Log filterer for contract events
-}
-
-// DelayedVetoableCaller is an auto generated read-only Go binding around an Ethereum contract.
-type DelayedVetoableCaller struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// DelayedVetoableTransactor is an auto generated write-only Go binding around an Ethereum contract.
-type DelayedVetoableTransactor struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// DelayedVetoableFilterer is an auto generated log filtering Go binding around an Ethereum contract events.
-type DelayedVetoableFilterer struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// DelayedVetoableSession is an auto generated Go binding around an Ethereum contract,
-// with pre-set call and transact options.
-type DelayedVetoableSession struct {
-	Contract     *DelayedVetoable  // Generic contract binding to set the session for
-	CallOpts     bind.CallOpts     // Call options to use throughout this session
-	TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
-}
-
-// DelayedVetoableCallerSession is an auto generated read-only Go binding around an Ethereum contract,
-// with pre-set call options.
-type DelayedVetoableCallerSession struct {
-	Contract *DelayedVetoableCaller // Generic contract caller binding to set the session for
-	CallOpts bind.CallOpts          // Call options to use throughout this session
-}
-
-// DelayedVetoableTransactorSession is an auto generated write-only Go binding around an Ethereum contract,
-// with pre-set transact options.
-type DelayedVetoableTransactorSession struct {
-	Contract     *DelayedVetoableTransactor // Generic contract transactor binding to set the session for
-	TransactOpts bind.TransactOpts          // Transaction auth options to use throughout this session
-}
-
-// DelayedVetoableRaw is an auto generated low-level Go binding around an Ethereum contract.
-type DelayedVetoableRaw struct {
-	Contract *DelayedVetoable // Generic contract binding to access the raw methods on
-}
-
-// DelayedVetoableCallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
-type DelayedVetoableCallerRaw struct {
-	Contract *DelayedVetoableCaller // Generic read-only contract binding to access the raw methods on
-}
-
-// DelayedVetoableTransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
-type DelayedVetoableTransactorRaw struct {
-	Contract *DelayedVetoableTransactor // Generic write-only contract binding to access the raw methods on
-}
-
-// NewDelayedVetoable creates a new instance of DelayedVetoable, bound to a specific deployed contract.
-func NewDelayedVetoable(address common.Address, backend bind.ContractBackend) (*DelayedVetoable, error) {
-	contract, err := bindDelayedVetoable(address, backend, backend, backend)
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoable{DelayedVetoableCaller: DelayedVetoableCaller{contract: contract}, DelayedVetoableTransactor: DelayedVetoableTransactor{contract: contract}, DelayedVetoableFilterer: DelayedVetoableFilterer{contract: contract}}, nil
-}
-
-// NewDelayedVetoableCaller creates a new read-only instance of DelayedVetoable, bound to a specific deployed contract.
-func NewDelayedVetoableCaller(address common.Address, caller bind.ContractCaller) (*DelayedVetoableCaller, error) {
-	contract, err := bindDelayedVetoable(address, caller, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoableCaller{contract: contract}, nil
-}
-
-// NewDelayedVetoableTransactor creates a new write-only instance of DelayedVetoable, bound to a specific deployed contract.
-func NewDelayedVetoableTransactor(address common.Address, transactor bind.ContractTransactor) (*DelayedVetoableTransactor, error) {
-	contract, err := bindDelayedVetoable(address, nil, transactor, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoableTransactor{contract: contract}, nil
-}
-
-// NewDelayedVetoableFilterer creates a new log filterer instance of DelayedVetoable, bound to a specific deployed contract.
-func NewDelayedVetoableFilterer(address common.Address, filterer bind.ContractFilterer) (*DelayedVetoableFilterer, error) {
-	contract, err := bindDelayedVetoable(address, nil, nil, filterer)
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoableFilterer{contract: contract}, nil
-}
-
-// bindDelayedVetoable binds a generic wrapper to an already deployed contract.
-func bindDelayedVetoable(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
-	parsed, err := abi.JSON(strings.NewReader(DelayedVetoableABI))
-	if err != nil {
-		return nil, err
-	}
-	return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_DelayedVetoable *DelayedVetoableRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-	return _DelayedVetoable.Contract.DelayedVetoableCaller.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_DelayedVetoable *DelayedVetoableRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.DelayedVetoableTransactor.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_DelayedVetoable *DelayedVetoableRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.DelayedVetoableTransactor.contract.Transact(opts, method, params...)
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_DelayedVetoable *DelayedVetoableCallerRaw) Call(opts *bind.CallOpts, result *[]interface{}, method string, params ...interface{}) error {
-	return _DelayedVetoable.Contract.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_DelayedVetoable *DelayedVetoableTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_DelayedVetoable *DelayedVetoableTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.contract.Transact(opts, method, params...)
-}
-
-// Version is a free data retrieval call binding the contract method 0x54fd4d50.
-//
-// Solidity: function version() view returns(string)
-func (_DelayedVetoable *DelayedVetoableCaller) Version(opts *bind.CallOpts) (string, error) {
-	var out []interface{}
-	err := _DelayedVetoable.contract.Call(opts, &out, "version")
-
-	if err != nil {
-		return *new(string), err
-	}
-
-	out0 := *abi.ConvertType(out[0], new(string)).(*string)
-
-	return out0, err
-
-}
-
-// Version is a free data retrieval call binding the contract method 0x54fd4d50.
-//
-// Solidity: function version() view returns(string)
-func (_DelayedVetoable *DelayedVetoableSession) Version() (string, error) {
-	return _DelayedVetoable.Contract.Version(&_DelayedVetoable.CallOpts)
-}
-
-// Version is a free data retrieval call binding the contract method 0x54fd4d50.
-//
-// Solidity: function version() view returns(string)
-func (_DelayedVetoable *DelayedVetoableCallerSession) Version() (string, error) {
-	return _DelayedVetoable.Contract.Version(&_DelayedVetoable.CallOpts)
-}
-
-// Delay is a paid mutator transaction binding the contract method 0x6a42b8f8.
-//
-// Solidity: function delay() returns(uint256 delay_)
-func (_DelayedVetoable *DelayedVetoableTransactor) Delay(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _DelayedVetoable.contract.Transact(opts, "delay")
-}
-
-// Delay is a paid mutator transaction binding the contract method 0x6a42b8f8.
-//
-// Solidity: function delay() returns(uint256 delay_)
-func (_DelayedVetoable *DelayedVetoableSession) Delay() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Delay(&_DelayedVetoable.TransactOpts)
-}
-
-// Delay is a paid mutator transaction binding the contract method 0x6a42b8f8.
-//
-// Solidity: function delay() returns(uint256 delay_)
-func (_DelayedVetoable *DelayedVetoableTransactorSession) Delay() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Delay(&_DelayedVetoable.TransactOpts)
-}
-
-// Initiator is a paid mutator transaction binding the contract method 0x5c39fcc1.
-//
-// Solidity: function initiator() returns(address initiator_)
-func (_DelayedVetoable *DelayedVetoableTransactor) Initiator(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _DelayedVetoable.contract.Transact(opts, "initiator")
-}
-
-// Initiator is a paid mutator transaction binding the contract method 0x5c39fcc1.
-//
-// Solidity: function initiator() returns(address initiator_)
-func (_DelayedVetoable *DelayedVetoableSession) Initiator() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Initiator(&_DelayedVetoable.TransactOpts)
-}
-
-// Initiator is a paid mutator transaction binding the contract method 0x5c39fcc1.
-//
-// Solidity: function initiator() returns(address initiator_)
-func (_DelayedVetoable *DelayedVetoableTransactorSession) Initiator() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Initiator(&_DelayedVetoable.TransactOpts)
-}
-
-// QueuedAt is a paid mutator transaction binding the contract method 0xb912de5d.
-//
-// Solidity: function queuedAt(bytes32 callHash) returns(uint256 queuedAt_)
-func (_DelayedVetoable *DelayedVetoableTransactor) QueuedAt(opts *bind.TransactOpts, callHash [32]byte) (*types.Transaction, error) {
-	return _DelayedVetoable.contract.Transact(opts, "queuedAt", callHash)
-}
-
-// QueuedAt is a paid mutator transaction binding the contract method 0xb912de5d.
-//
-// Solidity: function queuedAt(bytes32 callHash) returns(uint256 queuedAt_)
-func (_DelayedVetoable *DelayedVetoableSession) QueuedAt(callHash [32]byte) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.QueuedAt(&_DelayedVetoable.TransactOpts, callHash)
-}
-
-// QueuedAt is a paid mutator transaction binding the contract method 0xb912de5d.
-//
-// Solidity: function queuedAt(bytes32 callHash) returns(uint256 queuedAt_)
-func (_DelayedVetoable *DelayedVetoableTransactorSession) QueuedAt(callHash [32]byte) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.QueuedAt(&_DelayedVetoable.TransactOpts, callHash)
-}
-
-// Target is a paid mutator transaction binding the contract method 0xd4b83992.
-//
-// Solidity: function target() returns(address target_)
-func (_DelayedVetoable *DelayedVetoableTransactor) Target(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _DelayedVetoable.contract.Transact(opts, "target")
-}
-
-// Target is a paid mutator transaction binding the contract method 0xd4b83992.
-//
-// Solidity: function target() returns(address target_)
-func (_DelayedVetoable *DelayedVetoableSession) Target() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Target(&_DelayedVetoable.TransactOpts)
-}
-
-// Target is a paid mutator transaction binding the contract method 0xd4b83992.
-//
-// Solidity: function target() returns(address target_)
-func (_DelayedVetoable *DelayedVetoableTransactorSession) Target() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Target(&_DelayedVetoable.TransactOpts)
-}
-
-// Vetoer is a paid mutator transaction binding the contract method 0xd8bff440.
-//
-// Solidity: function vetoer() returns(address vetoer_)
-func (_DelayedVetoable *DelayedVetoableTransactor) Vetoer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _DelayedVetoable.contract.Transact(opts, "vetoer")
-}
-
-// Vetoer is a paid mutator transaction binding the contract method 0xd8bff440.
-//
-// Solidity: function vetoer() returns(address vetoer_)
-func (_DelayedVetoable *DelayedVetoableSession) Vetoer() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Vetoer(&_DelayedVetoable.TransactOpts)
-}
-
-// Vetoer is a paid mutator transaction binding the contract method 0xd8bff440.
-//
-// Solidity: function vetoer() returns(address vetoer_)
-func (_DelayedVetoable *DelayedVetoableTransactorSession) Vetoer() (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Vetoer(&_DelayedVetoable.TransactOpts)
-}
-
-// Fallback is a paid mutator transaction binding the contract fallback function.
-//
-// Solidity: fallback() returns()
-func (_DelayedVetoable *DelayedVetoableTransactor) Fallback(opts *bind.TransactOpts, calldata []byte) (*types.Transaction, error) {
-	return _DelayedVetoable.contract.RawTransact(opts, calldata)
-}
-
-// Fallback is a paid mutator transaction binding the contract fallback function.
-//
-// Solidity: fallback() returns()
-func (_DelayedVetoable *DelayedVetoableSession) Fallback(calldata []byte) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Fallback(&_DelayedVetoable.TransactOpts, calldata)
-}
-
-// Fallback is a paid mutator transaction binding the contract fallback function.
-//
-// Solidity: fallback() returns()
-func (_DelayedVetoable *DelayedVetoableTransactorSession) Fallback(calldata []byte) (*types.Transaction, error) {
-	return _DelayedVetoable.Contract.Fallback(&_DelayedVetoable.TransactOpts, calldata)
-}
-
-// DelayedVetoableDelayActivatedIterator is returned from FilterDelayActivated and is used to iterate over the raw logs and unpacked data for DelayActivated events raised by the DelayedVetoable contract.
-type DelayedVetoableDelayActivatedIterator struct {
-	Event *DelayedVetoableDelayActivated // Event containing the contract specifics and raw log
-
-	contract *bind.BoundContract // Generic contract to use for unpacking event data
-	event    string              // Event name to use for unpacking event data
-
-	logs chan types.Log        // Log channel receiving the found contract events
-	sub  ethereum.Subscription // Subscription for errors, completion and termination
-	done bool                  // Whether the subscription completed delivering logs
-	fail error                 // Occurred error to stop iteration
-}
-
-// Next advances the iterator to the subsequent event, returning whether there
-// are any more events found. In case of a retrieval or parsing error, false is
-// returned and Error() can be queried for the exact failure.
-func (it *DelayedVetoableDelayActivatedIterator) Next() bool {
-	// If the iterator failed, stop iterating
-	if it.fail != nil {
-		return false
-	}
-	// If the iterator completed, deliver directly whatever's available
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(DelayedVetoableDelayActivated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-	// Iterator still in progress, wait for either a data or an error event
-	select {
-	case log := <-it.logs:
-		it.Event = new(DelayedVetoableDelayActivated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-// Error returns any retrieval or parsing error occurred during filtering.
-func (it *DelayedVetoableDelayActivatedIterator) Error() error {
-	return it.fail
-}
-
-// Close terminates the iteration process, releasing any pending underlying
-// resources.
-func (it *DelayedVetoableDelayActivatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-// DelayedVetoableDelayActivated represents a DelayActivated event raised by the DelayedVetoable contract.
-type DelayedVetoableDelayActivated struct {
-	Delay *big.Int
-	Raw   types.Log // Blockchain specific contextual infos
-}
-
-// FilterDelayActivated is a free log retrieval operation binding the contract event 0xebf28bfb587e28dfffd9173cf71c32ba5d3f0544a0117b5539c9b274a5bba2a8.
-//
-// Solidity: event DelayActivated(uint256 delay)
-func (_DelayedVetoable *DelayedVetoableFilterer) FilterDelayActivated(opts *bind.FilterOpts) (*DelayedVetoableDelayActivatedIterator, error) {
-
-	logs, sub, err := _DelayedVetoable.contract.FilterLogs(opts, "DelayActivated")
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoableDelayActivatedIterator{contract: _DelayedVetoable.contract, event: "DelayActivated", logs: logs, sub: sub}, nil
-}
-
-// WatchDelayActivated is a free log subscription operation binding the contract event 0xebf28bfb587e28dfffd9173cf71c32ba5d3f0544a0117b5539c9b274a5bba2a8.
-//
-// Solidity: event DelayActivated(uint256 delay)
-func (_DelayedVetoable *DelayedVetoableFilterer) WatchDelayActivated(opts *bind.WatchOpts, sink chan<- *DelayedVetoableDelayActivated) (event.Subscription, error) {
-
-	logs, sub, err := _DelayedVetoable.contract.WatchLogs(opts, "DelayActivated")
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-				// New log arrived, parse the event and forward to the user
-				event := new(DelayedVetoableDelayActivated)
-				if err := _DelayedVetoable.contract.UnpackLog(event, "DelayActivated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-// ParseDelayActivated is a log parse operation binding the contract event 0xebf28bfb587e28dfffd9173cf71c32ba5d3f0544a0117b5539c9b274a5bba2a8.
-//
-// Solidity: event DelayActivated(uint256 delay)
-func (_DelayedVetoable *DelayedVetoableFilterer) ParseDelayActivated(log types.Log) (*DelayedVetoableDelayActivated, error) {
-	event := new(DelayedVetoableDelayActivated)
-	if err := _DelayedVetoable.contract.UnpackLog(event, "DelayActivated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-// DelayedVetoableForwardedIterator is returned from FilterForwarded and is used to iterate over the raw logs and unpacked data for Forwarded events raised by the DelayedVetoable contract.
-type DelayedVetoableForwardedIterator struct {
-	Event *DelayedVetoableForwarded // Event containing the contract specifics and raw log
-
-	contract *bind.BoundContract // Generic contract to use for unpacking event data
-	event    string              // Event name to use for unpacking event data
-
-	logs chan types.Log        // Log channel receiving the found contract events
-	sub  ethereum.Subscription // Subscription for errors, completion and termination
-	done bool                  // Whether the subscription completed delivering logs
-	fail error                 // Occurred error to stop iteration
-}
-
-// Next advances the iterator to the subsequent event, returning whether there
-// are any more events found. In case of a retrieval or parsing error, false is
-// returned and Error() can be queried for the exact failure.
-func (it *DelayedVetoableForwardedIterator) Next() bool {
-	// If the iterator failed, stop iterating
-	if it.fail != nil {
-		return false
-	}
-	// If the iterator completed, deliver directly whatever's available
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(DelayedVetoableForwarded)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-	// Iterator still in progress, wait for either a data or an error event
-	select {
-	case log := <-it.logs:
-		it.Event = new(DelayedVetoableForwarded)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-// Error returns any retrieval or parsing error occurred during filtering.
-func (it *DelayedVetoableForwardedIterator) Error() error {
-	return it.fail
-}
-
-// Close terminates the iteration process, releasing any pending underlying
-// resources.
-func (it *DelayedVetoableForwardedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-// DelayedVetoableForwarded represents a Forwarded event raised by the DelayedVetoable contract.
-type DelayedVetoableForwarded struct {
-	CallHash [32]byte
-	Data     []byte
-	Raw      types.Log // Blockchain specific contextual infos
-}
-
-// FilterForwarded is a free log retrieval operation binding the contract event 0x4c109d85bcd0bb5c735b4be850953d652afe4cd9aa2e0b1426a65a4dcb2e1229.
-//
-// Solidity: event Forwarded(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) FilterForwarded(opts *bind.FilterOpts, callHash [][32]byte) (*DelayedVetoableForwardedIterator, error) {
-
-	var callHashRule []interface{}
-	for _, callHashItem := range callHash {
-		callHashRule = append(callHashRule, callHashItem)
-	}
-
-	logs, sub, err := _DelayedVetoable.contract.FilterLogs(opts, "Forwarded", callHashRule)
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoableForwardedIterator{contract: _DelayedVetoable.contract, event: "Forwarded", logs: logs, sub: sub}, nil
-}
-
-// WatchForwarded is a free log subscription operation binding the contract event 0x4c109d85bcd0bb5c735b4be850953d652afe4cd9aa2e0b1426a65a4dcb2e1229.
-//
-// Solidity: event Forwarded(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) WatchForwarded(opts *bind.WatchOpts, sink chan<- *DelayedVetoableForwarded, callHash [][32]byte) (event.Subscription, error) {
-
-	var callHashRule []interface{}
-	for _, callHashItem := range callHash {
-		callHashRule = append(callHashRule, callHashItem)
-	}
-
-	logs, sub, err := _DelayedVetoable.contract.WatchLogs(opts, "Forwarded", callHashRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-				// New log arrived, parse the event and forward to the user
-				event := new(DelayedVetoableForwarded)
-				if err := _DelayedVetoable.contract.UnpackLog(event, "Forwarded", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-// ParseForwarded is a log parse operation binding the contract event 0x4c109d85bcd0bb5c735b4be850953d652afe4cd9aa2e0b1426a65a4dcb2e1229.
-//
-// Solidity: event Forwarded(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) ParseForwarded(log types.Log) (*DelayedVetoableForwarded, error) {
-	event := new(DelayedVetoableForwarded)
-	if err := _DelayedVetoable.contract.UnpackLog(event, "Forwarded", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-// DelayedVetoableInitiatedIterator is returned from FilterInitiated and is used to iterate over the raw logs and unpacked data for Initiated events raised by the DelayedVetoable contract.
-type DelayedVetoableInitiatedIterator struct {
-	Event *DelayedVetoableInitiated // Event containing the contract specifics and raw log
-
-	contract *bind.BoundContract // Generic contract to use for unpacking event data
-	event    string              // Event name to use for unpacking event data
-
-	logs chan types.Log        // Log channel receiving the found contract events
-	sub  ethereum.Subscription // Subscription for errors, completion and termination
-	done bool                  // Whether the subscription completed delivering logs
-	fail error                 // Occurred error to stop iteration
-}
-
-// Next advances the iterator to the subsequent event, returning whether there
-// are any more events found. In case of a retrieval or parsing error, false is
-// returned and Error() can be queried for the exact failure.
-func (it *DelayedVetoableInitiatedIterator) Next() bool {
-	// If the iterator failed, stop iterating
-	if it.fail != nil {
-		return false
-	}
-	// If the iterator completed, deliver directly whatever's available
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(DelayedVetoableInitiated)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-	// Iterator still in progress, wait for either a data or an error event
-	select {
-	case log := <-it.logs:
-		it.Event = new(DelayedVetoableInitiated)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-// Error returns any retrieval or parsing error occurred during filtering.
-func (it *DelayedVetoableInitiatedIterator) Error() error {
-	return it.fail
-}
-
-// Close terminates the iteration process, releasing any pending underlying
-// resources.
-func (it *DelayedVetoableInitiatedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-// DelayedVetoableInitiated represents a Initiated event raised by the DelayedVetoable contract.
-type DelayedVetoableInitiated struct {
-	CallHash [32]byte
-	Data     []byte
-	Raw      types.Log // Blockchain specific contextual infos
-}
-
-// FilterInitiated is a free log retrieval operation binding the contract event 0x87a332a414acbc7da074543639ce7ae02ff1ea72e88379da9f261b080beb5a13.
-//
-// Solidity: event Initiated(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) FilterInitiated(opts *bind.FilterOpts, callHash [][32]byte) (*DelayedVetoableInitiatedIterator, error) {
-
-	var callHashRule []interface{}
-	for _, callHashItem := range callHash {
-		callHashRule = append(callHashRule, callHashItem)
-	}
-
-	logs, sub, err := _DelayedVetoable.contract.FilterLogs(opts, "Initiated", callHashRule)
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoableInitiatedIterator{contract: _DelayedVetoable.contract, event: "Initiated", logs: logs, sub: sub}, nil
-}
-
-// WatchInitiated is a free log subscription operation binding the contract event 0x87a332a414acbc7da074543639ce7ae02ff1ea72e88379da9f261b080beb5a13.
-//
-// Solidity: event Initiated(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) WatchInitiated(opts *bind.WatchOpts, sink chan<- *DelayedVetoableInitiated, callHash [][32]byte) (event.Subscription, error) {
-
-	var callHashRule []interface{}
-	for _, callHashItem := range callHash {
-		callHashRule = append(callHashRule, callHashItem)
-	}
-
-	logs, sub, err := _DelayedVetoable.contract.WatchLogs(opts, "Initiated", callHashRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-				// New log arrived, parse the event and forward to the user
-				event := new(DelayedVetoableInitiated)
-				if err := _DelayedVetoable.contract.UnpackLog(event, "Initiated", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-// ParseInitiated is a log parse operation binding the contract event 0x87a332a414acbc7da074543639ce7ae02ff1ea72e88379da9f261b080beb5a13.
-//
-// Solidity: event Initiated(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) ParseInitiated(log types.Log) (*DelayedVetoableInitiated, error) {
-	event := new(DelayedVetoableInitiated)
-	if err := _DelayedVetoable.contract.UnpackLog(event, "Initiated", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
-
-// DelayedVetoableVetoedIterator is returned from FilterVetoed and is used to iterate over the raw logs and unpacked data for Vetoed events raised by the DelayedVetoable contract.
-type DelayedVetoableVetoedIterator struct {
-	Event *DelayedVetoableVetoed // Event containing the contract specifics and raw log
-
-	contract *bind.BoundContract // Generic contract to use for unpacking event data
-	event    string              // Event name to use for unpacking event data
-
-	logs chan types.Log        // Log channel receiving the found contract events
-	sub  ethereum.Subscription // Subscription for errors, completion and termination
-	done bool                  // Whether the subscription completed delivering logs
-	fail error                 // Occurred error to stop iteration
-}
-
-// Next advances the iterator to the subsequent event, returning whether there
-// are any more events found. In case of a retrieval or parsing error, false is
-// returned and Error() can be queried for the exact failure.
-func (it *DelayedVetoableVetoedIterator) Next() bool {
-	// If the iterator failed, stop iterating
-	if it.fail != nil {
-		return false
-	}
-	// If the iterator completed, deliver directly whatever's available
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(DelayedVetoableVetoed)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-	// Iterator still in progress, wait for either a data or an error event
-	select {
-	case log := <-it.logs:
-		it.Event = new(DelayedVetoableVetoed)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-// Error returns any retrieval or parsing error occurred during filtering.
-func (it *DelayedVetoableVetoedIterator) Error() error {
-	return it.fail
-}
-
-// Close terminates the iteration process, releasing any pending underlying
-// resources.
-func (it *DelayedVetoableVetoedIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-// DelayedVetoableVetoed represents a Vetoed event raised by the DelayedVetoable contract.
-type DelayedVetoableVetoed struct {
-	CallHash [32]byte
-	Data     []byte
-	Raw      types.Log // Blockchain specific contextual infos
-}
-
-// FilterVetoed is a free log retrieval operation binding the contract event 0xbede6852c1d97d93ff557f676de76670cd0dec861e7fe8beb13aa0ba2b0ab040.
-//
-// Solidity: event Vetoed(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) FilterVetoed(opts *bind.FilterOpts, callHash [][32]byte) (*DelayedVetoableVetoedIterator, error) {
-
-	var callHashRule []interface{}
-	for _, callHashItem := range callHash {
-		callHashRule = append(callHashRule, callHashItem)
-	}
-
-	logs, sub, err := _DelayedVetoable.contract.FilterLogs(opts, "Vetoed", callHashRule)
-	if err != nil {
-		return nil, err
-	}
-	return &DelayedVetoableVetoedIterator{contract: _DelayedVetoable.contract, event: "Vetoed", logs: logs, sub: sub}, nil
-}
-
-// WatchVetoed is a free log subscription operation binding the contract event 0xbede6852c1d97d93ff557f676de76670cd0dec861e7fe8beb13aa0ba2b0ab040.
-//
-// Solidity: event Vetoed(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) WatchVetoed(opts *bind.WatchOpts, sink chan<- *DelayedVetoableVetoed, callHash [][32]byte) (event.Subscription, error) {
-
-	var callHashRule []interface{}
-	for _, callHashItem := range callHash {
-		callHashRule = append(callHashRule, callHashItem)
-	}
-
-	logs, sub, err := _DelayedVetoable.contract.WatchLogs(opts, "Vetoed", callHashRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-				// New log arrived, parse the event and forward to the user
-				event := new(DelayedVetoableVetoed)
-				if err := _DelayedVetoable.contract.UnpackLog(event, "Vetoed", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}
-
-// ParseVetoed is a log parse operation binding the contract event 0xbede6852c1d97d93ff557f676de76670cd0dec861e7fe8beb13aa0ba2b0ab040.
-//
-// Solidity: event Vetoed(bytes32 indexed callHash, bytes data)
-func (_DelayedVetoable *DelayedVetoableFilterer) ParseVetoed(log types.Log) (*DelayedVetoableVetoed, error) {
-	event := new(DelayedVetoableVetoed)
-	if err := _DelayedVetoable.contract.UnpackLog(event, "Vetoed", log); err != nil {
-		return nil, err
-	}
-	event.Raw = log
-	return event, nil
-}
diff --git a/packages/contracts-bedrock/snapshots/abi/DelayedVetoable.json b/packages/contracts-bedrock/snapshots/abi/DelayedVetoable.json
deleted file mode 100644
index d76d1c8b108b..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/DelayedVetoable.json
+++ /dev/null
@@ -1,207 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_vetoer",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_initiator",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_target",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_operatingDelay",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "stateMutability": "nonpayable",
-    "type": "fallback"
-  },
-  {
-    "inputs": [],
-    "name": "delay",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "delay_",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "initiator",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "initiator_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_callHash",
-        "type": "bytes32"
-      }
-    ],
-    "name": "queuedAt",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "queuedAt_",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "target",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "target_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "vetoer",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "vetoer_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "delay",
-        "type": "uint256"
-      }
-    ],
-    "name": "DelayActivated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "callHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "Forwarded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "callHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "Initiated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "callHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "Vetoed",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "ForwardingEarly",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "expected",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "actual",
-        "type": "address"
-      }
-    ],
-    "name": "Unauthorized",
-    "type": "error"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index fb7b6d824392..e96fa687e9c6 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -3,10 +3,6 @@
     "initCodeHash": "0xbd00d6568abab3e7fc211c40d682862242f25493010a4a097bd1f3b45c8c87c3",
     "sourceCodeHash": "0x58b587034a67b4bb718abbaded8ac23b082c0971105874bcc42c23f051c67f6e"
   },
-  "src/L1/DelayedVetoable.sol": {
-    "initCodeHash": "0x9fe8ade6f6332262ff1f3539ac0bf57660edbad3cf4c4cb230c2ddac18aa0a3f",
-    "sourceCodeHash": "0x30e83a535ef27b2e900c831c4e1a4ec2750195350011c4fdacda1da9db2d167b"
-  },
   "src/L1/L1CrossDomainMessenger.sol": {
     "initCodeHash": "0x2e9cb3ceb5e55341b311f0666ef7655df4fafae75afdfbcd701cd9c9b2b017d5",
     "sourceCodeHash": "0x848ec3774be17bcc8ba65a23d08e35e979b3f39f9d2ac8a810188f945c69c9ea"
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/DelayedVetoable.json b/packages/contracts-bedrock/snapshots/storageLayout/DelayedVetoable.json
deleted file mode 100644
index 7da3cbbe5bd6..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/DelayedVetoable.json
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-  {
-    "bytes": "32",
-    "label": "_delay",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint256"
-  },
-  {
-    "bytes": "32",
-    "label": "_queuedAt",
-    "offset": 0,
-    "slot": "1",
-    "type": "mapping(bytes32 => uint256)"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/L1/DelayedVetoable.sol b/packages/contracts-bedrock/src/L1/DelayedVetoable.sol
deleted file mode 100644
index d968af214975..000000000000
--- a/packages/contracts-bedrock/src/L1/DelayedVetoable.sol
+++ /dev/null
@@ -1,193 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-// Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-
-/// @title DelayedVetoable
-/// @notice This contract enables a delay before a call is forwarded to a target contract, and during the delay period
-///         the call can be vetoed by the authorized vetoer.
-///         This contract does not support value transfers, only data is forwarded.
-///         Additionally, this contract cannot be used to forward calls with data beginning with the function selector
-///         of the queuedAt(bytes32) function. This is because of input validation checks which solidity performs at
-///         runtime on functions which take an argument.
-contract DelayedVetoable is ISemver {
-    /// @notice Error for when attempting to forward too early.
-    error ForwardingEarly();
-
-    /// @notice Error for unauthorized calls.
-    error Unauthorized(address expected, address actual);
-
-    /// @notice An event that is emitted when the delay is activated.
-    /// @param delay The delay that was activated.
-    event DelayActivated(uint256 delay);
-
-    /// @notice An event that is emitted when a call is initiated.
-    /// @param callHash The hash of the call data.
-    /// @param data The data of the initiated call.
-    event Initiated(bytes32 indexed callHash, bytes data);
-
-    /// @notice An event that is emitted each time a call is forwarded.
-    /// @param callHash The hash of the call data.
-    /// @param data The data forwarded to the target.
-    event Forwarded(bytes32 indexed callHash, bytes data);
-
-    /// @notice An event that is emitted each time a call is vetoed.
-    /// @param callHash The hash of the call data.
-    /// @param data The data forwarded to the target.
-    event Vetoed(bytes32 indexed callHash, bytes data);
-
-    /// @notice The address that all calls are forwarded to after the delay.
-    address internal immutable TARGET;
-
-    /// @notice The address that can veto a call.
-    address internal immutable VETOER;
-
-    /// @notice The address that can initiate a call.
-    address internal immutable INITIATOR;
-
-    /// @notice The delay which will be set after the initial system deployment is completed.
-    uint256 internal immutable OPERATING_DELAY;
-
-    /// @notice The current amount of time to wait before forwarding a call.
-    uint256 internal _delay;
-
-    /// @notice The time that a call was initiated.
-    mapping(bytes32 => uint256) internal _queuedAt;
-
-    /// @notice A modifier that reverts if not called by the vetoer or by address(0) to allow
-    ///         eth_call to interact with this proxy without needing to use low-level storage
-    ///         inspection. We assume that nobody is able to trigger calls from address(0) during
-    ///         normal EVM execution.
-    modifier readOrHandle() {
-        if (msg.sender == address(0)) {
-            _;
-        } else {
-            // This WILL halt the call frame on completion.
-            _handleCall();
-        }
-    }
-
-    /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.2
-    string public constant version = "1.0.1-beta.2";
-
-    /// @notice Sets the target admin during contract deployment.
-    /// @param _vetoer Address of the vetoer.
-    /// @param _initiator Address of the initiator.
-    /// @param _target Address of the target.
-    /// @param _operatingDelay Time to delay when the system is operational.
-    constructor(address _vetoer, address _initiator, address _target, uint256 _operatingDelay) {
-        // Note that the _delay value is not set here. Having an initial delay of 0 is helpful
-        // during the deployment of a new system.
-        VETOER = _vetoer;
-        INITIATOR = _initiator;
-        TARGET = _target;
-        OPERATING_DELAY = _operatingDelay;
-    }
-
-    /// @notice Gets the initiator
-    /// @return initiator_ Initiator address.
-    function initiator() external virtual readOrHandle returns (address initiator_) {
-        initiator_ = INITIATOR;
-    }
-
-    //// @notice Queries the vetoer address.
-    /// @return vetoer_ Vetoer address.
-    function vetoer() external virtual readOrHandle returns (address vetoer_) {
-        vetoer_ = VETOER;
-    }
-
-    //// @notice Queries the target address.
-    /// @return target_ Target address.
-    function target() external readOrHandle returns (address target_) {
-        target_ = TARGET;
-    }
-
-    /// @notice Gets the delay
-    /// @return delay_ Delay address.
-    function delay() external readOrHandle returns (uint256 delay_) {
-        delay_ = _delay;
-    }
-
-    /// @notice Gets entries in the _queuedAt mapping.
-    /// @param _callHash The hash of the call data.
-    /// @return queuedAt_ The time the callHash was recorded.
-    function queuedAt(bytes32 _callHash) external readOrHandle returns (uint256 queuedAt_) {
-        queuedAt_ = _queuedAt[_callHash];
-    }
-
-    /// @notice Used for all calls that pass data to the contract.
-    fallback() external {
-        _handleCall();
-    }
-
-    /// @notice Receives all calls other than those made by the vetoer.
-    ///         This enables transparent initiation and forwarding of calls to the target and avoids
-    ///         the need for additional layers of abi encoding.
-    function _handleCall() internal {
-        // The initiator and vetoer activate the delay by passing in null data.
-        if (msg.data.length == 0 && _delay == 0) {
-            if (msg.sender != INITIATOR && msg.sender != VETOER) {
-                revert Unauthorized(INITIATOR, msg.sender);
-            }
-            _delay = OPERATING_DELAY;
-            emit DelayActivated(_delay);
-            return;
-        }
-
-        bytes32 callHash = keccak256(msg.data);
-
-        // Case 1: The initiator is calling the contract to initiate a call.
-        if (msg.sender == INITIATOR && _queuedAt[callHash] == 0) {
-            if (_delay == 0) {
-                // This forward function will halt the call frame on completion.
-                _forwardAndHalt(callHash);
-            }
-            _queuedAt[callHash] = block.timestamp;
-            emit Initiated(callHash, msg.data);
-            return;
-        }
-
-        // Case 2: The vetoer is calling the contract to veto a call.
-        // Note: The vetoer retains the ability to veto even after the delay has passed. This makes censoring the vetoer
-        //       more costly, as there is no time limit after which their transaction can be included.
-        if (msg.sender == VETOER && _queuedAt[callHash] != 0) {
-            delete _queuedAt[callHash];
-            emit Vetoed(callHash, msg.data);
-            return;
-        }
-
-        // Case 3: The call is from an unpermissioned actor. We'll forward the call if the delay has
-        // passed.
-        if (_queuedAt[callHash] == 0) {
-            // The call has not been initiated, so we'll treat this is an unauthorized initiation attempt.
-            revert Unauthorized(INITIATOR, msg.sender);
-        }
-
-        if (_queuedAt[callHash] + _delay > block.timestamp) {
-            // Not enough time has passed, so we'll revert.
-            revert ForwardingEarly();
-        }
-
-        // Delete the call to prevent replays
-        delete _queuedAt[callHash];
-        _forwardAndHalt(callHash);
-    }
-
-    /// @notice Forwards the call to the target and halts the call frame.
-    function _forwardAndHalt(bytes32 _callHash) internal {
-        // Forward the call
-        emit Forwarded(_callHash, msg.data);
-        (bool success, bytes memory returndata) = TARGET.call(msg.data);
-        if (success == true) {
-            assembly {
-                return(add(returndata, 0x20), mload(returndata))
-            }
-        } else {
-            assembly {
-                revert(add(returndata, 0x20), mload(returndata))
-            }
-        }
-    }
-}
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IDelayedVetoable.sol b/packages/contracts-bedrock/src/L1/interfaces/IDelayedVetoable.sol
deleted file mode 100644
index 53fd16812763..000000000000
--- a/packages/contracts-bedrock/src/L1/interfaces/IDelayedVetoable.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-interface IDelayedVetoable {
-    error ForwardingEarly();
-    error Unauthorized(address expected, address actual);
-
-    event DelayActivated(uint256 delay);
-    event Forwarded(bytes32 indexed callHash, bytes data);
-    event Initiated(bytes32 indexed callHash, bytes data);
-    event Vetoed(bytes32 indexed callHash, bytes data);
-
-    fallback() external;
-
-    function delay() external returns (uint256 delay_);
-    function initiator() external returns (address initiator_);
-    function queuedAt(bytes32 _callHash) external returns (uint256 queuedAt_);
-    function target() external returns (address target_);
-    function version() external view returns (string memory);
-    function vetoer() external returns (address vetoer_);
-
-    function __constructor__(address _vetoer, address _initiator, address _target, uint256 _operatingDelay) external;
-}
diff --git a/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol b/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
deleted file mode 100644
index a0dd2d8c138e..000000000000
--- a/packages/contracts-bedrock/test/L1/DelayedVetoable.t.sol
+++ /dev/null
@@ -1,262 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { Test } from "forge-std/Test.sol";
-import { IDelayedVetoable } from "src/L1/interfaces/IDelayedVetoable.sol";
-import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
-
-contract DelayedVetoable_Init is Test {
-    error Unauthorized(address expected, address actual);
-    error ForwardingEarly();
-
-    event Initiated(bytes32 indexed callHash, bytes data);
-    event Forwarded(bytes32 indexed callHash, bytes data);
-    event Vetoed(bytes32 indexed callHash, bytes data);
-
-    address target;
-    address initiator;
-    address vetoer;
-    uint256 operatingDelay = 14 days;
-    IDelayedVetoable delayedVetoable;
-
-    function setUp() public {
-        initiator = makeAddr("initiator");
-        vetoer = makeAddr("vetoer");
-        target = makeAddr("target");
-        vm.deal(initiator, 10000 ether);
-        vm.deal(vetoer, 10000 ether);
-
-        delayedVetoable = IDelayedVetoable(
-            DeployUtils.create1({
-                _name: "DelayedVetoable",
-                _args: DeployUtils.encodeConstructor(
-                    abi.encodeCall(IDelayedVetoable.__constructor__, (vetoer, initiator, address(target), operatingDelay))
-                )
-            })
-        );
-
-        // Most tests will use the operating delay, so we call as the initiator with null data
-        // to set the delay. For tests that need to use the initial zero delay, we'll modify the
-        // value in storage.
-        vm.prank(initiator);
-        (bool success,) = address(delayedVetoable).call(hex"");
-        assertTrue(success);
-    }
-
-    /// @dev This function is used to prevent initiating the delay unintentionally.
-    ///      It should only be used on tests prior to the delay being activated.
-    /// @param data The data to be used in the call.
-    function assumeNonzeroData(bytes memory data) internal pure {
-        vm.assume(data.length > 0);
-    }
-
-    /// @dev This function is used to ensure that the data does not clash with the queuedAt function selector.
-    /// @param data The data to be used in the call.
-    function assumeNoClash(bytes calldata data) internal pure {
-        if (data.length >= 4) {
-            vm.assume(bytes4(data[0:4]) != bytes4(keccak256("queuedAt(bytes32)")));
-        }
-    }
-}
-
-contract DelayedVetoable_Getters_Test is DelayedVetoable_Init {
-    /// @dev The getters return the expected values when called by the zero address.
-    function test_getters_succeeds() external {
-        vm.startPrank(address(0));
-        assertEq(delayedVetoable.initiator(), initiator);
-        assertEq(delayedVetoable.vetoer(), vetoer);
-        assertEq(delayedVetoable.target(), target);
-        assertEq(delayedVetoable.delay(), operatingDelay);
-        assertEq(delayedVetoable.queuedAt(keccak256(abi.encode(0))), 0);
-    }
-}
-
-contract DelayedVetoable_Getters_TestFail is DelayedVetoable_Init {
-    /// @dev Check that getter calls from unauthorized entities will revert.
-    function test_getters_notZeroAddress_reverts() external {
-        vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, initiator, address(this)));
-        delayedVetoable.initiator();
-        vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, initiator, address(this)));
-        delayedVetoable.vetoer();
-        vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, initiator, address(this)));
-        delayedVetoable.target();
-        vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, initiator, address(this)));
-        delayedVetoable.delay();
-        vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, initiator, address(this)));
-        delayedVetoable.queuedAt(keccak256(abi.encode(0)));
-    }
-}
-
-contract DelayedVetoable_HandleCall_Test is DelayedVetoable_Init {
-    /// @dev A call can be initiated by the initiator.
-    function testFuzz_handleCall_initiation_succeeds(bytes calldata data) external {
-        assumeNoClash(data);
-        vm.expectEmit(true, false, false, true, address(delayedVetoable));
-        emit Initiated(keccak256(data), data);
-
-        vm.prank(initiator);
-        (bool success,) = address(delayedVetoable).call(data);
-        assertTrue(success);
-    }
-
-    /// @dev The delay is inititially set to zero and the call is immediately forwarded.
-    function testFuzz_handleCall_initialForwardingImmediately_succeeds(
-        bytes calldata inData,
-        bytes calldata outData
-    )
-        external
-    {
-        assumeNonzeroData(inData);
-        assumeNoClash(inData);
-
-        // Reset the delay to zero
-        vm.store(address(delayedVetoable), bytes32(uint256(0)), bytes32(uint256(0)));
-
-        vm.mockCall(target, inData, outData);
-        vm.expectEmit(true, false, false, true, address(delayedVetoable));
-        vm.expectCall({ callee: target, data: inData });
-        emit Forwarded(keccak256(inData), inData);
-        vm.prank(initiator);
-        (bool success, bytes memory returnData) = address(delayedVetoable).call(inData);
-        assertTrue(success);
-        assertEq(returnData, outData);
-
-        // Check that the callHash is not stored for future forwarding
-        bytes32 callHash = keccak256(inData);
-        vm.prank(address(0));
-        assertEq(delayedVetoable.queuedAt(callHash), 0);
-    }
-
-    /// @dev Calls are not forwarded until the delay has passed.
-    function testFuzz_handleCall_forwardingWithDelay_succeeds(bytes calldata data) external {
-        assumeNonzeroData(data);
-        assumeNoClash(data);
-
-        vm.prank(initiator);
-        (bool success,) = address(delayedVetoable).call(data);
-
-        // Check that the call is in the _queuedAt mapping
-        bytes32 callHash = keccak256(data);
-        vm.prank(address(0));
-        assertEq(delayedVetoable.queuedAt(callHash), block.timestamp);
-
-        vm.warp(block.timestamp + operatingDelay);
-        vm.expectEmit(true, false, false, true, address(delayedVetoable));
-        emit Forwarded(keccak256(data), data);
-
-        vm.expectCall({ callee: target, data: data });
-        (success,) = address(delayedVetoable).call(data);
-        assertTrue(success);
-    }
-}
-
-contract DelayedVetoable_HandleCall_TestFail is DelayedVetoable_Init {
-    /// @dev Only the initiator can initiate a call.
-    function test_handleCall_unauthorizedInitiation_reverts() external {
-        vm.expectRevert(abi.encodeWithSelector(IDelayedVetoable.Unauthorized.selector, initiator, address(this)));
-        (bool revertsAsExpected,) = address(delayedVetoable).call(hex"00001234");
-        assertTrue(revertsAsExpected);
-    }
-
-    /// @dev The call cannot be forwarded until the delay has passed.
-    function testFuzz_handleCall_forwardingTooSoon_reverts(bytes calldata data) external {
-        assumeNoClash(data);
-        vm.prank(initiator);
-        (bool success,) = address(delayedVetoable).call(data);
-        assertTrue(success);
-
-        vm.expectRevert(IDelayedVetoable.ForwardingEarly.selector);
-        (bool revertsAsExpected,) = address(delayedVetoable).call(data);
-        assertTrue(revertsAsExpected);
-    }
-
-    /// @dev The call cannot be forwarded a second time.
-    function testFuzz_handleCall_forwardingTwice_reverts(bytes calldata data) external {
-        assumeNoClash(data);
-
-        // Initiate the call
-        vm.prank(initiator);
-        (bool success,) = address(delayedVetoable).call(data);
-        assertTrue(success);
-
-        vm.warp(block.timestamp + operatingDelay);
-        vm.expectEmit(true, false, false, true, address(delayedVetoable));
-        emit Forwarded(keccak256(data), data);
-
-        // Forward the call
-        vm.expectCall({ callee: target, data: data });
-        (success,) = address(delayedVetoable).call(data);
-        assertTrue(success);
-
-        // Attempt to forward the same call again.
-        vm.expectRevert(abi.encodeWithSelector(IDelayedVetoable.Unauthorized.selector, initiator, address(this)));
-        (bool revertsAsExpected,) = address(delayedVetoable).call(data);
-        assertTrue(revertsAsExpected);
-    }
-
-    /// @dev If the target reverts, it is bubbled up.
-    function testFuzz_handleCall_forwardingTargetReverts_reverts(
-        bytes calldata inData,
-        bytes calldata outData
-    )
-        external
-    {
-        assumeNoClash(inData);
-
-        // Initiate the call
-        vm.prank(initiator);
-        (bool success,) = address(delayedVetoable).call(inData);
-        assertTrue(success);
-
-        vm.warp(block.timestamp + operatingDelay);
-        vm.expectEmit(true, false, false, true, address(delayedVetoable));
-        emit Forwarded(keccak256(inData), inData);
-
-        vm.mockCallRevert(target, inData, outData);
-
-        // Forward the call
-        vm.expectRevert(outData);
-        (bool revertsAsExpected,) = address(delayedVetoable).call(inData);
-        assertTrue(revertsAsExpected);
-    }
-
-    function testFuzz_handleCall_forwardingTargetRetValue_succeeds(
-        bytes calldata inData,
-        bytes calldata outData
-    )
-        external
-    {
-        assumeNoClash(inData);
-
-        // Initiate the call
-        vm.prank(initiator);
-        (bool success,) = address(delayedVetoable).call(inData);
-        assertTrue(success);
-
-        vm.warp(block.timestamp + operatingDelay);
-        vm.expectEmit(true, false, false, true, address(delayedVetoable));
-        emit Forwarded(keccak256(inData), inData);
-
-        vm.mockCall(target, inData, outData);
-
-        // Forward the call
-        (bool success2, bytes memory retData) = address(delayedVetoable).call(inData);
-        assertTrue(success2);
-        assertEq(keccak256(retData), keccak256(outData));
-    }
-
-    /// @dev A test documenting the single instance in which the contract is not 'transparent' to the initiator.
-    function testFuzz_handleCall_queuedAtClash_reverts() external {
-        // This will get us calldata with the same function selector as the queuedAt function, but
-        // with the incorrect input data length.
-        bytes memory inData = abi.encodePacked(keccak256("queuedAt(bytes32)"));
-
-        // Reset the delay to zero
-        vm.store(address(delayedVetoable), bytes32(uint256(0)), bytes32(uint256(0)));
-
-        vm.prank(initiator);
-        vm.expectRevert(bytes(""));
-        (bool revertsAsExpected,) = address(delayedVetoable).call(inData);
-        assertTrue(revertsAsExpected);
-    }
-}
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index 5150b4d725dd..3e5648fdfde0 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -106,14 +106,6 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "DataAvailabilityChallenge", _sel: IDataAvailabilityChallenge.resolve.selector });
         _addSpec({ _name: "DataAvailabilityChallenge", _sel: IDataAvailabilityChallenge.unlockBond.selector });
 
-        // DelayedVetoable
-        _addSpec({ _name: "DelayedVetoable", _sel: _getSel("delay()") });
-        _addSpec({ _name: "DelayedVetoable", _sel: _getSel("initiator()") });
-        _addSpec({ _name: "DelayedVetoable", _sel: _getSel("queuedAt(bytes32)") });
-        _addSpec({ _name: "DelayedVetoable", _sel: _getSel("target()") });
-        _addSpec({ _name: "DelayedVetoable", _sel: _getSel("version()") });
-        _addSpec({ _name: "DelayedVetoable", _sel: _getSel("vetoer()") });
-
         // L1CrossDomainMessenger
         _addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("MESSAGE_VERSION()") });
         _addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("MIN_GAS_CALLDATA_OVERHEAD()") });

From c267d98b19cc06a6999e2e953d59cdf5a8326ac8 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 15 Nov 2024 18:31:01 +0100
Subject: [PATCH 187/451] improve tests SystemConfig (#12938)

* improve tests

* improve tests

* fixes
---
 .../contracts-bedrock/test/L1/SystemConfig.t.sol    | 13 +++++++++++++
 .../test/L1/SystemConfigInterop.t.sol               | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index a6311c02b1e4..fd5fd296f8fb 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -255,6 +255,19 @@ contract SystemConfig_Init_ResourceConfig is SystemConfig_Init {
         _initializeWithResourceConfig(config, "SystemConfig: gas limit too low");
     }
 
+    /// @dev Tests that `setResourceConfig` reverts if the gas limit is too low.
+    function test_setResourceConfig_elasticityMultiplierIs0_reverts() external {
+        IResourceMetering.ResourceConfig memory config = IResourceMetering.ResourceConfig({
+            maxResourceLimit: 20_000_000,
+            elasticityMultiplier: 0,
+            baseFeeMaxChangeDenominator: 8,
+            systemTxMaxGas: 1_000_000,
+            minimumBaseFee: 1 gwei,
+            maximumBaseFee: 2 gwei
+        });
+        _initializeWithResourceConfig(config, "SystemConfig: elasticity multiplier cannot be 0");
+    }
+
     /// @dev Tests that `setResourceConfig` reverts if the elasticity multiplier
     ///      and max resource limit are configured such that there is a loss of precision.
     function test_setResourceConfig_badPrecision_reverts() external {
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index 426dba30c72a..78337fc3b4d0 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -26,6 +26,19 @@ contract SystemConfigInterop_Test is CommonTest {
         super.setUp();
     }
 
+    /// @dev Tests that when the decimals is not 18, initialization reverts.
+    function test_initialize_decimalsIsNot18_reverts(uint8 decimals) external {
+        vm.assume(decimals != 18);
+        address _token = address(L1Token);
+
+        vm.mockCall(_token, abi.encodeCall(ERC20.name, ()), abi.encode("Token"));
+        vm.mockCall(_token, abi.encodeCall(ERC20.symbol, ()), abi.encode("TKN"));
+        vm.mockCall(_token, abi.encodeCall(ERC20.decimals, ()), abi.encode(decimals));
+
+        vm.expectRevert("SystemConfig: bad decimals of gas paying token");
+        _cleanStorageAndInit(_token);
+    }
+
     /// @dev Tests that the gas paying token can be set.
     function testFuzz_setGasPayingToken_succeeds(
         address _token,

From 8f0a9b2d46f57b8ed4478a2ec39840ba61367684 Mon Sep 17 00:00:00 2001
From: blaine <blainemalone01@gmail.com>
Date: Fri, 15 Nov 2024 16:08:36 -0500
Subject: [PATCH 188/451] opcm-redesign: opcm targets a single release (#12851)

* fix: semver locking.

* fix: semver locking.

* feat: opcm impl contracts now type safe.

* feat: fixing test.

* fix: removing unused imports.

* fix: address didn't need to be payable.

* fix: moving all smart contract changes to first pr.

* fix: pr comments addressed.

* fix: removed InputContracts struct.

* fix: ran pre-pr

* fix: deploy implementations renaming version.

* fix: adding solidity changes to this pr.

* fix: adding v160 initializer back in.

* fix: removed branching logic from opcm.

* fix: removed SystemConfigV160.

* opcm-redesign: op-deployer changes

* fix: linting fix.

* fix: semver lock

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-chain-ops/interopgen/configs.go            |   2 +-
 op-chain-ops/interopgen/deploy.go             |   5 +-
 op-chain-ops/interopgen/deployments.go        |   3 +-
 op-chain-ops/interopgen/recipe.go             |   2 +-
 op-deployer/pkg/deployer/bootstrap/opcm.go    |  15 +-
 op-deployer/pkg/deployer/inspect/l1.go        |   4 +-
 .../deployer/integration_test/apply_test.go   |  26 +-
 op-deployer/pkg/deployer/opcm/contract.go     |  51 --
 .../pkg/deployer/opcm/implementations.go      |   6 +-
 op-deployer/pkg/deployer/opcm/opchain.go      |   6 +-
 op-deployer/pkg/deployer/pipeline/alt_da.go   |   2 +-
 .../pkg/deployer/pipeline/implementations.go  |   5 +-
 op-deployer/pkg/deployer/pipeline/init.go     |   4 +-
 op-deployer/pkg/deployer/pipeline/opchain.go  |   8 +-
 op-deployer/pkg/deployer/standard/standard.go |   9 +-
 op-deployer/pkg/deployer/state/state.go       |   2 +-
 .../scripts/deploy/Deploy.s.sol               |  10 +-
 .../deploy/DeployImplementations.s.sol        | 439 +++++-------------
 .../scripts/deploy/DeployOPChain.s.sol        |  35 +-
 .../deploy/ReadImplementationAddresses.s.sol  |  26 +-
 .../snapshots/abi/OPContractsManager.json     | 271 ++++++-----
 .../abi/OPContractsManagerInterop.json        | 271 ++++++-----
 .../snapshots/semver-lock.json                |   4 +-
 .../storageLayout/OPContractsManager.json     |  37 +-
 .../OPContractsManagerInterop.json            |  37 +-
 .../src/L1/OPContractsManager.sol             | 288 +++++-------
 .../src/L1/OPContractsManagerInterop.sol      |  15 +-
 .../src/L1/interfaces/ISystemConfigV160.sol   |  85 ----
 .../test/L1/OPContractsManager.t.sol          |  16 +-
 .../test/opcm/DeployImplementations.t.sol     | 114 +----
 .../test/opcm/DeployOPChain.t.sol             |  19 +-
 .../test/universal/Specs.t.sol                |  34 +-
 32 files changed, 666 insertions(+), 1185 deletions(-)
 delete mode 100644 packages/contracts-bedrock/src/L1/interfaces/ISystemConfigV160.sol

diff --git a/op-chain-ops/interopgen/configs.go b/op-chain-ops/interopgen/configs.go
index 942588a9929c..948d9daa3053 100644
--- a/op-chain-ops/interopgen/configs.go
+++ b/op-chain-ops/interopgen/configs.go
@@ -35,7 +35,7 @@ type SuperFaultProofConfig struct {
 }
 
 type OPCMImplementationsConfig struct {
-	Release string
+	L1ContractsRelease string
 
 	FaultProof SuperFaultProofConfig
 
diff --git a/op-chain-ops/interopgen/deploy.go b/op-chain-ops/interopgen/deploy.go
index 476406821ea5..e915b724e10b 100644
--- a/op-chain-ops/interopgen/deploy.go
+++ b/op-chain-ops/interopgen/deploy.go
@@ -170,10 +170,9 @@ func DeploySuperchainToL1(l1Host *script.Host, superCfg *SuperchainConfig) (*Sup
 		ProofMaturityDelaySeconds:       superCfg.Implementations.FaultProof.ProofMaturityDelaySeconds,
 		DisputeGameFinalityDelaySeconds: superCfg.Implementations.FaultProof.DisputeGameFinalityDelaySeconds,
 		MipsVersion:                     superCfg.Implementations.FaultProof.MipsVersion,
-		Release:                         superCfg.Implementations.Release,
+		L1ContractsRelease:              superCfg.Implementations.L1ContractsRelease,
 		SuperchainConfigProxy:           superDeployment.SuperchainConfigProxy,
 		ProtocolVersionsProxy:           superDeployment.ProtocolVersionsProxy,
-		OpcmProxyOwner:                  superDeployment.SuperchainProxyAdmin,
 		UseInterop:                      superCfg.Implementations.UseInterop,
 		StandardVersionsToml:            standard.VersionsMainnetData,
 	})
@@ -210,7 +209,7 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 		BasefeeScalar:           cfg.GasPriceOracleBaseFeeScalar,
 		BlobBaseFeeScalar:       cfg.GasPriceOracleBlobBaseFeeScalar,
 		L2ChainId:               new(big.Int).SetUint64(cfg.L2ChainID),
-		OpcmProxy:               superDeployment.OpcmProxy,
+		Opcm:                    superDeployment.Opcm,
 		SaltMixer:               cfg.SaltMixer,
 		GasLimit:                cfg.GasLimit,
 		DisputeGameType:         cfg.DisputeGameType,
diff --git a/op-chain-ops/interopgen/deployments.go b/op-chain-ops/interopgen/deployments.go
index ba18fbfdf9bd..f98a0554d870 100644
--- a/op-chain-ops/interopgen/deployments.go
+++ b/op-chain-ops/interopgen/deployments.go
@@ -9,8 +9,7 @@ type L1Deployment struct {
 }
 
 type Implementations struct {
-	OpcmProxy                        common.Address `json:"OPCMProxy"`
-	OpcmImpl                         common.Address `json:"OPCMImpl"`
+	Opcm                             common.Address `json:"OPCM"`
 	DelayedWETHImpl                  common.Address `json:"DelayedWETHImpl"`
 	OptimismPortalImpl               common.Address `json:"OptimismPortalImpl"`
 	PreimageOracleSingleton          common.Address `json:"PreimageOracleSingleton"`
diff --git a/op-chain-ops/interopgen/recipe.go b/op-chain-ops/interopgen/recipe.go
index 8983ee72da8e..e70c69e9f481 100644
--- a/op-chain-ops/interopgen/recipe.go
+++ b/op-chain-ops/interopgen/recipe.go
@@ -69,7 +69,7 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
 		ProtocolVersionsOwner: superchainProtocolVersionsOwner,
 		Deployer:              superchainDeployer,
 		Implementations: OPCMImplementationsConfig{
-			Release: "dev",
+			L1ContractsRelease: "dev",
 			FaultProof: SuperFaultProofConfig{
 				WithdrawalDelaySeconds:          big.NewInt(604800),
 				MinProposalSizeBytes:            big.NewInt(10000),
diff --git a/op-deployer/pkg/deployer/bootstrap/opcm.go b/op-deployer/pkg/deployer/bootstrap/opcm.go
index 2f5976f304ad..89a8c3df5123 100644
--- a/op-deployer/pkg/deployer/bootstrap/opcm.go
+++ b/op-deployer/pkg/deployer/bootstrap/opcm.go
@@ -164,10 +164,6 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 	if err != nil {
 		return fmt.Errorf("error getting standard versions TOML: %w", err)
 	}
-	opcmProxyOwnerAddr, err := standard.ManagerOwnerAddrFor(chainIDU64)
-	if err != nil {
-		return fmt.Errorf("error getting superchain proxy admin: %w", err)
-	}
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
 	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
@@ -199,14 +195,14 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 	}
 	host.SetNonce(chainDeployer, nonce)
 
-	var release string
+	var l1ContractsRelease string
 	if cfg.ArtifactsLocator.IsTag() {
-		release = cfg.ArtifactsLocator.Tag
+		l1ContractsRelease = cfg.ArtifactsLocator.Tag
 	} else {
-		release = "dev"
+		l1ContractsRelease = "dev"
 	}
 
-	lgr.Info("deploying OPCM", "release", release)
+	lgr.Info("deploying OPCM", "l1ContractsRelease", l1ContractsRelease)
 
 	// We need to etch the Superchain addresses so that they have nonzero code
 	// and the checks in the OPCM constructor pass.
@@ -238,10 +234,9 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 			ProofMaturityDelaySeconds:       new(big.Int).SetUint64(cfg.ProofMaturityDelaySeconds),
 			DisputeGameFinalityDelaySeconds: new(big.Int).SetUint64(cfg.DisputeGameFinalityDelaySeconds),
 			MipsVersion:                     new(big.Int).SetUint64(cfg.MIPSVersion),
-			Release:                         release,
+			L1ContractsRelease:              l1ContractsRelease,
 			SuperchainConfigProxy:           superchainConfigAddr,
 			ProtocolVersionsProxy:           protocolVersionsAddr,
-			OpcmProxyOwner:                  opcmProxyOwnerAddr,
 			StandardVersionsToml:            standardVersionsTOML,
 			UseInterop:                      false,
 		},
diff --git a/op-deployer/pkg/deployer/inspect/l1.go b/op-deployer/pkg/deployer/inspect/l1.go
index d0a4f88172d1..4883e83486c3 100644
--- a/op-deployer/pkg/deployer/inspect/l1.go
+++ b/op-deployer/pkg/deployer/inspect/l1.go
@@ -45,7 +45,7 @@ type OpChainDeployment struct {
 }
 
 type ImplementationsDeployment struct {
-	OpcmProxyAddress                        common.Address `json:"opcmProxyAddress"`
+	OpcmAddress                             common.Address `json:"opcmAddress"`
 	DelayedWETHImplAddress                  common.Address `json:"delayedWETHImplAddress"`
 	OptimismPortalImplAddress               common.Address `json:"optimismPortalImplAddress"`
 	PreimageOracleSingletonAddress          common.Address `json:"preimageOracleSingletonAddress"`
@@ -113,7 +113,7 @@ func L1(globalState *state.State, chainID common.Hash) (*L1Contracts, error) {
 			// DelayedWETHPermissionlessGameProxyAddress: chainState.DelayedWETHPermissionlessGameProxyAddress,
 		},
 		ImplementationsDeployment: ImplementationsDeployment{
-			OpcmProxyAddress:                        globalState.ImplementationsDeployment.OpcmProxyAddress,
+			OpcmAddress:                             globalState.ImplementationsDeployment.OpcmAddress,
 			DelayedWETHImplAddress:                  globalState.ImplementationsDeployment.DelayedWETHImplAddress,
 			OptimismPortalImplAddress:               globalState.ImplementationsDeployment.OptimismPortalImplAddress,
 			PreimageOracleSingletonAddress:          globalState.ImplementationsDeployment.PreimageOracleSingletonAddress,
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 215687c5cfc0..bcbc14eb7f19 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -207,6 +207,30 @@ func TestApplyExistingOPCM(t *testing.T) {
 	))
 
 	validateOPChainDeployment(t, ethClientCodeGetter(ctx, l1Client), st, intent)
+
+	releases := standard.L1VersionsSepolia.Releases["op-contracts/v1.6.0"]
+
+	implTests := []struct {
+		name    string
+		expAddr common.Address
+		actAddr common.Address
+	}{
+		{"OptimismPortal", releases.OptimismPortal.ImplementationAddress, st.ImplementationsDeployment.OptimismPortalImplAddress},
+		{"SystemConfig,", releases.SystemConfig.ImplementationAddress, st.ImplementationsDeployment.SystemConfigImplAddress},
+		{"L1CrossDomainMessenger", releases.L1CrossDomainMessenger.ImplementationAddress, st.ImplementationsDeployment.L1CrossDomainMessengerImplAddress},
+		{"L1ERC721Bridge", releases.L1ERC721Bridge.ImplementationAddress, st.ImplementationsDeployment.L1ERC721BridgeImplAddress},
+		{"L1StandardBridge", releases.L1StandardBridge.ImplementationAddress, st.ImplementationsDeployment.L1StandardBridgeImplAddress},
+		{"OptimismMintableERC20Factory", releases.OptimismMintableERC20Factory.ImplementationAddress, st.ImplementationsDeployment.OptimismMintableERC20FactoryImplAddress},
+		{"DisputeGameFactory", releases.DisputeGameFactory.ImplementationAddress, st.ImplementationsDeployment.DisputeGameFactoryImplAddress},
+		{"MIPS", releases.MIPS.Address, st.ImplementationsDeployment.MipsSingletonAddress},
+		{"PreimageOracle", releases.PreimageOracle.Address, st.ImplementationsDeployment.PreimageOracleSingletonAddress},
+		{"DelayedWETH", releases.DelayedWETH.ImplementationAddress, st.ImplementationsDeployment.DelayedWETHImplAddress},
+	}
+	for _, tt := range implTests {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.expAddr, tt.actAddr)
+		})
+	}
 }
 
 func TestL2BlockTimeOverride(t *testing.T) {
@@ -571,7 +595,7 @@ func validateSuperchainDeployment(t *testing.T, st *state.State, cg codeGetter)
 		{"SuperchainConfigImpl", st.SuperchainDeployment.SuperchainConfigImplAddress},
 		{"ProtocolVersionsProxy", st.SuperchainDeployment.ProtocolVersionsProxyAddress},
 		{"ProtocolVersionsImpl", st.SuperchainDeployment.ProtocolVersionsImplAddress},
-		{"OpcmProxy", st.ImplementationsDeployment.OpcmProxyAddress},
+		{"Opcm", st.ImplementationsDeployment.OpcmAddress},
 		{"PreimageOracleSingleton", st.ImplementationsDeployment.PreimageOracleSingletonAddress},
 		{"MipsSingleton", st.ImplementationsDeployment.MipsSingletonAddress},
 	}
diff --git a/op-deployer/pkg/deployer/opcm/contract.go b/op-deployer/pkg/deployer/opcm/contract.go
index b90db5814192..8d02f77e8e0a 100644
--- a/op-deployer/pkg/deployer/opcm/contract.go
+++ b/op-deployer/pkg/deployer/opcm/contract.go
@@ -48,57 +48,6 @@ func (c *Contract) GenericAddressGetter(ctx context.Context, functionName string
 	return c.callContractMethod(ctx, functionName, abi.Arguments{})
 }
 
-// GetImplementation retrieves the Implementation struct for a given release and contract name.
-func (c *Contract) GetOPCMImplementationAddress(ctx context.Context, release, contractName string) (common.Address, error) {
-	methodName := "implementations"
-	method := abi.NewMethod(
-		methodName,
-		methodName,
-		abi.Function,
-		"view",
-		true,
-		false,
-		abi.Arguments{
-			{Name: "release", Type: mustType("string")},
-			{Name: "contractName", Type: mustType("string")},
-		},
-		abi.Arguments{
-			{Name: "logic", Type: mustType("address")},
-			{Name: "initializer", Type: mustType("bytes4")},
-		},
-	)
-
-	calldata, err := method.Inputs.Pack(release, contractName)
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to pack inputs: %w", err)
-	}
-
-	msg := ethereum.CallMsg{
-		To:   &c.addr,
-		Data: append(bytes.Clone(method.ID), calldata...),
-	}
-
-	result, err := c.client.CallContract(ctx, msg, nil)
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to call contract: %w", err)
-	}
-
-	out, err := method.Outputs.Unpack(result)
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to unpack result: %w", err)
-	}
-	if len(out) != 2 {
-		return common.Address{}, fmt.Errorf("unexpected output length: %d", len(out))
-	}
-
-	logic, ok := out[0].(common.Address)
-	if !ok {
-		return common.Address{}, fmt.Errorf("unexpected type for logic: %T", out[0])
-	}
-
-	return logic, nil
-}
-
 func (c *Contract) callContractMethod(ctx context.Context, methodName string, inputs abi.Arguments, args ...interface{}) (common.Address, error) {
 	method := abi.NewMethod(
 		methodName,
diff --git a/op-deployer/pkg/deployer/opcm/implementations.go b/op-deployer/pkg/deployer/opcm/implementations.go
index 8dd072eef246..413452b1d348 100644
--- a/op-deployer/pkg/deployer/opcm/implementations.go
+++ b/op-deployer/pkg/deployer/opcm/implementations.go
@@ -18,12 +18,11 @@ type DeployImplementationsInput struct {
 	DisputeGameFinalityDelaySeconds *big.Int
 	MipsVersion                     *big.Int
 	// Release version to set OPCM implementations for, of the format `op-contracts/vX.Y.Z`.
-	Release               string
+	L1ContractsRelease    string
 	SuperchainConfigProxy common.Address
 	ProtocolVersionsProxy common.Address
 	UseInterop            bool // if true, deploy Interop implementations
 
-	OpcmProxyOwner       common.Address
 	StandardVersionsToml string // contents of 'standard-versions-mainnet.toml' or 'standard-versions-sepolia.toml' file
 }
 
@@ -32,8 +31,7 @@ func (input *DeployImplementationsInput) InputSet() bool {
 }
 
 type DeployImplementationsOutput struct {
-	OpcmProxy                        common.Address
-	OpcmImpl                         common.Address
+	Opcm                             common.Address
 	DelayedWETHImpl                  common.Address
 	OptimismPortalImpl               common.Address
 	PreimageOracleSingleton          common.Address
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index 1e1b468a417f..8c7e60fec4d2 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -26,7 +26,7 @@ type DeployOPChainInputV160 struct {
 	BasefeeScalar     uint32
 	BlobBaseFeeScalar uint32
 	L2ChainId         *big.Int
-	OpcmProxy         common.Address
+	Opcm              common.Address
 	SaltMixer         string
 	GasLimit          uint64
 
@@ -122,8 +122,8 @@ func deployOPChain[T any](host *script.Host, input T) (DeployOPChainOutput, erro
 
 type ReadImplementationAddressesInput struct {
 	DeployOPChainOutput
-	OpcmProxy common.Address
-	Release   string
+	Opcm    common.Address
+	Release string
 }
 
 type ReadImplementationAddressesOutput struct {
diff --git a/op-deployer/pkg/deployer/pipeline/alt_da.go b/op-deployer/pkg/deployer/pipeline/alt_da.go
index 62796832c93c..b36412620945 100644
--- a/op-deployer/pkg/deployer/pipeline/alt_da.go
+++ b/op-deployer/pkg/deployer/pipeline/alt_da.go
@@ -31,7 +31,7 @@ func DeployAltDA(env *Env, intent *state.Intent, st *state.State, chainID common
 	lgr.Info("deploying alt-da contracts")
 	dao, err = opcm.DeployAltDA(env.L1ScriptHost, opcm.DeployAltDAInput{
 		Salt:                     st.Create2Salt,
-		ProxyAdmin:               st.ImplementationsDeployment.OpcmProxyAddress,
+		ProxyAdmin:               chainState.ProxyAdminAddress,
 		ChallengeContractOwner:   chainIntent.Roles.L1ProxyAdminOwner,
 		ChallengeWindow:          new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DAChallengeWindow),
 		ResolveWindow:            new(big.Int).SetUint64(chainIntent.DangerousAltDAConfig.DAResolveWindow),
diff --git a/op-deployer/pkg/deployer/pipeline/implementations.go b/op-deployer/pkg/deployer/pipeline/implementations.go
index 47ea91fbe963..9e65fd4f54a3 100644
--- a/op-deployer/pkg/deployer/pipeline/implementations.go
+++ b/op-deployer/pkg/deployer/pipeline/implementations.go
@@ -68,10 +68,9 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 			ProofMaturityDelaySeconds:       new(big.Int).SetUint64(proofParams.ProofMaturityDelaySeconds),
 			DisputeGameFinalityDelaySeconds: new(big.Int).SetUint64(proofParams.DisputeGameFinalityDelaySeconds),
 			MipsVersion:                     new(big.Int).SetUint64(proofParams.MIPSVersion),
-			Release:                         contractsRelease,
+			L1ContractsRelease:              contractsRelease,
 			SuperchainConfigProxy:           st.SuperchainDeployment.SuperchainConfigProxyAddress,
 			ProtocolVersionsProxy:           st.SuperchainDeployment.ProtocolVersionsProxyAddress,
-			OpcmProxyOwner:                  st.SuperchainDeployment.ProxyAdminAddress,
 			StandardVersionsToml:            standardVersionsTOML,
 			UseInterop:                      intent.UseInterop,
 		},
@@ -81,7 +80,7 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 	}
 
 	st.ImplementationsDeployment = &state.ImplementationsDeployment{
-		OpcmProxyAddress:                        dio.OpcmProxy,
+		OpcmAddress:                             dio.Opcm,
 		DelayedWETHImplAddress:                  dio.DelayedWETHImpl,
 		OptimismPortalImplAddress:               dio.OptimismPortalImpl,
 		PreimageOracleSingletonAddress:          dio.PreimageOracleSingleton,
diff --git a/op-deployer/pkg/deployer/pipeline/init.go b/op-deployer/pkg/deployer/pipeline/init.go
index f8b12e36a431..b5c37c246f29 100644
--- a/op-deployer/pkg/deployer/pipeline/init.go
+++ b/op-deployer/pkg/deployer/pipeline/init.go
@@ -45,12 +45,12 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 			SuperchainConfigProxyAddress: common.Address(*superCfg.Config.SuperchainConfigAddr),
 		}
 
-		opcmProxy, err := standard.ManagerImplementationAddrFor(intent.L1ChainID)
+		opcmAddress, err := standard.ManagerImplementationAddrFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting OPCM proxy address: %w", err)
 		}
 		st.ImplementationsDeployment = &state.ImplementationsDeployment{
-			OpcmProxyAddress: opcmProxy,
+			OpcmAddress: opcmAddress,
 		}
 	}
 
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index a49848883cea..90cc665e077d 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -34,7 +34,7 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
 			}
 
-			opcmAddr = input.OpcmProxy
+			opcmAddr = input.Opcm
 			return opcm.DeployOPChainV160(env.L1ScriptHost, input)
 		}
 	default:
@@ -44,7 +44,7 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 				return opcm.DeployOPChainOutput{}, fmt.Errorf("error making deploy OP chain input: %w", err)
 			}
 
-			opcmAddr = input.OpcmProxy
+			opcmAddr = input.Opcm
 			return opcm.DeployOPChainIsthmus(env.L1ScriptHost, input)
 		}
 	}
@@ -67,7 +67,7 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 
 	readInput := opcm.ReadImplementationAddressesInput{
 		DeployOPChainOutput: dco,
-		OpcmProxy:           opcmAddr,
+		Opcm:                opcmAddr,
 		Release:             release,
 	}
 	impls, err := opcm.ReadImplementationAddresses(env.L1ScriptHost, readInput)
@@ -126,7 +126,7 @@ func makeDCIV160(intent *state.Intent, thisIntent *state.ChainIntent, chainID co
 		BasefeeScalar:                standard.BasefeeScalar,
 		BlobBaseFeeScalar:            standard.BlobBaseFeeScalar,
 		L2ChainId:                    chainID.Big(),
-		OpcmProxy:                    st.ImplementationsDeployment.OpcmProxyAddress,
+		Opcm:                         st.ImplementationsDeployment.OpcmAddress,
 		SaltMixer:                    st.Create2Salt.String(), // passing through salt generated at state initialization
 		GasLimit:                     standard.GasLimit,
 		DisputeGameType:              proofParams.DisputeGameType,
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 2fb6de8c5bf7..8c4ade1dcfb3 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -134,10 +134,11 @@ func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
 	switch chainID {
 	case 1:
 		// Generated using the bootstrap command on 10/18/2024.
-		return common.HexToAddress("0x18cec91779995ad14c880e4095456b9147160790"), nil
+		// TODO: @blmalone this needs re-bootstrapped because it's still proxied
+		return common.HexToAddress(""), nil
 	case 11155111:
-		// Generated using the bootstrap command on 10/18/2024.
-		return common.HexToAddress("0xf564eea7960ea244bfebcbbb17858748606147bf"), nil
+		// Generated using the bootstrap command on 11/15/2024.
+		return common.HexToAddress("0xde9eacb994a6eb12997445f8a63a22772c5c4313"), nil
 	default:
 		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
 	}
@@ -172,7 +173,7 @@ func SystemOwnerAddrFor(chainID uint64) (common.Address, error) {
 func ArtifactsURLForTag(tag string) (*url.URL, error) {
 	switch tag {
 	case "op-contracts/v1.6.0":
-		return url.Parse(standardArtifactsURL("3a27c6dc0cb61b36feaac26def98c64b4a48ec8f5c5ba6965e8ae3157606043c"))
+		return url.Parse(standardArtifactsURL("e1f0c4020618c4a98972e7124c39686cab2e31d5d7846f9ce5e0d5eed0f5ff32"))
 	case "op-contracts/v1.7.0-beta.1+l2-contracts":
 		return url.Parse(standardArtifactsURL("b0fb1f6f674519d637cff39a22187a5993d7f81a6d7b7be6507a0b50a5e38597"))
 	default:
diff --git a/op-deployer/pkg/deployer/state/state.go b/op-deployer/pkg/deployer/state/state.go
index e3974fa2a78c..e17ed6184c5d 100644
--- a/op-deployer/pkg/deployer/state/state.go
+++ b/op-deployer/pkg/deployer/state/state.go
@@ -64,7 +64,7 @@ type SuperchainDeployment struct {
 }
 
 type ImplementationsDeployment struct {
-	OpcmProxyAddress                        common.Address `json:"opcmProxyAddress"`
+	OpcmAddress                             common.Address `json:"opcmAddress"`
 	DelayedWETHImplAddress                  common.Address `json:"delayedWETHImplAddress"`
 	OptimismPortalImplAddress               common.Address `json:"optimismPortalImplAddress"`
 	PreimageOracleSingletonAddress          common.Address `json:"preimageOracleSingletonAddress"`
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 54cc1a23e172..0253e20a1956 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -162,7 +162,7 @@ contract Deploy is Deployer {
             L1ERC721Bridge: getAddress("L1ERC721BridgeProxy"),
             ProtocolVersions: getAddress("ProtocolVersionsProxy"),
             SuperchainConfig: getAddress("SuperchainConfigProxy"),
-            OPContractsManager: getAddress("OPContractsManagerProxy")
+            OPContractsManager: getAddress("OPContractsManager")
         });
     }
 
@@ -378,13 +378,12 @@ contract Deploy is Deployer {
         dii.set(dii.disputeGameFinalityDelaySeconds.selector, cfg.disputeGameFinalityDelaySeconds());
         dii.set(dii.mipsVersion.selector, Config.useMultithreadedCannon() ? 2 : 1);
         string memory release = "dev";
-        dii.set(dii.release.selector, release);
+        dii.set(dii.l1ContractsRelease.selector, release);
         dii.set(
             dii.standardVersionsToml.selector, string.concat(vm.projectRoot(), "/test/fixtures/standard-versions.toml")
         );
         dii.set(dii.superchainConfigProxy.selector, mustGetAddress("SuperchainConfigProxy"));
         dii.set(dii.protocolVersionsProxy.selector, mustGetAddress("ProtocolVersionsProxy"));
-        dii.set(dii.opcmProxyOwner.selector, cfg.finalSystemOwner());
 
         if (_isInterop) {
             di = DeployImplementations(new DeployImplementationsInterop());
@@ -409,8 +408,7 @@ contract Deploy is Deployer {
         save("DelayedWETH", address(dio.delayedWETHImpl()));
         save("PreimageOracle", address(dio.preimageOracleSingleton()));
         save("Mips", address(dio.mipsSingleton()));
-        save("OPContractsManagerProxy", address(dio.opcmProxy()));
-        save("OPContractsManager", address(dio.opcmImpl()));
+        save("OPContractsManager", address(dio.opcm()));
 
         Types.ContractSet memory contracts = _impls();
         ChainAssertions.checkL1CrossDomainMessenger({ _contracts: contracts, _vm: vm, _isProxy: false });
@@ -446,7 +444,7 @@ contract Deploy is Deployer {
 
         // Ensure that the requisite contracts are deployed
         address superchainConfigProxy = mustGetAddress("SuperchainConfigProxy");
-        OPContractsManager opcm = OPContractsManager(mustGetAddress("OPContractsManagerProxy"));
+        OPContractsManager opcm = OPContractsManager(mustGetAddress("OPContractsManager"));
 
         OPContractsManager.DeployInput memory deployInput = getDeployInput();
         OPContractsManager.DeployOutput memory deployOutput = opcm.deploy(deployInput);
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
index c9048a07dfa3..9abff9149181 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
@@ -8,16 +8,11 @@ import { LibString } from "@solady/utils/LibString.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
-import { ISystemConfigV160 } from "src/L1/interfaces/ISystemConfigV160.sol";
-import { IL1CrossDomainMessengerV160 } from "src/L1/interfaces/IL1CrossDomainMessengerV160.sol";
-import { IL1StandardBridgeV160 } from "src/L1/interfaces/IL1StandardBridgeV160.sol";
 
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Bytes } from "src/libraries/Bytes.sol";
 
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
 import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
@@ -51,8 +46,9 @@ contract DeployImplementationsInput is BaseDeployIO {
     uint256 internal _disputeGameFinalityDelaySeconds;
     uint256 internal _mipsVersion;
 
-    // The release version to set OPCM implementations for, of the format `op-contracts/vX.Y.Z`.
-    string internal _release;
+    // This is used in opcm to signal which version of the L1 smart contracts is deployed.
+    // It takes the format of `op-contracts/v*.*.*`.
+    string internal _l1ContractsRelease;
 
     // Outputs from DeploySuperchain.s.sol.
     ISuperchainConfig internal _superchainConfigProxy;
@@ -60,8 +56,6 @@ contract DeployImplementationsInput is BaseDeployIO {
 
     string internal _standardVersionsToml;
 
-    address internal _opcmProxyOwner;
-
     function set(bytes4 _sel, uint256 _value) public {
         require(_value != 0, "DeployImplementationsInput: cannot set zero value");
 
@@ -85,7 +79,7 @@ contract DeployImplementationsInput is BaseDeployIO {
 
     function set(bytes4 _sel, string memory _value) public {
         require(!LibString.eq(_value, ""), "DeployImplementationsInput: cannot set empty string");
-        if (_sel == this.release.selector) _release = _value;
+        if (_sel == this.l1ContractsRelease.selector) _l1ContractsRelease = _value;
         else if (_sel == this.standardVersionsToml.selector) _standardVersionsToml = _value;
         else revert("DeployImplementationsInput: unknown selector");
     }
@@ -94,7 +88,6 @@ contract DeployImplementationsInput is BaseDeployIO {
         require(_addr != address(0), "DeployImplementationsInput: cannot set zero address");
         if (_sel == this.superchainConfigProxy.selector) _superchainConfigProxy = ISuperchainConfig(_addr);
         else if (_sel == this.protocolVersionsProxy.selector) _protocolVersionsProxy = IProtocolVersions(_addr);
-        else if (_sel == this.opcmProxyOwner.selector) _opcmProxyOwner = _addr;
         else revert("DeployImplementationsInput: unknown selector");
     }
 
@@ -141,9 +134,9 @@ contract DeployImplementationsInput is BaseDeployIO {
         return _mipsVersion;
     }
 
-    function release() public view returns (string memory) {
-        require(!LibString.eq(_release, ""), "DeployImplementationsInput: not set");
-        return _release;
+    function l1ContractsRelease() public view returns (string memory) {
+        require(!LibString.eq(_l1ContractsRelease, ""), "DeployImplementationsInput: not set");
+        return _l1ContractsRelease;
     }
 
     function standardVersionsToml() public view returns (string memory) {
@@ -160,16 +153,10 @@ contract DeployImplementationsInput is BaseDeployIO {
         require(address(_protocolVersionsProxy) != address(0), "DeployImplementationsInput: not set");
         return _protocolVersionsProxy;
     }
-
-    function opcmProxyOwner() public view returns (address) {
-        require(address(_opcmProxyOwner) != address(0), "DeployImplementationsInput: not set");
-        return _opcmProxyOwner;
-    }
 }
 
 contract DeployImplementationsOutput is BaseDeployIO {
-    OPContractsManager internal _opcmProxy;
-    OPContractsManager internal _opcmImpl;
+    OPContractsManager internal _opcm;
     IDelayedWETH internal _delayedWETHImpl;
     IOptimismPortal2 internal _optimismPortalImpl;
     IPreimageOracle internal _preimageOracleSingleton;
@@ -185,8 +172,7 @@ contract DeployImplementationsOutput is BaseDeployIO {
         require(_addr != address(0), "DeployImplementationsOutput: cannot set zero address");
 
         // forgefmt: disable-start
-        if (_sel == this.opcmProxy.selector) _opcmProxy = OPContractsManager(payable(_addr));
-        else if (_sel == this.opcmImpl.selector) _opcmImpl = OPContractsManager(payable(_addr));
+        if (_sel == this.opcm.selector) _opcm = OPContractsManager(_addr);
         else if (_sel == this.optimismPortalImpl.selector) _optimismPortalImpl = IOptimismPortal2(payable(_addr));
         else if (_sel == this.delayedWETHImpl.selector) _delayedWETHImpl = IDelayedWETH(payable(_addr));
         else if (_sel == this.preimageOracleSingleton.selector) _preimageOracleSingleton = IPreimageOracle(_addr);
@@ -201,12 +187,11 @@ contract DeployImplementationsOutput is BaseDeployIO {
         // forgefmt: disable-end
     }
 
-    function checkOutput(DeployImplementationsInput _dii) public {
+    function checkOutput(DeployImplementationsInput _dii) public view {
         // With 12 addresses, we'd get a stack too deep error if we tried to do this inline as a
         // single call to `Solarray.addresses`. So we split it into two calls.
         address[] memory addrs1 = Solarray.addresses(
-            address(this.opcmProxy()),
-            address(this.opcmImpl()),
+            address(this.opcm()),
             address(this.optimismPortalImpl()),
             address(this.delayedWETHImpl()),
             address(this.preimageOracleSingleton()),
@@ -227,15 +212,9 @@ contract DeployImplementationsOutput is BaseDeployIO {
         assertValidDeploy(_dii);
     }
 
-    function opcmProxy() public returns (OPContractsManager) {
-        DeployUtils.assertValidContractAddress(address(_opcmProxy));
-        DeployUtils.assertERC1967ImplementationSet(address(_opcmProxy));
-        return _opcmProxy;
-    }
-
-    function opcmImpl() public view returns (OPContractsManager) {
-        DeployUtils.assertValidContractAddress(address(_opcmImpl));
-        return _opcmImpl;
+    function opcm() public view returns (OPContractsManager) {
+        DeployUtils.assertValidContractAddress(address(_opcm));
+        return _opcm;
     }
 
     function optimismPortalImpl() public view returns (IOptimismPortal2) {
@@ -289,40 +268,22 @@ contract DeployImplementationsOutput is BaseDeployIO {
     }
 
     // -------- Deployment Assertions --------
-    function assertValidDeploy(DeployImplementationsInput _dii) public {
+    function assertValidDeploy(DeployImplementationsInput _dii) public view {
         assertValidDelayedWETHImpl(_dii);
         assertValidDisputeGameFactoryImpl(_dii);
         assertValidL1CrossDomainMessengerImpl(_dii);
         assertValidL1ERC721BridgeImpl(_dii);
         assertValidL1StandardBridgeImpl(_dii);
         assertValidMipsSingleton(_dii);
-        assertValidOpcmProxy(_dii);
-        assertValidOpcmImpl(_dii);
+        assertValidOpcm(_dii);
         assertValidOptimismMintableERC20FactoryImpl(_dii);
         assertValidOptimismPortalImpl(_dii);
         assertValidPreimageOracleSingleton(_dii);
         assertValidSystemConfigImpl(_dii);
     }
 
-    function assertValidOpcmProxy(DeployImplementationsInput _dii) internal {
-        // First we check the proxy as itself.
-        IProxy proxy = IProxy(payable(address(opcmProxy())));
-        vm.prank(address(0));
-        address admin = proxy.admin();
-        require(admin == address(_dii.opcmProxyOwner()), "OPCMP-10");
-
-        // Then we check the proxy as OPCM.
-        DeployUtils.assertInitialized({ _contractAddress: address(opcmProxy()), _slot: 0, _offset: 0 });
-        require(address(opcmProxy().superchainConfig()) == address(_dii.superchainConfigProxy()), "OPCMP-20");
-        require(address(opcmProxy().protocolVersions()) == address(_dii.protocolVersionsProxy()), "OPCMP-30");
-        require(LibString.eq(opcmProxy().latestRelease(), _dii.release()), "OPCMP-50"); // Initial release is latest.
-    }
-
-    function assertValidOpcmImpl(DeployImplementationsInput _dii) internal {
-        IProxy proxy = IProxy(payable(address(opcmProxy())));
-        vm.prank(address(0));
-        OPContractsManager impl = OPContractsManager(proxy.implementation());
-        DeployUtils.assertInitialized({ _contractAddress: address(impl), _slot: 0, _offset: 0 });
+    function assertValidOpcm(DeployImplementationsInput _dii) internal view {
+        OPContractsManager impl = OPContractsManager(address(opcm()));
         require(address(impl.superchainConfig()) == address(_dii.superchainConfigProxy()), "OPCMI-10");
         require(address(impl.protocolVersions()) == address(_dii.protocolVersionsProxy()), "OPCMI-20");
     }
@@ -361,7 +322,6 @@ contract DeployImplementationsOutput is BaseDeployIO {
 
     function assertValidMipsSingleton(DeployImplementationsInput) internal view {
         IMIPS mips = mipsSingleton();
-
         require(address(mips.oracle()) == address(preimageOracleSingleton()), "MIPS-10");
     }
 
@@ -480,102 +440,38 @@ contract DeployImplementations is Script {
 
     // --- OP Contracts Manager ---
 
-    function opcmSystemConfigSetter(
-        DeployImplementationsInput _dii,
-        DeployImplementationsOutput _dio
-    )
-        internal
-        view
-        virtual
-        returns (OPContractsManager.ImplementationSetter memory)
-    {
-        // When configuring OPCM during Solidity tests, we are using the latest SystemConfig.sol
-        // version in this repo, which contains Custom Gas Token (CGT) features. This CGT version
-        // has a different `initialize` signature than the SystemConfig version that was released
-        // as part of `op-contracts/v1.6.0`, which is no longer in the repo. When running this
-        // script's bytecode for a production deploy of OPCM at `op-contracts/v1.6.0`, we need to
-        // use the ISystemConfigV160 interface instead of ISystemConfig. Therefore the selector used
-        // is a function of the `release` passed in by the caller.
-        bytes4 selector = LibString.eq(_dii.release(), "op-contracts/v1.6.0")
-            ? ISystemConfigV160.initialize.selector
-            : ISystemConfig.initialize.selector;
-        return OPContractsManager.ImplementationSetter({
-            name: "SystemConfig",
-            info: OPContractsManager.Implementation(address(_dio.systemConfigImpl()), selector)
-        });
-    }
-
-    function l1CrossDomainMessengerConfigSetter(
-        DeployImplementationsInput _dii,
-        DeployImplementationsOutput _dio
-    )
-        internal
-        view
-        virtual
-        returns (OPContractsManager.ImplementationSetter memory)
-    {
-        bytes4 selector = LibString.eq(_dii.release(), "op-contracts/v1.6.0")
-            ? IL1CrossDomainMessengerV160.initialize.selector
-            : IL1CrossDomainMessenger.initialize.selector;
-        return OPContractsManager.ImplementationSetter({
-            name: "L1CrossDomainMessenger",
-            info: OPContractsManager.Implementation(address(_dio.l1CrossDomainMessengerImpl()), selector)
-        });
-    }
-
-    function l1StandardBridgeConfigSetter(
-        DeployImplementationsInput _dii,
-        DeployImplementationsOutput _dio
-    )
-        internal
-        view
-        virtual
-        returns (OPContractsManager.ImplementationSetter memory)
-    {
-        bytes4 selector = LibString.eq(_dii.release(), "op-contracts/v1.6.0")
-            ? IL1StandardBridgeV160.initialize.selector
-            : IL1StandardBridge.initialize.selector;
-        return OPContractsManager.ImplementationSetter({
-            name: "L1StandardBridge",
-            info: OPContractsManager.Implementation(address(_dio.l1StandardBridgeImpl()), selector)
-        });
-    }
-
-    // Deploy and initialize a proxied OPContractsManager.
     function createOPCMContract(
         DeployImplementationsInput _dii,
         DeployImplementationsOutput _dio,
         OPContractsManager.Blueprints memory _blueprints,
-        string memory _release,
-        OPContractsManager.ImplementationSetter[] memory _setters
+        string memory _l1ContractsRelease
     )
         internal
         virtual
-        returns (OPContractsManager opcmProxy_)
+        returns (OPContractsManager opcm_)
     {
-        address opcmProxyOwner = _dii.opcmProxyOwner();
+        ISuperchainConfig superchainConfigProxy = _dii.superchainConfigProxy();
+        IProtocolVersions protocolVersionsProxy = _dii.protocolVersionsProxy();
+
+        OPContractsManager.Implementations memory implementations = OPContractsManager.Implementations({
+            l1ERC721BridgeImpl: address(_dio.l1ERC721BridgeImpl()),
+            optimismPortalImpl: address(_dio.optimismPortalImpl()),
+            systemConfigImpl: address(_dio.systemConfigImpl()),
+            optimismMintableERC20FactoryImpl: address(_dio.optimismMintableERC20FactoryImpl()),
+            l1CrossDomainMessengerImpl: address(_dio.l1CrossDomainMessengerImpl()),
+            l1StandardBridgeImpl: address(_dio.l1StandardBridgeImpl()),
+            disputeGameFactoryImpl: address(_dio.disputeGameFactoryImpl()),
+            delayedWETHImpl: address(_dio.delayedWETHImpl()),
+            mipsImpl: address(_dio.mipsSingleton())
+        });
 
         vm.broadcast(msg.sender);
-        IProxy proxy = IProxy(
-            DeployUtils.create1({
-                _name: "Proxy",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
-            })
+        opcm_ = new OPContractsManager(
+            superchainConfigProxy, protocolVersionsProxy, _l1ContractsRelease, _blueprints, implementations
         );
 
-        deployOPContractsManagerImpl(_dii, _dio);
-        OPContractsManager opcmImpl = _dio.opcmImpl();
-
-        OPContractsManager.InitializerInputs memory initializerInputs =
-            OPContractsManager.InitializerInputs(_blueprints, _setters, _release, true);
-
-        vm.startBroadcast(msg.sender);
-        proxy.upgradeToAndCall(address(opcmImpl), abi.encodeCall(opcmImpl.initialize, (initializerInputs)));
-
-        proxy.changeAdmin(address(opcmProxyOwner)); // transfer ownership of Proxy contract to the ProxyAdmin contract
-        vm.stopBroadcast();
-
-        opcmProxy_ = OPContractsManager(address(proxy));
+        vm.label(address(opcm_), "OPContractsManager");
+        _dio.set(_dio.opcm.selector, address(opcm_));
     }
 
     function deployOPContractsManager(
@@ -585,72 +481,42 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
-
-        // First we deploy the blueprints for the singletons deployed by OPCM.
-        // forgefmt: disable-start
-        bytes32 salt = _dii.salt();
-        OPContractsManager.Blueprints memory blueprints;
-
-        vm.startBroadcast(msg.sender);
-        blueprints.addressManager = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("AddressManager")), salt);
-        blueprints.proxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("Proxy")), salt);
-        blueprints.proxyAdmin = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ProxyAdmin")), salt);
-        blueprints.l1ChugSplashProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("L1ChugSplashProxy")), salt);
-        blueprints.resolvedDelegateProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ResolvedDelegateProxy")), salt);
-        blueprints.anchorStateRegistry = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("AnchorStateRegistry")), salt);
-        (blueprints.permissionedDisputeGame1, blueprints.permissionedDisputeGame2)  = deployBigBytecode(vm.getCode("PermissionedDisputeGame"), salt);
-        vm.stopBroadcast();
-        // forgefmt: disable-end
-
-        OPContractsManager.ImplementationSetter[] memory setters = new OPContractsManager.ImplementationSetter[](9);
-        setters[0] = OPContractsManager.ImplementationSetter({
-            name: "L1ERC721Bridge",
-            info: OPContractsManager.Implementation(address(_dio.l1ERC721BridgeImpl()), IL1ERC721Bridge.initialize.selector)
-        });
-        setters[1] = OPContractsManager.ImplementationSetter({
-            name: "OptimismPortal",
-            info: OPContractsManager.Implementation(
-                address(_dio.optimismPortalImpl()), IOptimismPortal2.initialize.selector
-            )
-        });
-        setters[2] = opcmSystemConfigSetter(_dii, _dio);
-        setters[3] = OPContractsManager.ImplementationSetter({
-            name: "OptimismMintableERC20Factory",
-            info: OPContractsManager.Implementation(
-                address(_dio.optimismMintableERC20FactoryImpl()), IOptimismMintableERC20Factory.initialize.selector
-            )
-        });
-        setters[4] = l1CrossDomainMessengerConfigSetter(_dii, _dio);
-        setters[5] = l1StandardBridgeConfigSetter(_dii, _dio);
-        setters[6] = OPContractsManager.ImplementationSetter({
-            name: "DisputeGameFactory",
-            info: OPContractsManager.Implementation(
-                address(_dio.disputeGameFactoryImpl()), IDisputeGameFactory.initialize.selector
-            )
-        });
-        setters[7] = OPContractsManager.ImplementationSetter({
-            name: "DelayedWETH",
-            info: OPContractsManager.Implementation(address(_dio.delayedWETHImpl()), IDelayedWETH.initialize.selector)
-        });
-        setters[8] = OPContractsManager.ImplementationSetter({
-            name: "MIPS",
-            // MIPS is a singleton for all chains, so it doesn't need to be initialized, so the
-            // selector is just `bytes4(0)`.
-            info: OPContractsManager.Implementation(address(_dio.mipsSingleton()), bytes4(0))
-        });
+        string memory l1ContractsRelease = _dii.l1ContractsRelease();
+        string memory stdVerToml = _dii.standardVersionsToml();
+        string memory contractName = "op_contracts_manager";
+        OPContractsManager opcm;
 
-        // This call contains a broadcast to deploy OPCM which is proxied.
-        OPContractsManager opcmProxy = createOPCMContract(_dii, _dio, blueprints, release, setters);
+        address existingImplementation = getReleaseAddress(l1ContractsRelease, contractName, stdVerToml);
+        if (existingImplementation != address(0)) {
+            opcm = OPContractsManager(existingImplementation);
+        } else {
+            // First we deploy the blueprints for the singletons deployed by OPCM.
+            // forgefmt: disable-start
+            bytes32 salt = _dii.salt();
+            OPContractsManager.Blueprints memory blueprints;
+
+            vm.startBroadcast(msg.sender);
+            blueprints.addressManager = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("AddressManager")), salt);
+            blueprints.proxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("Proxy")), salt);
+            blueprints.proxyAdmin = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ProxyAdmin")), salt);
+            blueprints.l1ChugSplashProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("L1ChugSplashProxy")), salt);
+            blueprints.resolvedDelegateProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ResolvedDelegateProxy")), salt);
+            blueprints.anchorStateRegistry = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("AnchorStateRegistry")), salt);
+            (blueprints.permissionedDisputeGame1, blueprints.permissionedDisputeGame2)  = deployBigBytecode(vm.getCode("PermissionedDisputeGame"), salt);
+            vm.stopBroadcast();
+            // forgefmt: disable-end
+
+            opcm = createOPCMContract(_dii, _dio, blueprints, l1ContractsRelease);
+        }
 
-        vm.label(address(opcmProxy), "OPContractsManager");
-        _dio.set(_dio.opcmProxy.selector, address(opcmProxy));
+        vm.label(address(opcm), "OPContractsManager");
+        _dio.set(_dio.opcm.selector, address(opcm));
     }
 
     // --- Core Contracts ---
 
     function deploySystemConfigImpl(DeployImplementationsInput _dii, DeployImplementationsOutput _dio) public virtual {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         // Using snake case for contract name to match the TOML file in superchain-registry.
         string memory contractName = "system_config";
@@ -659,7 +525,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = ISystemConfig(existingImplementation);
-        } else if (isDevelopRelease(release)) {
+        } else {
             // Deploy a new implementation for development builds.
             vm.broadcast(msg.sender);
             impl = ISystemConfig(
@@ -668,8 +534,6 @@ contract DeployImplementations is Script {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfig.__constructor__, ()))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "SystemConfigImpl");
@@ -683,7 +547,7 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "l1_cross_domain_messenger";
         IL1CrossDomainMessenger impl;
@@ -691,7 +555,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IL1CrossDomainMessenger(existingImplementation);
-        } else if (isDevelopRelease(release)) {
+        } else {
             vm.broadcast(msg.sender);
             impl = IL1CrossDomainMessenger(
                 DeployUtils.create1({
@@ -699,8 +563,6 @@ contract DeployImplementations is Script {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1CrossDomainMessenger.__constructor__, ()))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "L1CrossDomainMessengerImpl");
@@ -714,7 +576,7 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "l1_erc721_bridge";
         IL1ERC721Bridge impl;
@@ -722,7 +584,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IL1ERC721Bridge(existingImplementation);
-        } else if (isDevelopRelease(release)) {
+        } else {
             vm.broadcast(msg.sender);
             impl = IL1ERC721Bridge(
                 DeployUtils.create1({
@@ -730,8 +592,6 @@ contract DeployImplementations is Script {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1ERC721Bridge.__constructor__, ()))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "L1ERC721BridgeImpl");
@@ -745,7 +605,7 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "l1_standard_bridge";
         IL1StandardBridge impl;
@@ -753,7 +613,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IL1StandardBridge(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
+        } else {
             vm.broadcast(msg.sender);
             impl = IL1StandardBridge(
                 DeployUtils.create1({
@@ -761,8 +621,6 @@ contract DeployImplementations is Script {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1StandardBridge.__constructor__, ()))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "L1StandardBridgeImpl");
@@ -776,7 +634,7 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "optimism_mintable_erc20_factory";
         IOptimismMintableERC20Factory impl;
@@ -784,7 +642,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IOptimismMintableERC20Factory(existingImplementation);
-        } else if (isDevelopRelease(release)) {
+        } else {
             vm.broadcast(msg.sender);
             impl = IOptimismMintableERC20Factory(
                 DeployUtils.create1({
@@ -792,32 +650,12 @@ contract DeployImplementations is Script {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IOptimismMintableERC20Factory.__constructor__, ()))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "OptimismMintableERC20FactoryImpl");
         _dio.set(_dio.optimismMintableERC20FactoryImpl.selector, address(impl));
     }
 
-    function deployOPContractsManagerImpl(
-        DeployImplementationsInput _dii,
-        DeployImplementationsOutput _dio
-    )
-        public
-        virtual
-    {
-        ISuperchainConfig superchainConfigProxy = _dii.superchainConfigProxy();
-        IProtocolVersions protocolVersionsProxy = _dii.protocolVersionsProxy();
-
-        vm.broadcast(msg.sender);
-        // TODO: Eventually we will want to select the correct implementation based on the release.
-        OPContractsManager impl = new OPContractsManager(superchainConfigProxy, protocolVersionsProxy);
-
-        vm.label(address(impl), "OPContractsManagerImpl");
-        _dio.set(_dio.opcmImpl.selector, address(impl));
-    }
-
     // --- Fault Proofs Contracts ---
 
     // The fault proofs contracts are configured as follows:
@@ -862,7 +700,7 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "optimism_portal";
         IOptimismPortal2 impl;
@@ -870,7 +708,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IOptimismPortal2(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
+        } else {
             uint256 proofMaturityDelaySeconds = _dii.proofMaturityDelaySeconds();
             uint256 disputeGameFinalityDelaySeconds = _dii.disputeGameFinalityDelaySeconds();
             vm.broadcast(msg.sender);
@@ -884,8 +722,6 @@ contract DeployImplementations is Script {
                     )
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "OptimismPortalImpl");
@@ -893,7 +729,7 @@ contract DeployImplementations is Script {
     }
 
     function deployDelayedWETHImpl(DeployImplementationsInput _dii, DeployImplementationsOutput _dio) public virtual {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "delayed_weth";
         IDelayedWETH impl;
@@ -901,7 +737,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IDelayedWETH(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
+        } else {
             uint256 withdrawalDelaySeconds = _dii.withdrawalDelaySeconds();
             vm.broadcast(msg.sender);
             impl = IDelayedWETH(
@@ -912,8 +748,6 @@ contract DeployImplementations is Script {
                     )
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "DelayedWETHImpl");
@@ -927,7 +761,7 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "preimage_oracle";
         IPreimageOracle singleton;
@@ -935,7 +769,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             singleton = IPreimageOracle(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
+        } else {
             uint256 minProposalSizeBytes = _dii.minProposalSizeBytes();
             uint256 challengePeriodSeconds = _dii.challengePeriodSeconds();
             vm.broadcast(msg.sender);
@@ -947,8 +781,6 @@ contract DeployImplementations is Script {
                     )
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(singleton), "PreimageOracleSingleton");
@@ -956,7 +788,7 @@ contract DeployImplementations is Script {
     }
 
     function deployMipsSingleton(DeployImplementationsInput _dii, DeployImplementationsOutput _dio) public virtual {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "mips";
         IMIPS singleton;
@@ -964,7 +796,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             singleton = IMIPS(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
+        } else {
             uint256 mipsVersion = _dii.mipsVersion();
             IPreimageOracle preimageOracle = IPreimageOracle(address(_dio.preimageOracleSingleton()));
             vm.broadcast(msg.sender);
@@ -974,8 +806,6 @@ contract DeployImplementations is Script {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS.__constructor__, (preimageOracle)))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(singleton), "MIPSSingleton");
@@ -989,7 +819,7 @@ contract DeployImplementations is Script {
         public
         virtual
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "dispute_game_factory";
         IDisputeGameFactory impl;
@@ -997,7 +827,7 @@ contract DeployImplementations is Script {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IDisputeGameFactory(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
+        } else {
             vm.broadcast(msg.sender);
             impl = IDisputeGameFactory(
                 DeployUtils.create1({
@@ -1005,8 +835,6 @@ contract DeployImplementations is Script {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IDisputeGameFactory.__constructor__, ()))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "DisputeGameFactoryImpl");
@@ -1076,11 +904,6 @@ contract DeployImplementations is Script {
             }
         }
     }
-
-    // A release is considered a 'develop' release if it does not start with 'op-contracts'.
-    function isDevelopRelease(string memory _release) internal pure returns (bool) {
-        return !LibString.startsWith(_release, "op-contracts");
-    }
 }
 
 // Similar to how DeploySuperchain.s.sol contains a lot of comments to thoroughly document the script
@@ -1120,36 +943,35 @@ contract DeployImplementationsInterop is DeployImplementations {
         DeployImplementationsInput _dii,
         DeployImplementationsOutput _dio,
         OPContractsManager.Blueprints memory _blueprints,
-        string memory _release,
-        OPContractsManager.ImplementationSetter[] memory _setters
+        string memory _l1ContractsRelease
     )
         internal
+        virtual
         override
-        returns (OPContractsManager opcmProxy_)
+        returns (OPContractsManager opcm_)
     {
-        address opcmProxyOwner = _dii.opcmProxyOwner();
+        ISuperchainConfig superchainConfigProxy = _dii.superchainConfigProxy();
+        IProtocolVersions protocolVersionsProxy = _dii.protocolVersionsProxy();
+
+        OPContractsManager.Implementations memory implementations = OPContractsManager.Implementations({
+            l1ERC721BridgeImpl: address(_dio.l1ERC721BridgeImpl()),
+            optimismPortalImpl: address(_dio.optimismPortalImpl()),
+            systemConfigImpl: address(_dio.systemConfigImpl()),
+            optimismMintableERC20FactoryImpl: address(_dio.optimismMintableERC20FactoryImpl()),
+            l1CrossDomainMessengerImpl: address(_dio.l1CrossDomainMessengerImpl()),
+            l1StandardBridgeImpl: address(_dio.l1StandardBridgeImpl()),
+            disputeGameFactoryImpl: address(_dio.disputeGameFactoryImpl()),
+            delayedWETHImpl: address(_dio.delayedWETHImpl()),
+            mipsImpl: address(_dio.mipsSingleton())
+        });
 
         vm.broadcast(msg.sender);
-        IProxy proxy = IProxy(
-            DeployUtils.create1({
-                _name: "Proxy",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
-            })
+        opcm_ = new OPContractsManagerInterop(
+            superchainConfigProxy, protocolVersionsProxy, _l1ContractsRelease, _blueprints, implementations
         );
 
-        deployOPContractsManagerImpl(_dii, _dio); // overriding function
-        OPContractsManager opcmImpl = _dio.opcmImpl();
-
-        OPContractsManager.InitializerInputs memory initializerInputs =
-            OPContractsManager.InitializerInputs(_blueprints, _setters, _release, true);
-
-        vm.startBroadcast(msg.sender);
-        proxy.upgradeToAndCall(address(opcmImpl), abi.encodeCall(opcmImpl.initialize, (initializerInputs)));
-
-        proxy.changeAdmin(opcmProxyOwner); // transfer ownership of Proxy contract to the ProxyAdmin contract
-        vm.stopBroadcast();
-
-        opcmProxy_ = OPContractsManagerInterop(address(proxy));
+        vm.label(address(opcm_), "OPContractsManager");
+        _dio.set(_dio.opcm.selector, address(opcm_));
     }
 
     function deployOptimismPortalImpl(
@@ -1159,7 +981,7 @@ contract DeployImplementationsInterop is DeployImplementations {
         public
         override
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
         string memory contractName = "optimism_portal";
         IOptimismPortalInterop impl;
@@ -1167,7 +989,7 @@ contract DeployImplementationsInterop is DeployImplementations {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = IOptimismPortalInterop(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
+        } else {
             uint256 proofMaturityDelaySeconds = _dii.proofMaturityDelaySeconds();
             uint256 disputeGameFinalityDelaySeconds = _dii.disputeGameFinalityDelaySeconds();
             vm.broadcast(msg.sender);
@@ -1182,8 +1004,6 @@ contract DeployImplementationsInterop is DeployImplementations {
                     )
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "OptimismPortalImpl");
@@ -1197,7 +1017,7 @@ contract DeployImplementationsInterop is DeployImplementations {
         public
         override
     {
-        string memory release = _dii.release();
+        string memory release = _dii.l1ContractsRelease();
         string memory stdVerToml = _dii.standardVersionsToml();
 
         string memory contractName = "system_config";
@@ -1206,7 +1026,7 @@ contract DeployImplementationsInterop is DeployImplementations {
         address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
         if (existingImplementation != address(0)) {
             impl = ISystemConfigInterop(existingImplementation);
-        } else if (isDevelopRelease(release)) {
+        } else {
             vm.broadcast(msg.sender);
             impl = ISystemConfigInterop(
                 DeployUtils.create1({
@@ -1214,46 +1034,9 @@ contract DeployImplementationsInterop is DeployImplementations {
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfigInterop.__constructor__, ()))
                 })
             );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
         }
 
         vm.label(address(impl), "SystemConfigImpl");
         _dio.set(_dio.systemConfigImpl.selector, address(impl));
     }
-
-    function deployOPContractsManagerImpl(
-        DeployImplementationsInput _dii,
-        DeployImplementationsOutput _dio
-    )
-        public
-        override
-    {
-        ISuperchainConfig superchainConfigProxy = _dii.superchainConfigProxy();
-        IProtocolVersions protocolVersionsProxy = _dii.protocolVersionsProxy();
-
-        vm.broadcast(msg.sender);
-        // TODO: Eventually we will want to select the correct implementation based on the release.
-        OPContractsManager impl = new OPContractsManagerInterop(superchainConfigProxy, protocolVersionsProxy);
-
-        vm.label(address(impl), "OPContractsManagerImpl");
-        _dio.set(_dio.opcmImpl.selector, address(impl));
-    }
-
-    function opcmSystemConfigSetter(
-        DeployImplementationsInput,
-        DeployImplementationsOutput _dio
-    )
-        internal
-        view
-        override
-        returns (OPContractsManager.ImplementationSetter memory)
-    {
-        return OPContractsManager.ImplementationSetter({
-            name: "SystemConfig",
-            info: OPContractsManager.Implementation(
-                address(_dio.systemConfigImpl()), ISystemConfigInterop.initialize.selector
-            )
-        });
-    }
 }
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
index eb3b346452e9..a83dfb110625 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
@@ -47,7 +47,7 @@ contract DeployOPChainInput is BaseDeployIO {
     uint32 internal _basefeeScalar;
     uint32 internal _blobBaseFeeScalar;
     uint256 internal _l2ChainId;
-    OPContractsManager internal _opcmProxy;
+    OPContractsManager internal _opcm;
     string internal _saltMixer;
     uint64 internal _gasLimit;
 
@@ -68,7 +68,7 @@ contract DeployOPChainInput is BaseDeployIO {
         else if (_sel == this.unsafeBlockSigner.selector) _unsafeBlockSigner = _addr;
         else if (_sel == this.proposer.selector) _proposer = _addr;
         else if (_sel == this.challenger.selector) _challenger = _addr;
-        else if (_sel == this.opcmProxy.selector) _opcmProxy = OPContractsManager(_addr);
+        else if (_sel == this.opcm.selector) _opcm = OPContractsManager(_addr);
         else revert("DeployOPChainInput: unknown selector");
     }
 
@@ -174,11 +174,10 @@ contract DeployOPChainInput is BaseDeployIO {
         return abi.encode(ScriptConstants.DEFAULT_STARTING_ANCHOR_ROOTS());
     }
 
-    function opcmProxy() public returns (OPContractsManager) {
-        require(address(_opcmProxy) != address(0), "DeployOPChainInput: not set");
-        DeployUtils.assertValidContractAddress(address(_opcmProxy));
-        DeployUtils.assertERC1967ImplementationSet(address(_opcmProxy));
-        return _opcmProxy;
+    function opcm() public view returns (OPContractsManager) {
+        require(address(_opcm) != address(0), "DeployOPChainInput: not set");
+        DeployUtils.assertValidContractAddress(address(_opcm));
+        return _opcm;
     }
 
     function saltMixer() public view returns (string memory) {
@@ -347,7 +346,7 @@ contract DeployOPChain is Script {
     // -------- Core Deployment Methods --------
 
     function run(DeployOPChainInput _doi, DeployOPChainOutput _doo) public {
-        OPContractsManager opcmProxy = _doi.opcmProxy();
+        OPContractsManager opcm = _doi.opcm();
 
         OPContractsManager.Roles memory roles = OPContractsManager.Roles({
             opChainProxyAdminOwner: _doi.opChainProxyAdminOwner(),
@@ -374,7 +373,7 @@ contract DeployOPChain is Script {
         });
 
         vm.broadcast(msg.sender);
-        OPContractsManager.DeployOutput memory deployOutput = opcmProxy.deploy(deployInput);
+        OPContractsManager.DeployOutput memory deployOutput = opcm.deploy(deployInput);
 
         vm.label(address(deployOutput.opChainProxyAdmin), "opChainProxyAdmin");
         vm.label(address(deployOutput.addressManager), "addressManager");
@@ -480,9 +479,9 @@ contract DeployOPChain is Script {
             "DPG-20"
         );
 
-        OPContractsManager opcm = _doi.opcmProxy();
-        (address mips,) = opcm.implementations(opcm.latestRelease(), "MIPS");
-        require(game.vm() == IBigStepper(mips), "DPG-30");
+        OPContractsManager opcm = _doi.opcm();
+        address mipsImpl = opcm.implementations().mipsImpl;
+        require(game.vm() == IBigStepper(mipsImpl), "DPG-30");
 
         require(address(game.weth()) == address(_doo.delayedWETHPermissionedGameProxy()), "DPG-40");
         require(address(game.anchorStateRegistry()) == address(_doo.anchorStateRegistryProxy()), "DPG-50");
@@ -552,9 +551,7 @@ contract DeployOPChain is Script {
         require(outputConfig.maximumBaseFee == rConfig.maximumBaseFee, "SYSCON-130");
 
         require(systemConfig.startBlock() == block.number, "SYSCON-140");
-        require(
-            systemConfig.batchInbox() == _doi.opcmProxy().chainIdToBatchInboxAddress(_doi.l2ChainId()), "SYSCON-150"
-        );
+        require(systemConfig.batchInbox() == _doi.opcm().chainIdToBatchInboxAddress(_doi.l2ChainId()), "SYSCON-150");
 
         require(systemConfig.l1CrossDomainMessenger() == address(_doo.l1CrossDomainMessengerProxy()), "SYSCON-160");
         require(systemConfig.l1ERC721Bridge() == address(_doo.l1ERC721BridgeProxy()), "SYSCON-170");
@@ -579,7 +576,7 @@ contract DeployOPChain is Script {
 
         require(address(messenger.PORTAL()) == address(_doo.optimismPortalProxy()), "L1xDM-30");
         require(address(messenger.portal()) == address(_doo.optimismPortalProxy()), "L1xDM-40");
-        require(address(messenger.superchainConfig()) == address(_doi.opcmProxy().superchainConfig()), "L1xDM-50");
+        require(address(messenger.superchainConfig()) == address(_doi.opcm().superchainConfig()), "L1xDM-50");
 
         bytes32 xdmSenderSlot = vm.load(address(messenger), bytes32(uint256(204)));
         require(address(uint160(uint256(xdmSenderSlot))) == Constants.DEFAULT_L2_SENDER, "L1xDM-60");
@@ -595,7 +592,7 @@ contract DeployOPChain is Script {
         require(address(bridge.messenger()) == address(messenger), "L1SB-20");
         require(address(bridge.OTHER_BRIDGE()) == Predeploys.L2_STANDARD_BRIDGE, "L1SB-30");
         require(address(bridge.otherBridge()) == Predeploys.L2_STANDARD_BRIDGE, "L1SB-40");
-        require(address(bridge.superchainConfig()) == address(_doi.opcmProxy().superchainConfig()), "L1SB-50");
+        require(address(bridge.superchainConfig()) == address(_doi.opcm().superchainConfig()), "L1SB-50");
     }
 
     function assertValidOptimismMintableERC20Factory(DeployOPChainInput, DeployOPChainOutput _doo) internal {
@@ -617,12 +614,12 @@ contract DeployOPChain is Script {
 
         require(address(bridge.MESSENGER()) == address(_doo.l1CrossDomainMessengerProxy()), "L721B-30");
         require(address(bridge.messenger()) == address(_doo.l1CrossDomainMessengerProxy()), "L721B-40");
-        require(address(bridge.superchainConfig()) == address(_doi.opcmProxy().superchainConfig()), "L721B-50");
+        require(address(bridge.superchainConfig()) == address(_doi.opcm().superchainConfig()), "L721B-50");
     }
 
     function assertValidOptimismPortal(DeployOPChainInput _doi, DeployOPChainOutput _doo) internal {
         IOptimismPortal2 portal = _doo.optimismPortalProxy();
-        ISuperchainConfig superchainConfig = ISuperchainConfig(address(_doi.opcmProxy().superchainConfig()));
+        ISuperchainConfig superchainConfig = ISuperchainConfig(address(_doi.opcm().superchainConfig()));
 
         require(address(portal.disputeGameFactory()) == address(_doo.disputeGameFactoryProxy()), "PORTAL-10");
         require(address(portal.systemConfig()) == address(_doo.systemConfigProxy()), "PORTAL-20");
diff --git a/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol b/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
index 3992cf1cb657..35aefbed16d5 100644
--- a/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
@@ -12,29 +12,18 @@ import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
 import { IStaticL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
 
 contract ReadImplementationAddressesInput is DeployOPChainOutput {
-    OPContractsManager internal _opcmProxy;
-    string internal _release;
+    OPContractsManager internal _opcm;
 
     function set(bytes4 _sel, address _addr) public override {
         require(_addr != address(0), "ReadImplementationAddressesInput: cannot set zero address");
-        if (_sel == this.opcmProxy.selector) _opcmProxy = OPContractsManager(_addr);
+        if (_sel == this.opcm.selector) _opcm = OPContractsManager(_addr);
         else if (_sel == this.addressManager.selector) _addressManager = IAddressManager(_addr);
         else super.set(_sel, _addr);
     }
 
-    function set(bytes4 _sel, string memory _val) public {
-        if (_sel == this.release.selector) _release = _val;
-        else revert("ReadImplementationAddressesInput: unknown selector");
-    }
-
-    function opcmProxy() public view returns (OPContractsManager) {
-        DeployUtils.assertValidContractAddress(address(_opcmProxy));
-        return _opcmProxy;
-    }
-
-    function release() public view returns (string memory) {
-        require(bytes(_release).length != 0, "ReadImplementationAddressesInput: release not set");
-        return _release;
+    function opcm() public view returns (OPContractsManager) {
+        DeployUtils.assertValidContractAddress(address(_opcm));
+        return _opcm;
     }
 }
 
@@ -154,9 +143,12 @@ contract ReadImplementationAddresses is Script {
         vm.prank(address(0));
         _rio.set(_rio.l1StandardBridge.selector, l1SBImpl);
 
-        (address mipsLogic,) = _rii.opcmProxy().implementations(_rii.release(), "MIPS");
+        address mipsLogic = _rii.opcm().implementations().mipsImpl;
         _rio.set(_rio.mipsSingleton.selector, mipsLogic);
 
+        address delayedWETH = _rii.opcm().implementations().delayedWETHImpl;
+        _rio.set(_rio.delayedWETH.selector, delayedWETH);
+
         IAddressManager am = _rii.addressManager();
         _rio.set(_rio.l1CrossDomainMessenger.selector, am.getAddress("OVM_L1CrossDomainMessenger"));
 
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
index 7c478feb235d..b5758eca610f 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
@@ -10,6 +10,110 @@
         "internalType": "contract IProtocolVersions",
         "name": "_protocolVersions",
         "type": "address"
+      },
+      {
+        "internalType": "string",
+        "name": "_l1ContractsRelease",
+        "type": "string"
+      },
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "addressManager",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "proxy",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "proxyAdmin",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1ChugSplashProxy",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "resolvedDelegateProxy",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "anchorStateRegistry",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGame1",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGame2",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct OPContractsManager.Blueprints",
+        "name": "_blueprints",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "l1ERC721BridgeImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "optimismPortalImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "systemConfigImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "optimismMintableERC20FactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1CrossDomainMessengerImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1StandardBridgeImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "disputeGameFactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "delayedWETHImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "mipsImpl",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct OPContractsManager.Implementations",
+        "name": "_implementations",
+        "type": "tuple"
       }
     ],
     "stateMutability": "nonpayable",
@@ -298,138 +402,68 @@
     "type": "function"
   },
   {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
+    "inputs": [],
     "name": "implementations",
     "outputs": [
-      {
-        "internalType": "address",
-        "name": "logic",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes4",
-        "name": "initializer",
-        "type": "bytes4"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
       {
         "components": [
           {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "addressManager",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "proxy",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "proxyAdmin",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "l1ChugSplashProxy",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "resolvedDelegateProxy",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "anchorStateRegistry",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "permissionedDisputeGame1",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "permissionedDisputeGame2",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct OPContractsManager.Blueprints",
-            "name": "blueprints",
-            "type": "tuple"
+            "internalType": "address",
+            "name": "l1ERC721BridgeImpl",
+            "type": "address"
           },
           {
-            "components": [
-              {
-                "internalType": "string",
-                "name": "name",
-                "type": "string"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "address",
-                    "name": "logic",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bytes4",
-                    "name": "initializer",
-                    "type": "bytes4"
-                  }
-                ],
-                "internalType": "struct OPContractsManager.Implementation",
-                "name": "info",
-                "type": "tuple"
-              }
-            ],
-            "internalType": "struct OPContractsManager.ImplementationSetter[]",
-            "name": "setters",
-            "type": "tuple[]"
+            "internalType": "address",
+            "name": "optimismPortalImpl",
+            "type": "address"
           },
           {
-            "internalType": "string",
-            "name": "release",
-            "type": "string"
+            "internalType": "address",
+            "name": "systemConfigImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "optimismMintableERC20FactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1CrossDomainMessengerImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1StandardBridgeImpl",
+            "type": "address"
           },
           {
-            "internalType": "bool",
-            "name": "isLatest",
-            "type": "bool"
+            "internalType": "address",
+            "name": "disputeGameFactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "delayedWETHImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "mipsImpl",
+            "type": "address"
           }
         ],
-        "internalType": "struct OPContractsManager.InitializerInputs",
-        "name": "_initializerInputs",
+        "internalType": "struct OPContractsManager.Implementations",
+        "name": "",
         "type": "tuple"
       }
     ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
-    "name": "latestRelease",
+    "name": "l1ContractsRelease",
     "outputs": [
       {
         "internalType": "string",
@@ -529,19 +563,6 @@
     "name": "Deployed",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
   {
     "inputs": [
       {
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
index 7c478feb235d..b5758eca610f 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
@@ -10,6 +10,110 @@
         "internalType": "contract IProtocolVersions",
         "name": "_protocolVersions",
         "type": "address"
+      },
+      {
+        "internalType": "string",
+        "name": "_l1ContractsRelease",
+        "type": "string"
+      },
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "addressManager",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "proxy",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "proxyAdmin",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1ChugSplashProxy",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "resolvedDelegateProxy",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "anchorStateRegistry",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGame1",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "permissionedDisputeGame2",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct OPContractsManager.Blueprints",
+        "name": "_blueprints",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "l1ERC721BridgeImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "optimismPortalImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "systemConfigImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "optimismMintableERC20FactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1CrossDomainMessengerImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1StandardBridgeImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "disputeGameFactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "delayedWETHImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "mipsImpl",
+            "type": "address"
+          }
+        ],
+        "internalType": "struct OPContractsManager.Implementations",
+        "name": "_implementations",
+        "type": "tuple"
       }
     ],
     "stateMutability": "nonpayable",
@@ -298,138 +402,68 @@
     "type": "function"
   },
   {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
+    "inputs": [],
     "name": "implementations",
     "outputs": [
-      {
-        "internalType": "address",
-        "name": "logic",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes4",
-        "name": "initializer",
-        "type": "bytes4"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
       {
         "components": [
           {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "addressManager",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "proxy",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "proxyAdmin",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "l1ChugSplashProxy",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "resolvedDelegateProxy",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "anchorStateRegistry",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "permissionedDisputeGame1",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "permissionedDisputeGame2",
-                "type": "address"
-              }
-            ],
-            "internalType": "struct OPContractsManager.Blueprints",
-            "name": "blueprints",
-            "type": "tuple"
+            "internalType": "address",
+            "name": "l1ERC721BridgeImpl",
+            "type": "address"
           },
           {
-            "components": [
-              {
-                "internalType": "string",
-                "name": "name",
-                "type": "string"
-              },
-              {
-                "components": [
-                  {
-                    "internalType": "address",
-                    "name": "logic",
-                    "type": "address"
-                  },
-                  {
-                    "internalType": "bytes4",
-                    "name": "initializer",
-                    "type": "bytes4"
-                  }
-                ],
-                "internalType": "struct OPContractsManager.Implementation",
-                "name": "info",
-                "type": "tuple"
-              }
-            ],
-            "internalType": "struct OPContractsManager.ImplementationSetter[]",
-            "name": "setters",
-            "type": "tuple[]"
+            "internalType": "address",
+            "name": "optimismPortalImpl",
+            "type": "address"
           },
           {
-            "internalType": "string",
-            "name": "release",
-            "type": "string"
+            "internalType": "address",
+            "name": "systemConfigImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "optimismMintableERC20FactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1CrossDomainMessengerImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "l1StandardBridgeImpl",
+            "type": "address"
           },
           {
-            "internalType": "bool",
-            "name": "isLatest",
-            "type": "bool"
+            "internalType": "address",
+            "name": "disputeGameFactoryImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "delayedWETHImpl",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "mipsImpl",
+            "type": "address"
           }
         ],
-        "internalType": "struct OPContractsManager.InitializerInputs",
-        "name": "_initializerInputs",
+        "internalType": "struct OPContractsManager.Implementations",
+        "name": "",
         "type": "tuple"
       }
     ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
-    "name": "latestRelease",
+    "name": "l1ContractsRelease",
     "outputs": [
       {
         "internalType": "string",
@@ -529,19 +563,6 @@
     "name": "Deployed",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
   {
     "inputs": [
       {
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index e96fa687e9c6..8f40dca3ff43 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -20,8 +20,8 @@
     "sourceCodeHash": "0x4132ff37d267cb12224b75ea806c0aa7d25407b0d66ce526d7fcda8f7d223882"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0xd58cb3978affc5c1457cdd498ff8420c90aef804d4c3b62cf42ab2691986d6d2",
-    "sourceCodeHash": "0x7bfa6eff76176649fe600303cd60009a0f6e282cbaec55836b5ea1f8875cbeb5"
+    "initCodeHash": "0xd038cc35325d023499151264232d75fa4ecc81f04a8c8353e6b50c43af224d6e",
+    "sourceCodeHash": "0xa13f3ab2b8744015290dbabe5f20fdd44774607e6a7ad3e5e016303fc4aa8c12"
   },
   "src/L1/OptimismPortal.sol": {
     "initCodeHash": "0x152167cfa18635ae4918a6eb3371a599cfa084418c0a652799cdb48bfc0ee0cc",
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
index aeef539c5c20..aa8148b34cba 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
@@ -1,51 +1,30 @@
 [
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
   {
     "bytes": "32",
-    "label": "latestRelease",
+    "label": "l1ContractsRelease",
     "offset": 0,
-    "slot": "1",
+    "slot": "0",
     "type": "string"
   },
-  {
-    "bytes": "32",
-    "label": "implementations",
-    "offset": 0,
-    "slot": "2",
-    "type": "mapping(string => mapping(string => struct OPContractsManager.Implementation))"
-  },
   {
     "bytes": "32",
     "label": "systemConfigs",
     "offset": 0,
-    "slot": "3",
+    "slot": "1",
     "type": "mapping(uint256 => contract ISystemConfig)"
   },
   {
     "bytes": "256",
     "label": "blueprint",
     "offset": 0,
-    "slot": "4",
+    "slot": "2",
     "type": "struct OPContractsManager.Blueprints"
   },
   {
-    "bytes": "1600",
-    "label": "__gap",
+    "bytes": "288",
+    "label": "implementation",
     "offset": 0,
-    "slot": "12",
-    "type": "uint256[50]"
+    "slot": "10",
+    "type": "struct OPContractsManager.Implementations"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
index aeef539c5c20..aa8148b34cba 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
@@ -1,51 +1,30 @@
 [
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
   {
     "bytes": "32",
-    "label": "latestRelease",
+    "label": "l1ContractsRelease",
     "offset": 0,
-    "slot": "1",
+    "slot": "0",
     "type": "string"
   },
-  {
-    "bytes": "32",
-    "label": "implementations",
-    "offset": 0,
-    "slot": "2",
-    "type": "mapping(string => mapping(string => struct OPContractsManager.Implementation))"
-  },
   {
     "bytes": "32",
     "label": "systemConfigs",
     "offset": 0,
-    "slot": "3",
+    "slot": "1",
     "type": "mapping(uint256 => contract ISystemConfig)"
   },
   {
     "bytes": "256",
     "label": "blueprint",
     "offset": 0,
-    "slot": "4",
+    "slot": "2",
     "type": "struct OPContractsManager.Blueprints"
   },
   {
-    "bytes": "1600",
-    "label": "__gap",
+    "bytes": "288",
+    "label": "implementation",
     "offset": 0,
-    "slot": "12",
-    "type": "uint256[50]"
+    "slot": "10",
+    "type": "struct OPContractsManager.Implementations"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
index 4bf52ff228a1..a2a5a5f215b0 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -4,15 +4,12 @@ pragma solidity 0.8.15;
 import { Blueprint } from "src/libraries/Blueprint.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { ISystemConfigV160 } from "src/L1/interfaces/ISystemConfigV160.sol";
 import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
 
 import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
@@ -28,14 +25,12 @@ import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISystemConfigV160 } from "src/L1/interfaces/ISystemConfigV160.sol";
 import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
 import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
 import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
 import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
 
-/// @custom:proxied true
-contract OPContractsManager is ISemver, Initializable {
+contract OPContractsManager is ISemver {
     // -------- Structs --------
 
     /// @notice Represents the roles that can be set when deploying a standard OP Stack chain.
@@ -89,19 +84,6 @@ contract OPContractsManager is ISemver, Initializable {
         IDelayedWETH delayedWETHPermissionlessGameProxy;
     }
 
-    /// @notice The logic address and initializer selector for an implementation contract.
-    struct Implementation {
-        address logic; // Address containing the deployed logic contract.
-        bytes4 initializer; // Function selector for the initializer.
-    }
-
-    /// @notice Used to set the implementation for a contract by mapping a contract
-    /// name to the implementation data.
-    struct ImplementationSetter {
-        string name; // Contract name.
-        Implementation info; // Implementation to set.
-    }
-
     /// @notice Addresses of ERC-5202 Blueprint contracts. There are used for deploying full size
     /// contracts, to reduce the code size of this factory contract. If it deployed full contracts
     /// using the `new Proxy()` syntax, the code size would get large fast, since this contract would
@@ -118,19 +100,23 @@ contract OPContractsManager is ISemver, Initializable {
         address permissionedDisputeGame2;
     }
 
-    /// @notice Inputs required when initializing the OPContractsManager. To avoid 'StackTooDeep' errors,
-    /// all necessary inputs (excluding immutables) for initialization are bundled together in this struct.
-    struct InitializerInputs {
-        Blueprints blueprints;
-        ImplementationSetter[] setters;
-        string release;
-        bool isLatest;
+    /// @notice The latest implementation contracts for the OP Stack.
+    struct Implementations {
+        address l1ERC721BridgeImpl;
+        address optimismPortalImpl;
+        address systemConfigImpl;
+        address optimismMintableERC20FactoryImpl;
+        address l1CrossDomainMessengerImpl;
+        address l1StandardBridgeImpl;
+        address disputeGameFactoryImpl;
+        address delayedWETHImpl;
+        address mipsImpl;
     }
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.0.0-beta.20
-    string public constant version = "1.0.0-beta.20";
+    /// @custom:semver 1.0.0-beta.21
+    string public constant version = "1.0.0-beta.21";
 
     /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
     /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
@@ -142,24 +128,20 @@ contract OPContractsManager is ISemver, Initializable {
     /// @notice Address of the ProtocolVersions contract shared by all chains.
     IProtocolVersions public immutable protocolVersions;
 
-    /// @notice The latest release of the OP Contracts Manager, as a string of the format `op-contracts/vX.Y.Z`.
-    string public latestRelease;
-
-    /// @notice Maps a release version to a contract name to it's implementation data.
-    mapping(string => mapping(string => Implementation)) public implementations;
+    // @notice L1 smart contracts release deployed by this version of OPCM. This is used in opcm to signal which version
+    // of the L1 smart contracts is deployed. It takes the format of `op-contracts/vX.Y.Z`.
+    string public l1ContractsRelease;
 
     /// @notice Maps an L2 Chain ID to the SystemConfig for that chain.
     mapping(uint256 => ISystemConfig) public systemConfigs;
 
     /// @notice Addresses of the Blueprint contracts.
     /// This is internal because if public the autogenerated getter method would return a tuple of
-    /// addresses, but we want it to return a struct. This is also set via `initialize` because
-    /// we can't make this an immutable variable as it is a non-value type.
+    /// addresses, but we want it to return a struct.
     Blueprints internal blueprint;
 
-    /// @notice Storage gap for future modifications, so we can expand the number of blueprints
-    /// without affecting other storage variables.
-    uint256[50] private __gap;
+    /// @notice Addresses of the latest implementation contracts.
+    Implementations internal implementation;
 
     // -------- Events --------
 
@@ -197,37 +179,26 @@ contract OPContractsManager is ISemver, Initializable {
 
     // -------- Methods --------
 
-    /// @notice OPCM is proxied. Therefore the `initialize` function replaces most constructor logic for this contract.
-
-    constructor(ISuperchainConfig _superchainConfig, IProtocolVersions _protocolVersions) {
+    constructor(
+        ISuperchainConfig _superchainConfig,
+        IProtocolVersions _protocolVersions,
+        string memory _l1ContractsRelease,
+        Blueprints memory _blueprints,
+        Implementations memory _implementations
+    ) {
         assertValidContractAddress(address(_superchainConfig));
         assertValidContractAddress(address(_protocolVersions));
         superchainConfig = _superchainConfig;
         protocolVersions = _protocolVersions;
-        _disableInitializers();
-    }
-
-    function initialize(InitializerInputs memory _initializerInputs) public initializer {
-        if (_initializerInputs.isLatest) latestRelease = _initializerInputs.release;
-        if (keccak256(bytes(latestRelease)) == keccak256("")) revert LatestReleaseNotSet();
+        l1ContractsRelease = _l1ContractsRelease;
 
-        for (uint256 i = 0; i < _initializerInputs.setters.length; i++) {
-            ImplementationSetter memory setter = _initializerInputs.setters[i];
-            Implementation storage impl = implementations[_initializerInputs.release][setter.name];
-            if (impl.logic != address(0)) revert AlreadyReleased();
-
-            impl.initializer = setter.info.initializer;
-            impl.logic = setter.info.logic;
-        }
-
-        blueprint = _initializerInputs.blueprints;
+        blueprint = _blueprints;
+        implementation = _implementations;
     }
 
     function deploy(DeployInput calldata _input) external returns (DeployOutput memory) {
         assertValidInputs(_input);
-
         uint256 l2ChainId = _input.l2ChainId;
-
         // The salt for a non-proxy contract is a function of the chain ID and the salt mixer.
         string memory saltMixer = _input.saltMixer;
         bytes32 salt = keccak256(abi.encode(l2ChainId, saltMixer));
@@ -266,7 +237,6 @@ contract OPContractsManager is ISemver, Initializable {
             payable(Blueprint.deployFrom(blueprint.l1ChugSplashProxy, salt, abi.encode(output.opChainProxyAdmin)))
         );
         output.opChainProxyAdmin.setProxyType(address(output.l1StandardBridgeProxy), IProxyAdmin.ProxyType.CHUGSPLASH);
-
         string memory contractName = "OVM_L1CrossDomainMessenger";
         output.l1CrossDomainMessengerProxy = IL1CrossDomainMessenger(
             Blueprint.deployFrom(blueprint.resolvedDelegateProxy, salt, abi.encode(output.addressManager, contractName))
@@ -275,10 +245,8 @@ contract OPContractsManager is ISemver, Initializable {
             address(output.l1CrossDomainMessengerProxy), IProxyAdmin.ProxyType.RESOLVED
         );
         output.opChainProxyAdmin.setImplementationName(address(output.l1CrossDomainMessengerProxy), contractName);
-
         // Now that all proxies are deployed, we can transfer ownership of the AddressManager to the ProxyAdmin.
         output.addressManager.transferOwnership(address(output.opChainProxyAdmin));
-
         // The AnchorStateRegistry Implementation is not MCP Ready, and therefore requires an implementation per chain.
         // It must be deployed after the DisputeGameFactoryProxy so that it can be provided as a constructor argument.
         output.anchorStateRegistryImpl = IAnchorStateRegistry(
@@ -301,54 +269,76 @@ contract OPContractsManager is ISemver, Initializable {
         );
 
         // -------- Set and Initialize Proxy Implementations --------
-        Implementation memory impl;
         bytes memory data;
 
-        impl = getLatestImplementation("L1ERC721Bridge");
-        data = encodeL1ERC721BridgeInitializer(impl.initializer, output);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.l1ERC721BridgeProxy), impl.logic, data);
+        data = encodeL1ERC721BridgeInitializer(IL1ERC721Bridge.initialize.selector, output);
+        upgradeAndCall(
+            output.opChainProxyAdmin, address(output.l1ERC721BridgeProxy), implementation.l1ERC721BridgeImpl, data
+        );
 
-        impl = getLatestImplementation("OptimismPortal");
-        data = encodeOptimismPortalInitializer(impl.initializer, output);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.optimismPortalProxy), impl.logic, data);
+        data = encodeOptimismPortalInitializer(IOptimismPortal2.initialize.selector, output);
+        upgradeAndCall(
+            output.opChainProxyAdmin, address(output.optimismPortalProxy), implementation.optimismPortalImpl, data
+        );
 
         // First we upgrade the implementation so it's version can be retrieved, then we initialize
         // it afterwards. See the comments in encodeSystemConfigInitializer to learn more.
-        impl = getLatestImplementation("SystemConfig");
-        output.opChainProxyAdmin.upgrade(payable(address(output.systemConfigProxy)), impl.logic);
-        data = encodeSystemConfigInitializer(impl.initializer, _input, output);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.systemConfigProxy), impl.logic, data);
+        output.opChainProxyAdmin.upgrade(payable(address(output.systemConfigProxy)), implementation.systemConfigImpl);
+        data = encodeSystemConfigInitializer(_input, output);
+        upgradeAndCall(
+            output.opChainProxyAdmin, address(output.systemConfigProxy), implementation.systemConfigImpl, data
+        );
 
-        impl = getLatestImplementation("OptimismMintableERC20Factory");
-        data = encodeOptimismMintableERC20FactoryInitializer(impl.initializer, output);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.optimismMintableERC20FactoryProxy), impl.logic, data);
+        data = encodeOptimismMintableERC20FactoryInitializer(IOptimismMintableERC20Factory.initialize.selector, output);
+        upgradeAndCall(
+            output.opChainProxyAdmin,
+            address(output.optimismMintableERC20FactoryProxy),
+            implementation.optimismMintableERC20FactoryImpl,
+            data
+        );
 
-        impl = getLatestImplementation("L1CrossDomainMessenger");
-        data = encodeL1CrossDomainMessengerInitializer(impl.initializer, output);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.l1CrossDomainMessengerProxy), impl.logic, data);
+        data = encodeL1CrossDomainMessengerInitializer(IL1CrossDomainMessenger.initialize.selector, output);
+        upgradeAndCall(
+            output.opChainProxyAdmin,
+            address(output.l1CrossDomainMessengerProxy),
+            implementation.l1CrossDomainMessengerImpl,
+            data
+        );
 
-        impl = getLatestImplementation("L1StandardBridge");
-        data = encodeL1StandardBridgeInitializer(impl.initializer, output);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.l1StandardBridgeProxy), impl.logic, data);
+        data = encodeL1StandardBridgeInitializer(IL1StandardBridge.initialize.selector, output);
+        upgradeAndCall(
+            output.opChainProxyAdmin, address(output.l1StandardBridgeProxy), implementation.l1StandardBridgeImpl, data
+        );
 
-        impl = getLatestImplementation("DelayedWETH");
-        data = encodeDelayedWETHInitializer(impl.initializer, _input);
+        data = encodeDelayedWETHInitializer(IDelayedWETH.initialize.selector, _input);
         // Eventually we will switch from DelayedWETHPermissionedGameProxy to DelayedWETHPermissionlessGameProxy.
-        upgradeAndCall(output.opChainProxyAdmin, address(output.delayedWETHPermissionedGameProxy), impl.logic, data);
+        upgradeAndCall(
+            output.opChainProxyAdmin,
+            address(output.delayedWETHPermissionedGameProxy),
+            implementation.delayedWETHImpl,
+            data
+        );
 
         // We set the initial owner to this contract, set game implementations, then transfer ownership.
-        impl = getLatestImplementation("DisputeGameFactory");
-        data = encodeDisputeGameFactoryInitializer(impl.initializer, _input);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.disputeGameFactoryProxy), impl.logic, data);
+        data = encodeDisputeGameFactoryInitializer(IDisputeGameFactory.initialize.selector, _input);
+        upgradeAndCall(
+            output.opChainProxyAdmin,
+            address(output.disputeGameFactoryProxy),
+            implementation.disputeGameFactoryImpl,
+            data
+        );
         output.disputeGameFactoryProxy.setImplementation(
             GameTypes.PERMISSIONED_CANNON, IDisputeGame(address(output.permissionedDisputeGame))
         );
         output.disputeGameFactoryProxy.transferOwnership(address(_input.roles.opChainProxyAdminOwner));
 
-        impl.logic = address(output.anchorStateRegistryImpl);
-        impl.initializer = IAnchorStateRegistry.initialize.selector;
-        data = encodeAnchorStateRegistryInitializer(impl.initializer, _input);
-        upgradeAndCall(output.opChainProxyAdmin, address(output.anchorStateRegistryProxy), impl.logic, data);
+        data = encodeAnchorStateRegistryInitializer(IAnchorStateRegistry.initialize.selector, _input);
+        upgradeAndCall(
+            output.opChainProxyAdmin,
+            address(output.anchorStateRegistryProxy),
+            address(output.anchorStateRegistryImpl),
+            data
+        );
 
         // -------- Finalize Deployment --------
         // Transfer ownership of the ProxyAdmin from this contract to the specified owner.
@@ -402,13 +392,6 @@ contract OPContractsManager is ISemver, Initializable {
         return Blueprint.deployFrom(blueprint.proxy, salt, abi.encode(_proxyAdmin));
     }
 
-    /// @notice Returns the implementation data for a contract name. Makes a copy of the internal
-    //  Implementation struct in storage to prevent accidental mutation of the internal data.
-    function getLatestImplementation(string memory _name) internal view returns (Implementation memory) {
-        Implementation storage impl = implementations[latestRelease][_name];
-        return Implementation({ logic: impl.logic, initializer: impl.initializer });
-    }
-
     // -------- Initializer Encoding --------
 
     /// @notice Helper method for encoding the L1ERC721Bridge initializer data.
@@ -445,7 +428,6 @@ contract OPContractsManager is ISemver, Initializable {
 
     /// @notice Helper method for encoding the SystemConfig initializer data.
     function encodeSystemConfigInitializer(
-        bytes4 _selector,
         DeployInput memory _input,
         DeployOutput memory _output
     )
@@ -454,50 +436,22 @@ contract OPContractsManager is ISemver, Initializable {
         virtual
         returns (bytes memory)
     {
-        // We inspect the SystemConfig contract and determine it's signature here. This is required
-        // because this OPCM contract is being developed in a repository that no longer contains the
-        // SystemConfig contract that was released as part of `op-contracts/v1.6.0`, but in production
-        // it needs to support that version, in addition to the version currently on develop.
-        string memory semver = _output.systemConfigProxy.version();
-        if (keccak256(abi.encode(semver)) == keccak256(abi.encode(string("2.2.0")))) {
-            // We are using the op-contracts/v1.6.0 SystemConfig contract.
-            (
-                IResourceMetering.ResourceConfig memory referenceResourceConfig,
-                ISystemConfigV160.Addresses memory opChainAddrs
-            ) = defaultSystemConfigV160Params(_selector, _input, _output);
-
-            return abi.encodeWithSelector(
-                _selector,
-                _input.roles.systemConfigOwner,
-                _input.basefeeScalar,
-                _input.blobBasefeeScalar,
-                bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
-                _input.gasLimit,
-                _input.roles.unsafeBlockSigner,
-                referenceResourceConfig,
-                chainIdToBatchInboxAddress(_input.l2ChainId),
-                opChainAddrs
-            );
-        } else {
-            // We are using the latest SystemConfig contract from the repo.
-            (
-                IResourceMetering.ResourceConfig memory referenceResourceConfig,
-                ISystemConfig.Addresses memory opChainAddrs
-            ) = defaultSystemConfigParams(_selector, _input, _output);
-
-            return abi.encodeWithSelector(
-                _selector,
-                _input.roles.systemConfigOwner,
-                _input.basefeeScalar,
-                _input.blobBasefeeScalar,
-                bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
-                _input.gasLimit,
-                _input.roles.unsafeBlockSigner,
-                referenceResourceConfig,
-                chainIdToBatchInboxAddress(_input.l2ChainId),
-                opChainAddrs
-            );
-        }
+        bytes4 selector = ISystemConfig.initialize.selector;
+        (IResourceMetering.ResourceConfig memory referenceResourceConfig, ISystemConfig.Addresses memory opChainAddrs) =
+            defaultSystemConfigParams(selector, _input, _output);
+
+        return abi.encodeWithSelector(
+            selector,
+            _input.roles.systemConfigOwner,
+            _input.basefeeScalar,
+            _input.blobBasefeeScalar,
+            bytes32(uint256(uint160(_input.roles.batcher))), // batcherHash
+            _input.gasLimit,
+            _input.roles.unsafeBlockSigner,
+            referenceResourceConfig,
+            chainIdToBatchInboxAddress(_input.l2ChainId),
+            opChainAddrs
+        );
     }
 
     /// @notice Helper method for encoding the OptimismMintableERC20Factory initializer data.
@@ -599,7 +553,7 @@ contract OPContractsManager is ISemver, Initializable {
             _input.disputeSplitDepth,
             _input.disputeClockExtension,
             _input.disputeMaxClockDuration,
-            IBigStepper(getLatestImplementation("MIPS").logic),
+            IBigStepper(implementation.mipsImpl),
             IDelayedWETH(payable(address(_output.delayedWETHPermissionedGameProxy))),
             IAnchorStateRegistry(address(_output.anchorStateRegistryProxy)),
             _input.l2ChainId,
@@ -645,45 +599,6 @@ contract OPContractsManager is ISemver, Initializable {
         assertValidContractAddress(opChainAddrs_.optimismMintableERC20Factory);
     }
 
-    /// @notice Returns default, standard config arguments for the SystemConfig initializer.
-    /// This is used by subclasses to reduce code duplication.
-    function defaultSystemConfigV160Params(
-        bytes4, /* selector */
-        DeployInput memory, /* _input */
-        DeployOutput memory _output
-    )
-        internal
-        view
-        virtual
-        returns (
-            IResourceMetering.ResourceConfig memory resourceConfig_,
-            ISystemConfigV160.Addresses memory opChainAddrs_
-        )
-    {
-        // We use assembly to easily convert from IResourceMetering.ResourceConfig to ResourceMetering.ResourceConfig.
-        // This is required because we have not yet fully migrated the codebase to be interface-based.
-        IResourceMetering.ResourceConfig memory resourceConfig = Constants.DEFAULT_RESOURCE_CONFIG();
-        assembly ("memory-safe") {
-            resourceConfig_ := resourceConfig
-        }
-
-        opChainAddrs_ = ISystemConfigV160.Addresses({
-            l1CrossDomainMessenger: address(_output.l1CrossDomainMessengerProxy),
-            l1ERC721Bridge: address(_output.l1ERC721BridgeProxy),
-            l1StandardBridge: address(_output.l1StandardBridgeProxy),
-            disputeGameFactory: address(_output.disputeGameFactoryProxy),
-            optimismPortal: address(_output.optimismPortalProxy),
-            optimismMintableERC20Factory: address(_output.optimismMintableERC20FactoryProxy)
-        });
-
-        assertValidContractAddress(opChainAddrs_.l1CrossDomainMessenger);
-        assertValidContractAddress(opChainAddrs_.l1ERC721Bridge);
-        assertValidContractAddress(opChainAddrs_.l1StandardBridge);
-        assertValidContractAddress(opChainAddrs_.disputeGameFactory);
-        assertValidContractAddress(opChainAddrs_.optimismPortal);
-        assertValidContractAddress(opChainAddrs_.optimismMintableERC20Factory);
-    }
-
     /// @notice Makes an external call to the target to initialize the proxy with the specified data.
     /// First performs safety checks to ensure the target, implementation, and proxy admin are valid.
     function upgradeAndCall(
@@ -710,4 +625,9 @@ contract OPContractsManager is ISemver, Initializable {
     function blueprints() public view returns (Blueprints memory) {
         return blueprint;
     }
+
+    /// @notice Returns the implementation contract addresses.
+    function implementations() public view returns (Implementations memory) {
+        return implementation;
+    }
 }
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
index 19de5537b41c..79e0efda9735 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
@@ -6,20 +6,22 @@ import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
 
-/// @custom:proxied true
 contract OPContractsManagerInterop is OPContractsManager {
     constructor(
         ISuperchainConfig _superchainConfig,
-        IProtocolVersions _protocolVersions
+        IProtocolVersions _protocolVersions,
+        string memory _l1ContractsRelease,
+        Blueprints memory _blueprints,
+        Implementations memory _implementations
     )
-        OPContractsManager(_superchainConfig, _protocolVersions)
+        OPContractsManager(_superchainConfig, _protocolVersions, _l1ContractsRelease, _blueprints, _implementations)
     { }
 
     // The `SystemConfigInterop` contract has an extra `address _dependencyManager` argument
     // that we must account for.
     function encodeSystemConfigInitializer(
-        bytes4 _selector,
         DeployInput memory _input,
         DeployOutput memory _output
     )
@@ -29,8 +31,9 @@ contract OPContractsManagerInterop is OPContractsManager {
         override
         returns (bytes memory)
     {
+        bytes4 selector = ISystemConfigInterop.initialize.selector;
         (IResourceMetering.ResourceConfig memory referenceResourceConfig, ISystemConfig.Addresses memory opChainAddrs) =
-            defaultSystemConfigParams(_selector, _input, _output);
+            defaultSystemConfigParams(selector, _input, _output);
 
         // TODO For now we assume that the dependency manager is the same as system config owner.
         // This is currently undefined since it's not part of the standard config, so we may need
@@ -40,7 +43,7 @@ contract OPContractsManagerInterop is OPContractsManager {
         address dependencyManager = address(_input.roles.systemConfigOwner);
 
         return abi.encodeWithSelector(
-            _selector,
+            selector,
             _input.roles.systemConfigOwner,
             _input.basefeeScalar,
             _input.blobBasefeeScalar,
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigV160.sol b/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigV160.sol
deleted file mode 100644
index 210b0ddf8e5e..000000000000
--- a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigV160.sol
+++ /dev/null
@@ -1,85 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-
-/// @notice This interface corresponds to the op-contracts/v1.6.0 release of the SystemConfig
-/// contract, which has a semver of 2.2.0 as specified in
-/// https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts%2Fv1.6.0
-interface ISystemConfigV160 {
-    enum UpdateType {
-        BATCHER,
-        FEE_SCALARS,
-        GAS_LIMIT,
-        UNSAFE_BLOCK_SIGNER
-    }
-
-    struct Addresses {
-        address l1CrossDomainMessenger;
-        address l1ERC721Bridge;
-        address l1StandardBridge;
-        address disputeGameFactory;
-        address optimismPortal;
-        address optimismMintableERC20Factory;
-    }
-
-    event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
-    event Initialized(uint8 version);
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
-
-    function BATCH_INBOX_SLOT() external view returns (bytes32);
-    function DISPUTE_GAME_FACTORY_SLOT() external view returns (bytes32);
-    function L1_CROSS_DOMAIN_MESSENGER_SLOT() external view returns (bytes32);
-    function L1_ERC_721_BRIDGE_SLOT() external view returns (bytes32);
-    function L1_STANDARD_BRIDGE_SLOT() external view returns (bytes32);
-    function OPTIMISM_MINTABLE_ERC20_FACTORY_SLOT() external view returns (bytes32);
-    function OPTIMISM_PORTAL_SLOT() external view returns (bytes32);
-    function START_BLOCK_SLOT() external view returns (bytes32);
-    function UNSAFE_BLOCK_SIGNER_SLOT() external view returns (bytes32);
-    function VERSION() external view returns (uint256);
-    function basefeeScalar() external view returns (uint32);
-    function batchInbox() external view returns (address addr_);
-    function batcherHash() external view returns (bytes32);
-    function blobbasefeeScalar() external view returns (uint32);
-    function disputeGameFactory() external view returns (address addr_);
-    function gasLimit() external view returns (uint64);
-    function gasPayingToken() external view returns (address addr_, uint8 decimals_);
-    function gasPayingTokenName() external view returns (string memory name_);
-    function gasPayingTokenSymbol() external view returns (string memory symbol_);
-    function initialize(
-        address _owner,
-        uint256 _basefeeScalar,
-        uint256 _blobbasefeeScalar,
-        bytes32 _batcherHash,
-        uint64 _gasLimit,
-        address _unsafeBlockSigner,
-        IResourceMetering.ResourceConfig memory _config,
-        address _batchInbox,
-        Addresses memory _addresses
-    )
-        external;
-    function isCustomGasToken() external view returns (bool);
-    function l1CrossDomainMessenger() external view returns (address addr_);
-    function l1ERC721Bridge() external view returns (address addr_);
-    function l1StandardBridge() external view returns (address addr_);
-    function maximumGasLimit() external pure returns (uint64);
-    function minimumGasLimit() external view returns (uint64);
-    function optimismMintableERC20Factory() external view returns (address addr_);
-    function optimismPortal() external view returns (address addr_);
-    function overhead() external view returns (uint256);
-    function owner() external view returns (address);
-    function renounceOwnership() external;
-    function resourceConfig() external view returns (IResourceMetering.ResourceConfig memory);
-    function scalar() external view returns (uint256);
-    function setBatcherHash(bytes32 _batcherHash) external;
-    function setGasConfig(uint256 _overhead, uint256 _scalar) external;
-    function setGasConfigEcotone(uint32 _basefeeScalar, uint32 _blobbasefeeScalar) external;
-    function setGasLimit(uint64 _gasLimit) external;
-    function setUnsafeBlockSigner(address _unsafeBlockSigner) external;
-    function startBlock() external view returns (uint256 startBlock_);
-    function transferOwnership(address newOwner) external; // nosemgrep
-    function unsafeBlockSigner() external view returns (address addr_);
-    function version() external pure returns (string memory);
-
-    function __constructor__() external;
-}
diff --git a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
index 5b2260fce992..e828b415621e 100644
--- a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
+++ b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
@@ -14,9 +14,12 @@ import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 contract OPContractsManager_Harness is OPContractsManager {
     constructor(
         ISuperchainConfig _superchainConfig,
-        IProtocolVersions _protocolVersions
+        IProtocolVersions _protocolVersions,
+        string memory _l1ContractsRelease,
+        Blueprints memory _blueprints,
+        Implementations memory _implementations
     )
-        OPContractsManager(_superchainConfig, _protocolVersions)
+        OPContractsManager(_superchainConfig, _protocolVersions, _l1ContractsRelease, _blueprints, _implementations)
     { }
 
     function chainIdToBatchInboxAddress_exposed(uint256 l2ChainId) public pure returns (address) {
@@ -49,7 +52,7 @@ contract OPContractsManager_Deploy_Test is DeployOPChain_TestBase {
         doi.set(doi.basefeeScalar.selector, basefeeScalar);
         doi.set(doi.blobBaseFeeScalar.selector, blobBaseFeeScalar);
         doi.set(doi.l2ChainId.selector, l2ChainId);
-        doi.set(doi.opcmProxy.selector, address(opcm));
+        doi.set(doi.opcm.selector, address(opcm));
         doi.set(doi.gasLimit.selector, gasLimit);
 
         doi.set(doi.disputeGameType.selector, disputeGameType);
@@ -116,12 +119,17 @@ contract OPContractsManager_InternalMethods_Test is Test {
     function setUp() public {
         ISuperchainConfig superchainConfigProxy = ISuperchainConfig(makeAddr("superchainConfig"));
         IProtocolVersions protocolVersionsProxy = IProtocolVersions(makeAddr("protocolVersions"));
+        OPContractsManager.Blueprints memory emptyBlueprints;
+        OPContractsManager.Implementations memory emptyImpls;
         vm.etch(address(superchainConfigProxy), hex"01");
         vm.etch(address(protocolVersionsProxy), hex"01");
 
         opcmHarness = new OPContractsManager_Harness({
             _superchainConfig: superchainConfigProxy,
-            _protocolVersions: protocolVersionsProxy
+            _protocolVersions: protocolVersionsProxy,
+            _l1ContractsRelease: "dev",
+            _blueprints: emptyBlueprints,
+            _implementations: emptyImpls
         });
     }
 
diff --git a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
index 0282ea0b3d90..8d3feac2de0d 100644
--- a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
@@ -61,7 +61,7 @@ contract DeployImplementationsInput_Test is Test {
         dii.disputeGameFinalityDelaySeconds();
 
         vm.expectRevert("DeployImplementationsInput: not set");
-        dii.release();
+        dii.l1ContractsRelease();
 
         vm.expectRevert("DeployImplementationsInput: not set");
         dii.superchainConfigProxy();
@@ -69,23 +69,9 @@ contract DeployImplementationsInput_Test is Test {
         vm.expectRevert("DeployImplementationsInput: not set");
         dii.protocolVersionsProxy();
 
-        vm.expectRevert("DeployImplementationsInput: not set");
-        dii.opcmProxyOwner();
-
         vm.expectRevert("DeployImplementationsInput: not set");
         dii.standardVersionsToml();
     }
-
-    function test_opcmProxyOwner_whenNotSet_reverts() public {
-        vm.expectRevert("DeployImplementationsInput: not set");
-        dii.opcmProxyOwner();
-    }
-
-    function test_opcmProxyOwner_succeeds() public {
-        dii.set(dii.opcmProxyOwner.selector, address(msg.sender));
-        address opcmProxyOwner = dii.opcmProxyOwner();
-        assertEq(address(msg.sender), address(opcmProxyOwner), "100");
-    }
 }
 
 contract DeployImplementationsOutput_Test is Test {
@@ -96,17 +82,7 @@ contract DeployImplementationsOutput_Test is Test {
     }
 
     function test_set_succeeds() public {
-        IProxy proxy = IProxy(
-            DeployUtils.create1({
-                _name: "Proxy",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (address(0))))
-            })
-        );
-        address opcmImpl = address(makeAddr("opcmImpl"));
-        vm.prank(address(0));
-        proxy.upgradeTo(opcmImpl);
-
-        OPContractsManager opcmProxy = OPContractsManager(address(proxy));
+        OPContractsManager opcm = OPContractsManager(address(makeAddr("opcm")));
         IOptimismPortal2 optimismPortalImpl = IOptimismPortal2(payable(makeAddr("optimismPortalImpl")));
         IDelayedWETH delayedWETHImpl = IDelayedWETH(payable(makeAddr("delayedWETHImpl")));
         IPreimageOracle preimageOracleSingleton = IPreimageOracle(makeAddr("preimageOracleSingleton"));
@@ -120,8 +96,7 @@ contract DeployImplementationsOutput_Test is Test {
             IOptimismMintableERC20Factory(makeAddr("optimismMintableERC20FactoryImpl"));
         IDisputeGameFactory disputeGameFactoryImpl = IDisputeGameFactory(makeAddr("disputeGameFactoryImpl"));
 
-        vm.etch(address(opcmProxy), address(opcmProxy).code);
-        vm.etch(address(opcmImpl), hex"01");
+        vm.etch(address(opcm), hex"01");
         vm.etch(address(optimismPortalImpl), hex"01");
         vm.etch(address(delayedWETHImpl), hex"01");
         vm.etch(address(preimageOracleSingleton), hex"01");
@@ -132,7 +107,7 @@ contract DeployImplementationsOutput_Test is Test {
         vm.etch(address(l1StandardBridgeImpl), hex"01");
         vm.etch(address(optimismMintableERC20FactoryImpl), hex"01");
         vm.etch(address(disputeGameFactoryImpl), hex"01");
-        dio.set(dio.opcmProxy.selector, address(opcmProxy));
+        dio.set(dio.opcm.selector, address(opcm));
         dio.set(dio.optimismPortalImpl.selector, address(optimismPortalImpl));
         dio.set(dio.delayedWETHImpl.selector, address(delayedWETHImpl));
         dio.set(dio.preimageOracleSingleton.selector, address(preimageOracleSingleton));
@@ -144,7 +119,7 @@ contract DeployImplementationsOutput_Test is Test {
         dio.set(dio.optimismMintableERC20FactoryImpl.selector, address(optimismMintableERC20FactoryImpl));
         dio.set(dio.disputeGameFactoryImpl.selector, address(disputeGameFactoryImpl));
 
-        assertEq(address(opcmProxy), address(dio.opcmProxy()), "50");
+        assertEq(address(opcm), address(dio.opcm()), "50");
         assertEq(address(optimismPortalImpl), address(dio.optimismPortalImpl()), "100");
         assertEq(address(delayedWETHImpl), address(dio.delayedWETHImpl()), "200");
         assertEq(address(preimageOracleSingleton), address(dio.preimageOracleSingleton()), "300");
@@ -273,7 +248,7 @@ contract DeployImplementations_Test is Test {
 
     function test_deployImplementation_succeeds() public {
         string memory deployContractsRelease = "dev-release";
-        dii.set(dii.release.selector, deployContractsRelease);
+        dii.set(dii.l1ContractsRelease.selector, deployContractsRelease);
         deployImplementations.deploySystemConfigImpl(dii, dio);
         assertTrue(address(0) != address(dio.systemConfigImpl()));
     }
@@ -282,7 +257,7 @@ contract DeployImplementations_Test is Test {
         // All hardcoded addresses below are taken from the superchain-registry config:
         // https://github.com/ethereum-optimism/superchain-registry/blob/be65d22f8128cf0c4e5b4e1f677daf86843426bf/validation/standard/standard-versions.toml#L11
         string memory testRelease = "op-contracts/v1.6.0";
-        dii.set(dii.release.selector, testRelease);
+        dii.set(dii.l1ContractsRelease.selector, testRelease);
 
         deployImplementations.deploySystemConfigImpl(dii, dio);
         address srSystemConfigImpl = address(0xF56D96B2535B932656d3c04Ebf51baBff241D886);
@@ -335,71 +310,6 @@ contract DeployImplementations_Test is Test {
         assertEq(srDisputeGameFactoryImpl, address(dio.disputeGameFactoryImpl()));
     }
 
-    function test_deploy_atNonExistentRelease_reverts() public {
-        string memory unknownRelease = "op-contracts/v0.0.0";
-        dii.set(dii.release.selector, unknownRelease);
-
-        bytes memory expectedErr =
-            bytes(string.concat("DeployImplementations: failed to deploy release ", unknownRelease));
-
-        vm.expectRevert(expectedErr);
-        deployImplementations.deploySystemConfigImpl(dii, dio);
-
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployL1CrossDomainMessengerImpl(dii, dio);
-
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployL1ERC721BridgeImpl(dii, dio);
-
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployL1StandardBridgeImpl(dii, dio);
-
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployOptimismMintableERC20FactoryImpl(dii, dio);
-
-        // TODO: Uncomment the code below when OPContractsManager is deployed based on release. Superchain-registry
-        // doesn't contain OPContractsManager yet.
-        // dii.set(dii.superchainConfigProxy.selector, address(superchainConfigProxy));
-        // dii.set(dii.protocolVersionsProxy.selector, address(protocolVersionsProxy));
-        // vm.etch(address(superchainConfigProxy), hex"01");
-        // vm.etch(address(protocolVersionsProxy), hex"01");
-        // vm.expectRevert(expectedErr);
-        // deployImplementations.deployOPContractsManagerImpl(dii, dio);
-
-        dii.set(dii.proofMaturityDelaySeconds.selector, 1);
-        dii.set(dii.disputeGameFinalityDelaySeconds.selector, 2);
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployOptimismPortalImpl(dii, dio);
-
-        dii.set(dii.withdrawalDelaySeconds.selector, 1);
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployDelayedWETHImpl(dii, dio);
-
-        dii.set(dii.minProposalSizeBytes.selector, 1);
-        dii.set(dii.challengePeriodSeconds.selector, 2);
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployPreimageOracleSingleton(dii, dio);
-
-        address preImageOracleSingleton = makeAddr("preImageOracleSingleton");
-        vm.etch(address(preImageOracleSingleton), hex"01");
-        dio.set(dio.preimageOracleSingleton.selector, preImageOracleSingleton);
-        vm.expectRevert(expectedErr);
-        deployImplementations.deployMipsSingleton(dii, dio);
-
-        vm.expectRevert(expectedErr); // fault proof contracts don't exist at this release
-        deployImplementations.deployDisputeGameFactoryImpl(dii, dio);
-    }
-
-    function test_deploy_noContractExistsAtRelease_reverts() public {
-        string memory unknownRelease = "op-contracts/v1.3.0";
-        dii.set(dii.release.selector, unknownRelease);
-        bytes memory expectedErr =
-            bytes(string.concat("DeployImplementations: failed to deploy release ", unknownRelease));
-
-        vm.expectRevert(expectedErr); // fault proof contracts don't exist at this release
-        deployImplementations.deployDisputeGameFactoryImpl(dii, dio);
-    }
-
     function testFuzz_run_memory_succeeds(bytes32 _seed) public {
         withdrawalDelaySeconds = uint256(hash(_seed, 0));
         minProposalSizeBytes = uint256(hash(_seed, 1));
@@ -409,7 +319,7 @@ contract DeployImplementations_Test is Test {
         string memory release = string(bytes.concat(hash(_seed, 5)));
         protocolVersionsProxy = IProtocolVersions(address(uint160(uint256(hash(_seed, 7)))));
 
-        // Must configure the ProxyAdmin contract which is used to upgrade the OPCM's proxy contract.
+        // Must configure the ProxyAdmin contract.
         IProxyAdmin superchainProxyAdmin = IProxyAdmin(
             DeployUtils.create1({
                 _name: "ProxyAdmin",
@@ -439,10 +349,9 @@ contract DeployImplementations_Test is Test {
         dii.set(dii.proofMaturityDelaySeconds.selector, proofMaturityDelaySeconds);
         dii.set(dii.disputeGameFinalityDelaySeconds.selector, disputeGameFinalityDelaySeconds);
         dii.set(dii.mipsVersion.selector, 1);
-        dii.set(dii.release.selector, release);
+        dii.set(dii.l1ContractsRelease.selector, release);
         dii.set(dii.superchainConfigProxy.selector, address(superchainConfigProxy));
         dii.set(dii.protocolVersionsProxy.selector, address(protocolVersionsProxy));
-        dii.set(dii.opcmProxyOwner.selector, msg.sender);
 
         deployImplementations.run(dii, dio);
 
@@ -453,10 +362,9 @@ contract DeployImplementations_Test is Test {
         assertEq(proofMaturityDelaySeconds, dii.proofMaturityDelaySeconds(), "400");
         assertEq(disputeGameFinalityDelaySeconds, dii.disputeGameFinalityDelaySeconds(), "500");
         assertEq(1, dii.mipsVersion(), "512");
-        assertEq(release, dii.release(), "525");
+        assertEq(release, dii.l1ContractsRelease(), "525");
         assertEq(address(superchainConfigProxy), address(dii.superchainConfigProxy()), "550");
         assertEq(address(protocolVersionsProxy), address(dii.protocolVersionsProxy()), "575");
-        assertEq(msg.sender, dii.opcmProxyOwner(), "580");
 
         // Architecture assertions.
         assertEq(address(dio.mipsSingleton().oracle()), address(dio.preimageOracleSingleton()), "600");
@@ -475,7 +383,7 @@ contract DeployImplementations_Test is Test {
         dii.set(dii.disputeGameFinalityDelaySeconds.selector, disputeGameFinalityDelaySeconds);
         dii.set(dii.mipsVersion.selector, 1);
         string memory release = "dev-release";
-        dii.set(dii.release.selector, release);
+        dii.set(dii.l1ContractsRelease.selector, release);
         dii.set(dii.superchainConfigProxy.selector, address(superchainConfigProxy));
         dii.set(dii.protocolVersionsProxy.selector, address(protocolVersionsProxy));
 
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
index 5249ded41cc9..5280328168b9 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
@@ -39,10 +39,10 @@ contract DeployOPChainInput_Test is Test {
     address unsafeBlockSigner = makeAddr("unsafeBlockSigner");
     address proposer = makeAddr("proposer");
     address challenger = makeAddr("challenger");
+    address opcm = makeAddr("opcm");
     uint32 basefeeScalar = 100;
     uint32 blobBaseFeeScalar = 200;
     uint256 l2ChainId = 300;
-    OPContractsManager opcm = OPContractsManager(makeAddr("opcm"));
     string saltMixer = "saltMixer";
 
     function setUp() public {
@@ -60,9 +60,8 @@ contract DeployOPChainInput_Test is Test {
         doi.set(doi.blobBaseFeeScalar.selector, blobBaseFeeScalar);
         doi.set(doi.l2ChainId.selector, l2ChainId);
         doi.set(doi.allowCustomDisputeParameters.selector, true);
-
-        (IProxy opcmProxy) = DeployUtils.buildERC1967ProxyWithImpl("opcmProxy");
-        doi.set(doi.opcmProxy.selector, address(opcmProxy));
+        doi.set(doi.opcm.selector, opcm);
+        vm.etch(opcm, hex"01");
 
         // Compare the default inputs to the getter methods.
         assertEq(opChainProxyAdminOwner, doi.opChainProxyAdminOwner(), "200");
@@ -74,7 +73,7 @@ contract DeployOPChainInput_Test is Test {
         assertEq(basefeeScalar, doi.basefeeScalar(), "800");
         assertEq(blobBaseFeeScalar, doi.blobBaseFeeScalar(), "900");
         assertEq(l2ChainId, doi.l2ChainId(), "1000");
-        assertEq(address(opcmProxy), address(doi.opcmProxy()), "1100");
+        assertEq(opcm, address(doi.opcm()), "1100");
         assertEq(true, doi.allowCustomDisputeParameters(), "1200");
     }
 
@@ -396,7 +395,7 @@ contract DeployOPChain_TestBase is Test {
         dii.set(dii.proofMaturityDelaySeconds.selector, proofMaturityDelaySeconds);
         dii.set(dii.disputeGameFinalityDelaySeconds.selector, disputeGameFinalityDelaySeconds);
         dii.set(dii.mipsVersion.selector, 1);
-        dii.set(dii.release.selector, release);
+        dii.set(dii.l1ContractsRelease.selector, release);
         dii.set(dii.superchainConfigProxy.selector, address(superchainConfigProxy));
         dii.set(dii.protocolVersionsProxy.selector, address(protocolVersionsProxy));
         // End users of the DeployImplementations contract will need to set the `standardVersionsToml`.
@@ -404,7 +403,7 @@ contract DeployOPChain_TestBase is Test {
             string.concat(vm.projectRoot(), "/test/fixtures/standard-versions.toml");
         string memory standardVersionsToml = vm.readFile(standardVersionsTomlPath);
         dii.set(dii.standardVersionsToml.selector, standardVersionsToml);
-        dii.set(dii.opcmProxyOwner.selector, address(1));
+
         deployImplementations.run(dii, dio);
 
         // Deploy DeployOpChain, but defer populating the input values to the test suites inheriting this contract.
@@ -412,7 +411,7 @@ contract DeployOPChain_TestBase is Test {
         (doi, doo) = deployOPChain.etchIOContracts();
 
         // Set the OPContractsManager input for DeployOPChain.
-        opcm = dio.opcmProxy();
+        opcm = dio.opcm();
     }
 
     // See the function of the same name in the `DeployImplementations_Test` contract of
@@ -466,7 +465,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         doi.set(doi.basefeeScalar.selector, basefeeScalar);
         doi.set(doi.blobBaseFeeScalar.selector, blobBaseFeeScalar);
         doi.set(doi.l2ChainId.selector, l2ChainId);
-        doi.set(doi.opcmProxy.selector, address(opcm)); // Not fuzzed since it must be an actual instance.
+        doi.set(doi.opcm.selector, address(opcm));
         doi.set(doi.saltMixer.selector, saltMixer);
         doi.set(doi.gasLimit.selector, gasLimit);
         doi.set(doi.disputeGameType.selector, disputeGameType);
@@ -559,7 +558,7 @@ contract DeployOPChain_Test is DeployOPChain_TestBase {
         doi.set(doi.basefeeScalar.selector, basefeeScalar);
         doi.set(doi.blobBaseFeeScalar.selector, blobBaseFeeScalar);
         doi.set(doi.l2ChainId.selector, l2ChainId);
-        doi.set(doi.opcmProxy.selector, address(opcm));
+        doi.set(doi.opcm.selector, address(opcm));
         doi.set(doi.saltMixer.selector, saltMixer);
         doi.set(doi.gasLimit.selector, gasLimit);
         doi.set(doi.disputeGameType.selector, disputeGameType);
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index 3e5648fdfde0..49e35e835f36 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -16,6 +16,7 @@ import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
 import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
 import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
 import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 
@@ -479,36 +480,37 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("gasLimit()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("eip1559Denominator()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("eip1559Elasticity()") });
+        _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfigInterop.initialize.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.initialize.selector });
-        _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.minimumGasLimit.selector });
+        _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfigInterop.minimumGasLimit.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("overhead()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("owner()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("renounceOwnership()"), _auth: Role.SYSTEMCONFIGOWNER });
-        _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.resourceConfig.selector });
+        _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfigInterop.resourceConfig.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("scalar()") });
         _addSpec({
             _name: "SystemConfigInterop",
-            _sel: ISystemConfig.setBatcherHash.selector,
+            _sel: ISystemConfigInterop.setBatcherHash.selector,
             _auth: Role.SYSTEMCONFIGOWNER
         });
         _addSpec({
             _name: "SystemConfigInterop",
-            _sel: ISystemConfig.setGasConfig.selector,
+            _sel: ISystemConfigInterop.setGasConfig.selector,
             _auth: Role.SYSTEMCONFIGOWNER
         });
         _addSpec({
             _name: "SystemConfigInterop",
-            _sel: ISystemConfig.setGasLimit.selector,
+            _sel: ISystemConfigInterop.setGasLimit.selector,
             _auth: Role.SYSTEMCONFIGOWNER
         });
         _addSpec({
             _name: "SystemConfigInterop",
-            _sel: ISystemConfig.setEIP1559Params.selector,
+            _sel: ISystemConfigInterop.setEIP1559Params.selector,
             _auth: Role.SYSTEMCONFIGOWNER
         });
         _addSpec({
             _name: "SystemConfigInterop",
-            _sel: ISystemConfig.setUnsafeBlockSigner.selector,
+            _sel: ISystemConfigInterop.setUnsafeBlockSigner.selector,
             _auth: Role.SYSTEMCONFIGOWNER
         });
         _addSpec({
@@ -516,7 +518,7 @@ contract Specification_Test is CommonTest {
             _sel: _getSel("transferOwnership(address)"),
             _auth: Role.SYSTEMCONFIGOWNER
         });
-        _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfig.unsafeBlockSigner.selector });
+        _addSpec({ _name: "SystemConfigInterop", _sel: ISystemConfigInterop.unsafeBlockSigner.selector });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("version()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("l1CrossDomainMessenger()") });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("l1ERC721Bridge()") });
@@ -552,12 +554,6 @@ contract Specification_Test is CommonTest {
             _auth: Role.DEPENDENCYMANAGER
         });
         _addSpec({ _name: "SystemConfigInterop", _sel: _getSel("dependencyManager()") });
-        _addSpec({
-            _name: "SystemConfigInterop",
-            _sel: _getSel(
-                "initialize(address,uint32,uint32,bytes32,uint64,address,(uint32,uint8,uint8,uint32,uint32,uint128),address,(address,address,address,address,address,address,address),address)"
-            )
-        });
 
         // ProxyAdmin
         _addSpec({ _name: "ProxyAdmin", _sel: _getSel("addressManager()") });
@@ -841,27 +837,25 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("version()") });
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("superchainConfig()") });
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("protocolVersions()") });
-        _addSpec({ _name: "OPContractsManager", _sel: _getSel("latestRelease()") });
-        _addSpec({ _name: "OPContractsManager", _sel: _getSel("implementations(string,string)") });
+        _addSpec({ _name: "OPContractsManager", _sel: _getSel("l1ContractsRelease()") });
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("systemConfigs(uint256)") });
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("OUTPUT_VERSION()") });
-        _addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.initialize.selector });
         _addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.deploy.selector });
         _addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.blueprints.selector });
         _addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.chainIdToBatchInboxAddress.selector });
+        _addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.implementations.selector });
 
         // OPContractsManagerInterop
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("version()") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("superchainConfig()") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("protocolVersions()") });
-        _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("latestRelease()") });
-        _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("implementations(string,string)") });
+        _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("l1ContractsRelease()") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("systemConfigs(uint256)") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("OUTPUT_VERSION()") });
-        _addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.initialize.selector });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.deploy.selector });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.blueprints.selector });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.chainIdToBatchInboxAddress.selector });
+        _addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.implementations.selector });
 
         // DeputyGuardianModule
         _addSpec({

From 78fed1eee1fdff1e73673b514f9d4b382f25d503 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Sat, 16 Nov 2024 02:37:49 +0100
Subject: [PATCH 189/451] remove unnecessary check (#12914)

* remove unnecessary check

* fixes
---
 packages/contracts-bedrock/snapshots/semver-lock.json     | 8 ++++----
 packages/contracts-bedrock/src/L1/SystemConfig.sol        | 5 ++---
 packages/contracts-bedrock/src/L1/SystemConfigInterop.sol | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 8f40dca3ff43..dd2618cc5a7e 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -44,12 +44,12 @@
     "sourceCodeHash": "0x39489a85bc3a5c8560f82d41b31bf7fe22f5b648f4ed538f61695a73092ea9eb"
   },
   "src/L1/SystemConfig.sol": {
-    "initCodeHash": "0x429058f75d97fa7a7d0166b59830909bc722324feefc40f2b41419d6335d3f37",
-    "sourceCodeHash": "0x5ca776041a4ddc0d28ec55db7012d669481cd4601b0e71dbd3493a67b8a7e5a5"
+    "initCodeHash": "0x0eda38e2fb2687a324289f04ec8ad0d2afe51f45219d074740fb4a0e24ea6569",
+    "sourceCodeHash": "0x6dbbe8716ca8cd2fba3da8dcae0ca0c4b1f3e9dd04220fb24a15666b23300927"
   },
   "src/L1/SystemConfigInterop.sol": {
-    "initCodeHash": "0x277a61dcabed81a15739a8e9ed50615252bcc687cebea852e00191d0a1fbe11f",
-    "sourceCodeHash": "0x38361a4f70a19e1b7819e933932a0c9fd2bcebaaebcbc7942f5c00dfaa2c28df"
+    "initCodeHash": "0x443fd84f8dbc38f03e59a56b99099b5e4b28de3e860a5d16c1a21101745622a4",
+    "sourceCodeHash": "0x5c2e00cd8939a538eb38580d76e70d27dd1e8e6cd9328e1978468981017736e6"
   },
   "src/L2/BaseFeeVault.sol": {
     "initCodeHash": "0xbf49824cf37e201181484a8a423fcad8f504dc925921a2b28e83398197858dec",
diff --git a/packages/contracts-bedrock/src/L1/SystemConfig.sol b/packages/contracts-bedrock/src/L1/SystemConfig.sol
index afb9525403c7..517391164438 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfig.sol
@@ -137,9 +137,9 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 2.3.0-beta.5
+    /// @custom:semver 2.3.0-beta.6
     function version() public pure virtual returns (string memory) {
-        return "2.3.0-beta.5";
+        return "2.3.0-beta.6";
     }
 
     /// @notice Constructs the SystemConfig contract. Cannot set
@@ -224,7 +224,6 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
         _setGasPayingToken(_addresses.gasPayingToken);
 
         _setResourceConfig(_config);
-        require(_gasLimit >= minimumGasLimit(), "SystemConfig: gas limit too low");
     }
 
     /// @notice Returns the minimum L2 gas limit that can be safely set for the system to
diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
index 032109286596..9e9503fe6236 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
@@ -68,9 +68,9 @@ contract SystemConfigInterop is SystemConfig {
         Storage.setAddress(DEPENDENCY_MANAGER_SLOT, _dependencyManager);
     }
 
-    /// @custom:semver +interop-beta.3
+    /// @custom:semver +interop-beta.4
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.3");
+        return string.concat(super.version(), "+interop-beta.4");
     }
 
     /// @notice Internal setter for the gas paying token address, includes validation.

From 914157f97f1361cafa41e401b475d71ba84fc2e8 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Sun, 17 Nov 2024 06:49:52 -0800
Subject: [PATCH 190/451] devnet: Replace mt-cannon with 64-bit Cannon (#12924)

---
 Makefile                                      |  4 +--
 op-e2e/faultproofs/precompile_test.go         | 34 +++++++++++++++----
 op-program/README.md                          |  1 +
 .../scripts/deploy/Deploy.s.sol               |  6 ++--
 .../scripts/deploy/DeployDisputeGame.s.sol    |  2 +-
 .../deploy/DeployImplementations.s.sol        |  2 +-
 .../scripts/deploy/DeployMIPS.s.sol           |  2 +-
 7 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 3f6f759c59fc..9830a3060cb2 100644
--- a/Makefile
+++ b/Makefile
@@ -147,8 +147,8 @@ cannon-prestate: op-program cannon ## Generates prestate using cannon and op-pro
 	mv op-program/bin/0.json op-program/bin/prestate-proof.json
 .PHONY: cannon-prestate
 
-cannon-prestate-mt: op-program cannon ## Generates prestate using cannon and op-program in the multithreaded cannon format
-	./cannon/bin/cannon load-elf --type multithreaded --path op-program/bin/op-program-client.elf --out op-program/bin/prestate-mt.bin.gz --meta op-program/bin/meta-mt.json
+cannon-prestate-mt: op-program cannon ## Generates prestate using cannon and op-program in the multithreaded64 cannon format
+	./cannon/bin/cannon load-elf --type multithreaded64 --path op-program/bin/op-program-client64.elf --out op-program/bin/prestate-mt.bin.gz --meta op-program/bin/meta-mt.json
 	./cannon/bin/cannon run --proof-at '=0' --stop-at '=1' --input op-program/bin/prestate-mt.bin.gz --meta op-program/bin/meta-mt.json --proof-fmt 'op-program/bin/%d-mt.json' --output ""
 	mv op-program/bin/0-mt.json op-program/bin/prestate-proof-mt.json
 .PHONY: cannon-prestate-mt
diff --git a/op-e2e/faultproofs/precompile_test.go b/op-e2e/faultproofs/precompile_test.go
index 6d116bfa0993..2beabfba54d6 100644
--- a/op-e2e/faultproofs/precompile_test.go
+++ b/op-e2e/faultproofs/precompile_test.go
@@ -1,9 +1,12 @@
 package faultproofs
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"math"
 	"math/big"
+	"os/exec"
 	"path/filepath"
 	"testing"
 
@@ -12,7 +15,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/system/e2esys"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/helpers"
 
-	"github.com/ethereum-optimism/optimism/cannon/mipsevm/versions"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -276,9 +278,29 @@ func runCannon(t *testing.T, ctx context.Context, sys *e2esys.System, inputs uti
 	err := executor.DoGenerateProof(ctx, proofsDir, math.MaxUint, math.MaxUint, extraVmArgs...)
 	require.NoError(t, err, "failed to generate proof")
 
-	state, err := versions.LoadStateFromFile(vm.FinalStatePath(proofsDir, cfg.Cannon.BinarySnapshots))
-	require.NoError(t, err, "failed to parse state")
-	require.True(t, state.GetExited(), "cannon did not exit")
-	require.Zero(t, state.GetExitCode(), "cannon failed with exit code %d", state.GetExitCode())
-	t.Logf("Completed in %d steps", state.GetStep())
+	stdOut, _, err := runCmd(ctx, cfg.Cannon.VmBin, "witness", "--input", vm.FinalStatePath(proofsDir, cfg.Cannon.BinarySnapshots))
+	require.NoError(t, err, "failed to run witness cmd")
+	type stateData struct {
+		Step     uint64 `json:"step"`
+		ExitCode uint8  `json:"exitCode"`
+		Exited   bool   `json:"exited"`
+	}
+	var data stateData
+	err = json.Unmarshal([]byte(stdOut), &data)
+	require.NoError(t, err, "failed to parse state data")
+	require.True(t, data.Exited, "cannon did not exit")
+	require.Zero(t, data.ExitCode, "cannon failed with exit code %d", data.ExitCode)
+	t.Logf("Completed in %d steps", data.Step)
+}
+
+func runCmd(ctx context.Context, binary string, args ...string) (stdOut string, stdErr string, err error) {
+	var outBuf bytes.Buffer
+	var errBuf bytes.Buffer
+	cmd := exec.CommandContext(ctx, binary, args...)
+	cmd.Stdout = &outBuf
+	cmd.Stderr = &errBuf
+	err = cmd.Run()
+	stdOut = outBuf.String()
+	stdErr = errBuf.String()
+	return
 }
diff --git a/op-program/README.md b/op-program/README.md
index 15e89ffb5cf7..932ec85db22f 100644
--- a/op-program/README.md
+++ b/op-program/README.md
@@ -45,6 +45,7 @@ After running `make reproducible-prestate`, the following files can be found in
 [./bin/](./bin/):
 - [`op-program`](./bin/op-program)
 - [`op-program-client.elf`](./bin/op-program-client.elf)
+- [`op-program-client64.elf`](./bin/op-program-client64.elf)
 - [`prestate.bin.gz`](./bin/prestate.bin.gz)
 - [`prestate-proof.json`](./bin/prestate-proof.json)
 
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 0253e20a1956..26ef385c2f90 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -695,12 +695,12 @@ contract Deploy is Deployer {
         addr_ = address(oracle);
     }
 
-    /// @notice Deploy Mips VM. Deploys either MIPS or MIPS2 depending on the environment
+    /// @notice Deploy Mips VM. Deploys either MIPS or MIPS64 depending on the environment
     function deployMips() public broadcast returns (address addr_) {
         addr_ = DeployUtils.create2AndSave({
             _save: this,
             _salt: _implSalt(),
-            _name: Config.useMultithreadedCannon() ? "MIPS2" : "MIPS",
+            _name: Config.useMultithreadedCannon() ? "MIPS64" : "MIPS",
             _args: DeployUtils.encodeConstructor(
                 abi.encodeCall(IMIPS2.__constructor__, (IPreimageOracle(mustGetAddress("PreimageOracle"))))
             )
@@ -1019,7 +1019,7 @@ contract Deploy is Deployer {
         mipsAbsolutePrestate_ =
             Claim.wrap(abi.decode(bytes(Process.bash(string.concat("cat ", filePath, " | jq -r .pre"))), (bytes32)));
         console.log(
-            "[MT-Cannon Dispute Game] Using devnet MIPS2 Absolute prestate: %s",
+            "[MT-Cannon Dispute Game] Using devnet MIPS64 Absolute prestate: %s",
             vm.toString(Claim.unwrap(mipsAbsolutePrestate_))
         );
     }
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
index 51b60c6c2995..c128260a21da 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
@@ -376,7 +376,7 @@ contract DeployDisputeGame is Script {
             vm.broadcast(msg.sender);
             singleton = IMIPS(
                 DeployUtils.create1({
-                    _name: mipsVersion == 1 ? "MIPS" : "MIPS2",
+                    _name: mipsVersion == 1 ? "MIPS" : "MIPS64",
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS.__constructor__, (preimageOracle)))
                 })
             );
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
index 9abff9149181..71ba435df4c3 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
@@ -802,7 +802,7 @@ contract DeployImplementations is Script {
             vm.broadcast(msg.sender);
             singleton = IMIPS(
                 DeployUtils.create1({
-                    _name: mipsVersion == 1 ? "MIPS" : "MIPS2",
+                    _name: mipsVersion == 1 ? "MIPS" : "MIPS64",
                     _args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS.__constructor__, (preimageOracle)))
                 })
             );
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
index 5890630c9c22..09ef6d059cd0 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
@@ -98,7 +98,7 @@ contract DeployMIPS is Script {
         vm.broadcast(msg.sender);
         singleton = IMIPS(
             DeployUtils.create1({
-                _name: mipsVersion == 1 ? "MIPS" : "MIPS2",
+                _name: mipsVersion == 1 ? "MIPS" : "MIPS64",
                 _args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS.__constructor__, (preimageOracle)))
             })
         );

From 7550853ecc343d6fb59f1d332390d9796cfb9ff1 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Mon, 18 Nov 2024 14:59:38 +0800
Subject: [PATCH 191/451] Check `bcast.From` correctly (#12941)

* ensure bcast.From == mgr.From()

* address comment

* fix for create2
---
 op-deployer/pkg/deployer/broadcaster/keyed.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op-deployer/pkg/deployer/broadcaster/keyed.go b/op-deployer/pkg/deployer/broadcaster/keyed.go
index f5797d939156..c9bb27fcf0ce 100644
--- a/op-deployer/pkg/deployer/broadcaster/keyed.go
+++ b/op-deployer/pkg/deployer/broadcaster/keyed.go
@@ -90,6 +90,9 @@ func NewKeyedBroadcaster(cfg KeyedBroadcasterOpts) (*KeyedBroadcaster, error) {
 }
 
 func (t *KeyedBroadcaster) Hook(bcast script.Broadcast) {
+	if bcast.Type != script.BroadcastCreate2 && bcast.From != t.mgr.From() {
+		panic(fmt.Sprintf("invalid from for broadcast:%v, expected:%v", bcast.From, t.mgr.From()))
+	}
 	t.mtx.Lock()
 	t.bcasts = append(t.bcasts, bcast)
 	t.mtx.Unlock()

From 873b3e0d6aece3f72dec734b0e2e26b3c962d548 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 18 Nov 2024 09:19:32 +0000
Subject: [PATCH 192/451] op-batcher: fix channel duration timeout management
 (#12916)

* op-batcher: fix channel duration timeout management

Previously, we would use L1 data to help track channel durations. For example, the batcher would be configured to post data every hour. We update a global state variable with the latest l1 origin of a channel when it closed, and compute the deadline for that channel using a duration delta starting at that l1 origin timestamp.

Since we changed the way autoDA switching works, a channel can be _closed_ (due to a duration timeout or other reason) and this will cause the l1 origin state variable to move forward, extending the deadline ready for the next channel. Crucially, with autoDA switching nowadays, the closed channel will not always be submitted on chain (it can be discarded and the blocks requeued). If it is discarded, the channel duration timeout has already been extended.

The fix for this is to update the global state variable at channel submission time, not channel closing time.

* add regression test for channel duration timeouts during requeue
---
 op-batcher/batcher/channel_manager.go      | 27 +++++++++++-----------
 op-batcher/batcher/channel_manager_test.go | 16 +++++++++----
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 06403645ea4d..8e9870413a40 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -39,8 +39,9 @@ type channelManager struct {
 
 	// All blocks since the last request for new tx data.
 	blocks queue.Queue[*types.Block]
-	// The latest L1 block from all the L2 blocks in the most recently closed channel
-	l1OriginLastClosedChannel eth.BlockID
+	// The latest L1 block from all the L2 blocks in the most recently submitted channel.
+	// Used to track channel duration timeouts.
+	l1OriginLastSubmittedChannel eth.BlockID
 	// The default ChannelConfig to use for the next channel
 	defaultCfg ChannelConfig
 	// last block hash - for reorg detection
@@ -75,12 +76,12 @@ func (s *channelManager) SetChannelOutFactory(outFactory ChannelOutFactory) {
 
 // Clear clears the entire state of the channel manager.
 // It is intended to be used before launching op-batcher and after an L2 reorg.
-func (s *channelManager) Clear(l1OriginLastClosedChannel eth.BlockID) {
+func (s *channelManager) Clear(l1OriginLastSubmittedChannel eth.BlockID) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	s.log.Trace("clearing channel manager state")
 	s.blocks.Clear()
-	s.l1OriginLastClosedChannel = l1OriginLastClosedChannel
+	s.l1OriginLastSubmittedChannel = l1OriginLastSubmittedChannel
 	s.tip = common.Hash{}
 	s.closed = false
 	s.currentChannel = nil
@@ -160,6 +161,12 @@ func (s *channelManager) nextTxData(channel *channel) (txData, error) {
 		return txData{}, io.EOF // TODO: not enough data error instead
 	}
 	tx := channel.NextTxData()
+
+	// update s.l1OriginLastSubmittedChannel so that the next
+	// channel's duration timeout will trigger properly
+	if channel.LatestL1Origin().Number > s.l1OriginLastSubmittedChannel.Number {
+		s.l1OriginLastSubmittedChannel = channel.LatestL1Origin()
+	}
 	s.txChannels[tx.ID().String()] = channel
 	return tx, nil
 }
@@ -284,7 +291,7 @@ func (s *channelManager) ensureChannelWithSpace(l1Head eth.BlockID) error {
 		return fmt.Errorf("creating channel out: %w", err)
 	}
 
-	pc := newChannel(s.log, s.metr, cfg, s.rollupCfg, s.l1OriginLastClosedChannel.Number, channelOut)
+	pc := newChannel(s.log, s.metr, cfg, s.rollupCfg, s.l1OriginLastSubmittedChannel.Number, channelOut)
 
 	s.currentChannel = pc
 	s.channelQueue = append(s.channelQueue, pc)
@@ -292,7 +299,7 @@ func (s *channelManager) ensureChannelWithSpace(l1Head eth.BlockID) error {
 	s.log.Info("Created channel",
 		"id", pc.ID(),
 		"l1Head", l1Head,
-		"l1OriginLastClosedChannel", s.l1OriginLastClosedChannel,
+		"l1OriginLastSubmittedChannel", s.l1OriginLastSubmittedChannel,
 		"blocks_pending", s.blocks.Len(),
 		"batch_type", cfg.BatchType,
 		"compression_algo", cfg.CompressorConfig.CompressionAlgo,
@@ -374,11 +381,6 @@ func (s *channelManager) outputFrames() error {
 		return nil
 	}
 
-	lastClosedL1Origin := s.currentChannel.LatestL1Origin()
-	if lastClosedL1Origin.Number > s.l1OriginLastClosedChannel.Number {
-		s.l1OriginLastClosedChannel = lastClosedL1Origin
-	}
-
 	inBytes, outBytes := s.currentChannel.InputBytes(), s.currentChannel.OutputBytes()
 	s.metr.RecordChannelClosed(
 		s.currentChannel.ID(),
@@ -401,12 +403,11 @@ func (s *channelManager) outputFrames() error {
 		"input_bytes", inBytes,
 		"output_bytes", outBytes,
 		"oldest_l1_origin", s.currentChannel.OldestL1Origin(),
-		"l1_origin", lastClosedL1Origin,
+		"l1_origin", s.currentChannel.LatestL1Origin(),
 		"oldest_l2", s.currentChannel.OldestL2(),
 		"latest_l2", s.currentChannel.LatestL2(),
 		"full_reason", s.currentChannel.FullErr(),
 		"compr_ratio", comprRatio,
-		"latest_l1_origin", s.l1OriginLastClosedChannel,
 	)
 	return nil
 }
diff --git a/op-batcher/batcher/channel_manager_test.go b/op-batcher/batcher/channel_manager_test.go
index 8dcb0745c164..d3a67a1bf1f4 100644
--- a/op-batcher/batcher/channel_manager_test.go
+++ b/op-batcher/batcher/channel_manager_test.go
@@ -130,7 +130,7 @@ func ChannelManager_Clear(t *testing.T, batchType uint) {
 
 	// Channel Manager state should be empty by default
 	require.Empty(m.blocks)
-	require.Equal(eth.BlockID{}, m.l1OriginLastClosedChannel)
+	require.Equal(eth.BlockID{}, m.l1OriginLastSubmittedChannel)
 	require.Equal(common.Hash{}, m.tip)
 	require.Nil(m.currentChannel)
 	require.Empty(m.channelQueue)
@@ -161,8 +161,8 @@ func ChannelManager_Clear(t *testing.T, batchType uint) {
 	require.NoError(m.outputFrames())
 	_, err := m.nextTxData(m.currentChannel)
 	require.NoError(err)
-	require.NotNil(m.l1OriginLastClosedChannel)
 	require.Len(m.blocks, 0)
+	require.NotNil(m.l1OriginLastSubmittedChannel)
 	require.Equal(newL1Tip, m.tip)
 	require.Len(m.currentChannel.pendingTransactions, 1)
 
@@ -184,7 +184,7 @@ func ChannelManager_Clear(t *testing.T, batchType uint) {
 
 	// Check that the entire channel manager state cleared
 	require.Empty(m.blocks)
-	require.Equal(uint64(123), m.l1OriginLastClosedChannel.Number)
+	require.Equal(uint64(123), m.l1OriginLastSubmittedChannel.Number)
 	require.Equal(common.Hash{}, m.tip)
 	require.Nil(m.currentChannel)
 	require.Empty(m.channelQueue)
@@ -475,7 +475,7 @@ func TestChannelManager_ChannelCreation(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
 
-			m.l1OriginLastClosedChannel = test.safeL1Block
+			m.l1OriginLastSubmittedChannel = test.safeL1Block
 			require.Nil(t, m.currentChannel)
 
 			require.NoError(t, m.ensureChannelWithSpace(eth.BlockID{}))
@@ -639,6 +639,8 @@ func TestChannelManager_Requeue(t *testing.T) {
 	// Assert that at least one block was processed into the channel
 	require.NotContains(t, m.blocks, blockA)
 
+	l1OriginBeforeRequeue := m.l1OriginLastSubmittedChannel
+
 	// Call the function we are testing
 	m.Requeue(m.defaultCfg)
 
@@ -646,6 +648,12 @@ func TestChannelManager_Requeue(t *testing.T) {
 	require.Equal(t, m.blocks, stateSnapshot)
 	require.Empty(t, m.channelQueue)
 
+	// Ensure the l1OridingLastSubmittedChannel was
+	// not changed. This ensures the next channel
+	// has its duration timeout deadline computed
+	// properly.
+	require.Equal(t, l1OriginBeforeRequeue, m.l1OriginLastSubmittedChannel)
+
 	// Trigger the blocks -> channelQueue data pipelining again
 	require.NoError(t, m.ensureChannelWithSpace(eth.BlockID{}))
 	require.NotEmpty(t, m.channelQueue)

From c91fe2f68791f7242c8768d4d08ead128a23a2c8 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 18 Nov 2024 09:46:24 +0000
Subject: [PATCH 193/451] batcher: keep blocks, channels and frames in strict
 order & simplify reorg handling (#12390)

* use a queue.Queue for channelBuilder.frames

* remove pop and push terminology

* proliferate queue.Queue type

* simplify requeue method

* undo changes to submodule

* sketch out new arch

https://www.notion.so/oplabs/op-batcher-re-architecture-114f153ee162803d943ff4628ab6578f

* add TODO

* add channelManager.pruneSafeBlocks method and integrate into main loop

* fix frameCursor semantics

* fixup tests

* avoid Rewind() in tests

* only rewind cursor in rewind (never move it forward)

* fix assertions

* prune channels whose blocks are now safe

* handle case when rewinding a channel with no blocks

this is strange, I don't think we should expect channels with frames but no blocks...

* add clarification

* implement channelManager.pendinBlocks() method

* fix pruning logic

* simplify pruneChannels

* simplify pruneSafeBlocks

* add unit tests for pruneSafeBlocks

* fix pruneSafeBlocks to avoid underflow

* improve test

* add unit tests for pruneChannels

* introduce handleChannelTimeout

and simplify channel.TxConfirmed API

* factor out channelManager.rewindToBlockWithHash

* change test expectation

* do more pruning in test

* Replace "clean shutdown" behaviour with waitNodeSync()

Instead of optimizing for a clean shutdown (which we couldn't guarantee anyway), this change optimizes for code simplicity.

This change also helps us restrict the amount of code which mutates the channelQueue (removePendingChannel was doing removal of channels at arbitrary positions in the queue).

The downside is that we may end up needlessly resubmitting some data after the reset.

Reorgs are rare, so it makes sense to optimize for correctness rather than DA costs here.

* Add readme and architecture diagram

* don't panic when there is a safe chain reorg

* fix test

* readability improvements

* only clear state after waiting for node to sync

* resize image

* tweak readme

* typo

* rewindToBlockWithHash never moves cursor forward

* use s.pendingBlocks()

* add log line

* check there are blocks when handling timeout

* rename HasFrame() to HasPendingFrame()

* fixup test

* improve readme

* link to open issues by tag

* add log when main loop returns

* pass blockID to rewindToBlock

and panic if block does not exist

* don't remove all channels when a channel times out

keep older channels, it's possible that they also time out

* use newSafeHead.L1Origin in Clear() when pruning blocks

* clarify comment

* use warn log level on safe chain reorg pruning, and unify handling for safe head above unsafe head

* update panic message

* extend test coverage and fix bug

* rename test blocks

* simplify HasPendingFrame() method

* simplify implementation of RewindFrameCursor

* activate dormant test

* ensure pending_blocks_bytes_current metric is tracked properly

* cover metrics behaviour in test

using new TestMetrics struct

* extend test coverage to channelManager.handleChannelTimeout

* add comment to TxFailed

* rename test fn

* point to e2e tests in readme.

* readme: performance -> throughput

* improve channel_manager_test to assert old channels are not affected by requeue or timeout

* fix handleChannelTimeout behaviour

We were trimming older channels and keeping new ones. We need to trim newer channels and keep old ones. Fixes associated test (see previous commit).

* tighten up requirements for invalidating a channel

* replace requeue with handleChannelInvalidated
---
 op-batcher/architecture.png                | Bin 0 -> 286852 bytes
 op-batcher/batcher/channel.go              |  37 +-
 op-batcher/batcher/channel_builder.go      |  61 +--
 op-batcher/batcher/channel_builder_test.go |  21 +-
 op-batcher/batcher/channel_manager.go      | 235 +++++------
 op-batcher/batcher/channel_manager_test.go | 435 +++++++++------------
 op-batcher/batcher/channel_test.go         |  15 +-
 op-batcher/batcher/driver.go               |  90 ++---
 op-batcher/metrics/test.go                 |  22 ++
 op-batcher/readme.md                       |  69 ++++
 10 files changed, 503 insertions(+), 482 deletions(-)
 create mode 100644 op-batcher/architecture.png
 create mode 100644 op-batcher/metrics/test.go
 create mode 100644 op-batcher/readme.md

diff --git a/op-batcher/architecture.png b/op-batcher/architecture.png
new file mode 100644
index 0000000000000000000000000000000000000000..0eab940fbb5224f4a33ce70cc9ec27732e2d813f
GIT binary patch
literal 286852
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%0AeJ6N0={5)t?k6^;lB1XM|6*o-0L
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

literal 0
HcmV?d00001

diff --git a/op-batcher/batcher/channel.go b/op-batcher/batcher/channel.go
index dd0827d4686c..9ae52be405dc 100644
--- a/op-batcher/batcher/channel.go
+++ b/op-batcher/batcher/channel.go
@@ -49,10 +49,10 @@ func newChannel(log log.Logger, metr metrics.Metricer, cfg ChannelConfig, rollup
 func (c *channel) TxFailed(id string) {
 	if data, ok := c.pendingTransactions[id]; ok {
 		c.log.Trace("marked transaction as failed", "id", id)
-		// Note: when the batcher is changed to send multiple frames per tx,
-		// this needs to be changed to iterate over all frames of the tx data
-		// and re-queue them.
-		c.channelBuilder.PushFrames(data.Frames()...)
+		// Rewind to the first frame of the failed tx
+		// -- the frames are ordered, and we want to send them
+		// all again.
+		c.channelBuilder.RewindFrameCursor(data.Frames()[0])
 		delete(c.pendingTransactions, id)
 	} else {
 		c.log.Warn("unknown transaction marked as failed", "id", id)
@@ -61,18 +61,16 @@ func (c *channel) TxFailed(id string) {
 	c.metr.RecordBatchTxFailed()
 }
 
-// TxConfirmed marks a transaction as confirmed on L1. Unfortunately even if all frames in
-// a channel have been marked as confirmed on L1 the channel may be invalid & need to be
-// resubmitted.
-// This function may reset the pending channel if the pending channel has timed out.
-func (c *channel) TxConfirmed(id string, inclusionBlock eth.BlockID) (bool, []*types.Block) {
+// TxConfirmed marks a transaction as confirmed on L1. Returns a bool indicating
+// whether the channel timed out on chain.
+func (c *channel) TxConfirmed(id string, inclusionBlock eth.BlockID) bool {
 	c.metr.RecordBatchTxSubmitted()
 	c.log.Debug("marked transaction as confirmed", "id", id, "block", inclusionBlock)
 	if _, ok := c.pendingTransactions[id]; !ok {
 		c.log.Warn("unknown transaction marked as confirmed", "id", id, "block", inclusionBlock)
 		// TODO: This can occur if we clear the channel while there are still pending transactions
 		// We need to keep track of stale transactions instead
-		return false, nil
+		return false
 	}
 	delete(c.pendingTransactions, id)
 	c.confirmedTransactions[id] = inclusionBlock
@@ -82,21 +80,20 @@ func (c *channel) TxConfirmed(id string, inclusionBlock eth.BlockID) (bool, []*t
 	c.minInclusionBlock = min(c.minInclusionBlock, inclusionBlock.Number)
 	c.maxInclusionBlock = max(c.maxInclusionBlock, inclusionBlock.Number)
 
+	if c.isFullySubmitted() {
+		c.metr.RecordChannelFullySubmitted(c.ID())
+		c.log.Info("Channel is fully submitted", "id", c.ID(), "min_inclusion_block", c.minInclusionBlock, "max_inclusion_block", c.maxInclusionBlock)
+	}
+
 	// If this channel timed out, put the pending blocks back into the local saved blocks
 	// and then reset this state so it can try to build a new channel.
 	if c.isTimedOut() {
 		c.metr.RecordChannelTimedOut(c.ID())
 		c.log.Warn("Channel timed out", "id", c.ID(), "min_inclusion_block", c.minInclusionBlock, "max_inclusion_block", c.maxInclusionBlock)
-		return true, c.channelBuilder.Blocks()
-	}
-	// If we are done with this channel, record that.
-	if c.isFullySubmitted() {
-		c.metr.RecordChannelFullySubmitted(c.ID())
-		c.log.Info("Channel is fully submitted", "id", c.ID(), "min_inclusion_block", c.minInclusionBlock, "max_inclusion_block", c.maxInclusionBlock)
-		return true, nil
+		return true
 	}
 
-	return false, nil
+	return false
 }
 
 // Timeout returns the channel timeout L1 block number. If there is no timeout set, it returns 0.
@@ -136,7 +133,7 @@ func (c *channel) ID() derive.ChannelID {
 func (c *channel) NextTxData() txData {
 	nf := c.cfg.MaxFramesPerTx()
 	txdata := txData{frames: make([]frameData, 0, nf), asBlob: c.cfg.UseBlobs}
-	for i := 0; i < nf && c.channelBuilder.HasFrame(); i++ {
+	for i := 0; i < nf && c.channelBuilder.HasPendingFrame(); i++ {
 		frame := c.channelBuilder.NextFrame()
 		txdata.frames = append(txdata.frames, frame)
 	}
@@ -151,7 +148,7 @@ func (c *channel) NextTxData() txData {
 func (c *channel) HasTxData() bool {
 	if c.IsFull() || // If the channel is full, we should start to submit it
 		!c.cfg.UseBlobs { // If using calldata, we only send one frame per tx
-		return c.channelBuilder.HasFrame()
+		return c.channelBuilder.HasPendingFrame()
 	}
 	// Collect enough frames if channel is not full yet
 	return c.channelBuilder.PendingFrames() >= int(c.cfg.MaxFramesPerTx())
diff --git a/op-batcher/batcher/channel_builder.go b/op-batcher/batcher/channel_builder.go
index ae1fb03d2841..597b5ed3e144 100644
--- a/op-batcher/batcher/channel_builder.go
+++ b/op-batcher/batcher/channel_builder.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/queue"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
@@ -65,7 +66,7 @@ type ChannelBuilder struct {
 	// current channel
 	co derive.ChannelOut
 	// list of blocks in the channel. Saved in case the channel must be rebuilt
-	blocks []*types.Block
+	blocks queue.Queue[*types.Block]
 	// latestL1Origin is the latest L1 origin of all the L2 blocks that have been added to the channel
 	latestL1Origin eth.BlockID
 	// oldestL1Origin is the oldest L1 origin of all the L2 blocks that have been added to the channel
@@ -75,7 +76,12 @@ type ChannelBuilder struct {
 	// oldestL2 is the oldest L2 block of all the L2 blocks that have been added to the channel
 	oldestL2 eth.BlockID
 	// frames data queue, to be send as txs
-	frames []frameData
+	frames queue.Queue[frameData]
+	// frameCursor tracks which frames in the queue were submitted
+	// frames[frameCursor] is the next unsubmitted (pending) frame
+	// frameCursor = len(frames) is reserved for when
+	// there are no pending (next unsubmitted) frames
+	frameCursor int
 	// total frames counter
 	numFrames int
 	// total amount of output data of all frames created yet
@@ -190,7 +196,7 @@ func (c *ChannelBuilder) AddBlock(block *types.Block) (*derive.L1BlockInfo, erro
 		return l1info, fmt.Errorf("adding block to channel out: %w", err)
 	}
 
-	c.blocks = append(c.blocks, block)
+	c.blocks.Enqueue(block)
 	c.updateSwTimeout(l1info.Number)
 
 	if l1info.Number > c.latestL1Origin.Number {
@@ -312,11 +318,11 @@ func (c *ChannelBuilder) setFullErr(err error) {
 }
 
 // OutputFrames creates new frames with the channel out. It should be called
-// after AddBlock and before iterating over available frames with HasFrame and
+// after AddBlock and before iterating over pending frames with HasFrame and
 // NextFrame.
 //
 // If the channel isn't full yet, it will conservatively only
-// pull readily available frames from the compression output.
+// pull pending frames from the compression output.
 // If it is full, the channel is closed and all remaining
 // frames will be created, possibly with a small leftover frame.
 func (c *ChannelBuilder) OutputFrames() error {
@@ -387,7 +393,7 @@ func (c *ChannelBuilder) outputFrame() error {
 		id:   frameID{chID: c.co.ID(), frameNumber: fn},
 		data: buf.Bytes(),
 	}
-	c.frames = append(c.frames, frame)
+	c.frames.Enqueue(frame)
 	c.numFrames++
 	c.outputBytes += len(frame.data)
 	return err // possibly io.EOF (last frame)
@@ -402,46 +408,47 @@ func (c *ChannelBuilder) Close() {
 }
 
 // TotalFrames returns the total number of frames that were created in this channel so far.
-// It does not decrease when the frames queue is being emptied.
 func (c *ChannelBuilder) TotalFrames() int {
 	return c.numFrames
 }
 
-// HasFrame returns whether there's any available frame. If true, it can be
-// popped using NextFrame().
+// HasPendingFrame returns whether there's any pending frame. If true, it can be
+// dequeued using NextFrame().
 //
 // Call OutputFrames before to create new frames from the channel out
 // compression pipeline.
-func (c *ChannelBuilder) HasFrame() bool {
-	return len(c.frames) > 0
+func (c *ChannelBuilder) HasPendingFrame() bool {
+	return c.frameCursor < c.frames.Len()
 }
 
 // PendingFrames returns the number of pending frames in the frames queue.
-// It is larger zero iff HasFrame() returns true.
+// It is larger than zero iff HasFrame() returns true.
 func (c *ChannelBuilder) PendingFrames() int {
-	return len(c.frames)
+	return c.frames.Len() - c.frameCursor
 }
 
-// NextFrame dequeues the next available frame.
-// HasFrame must be called prior to check if there's a next frame available.
+// NextFrame returns the next pending frame and increments the frameCursor
+// HasFrame must be called prior to check if there a next pending frame exists.
 // Panics if called when there's no next frame.
 func (c *ChannelBuilder) NextFrame() frameData {
-	if len(c.frames) == 0 {
+	if len(c.frames) <= c.frameCursor {
 		panic("no next frame")
 	}
-
-	f := c.frames[0]
-	c.frames = c.frames[1:]
+	f := c.frames[c.frameCursor]
+	c.frameCursor++
 	return f
 }
 
-// PushFrames adds the frames back to the internal frames queue. Panics if not of
-// the same channel.
-func (c *ChannelBuilder) PushFrames(frames ...frameData) {
-	for _, f := range frames {
-		if f.id.chID != c.ID() {
-			panic("wrong channel")
-		}
-		c.frames = append(c.frames, f)
+// RewindFrameCursor moves the frameCursor to point at the supplied frame
+// only if it is ahead of it.
+// Panics if the frame is not in this channel.
+func (c *ChannelBuilder) RewindFrameCursor(frame frameData) {
+	if c.frames.Len() <= int(frame.id.frameNumber) ||
+		len(c.frames[frame.id.frameNumber].data) != len(frame.data) ||
+		c.frames[frame.id.frameNumber].id.chID != frame.id.chID {
+		panic("cannot rewind to unknown frame")
+	}
+	if c.frameCursor > int(frame.id.frameNumber) {
+		c.frameCursor = int(frame.id.frameNumber)
 	}
 }
diff --git a/op-batcher/batcher/channel_builder_test.go b/op-batcher/batcher/channel_builder_test.go
index 957f9ae59739..6994186b7f07 100644
--- a/op-batcher/batcher/channel_builder_test.go
+++ b/op-batcher/batcher/channel_builder_test.go
@@ -299,6 +299,7 @@ func TestChannelBuilderBatchType(t *testing.T) {
 		{"ChannelBuilder_PendingFrames_TotalFrames", ChannelBuilder_PendingFrames_TotalFrames},
 		{"ChannelBuilder_InputBytes", ChannelBuilder_InputBytes},
 		{"ChannelBuilder_OutputBytes", ChannelBuilder_OutputBytes},
+		{"ChannelBuilder_OutputWrongFramePanic", ChannelBuilder_OutputWrongFramePanic},
 	}
 	for _, test := range tests {
 		test := test
@@ -340,7 +341,7 @@ func TestChannelBuilder_NextFrame(t *testing.T) {
 		},
 		data: expectedBytes,
 	}
-	cb.PushFrames(frameData)
+	cb.frames = append(cb.frames, frameData)
 
 	// There should only be 1 frame in the channel builder
 	require.Equal(t, 1, cb.PendingFrames())
@@ -355,7 +356,7 @@ func TestChannelBuilder_NextFrame(t *testing.T) {
 	require.PanicsWithValue(t, "no next frame", func() { cb.NextFrame() })
 }
 
-// TestChannelBuilder_OutputWrongFramePanic tests that a panic is thrown when a frame is pushed with an invalid frame id
+// TestChannelBuilder_OutputWrongFramePanic tests that a panic is thrown when we try to rewind the cursor with an invalid frame id
 func ChannelBuilder_OutputWrongFramePanic(t *testing.T, batchType uint) {
 	channelConfig := defaultTestChannelConfig()
 	channelConfig.BatchType = batchType
@@ -377,7 +378,7 @@ func ChannelBuilder_OutputWrongFramePanic(t *testing.T, batchType uint) {
 
 	// The frame push should panic since we constructed a new channel out
 	// so the channel out id won't match
-	require.PanicsWithValue(t, "wrong channel", func() {
+	require.PanicsWithValue(t, "cannot rewind to unknown frame", func() {
 		frame := frameData{
 			id: frameID{
 				chID:        co.ID(),
@@ -385,7 +386,7 @@ func ChannelBuilder_OutputWrongFramePanic(t *testing.T, batchType uint) {
 			},
 			data: buf.Bytes(),
 		}
-		cb.PushFrames(frame)
+		cb.RewindFrameCursor(frame)
 	})
 }
 
@@ -625,11 +626,11 @@ func TestChannelBuilder_FullShadowCompressor(t *testing.T) {
 
 	require.NoError(cb.OutputFrames())
 
-	require.True(cb.HasFrame())
+	require.True(cb.HasPendingFrame())
 	f := cb.NextFrame()
 	require.Less(len(f.data), int(cfg.MaxFrameSize)) // would fail without fix, full frame
 
-	require.False(cb.HasFrame(), "no leftover frame expected") // would fail without fix
+	require.False(cb.HasPendingFrame(), "no leftover frame expected") // would fail without fix
 }
 
 func ChannelBuilder_AddBlock(t *testing.T, batchType uint) {
@@ -656,8 +657,8 @@ func ChannelBuilder_AddBlock(t *testing.T, batchType uint) {
 		expectedInputBytes = 47
 	}
 	require.Equal(t, expectedInputBytes, cb.co.InputBytes())
-	require.Equal(t, 1, len(cb.blocks))
-	require.Equal(t, 0, len(cb.frames))
+	require.Equal(t, 1, cb.blocks.Len())
+	require.Equal(t, 0, cb.frames.Len())
 	require.True(t, cb.IsFull())
 
 	// Since the channel output is full, the next call to AddBlock
@@ -858,7 +859,7 @@ func ChannelBuilder_PendingFrames_TotalFrames(t *testing.T, batchType uint) {
 
 	// empty queue
 	for pf := nf - 1; pf >= 0; pf-- {
-		require.True(cb.HasFrame())
+		require.True(cb.HasPendingFrame())
 		_ = cb.NextFrame()
 		require.Equal(cb.PendingFrames(), pf)
 		require.Equal(cb.TotalFrames(), nf)
@@ -932,7 +933,7 @@ func ChannelBuilder_OutputBytes(t *testing.T, batchType uint) {
 	require.Greater(cb.PendingFrames(), 1)
 
 	var flen int
-	for cb.HasFrame() {
+	for cb.HasPendingFrame() {
 		f := cb.NextFrame()
 		flen += len(f.data)
 	}
diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 8e9870413a40..4208a8cd3795 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -39,6 +39,10 @@ type channelManager struct {
 
 	// All blocks since the last request for new tx data.
 	blocks queue.Queue[*types.Block]
+	// blockCursor is an index into blocks queue. It points at the next block
+	// to build a channel with. blockCursor = len(blocks) is reserved for when
+	// there are no blocks ready to build with.
+	blockCursor int
 	// The latest L1 block from all the L2 blocks in the most recently submitted channel.
 	// Used to track channel duration timeouts.
 	l1OriginLastSubmittedChannel eth.BlockID
@@ -53,9 +57,6 @@ type channelManager struct {
 	channelQueue []*channel
 	// used to lookup channels by tx ID upon tx success / failure
 	txChannels map[string]*channel
-
-	// if set to true, prevents production of any new channel frames
-	closed bool
 }
 
 func NewChannelManager(log log.Logger, metr metrics.Metricer, cfgProvider ChannelConfigProvider, rollupCfg *rollup.Config) *channelManager {
@@ -81,14 +82,18 @@ func (s *channelManager) Clear(l1OriginLastSubmittedChannel eth.BlockID) {
 	defer s.mu.Unlock()
 	s.log.Trace("clearing channel manager state")
 	s.blocks.Clear()
+	s.blockCursor = 0
 	s.l1OriginLastSubmittedChannel = l1OriginLastSubmittedChannel
 	s.tip = common.Hash{}
-	s.closed = false
 	s.currentChannel = nil
 	s.channelQueue = nil
 	s.txChannels = make(map[string]*channel)
 }
 
+func (s *channelManager) pendingBlocks() int {
+	return s.blocks.Len() - s.blockCursor
+}
+
 // TxFailed records a transaction as failed. It will attempt to resubmit the data
 // in the failed transaction.
 func (s *channelManager) TxFailed(_id txID) {
@@ -98,34 +103,21 @@ func (s *channelManager) TxFailed(_id txID) {
 	if channel, ok := s.txChannels[id]; ok {
 		delete(s.txChannels, id)
 		channel.TxFailed(id)
-		if s.closed && channel.NoneSubmitted() {
-			s.log.Info("Channel has no submitted transactions, clearing for shutdown", "chID", channel.ID())
-			s.removePendingChannel(channel)
-		}
 	} else {
 		s.log.Warn("transaction from unknown channel marked as failed", "id", id)
 	}
 }
 
-// TxConfirmed marks a transaction as confirmed on L1. Unfortunately even if all frames in
-// a channel have been marked as confirmed on L1 the channel may be invalid & need to be
-// resubmitted.
-// This function may reset the pending channel if the pending channel has timed out.
+// TxConfirmed marks a transaction as confirmed on L1. Only if the channel timed out
+// the channelManager's state is modified.
 func (s *channelManager) TxConfirmed(_id txID, inclusionBlock eth.BlockID) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	id := _id.String()
 	if channel, ok := s.txChannels[id]; ok {
 		delete(s.txChannels, id)
-		done, blocksToRequeue := channel.TxConfirmed(id, inclusionBlock)
-		if done {
-			s.removePendingChannel(channel)
-			if len(blocksToRequeue) > 0 {
-				s.blocks.Prepend(blocksToRequeue...)
-			}
-			for _, b := range blocksToRequeue {
-				s.metr.RecordL2BlockInPendingQueue(b)
-			}
+		if timedOut := channel.TxConfirmed(id, inclusionBlock); timedOut {
+			s.handleChannelInvalidated(channel)
 		}
 	} else {
 		s.log.Warn("transaction from unknown channel marked as confirmed", "id", id)
@@ -134,23 +126,48 @@ func (s *channelManager) TxConfirmed(_id txID, inclusionBlock eth.BlockID) {
 	s.log.Debug("marked transaction as confirmed", "id", id, "block", inclusionBlock)
 }
 
-// removePendingChannel removes the given completed channel from the manager's state.
-func (s *channelManager) removePendingChannel(channel *channel) {
-	if s.currentChannel == channel {
-		s.currentChannel = nil
+// rewindToBlock updates the blockCursor to point at
+// the block with the supplied hash, only if that block exists
+// in the block queue and the blockCursor is ahead of it.
+// Panics if the block is not in state.
+func (s *channelManager) rewindToBlock(block eth.BlockID) {
+	idx := block.Number - s.blocks[0].Number().Uint64()
+	if s.blocks[idx].Hash() == block.Hash && idx < uint64(s.blockCursor) {
+		s.blockCursor = int(idx)
+	} else {
+		panic("tried to rewind to nonexistent block")
 	}
-	index := -1
-	for i, c := range s.channelQueue {
-		if c == channel {
-			index = i
-			break
+}
+
+// handleChannelInvalidated rewinds the channelManager's blockCursor
+// to point at the first block added to the provided channel,
+// and removes the channel from the channelQueue, along with
+// any channels which are newer than the provided channel.
+func (s *channelManager) handleChannelInvalidated(c *channel) {
+	if len(c.channelBuilder.blocks) > 0 {
+		// This is usually true, but there is an edge case
+		// where a channel timed out before any blocks got added.
+		// In that case we end up with an empty frame (header only),
+		// and there are no blocks to requeue.
+		blockID := eth.ToBlockID(c.channelBuilder.blocks[0])
+		for _, block := range c.channelBuilder.blocks {
+			s.metr.RecordL2BlockInPendingQueue(block)
 		}
+		s.rewindToBlock(blockID)
+	} else {
+		s.log.Debug("channelManager.handleChanneInvalidated: channel had no blocks")
 	}
-	if index < 0 {
-		s.log.Warn("channel not found in channel queue", "id", channel.ID())
-		return
+
+	// Trim provided channel and any older channels:
+	for i := range s.channelQueue {
+		if s.channelQueue[i] == c {
+			s.channelQueue = s.channelQueue[:i]
+			break
+		}
 	}
-	s.channelQueue = append(s.channelQueue[:index], s.channelQueue[index+1:]...)
+
+	// We want to start writing to a new channel, so reset currentChannel.
+	s.currentChannel = nil
 }
 
 // nextTxData dequeues frames from the channel and returns them encoded in a transaction.
@@ -207,7 +224,16 @@ func (s *channelManager) TxData(l1Head eth.BlockID) (txData, error) {
 	s.log.Info("Recomputing optimal ChannelConfig: changing DA type and requeing blocks...",
 		"useBlobsBefore", s.defaultCfg.UseBlobs,
 		"useBlobsAfter", newCfg.UseBlobs)
-	s.Requeue(newCfg)
+
+	// Invalidate the channel so its blocks
+	// get requeued:
+	s.handleChannelInvalidated(channel)
+
+	// Set the defaultCfg so new channels
+	// pick up the new ChannelConfig
+	s.defaultCfg = newCfg
+
+	// Try again to get data to send on chain.
 	channel, err = s.getReadyChannel(l1Head)
 	if err != nil {
 		return emptyTxData, err
@@ -238,14 +264,9 @@ func (s *channelManager) getReadyChannel(l1Head eth.BlockID) (*channel, error) {
 		return firstWithTxData, nil
 	}
 
-	if s.closed {
-		return nil, io.EOF
-	}
-
 	// No pending tx data, so we have to add new blocks to the channel
-
 	// If we have no saved blocks, we will not be able to create valid frames
-	if s.blocks.Len() == 0 {
+	if s.pendingBlocks() == 0 {
 		return nil, io.EOF
 	}
 
@@ -299,8 +320,8 @@ func (s *channelManager) ensureChannelWithSpace(l1Head eth.BlockID) error {
 	s.log.Info("Created channel",
 		"id", pc.ID(),
 		"l1Head", l1Head,
+		"blocks_pending", s.pendingBlocks(),
 		"l1OriginLastSubmittedChannel", s.l1OriginLastSubmittedChannel,
-		"blocks_pending", s.blocks.Len(),
 		"batch_type", cfg.BatchType,
 		"compression_algo", cfg.CompressorConfig.CompressionAlgo,
 		"target_num_frames", cfg.TargetNumFrames,
@@ -331,7 +352,7 @@ func (s *channelManager) processBlocks() error {
 		latestL2ref eth.L2BlockRef
 	)
 
-	for i := 0; ; i++ {
+	for i := s.blockCursor; ; i++ {
 		block, ok := s.blocks.PeekN(i)
 		if !ok {
 			break
@@ -355,7 +376,7 @@ func (s *channelManager) processBlocks() error {
 		}
 	}
 
-	_, _ = s.blocks.DequeueN(blocksAdded)
+	s.blockCursor += blocksAdded
 
 	s.metr.RecordL2BlocksAdded(latestL2ref,
 		blocksAdded,
@@ -364,7 +385,7 @@ func (s *channelManager) processBlocks() error {
 		s.currentChannel.ReadyBytes())
 	s.log.Debug("Added blocks to channel",
 		"blocks_added", blocksAdded,
-		"blocks_pending", s.blocks.Len(),
+		"blocks_pending", s.pendingBlocks(),
 		"channel_full", s.currentChannel.IsFull(),
 		"input_bytes", s.currentChannel.InputBytes(),
 		"ready_bytes", s.currentChannel.ReadyBytes(),
@@ -384,7 +405,7 @@ func (s *channelManager) outputFrames() error {
 	inBytes, outBytes := s.currentChannel.InputBytes(), s.currentChannel.OutputBytes()
 	s.metr.RecordChannelClosed(
 		s.currentChannel.ID(),
-		s.blocks.Len(),
+		s.pendingBlocks(),
 		s.currentChannel.TotalFrames(),
 		inBytes,
 		outBytes,
@@ -398,7 +419,7 @@ func (s *channelManager) outputFrames() error {
 
 	s.log.Info("Channel closed",
 		"id", s.currentChannel.ID(),
-		"blocks_pending", s.blocks.Len(),
+		"blocks_pending", s.pendingBlocks(),
 		"num_frames", s.currentChannel.TotalFrames(),
 		"input_bytes", inBytes,
 		"output_bytes", outBytes,
@@ -443,83 +464,77 @@ func l2BlockRefFromBlockAndL1Info(block *types.Block, l1info *derive.L1BlockInfo
 
 var ErrPendingAfterClose = errors.New("pending channels remain after closing channel-manager")
 
-// Close clears any pending channels that are not in-flight already, to leave a clean derivation state.
-// Close then marks the remaining current open channel, if any, as "full" so it can be submitted as well.
-// Close does NOT immediately output frames for the current remaining channel:
-// as this might error, due to limitations on a single channel.
-// Instead, this is part of the pending-channel submission work: after closing,
-// the caller SHOULD drain pending channels by generating TxData repeatedly until there is none left (io.EOF).
-// A ErrPendingAfterClose error will be returned if there are any remaining pending channels to submit.
-func (s *channelManager) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if s.closed {
-		return nil
+// pruneSafeBlocks dequeues blocks from the internal blocks queue
+// if they have now become safe.
+func (s *channelManager) pruneSafeBlocks(newSafeHead eth.L2BlockRef) {
+	oldestBlock, ok := s.blocks.Peek()
+	if !ok {
+		// no blocks to prune
+		return
 	}
 
-	s.closed = true
-	s.log.Info("Channel manager is closing")
-
-	// Any pending state can be proactively cleared if there are no submitted transactions
-	for _, ch := range s.channelQueue {
-		if ch.NoneSubmitted() {
-			s.log.Info("Channel has no past or pending submission - dropping", "id", ch.ID())
-			s.removePendingChannel(ch)
-		} else {
-			s.log.Info("Channel is in-flight and will need to be submitted after close", "id", ch.ID(), "confirmed", len(ch.confirmedTransactions), "pending", len(ch.pendingTransactions))
-		}
+	if newSafeHead.Number+1 == oldestBlock.NumberU64() {
+		// no blocks to prune
+		return
 	}
-	s.log.Info("Reviewed all pending channels on close", "remaining", len(s.channelQueue))
 
-	if s.currentChannel == nil {
-		return nil
+	if newSafeHead.Number+1 < oldestBlock.NumberU64() {
+		// This could happen if there was an L1 reorg.
+		s.log.Warn("safe head reversed, clearing channel manager state",
+			"oldestBlock", eth.ToBlockID(oldestBlock),
+			"newSafeBlock", newSafeHead)
+		// We should restart work from the new safe head,
+		// and therefore prune all the blocks.
+		s.Clear(newSafeHead.L1Origin)
+		return
 	}
 
-	// If the channel is already full, we don't need to close it or output frames.
-	// This would already have happened in TxData.
-	if !s.currentChannel.IsFull() {
-		// Force-close the remaining open channel early (if not already closed):
-		// it will be marked as "full" due to service termination.
-		s.currentChannel.Close()
+	numBlocksToDequeue := newSafeHead.Number + 1 - oldestBlock.NumberU64()
 
-		// Final outputFrames call in case there was unflushed data in the compressor.
-		if err := s.outputFrames(); err != nil {
-			return fmt.Errorf("outputting frames during close: %w", err)
-		}
+	if numBlocksToDequeue > uint64(s.blocks.Len()) {
+		// This could happen if the batcher restarted.
+		// The sequencer may have derived the safe chain
+		// from channels sent by a previous batcher instance.
+		s.log.Warn("safe head above unsafe head, clearing channel manager state",
+			"unsafeBlock", eth.ToBlockID(s.blocks[s.blocks.Len()-1]),
+			"newSafeBlock", newSafeHead)
+		// We should restart work from the new safe head,
+		// and therefore prune all the blocks.
+		s.Clear(newSafeHead.L1Origin)
+		return
 	}
 
-	if s.currentChannel.HasTxData() {
-		// Make it clear to the caller that there is remaining pending work.
-		return ErrPendingAfterClose
+	if s.blocks[numBlocksToDequeue-1].Hash() != newSafeHead.Hash {
+		s.log.Warn("safe chain reorg, clearing channel manager state",
+			"existingBlock", eth.ToBlockID(s.blocks[numBlocksToDequeue-1]),
+			"newSafeBlock", newSafeHead)
+		// We should restart work from the new safe head,
+		// and therefore prune all the blocks.
+		s.Clear(newSafeHead.L1Origin)
+		return
 	}
-	return nil
-}
 
-// Requeue rebuilds the channel manager state by
-// rewinding blocks back from the channel queue, and setting the defaultCfg.
-func (s *channelManager) Requeue(newCfg ChannelConfig) {
-	newChannelQueue := []*channel{}
-	blocksToRequeue := []*types.Block{}
-	for _, channel := range s.channelQueue {
-		if !channel.NoneSubmitted() {
-			newChannelQueue = append(newChannelQueue, channel)
-			continue
-		}
-		blocksToRequeue = append(blocksToRequeue, channel.channelBuilder.Blocks()...)
-	}
+	// This shouldn't return an error because
+	// We already checked numBlocksToDequeue <= s.blocks.Len()
+	_, _ = s.blocks.DequeueN(int(numBlocksToDequeue))
+	s.blockCursor -= int(numBlocksToDequeue)
 
-	// We put the blocks back at the front of the queue:
-	s.blocks.Prepend(blocksToRequeue...)
-	for _, b := range blocksToRequeue {
-		s.metr.RecordL2BlockInPendingQueue(b)
+	if s.blockCursor < 0 {
+		panic("negative blockCursor")
 	}
+}
 
-	// Channels which where already being submitted are put back
-	s.channelQueue = newChannelQueue
-	s.currentChannel = nil
-	// Setting the defaultCfg will cause new channels
-	// to pick up the new ChannelConfig
-	s.defaultCfg = newCfg
+// pruneChannels dequeues channels from the internal channels queue
+// if they were built using blocks which are now safe
+func (s *channelManager) pruneChannels(newSafeHead eth.L2BlockRef) {
+	i := 0
+	for _, ch := range s.channelQueue {
+		if ch.LatestL2().Number > newSafeHead.Number {
+			break
+		}
+		i++
+	}
+	s.channelQueue = s.channelQueue[i:]
 }
 
 // PendingDABytes returns the current number of bytes pending to be written to the DA layer (from blocks fetched from L2
diff --git a/op-batcher/batcher/channel_manager_test.go b/op-batcher/batcher/channel_manager_test.go
index d3a67a1bf1f4..1c742207a5f0 100644
--- a/op-batcher/batcher/channel_manager_test.go
+++ b/op-batcher/batcher/channel_manager_test.go
@@ -40,10 +40,6 @@ func TestChannelManagerBatchType(t *testing.T) {
 		{"ChannelManagerReturnsErrReorgWhenDrained", ChannelManagerReturnsErrReorgWhenDrained},
 		{"ChannelManager_Clear", ChannelManager_Clear},
 		{"ChannelManager_TxResend", ChannelManager_TxResend},
-		{"ChannelManagerCloseBeforeFirstUse", ChannelManagerCloseBeforeFirstUse},
-		{"ChannelManagerCloseNoPendingChannel", ChannelManagerCloseNoPendingChannel},
-		{"ChannelManagerClosePendingChannel", ChannelManagerClosePendingChannel},
-		{"ChannelManagerCloseAllTxsFailed", ChannelManagerCloseAllTxsFailed},
 	}
 	for _, test := range tests {
 		test := test
@@ -154,14 +150,13 @@ func ChannelManager_Clear(t *testing.T, batchType uint) {
 
 	// Process the blocks
 	// We should have a pending channel with 1 frame
-	// and no more blocks since processBlocks consumes
-	// the list
+
 	require.NoError(m.processBlocks())
 	require.NoError(m.currentChannel.channelBuilder.co.Flush())
 	require.NoError(m.outputFrames())
 	_, err := m.nextTxData(m.currentChannel)
 	require.NoError(err)
-	require.Len(m.blocks, 0)
+	require.Equal(m.blockCursor, len(m.blocks))
 	require.NotNil(m.l1OriginLastSubmittedChannel)
 	require.Equal(newL1Tip, m.tip)
 	require.Len(m.currentChannel.pendingTransactions, 1)
@@ -173,7 +168,7 @@ func ChannelManager_Clear(t *testing.T, batchType uint) {
 		ParentHash: a.Hash(),
 	}, nil, nil, nil)
 	require.NoError(m.AddL2Block(b))
-	require.Len(m.blocks, 1)
+	require.Equal(m.blockCursor, len(m.blocks)-1)
 	require.Equal(b.Hash(), m.tip)
 
 	safeL1Origin := eth.BlockID{
@@ -228,220 +223,6 @@ func ChannelManager_TxResend(t *testing.T, batchType uint) {
 	require.Len(fs, 1)
 }
 
-// ChannelManagerCloseBeforeFirstUse ensures that the channel manager
-// will not produce any frames if closed immediately.
-func ChannelManagerCloseBeforeFirstUse(t *testing.T, batchType uint) {
-	require := require.New(t)
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-	log := testlog.Logger(t, log.LevelCrit)
-	m := NewChannelManager(log, metrics.NoopMetrics,
-		channelManagerTestConfig(10000, batchType),
-		defaultTestRollupConfig,
-	)
-	m.Clear(eth.BlockID{})
-
-	a := derivetest.RandomL2BlockWithChainId(rng, 4, defaultTestRollupConfig.L2ChainID)
-
-	require.NoError(m.Close(), "Expected to close channel manager gracefully")
-
-	err := m.AddL2Block(a)
-	require.NoError(err, "Failed to add L2 block")
-
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected closed channel manager to contain no tx data")
-}
-
-// ChannelManagerCloseNoPendingChannel ensures that the channel manager
-// can gracefully close with no pending channels, and will not emit any new
-// channel frames.
-func ChannelManagerCloseNoPendingChannel(t *testing.T, batchType uint) {
-	require := require.New(t)
-	log := testlog.Logger(t, log.LevelCrit)
-	cfg := channelManagerTestConfig(10000, batchType)
-	cfg.CompressorConfig.TargetOutputSize = 1 // full on first block
-	cfg.ChannelTimeout = 1000
-	m := NewChannelManager(log, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
-	m.Clear(eth.BlockID{})
-	a := newMiniL2Block(0)
-	b := newMiniL2BlockWithNumberParent(0, big.NewInt(1), a.Hash())
-
-	err := m.AddL2Block(a)
-	require.NoError(err, "Failed to add L2 block")
-
-	txdata, err := m.TxData(eth.BlockID{})
-	require.NoError(err, "Expected channel manager to return valid tx data")
-
-	m.TxConfirmed(txdata.ID(), eth.BlockID{})
-
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected channel manager to EOF")
-
-	require.NoError(m.Close(), "Expected to close channel manager gracefully")
-
-	err = m.AddL2Block(b)
-	require.NoError(err, "Failed to add L2 block")
-
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected closed channel manager to return no new tx data")
-}
-
-// ChannelManagerClosePendingChannel ensures that the channel manager
-// can gracefully close with a pending channel, and will not produce any
-// new channel frames after this point.
-func ChannelManagerClosePendingChannel(t *testing.T, batchType uint) {
-	require := require.New(t)
-	// The number of batch txs depends on compression of the random data, hence the static test RNG seed.
-	// Example of different RNG seed that creates less than 2 frames: 1698700588902821588
-	rng := rand.New(rand.NewSource(123))
-	log := testlog.Logger(t, log.LevelError)
-	cfg := channelManagerTestConfig(10_000, batchType)
-	cfg.ChannelTimeout = 1000
-	m := NewChannelManager(log, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
-	m.Clear(eth.BlockID{})
-
-	numTx := 20 // Adjust number of txs to make 2 frames
-	a := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-
-	err := m.AddL2Block(a)
-	require.NoError(err, "Failed to add L2 block")
-
-	txdata, err := m.TxData(eth.BlockID{})
-	require.NoError(err, "Expected channel manager to produce valid tx data")
-	log.Info("generated first tx data", "len", txdata.Len())
-
-	m.TxConfirmed(txdata.ID(), eth.BlockID{})
-
-	require.ErrorIs(m.Close(), ErrPendingAfterClose, "Expected channel manager to error on close because of pending tx data")
-
-	txdata, err = m.TxData(eth.BlockID{})
-	require.NoError(err, "Expected channel manager to produce tx data from remaining L2 block data")
-	log.Info("generated more tx data", "len", txdata.Len())
-
-	m.TxConfirmed(txdata.ID(), eth.BlockID{})
-
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected channel manager to have no more tx data")
-
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected closed channel manager to produce no more tx data")
-}
-
-// ChannelManager_Close_PartiallyPendingChannel ensures that the channel manager
-// can gracefully close with a pending channel, where a block is still waiting
-// inside the compressor to be flushed.
-//
-// This test runs only for singular batches on purpose.
-// The SpanChannelOut writes full span batches to the compressor for
-// every new block that's added, so NonCompressor cannot be used to
-// set up a scenario where data is only partially flushed.
-// Couldn't get the test to work even with modifying NonCompressor
-// to flush half-way through writing to the compressor...
-func TestChannelManager_Close_PartiallyPendingChannel(t *testing.T) {
-	require := require.New(t)
-	// The number of batch txs depends on compression of the random data, hence the static test RNG seed.
-	// Example of different RNG seed that creates less than 2 frames: 1698700588902821588
-	rng := rand.New(rand.NewSource(123))
-	log := testlog.Logger(t, log.LevelError)
-	cfg := ChannelConfig{
-		MaxFrameSize:    2200,
-		ChannelTimeout:  1000,
-		TargetNumFrames: 100,
-	}
-	cfg.InitNoneCompressor()
-	m := NewChannelManager(log, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
-	m.Clear(eth.BlockID{})
-
-	numTx := 3 // Adjust number of txs to make 2 frames
-	a := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-	b := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-	bHeader := b.Header()
-	bHeader.Number = new(big.Int).Add(a.Number(), big.NewInt(1))
-	bHeader.ParentHash = a.Hash()
-	b = b.WithSeal(bHeader)
-
-	require.NoError(m.AddL2Block(a), "adding 1st L2 block")
-	require.NoError(m.AddL2Block(b), "adding 2nd L2 block")
-
-	// Inside TxData, the two blocks queued above are written to the compressor.
-	// The NonCompressor will flush the first, but not the second block, when
-	// adding the second block, setting up the test with a partially flushed
-	// compressor.
-	txdata, err := m.TxData(eth.BlockID{})
-	require.NoError(err, "Expected channel manager to produce valid tx data")
-	log.Info("generated first tx data", "len", txdata.Len())
-
-	m.TxConfirmed(txdata.ID(), eth.BlockID{})
-
-	// ensure no new ready data before closing
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected unclosed channel manager to only return a single frame")
-
-	require.ErrorIs(m.Close(), ErrPendingAfterClose, "Expected channel manager to error on close because of pending tx data")
-	require.NotNil(m.currentChannel)
-	require.ErrorIs(m.currentChannel.FullErr(), ErrTerminated, "Expected current channel to be terminated by Close")
-
-	txdata, err = m.TxData(eth.BlockID{})
-	require.NoError(err, "Expected channel manager to produce tx data from remaining L2 block data")
-	log.Info("generated more tx data", "len", txdata.Len())
-
-	m.TxConfirmed(txdata.ID(), eth.BlockID{})
-
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected closed channel manager to produce no more tx data")
-}
-
-// ChannelManagerCloseAllTxsFailed ensures that the channel manager
-// can gracefully close after producing transaction frames if none of these
-// have successfully landed on chain.
-func ChannelManagerCloseAllTxsFailed(t *testing.T, batchType uint) {
-	require := require.New(t)
-	rng := rand.New(rand.NewSource(1357))
-	log := testlog.Logger(t, log.LevelCrit)
-	cfg := channelManagerTestConfig(100, batchType)
-	cfg.TargetNumFrames = 1000
-	cfg.InitNoneCompressor()
-	m := NewChannelManager(log, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
-	m.Clear(eth.BlockID{})
-
-	a := derivetest.RandomL2BlockWithChainId(rng, 1000, defaultTestRollupConfig.L2ChainID)
-
-	err := m.AddL2Block(a)
-	require.NoError(err, "Failed to add L2 block")
-
-	drainTxData := func() (txdatas []txData) {
-		for {
-			txdata, err := m.TxData(eth.BlockID{})
-			if err == io.EOF {
-				return
-			}
-			require.NoError(err, "Expected channel manager to produce valid tx data")
-			txdatas = append(txdatas, txdata)
-		}
-	}
-
-	txdatas := drainTxData()
-	require.NotEmpty(txdatas)
-
-	for _, txdata := range txdatas {
-		m.TxFailed(txdata.ID())
-	}
-
-	// Show that this data will continue to be emitted as long as the transaction
-	// fails and the channel manager is not closed
-	txdatas1 := drainTxData()
-	require.NotEmpty(txdatas)
-	require.ElementsMatch(txdatas, txdatas1, "expected same txdatas on re-attempt")
-
-	for _, txdata := range txdatas1 {
-		m.TxFailed(txdata.ID())
-	}
-
-	require.NoError(m.Close(), "Expected to close channel manager gracefully")
-
-	_, err = m.TxData(eth.BlockID{})
-	require.ErrorIs(err, io.EOF, "Expected closed channel manager to produce no more tx data")
-}
-
 func TestChannelManager_ChannelCreation(t *testing.T) {
 	l := testlog.Logger(t, log.LevelCrit)
 	const maxChannelDuration = 15
@@ -543,10 +324,12 @@ func TestChannelManager_TxData(t *testing.T) {
 
 		// * One when the channelManager was created
 		// * One when the channel is about to be submitted
-		// * Potentially one more if the replacement channel is about to be submitted,
-		//   this only happens when going from calldata->blobs because
-		//   the channel is no longer ready to send until more data
-		//   is added.
+		// * Potentially one more when the replacement channel
+		//   is not immediately ready to be submitted, but later
+		//   becomes ready after more data is added.
+		//   This only happens when going from calldata->blobs because
+		//   the channel is not immediately ready to send until more data
+		//   is added due to blob channels having greater capacity.
 		numExpectedAssessments int
 	}
 
@@ -591,7 +374,7 @@ func TestChannelManager_TxData(t *testing.T) {
 			// we get some data to submit
 			var data txData
 			for {
-				m.blocks = []*types.Block{blockA}
+				m.blocks = append(m.blocks, blockA)
 				data, err = m.TxData(eth.BlockID{})
 				if err == nil && data.Len() > 0 {
 					break
@@ -609,16 +392,15 @@ func TestChannelManager_TxData(t *testing.T) {
 
 }
 
-// TestChannelManager_Requeue seeds the channel manager with blocks,
+// TestChannelManager_handleChannelInvalidated seeds the channel manager with blocks,
 // takes a state snapshot, triggers the blocks->channels pipeline,
-// and then calls Requeue. Finally, it asserts the channel manager's
-// state is equal to the snapshot. It repeats this for a channel
-// which has a pending transaction and verifies that Requeue is then
-// a noop.
-func TestChannelManager_Requeue(t *testing.T) {
+// and then calls handleChannelInvalidated. It asserts on the final state of
+// the channel manager.
+func TestChannelManager_handleChannelInvalidated(t *testing.T) {
 	l := testlog.Logger(t, log.LevelCrit)
 	cfg := channelManagerTestConfig(100, derive.SingularBatchType)
-	m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
+	metrics := new(metrics.TestMetrics)
+	m := NewChannelManager(l, metrics, cfg, defaultTestRollupConfig)
 
 	// Seed channel manager with blocks
 	rng := rand.New(rand.NewSource(99))
@@ -631,50 +413,197 @@ func TestChannelManager_Requeue(t *testing.T) {
 	m.blocks = stateSnapshot
 	require.Empty(t, m.channelQueue)
 
+	// Place an old channel in the queue.
+	// This channel should not be affected by
+	// a requeue or a later channel timing out.
+	oldChannel := newChannel(l, nil, m.defaultCfg, defaultTestRollupConfig, 0, nil)
+	oldChannel.Close()
+	m.channelQueue = []*channel{oldChannel}
+	require.Len(t, m.channelQueue, 1)
+
+	// Setup initial metrics
+	metrics.RecordL2BlockInPendingQueue(blockA)
+	metrics.RecordL2BlockInPendingQueue(blockB)
+	pendingBytesBefore := metrics.PendingBlocksBytesCurrent
+
 	// Trigger the blocks -> channelQueue data pipelining
 	require.NoError(t, m.ensureChannelWithSpace(eth.BlockID{}))
-	require.NotEmpty(t, m.channelQueue)
+	require.Len(t, m.channelQueue, 2)
 	require.NoError(t, m.processBlocks())
 
 	// Assert that at least one block was processed into the channel
-	require.NotContains(t, m.blocks, blockA)
+	require.Equal(t, 1, m.blockCursor)
 
-	l1OriginBeforeRequeue := m.l1OriginLastSubmittedChannel
+	// Check metric decreased
+	metricsDelta := metrics.PendingBlocksBytesCurrent - pendingBytesBefore
+	require.Negative(t, metricsDelta)
 
-	// Call the function we are testing
-	m.Requeue(m.defaultCfg)
+	l1OriginBefore := m.l1OriginLastSubmittedChannel
+
+	m.handleChannelInvalidated(m.currentChannel)
 
 	// Ensure we got back to the state above
 	require.Equal(t, m.blocks, stateSnapshot)
-	require.Empty(t, m.channelQueue)
+	require.Contains(t, m.channelQueue, oldChannel)
+	require.Len(t, m.channelQueue, 1)
+
+	// Check metric came back up to previous value
+	require.Equal(t, pendingBytesBefore, metrics.PendingBlocksBytesCurrent)
 
 	// Ensure the l1OridingLastSubmittedChannel was
 	// not changed. This ensures the next channel
 	// has its duration timeout deadline computed
 	// properly.
-	require.Equal(t, l1OriginBeforeRequeue, m.l1OriginLastSubmittedChannel)
+	require.Equal(t, l1OriginBefore, m.l1OriginLastSubmittedChannel)
 
 	// Trigger the blocks -> channelQueue data pipelining again
 	require.NoError(t, m.ensureChannelWithSpace(eth.BlockID{}))
 	require.NotEmpty(t, m.channelQueue)
 	require.NoError(t, m.processBlocks())
+}
 
-	// Assert that at least one block was processed into the channel
-	require.NotContains(t, m.blocks, blockA)
+func TestChannelManager_PruneBlocks(t *testing.T) {
+	l := testlog.Logger(t, log.LevelDebug)
+	cfg := channelManagerTestConfig(100, derive.SingularBatchType)
+	m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
+
+	a := types.NewBlock(&types.Header{
+		Number: big.NewInt(0),
+	}, nil, nil, nil)
+	b := types.NewBlock(&types.Header{ // This will shortly become the safe head
+		Number:     big.NewInt(1),
+		ParentHash: a.Hash(),
+	}, nil, nil, nil)
+	c := types.NewBlock(&types.Header{
+		Number:     big.NewInt(2),
+		ParentHash: b.Hash(),
+	}, nil, nil, nil)
+
+	require.NoError(t, m.AddL2Block(a))
+	m.blockCursor += 1
+	require.NoError(t, m.AddL2Block(b))
+	m.blockCursor += 1
+	require.NoError(t, m.AddL2Block(c))
+	m.blockCursor += 1
+
+	// Normal path
+	m.pruneSafeBlocks(eth.L2BlockRef{
+		Hash:   b.Hash(),
+		Number: b.NumberU64(),
+	})
+	require.Equal(t, queue.Queue[*types.Block]{c}, m.blocks)
+
+	// Safe chain didn't move, nothing to prune
+	m.pruneSafeBlocks(eth.L2BlockRef{
+		Hash:   b.Hash(),
+		Number: b.NumberU64(),
+	})
+	require.Equal(t, queue.Queue[*types.Block]{c}, m.blocks)
+
+	// Safe chain moved beyond the blocks we had
+	// state should be cleared
+	m.pruneSafeBlocks(eth.L2BlockRef{
+		Hash:   c.Hash(),
+		Number: uint64(99),
+	})
+	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
+
+	// No blocks to prune, NOOP
+	m.pruneSafeBlocks(eth.L2BlockRef{
+		Hash:   c.Hash(),
+		Number: c.NumberU64(),
+	})
+	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
+
+	// Put another block in
+	d := types.NewBlock(&types.Header{
+		Number:     big.NewInt(3),
+		ParentHash: c.Hash(),
+	}, nil, nil, nil)
+	require.NoError(t, m.AddL2Block(d))
+	m.blockCursor += 1
+
+	// Safe chain reorg
+	// state should be cleared
+	m.pruneSafeBlocks(eth.L2BlockRef{
+		Hash:   a.Hash(),
+		Number: uint64(3),
+	})
+	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
+
+	// Put another block in
+	require.NoError(t, m.AddL2Block(d))
+	m.blockCursor += 1
+
+	// Safe chain reversed
+	// state should be cleared
+	m.pruneSafeBlocks(eth.L2BlockRef{
+		Hash:   a.Hash(), // unused
+		Number: uint64(1),
+	})
+	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
+
+}
+
+func TestChannelManager_PruneChannels(t *testing.T) {
+	l := testlog.Logger(t, log.LevelCrit)
+	cfg := channelManagerTestConfig(100, derive.SingularBatchType)
+	cfg.InitNoneCompressor()
+	m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
 
-	// Now mark the 0th channel in the queue as already
-	// starting to send on chain
-	channel0 := m.channelQueue[0]
-	channel0.pendingTransactions["foo"] = txData{}
-	require.False(t, channel0.NoneSubmitted())
+	A, err := newChannelWithChannelOut(l, metrics.NoopMetrics, cfg, m.rollupCfg, 0)
+	require.NoError(t, err)
+	B, err := newChannelWithChannelOut(l, metrics.NoopMetrics, cfg, m.rollupCfg, 0)
+	require.NoError(t, err)
+	C, err := newChannelWithChannelOut(l, metrics.NoopMetrics, cfg, m.rollupCfg, 0)
+	require.NoError(t, err)
+
+	m.channelQueue = []*channel{A, B, C}
+
+	numTx := 1
+	rng := rand.New(rand.NewSource(123))
+	a0 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
+	a0 = a0.WithSeal(&types.Header{Number: big.NewInt(0)})
+	a1 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
+	a1 = a1.WithSeal(&types.Header{Number: big.NewInt(1)})
+	b2 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
+	b2 = b2.WithSeal(&types.Header{Number: big.NewInt(2)})
+	b3 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
+	b3 = b3.WithSeal(&types.Header{Number: big.NewInt(3)})
+	c4 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
+	c4 = c4.WithSeal(&types.Header{Number: big.NewInt(4)})
+
+	_, err = A.AddBlock(a0)
+	require.NoError(t, err)
+	_, err = A.AddBlock(a1)
+	require.NoError(t, err)
+
+	_, err = B.AddBlock(b2)
+	require.NoError(t, err)
+	_, err = B.AddBlock(b3)
+	require.NoError(t, err)
+
+	_, err = C.AddBlock(c4)
+	require.NoError(t, err)
+
+	m.pruneChannels(eth.L2BlockRef{
+		Number: uint64(3),
+	})
 
-	// Call the function we are testing
-	m.Requeue(m.defaultCfg)
+	require.Equal(t, []*channel{C}, m.channelQueue)
+
+	m.pruneChannels(eth.L2BlockRef{
+		Number: uint64(4),
+	})
+
+	require.Equal(t, []*channel{}, m.channelQueue)
+
+	m.pruneChannels(eth.L2BlockRef{
+		Number: uint64(4),
+	})
 
-	// The requeue shouldn't affect the pending channel
-	require.Contains(t, m.channelQueue, channel0)
+	require.Equal(t, []*channel{}, m.channelQueue)
 
-	require.NotContains(t, m.blocks, blockA)
 }
 func TestChannelManager_ChannelOutFactory(t *testing.T) {
 	type ChannelOutWrapper struct {
diff --git a/op-batcher/batcher/channel_test.go b/op-batcher/batcher/channel_test.go
index 0aad780131c7..b36ce9311bce 100644
--- a/op-batcher/batcher/channel_test.go
+++ b/op-batcher/batcher/channel_test.go
@@ -113,7 +113,7 @@ func TestChannelManager_NextTxData(t *testing.T) {
 			frameNumber: uint16(0),
 		},
 	}
-	channel.channelBuilder.PushFrames(frame)
+	channel.channelBuilder.frames = append(channel.channelBuilder.frames, frame)
 	require.Equal(t, 1, channel.PendingFrames())
 
 	// Now the nextTxData function should return the frame
@@ -142,7 +142,7 @@ func TestChannel_NextTxData_singleFrameTx(t *testing.T) {
 
 	mockframes := makeMockFrameDatas(chID, n+1)
 	// put multiple frames into channel, but less than target
-	ch.channelBuilder.PushFrames(mockframes[:n-1]...)
+	ch.channelBuilder.frames = mockframes[:n-1]
 
 	requireTxData := func(i int) {
 		require.True(ch.HasTxData(), "expected tx data %d", i)
@@ -160,7 +160,7 @@ func TestChannel_NextTxData_singleFrameTx(t *testing.T) {
 	require.False(ch.HasTxData())
 
 	// put in last two
-	ch.channelBuilder.PushFrames(mockframes[n-1 : n+1]...)
+	ch.channelBuilder.frames = append(ch.channelBuilder.frames, mockframes[n-1:n+1]...)
 	for i := n - 1; i < n+1; i++ {
 		requireTxData(i)
 	}
@@ -183,11 +183,11 @@ func TestChannel_NextTxData_multiFrameTx(t *testing.T) {
 
 	mockframes := makeMockFrameDatas(chID, n+1)
 	// put multiple frames into channel, but less than target
-	ch.channelBuilder.PushFrames(mockframes[:n-1]...)
+	ch.channelBuilder.frames = append(ch.channelBuilder.frames, mockframes[:n-1]...)
 	require.False(ch.HasTxData())
 
 	// put in last two
-	ch.channelBuilder.PushFrames(mockframes[n-1 : n+1]...)
+	ch.channelBuilder.frames = append(ch.channelBuilder.frames, mockframes[n-1:n+1]...)
 	require.True(ch.HasTxData())
 	txdata := ch.NextTxData()
 	require.Len(txdata.frames, n)
@@ -240,7 +240,8 @@ func TestChannelTxConfirmed(t *testing.T) {
 			frameNumber: uint16(0),
 		},
 	}
-	m.currentChannel.channelBuilder.PushFrames(frame)
+	m.currentChannel.channelBuilder.frames = append(m.currentChannel.channelBuilder.frames, frame)
+
 	require.Equal(t, 1, m.currentChannel.PendingFrames())
 	returnedTxData, err := m.nextTxData(m.currentChannel)
 	expectedTxData := singleFrameTxData(frame)
@@ -291,7 +292,7 @@ func TestChannelTxFailed(t *testing.T) {
 			frameNumber: uint16(0),
 		},
 	}
-	m.currentChannel.channelBuilder.PushFrames(frame)
+	m.currentChannel.channelBuilder.frames = append(m.currentChannel.channelBuilder.frames, frame)
 	require.Equal(t, 1, m.currentChannel.PendingFrames())
 	returnedTxData, err := m.nextTxData(m.currentChannel)
 	expectedTxData := singleFrameTxData(frame)
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 6e237b176d8d..2c9db3821e3a 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"math"
 	"math/big"
 	_ "net/http/pprof"
 	"sync"
@@ -241,11 +240,12 @@ func (l *BatchSubmitter) StopBatchSubmitting(ctx context.Context) error {
 //  2. Check if the sync status is valid or if we are all the way up to date
 //  3. Check if it needs to initialize state OR it is lagging (todo: lagging just means race condition?)
 //  4. Load all new blocks into the local state.
+//  5. Dequeue blocks from local state which are now safe.
 //
 // If there is a reorg, it will reset the last stored block but not clear the internal state so
 // the state can be flushed to L1.
-func (l *BatchSubmitter) loadBlocksIntoState(ctx context.Context) error {
-	start, end, err := l.calculateL2BlockRangeToStore(ctx)
+func (l *BatchSubmitter) loadBlocksIntoState(syncStatus eth.SyncStatus, ctx context.Context) error {
+	start, end, err := l.calculateL2BlockRangeToStore(syncStatus)
 	if err != nil {
 		l.Log.Warn("Error calculating L2 block range", "err", err)
 		return err
@@ -308,12 +308,10 @@ func (l *BatchSubmitter) loadBlockIntoState(ctx context.Context, blockNumber uin
 	return block, nil
 }
 
-// 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) {
+func (l *BatchSubmitter) getSyncStatus(ctx context.Context) (*eth.SyncStatus, error) {
 	rollupClient, err := l.EndpointProvider.RollupClient(ctx)
 	if err != nil {
-		return eth.BlockID{}, eth.BlockID{}, fmt.Errorf("getting rollup client: %w", err)
+		return nil, fmt.Errorf("getting rollup client: %w", err)
 	}
 
 	var (
@@ -331,7 +329,7 @@ func (l *BatchSubmitter) calculateL2BlockRangeToStore(ctx context.Context) (eth.
 
 		// Ensure that we have the sync status
 		if err != nil {
-			return eth.BlockID{}, eth.BlockID{}, fmt.Errorf("failed to get sync status: %w", err)
+			return nil, fmt.Errorf("failed to get sync status: %w", err)
 		}
 
 		// If we have a head, break out of the loop
@@ -348,10 +346,21 @@ func (l *BatchSubmitter) calculateL2BlockRangeToStore(ctx context.Context) (eth.
 			// Reset timer to tick of the new backoff time again
 			timer.Reset(backoff)
 		case <-ctx.Done():
-			return eth.BlockID{}, eth.BlockID{}, ctx.Err()
+			return nil, ctx.Err()
 		}
 	}
 
+	return syncStatus, nil
+}
+
+// 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
+// as well as garbage collecting blocks which became safe)
+func (l *BatchSubmitter) calculateL2BlockRangeToStore(syncStatus eth.SyncStatus) (eth.BlockID, eth.BlockID, error) {
+	if syncStatus.HeadL1 == (eth.L1BlockRef{}) {
+		return eth.BlockID{}, eth.BlockID{}, errors.New("empty sync status")
+	}
+
 	// Check last stored to see if it needs to be set on startup OR set if is lagged behind.
 	// It lagging implies that the op-node processed some batches that were submitted prior to the current instance of the batcher being alive.
 	if l.lastStoredBlock == (eth.BlockID{}) {
@@ -430,65 +439,36 @@ func (l *BatchSubmitter) loop() {
 	ticker := time.NewTicker(l.Config.PollInterval)
 	defer ticker.Stop()
 
-	publishAndWait := func() {
-		l.publishStateToL1(queue, receiptsCh, daGroup, time.Duration(math.MaxInt64))
-		if !l.Txmgr.IsClosed() {
-			if l.Config.UseAltDA {
-				l.Log.Info("Waiting for altDA writes to complete...")
-				err := daGroup.Wait()
-				if err != nil {
-					l.Log.Error("Error returned by one of the altda goroutines waited on", "err", err)
-				}
-			}
-			l.Log.Info("Waiting for L1 txs to be confirmed...")
-			err := queue.Wait()
-			if err != nil {
-				l.Log.Error("Error returned by one of the txmgr goroutines waited on", "err", err)
-			}
-		} else {
-			l.Log.Info("Txmgr is closed, remaining channel data won't be sent")
-		}
-	}
-
 	for {
 		select {
 		case <-ticker.C:
+
 			if !l.checkTxpool(queue, receiptsCh) {
 				continue
 			}
-			if err := l.loadBlocksIntoState(l.shutdownCtx); errors.Is(err, ErrReorg) {
-				err := l.state.Close()
+
+			syncStatus, err := l.getSyncStatus(l.shutdownCtx)
+			if err != nil {
+				l.Log.Warn("could not get sync status", "err", err)
+				continue
+			}
+
+			l.state.pruneSafeBlocks(syncStatus.SafeL2)
+			l.state.pruneChannels(syncStatus.SafeL2)
+			if err := l.loadBlocksIntoState(*syncStatus, l.shutdownCtx); errors.Is(err, ErrReorg) {
+				// Wait for any in flight transactions
+				// to be ingested by the node before
+				// we start loading blocks again.
+				err := l.waitNodeSync()
 				if err != nil {
-					if errors.Is(err, ErrPendingAfterClose) {
-						l.Log.Warn("Closed channel manager to handle L2 reorg with pending channel(s) remaining - submitting")
-					} else {
-						l.Log.Error("Error closing the channel manager to handle a L2 reorg", "err", err)
-					}
+					l.Log.Warn("error waiting for node sync", "err", err)
 				}
-				// on reorg we want to publish all pending state then wait until each result clears before resetting
-				// the state.
-				publishAndWait()
 				l.clearState(l.shutdownCtx)
 				continue
 			}
 			l.publishStateToL1(queue, receiptsCh, daGroup, l.Config.PollInterval)
 		case <-l.shutdownCtx.Done():
-			if l.Txmgr.IsClosed() {
-				l.Log.Info("Txmgr is closed, remaining channel data won't be sent")
-				return
-			}
-			// This removes any never-submitted pending channels, so these do not have to be drained with transactions.
-			// Any remaining unfinished channel is terminated, so its data gets submitted.
-			err := l.state.Close()
-			if err != nil {
-				if errors.Is(err, ErrPendingAfterClose) {
-					l.Log.Warn("Closed channel manager on shutdown with pending channel(s) remaining - submitting")
-				} else {
-					l.Log.Error("Error closing the channel manager on shutdown", "err", err)
-				}
-			}
-			publishAndWait()
-			l.Log.Info("Finished publishing all remaining channel data")
+			l.Log.Warn("main loop returning")
 			return
 		}
 	}
diff --git a/op-batcher/metrics/test.go b/op-batcher/metrics/test.go
new file mode 100644
index 000000000000..76c365ea7e2b
--- /dev/null
+++ b/op-batcher/metrics/test.go
@@ -0,0 +1,22 @@
+package metrics
+
+import (
+	"github.com/ethereum/go-ethereum/core/types"
+)
+
+type TestMetrics struct {
+	noopMetrics
+	PendingBlocksBytesCurrent float64
+}
+
+var _ Metricer = new(TestMetrics)
+
+func (m *TestMetrics) RecordL2BlockInPendingQueue(block *types.Block) {
+	_, rawSize := estimateBatchSize(block)
+	m.PendingBlocksBytesCurrent += float64(rawSize)
+
+}
+func (m *TestMetrics) RecordL2BlockInChannel(block *types.Block) {
+	_, rawSize := estimateBatchSize(block)
+	m.PendingBlocksBytesCurrent -= float64(rawSize)
+}
diff --git a/op-batcher/readme.md b/op-batcher/readme.md
new file mode 100644
index 000000000000..1d601fea94be
--- /dev/null
+++ b/op-batcher/readme.md
@@ -0,0 +1,69 @@
+# op-batcher
+
+The `op-batcher` is responsible for ensuring data availability. See the [specs](https://specs.optimism.io/protocol/batcher.html).
+
+
+## Interactions & Dependencies
+The `op-batcher` works together with the [sequencer](../op-node/) (which it reads unsafe blocks from), the data availability layer (e.g. Layer 1 or an [Alt DA](../op-alt-da/) layer, which it posts data to), and the [derivation pipeline](../op-node/) (which reads the data from the DA layer and progresses the safe chain).
+
+It depends directly on some code shared with the derivation pipeline, namely the [`ChannelOut`](../op-node/rollup/derive/channel_out.go) implementation(s). It also depends directly on the shared [txmgr](../op-service/txmgr/) module.
+
+## Testing
+The batcher has a suite of unit test which can be triggered by running
+```
+go test ./...
+```
+from this directory. There are also end-to-end tests in [`op-e2e`](../op-e2e/) which integrate the batcher.
+
+## Architecture
+
+The architecture of this batcher implementation is shown on the left side of the following diagram:
+
+![architecture](./architecture.png)
+
+Batch submitting (writing to the DA layer, in the middle of the diagram) works together with the derivation pipeline (on the right side of the diagram, reading from the DA layer) to progress the safe chain.
+
+The philosophy behind the current architecture is:
+* Blocks, channels and frames are kept around for as long as they might be needed, and discarded as soon as they are not needed. They are not moved from one part of state to another.
+* We retain block data in a strict order for as long as necessary. We only garbage collect frames, channels and blocks when the safe head moves sufficiently and those structures have done their job.
+* When something goes wrong, we rewind the state cursors by the minimal amount we need to get going again.
+
+
+### Happy path
+
+In the happy path, the batcher periodically:
+1. Enqueues unsafe blocks and dequeues safe blocks from the sequencer to its internal state.
+2. Enqueues a new channel, if necessary.
+3. Processes some unprocessed blocks into the current channel, triggers the compression of the block data and the creation of frames.
+4. Sends frames from the channel queue to the DA layer as (e.g. to Ethereum L1 as calldata or blob transactions).
+5. If there is more transaction data to send, go to 2. Else wait for a tick and go to 1.
+
+
+The `blockCursor` state variable tracks the next unprocessed block.
+In each channel, the `frameCursor` tracks the next unsent frame.
+
+
+### Reorgs
+When an L2 unsafe reorg is detected, the batch submitter will reset its state, and wait for any in flight transactions to be ingested by the verifier nodes before starting work again.
+
+### Tx Failed
+When a Tx fails, an asynchronous receipts handler is triggered. The channel from whence the Tx's frames came has its `frameCursor` rewound, so that all the frames can be resubmitted in order.
+
+### Channel Times Out
+When at Tx is confirmed, an asynchronous receipts handler is triggered. We only update the batcher's state if the channel timed out on chain. In that case, the `blockCursor` is rewound to the first block added to that channel, and the channel queue is cleared out. This allows the batcher to start fresh building a new channel starting from the same block -- it does not need to refetch blocks from the sequencer.
+
+## Design Principles and Optimization Targets
+At the current time, the batcher should be optimized for correctness, simplicity and robustness. It is considered preferable to prioritize these properties, even at the expense of other potentially desirable properties such as frugality. For example, it is preferable to have the batcher resubmit some data from time to time ("wasting" money on data availability costs) instead of avoiding that by e.g. adding some persistent state to the batcher.
+
+The batcher can almost always recover from unforeseen situations by being restarted.
+
+
+Some complexity is permitted, however, for handling data availability switching, so that the batcher is not wasting money for longer periods of time.
+
+## Known issues and future work
+
+Link to [open issues with the `op-batcher` tag](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aopen+is%3Aissue+label%3AA-op-batcher).
+
+The batcher launches L1 transactions in parallel so that it can achieve higher throughput, particularly in situations where there is a large backlog of data which needs to be posted. Sometimes, transactions can get stuck in the L1 mempool. The batcher does have functionality to clear these stuck transactions, but it is not completely reliable.
+
+The automatic data availability switching behavior is a somewhat new feature which may still have some bugs in it.

From 01559d2ea3242f200adad77dec8797120ffe929d Mon Sep 17 00:00:00 2001
From: soyboy <85043086+sbvegan@users.noreply.github.com>
Date: Mon, 18 Nov 2024 18:38:12 +0800
Subject: [PATCH 194/451] adding conduit bootnodes (#12534)

* removing duplicate default bootnode

* adding conduit bootnodes

* removing duplicate bootnode
---
 op-node/p2p/config.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/op-node/p2p/config.go b/op-node/p2p/config.go
index ee21ba20fc39..10a75881b87d 100644
--- a/op-node/p2p/config.go
+++ b/op-node/p2p/config.go
@@ -29,7 +29,6 @@ var DefaultBootnodes = []*enode.Node{
 	// OP Labs
 	enode.MustParse("enode://869d07b5932f17e8490990f75a3f94195e9504ddb6b85f7189e5a9c0a8fff8b00aecf6f3ac450ecba6cdabdb5858788a94bde2b613e0f2d82e9b395355f76d1a@34.65.67.101:30305"),
 	enode.MustParse("enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:30305"),
-	enode.MustParse("enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305"),
 	// Base
 	enode.MustParse("enr:-J24QNz9lbrKbN4iSmmjtnr7SjUMk4zB7f1krHZcTZx-JRKZd0kA2gjufUROD6T3sOWDVDnFJRvqBBo62zuF-hYCohOGAYiOoEyEgmlkgnY0gmlwhAPniryHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQKNVFlCxh_B-716tTs-h1vMzZkSs1FTu_OYTNjgufplG4N0Y3CCJAaDdWRwgiQG"),
 	enode.MustParse("enr:-J24QH-f1wt99sfpHy4c0QJM-NfmsIfmlLAMMcgZCUEgKG_BBYFc6FwYgaMJMQN5dsRBJApIok0jFn-9CS842lGpLmqGAYiOoDRAgmlkgnY0gmlwhLhIgb2Hb3BzdGFja4OFQgCJc2VjcDI1NmsxoQJ9FTIv8B9myn1MWaC_2lJ-sMoeCDkusCsk4BYHjjCq04N0Y3CCJAaDdWRwgiQG"),
@@ -37,7 +36,9 @@ var DefaultBootnodes = []*enode.Node{
 	enode.MustParse("enr:-J24QHmGyBwUZXIcsGYMaUqGGSl4CFdx9Tozu-vQCn5bHIQbR7On7dZbU61vYvfrJr30t0iahSqhc64J46MnUO2JvQaGAYiOoCKKgmlkgnY0gmlwhAPnCzSHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQINc4fSijfbNIiGhcgvwjsjxVFJHUstK9L1T8OTKUjgloN0Y3CCJAaDdWRwgiQG"),
 	enode.MustParse("enr:-J24QG3ypT4xSu0gjb5PABCmVxZqBjVw9ca7pvsI8jl4KATYAnxBmfkaIuEqy9sKvDHKuNCsy57WwK9wTt2aQgcaDDyGAYiOoGAXgmlkgnY0gmlwhDbGmZaHb3BzdGFja4OFQgCJc2VjcDI1NmsxoQIeAK_--tcLEiu7HvoUlbV52MspE0uCocsx1f_rYvRenIN0Y3CCJAaDdWRwgiQG"),
 	// Conduit
-	enode.MustParse("enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:30305"),
+	enode.MustParse("enode://d25ce99435982b04d60c4b41ba256b84b888626db7bee45a9419382300fbe907359ae5ef250346785bff8d3b9d07cd3e017a27e2ee3cfda3bcbb0ba762ac9674@bootnode.conduit.xyz:0?discport=30301"),
+	enode.MustParse("enode://2d4e7e9d48f4dd4efe9342706dd1b0024681bd4c3300d021f86fc75eab7865d4e0cbec6fbc883f011cfd6a57423e7e2f6e104baad2b744c3cafaec6bc7dc92c1@34.65.43.171:0?discport=30305"),
+	enode.MustParse("enode://9d7a3efefe442351217e73b3a593bcb8efffb55b4807699972145324eab5e6b382152f8d24f6301baebbfb5ecd4127bd3faab2842c04cd432bdf50ba092f6645@34.65.109.126:0?discport=30305"),
 }
 
 type HostMetrics interface {

From fd427154f66938505c9c5e7a28feebadf0002a09 Mon Sep 17 00:00:00 2001
From: Chen Kai <281165273grape@gmail.com>
Date: Mon, 18 Nov 2024 23:31:57 +0800
Subject: [PATCH 195/451] cannon: Add more concurrency primitives tests 
 (#12771)

* feat:Add more sync tests

Signed-off-by: Chen Kai <281165273grape@gmail.com>

* feat:add more sync tests

Signed-off-by: Chen Kai <281165273grape@gmail.com>

* fix:fix failed tests

Signed-off-by: Chen Kai <281165273grape@gmail.com>

* fix:add copyright credit and remove unused code

Signed-off-by: Chen Kai <281165273grape@gmail.com>

* fix:fix copyright format

Signed-off-by: Chen Kai <281165273grape@gmail.com>

* fix code review suggestions

Signed-off-by: Chen Kai <281165273grape@gmail.com>

---------

Signed-off-by: Chen Kai <281165273grape@gmail.com>
---
 .../multithreaded/instrumented_test.go        |  99 ++++--
 .../example/{multithreaded => mt-cond}/go.mod |   2 +-
 cannon/testdata/example/mt-cond/main.go       | 302 ++++++++++++++++++
 cannon/testdata/example/mt-map/go.mod         |   5 +
 cannon/testdata/example/mt-map/main.go        |  43 +++
 cannon/testdata/example/mt-mutex/go.mod       |   5 +
 cannon/testdata/example/mt-mutex/main.go      |  82 +++++
 cannon/testdata/example/mt-once/go.mod        |   5 +
 cannon/testdata/example/mt-once/main.go       |  98 ++++++
 cannon/testdata/example/mt-pool/go.mod        |   5 +
 cannon/testdata/example/mt-pool/main.go       |  38 +++
 cannon/testdata/example/mt-rwmutex/go.mod     |   5 +
 cannon/testdata/example/mt-rwmutex/main.go    | 226 +++++++++++++
 cannon/testdata/example/mt-wg/go.mod          |   5 +
 .../example/{multithreaded => mt-wg}/main.go  |   6 -
 15 files changed, 901 insertions(+), 25 deletions(-)
 rename cannon/testdata/example/{multithreaded => mt-cond}/go.mod (58%)
 create mode 100644 cannon/testdata/example/mt-cond/main.go
 create mode 100644 cannon/testdata/example/mt-map/go.mod
 create mode 100644 cannon/testdata/example/mt-map/main.go
 create mode 100644 cannon/testdata/example/mt-mutex/go.mod
 create mode 100644 cannon/testdata/example/mt-mutex/main.go
 create mode 100644 cannon/testdata/example/mt-once/go.mod
 create mode 100644 cannon/testdata/example/mt-once/main.go
 create mode 100644 cannon/testdata/example/mt-pool/go.mod
 create mode 100644 cannon/testdata/example/mt-pool/main.go
 create mode 100644 cannon/testdata/example/mt-rwmutex/go.mod
 create mode 100644 cannon/testdata/example/mt-rwmutex/main.go
 create mode 100644 cannon/testdata/example/mt-wg/go.mod
 rename cannon/testdata/example/{multithreaded => mt-wg}/main.go (79%)

diff --git a/cannon/mipsevm/multithreaded/instrumented_test.go b/cannon/mipsevm/multithreaded/instrumented_test.go
index ec079e50c8ce..6c8fade9ff53 100644
--- a/cannon/mipsevm/multithreaded/instrumented_test.go
+++ b/cannon/mipsevm/multithreaded/instrumented_test.go
@@ -36,27 +36,90 @@ func TestInstrumentedState_Claim(t *testing.T) {
 
 func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 	t.Parallel()
-	state, _ := testutil.LoadELFProgram(t, testutil.ProgramPath("multithreaded"), CreateInitialState, false)
-	oracle := testutil.StaticOracle(t, []byte{})
-
-	var stdOutBuf, stdErrBuf bytes.Buffer
-	us := NewInstrumentedState(state, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger(), nil)
-	for i := 0; i < 2_000_000; i++ {
-		if us.GetState().GetExited() {
-			break
-		}
-		_, err := us.Step(false)
-		require.NoError(t, err)
+	cases := []struct {
+		name           string
+		expectedOutput []string
+		programName    string
+	}{
+		{
+			name: "wg and chan test",
+			expectedOutput: []string{
+				"waitgroup result: 42",
+				"channels result: 1234",
+			},
+			programName: "mt-wg",
+		},
+		{
+			name: "mutex test",
+			expectedOutput: []string{
+				"Mutex test passed",
+			},
+			programName: "mt-mutex",
+		},
+		{
+			name: "cond test",
+			expectedOutput: []string{
+				"Cond test passed",
+			},
+			programName: "mt-cond",
+		},
+		{
+			name: "rwmutex test",
+			expectedOutput: []string{
+				"RWMutex test passed",
+			},
+			programName: "mt-rwmutex",
+		},
+		{
+			name: "once test",
+			expectedOutput: []string{
+				"Once test passed",
+			},
+			programName: "mt-once",
+		},
+		{
+			name: "map test",
+			expectedOutput: []string{
+				"Map test passed",
+			},
+			programName: "mt-map",
+		},
+		{
+			name: "pool test",
+			expectedOutput: []string{
+				"Pool test passed",
+			},
+			programName: "mt-pool",
+		},
 	}
-	t.Logf("Completed in %d steps", state.Step)
 
-	require.True(t, state.Exited, "must complete program")
-	require.Equal(t, uint8(0), state.ExitCode, "exit with 0")
-	require.Contains(t, "waitgroup result: 42", stdErrBuf.String())
-	require.Contains(t, "channels result: 1234", stdErrBuf.String())
-	require.Equal(t, "", stdErrBuf.String(), "should not print any errors")
-}
+	for _, test := range cases {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			t.Parallel()
+			state, _ := testutil.LoadELFProgram(t, testutil.ProgramPath(test.programName), CreateInitialState, false)
+			oracle := testutil.StaticOracle(t, []byte{})
 
+			var stdOutBuf, stdErrBuf bytes.Buffer
+			us := NewInstrumentedState(state, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger(), nil)
+			for i := 0; i < 5_000_000; i++ {
+				if us.GetState().GetExited() {
+					break
+				}
+				_, err := us.Step(false)
+				require.NoError(t, err)
+			}
+			t.Logf("Completed in %d steps", state.Step)
+
+			require.True(t, state.Exited, "must complete program")
+			require.Equal(t, uint8(0), state.ExitCode, "exit with 0")
+			for _, expected := range test.expectedOutput {
+				require.Contains(t, stdOutBuf.String(), expected)
+			}
+			require.Equal(t, "", stdErrBuf.String(), "should not print any errors")
+		})
+	}
+}
 func TestInstrumentedState_Alloc(t *testing.T) {
 	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
 		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
diff --git a/cannon/testdata/example/multithreaded/go.mod b/cannon/testdata/example/mt-cond/go.mod
similarity index 58%
rename from cannon/testdata/example/multithreaded/go.mod
rename to cannon/testdata/example/mt-cond/go.mod
index e1bdb77a9aff..d6d1853d5af2 100644
--- a/cannon/testdata/example/multithreaded/go.mod
+++ b/cannon/testdata/example/mt-cond/go.mod
@@ -1,4 +1,4 @@
-module multithreaded
+module cond
 
 go 1.22
 
diff --git a/cannon/testdata/example/mt-cond/main.go b/cannon/testdata/example/mt-cond/main.go
new file mode 100644
index 000000000000..2b584cec999b
--- /dev/null
+++ b/cannon/testdata/example/mt-cond/main.go
@@ -0,0 +1,302 @@
+// Portions of this code are derived from code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/400433af3660905ecaceaf19ddad3e6c24b141df/src/sync/cond_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright 2009 The Go Authors.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+package main
+
+import (
+	"fmt"
+	"os"
+	"reflect"
+	"runtime"
+	"sync"
+)
+
+func main() {
+	TestCondSignal()
+	TestCondSignalGenerations()
+	TestCondBroadcast()
+	TestRace()
+	TestCondSignalStealing()
+	TestCondCopy()
+
+	fmt.Println("Cond test passed")
+}
+
+func TestCondSignal() {
+	var m sync.Mutex
+	c := sync.NewCond(&m)
+	n := 2
+	running := make(chan bool, n)
+	awake := make(chan bool, n)
+	for i := 0; i < n; i++ {
+		go func() {
+			m.Lock()
+			running <- true
+			c.Wait()
+			awake <- true
+			m.Unlock()
+		}()
+	}
+	for i := 0; i < n; i++ {
+		<-running // Wait for everyone to run.
+	}
+	for n > 0 {
+		select {
+		case <-awake:
+			_, _ = fmt.Fprintln(os.Stderr, "goroutine not asleep")
+			os.Exit(1)
+		default:
+		}
+		m.Lock()
+		c.Signal()
+		m.Unlock()
+		<-awake // Will deadlock if no goroutine wakes up
+		select {
+		case <-awake:
+			_, _ = fmt.Fprintln(os.Stderr, "too many goroutines awake")
+			os.Exit(1)
+		default:
+		}
+		n--
+	}
+	c.Signal()
+}
+
+func TestCondSignalGenerations() {
+	var m sync.Mutex
+	c := sync.NewCond(&m)
+	n := 100
+	running := make(chan bool, n)
+	awake := make(chan int, n)
+	for i := 0; i < n; i++ {
+		go func(i int) {
+			m.Lock()
+			running <- true
+			c.Wait()
+			awake <- i
+			m.Unlock()
+		}(i)
+		if i > 0 {
+			a := <-awake
+			if a != i-1 {
+				_, _ = fmt.Fprintf(os.Stderr, "wrong goroutine woke up: want %d, got %d\n", i-1, a)
+				os.Exit(1)
+			}
+		}
+		<-running
+		m.Lock()
+		c.Signal()
+		m.Unlock()
+	}
+}
+
+func TestCondBroadcast() {
+	var m sync.Mutex
+	c := sync.NewCond(&m)
+	n := 5
+	running := make(chan int, n)
+	awake := make(chan int, n)
+	exit := false
+	for i := 0; i < n; i++ {
+		go func(g int) {
+			m.Lock()
+			for !exit {
+				running <- g
+				c.Wait()
+				awake <- g
+			}
+			m.Unlock()
+		}(i)
+	}
+	for i := 0; i < n; i++ {
+		for i := 0; i < n; i++ {
+			<-running // Will deadlock unless n are running.
+		}
+		if i == n-1 {
+			m.Lock()
+			exit = true
+			m.Unlock()
+		}
+		select {
+		case <-awake:
+			_, _ = fmt.Fprintln(os.Stderr, "goroutine not asleep")
+			os.Exit(1)
+		default:
+		}
+		m.Lock()
+		c.Broadcast()
+		m.Unlock()
+		seen := make([]bool, n)
+		for i := 0; i < n; i++ {
+			g := <-awake
+			if seen[g] {
+				_, _ = fmt.Fprintln(os.Stderr, "goroutine woke up twice")
+				os.Exit(1)
+			}
+			seen[g] = true
+		}
+	}
+	select {
+	case <-running:
+		_, _ = fmt.Fprintln(os.Stderr, "goroutine still running")
+		os.Exit(1)
+	default:
+	}
+	c.Broadcast()
+}
+
+func TestRace() {
+	x := 0
+	c := sync.NewCond(&sync.Mutex{})
+	done := make(chan bool)
+	go func() {
+		c.L.Lock()
+		x = 1
+		c.Wait()
+		if x != 2 {
+			_, _ = fmt.Fprintln(os.Stderr, "want 2")
+			os.Exit(1)
+		}
+		x = 3
+		c.Signal()
+		c.L.Unlock()
+		done <- true
+	}()
+	go func() {
+		c.L.Lock()
+		for {
+			if x == 1 {
+				x = 2
+				c.Signal()
+				break
+			}
+			c.L.Unlock()
+			runtime.Gosched()
+			c.L.Lock()
+		}
+		c.L.Unlock()
+		done <- true
+	}()
+	go func() {
+		c.L.Lock()
+		for {
+			if x == 2 {
+				c.Wait()
+				if x != 3 {
+					_, _ = fmt.Fprintln(os.Stderr, "want 3")
+					os.Exit(1)
+				}
+				break
+			}
+			if x == 3 {
+				break
+			}
+			c.L.Unlock()
+			runtime.Gosched()
+			c.L.Lock()
+		}
+		c.L.Unlock()
+		done <- true
+	}()
+	<-done
+	<-done
+	<-done
+}
+
+func TestCondSignalStealing() {
+	for iters := 0; iters < 5; iters++ {
+		var m sync.Mutex
+		cond := sync.NewCond(&m)
+
+		// Start a waiter.
+		ch := make(chan struct{})
+		go func() {
+			m.Lock()
+			ch <- struct{}{}
+			cond.Wait()
+			m.Unlock()
+
+			ch <- struct{}{}
+		}()
+
+		<-ch
+		m.Lock()
+		m.Unlock()
+
+		// We know that the waiter is in the cond.Wait() call because we
+		// synchronized with it, then acquired/released the mutex it was
+		// holding when we synchronized.
+		//
+		// Start two goroutines that will race: one will broadcast on
+		// the cond var, the other will wait on it.
+		//
+		// The new waiter may or may not get notified, but the first one
+		// has to be notified.
+		done := false
+		go func() {
+			cond.Broadcast()
+		}()
+
+		go func() {
+			m.Lock()
+			for !done {
+				cond.Wait()
+			}
+			m.Unlock()
+		}()
+
+		// Check that the first waiter does get signaled.
+		<-ch
+
+		// Release the second waiter in case it didn't get the
+		// broadcast.
+		m.Lock()
+		done = true
+		m.Unlock()
+		cond.Broadcast()
+	}
+}
+
+func TestCondCopy() {
+	defer func() {
+		err := recover()
+		if err == nil || err.(string) != "sync.Cond is copied" {
+			_, _ = fmt.Fprintf(os.Stderr, "got %v, expect sync.Cond is copied", err)
+			os.Exit(1)
+		}
+	}()
+	c := sync.Cond{L: &sync.Mutex{}}
+	c.Signal()
+	var c2 sync.Cond
+	reflect.ValueOf(&c2).Elem().Set(reflect.ValueOf(&c).Elem()) // c2 := c, hidden from vet
+	c2.Signal()
+}
diff --git a/cannon/testdata/example/mt-map/go.mod b/cannon/testdata/example/mt-map/go.mod
new file mode 100644
index 000000000000..1d7b890f7f1a
--- /dev/null
+++ b/cannon/testdata/example/mt-map/go.mod
@@ -0,0 +1,5 @@
+module map
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/example/mt-map/main.go b/cannon/testdata/example/mt-map/main.go
new file mode 100644
index 000000000000..085319b88d87
--- /dev/null
+++ b/cannon/testdata/example/mt-map/main.go
@@ -0,0 +1,43 @@
+package main
+
+import (
+	"fmt"
+	"sync"
+)
+
+func main() {
+	var m sync.Map
+
+	m.Store("hello", "world")
+	m.Store("foo", "bar")
+	m.Store("baz", "qux")
+
+	m.Delete("foo")
+	m.Load("baz")
+
+	go func() {
+		m.CompareAndDelete("hello", "world")
+		m.LoadAndDelete("baz")
+	}()
+
+	var wg sync.WaitGroup
+	for i := 0; i < 100; i++ {
+		wg.Add(1)
+		go func() {
+			m.Load("hello")
+			m.Load("baz")
+			m.Range(func(k, v interface{}) bool {
+				m.Load("hello")
+				m.Load("baz")
+				return true
+			})
+			m.CompareAndSwap("hello", "world", "Go")
+			m.LoadOrStore("hello", "world")
+			wg.Done()
+		}()
+	}
+
+	wg.Wait()
+
+	fmt.Println("Map test passed")
+}
diff --git a/cannon/testdata/example/mt-mutex/go.mod b/cannon/testdata/example/mt-mutex/go.mod
new file mode 100644
index 000000000000..368cf9be0ae5
--- /dev/null
+++ b/cannon/testdata/example/mt-mutex/go.mod
@@ -0,0 +1,5 @@
+module mutex
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/example/mt-mutex/main.go b/cannon/testdata/example/mt-mutex/main.go
new file mode 100644
index 000000000000..4f96e5d2308d
--- /dev/null
+++ b/cannon/testdata/example/mt-mutex/main.go
@@ -0,0 +1,82 @@
+// Portions of this code are derived from code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/400433af3660905ecaceaf19ddad3e6c24b141df/src/sync/mutex_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright 2009 The Go Authors.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+package main
+
+import (
+	"fmt"
+	"os"
+	"sync"
+)
+
+func main() {
+	TestMutex()
+}
+
+func TestMutex() {
+	m := new(sync.Mutex)
+
+	m.Lock()
+	if m.TryLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryLock succeeded with mutex locked")
+		os.Exit(1)
+	}
+	m.Unlock()
+	if !m.TryLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryLock failed with mutex unlocked")
+		os.Exit(1)
+	}
+	m.Unlock()
+
+	c := make(chan bool)
+	for i := 0; i < 10; i++ {
+		go HammerMutex(m, 1000, c)
+	}
+	for i := 0; i < 10; i++ {
+		<-c
+	}
+	fmt.Println("Mutex test passed")
+}
+
+func HammerMutex(m *sync.Mutex, loops int, cdone chan bool) {
+	for i := 0; i < loops; i++ {
+		if i%3 == 0 {
+			if m.TryLock() {
+				m.Unlock()
+			}
+			continue
+		}
+		m.Lock()
+		m.Unlock()
+	}
+	cdone <- true
+}
diff --git a/cannon/testdata/example/mt-once/go.mod b/cannon/testdata/example/mt-once/go.mod
new file mode 100644
index 000000000000..7595e1de483f
--- /dev/null
+++ b/cannon/testdata/example/mt-once/go.mod
@@ -0,0 +1,5 @@
+module once
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/example/mt-once/main.go b/cannon/testdata/example/mt-once/main.go
new file mode 100644
index 000000000000..3be753e2f702
--- /dev/null
+++ b/cannon/testdata/example/mt-once/main.go
@@ -0,0 +1,98 @@
+// Portions of this code are derived from code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/400433af3660905ecaceaf19ddad3e6c24b141df/src/sync/once_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright 2009 The Go Authors.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+package main
+
+import (
+	"fmt"
+	"os"
+	"sync"
+)
+
+func main() {
+	TestOnce()
+	TestOncePanic()
+
+	fmt.Println("Once test passed")
+}
+
+type one int
+
+func (o *one) Increment() {
+	*o++
+}
+
+func run(once *sync.Once, o *one, c chan bool) {
+	once.Do(func() { o.Increment() })
+	if v := *o; v != 1 {
+		_, _ = fmt.Fprintf(os.Stderr, "once failed inside run: %d is not 1\n", v)
+		os.Exit(1)
+	}
+	c <- true
+}
+
+func TestOnce() {
+	o := new(one)
+	once := new(sync.Once)
+	c := make(chan bool)
+	const N = 10
+	for i := 0; i < N; i++ {
+		go run(once, o, c)
+	}
+	for i := 0; i < N; i++ {
+		<-c
+	}
+	if *o != 1 {
+		_, _ = fmt.Fprintf(os.Stderr, "once failed outside run: %d is not 1\n", *o)
+		os.Exit(1)
+	}
+}
+
+func TestOncePanic() {
+	var once sync.Once
+	func() {
+		defer func() {
+			if r := recover(); r == nil {
+				_, _ = fmt.Fprintf(os.Stderr, "Once.Do did not panic")
+				os.Exit(1)
+			}
+		}()
+		once.Do(func() {
+			panic("failed")
+		})
+	}()
+
+	once.Do(func() {
+		_, _ = fmt.Fprintf(os.Stderr, "Once.Do called twice")
+		os.Exit(1)
+	})
+}
diff --git a/cannon/testdata/example/mt-pool/go.mod b/cannon/testdata/example/mt-pool/go.mod
new file mode 100644
index 000000000000..f57bdf9b81e0
--- /dev/null
+++ b/cannon/testdata/example/mt-pool/go.mod
@@ -0,0 +1,5 @@
+module pool
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/example/mt-pool/main.go b/cannon/testdata/example/mt-pool/main.go
new file mode 100644
index 000000000000..267710f3ea3a
--- /dev/null
+++ b/cannon/testdata/example/mt-pool/main.go
@@ -0,0 +1,38 @@
+package main
+
+import (
+	"fmt"
+	"sync"
+)
+
+func main() {
+	var x sync.Pool
+
+	x.Put(1)
+	x.Put(2)
+
+	// try some concurrency!
+	var wg sync.WaitGroup
+	wg.Add(2)
+	go func() {
+		x.Put(3)
+		wg.Done()
+	}()
+	go func() {
+		x.Put(4)
+		wg.Done()
+	}()
+
+	wg.Wait()
+
+	wg.Add(4)
+	for i := 0; i < 4; i++ {
+		go func() {
+			x.Get()
+			wg.Done()
+		}()
+	}
+	wg.Wait()
+
+	fmt.Println("Pool test passed")
+}
diff --git a/cannon/testdata/example/mt-rwmutex/go.mod b/cannon/testdata/example/mt-rwmutex/go.mod
new file mode 100644
index 000000000000..a0a433e91199
--- /dev/null
+++ b/cannon/testdata/example/mt-rwmutex/go.mod
@@ -0,0 +1,5 @@
+module rwmutex
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/example/mt-rwmutex/main.go b/cannon/testdata/example/mt-rwmutex/main.go
new file mode 100644
index 000000000000..8553bba75ef4
--- /dev/null
+++ b/cannon/testdata/example/mt-rwmutex/main.go
@@ -0,0 +1,226 @@
+// Portions of this code are derived from code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/400433af3660905ecaceaf19ddad3e6c24b141df/src/sync/rwmutex_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright 2009 The Go Authors.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google LLC nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+package main
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"sync"
+	"sync/atomic"
+)
+
+func main() {
+	TestParallelReaders()
+	TestRLocker()
+	TestRWMutex()
+
+	fmt.Println("RWMutex test passed")
+}
+
+func parallelReader(m *sync.RWMutex, clocked, cunlock, cdone chan bool) {
+	m.RLock()
+	clocked <- true
+	<-cunlock
+	m.RUnlock()
+	cdone <- true
+}
+
+func doTestParallelReaders(numReaders, gomaxprocs int) {
+	runtime.GOMAXPROCS(gomaxprocs)
+	var m sync.RWMutex
+	clocked := make(chan bool)
+	cunlock := make(chan bool)
+	cdone := make(chan bool)
+	for i := 0; i < numReaders; i++ {
+		go parallelReader(&m, clocked, cunlock, cdone)
+	}
+	// Wait for all parallel RLock()s to succeed.
+	for i := 0; i < numReaders; i++ {
+		<-clocked
+	}
+	for i := 0; i < numReaders; i++ {
+		cunlock <- true
+	}
+	// Wait for the goroutines to finish.
+	for i := 0; i < numReaders; i++ {
+		<-cdone
+	}
+}
+
+func TestParallelReaders() {
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(-1))
+	doTestParallelReaders(1, 4)
+	doTestParallelReaders(3, 4)
+	doTestParallelReaders(4, 2)
+}
+
+func reader(rwm *sync.RWMutex, num_iterations int, activity *int32, cdone chan bool) {
+	for i := 0; i < num_iterations; i++ {
+		rwm.RLock()
+		n := atomic.AddInt32(activity, 1)
+		if n < 1 || n >= 10000 {
+			rwm.RUnlock()
+			panic(fmt.Sprintf("wlock(%d)\n", n))
+		}
+		for i := 0; i < 100; i++ {
+		}
+		atomic.AddInt32(activity, -1)
+		rwm.RUnlock()
+	}
+	cdone <- true
+}
+
+func writer(rwm *sync.RWMutex, num_iterations int, activity *int32, cdone chan bool) {
+	for i := 0; i < num_iterations; i++ {
+		rwm.Lock()
+		n := atomic.AddInt32(activity, 10000)
+		if n != 10000 {
+			rwm.Unlock()
+			panic(fmt.Sprintf("wlock(%d)\n", n))
+		}
+		for i := 0; i < 100; i++ {
+		}
+		atomic.AddInt32(activity, -10000)
+		rwm.Unlock()
+	}
+	cdone <- true
+}
+
+func HammerRWMutex(gomaxprocs, numReaders, num_iterations int) {
+	runtime.GOMAXPROCS(gomaxprocs)
+	// Number of active readers + 10000 * number of active writers.
+	var activity int32
+	var rwm sync.RWMutex
+	cdone := make(chan bool)
+	go writer(&rwm, num_iterations, &activity, cdone)
+	var i int
+	for i = 0; i < numReaders/2; i++ {
+		go reader(&rwm, num_iterations, &activity, cdone)
+	}
+	go writer(&rwm, num_iterations, &activity, cdone)
+	for ; i < numReaders; i++ {
+		go reader(&rwm, num_iterations, &activity, cdone)
+	}
+	// Wait for the 2 writers and all readers to finish.
+	for i := 0; i < 2+numReaders; i++ {
+		<-cdone
+	}
+}
+
+func TestRWMutex() {
+	var m sync.RWMutex
+
+	m.Lock()
+	if m.TryLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryLock succeeded with mutex locked")
+		os.Exit(1)
+	}
+	if m.TryRLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryRLock succeeded with mutex locked")
+		os.Exit(1)
+	}
+	m.Unlock()
+
+	if !m.TryLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryLock failed with mutex unlocked")
+		os.Exit(1)
+	}
+	m.Unlock()
+
+	if !m.TryRLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryRLock failed with mutex unlocked")
+		os.Exit(1)
+	}
+	if !m.TryRLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryRLock failed with mutex unlocked")
+		os.Exit(1)
+	}
+	if m.TryLock() {
+		_, _ = fmt.Fprintln(os.Stderr, "TryLock succeeded with mutex rlocked")
+		os.Exit(1)
+	}
+	m.RUnlock()
+	m.RUnlock()
+
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(-1))
+	n := 5
+
+	HammerRWMutex(1, 1, n)
+	HammerRWMutex(1, 3, n)
+	HammerRWMutex(1, 10, n)
+	HammerRWMutex(4, 1, n)
+	HammerRWMutex(4, 3, n)
+	HammerRWMutex(4, 10, n)
+	HammerRWMutex(10, 1, n)
+	HammerRWMutex(10, 3, n)
+	HammerRWMutex(10, 10, n)
+	HammerRWMutex(10, 5, n)
+}
+
+func TestRLocker() {
+	var wl sync.RWMutex
+	var rl sync.Locker
+	wlocked := make(chan bool, 1)
+	rlocked := make(chan bool, 1)
+	rl = wl.RLocker()
+	n := 10
+	go func() {
+		for i := 0; i < n; i++ {
+			rl.Lock()
+			rl.Lock()
+			rlocked <- true
+			wl.Lock()
+			wlocked <- true
+		}
+	}()
+	for i := 0; i < n; i++ {
+		<-rlocked
+		rl.Unlock()
+		select {
+		case <-wlocked:
+			_, _ = fmt.Fprintln(os.Stderr, "RLocker() didn't read-lock it")
+			os.Exit(1)
+		default:
+		}
+		rl.Unlock()
+		<-wlocked
+		select {
+		case <-rlocked:
+			_, _ = fmt.Fprintln(os.Stderr, "RLocker() didn't respect the write lock")
+			os.Exit(1)
+		default:
+		}
+		wl.Unlock()
+	}
+}
diff --git a/cannon/testdata/example/mt-wg/go.mod b/cannon/testdata/example/mt-wg/go.mod
new file mode 100644
index 000000000000..c8a518a535b5
--- /dev/null
+++ b/cannon/testdata/example/mt-wg/go.mod
@@ -0,0 +1,5 @@
+module wg
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/example/multithreaded/main.go b/cannon/testdata/example/mt-wg/main.go
similarity index 79%
rename from cannon/testdata/example/multithreaded/main.go
rename to cannon/testdata/example/mt-wg/main.go
index bc871f56e524..841125c6b925 100644
--- a/cannon/testdata/example/multithreaded/main.go
+++ b/cannon/testdata/example/mt-wg/main.go
@@ -2,8 +2,6 @@ package main
 
 import (
 	"fmt"
-	"os"
-	"runtime"
 	"sync"
 	"sync/atomic"
 )
@@ -39,8 +37,4 @@ func main() {
 	a <- 1234
 	out := <-c
 	fmt.Printf("channels result: %d\n", out)
-
-	// try a GC! (the runtime might not have run one yet)
-	runtime.GC()
-	_, _ = os.Stdout.Write([]byte("GC complete!\n"))
 }

From bc6f8de543608be28590949259155f5ad163c986 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 23:45:44 +0800
Subject: [PATCH 196/451] dependabot(gomod): bump golang.org/x/sync from 0.8.0
 to 0.9.0 (#12885)

Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.8.0 to 0.9.0.
- [Commits](https://github.com/golang/sync/compare/v0.8.0...v0.9.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index d1be77ddc0e1..11a236812990 100644
--- a/go.mod
+++ b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/urfave/cli/v2 v2.27.5
 	golang.org/x/crypto v0.28.0
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
-	golang.org/x/sync v0.8.0
+	golang.org/x/sync v0.9.0
 	golang.org/x/term v0.25.0
 	golang.org/x/time v0.7.0
 )
diff --git a/go.sum b/go.sum
index 5eabf529b0df..8436ca18ce06 100644
--- a/go.sum
+++ b/go.sum
@@ -927,8 +927,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

From 29f76e54dc6a60094f5a5511f4c6a3f398a34240 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Mon, 18 Nov 2024 18:24:11 +0100
Subject: [PATCH 197/451] Sc/fix update semgrep (#12942)

* fix upgrade-semgrep

* fix upgrade-semgrep
---
 justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/justfile b/justfile
index e40186f75dff..6438ba36197a 100644
--- a/justfile
+++ b/justfile
@@ -61,4 +61,4 @@ check-semgrep:
   [ "$(just print-semgrep)" = "$(jq -r .semgrep < versions.json)" ] && echo '✓ semgrep versions match' || (echo '✗ semgrep version mismatch. Run `just upgrade-semgrep` to upgrade.' && exit 1)
 
 upgrade-semgrep:
-  jq '.semgrep = $v' --arg v $(just print-semgrep) <<<$(cat versions.json) > versions.json
+  pip3 install semgrep=="$(jq -r .semgrep < versions.json)"

From f6810a40292babf3c35ee2e97c6370a0b9f15a9a Mon Sep 17 00:00:00 2001
From: blaine <blainemalone01@gmail.com>
Date: Mon, 18 Nov 2024 16:58:06 -0500
Subject: [PATCH 198/451] feat: opcm mainnet deploy. (#12953)

---
 op-deployer/pkg/deployer/standard/standard.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 8c4ade1dcfb3..516bdb650283 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -133,9 +133,8 @@ func CommitForDeployTag(tag string) (string, error) {
 func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
 	switch chainID {
 	case 1:
-		// Generated using the bootstrap command on 10/18/2024.
-		// TODO: @blmalone this needs re-bootstrapped because it's still proxied
-		return common.HexToAddress(""), nil
+		// Generated using the bootstrap command on 11/18/2024.
+		return common.HexToAddress("0x9bc0a1ed534bfb31a6be69e5b767cba332f14347"), nil
 	case 11155111:
 		// Generated using the bootstrap command on 11/15/2024.
 		return common.HexToAddress("0xde9eacb994a6eb12997445f8a63a22772c5c4313"), nil

From f94151b6c1b13243c3d6e9c3bf8a532287ec0a24 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 18 Nov 2024 14:59:13 -0700
Subject: [PATCH 199/451] op-deployer: Refactor semver inspector, add L2
 genesis test (#12946)

- Refactor the semver inspector so that it can be called from outside the CLI
- Adds a a canonical L2 genesis file for v1.6.0, and a unit test to assert that new chains deployed using v1.6.0 have the right L2 genesis.
---
 op-deployer/pkg/deployer/artifacts/locator.go |  16 ++
 op-deployer/pkg/deployer/inspect/semvers.go   | 164 ++++++++++++------
 .../deployer/integration_test/apply_test.go   | 134 +++++++++++++-
 .../testdata/allocs-l2-v160.json.gz           | Bin 0 -> 152466 bytes
 4 files changed, 260 insertions(+), 54 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160.json.gz

diff --git a/op-deployer/pkg/deployer/artifacts/locator.go b/op-deployer/pkg/deployer/artifacts/locator.go
index 160e8790420b..aa44d43644c8 100644
--- a/op-deployer/pkg/deployer/artifacts/locator.go
+++ b/op-deployer/pkg/deployer/artifacts/locator.go
@@ -24,6 +24,22 @@ var DefaultL2ContractsLocator = &Locator{
 	Tag: standard.DefaultL2ContractsTag,
 }
 
+func NewLocatorFromTag(tag string) (*Locator, error) {
+	loc := new(Locator)
+	if err := loc.UnmarshalText([]byte("tag://" + tag)); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal tag: %w", err)
+	}
+	return loc, nil
+}
+
+func MustNewLocatorFromTag(tag string) *Locator {
+	loc, err := NewLocatorFromTag(tag)
+	if err != nil {
+		panic(err)
+	}
+	return loc
+}
+
 type Locator struct {
 	URL *url.URL
 	Tag string
diff --git a/op-deployer/pkg/deployer/inspect/semvers.go b/op-deployer/pkg/deployer/inspect/semvers.go
index da666096ee18..48e16d21dbc4 100644
--- a/op-deployer/pkg/deployer/inspect/semvers.go
+++ b/op-deployer/pkg/deployer/inspect/semvers.go
@@ -8,6 +8,10 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
@@ -25,8 +29,6 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-var versionSelector = []byte{0x54, 0xfd, 0x4d, 0x50}
-
 func L2SemversCLI(cliCtx *cli.Context) error {
 	cliCfg, err := readConfig(cliCtx)
 	if err != nil {
@@ -67,6 +69,60 @@ func L2SemversCLI(cliCtx *cli.Context) error {
 		}
 	}()
 
+	ps, err := L2Semvers(L2SemversConfig{
+		Lgr:        l,
+		Artifacts:  artifactsFS,
+		ChainState: chainState,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to get L2 semvers: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(ps, ioutil.ToStdOutOrFileOrNoop(cliCfg.Outfile, 0o666)); err != nil {
+		return fmt.Errorf("failed to write rollup config: %w", err)
+	}
+
+	return nil
+}
+
+type L2SemversConfig struct {
+	Lgr        log.Logger
+	Artifacts  foundry.StatDirFs
+	ChainState *state.ChainState
+}
+
+type L2PredeploySemvers struct {
+	L2ToL1MessagePasser           string
+	DeployerWhitelist             string
+	WETH                          string
+	L2CrossDomainMessenger        string
+	L2StandardBridge              string
+	SequencerFeeVault             string
+	OptimismMintableERC20Factory  string
+	L1BlockNumber                 string
+	GasPriceOracle                string
+	L1Block                       string
+	LegacyMessagePasser           string
+	L2ERC721Bridge                string
+	OptimismMintableERC721Factory string
+	BaseFeeVault                  string
+	L1FeeVault                    string
+	SchemaRegistry                string
+	EAS                           string
+	CrossL2Inbox                  string
+	L2toL2CrossDomainMessenger    string
+	SuperchainWETH                string
+	ETHLiquidity                  string
+	SuperchainTokenBridge         string
+	OptimismMintableERC20         string
+	OptimismMintableERC721        string
+}
+
+func L2Semvers(cfg L2SemversConfig) (*L2PredeploySemvers, error) {
+	l := cfg.Lgr
+	artifactsFS := cfg.Artifacts
+	chainState := cfg.ChainState
+
 	host, err := env.DefaultScriptHost(
 		broadcaster.NoopBroadcaster(),
 		l,
@@ -74,85 +130,89 @@ func L2SemversCLI(cliCtx *cli.Context) error {
 		artifactsFS,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create script host: %w", err)
+		return nil, fmt.Errorf("failed to create script host: %w", err)
 	}
 	host.ImportState(chainState.Allocs.Data)
 
-	addr := common.Address{19: 0x01}
-
 	type contractToCheck struct {
-		Address common.Address
-		Name    string
+		Address  common.Address
+		FieldPtr *string
+		Name     string
 	}
 
-	contractsOutput := make(map[string]string)
+	var ps L2PredeploySemvers
 
-	// The gov token and the proxy admin do not have semvers.
 	contracts := []contractToCheck{
-		{predeploys.L2ToL1MessagePasserAddr, "L2ToL1MessagePasser"},
-		{predeploys.DeployerWhitelistAddr, "DeployerWhitelist"},
-		{predeploys.WETHAddr, "WETH"},
-		{predeploys.L2CrossDomainMessengerAddr, "L2CrossDomainMessenger"},
-		{predeploys.L2StandardBridgeAddr, "L2StandardBridge"},
-		{predeploys.SequencerFeeVaultAddr, "SequencerFeeVault"},
-		{predeploys.OptimismMintableERC20FactoryAddr, "OptimismMintableERC20Factory"},
-		{predeploys.L1BlockNumberAddr, "L1BlockNumber"},
-		{predeploys.GasPriceOracleAddr, "GasPriceOracle"},
-		{predeploys.L1BlockAddr, "L1Block"},
-		{predeploys.LegacyMessagePasserAddr, "LegacyMessagePasser"},
-		{predeploys.L2ERC721BridgeAddr, "L2ERC721Bridge"},
-		{predeploys.OptimismMintableERC721FactoryAddr, "OptimismMintableERC721Factory"},
-		{predeploys.BaseFeeVaultAddr, "BaseFeeVault"},
-		{predeploys.L1FeeVaultAddr, "L1FeeVault"},
-		{predeploys.SchemaRegistryAddr, "SchemaRegistry"},
-		{predeploys.EASAddr, "EAS"},
-		{predeploys.WETHAddr, "WETH"},
+		{predeploys.L2ToL1MessagePasserAddr, &ps.L2ToL1MessagePasser, "L2ToL1MessagePasser"},
+		{predeploys.DeployerWhitelistAddr, &ps.DeployerWhitelist, "DeployerWhitelist"},
+		{predeploys.WETHAddr, &ps.WETH, "WETH"},
+		{predeploys.L2CrossDomainMessengerAddr, &ps.L2CrossDomainMessenger, "L2CrossDomainMessenger"},
+		{predeploys.L2StandardBridgeAddr, &ps.L2StandardBridge, "L2StandardBridge"},
+		{predeploys.SequencerFeeVaultAddr, &ps.SequencerFeeVault, "SequencerFeeVault"},
+		{predeploys.OptimismMintableERC20FactoryAddr, &ps.OptimismMintableERC20Factory, "OptimismMintableERC20Factory"},
+		{predeploys.L1BlockNumberAddr, &ps.L1BlockNumber, "L1BlockNumber"},
+		{predeploys.GasPriceOracleAddr, &ps.GasPriceOracle, "GasPriceOracle"},
+		{predeploys.L1BlockAddr, &ps.L1Block, "L1Block"},
+		{predeploys.LegacyMessagePasserAddr, &ps.LegacyMessagePasser, "LegacyMessagePasser"},
+		{predeploys.L2ERC721BridgeAddr, &ps.L2ERC721Bridge, "L2ERC721Bridge"},
+		{predeploys.OptimismMintableERC721FactoryAddr, &ps.OptimismMintableERC721Factory, "OptimismMintableERC721Factory"},
+		{predeploys.BaseFeeVaultAddr, &ps.BaseFeeVault, "BaseFeeVault"},
+		{predeploys.L1FeeVaultAddr, &ps.L1FeeVault, "L1FeeVault"},
+		{predeploys.SchemaRegistryAddr, &ps.SchemaRegistry, "SchemaRegistry"},
+		{predeploys.EASAddr, &ps.EAS, "EAS"},
 	}
 	for _, contract := range contracts {
-		data, _, err := host.Call(
-			addr,
-			contract.Address,
-			bytes.Clone(versionSelector),
-			1_000_000_000,
-			uint256.NewInt(0),
-		)
+		semver, err := ReadSemver(host, contract.Address)
 		if err != nil {
-			return fmt.Errorf("failed to call version on %s: %w", contract.Name, err)
-		}
-
-		// The second 32 bytes contain the length of the string
-		length := new(big.Int).SetBytes(data[32:64]).Int64()
-		// Start of the string data (after offset and length)
-		stringStart := 64
-		stringEnd := int64(stringStart) + length
-
-		// Bounds check
-		if stringEnd > int64(len(data)) {
-			return fmt.Errorf("string data out of bounds")
+			return nil, fmt.Errorf("failed to read semver for %s: %w", contract.Name, err)
 		}
 
-		contractsOutput[contract.Name] = string(data[stringStart:stringEnd])
+		*contract.FieldPtr = semver
 	}
 
 	erc20Semver, err := findSemverBytecode(host, predeploys.OptimismMintableERC20FactoryAddr)
 	if err == nil {
-		contractsOutput["OptimismMintableERC20"] = erc20Semver
+		ps.OptimismMintableERC20 = erc20Semver
 	} else {
 		l.Warn("failed to find semver for OptimismMintableERC20", "err", err)
 	}
 
 	erc721Semver, err := findSemverBytecode(host, predeploys.OptimismMintableERC721FactoryAddr)
 	if err == nil {
-		contractsOutput["OptimismMintableERC721"] = erc721Semver
+		ps.OptimismMintableERC721 = erc721Semver
 	} else {
 		l.Warn("failed to find semver for OptimismMintableERC721", "err", err)
 	}
 
-	if err := jsonutil.WriteJSON(contractsOutput, ioutil.ToStdOutOrFileOrNoop(cliCfg.Outfile, 0o666)); err != nil {
-		return fmt.Errorf("failed to write rollup config: %w", err)
+	return &ps, nil
+}
+
+var versionSelector = []byte{0x54, 0xfd, 0x4d, 0x50}
+
+func ReadSemver(host *script.Host, addr common.Address) (string, error) {
+	data, _, err := host.Call(
+		common.Address{19: 0x01},
+		addr,
+		bytes.Clone(versionSelector),
+		1_000_000_000,
+		uint256.NewInt(0),
+	)
+	if err != nil {
+		return "", fmt.Errorf("failed to call version on %s: %w", addr, err)
 	}
 
-	return nil
+	// The second 32 bytes contain the length of the string
+	length := new(big.Int).SetBytes(data[32:64]).Int64()
+	// Start of the string data (after offset and length)
+	stringStart := 64
+	stringEnd := int64(stringStart) + length
+
+	// Bounds check
+	if stringEnd > int64(len(data)) {
+		return "", fmt.Errorf("string data out of bounds")
+	}
+
+	return string(data[stringStart:stringEnd]), nil
 }
 
 const patternLen = 24
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index bcbc14eb7f19..7f4c0cb06deb 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -1,12 +1,16 @@
 package integration_test
 
 import (
+	"bufio"
 	"bytes"
+	"compress/gzip"
 	"context"
 	"crypto/rand"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"log/slog"
+	"maps"
 	"math/big"
 	"os"
 	"testing"
@@ -182,13 +186,15 @@ func TestApplyExistingOPCM(t *testing.T) {
 
 	l2ChainID := uint256.NewInt(1)
 
+	// Hardcode the below tags to ensure the test is validating the correct
+	// version even if the underlying tag changes
 	intent, st := newIntent(
 		t,
 		l1ChainID,
 		dk,
 		l2ChainID,
-		artifacts.DefaultL1ContractsLocator,
-		artifacts.DefaultL2ContractsLocator,
+		artifacts.MustNewLocatorFromTag("op-contracts/v1.6.0"),
+		artifacts.MustNewLocatorFromTag("op-contracts/v1.7.0-beta.1+l2-contracts"),
 	)
 	// Define a new create2 salt to avoid contract address collisions
 	_, err = rand.Read(st.Create2Salt[:])
@@ -231,6 +237,130 @@ func TestApplyExistingOPCM(t *testing.T) {
 			require.Equal(t, tt.expAddr, tt.actAddr)
 		})
 	}
+
+	artifactsFSL2, cleanupL2, err := artifacts.Download(
+		ctx,
+		intent.L2ContractsLocator,
+		artifacts.LogProgressor(lgr),
+	)
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		require.NoError(t, cleanupL2())
+	})
+
+	chainState := st.Chains[0]
+	chainIntent := intent.Chains[0]
+
+	semvers, err := inspect.L2Semvers(inspect.L2SemversConfig{
+		Lgr:        lgr,
+		Artifacts:  artifactsFSL2,
+		ChainState: chainState,
+	})
+	require.NoError(t, err)
+
+	expectedSemversL2 := &inspect.L2PredeploySemvers{
+		L2ToL1MessagePasser:           "1.1.1-beta.1",
+		DeployerWhitelist:             "1.1.1-beta.1",
+		WETH:                          "1.0.0-beta.1",
+		L2CrossDomainMessenger:        "2.1.1-beta.1",
+		L2StandardBridge:              "1.11.1-beta.1",
+		SequencerFeeVault:             "1.5.0-beta.2",
+		OptimismMintableERC20Factory:  "1.10.1-beta.2",
+		L1BlockNumber:                 "1.1.1-beta.1",
+		GasPriceOracle:                "1.3.1-beta.1",
+		L1Block:                       "1.5.1-beta.1",
+		LegacyMessagePasser:           "1.1.1-beta.1",
+		L2ERC721Bridge:                "1.7.1-beta.2",
+		OptimismMintableERC721Factory: "1.4.1-beta.1",
+		BaseFeeVault:                  "1.5.0-beta.2",
+		L1FeeVault:                    "1.5.0-beta.2",
+		SchemaRegistry:                "1.3.1-beta.1",
+		EAS:                           "1.4.1-beta.1",
+		CrossL2Inbox:                  "",
+		L2toL2CrossDomainMessenger:    "",
+		SuperchainWETH:                "",
+		ETHLiquidity:                  "",
+		SuperchainTokenBridge:         "",
+		OptimismMintableERC20:         "1.4.0-beta.1",
+		OptimismMintableERC721:        "1.3.1-beta.1",
+	}
+
+	require.EqualValues(t, expectedSemversL2, semvers)
+
+	f, err := os.Open("./testdata/allocs-l2-v160.json.gz")
+	require.NoError(t, err)
+	defer f.Close()
+	gzr, err := gzip.NewReader(f)
+	require.NoError(t, err)
+	defer gzr.Close()
+	dec := json.NewDecoder(bufio.NewReader(gzr))
+	var expAllocs types.GenesisAlloc
+	require.NoError(t, dec.Decode(&expAllocs))
+
+	type storageCheckerFunc func(addr common.Address, actStorage map[common.Hash]common.Hash)
+
+	storageDiff := func(addr common.Address, expStorage, actStorage map[common.Hash]common.Hash) {
+		require.EqualValues(t, expStorage, actStorage, "storage for %s differs", addr)
+	}
+
+	defaultStorageChecker := func(addr common.Address, actStorage map[common.Hash]common.Hash) {
+		storageDiff(addr, expAllocs[addr].Storage, actStorage)
+	}
+
+	overrideStorageChecker := func(addr common.Address, actStorage, overrides map[common.Hash]common.Hash) {
+		expStorage := make(map[common.Hash]common.Hash)
+		maps.Copy(expStorage, expAllocs[addr].Storage)
+		maps.Copy(expStorage, overrides)
+		storageDiff(addr, expStorage, actStorage)
+	}
+
+	storageCheckers := map[common.Address]storageCheckerFunc{
+		predeploys.L2CrossDomainMessengerAddr: func(addr common.Address, actStorage map[common.Hash]common.Hash) {
+			overrideStorageChecker(addr, actStorage, map[common.Hash]common.Hash{
+				{31: 0xcf}: common.BytesToHash(chainState.L1CrossDomainMessengerProxyAddress.Bytes()),
+			})
+		},
+		predeploys.L2StandardBridgeAddr: func(addr common.Address, actStorage map[common.Hash]common.Hash) {
+			overrideStorageChecker(addr, actStorage, map[common.Hash]common.Hash{
+				{31: 0x04}: common.BytesToHash(chainState.L1StandardBridgeProxyAddress.Bytes()),
+			})
+		},
+		predeploys.L2ERC721BridgeAddr: func(addr common.Address, actStorage map[common.Hash]common.Hash) {
+			overrideStorageChecker(addr, actStorage, map[common.Hash]common.Hash{
+				{31: 0x02}: common.BytesToHash(chainState.L1ERC721BridgeProxyAddress.Bytes()),
+			})
+		},
+		predeploys.ProxyAdminAddr: func(addr common.Address, actStorage map[common.Hash]common.Hash) {
+			overrideStorageChecker(addr, actStorage, map[common.Hash]common.Hash{
+				{}: common.BytesToHash(intent.Chains[0].Roles.L2ProxyAdminOwner.Bytes()),
+			})
+		},
+		// The ProxyAdmin owner is also set on the ProxyAdmin contract's implementation address, see
+		// L2Genesis.s.sol line 292.
+		common.HexToAddress("0xc0d3c0d3c0d3c0d3c0d3c0d3c0d3c0d3c0d30018"): func(addr common.Address, actStorage map[common.Hash]common.Hash) {
+			overrideStorageChecker(addr, actStorage, map[common.Hash]common.Hash{
+				{}: common.BytesToHash(chainIntent.Roles.L2ProxyAdminOwner.Bytes()),
+			})
+		},
+	}
+
+	//Use a custom equality function to compare the genesis allocs
+	//because the reflect-based one is really slow
+	actAllocs := st.Chains[0].Allocs.Data.Accounts
+	require.Equal(t, len(expAllocs), len(actAllocs))
+	for addr, expAcc := range expAllocs {
+		actAcc, ok := actAllocs[addr]
+		require.True(t, ok)
+		require.True(t, expAcc.Balance.Cmp(actAcc.Balance) == 0, "balance for %s differs", addr)
+		require.Equal(t, expAcc.Nonce, actAcc.Nonce, "nonce for %s differs", addr)
+		require.Equal(t, hex.EncodeToString(expAllocs[addr].Code), hex.EncodeToString(actAcc.Code), "code for %s differs", addr)
+
+		storageChecker, ok := storageCheckers[addr]
+		if !ok {
+			storageChecker = defaultStorageChecker
+		}
+		storageChecker(addr, actAcc.Storage)
+	}
 }
 
 func TestL2BlockTimeOverride(t *testing.T) {
diff --git a/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160.json.gz b/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..545dc3397bdd3220146c7c6c150ec44fcd19b457
GIT binary patch
literal 152466
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

literal 0
HcmV?d00001


From 7359d15c3a16a91f47a82ff6566721c68d40ff58 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Tue, 19 Nov 2024 03:48:49 +0100
Subject: [PATCH 200/451] improve tests L2CrossDomainMessenger_Test (#12934)

* improve tests

* fixes

* fixes...

* Apply suggestions from code review

Co-authored-by: smartcontracts <kelvin@optimism.io>

* fixes

---------

Co-authored-by: smartcontracts <kelvin@optimism.io>
---
 .../test/L2/L2CrossDomainMessenger.t.sol      | 97 ++++++++++++++++++-
 1 file changed, 92 insertions(+), 5 deletions(-)

diff --git a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
index 131851783c79..f5ef2d635595 100644
--- a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
@@ -5,6 +5,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Reverter } from "test/mocks/Callers.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
+import { stdError } from "forge-std/StdError.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
@@ -148,17 +149,103 @@ contract L2CrossDomainMessenger_Test is CommonTest {
         assertEq(l2CrossDomainMessenger.failedMessages(hash), false);
     }
 
-    /// @dev Tests that `relayMessage` reverts if attempting to relay
-    ///      a message sent to an L1 system contract.
-    function test_relayMessage_toSystemContract_reverts() external {
-        address target = address(l2ToL1MessagePasser);
+    /// @dev Tests that relayMessage reverts if the value sent does not match the amount
+    function test_relayMessage_fromOtherMessengerValueMismatch_reverts() external {
+        // set the target to be alice
+        address target = alice;
         address sender = address(l1CrossDomainMessenger);
         address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
         bytes memory message = hex"1111";
 
+        // cannot send a message where the amount inputted does not match the msg.value
+        vm.deal(caller, 10 ether);
         vm.prank(caller);
+        vm.expectRevert(stdError.assertionError);
+        l2CrossDomainMessenger.relayMessage{ value: 10 ether }(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 9 ether, 0, message
+        );
+    }
+
+    /// @dev Tests that relayMessage reverts if a failed message is attempted to be replayed and the caller is the other
+    /// messenger
+    function test_relayMessage_fromOtherMessengerFailedMessageReplay_reverts() external {
+        // set the target to be alice
+        address target = alice;
+        address sender = address(l1CrossDomainMessenger);
+        address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
+        bytes memory message = hex"1111";
+
+        // make a failed message
+        vm.etch(target, hex"fe");
+        vm.prank(caller);
+        l2CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
+        );
+
+        // cannot replay messages when the caller is the other messenger
+        vm.prank(caller);
+        vm.expectRevert(stdError.assertionError);
+        l2CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
+        );
+    }
+
+    /// @dev Tests that relayMessage reverts if attempting to relay a message
+    ///      sent to self
+    function test_relayMessage_toSelf_reverts() external {
+        address sender = address(l1CrossDomainMessenger);
+        address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
+        bytes memory message = hex"1111";
+
+        vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));
+
+        vm.prank(caller);
+        vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
+        l2CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
+            sender,
+            address(l2CrossDomainMessenger),
+            0,
+            0,
+            message
+        );
+    }
+
+    /// @dev Tests that relayMessage reverts if attempting to relay a message
+    ///      sent to the l2ToL1MessagePasser address
+    function test_relayMessage_toL2ToL1MessagePasser_reverts() external {
+        address sender = address(l1CrossDomainMessenger);
+        address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
+        bytes memory message = hex"1111";
+
+        vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));
+
+        vm.prank(caller);
+        vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
+        l2CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
+            sender,
+            address(l2ToL1MessagePasser),
+            0,
+            0,
+            message
+        );
+    }
+
+    /// @dev Tests that the relayMessage function reverts if the message called by non-optimismPortal but not a failed
+    /// message
+    function test_relayMessage_relayingNewMessageByExternalUser_reverts() external {
+        address target = address(alice);
+        address sender = address(l1CrossDomainMessenger);
+        bytes memory message = hex"1111";
+
+        vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));
+
+        vm.prank(bob);
         vm.expectRevert("CrossDomainMessenger: message cannot be replayed");
-        l1CrossDomainMessenger.relayMessage(Encoding.encodeVersionedNonce(0, 1), sender, target, 0, 0, message);
+        l2CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
+        );
     }
 
     /// @dev Tests that `relayMessage` correctly resets the `xDomainMessageSender`

From e32278e897db31045def5cc9fd70981f8e95adb7 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Tue, 19 Nov 2024 03:49:43 +0100
Subject: [PATCH 201/451] improve tests of L1CrossDomainMessenger_Test (#12933)

* improve tests

* fixes

* fixes

* fixes

* Apply suggestions from code review

Co-authored-by: smartcontracts <kelvin@optimism.io>

* fixes

---------

Co-authored-by: smartcontracts <kelvin@optimism.io>
---
 .../test/L1/L1CrossDomainMessenger.t.sol      | 87 +++++++++++++++++--
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
index 23c1365e9156..22345d860e42 100644
--- a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
@@ -4,6 +4,7 @@ pragma solidity 0.8.15;
 // Testing utilities
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Reverter } from "test/mocks/Callers.sol";
+import { stdError } from "forge-std/StdError.sol";
 
 // Libraries
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
@@ -173,21 +174,93 @@ contract L1CrossDomainMessenger_Test is CommonTest {
         assertEq(l1CrossDomainMessenger.failedMessages(hash), false);
     }
 
-    /// @dev Tests that relayMessage reverts if attempting to relay a message
-    ///      sent to an L1 system contract.
-    function test_relayMessage_toSystemContract_reverts() external {
-        // set the target to be the OptimismPortal
-        address target = address(optimismPortal);
+    /// @dev Tests that relayMessage reverts if caller is optimismPortal and the value sent does not match the amount
+    function test_relayMessage_fromOtherMessengerValueMismatch_reverts() external {
+        address target = alice;
         address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
         bytes memory message = hex"1111";
 
+        // set the value of op.l2Sender() to be the L2CrossDomainMessenger.
+        vm.store(address(optimismPortal), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
+
+        // correctly sending as OptimismPortal but amount does not match msg.value
+        vm.deal(address(optimismPortal), 10 ether);
+        vm.prank(address(optimismPortal));
+        vm.expectRevert(stdError.assertionError);
+        l1CrossDomainMessenger.relayMessage{ value: 10 ether }(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 9 ether, 0, message
+        );
+    }
+
+    /// @dev Tests that relayMessage reverts if a failed message is attempted to be replayed via the optimismPortal
+    function test_relayMessage_fromOtherMessengerFailedMessageReplay_reverts() external {
+        address target = alice;
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
+        bytes memory message = hex"1111";
+
+        // set the value of op.l2Sender() to be the L2 Cross Domain Messenger.
+        vm.store(address(optimismPortal), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
+
+        // make a failed message
+        vm.etch(target, hex"fe");
         vm.prank(address(optimismPortal));
-        vm.expectRevert("CrossDomainMessenger: message cannot be replayed");
         l1CrossDomainMessenger.relayMessage(
             Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
         );
 
-        vm.store(address(optimismPortal), 0, bytes32(abi.encode(sender)));
+        // cannot replay messages when optimism portal is msg.sender
+        vm.prank(address(optimismPortal));
+        vm.expectRevert(stdError.assertionError);
+        l1CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
+        );
+    }
+
+    /// @dev Tests that relayMessage reverts if attempting to relay a message
+    ///      with l1CrossDomainMessenger as the target
+    function test_relayMessage_toSelf_reverts() external {
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
+        bytes memory message = hex"1111";
+
+        vm.store(address(optimismPortal), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
+
+        vm.prank(address(optimismPortal));
+        vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
+        l1CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
+            sender,
+            address(l1CrossDomainMessenger),
+            0,
+            0,
+            message
+        );
+    }
+
+    /// @dev Tests that relayMessage reverts if attempting to relay a message
+    ///      with optimismPortal as the target
+    function test_relayMessage_toOptimismPortal_reverts() external {
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
+        bytes memory message = hex"1111";
+
+        vm.store(address(optimismPortal), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
+
+        vm.prank(address(optimismPortal));
+        vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
+        l1CrossDomainMessenger.relayMessage(
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, address(optimismPortal), 0, 0, message
+        );
+    }
+
+    /// @dev Tests that the relayMessage function reverts if the message called by non-optimismPortal but not a failed
+    /// message
+    function test_relayMessage_relayingNewMessageByExternalUser_reverts() external {
+        address target = address(alice);
+        address sender = Predeploys.L2_CROSS_DOMAIN_MESSENGER;
+        bytes memory message = hex"1111";
+
+        vm.store(address(optimismPortal), bytes32(senderSlotIndex), bytes32(abi.encode(sender)));
+
+        vm.prank(bob);
         vm.expectRevert("CrossDomainMessenger: message cannot be replayed");
         l1CrossDomainMessenger.relayMessage(
             Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message

From 357fc7d44d38f7b1c0f8bfbe5b689dc6205257a9 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Tue, 19 Nov 2024 03:50:36 +0100
Subject: [PATCH 202/451] fix challenge struct natspec (#12951)

* fix challenge struct natspec

* semver bump

* semver bump

* semver bump
---
 packages/contracts-bedrock/snapshots/semver-lock.json      | 4 ++--
 .../contracts-bedrock/src/L1/DataAvailabilityChallenge.sol | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index dd2618cc5a7e..5ba3a4b6a165 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -1,7 +1,7 @@
 {
   "src/L1/DataAvailabilityChallenge.sol": {
-    "initCodeHash": "0xbd00d6568abab3e7fc211c40d682862242f25493010a4a097bd1f3b45c8c87c3",
-    "sourceCodeHash": "0x58b587034a67b4bb718abbaded8ac23b082c0971105874bcc42c23f051c67f6e"
+    "initCodeHash": "0x240a9b695e1ab73692672b907c2ae147ee9224e95a03c02d99333afe186c3d2f",
+    "sourceCodeHash": "0xc6ab0e64cfbdcfa6de0a480426263712b3ddbabe56a88ec7c02556cb432e6b02"
   },
   "src/L1/L1CrossDomainMessenger.sol": {
     "initCodeHash": "0x2e9cb3ceb5e55341b311f0666ef7655df4fafae75afdfbcd701cd9c9b2b017d5",
diff --git a/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol b/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol
index 2a725fc4f200..666e4306b482 100644
--- a/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol
+++ b/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol
@@ -24,9 +24,10 @@ enum CommitmentType {
 }
 
 /// @dev A struct representing a single DA challenge.
-/// @custom:field status The status of the challenge.
 /// @custom:field challenger The address that initiated the challenge.
+/// @custom:field lockedBond The amount of ETH bond that was locked by the challenger.
 /// @custom:field startBlock The block number at which the challenge was initiated.
+/// @custom:field resolvedBlock The block number at which the challenge was resolved.
 struct Challenge {
     address challenger;
     uint256 lockedBond;
@@ -94,8 +95,8 @@ contract DataAvailabilityChallenge is OwnableUpgradeable, ISemver {
     event BalanceChanged(address account, uint256 balance);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.2
-    string public constant version = "1.0.1-beta.2";
+    /// @custom:semver 1.0.1-beta.3
+    string public constant version = "1.0.1-beta.3";
 
     /// @notice The fixed cost of resolving a challenge.
     /// @dev The value is estimated by measuring the cost of resolving with `bytes(0)`

From 99150d3df6d36c1f2c518645916ad2804effe717 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Tue, 19 Nov 2024 14:02:53 +1000
Subject: [PATCH 203/451] security-reviews: Add 3Doc report on Canon F_GETFD
 changes. (#12960)

* security-reviews: Add 3Doc report on Canon F_GETFD changes.

* security-reviews: Update README.
---
 .../2024_10-Cannon-FGETFD-3DocSecurity.md     | 114 ++++++++++++++++++
 docs/security-reviews/README.md               |   3 +-
 2 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 docs/security-reviews/2024_10-Cannon-FGETFD-3DocSecurity.md

diff --git a/docs/security-reviews/2024_10-Cannon-FGETFD-3DocSecurity.md b/docs/security-reviews/2024_10-Cannon-FGETFD-3DocSecurity.md
new file mode 100644
index 000000000000..f157356e4905
--- /dev/null
+++ b/docs/security-reviews/2024_10-Cannon-FGETFD-3DocSecurity.md
@@ -0,0 +1,114 @@
+# Audit Report - OP Cannon
+
+|                |                                                                           |
+| -------------- | ------------------------------------------------------------------------- |
+| **Audit Date** | Oct 2nd 2024 - Oct 3rd 2024                                               |
+| **Auditor**    | 3DOC Security ([@3docSec](https://x.com/3docSec))                         |
+| **Version 1**  | Oct 3rd 2024.                                                             |
+
+<br clear="both" />
+
+# Contents
+- [Audit Report - OP cannon](#audit-report---op-cannon)
+- [Contents](#contents)
+- [Disclaimer](#disclaimer)
+- [About 3DOC](#about-3doc)
+- [Scope](#scope)
+- [Severity Classification](#severity-classification)
+- [Summary](#summary)
+- [Findings](#findings)
+  - [Low Risk Findings (1)](#low-risk-findings-1)
+    - [1. Op-challenger Docker image does not include Cannon embeds](#-op-challenger-docker-image-does-not-include-cannon-embeds)
+
+# Disclaimer
+_The following audit report is based on the information and code provided by the client, and any findings or recommendations are made solely on the basis of this information. While the Auditor has exercised due care and skill in conducting the audit, it cannot be guaranteed that all issues have been identified and that there are no undiscovered errors or vulnerabilities in the code._
+
+_Furthermore, this report is not an endorsement or certification of the protocol, and the Auditor does not assume any responsibility for any losses or damages that may result from the use of the smart contracts, either in their current form or in any modified version thereof._
+
+# About 3DOC
+3DOC is a top ranked Smart Contract Auditor doing audits on Code4rena (www.code4rena.com), having ranked 1st in multiple contests in [solo](https://code4rena.com/@3docSec) and [team](https://code4rena.com/@RadiantLabs) audits, including the [Optimism superchain contest](https://code4rena.com/audits/2024-07-optimism-superchain) in July 2024.<br>
+He can also be booked for conducting Private Audits.
+
+Contact: <br>
+
+X: [@3DocSec](https://x.com/3DocSec)
+
+e-mail: [hello@3doc.fr](mailto:hello@3doc.fr)
+
+# Scope
+The scope of the audit is the following Pull Request in the client's GitHub repository:
+
+https://github.com/ethereum-optimism/optimism/pull/12050
+
+The change consists of a core update for supporting the `F_GETFD` syscall in the MIPS VM, [provided with this commit](https://github.com/ethereum-optimism/optimism/pull/12050/commits/7c8257d3574a2a76ab90f8129c7b532d68049944), and several additional updates accommodating the VM version bump that came with the core change.
+
+# Severity Classification
+| Severity               | Impact: High | Impact: Medium | Impact: Low |
+| ---------------------- | ------------ | -------------- | ----------- |
+| **Likelihood: High**   | ![high]      | ![high]        | ![medium]   |
+| **Likelihood: Medium** | ![high]      | ![medium]      | ![low]      |
+| **Likelihood: Low**    | ![medium]    | ![low]         | ![low]      |
+
+**Impact** - the technical, economic and reputation damage of a successful attack
+
+**Likelihood** - the chance that a particular vulnerability is discovered and exploited
+
+# Summary
+
+| Severity       | Total |
+| -------------- | ----- |
+| ![high]        | 0     |
+| ![medium]      | 0     |
+| ![low]         | 0     |
+| ![information] | 0     |
+
+
+# Findings
+## Low Risk findings (0)
+
+### [False positive] Op-challenger Docker image does not include Cannon embeds
+#### Description
+The change in scope added a new implementation of the Cannon VM, which was called `VersionSingleThreaded2`. Cannon has now three versions (`VersionSingleThreaded`, `VersionSingleThreaded2`, and `VersionMultiThreaded`).
+
+The op-challenger program makes use of the Cannon VM in several places via the configured `VmBin` path, which point to the `multicannon` command line. This one reads the State version from the input state and selects the right Cannon VM accordingly (`cannon/multicannon/exec.go:L81`).
+
+If we look at the Docker challenger image generated by the `make golang-docker` command, however, we can see it doesn't contain an `embeds` folder:
+
+```
+docker run -t us-docker.pkg.dev/oplabs-tools-artifacts/images/op-challenger  find / -name embeds
+```
+
+But it however has the `cannon` command pointing to the `multicannon` multiplexer:
+
+```
+➜  optimism git:(52d0e60c1) ✗ docker run -t us-docker.pkg.dev/oplabs-tools-artifacts/images/op-challenger  cannon | head -2
+NAME:
+   multicannon - MIPS Fault Proof tool
+➜  optimism git:(52d0e60c1) ✗
+```
+
+This issue appears to be pre-existing to the changes in scope; using Docker images to run the challenger is [mentioned as option](https://docs.optimism.io/builders/chain-operators/tools/op-challenger), but only as alternative option, hence the Low risk assessed for this finding.
+
+#### Impact
+Because of this issue, challenger instances operated in a Docker container won't be able to function properly.
+
+#### Recommendation
+Consider modifying the Docker build chain to include the `embeds` folder.
+Consider extending the current e2e test suite to cover execution from Docker images.
+
+#### Discussion
+
+> @inphi The cannon-2 implementation that supports go1.22 is now embedded into the cannon cli binary. Note that these embeds are not actual files that you can find in the docker container filesystem. But rather an embedded filesystem inside the Go binary - https://pkg.go.dev/embed.
+
+> @3DOC Oh yes I see that. So those are included in an embedded filesystem, I missed that
+
+
+[high]: https://img.shields.io/badge/-HIGH-b02319 "HIGH"
+[medium]: https://img.shields.io/badge/-MEDIUM-orange "MEDIUM"
+[low]: https://img.shields.io/badge/-LOW-FFD700 "LOW"
+[information]: https://img.shields.io/badge/-INFORMATION-darkgreen "INFORMATION"
+[fixed]: https://img.shields.io/badge/-FIXED-brightgreen "FIXED"
+[acknowledged]: https://img.shields.io/badge/-ACKNOWLEDGED-blue "ACKNOWLEDGED"
+[disputed]: https://img.shields.io/badge/-DISPUTED-lightgrey "DISPUTED"
+[reported]: https://img.shields.io/badge/-REPORTED-lightblue "REPORTED"
+[partiallyfixed]: https://img.shields.io/badge/-PARTIALLY_FIXED-lightgreen "PARTIALLTY FIXED"
diff --git a/docs/security-reviews/README.md b/docs/security-reviews/README.md
index 483dc1541858..5639b74410b8 100644
--- a/docs/security-reviews/README.md
+++ b/docs/security-reviews/README.md
@@ -6,7 +6,7 @@ Each review is focused on a different part of the codebase, and at a different p
 Please see the report for the specific details.
 
 | Date    | Reviewer             | Focus and Scope                                                                                                                                                                                                           | Report Link                                                                                                                                                | Commit                                       | Subsequent Release  |
-| ------- | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------- | ------------------- |
+|---------|----------------------| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |------------------------------------------------------------------------------------------------------------------------------------------------------------| -------------------------------------------- |---------------------|
 | 2020-10 | Trail of Bits        | Rollup                                                                                                                                                                                                                    | [2020_10-TrailOfBits.pdf](./2020_10-Rollup-TrailOfBits.pdf)                                                                                                |                                              |                     |
 | 2020-11 | Dapphub              | ECDSA Wallet                                                                                                                                                                                                              | [2020_11-Dapphub-ECDSA_Wallet.pdf](./2020_11-Dapphub-ECDSA_Wallet.pdf)                                                                                     |                                              |                     |
 | 2021-03 | OpenZeppelin         | OVM and Rollup                                                                                                                                                                                                            | [2021_03-OVM_and_Rollup-OpenZeppelin.pdf](./2021_03-OVM_and_Rollup-OpenZeppelin.pdf)                                                                       |                                              |                     |
@@ -27,5 +27,6 @@ Please see the report for the specific details.
 | 2024-03 | Sherlock             | Fault Proofs                                                                                                                                                                                                              | Sherlock Optimism Fault Proofs Contest ([site](https://audits.sherlock.xyz/contests/205), [repo](https://github.com/sherlock-audit/2024-02-optimism-2024)) |                                              |                     |
 | 2024-08 | Cantina              | Fault proof no-MIPS: All contracts in the `packages/contracts-bedrock/src/dispute` directory                                                                                                                              | [./2024_08_Fault-Proofs-MIPS_Cantina.pdf](./2024_08_Fault-Proofs-MIPS_Cantina.pdf)                                                                         | 1f7081798ce2d49b8643514663d10681cb853a3d     | op-contracts/v1.4.0 |
 | 2024-08 | Spearbit             | Fault proof MIPS: `MIPS.sol`                                                                                                                                                                                              | [./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf](./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf)                                                                 | 71b93116738ee98c9f8713b1a5dfe626ce06c1b2     | op-contracts/v1.6.0 |
+| 2024-10 | 3Doc Security        | Fault proof MIPS: `MIPS.sol`                                                                                                                                                                                              | [./2024_10-Cannon-FGETFD-3DocSecurity.md](./2024_10-Cannon-FGETFD-3DocSecurity.md)                                                                         | 52d0e60c16498ad4efec8798e3fc1b36b13f46a2     | op-contracts/v1.8.0 |
 
 [kontrol]: https://github.com/ethereum-optimism/optimism/blob/876e16ad04968f0bb641eb76f98eb77e7e1a3e16/packages/contracts-bedrock/test/kontrol/README.md

From c4a44c977d55df770d2ad4b9f0dd521beb64f11c Mon Sep 17 00:00:00 2001
From: BE Water <CarolAHHaydn@gmail.com>
Date: Tue, 19 Nov 2024 08:58:31 +0400
Subject: [PATCH 204/451] make the solidity code path correct. (#12959)

---
 packages/contracts-bedrock/meta/STYLE_GUIDE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contracts-bedrock/meta/STYLE_GUIDE.md b/packages/contracts-bedrock/meta/STYLE_GUIDE.md
index 1d8b84818b9b..00af13d5a5b4 100644
--- a/packages/contracts-bedrock/meta/STYLE_GUIDE.md
+++ b/packages/contracts-bedrock/meta/STYLE_GUIDE.md
@@ -96,8 +96,8 @@ Spacers MUST be `private`.
 
 All contracts should be assumed to live behind proxies (except in certain special circumstances).
 This means that new contracts MUST be built under the assumption of upgradeability.
-We use a minimal [`Proxy`](./src/universal/Proxy.sol) contract designed to be owned by a
-corresponding [`ProxyAdmin`](./src/universal/ProxyAdmin.sol) which follow the interfaces
+We use a minimal [`Proxy`](../src/universal/Proxy.sol) contract designed to be owned by a
+corresponding [`ProxyAdmin`](../src/universal/ProxyAdmin.sol) which follow the interfaces
 of OpenZeppelin's `Proxy` and `ProxyAdmin` contracts, respectively.
 
 Unless explicitly discussed otherwise, you MUST include the following basic upgradeability

From 52e9be8aed15b17249bf47c10c22728e6c71fc62 Mon Sep 17 00:00:00 2001
From: brawn <nftdropped@gmail.com>
Date: Tue, 19 Nov 2024 08:08:11 +0300
Subject: [PATCH 205/451] Typo fix Update build-legacy-cannons.sh (#12955)

Fix typo in build script comment for clarity
---
 cannon/scripts/build-legacy-cannons.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cannon/scripts/build-legacy-cannons.sh b/cannon/scripts/build-legacy-cannons.sh
index 62b543839841..3df0a43c31ea 100755
--- a/cannon/scripts/build-legacy-cannons.sh
+++ b/cannon/scripts/build-legacy-cannons.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 SCRIPTS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # This script builds a version of the cannon executable that includes support for both current and legacy state versions.
-# Each cannon release is built
+# Each cannon release is built separately.
 
 TMP_DIR=$(mktemp -d)
 function cleanup() {

From d67530964d6da9b87db48cfffc48fb7e212219ee Mon Sep 17 00:00:00 2001
From: Donny <130464015+defitricks@users.noreply.github.com>
Date: Tue, 19 Nov 2024 07:11:24 +0200
Subject: [PATCH 206/451] Typo Update pr-guidelines.md (#12929)

CI must passing should be CI must pass.
---
 docs/handbook/pr-guidelines.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/handbook/pr-guidelines.md b/docs/handbook/pr-guidelines.md
index cf133ada6c57..57913ebeaa51 100644
--- a/docs/handbook/pr-guidelines.md
+++ b/docs/handbook/pr-guidelines.md
@@ -46,4 +46,4 @@ This is organized by current state of PR, so it can be easily referenced frequen
 ### 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.
+- **Other Standard Merge Requirements**: The PR must be approved by the appropriate reviewers, CI must pass, and other standard merge requirements apply.

From 3d50ab9eda5e087137257ad23ee6ac727b105771 Mon Sep 17 00:00:00 2001
From: soyboy <85043086+sbvegan@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:14:52 +0800
Subject: [PATCH 207/451] Update README.md (#12945)

- fixing the audit commits and descriptions so they map correctly
---
 docs/security-reviews/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/security-reviews/README.md b/docs/security-reviews/README.md
index 5639b74410b8..265d0a65f903 100644
--- a/docs/security-reviews/README.md
+++ b/docs/security-reviews/README.md
@@ -25,8 +25,8 @@ Please see the report for the specific details.
 | 2024-02 | Runtime Verification | Pausability                                                                                                                                                                                                               | [Kontrol Verification][kontrol]                                                                                                                            |                                              |                     |
 | 2024-02 | Cantina              | MCP L1: `OptimismPortal.sol`, `L1CrossDomainMessenger.sol`, `L1StandardBridge.sol`, `L1ERC721Bridge.sol`, `OptimismMintableERC20Factory.sol`, `L2OutputOracle.sol`, `SystemConfig.sol`                                    | [2024_02-MCP_L1-Cantina.pdf](./2024_02-MCP_L1-Cantina.pdf)                                                                                                 | e6ef3a900c42c8722e72c2e2314027f85d12ced5     | op-contracts/v1.3.0 |
 | 2024-03 | Sherlock             | Fault Proofs                                                                                                                                                                                                              | Sherlock Optimism Fault Proofs Contest ([site](https://audits.sherlock.xyz/contests/205), [repo](https://github.com/sherlock-audit/2024-02-optimism-2024)) |                                              |                     |
-| 2024-08 | Cantina              | Fault proof no-MIPS: All contracts in the `packages/contracts-bedrock/src/dispute` directory                                                                                                                              | [./2024_08_Fault-Proofs-MIPS_Cantina.pdf](./2024_08_Fault-Proofs-MIPS_Cantina.pdf)                                                                         | 1f7081798ce2d49b8643514663d10681cb853a3d     | op-contracts/v1.4.0 |
-| 2024-08 | Spearbit             | Fault proof MIPS: `MIPS.sol`                                                                                                                                                                                              | [./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf](./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf)                                                                 | 71b93116738ee98c9f8713b1a5dfe626ce06c1b2     | op-contracts/v1.6.0 |
+| 2024-08 | Cantina              | Fault proof MIPS: `MIPS.sol`                                                                                                                                                                                              | [./2024_08_Fault-Proofs-MIPS_Cantina.pdf](./2024_08_Fault-Proofs-MIPS_Cantina.pdf)                                                                         | 71b93116738ee98c9f8713b1a5dfe626ce06c1b2     | op-contracts/v1.4.0 |
+| 2024-08 | Spearbit             | Fault proof no-MIPS: All contracts in the `packages/contracts-bedrock/src/dispute` directory                                                                                                                              | [./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf](./2024_08_Fault-Proofs-No-MIPS_Spearbit.pdf)                                                                 | 1f7081798ce2d49b8643514663d10681cb853a3d     | op-contracts/v1.6.0 |
 | 2024-10 | 3Doc Security        | Fault proof MIPS: `MIPS.sol`                                                                                                                                                                                              | [./2024_10-Cannon-FGETFD-3DocSecurity.md](./2024_10-Cannon-FGETFD-3DocSecurity.md)                                                                         | 52d0e60c16498ad4efec8798e3fc1b36b13f46a2     | op-contracts/v1.8.0 |
 
 [kontrol]: https://github.com/ethereum-optimism/optimism/blob/876e16ad04968f0bb641eb76f98eb77e7e1a3e16/packages/contracts-bedrock/test/kontrol/README.md

From fbcfb837de427c43a57e76de2373d9c76fce873e Mon Sep 17 00:00:00 2001
From: brawn <nftdropped@gmail.com>
Date: Tue, 19 Nov 2024 10:27:18 +0300
Subject: [PATCH 208/451] Typo fix Update commitment.go (#12961)

Fix typo in comment for Keccak256Commitment.Encode method
---
 op-alt-da/commitment.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-alt-da/commitment.go b/op-alt-da/commitment.go
index cc5829ad4dc6..a6fa5424665b 100644
--- a/op-alt-da/commitment.go
+++ b/op-alt-da/commitment.go
@@ -108,7 +108,7 @@ func (c Keccak256Commitment) CommitmentType() CommitmentType {
 	return Keccak256CommitmentType
 }
 
-// Encode adds a commitment type prefix self describing the commitment.
+// Encode adds a commitment type prefix that describes the commitment.
 func (c Keccak256Commitment) Encode() []byte {
 	return append([]byte{byte(Keccak256CommitmentType)}, c...)
 }

From 3e7c1dd69d48c1edefd593abe555fd2fd8eec9be Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Tue, 19 Nov 2024 15:28:01 +0800
Subject: [PATCH 209/451] fix typos (#12910)

---
 .../contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
index 74492556e1b1..5e35e8848c8a 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
@@ -60,9 +60,9 @@ import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 // we use variable names that are shorthand for the full contract names, for example:
 //   - `dsi` for DeploySuperchainInput
 //   - `dso` for DeploySuperchainOutput
-//   - `dio` for DeployImplementationsInput
+//   - `dii` for DeployImplementationsInput
 //   - `dio` for DeployImplementationsOutput
-//   - `doo` for DeployOPChainInput
+//   - `doi` for DeployOPChainInput
 //   - `doo` for DeployOPChainOutput
 //   - etc.
 

From e8de7b191b0df2fd454fce6955bc5702e34bf297 Mon Sep 17 00:00:00 2001
From: Cypher Pepe <125112044+cypherpepe@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:29:12 +0300
Subject: [PATCH 210/451] chore: Fix Typos and Minor Edits in Documentation
 Files* (#12881)

* typo corr 2022-02-02-inflation-vuln.md

* typo corr README.md

* typo corr RUNBOOK.md
---
 docs/postmortems/2022-02-02-inflation-vuln.md | 2 +-
 op-challenger/README.md                       | 2 +-
 op-conductor/RUNBOOK.md                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/postmortems/2022-02-02-inflation-vuln.md b/docs/postmortems/2022-02-02-inflation-vuln.md
index a755b0fdfe38..a2a23e382303 100644
--- a/docs/postmortems/2022-02-02-inflation-vuln.md
+++ b/docs/postmortems/2022-02-02-inflation-vuln.md
@@ -58,7 +58,7 @@ timeline and activities were as follows:
 (Using github handles as identifiers)
 
 - 2022-02-02 1625: smartcontracts receives an e-mail from saurik claiming to have found a critical
-  issue in L2Geth. E-mail was sent to securityoptimism.io.
+  issue in L2Geth. E-mail was sent to security@optimism.io.
 - 2022-02-02 X: saurik messaged smartcontracts on Discord to make sure we checked the e-mail since
   he knew we had a prior problem where security advisories went to spam.
 - 2022-02-02 1650: Huddle begins in #security on Slack.
diff --git a/op-challenger/README.md b/op-challenger/README.md
index 97fafab8e6f7..5efbbd85b3d3 100644
--- a/op-challenger/README.md
+++ b/op-challenger/README.md
@@ -1,7 +1,7 @@
 # op-challenger
 
 The `op-challenger` is a modular **op-stack** challenge agent written in
-golang for dispute games including, but not limited to,attestation games,
+golang for dispute games including, but not limited to, attestation games,
 fault games, and validity games. To learn more about dispute games, visit
 the [fault proof specs][proof-specs].
 
diff --git a/op-conductor/RUNBOOK.md b/op-conductor/RUNBOOK.md
index 8e80fde6b6c0..00b8757a338e 100644
--- a/op-conductor/RUNBOOK.md
+++ b/op-conductor/RUNBOOK.md
@@ -28,7 +28,7 @@ OP_CONDUCTOR_NODE_RPC=<node-rpc-endpoint> # for example, http://op-node:8545
 OP_CONDUCTOR_EXECUTION_RPC=<execution-rpc-endpoint> # for example, http://op-geth:8545
 OP_CONDUCTOR_NETWORK=<network-name> # for example, base-mainnet, op-mainnet, etc, should be same as OP_NODE_NETWORK
 OP_CONDUCTOR_HEALTHCHECK_INTERVAL=<healthcheck-interval> # in seconds
-OP_CONDUCTOR_HEALTHCHECK_UNSAFE_INTERVAL=<unsafe-interval> # Interval allowed between unsafe head and now measured in seconds in seconds
+OP_CONDUCTOR_HEALTHCHECK_UNSAFE_INTERVAL=<unsafe-interval> # Interval allowed between unsafe head and now measured in seconds
 OP_CONDUCTOR_HEALTHCHECK_MIN_PEER_COUNT=<min-peer-count> # minimum number of peers required to be considered healthy
 OP_CONDUCTOR_RAFT_BOOTSTRAP=true/false # set to true if you want to bootstrap the raft cluster
 ```

From b3ec4d6972f1e1363a8fc5397b0ff434280be3a1 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Tue, 19 Nov 2024 10:34:16 +0000
Subject: [PATCH 211/451] batcher refactor: flatten out go routines (#12405)

* flatten out batcher goroutines

* move wg increment to parent fn

* ensure mainloop closes before receipts loop

* add comments

* pass a context to both loops

* remove debug lines

* clean up mutex handling in receiptsLoop

* don't need to set default value the first time
* avoid writing to Logger while holding mutex

* typo

* increase log level and include tx.ID

* fix changes from merge, hoist throttling loop goroutine launch to driver

* call done on waitgroup in throttlingLoop

* move function around

hoping this makes the diff nicer
---
 op-batcher/batcher/driver.go | 78 ++++++++++++++++++++++--------------
 op-batcher/readme.md         |  2 +-
 2 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 2c9db3821e3a..7b1d6139e265 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -111,7 +111,7 @@ type BatchSubmitter struct {
 	running bool
 
 	txpoolMutex       sync.Mutex // guards txpoolState and txpoolBlockedBlob
-	txpoolState       int
+	txpoolState       TxPoolState
 	txpoolBlockedBlob bool
 
 	// lastStoredBlock is the last block loaded into `state`. If it is empty it should be set to the l2 safe head.
@@ -160,8 +160,20 @@ func (l *BatchSubmitter) StartBatchSubmitting() error {
 		}
 	}
 
-	l.wg.Add(1)
-	go l.loop()
+	receiptsCh := make(chan txmgr.TxReceipt[txRef])
+	receiptsLoopCtx, cancelReceiptsLoopCtx := context.WithCancel(context.Background())
+	throttlingLoopCtx, cancelThrottlingLoopCtx := context.WithCancel(context.Background())
+
+	// DA throttling loop should always be started except for testing (indicated by ThrottleInterval == 0)
+	if l.Config.ThrottleInterval > 0 {
+		l.wg.Add(1)
+		go l.throttlingLoop(throttlingLoopCtx)
+	} else {
+		l.Log.Warn("Throttling loop is DISABLED due to 0 throttle-interval. This should not be disabled in prod.")
+	}
+	l.wg.Add(2)
+	go l.processReceiptsLoop(receiptsLoopCtx, receiptsCh)                                    // receives from receiptsCh
+	go l.mainLoop(l.shutdownCtx, receiptsCh, cancelReceiptsLoopCtx, cancelThrottlingLoopCtx) // sends on receiptsCh
 
 	l.Log.Info("Batch Submitter started")
 	return nil
@@ -390,6 +402,8 @@ func (l *BatchSubmitter) calculateL2BlockRangeToStore(syncStatus eth.SyncStatus)
 // Submitted batch, but it is not valid
 // Missed L2 block somehow.
 
+type TxPoolState int
+
 const (
 	// Txpool states.  Possible state transitions:
 	//   TxpoolGood -> TxpoolBlocked:
@@ -399,13 +413,29 @@ const (
 	//     send a cancellation transaction.
 	//   TxpoolCancelPending -> TxpoolGood:
 	//     happens once the cancel transaction completes, whether successfully or in error.
-	TxpoolGood int = iota
+	TxpoolGood TxPoolState = iota
 	TxpoolBlocked
 	TxpoolCancelPending
 )
 
-func (l *BatchSubmitter) loop() {
+// setTxPoolState locks the mutex, sets the parameters to the supplied ones, and release the mutex.
+func (l *BatchSubmitter) setTxPoolState(txPoolState TxPoolState, txPoolBlockedBlob bool) {
+	l.txpoolMutex.Lock()
+	l.txpoolState = txPoolState
+	l.txpoolBlockedBlob = txPoolBlockedBlob
+	l.txpoolMutex.Unlock()
+}
+
+// mainLoop periodically:
+// -  polls the sequencer,
+// -  prunes the channel manager state (i.e. safe blocks)
+// -  loads unsafe blocks from the sequencer
+// -  drives the creation of channels and frames
+// -  sends transactions to the DA layer
+func (l *BatchSubmitter) mainLoop(ctx context.Context, receiptsCh chan txmgr.TxReceipt[txRef], receiptsLoopCancel, throttlingLoopCancel context.CancelFunc) {
 	defer l.wg.Done()
+	defer receiptsLoopCancel()
+	defer throttlingLoopCancel()
 
 	queue := txmgr.NewQueue[txRef](l.killCtx, l.Txmgr, l.Config.MaxPendingTransactions)
 	daGroup := &errgroup.Group{}
@@ -419,22 +449,8 @@ func (l *BatchSubmitter) loop() {
 	l.txpoolState = TxpoolGood
 	l.txpoolMutex.Unlock()
 
-	// start the receipt/result processing loop
-	receiptsLoopDone := make(chan struct{})
-	defer close(receiptsLoopDone) // shut down receipt loop
 	l.l2BlockAdded = make(chan struct{})
 	defer close(l.l2BlockAdded)
-	receiptsCh := make(chan txmgr.TxReceipt[txRef])
-	go l.processReceiptsLoop(receiptsCh, receiptsLoopDone)
-
-	// DA throttling loop should always be started except for testing (indicated by ThrottleInterval == 0)
-	if l.Config.ThrottleInterval > 0 {
-		throttlingLoopDone := make(chan struct{})
-		defer close(throttlingLoopDone)
-		go l.throttlingLoop(throttlingLoopDone)
-	} else {
-		l.Log.Warn("Throttling loop is DISABLED due to 0 throttle-interval. This should not be disabled in prod.")
-	}
 
 	ticker := time.NewTicker(l.Config.PollInterval)
 	defer ticker.Stop()
@@ -467,34 +483,33 @@ func (l *BatchSubmitter) loop() {
 				continue
 			}
 			l.publishStateToL1(queue, receiptsCh, daGroup, l.Config.PollInterval)
-		case <-l.shutdownCtx.Done():
+		case <-ctx.Done():
 			l.Log.Warn("main loop returning")
 			return
 		}
 	}
 }
 
-func (l *BatchSubmitter) processReceiptsLoop(receiptsCh chan txmgr.TxReceipt[txRef], receiptsLoopDone chan struct{}) {
+// processReceiptsLoop handles transaction receipts from the DA layer
+func (l *BatchSubmitter) processReceiptsLoop(ctx context.Context, receiptsCh chan txmgr.TxReceipt[txRef]) {
+	defer l.wg.Done()
 	l.Log.Info("Starting receipts processing loop")
 	for {
 		select {
 		case r := <-receiptsCh:
-			l.txpoolMutex.Lock()
 			if errors.Is(r.Err, txpool.ErrAlreadyReserved) && l.txpoolState == TxpoolGood {
-				l.txpoolState = TxpoolBlocked
-				l.txpoolBlockedBlob = r.ID.isBlob
-				l.Log.Info("incompatible tx in txpool", "is_blob", r.ID.isBlob)
+				l.setTxPoolState(TxpoolBlocked, r.ID.isBlob)
+				l.Log.Warn("incompatible tx in txpool", "id", r.ID, "is_blob", r.ID.isBlob)
 			} else if r.ID.isCancel && l.txpoolState == TxpoolCancelPending {
 				// Set state to TxpoolGood even if the cancellation transaction ended in error
 				// since the stuck transaction could have cleared while we were waiting.
-				l.txpoolState = TxpoolGood
+				l.setTxPoolState(TxpoolGood, l.txpoolBlockedBlob)
 				l.Log.Info("txpool may no longer be blocked", "err", r.Err)
 			}
-			l.txpoolMutex.Unlock()
 			l.Log.Info("Handling receipt", "id", r.ID)
 			l.handleReceipt(r)
-		case <-receiptsLoopDone:
-			l.Log.Info("Receipts processing loop done")
+		case <-ctx.Done():
+			l.Log.Info("Receipt processing loop done")
 			return
 		}
 	}
@@ -504,7 +519,8 @@ func (l *BatchSubmitter) processReceiptsLoop(receiptsCh chan txmgr.TxReceipt[txR
 // throttling of incoming data prevent the backlog from growing too large. By looping & calling the miner API setter
 // continuously, we ensure the engine currently in use is always going to be reset to the proper throttling settings
 // even in the event of sequencer failover.
-func (l *BatchSubmitter) throttlingLoop(throttlingLoopDone chan struct{}) {
+func (l *BatchSubmitter) throttlingLoop(ctx context.Context) {
+	defer l.wg.Done()
 	l.Log.Info("Starting DA throttling loop")
 	ticker := time.NewTicker(l.Config.ThrottleInterval)
 	defer ticker.Stop()
@@ -556,7 +572,7 @@ func (l *BatchSubmitter) throttlingLoop(throttlingLoopDone chan struct{}) {
 			updateParams()
 		case <-ticker.C:
 			updateParams()
-		case <-throttlingLoopDone:
+		case <-ctx.Done():
 			l.Log.Info("DA throttling loop done")
 			return
 		}
diff --git a/op-batcher/readme.md b/op-batcher/readme.md
index 1d601fea94be..e09eb3fce2a9 100644
--- a/op-batcher/readme.md
+++ b/op-batcher/readme.md
@@ -50,7 +50,7 @@ When an L2 unsafe reorg is detected, the batch submitter will reset its state, a
 When a Tx fails, an asynchronous receipts handler is triggered. The channel from whence the Tx's frames came has its `frameCursor` rewound, so that all the frames can be resubmitted in order.
 
 ### Channel Times Out
-When at Tx is confirmed, an asynchronous receipts handler is triggered. We only update the batcher's state if the channel timed out on chain. In that case, the `blockCursor` is rewound to the first block added to that channel, and the channel queue is cleared out. This allows the batcher to start fresh building a new channel starting from the same block -- it does not need to refetch blocks from the sequencer.
+When a Tx is confirmed, an asynchronous receipts handler is triggered. We only update the batcher's state if the channel timed out on chain. In that case, the `blockCursor` is rewound to the first block added to that channel, and the channel queue is cleared out. This allows the batcher to start fresh building a new channel starting from the same block -- it does not need to refetch blocks from the sequencer.
 
 ## Design Principles and Optimization Targets
 At the current time, the batcher should be optimized for correctness, simplicity and robustness. It is considered preferable to prioritize these properties, even at the expense of other potentially desirable properties such as frugality. For example, it is preferable to have the batcher resubmit some data from time to time ("wasting" money on data availability costs) instead of avoiding that by e.g. adding some persistent state to the batcher.

From aec36974369a238c112259b2f0131efb083ce68d Mon Sep 17 00:00:00 2001
From: Roberto Bayardo <roberto.bayardo@coinbase.com>
Date: Tue, 19 Nov 2024 03:19:26 -0800
Subject: [PATCH 212/451] document batcher throttling in op-batcher readme
 (#12957)

---
 op-batcher/readme.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/op-batcher/readme.md b/op-batcher/readme.md
index e09eb3fce2a9..ba547845f099 100644
--- a/op-batcher/readme.md
+++ b/op-batcher/readme.md
@@ -60,6 +60,25 @@ The batcher can almost always recover from unforeseen situations by being restar
 
 Some complexity is permitted, however, for handling data availability switching, so that the batcher is not wasting money for longer periods of time.
 
+### Data Availability Backlog
+
+A chain can potentially experience an influx of large transactions whose data availability requirements exceed the total
+throughput of the data availability layer. While this situation might resolve on its own in the long term through the
+data availability pricing mechanism, in practice this feedback loop is too slow to prevent a very large backlog of data
+from being produced, even at a relatively low cost to whomever is submitting the large transactions. In such
+circumstances, the safe head can fall significantly behind the unsafe head, and the time between seeing a transaction
+(and charging it a given L1 data fee) and actually posting the transaction to the data availability layer grows larger
+and larger. Because DA costs can rise quickly during such an event, the batcher can end up paying far more to post the
+transaction to the DA layer than what can be recovered from the transaction's data fee.
+
+To prevent a significant DA backlog, the batcher can instruct the block builder (via op-geth's miner RPC API) to impose
+thresholds on the total DA requirements of a single block, and/or the maximum DA requirement of any single
+transaction. In the happy case, the batcher instructs the block builder to impose a block-level DA limit of
+OP_BATCHER_THROTTLE_ALWAYS_BLOCK_SIZE, and imposes no additional limit on the DA requirements of a single
+transaction. But in the case of a DA backlog (as defined by OP_BATCHER_THROTTLE_THRESHOLD), the batcher instructs the
+block builder to instead impose a (tighter) block level limit of OP_BATCHER_THROTTLE_BLOCK_SIZE, and a single
+transaction limit of OP_BATCHER_THROTTLE_TRANSACTION_SIZE.
+
 ## Known issues and future work
 
 Link to [open issues with the `op-batcher` tag](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aopen+is%3Aissue+label%3AA-op-batcher).

From 8e0b89c116d0e294d9fb6e8c60a4bc70421b57d7 Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Tue, 19 Nov 2024 12:52:24 +0100
Subject: [PATCH 213/451] Update superchain-registry to include metal-sepolia
 Holocene activation (#12966)

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 11a236812990..4fb2c9053db5 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/crate-crypto/go-kzg-4844 v1.0.0
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
-	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241113154227-e72c6311f6e7
+	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241119111730-bee358f6d6e6
 	github.com/ethereum/go-ethereum v1.14.11
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
@@ -250,7 +250,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.2-rc.1
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.2-rc.2
 
 //replace github.com/ethereum/go-ethereum => ../go-ethereum
 
diff --git a/go.sum b/go.sum
index 8436ca18ce06..7efcb5da40bd 100644
--- a/go.sum
+++ b/go.sum
@@ -187,10 +187,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.2-rc.1 h1:v314tR5EzG+QNE9aLf+goWCDsTT+RT2EsdOOlJT6CwM=
-github.com/ethereum-optimism/op-geth v1.101411.2-rc.1/go.mod h1:RrPkuqfeIXkW28lQJwc5AG/BKbhkHRXPD5YezeeK4w8=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241113154227-e72c6311f6e7 h1:Mbgsp5T52F2pEULHccLr4NtnT6cKnJgabpAPlTfPxrk=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241113154227-e72c6311f6e7/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
+github.com/ethereum-optimism/op-geth v1.101411.2-rc.2 h1:3suWTU9DwBdY8Yy/ZgZLB/yBy3TwpntpkUn61mZgNpY=
+github.com/ethereum-optimism/op-geth v1.101411.2-rc.2/go.mod h1:dITJzx1KXsV2KusscsktidEb00blTSyFhalq8CjfsUY=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241119111730-bee358f6d6e6 h1:+AIYWDX7FeWRLnBVqPiwireTacLLGGww1slGyv+YN0o=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241119111730-bee358f6d6e6/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
 github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=

From 910c9ade39c0bcdff5f2badd94efbe016a428e73 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Tue, 19 Nov 2024 14:08:20 +0000
Subject: [PATCH 214/451] batcher: add batchSubmitter.checkExpectedProgress
 (#12430)

* implement batchSubmitter.checkExpectedProgress

* remove buffer variable

* add warning logs when calling waitNodeSyncAndClearState

* push method down into channel manager and add test

* clarify SyncStatus documentation

* improve TestChannelManager_CheckExpectedProgress

make parameters "tighter" / more realistic and check an extra case
---
 op-batcher/batcher/channel_manager.go      | 16 +++++++
 op-batcher/batcher/channel_manager_test.go | 54 ++++++++++++++++++++++
 op-batcher/batcher/driver.go               | 30 ++++++++----
 op-service/eth/sync_status.go              |  2 +-
 4 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 4208a8cd3795..81ee0fb35a51 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -549,3 +549,19 @@ func (s *channelManager) PendingDABytes() int64 {
 	}
 	return int64(f)
 }
+
+// CheckExpectedProgress uses the supplied syncStatus to infer
+// whether the node providing the status has made the expected
+// safe head progress given fully submitted channels held in
+// state.
+func (m *channelManager) CheckExpectedProgress(syncStatus eth.SyncStatus) error {
+	for _, ch := range m.channelQueue {
+		if ch.isFullySubmitted() && // This implies a number of l1 confirmations has passed, depending on how the txmgr was configured
+			!ch.isTimedOut() &&
+			syncStatus.CurrentL1.Number > ch.maxInclusionBlock &&
+			syncStatus.SafeL2.Number < ch.LatestL2().Number {
+			return errors.New("safe head did not make expected progress")
+		}
+	}
+	return nil
+}
diff --git a/op-batcher/batcher/channel_manager_test.go b/op-batcher/batcher/channel_manager_test.go
index 1c742207a5f0..32aae1b06dd1 100644
--- a/op-batcher/batcher/channel_manager_test.go
+++ b/op-batcher/batcher/channel_manager_test.go
@@ -627,3 +627,57 @@ func TestChannelManager_ChannelOutFactory(t *testing.T) {
 
 	require.IsType(t, &ChannelOutWrapper{}, m.currentChannel.channelBuilder.co)
 }
+
+func TestChannelManager_CheckExpectedProgress(t *testing.T) {
+	l := testlog.Logger(t, log.LevelCrit)
+	cfg := channelManagerTestConfig(100, derive.SingularBatchType)
+	cfg.InitNoneCompressor()
+	m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
+
+	channelMaxInclusionBlockNumber := uint64(3)
+	channelLatestSafeBlockNumber := uint64(11)
+
+	// Prepare a (dummy) fully submitted channel
+	// with
+	// maxInclusionBlock and latest safe block number as above
+	A, err := newChannelWithChannelOut(l, metrics.NoopMetrics, cfg, m.rollupCfg, 0)
+	require.NoError(t, err)
+	rng := rand.New(rand.NewSource(123))
+	a0 := derivetest.RandomL2BlockWithChainId(rng, 1, defaultTestRollupConfig.L2ChainID)
+	a0 = a0.WithSeal(&types.Header{Number: big.NewInt(int64(channelLatestSafeBlockNumber))})
+	_, err = A.AddBlock(a0)
+	require.NoError(t, err)
+	A.maxInclusionBlock = channelMaxInclusionBlockNumber
+	A.Close()
+	A.channelBuilder.frames = nil
+	A.channelBuilder.frameCursor = 0
+	require.True(t, A.isFullySubmitted())
+
+	m.channelQueue = append(m.channelQueue, A)
+
+	// The current L1 number implies that
+	// channel A above should have been derived
+	// from, so we expect safe head to progress to
+	// the channelLatestSafeBlockNumber.
+	// Since the safe head moved to 11, there is no error:
+	ss := eth.SyncStatus{
+		CurrentL1: eth.L1BlockRef{Number: channelMaxInclusionBlockNumber + 1},
+		SafeL2:    eth.L2BlockRef{Number: channelLatestSafeBlockNumber},
+	}
+	err = m.CheckExpectedProgress(ss)
+	require.NoError(t, err)
+
+	// If the currentL1 is as above but the
+	// safe head is less than channelLatestSafeBlockNumber,
+	// the method should return an error:
+	ss.SafeL2 = eth.L2BlockRef{Number: channelLatestSafeBlockNumber - 1}
+	err = m.CheckExpectedProgress(ss)
+	require.Error(t, err)
+
+	// If the safe head is still less than channelLatestSafeBlockNumber
+	// but the currentL1 is _equal_ to the channelMaxInclusionBlockNumber
+	// there should be no error as that block is still being derived from:
+	ss.CurrentL1 = eth.L1BlockRef{Number: channelMaxInclusionBlockNumber}
+	err = m.CheckExpectedProgress(ss)
+	require.NoError(t, err)
+}
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 7b1d6139e265..dde08ac84193 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -471,17 +471,20 @@ func (l *BatchSubmitter) mainLoop(ctx context.Context, receiptsCh chan txmgr.TxR
 
 			l.state.pruneSafeBlocks(syncStatus.SafeL2)
 			l.state.pruneChannels(syncStatus.SafeL2)
+
+			err = l.state.CheckExpectedProgress(*syncStatus)
+			if err != nil {
+				l.Log.Warn("error checking expected progress, clearing state and waiting for node sync", "err", err)
+				l.waitNodeSyncAndClearState()
+				continue
+			}
+
 			if err := l.loadBlocksIntoState(*syncStatus, l.shutdownCtx); errors.Is(err, ErrReorg) {
-				// Wait for any in flight transactions
-				// to be ingested by the node before
-				// we start loading blocks again.
-				err := l.waitNodeSync()
-				if err != nil {
-					l.Log.Warn("error waiting for node sync", "err", err)
-				}
-				l.clearState(l.shutdownCtx)
+				l.Log.Warn("error loading blocks, clearing state and waiting for node sync", "err", err)
+				l.waitNodeSyncAndClearState()
 				continue
 			}
+
 			l.publishStateToL1(queue, receiptsCh, daGroup, l.Config.PollInterval)
 		case <-ctx.Done():
 			l.Log.Warn("main loop returning")
@@ -579,6 +582,17 @@ func (l *BatchSubmitter) throttlingLoop(ctx context.Context) {
 	}
 }
 
+func (l *BatchSubmitter) waitNodeSyncAndClearState() {
+	// Wait for any in flight transactions
+	// to be ingested by the node before
+	// we start loading blocks again.
+	err := l.waitNodeSync()
+	if err != nil {
+		l.Log.Warn("error waiting for node sync", "err", err)
+	}
+	l.clearState(l.shutdownCtx)
+}
+
 // waitNodeSync Check to see if there was a batcher tx sent recently that
 // still needs more block confirmations before being considered finalized
 func (l *BatchSubmitter) waitNodeSync() error {
diff --git a/op-service/eth/sync_status.go b/op-service/eth/sync_status.go
index f9db1f672b82..e16275920e2b 100644
--- a/op-service/eth/sync_status.go
+++ b/op-service/eth/sync_status.go
@@ -5,7 +5,7 @@ package eth
 type SyncStatus struct {
 	// CurrentL1 is the L1 block that the derivation process is last idled at.
 	// This may not be fully derived into L2 data yet.
-	// The safe L2 blocks were produced/included fully from the L1 chain up to and including this L1 block.
+	// The safe L2 blocks were produced/included fully from the L1 chain up to _but excluding_ this L1 block.
 	// If the node is synced, this matches the HeadL1, minus the verifier confirmation distance.
 	CurrentL1 L1BlockRef `json:"current_l1"`
 	// CurrentL1Finalized is a legacy sync-status attribute. This is deprecated.

From 50e1623a8d0945f00a79eb8a569884f2a59d7fb5 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Tue, 19 Nov 2024 09:12:12 -0600
Subject: [PATCH 215/451] interop: Reset Derivation and Backfill Supervisor
 when Too Far Behind (#12919)

* Reset Derivation when Supervisor is Behind

* Disable Batcher Throttling in Interop local-devnet
---
 interop-devnet/docker-compose.yml                    |  2 ++
 op-node/rollup/interop/interop.go                    |  6 +++++-
 op-supervisor/supervisor/backend/db/fromda/update.go | 12 ++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/interop-devnet/docker-compose.yml b/interop-devnet/docker-compose.yml
index de97c9967b64..c4cbab978a12 100644
--- a/interop-devnet/docker-compose.yml
+++ b/interop-devnet/docker-compose.yml
@@ -319,6 +319,7 @@ services:
       OP_BATCHER_METRICS_ENABLED: "true"
       OP_BATCHER_RPC_ENABLE_ADMIN: "true"
       OP_BATCHER_BATCH_TYPE:
+      OP_BATCHER_THROTTLE_INTERVAL: 0
       # uncomment to use blobs
       # OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs
     env_file:
@@ -350,6 +351,7 @@ services:
       OP_BATCHER_METRICS_ENABLED: "true"
       OP_BATCHER_RPC_ENABLE_ADMIN: "true"
       OP_BATCHER_BATCH_TYPE:
+      OP_BATCHER_THROTTLE_INTERVAL: 0
       # uncomment to use blobs
       # OP_BATCHER_DATA_AVAILABILITY_TYPE: blobs
     env_file:
diff --git a/op-node/rollup/interop/interop.go b/op-node/rollup/interop/interop.go
index a4342b6a19f6..94fa77a5b309 100644
--- a/op-node/rollup/interop/interop.go
+++ b/op-node/rollup/interop/interop.go
@@ -3,6 +3,7 @@ package interop
 import (
 	"context"
 	"fmt"
+	"strings"
 	"sync"
 	"time"
 
@@ -139,7 +140,10 @@ func (d *InteropDeriver) onInteropPendingSafeChangedEvent(x engine.InteropPendin
 	defer cancel()
 	if err := d.backend.UpdateLocalSafe(ctx, d.chainID, x.DerivedFrom, x.Ref.BlockRef()); err != nil {
 		d.log.Debug("Failed to signal derived-from update to interop backend", "derivedFrom", x.DerivedFrom, "block", x.Ref)
-		// still continue to try and do a cross-safe update
+		if strings.Contains(err.Error(), "too far behind") {
+			d.log.Error("Supervisor is too far behind, resetting derivation", "err", err)
+			d.emitter.Emit(rollup.ResetEvent{Err: fmt.Errorf("supervisor is too far behind: %w", err)})
+		}
 	}
 	// Now that the op-supervisor is aware of the new local-safe block, we want to check if cross-safe changed.
 	d.emitter.Emit(engine.RequestCrossSafeEvent{})
diff --git a/op-supervisor/supervisor/backend/db/fromda/update.go b/op-supervisor/supervisor/backend/db/fromda/update.go
index 146e558cf266..957df9e2dfa7 100644
--- a/op-supervisor/supervisor/backend/db/fromda/update.go
+++ b/op-supervisor/supervisor/backend/db/fromda/update.go
@@ -67,8 +67,10 @@ func (db *DB) AddDerived(derivedFrom eth.BlockRef, derived eth.BlockRef) error {
 				derived, derived.ParentHash, lastDerived, types.ErrConflict)
 		}
 	} else if lastDerived.Number+1 < derived.Number {
-		return fmt.Errorf("derived block %s (parent: %s) is too new, expected to build on top of %s: %w",
-			derived, derived.ParentHash, lastDerived, types.ErrOutOfOrder)
+		return fmt.Errorf("cannot add block (%s derived from %s), last block (%s derived from %s) is too far behind: (%w)",
+			derived, derivedFrom,
+			lastDerived, lastDerivedFrom,
+			types.ErrOutOfOrder)
 	} else {
 		return fmt.Errorf("derived block %s is older than current derived block %s: %w",
 			derived, lastDerived, types.ErrOutOfOrder)
@@ -89,8 +91,10 @@ func (db *DB) AddDerived(derivedFrom eth.BlockRef, derived eth.BlockRef) error {
 		}
 	} else if lastDerivedFrom.Number+1 < derivedFrom.Number {
 		// adding block that is derived from something too far into the future
-		return fmt.Errorf("cannot add block %s as derived from %s, still deriving from %s: %w",
-			derived, derivedFrom, lastDerivedFrom, types.ErrOutOfOrder)
+		return fmt.Errorf("cannot add block (%s derived from %s), last block (%s derived from %s) is too far behind: (%w)",
+			derived, derivedFrom,
+			lastDerived, lastDerivedFrom,
+			types.ErrOutOfOrder)
 	} else {
 		// adding block that is derived from something too old
 		return fmt.Errorf("cannot add block %s as derived from %s, deriving already at %s: %w",

From cd2df97287c07856e4249da94031ea040eaa1cde Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 19 Nov 2024 09:20:31 -0700
Subject: [PATCH 216/451] op-deployer: Test mainnet deployment (#12958)

Adds a unit test for mainnet deployments at version 1.6.0.
---
 .circleci/config.yml                          |   1 +
 .../deployer/integration_test/apply_test.go   |  46 +++++++++++-------
 .../testdata/allocs-l2-v160-1.json.gz         | Bin 0 -> 152468 bytes
 .../testdata/allocs-l2-v160-11155111.json.gz  | Bin 0 -> 152484 bytes
 .../testdata/allocs-l2-v160.json.gz           | Bin 152466 -> 0 bytes
 5 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160-1.json.gz
 create mode 100644 op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160-11155111.json.gz
 delete mode 100644 op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160.json.gz

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9fbed7bde44d..08a5d7afd3fa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -867,6 +867,7 @@ jobs:
 
             export ENABLE_ANVIL=true
             export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io"
+            export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io"
 
             gotestsum --format=testname \
               --junitfile=./tmp/test-results/results.xml \
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 7f4c0cb06deb..0de23866946c 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -68,6 +68,8 @@ network_params:
   genesis_delay: 0
 `
 
+const defaultL1ChainID uint64 = 77799777
+
 type deployerKey struct{}
 
 func (d *deployerKey) HDPath() string {
@@ -99,7 +101,7 @@ func TestEndToEndApply(t *testing.T) {
 	require.NoError(t, err)
 
 	depKey := new(deployerKey)
-	l1ChainID := big.NewInt(77799777)
+	l1ChainID := new(big.Int).SetUint64(defaultL1ChainID)
 	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
 	require.NoError(t, err)
 	pk, err := dk.Secret(depKey)
@@ -151,9 +153,19 @@ func TestEndToEndApply(t *testing.T) {
 }
 
 func TestApplyExistingOPCM(t *testing.T) {
+	t.Run("mainnet", func(t *testing.T) {
+		testApplyExistingOPCM(t, 1, os.Getenv("MAINNET_RPC_URL"), standard.L1VersionsMainnet)
+	})
+	t.Run("sepolia", func(t *testing.T) {
+		testApplyExistingOPCM(t, 11155111, os.Getenv("SEPOLIA_RPC_URL"), standard.L1VersionsSepolia)
+	})
+}
+
+func testApplyExistingOPCM(t *testing.T, l1ChainID uint64, forkRPCUrl string, versions standard.L1Versions) {
+	op_e2e.InitParallel(t)
+
 	anvil.Test(t)
 
-	forkRPCUrl := os.Getenv("SEPOLIA_RPC_URL")
 	if forkRPCUrl == "" {
 		t.Skip("no fork RPC URL provided")
 	}
@@ -177,20 +189,20 @@ func TestApplyExistingOPCM(t *testing.T) {
 	l1Client, err := ethclient.Dial(runner.RPCUrl())
 	require.NoError(t, err)
 
-	l1ChainID := big.NewInt(11155111)
+	l1ChainIDBig := new(big.Int).SetUint64(l1ChainID)
 	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
 	require.NoError(t, err)
 	// index 0 from Anvil's test set
 	pk, err := crypto.HexToECDSA("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
 	require.NoError(t, err)
 
-	l2ChainID := uint256.NewInt(1)
+	l2ChainID := uint256.NewInt(777)
 
 	// Hardcode the below tags to ensure the test is validating the correct
 	// version even if the underlying tag changes
 	intent, st := newIntent(
 		t,
-		l1ChainID,
+		l1ChainIDBig,
 		dk,
 		l2ChainID,
 		artifacts.MustNewLocatorFromTag("op-contracts/v1.6.0"),
@@ -214,7 +226,7 @@ func TestApplyExistingOPCM(t *testing.T) {
 
 	validateOPChainDeployment(t, ethClientCodeGetter(ctx, l1Client), st, intent)
 
-	releases := standard.L1VersionsSepolia.Releases["op-contracts/v1.6.0"]
+	releases := versions.Releases["op-contracts/v1.6.0"]
 
 	implTests := []struct {
 		name    string
@@ -287,7 +299,7 @@ func TestApplyExistingOPCM(t *testing.T) {
 
 	require.EqualValues(t, expectedSemversL2, semvers)
 
-	f, err := os.Open("./testdata/allocs-l2-v160.json.gz")
+	f, err := os.Open(fmt.Sprintf("./testdata/allocs-l2-v160-%d.json.gz", l1ChainID))
 	require.NoError(t, err)
 	defer f.Close()
 	gzr, err := gzip.NewReader(f)
@@ -370,7 +382,7 @@ func TestL2BlockTimeOverride(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	opts, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t, defaultL1ChainID)
 	intent.GlobalDeployOverrides = map[string]interface{}{
 		"l2BlockTime": float64(3),
 	}
@@ -388,7 +400,7 @@ func TestApplyGenesisStrategy(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	opts, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t, defaultL1ChainID)
 
 	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
 
@@ -408,7 +420,7 @@ func TestProofParamOverrides(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	opts, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t, defaultL1ChainID)
 	intent.GlobalDeployOverrides = map[string]any{
 		"withdrawalDelaySeconds":                  standard.WithdrawalDelaySeconds + 1,
 		"minProposalSizeBytes":                    standard.MinProposalSizeBytes + 1,
@@ -505,7 +517,7 @@ func TestInteropDeployment(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	opts, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t, defaultL1ChainID)
 	intent.UseInterop = true
 
 	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
@@ -523,7 +535,7 @@ func TestAltDADeployment(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	opts, intent, st := setupGenesisChain(t)
+	opts, intent, st := setupGenesisChain(t, defaultL1ChainID)
 	altDACfg := genesis.AltDADeployConfig{
 		UseAltDA:                   true,
 		DACommitmentType:           altda.KeccakCommitmentString,
@@ -601,7 +613,7 @@ func TestInvalidL2Genesis(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			opts, intent, _ := setupGenesisChain(t)
+			opts, intent, _ := setupGenesisChain(t, defaultL1ChainID)
 			intent.DeploymentStrategy = state.DeploymentStrategyGenesis
 			intent.GlobalDeployOverrides = tt.overrides
 
@@ -612,11 +624,11 @@ func TestInvalidL2Genesis(t *testing.T) {
 	}
 }
 
-func setupGenesisChain(t *testing.T) (deployer.ApplyPipelineOpts, *state.Intent, *state.State) {
+func setupGenesisChain(t *testing.T, l1ChainID uint64) (deployer.ApplyPipelineOpts, *state.Intent, *state.State) {
 	lgr := testlog.Logger(t, slog.LevelDebug)
 
 	depKey := new(deployerKey)
-	l1ChainID := big.NewInt(77799777)
+	l1ChainIDBig := new(big.Int).SetUint64(l1ChainID)
 	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
 	require.NoError(t, err)
 
@@ -627,8 +639,8 @@ func setupGenesisChain(t *testing.T) (deployer.ApplyPipelineOpts, *state.Intent,
 
 	loc, _ := testutil.LocalArtifacts(t)
 
-	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
-	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID1))
+	intent, st := newIntent(t, l1ChainIDBig, dk, l2ChainID1, loc, loc)
+	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainIDBig, l2ChainID1))
 	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
 
 	opts := deployer.ApplyPipelineOpts{
diff --git a/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160-1.json.gz b/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160-1.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7a5450d641911eee9b419f451135296b9a73585f
GIT binary patch
literal 152468
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%0AP
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
WzuK+;{*V9ukN+PDe`r`$1&{#wx+CQP

literal 0
HcmV?d00001

diff --git a/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160-11155111.json.gz b/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160-11155111.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2fed12ccec471ede0edd95f3b2d92983e88d0477
GIT binary patch
literal 152484
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

literal 0
HcmV?d00001

diff --git a/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160.json.gz b/op-deployer/pkg/deployer/integration_test/testdata/allocs-l2-v160.json.gz
deleted file mode 100644
index 545dc3397bdd3220146c7c6c150ec44fcd19b457..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152466
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


From 85b535c7b9781fe28a11b9f05a7ab0e892b11a76 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Tue, 19 Nov 2024 10:40:10 -0600
Subject: [PATCH 217/451] interop: make geth Dockerfile use v1.101411.2-rc.1
 (#12820)

* interop: make geth Dockerfile use rc5

* use rc6

* Update ops-bedrock/l2-op-geth-interop.Dockerfile
---
 ops-bedrock/l2-op-geth-interop.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ops-bedrock/l2-op-geth-interop.Dockerfile b/ops-bedrock/l2-op-geth-interop.Dockerfile
index 41a667c0fc29..5021fede46db 100644
--- a/ops-bedrock/l2-op-geth-interop.Dockerfile
+++ b/ops-bedrock/l2-op-geth-interop.Dockerfile
@@ -1,4 +1,4 @@
-FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101411.1-rc.3
+FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101411.2-rc.1
 # Note: depend on dev-release for sequencer interop message checks
 
 RUN apk add --no-cache jq

From 9144db1b147cc1df9a8f1526b8d7ef85cd5a24c7 Mon Sep 17 00:00:00 2001
From: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed, 20 Nov 2024 00:40:17 +0800
Subject: [PATCH 218/451] repo: remove `op-ufm` package (#12968)

It has been 6 months since we removed the package and added the
redirect. Anybody that has not learned where it is at this point
will be able to search Github and find a link to this commit.
---
 op-ufm/README.md | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 op-ufm/README.md

diff --git a/op-ufm/README.md b/op-ufm/README.md
deleted file mode 100644
index 08d1b4a6eca7..000000000000
--- a/op-ufm/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# ⚠️  Important
-This project has been moved to [ethereum-optimism/infra](https://github.com/ethereum-optimism/infra)
-
-# OP User Facing Monitoring
-
-This project simulates a synthetic user interacting with a OP Stack chain.
-
-It is intended to be used as a tool for monitoring
-the health of the network by measuring end-to-end transaction latency.
-
-
-## Metrics
-
-* Round-trip duration time to get transaction receipt (from creation timestamp)
-
-* First-seen duration time (from creation timestamp)
-
-
-## Usage
-
-Run `make ufm` to build the binary. No additional dependencies are necessary.
-
-Copy `example.config.toml` to `config.toml` and edit the file to configure the service.
-
-Start the service with `ufm config.toml`.
-

From 0933da4960a94187b2159923da4dd6f9246a25da Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Tue, 19 Nov 2024 17:29:56 +0000
Subject: [PATCH 219/451] fix: op-batcher batch-tx-submitted metric double
 count (#12975)

Co-authored-by: Samuel Laferriere <samlaf92@gmail.com>
---
 op-batcher/batcher/channel.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-batcher/batcher/channel.go b/op-batcher/batcher/channel.go
index 9ae52be405dc..95abcb46a7fa 100644
--- a/op-batcher/batcher/channel.go
+++ b/op-batcher/batcher/channel.go
@@ -64,7 +64,7 @@ func (c *channel) TxFailed(id string) {
 // TxConfirmed marks a transaction as confirmed on L1. Returns a bool indicating
 // whether the channel timed out on chain.
 func (c *channel) TxConfirmed(id string, inclusionBlock eth.BlockID) bool {
-	c.metr.RecordBatchTxSubmitted()
+	c.metr.RecordBatchTxSuccess()
 	c.log.Debug("marked transaction as confirmed", "id", id, "block", inclusionBlock)
 	if _, ok := c.pendingTransactions[id]; !ok {
 		c.log.Warn("unknown transaction marked as confirmed", "id", id, "block", inclusionBlock)

From 9e7d6d383f5028428938a17b87a791a6c3ac3b8a Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 19 Nov 2024 10:47:17 -0700
Subject: [PATCH 220/451] op-deployer: Update dockerfile (#12979)

Update the op-deployer Dockerfile to install CA certificates and symlink /op-deployer into /usr/local/bin so that it's on the container's PATH.
---
 op-deployer/Dockerfile.default | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/op-deployer/Dockerfile.default b/op-deployer/Dockerfile.default
index cc5ca8d95e4f..0821bc0c48ee 100644
--- a/op-deployer/Dockerfile.default
+++ b/op-deployer/Dockerfile.default
@@ -1,3 +1,9 @@
 FROM debian:bookworm-20240812-slim
 ENTRYPOINT ["/op-deployer"]
-COPY op-deployer /op-deployer
\ No newline at end of file
+COPY op-deployer /op-deployer
+
+# Install ca-certificates so that HTTPS requests work
+RUN apt-get update && apt-get install -y ca-certificates
+
+# Symlink onto the PATH
+RUN ln -s /op-deployer /usr/local/bin/op-deployer
\ No newline at end of file

From d2df40a515e490de3dc495666c26af5309d1eda4 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Wed, 20 Nov 2024 01:49:25 +0800
Subject: [PATCH 221/451] remove an impossible condition (#12865)

---
 op-chain-ops/script/script.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-chain-ops/script/script.go b/op-chain-ops/script/script.go
index 3ce493487f77..9a3d9ae80201 100644
--- a/op-chain-ops/script/script.go
+++ b/op-chain-ops/script/script.go
@@ -609,7 +609,7 @@ func (h *Host) onOpcode(pc uint64, op byte, gas, cost uint64, scope tracing.OpCo
 		})
 	}
 	// Sanity check that top of the call-stack matches the scope context now
-	if len(h.callStack) == 0 || h.callStack[len(h.callStack)-1].Ctx != scopeCtx {
+	if h.callStack[len(h.callStack)-1].Ctx != scopeCtx {
 		panic("scope context changed without call-frame pop/push")
 	}
 	cf := h.callStack[len(h.callStack)-1]

From b824f9bc7c7b15db2198fd6f3a7f09e541477f51 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Wed, 20 Nov 2024 01:12:20 +0700
Subject: [PATCH 222/451] op-chain-ops: remove L1 clique option (#12977)

---
 op-chain-ops/genesis/config.go                |  6 ----
 op-chain-ops/genesis/genesis.go               | 30 +++++--------------
 .../testdata/test-deploy-config-full.json     |  2 --
 op-e2e/config/init.go                         |  3 --
 op-e2e/e2eutils/secrets.go                    | 26 +++++-----------
 op-wheel/cheat/cheat.go                       |  2 +-
 .../deploy-config/sepolia-devnet-0.json       |  2 --
 7 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/op-chain-ops/genesis/config.go b/op-chain-ops/genesis/config.go
index 7ed0a6e2f682..69d8999880bb 100644
--- a/op-chain-ops/genesis/config.go
+++ b/op-chain-ops/genesis/config.go
@@ -854,12 +854,6 @@ func (d *L1DependenciesConfig) CheckAddresses(dependencyContext DependencyContex
 // The genesis generation may log warnings, do a best-effort support attempt,
 // or ignore these attributes completely.
 type LegacyDeployConfig struct {
-	// CliqueSignerAddress represents the signer address for the clique consensus engine.
-	// It is used in the multi-process devnet to sign blocks.
-	CliqueSignerAddress common.Address `json:"cliqueSignerAddress"`
-	// L1UseClique represents whether or not to use the clique consensus engine.
-	L1UseClique bool `json:"l1UseClique"`
-
 	// DeploymentWaitConfirmations is the number of confirmations to wait during
 	// deployment. This is DEPRECATED and should be removed in a future PR.
 	DeploymentWaitConfirmations int `json:"deploymentWaitConfirmations"`
diff --git a/op-chain-ops/genesis/genesis.go b/op-chain-ops/genesis/genesis.go
index c852fa0fc100..ee7836852358 100644
--- a/op-chain-ops/genesis/genesis.go
+++ b/op-chain-ops/genesis/genesis.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ethereum/go-ethereum/consensus/misc/eip1559"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -141,25 +140,12 @@ 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)
-	if config.L1UseClique {
-		// warning: clique has an overly strict block header timestamp check against the system wallclock,
-		// causing blocks to get scheduled as "future block" and not get mined instantly when produced.
-		chainConfig.Clique = &params.CliqueConfig{
-			Period: config.L1BlockTime,
-			Epoch:  30000,
-		}
-		extraData = append(append(make([]byte, 32), config.CliqueSignerAddress[:]...), make([]byte, crypto.SignatureLength)...)
-	} else {
-		chainConfig.MergeNetsplitBlock = big.NewInt(0)
-		chainConfig.TerminalTotalDifficulty = big.NewInt(0)
-		chainConfig.TerminalTotalDifficultyPassed = true
-		chainConfig.ShanghaiTime = u64ptr(0)
-		chainConfig.CancunTime = u64ptr(0)
+		ShanghaiTime:        u64ptr(0),
+		CancunTime:          u64ptr(0),
+		// To enable post-Merge consensus at genesis
+		MergeNetsplitBlock:            big.NewInt(0),
+		TerminalTotalDifficulty:       big.NewInt(0),
+		TerminalTotalDifficultyPassed: true,
 	}
 
 	gasLimit := config.L1GenesisBlockGasLimit
@@ -178,7 +164,7 @@ func NewL1Genesis(config *DeployConfig) (*core.Genesis, error) {
 	if timestamp == 0 {
 		timestamp = hexutil.Uint64(time.Now().Unix())
 	}
-	if !config.L1UseClique && config.L1CancunTimeOffset != nil {
+	if config.L1CancunTimeOffset != nil {
 		cancunTime := uint64(timestamp) + uint64(*config.L1CancunTimeOffset)
 		chainConfig.CancunTime = &cancunTime
 	}
@@ -187,7 +173,7 @@ func NewL1Genesis(config *DeployConfig) (*core.Genesis, error) {
 		Config:        &chainConfig,
 		Nonce:         uint64(config.L1GenesisBlockNonce),
 		Timestamp:     uint64(timestamp),
-		ExtraData:     extraData,
+		ExtraData:     make([]byte, 0),
 		GasLimit:      uint64(gasLimit),
 		Difficulty:    difficulty.ToInt(),
 		Mixhash:       config.L1GenesisBlockMixHash,
diff --git a/op-chain-ops/genesis/testdata/test-deploy-config-full.json b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
index 814fff245b0d..7fe9a78e7154 100644
--- a/op-chain-ops/genesis/testdata/test-deploy-config-full.json
+++ b/op-chain-ops/genesis/testdata/test-deploy-config-full.json
@@ -6,8 +6,6 @@
   "maxSequencerDrift": 20,
   "sequencerWindowSize": 100,
   "channelTimeout": 30,
-  "l1UseClique": false,
-  "cliqueSignerAddress": "0x0000000000000000000000000000000000000000",
   "customGasTokenAddress": "0x0000000000000000000000000000000000000000",
   "p2pSequencerAddress": "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc",
   "batchInboxAddress": "0x42000000000000000000000000000000000000ff",
diff --git a/op-e2e/config/init.go b/op-e2e/config/init.go
index 9419c1277060..032f70bf2a88 100644
--- a/op-e2e/config/init.go
+++ b/op-e2e/config/init.go
@@ -201,9 +201,6 @@ func initAllocType(root string, allocType AllocType) {
 		panic(err)
 	}
 
-	// Do not use clique in the in memory tests. Otherwise block building
-	// would be much more complex.
-	dc.L1UseClique = false
 	// Set the L1 genesis block timestamp to now
 	dc.L1GenesisBlockTimestamp = hexutil.Uint64(time.Now().Unix())
 	dc.FundDevAccounts = true
diff --git a/op-e2e/e2eutils/secrets.go b/op-e2e/e2eutils/secrets.go
index cd4c91e1e09e..9cee2f25c4c1 100644
--- a/op-e2e/e2eutils/secrets.go
+++ b/op-e2e/e2eutils/secrets.go
@@ -19,8 +19,8 @@ const defaultHDPathPrefix = "m/44'/60'/0'/0/"
 // If these values are changed, it is subject to breaking tests. They
 // must be in sync with the values in the DeployConfig used to create the system.
 var DefaultMnemonicConfig = &MnemonicConfig{
-	Mnemonic:     "test test test test test test test test test test test junk",
-	CliqueSigner: "m/44'/60'/0'/0/0",
+	Mnemonic: "test test test test test test test test test test test junk",
+	// Note: "m/44'/60'/0'/0/0" is a legacy mnemonic path, used for the L1 clique signer.
 	Proposer:     "m/44'/60'/0'/0/1",
 	Batcher:      "m/44'/60'/0'/0/2",
 	Deployer:     "m/44'/60'/0'/0/3",
@@ -36,9 +36,8 @@ var DefaultMnemonicConfig = &MnemonicConfig{
 type MnemonicConfig struct {
 	Mnemonic string
 
-	CliqueSigner string
-	Deployer     string
-	SysCfgOwner  string
+	Deployer    string
+	SysCfgOwner string
 
 	// rollup actors
 	Proposer     string
@@ -66,10 +65,6 @@ func (m *MnemonicConfig) Secrets() (*Secrets, error) {
 	if err != nil {
 		return nil, err
 	}
-	cliqueSigner, err := wallet.PrivateKey(account(m.CliqueSigner))
-	if err != nil {
-		return nil, err
-	}
 	sysCfgOwner, err := wallet.PrivateKey(account(m.SysCfgOwner))
 	if err != nil {
 		return nil, err
@@ -102,7 +97,6 @@ func (m *MnemonicConfig) Secrets() (*Secrets, error) {
 	return &Secrets{
 		Deployer:     deployer,
 		SysCfgOwner:  sysCfgOwner,
-		CliqueSigner: cliqueSigner,
 		Proposer:     proposer,
 		Batcher:      batcher,
 		SequencerP2P: sequencerP2P,
@@ -115,9 +109,8 @@ func (m *MnemonicConfig) Secrets() (*Secrets, error) {
 
 // Secrets bundles secp256k1 private keys for all common rollup actors for testing purposes.
 type Secrets struct {
-	Deployer     *ecdsa.PrivateKey
-	CliqueSigner *ecdsa.PrivateKey
-	SysCfgOwner  *ecdsa.PrivateKey
+	Deployer    *ecdsa.PrivateKey
+	SysCfgOwner *ecdsa.PrivateKey
 
 	// rollup actors
 	Proposer     *ecdsa.PrivateKey
@@ -138,7 +131,6 @@ type Secrets struct {
 func (s *Secrets) Addresses() *Addresses {
 	return &Addresses{
 		Deployer:     crypto.PubkeyToAddress(s.Deployer.PublicKey),
-		CliqueSigner: crypto.PubkeyToAddress(s.CliqueSigner.PublicKey),
 		SysCfgOwner:  crypto.PubkeyToAddress(s.SysCfgOwner.PublicKey),
 		Proposer:     crypto.PubkeyToAddress(s.Proposer.PublicKey),
 		Batcher:      crypto.PubkeyToAddress(s.Batcher.PublicKey),
@@ -151,9 +143,8 @@ func (s *Secrets) Addresses() *Addresses {
 
 // Addresses bundles the addresses for all common rollup addresses for testing purposes.
 type Addresses struct {
-	Deployer     common.Address
-	CliqueSigner common.Address
-	SysCfgOwner  common.Address
+	Deployer    common.Address
+	SysCfgOwner common.Address
 
 	// rollup actors
 	Proposer     common.Address
@@ -169,7 +160,6 @@ type Addresses struct {
 func (a *Addresses) All() []common.Address {
 	return []common.Address{
 		a.Deployer,
-		a.CliqueSigner,
 		a.SysCfgOwner,
 		a.Proposer,
 		a.Batcher,
diff --git a/op-wheel/cheat/cheat.go b/op-wheel/cheat/cheat.go
index 4b2d428e1029..1b5089c28364 100644
--- a/op-wheel/cheat/cheat.go
+++ b/op-wheel/cheat/cheat.go
@@ -138,7 +138,7 @@ func (ch *Cheater) RunAndClose(fn HeadFn) error {
 
 	// Geth stores the TD for each block separately from the block itself. We must update this
 	// manually, otherwise Geth thinks we haven't reached TTD yet and tries to build a block
-	// using Clique consensus, which causes a panic.
+	// using pre-merge consensus, which causes a panic.
 	rawdb.WriteTd(batch, blockHash, preID.Number, ch.Blockchain.GetTd(preID.Hash, preID.Number))
 
 	// Need to copy over receipts since they are keyed by block hash.
diff --git a/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json b/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json
index 4239d10c3d07..8cc17a8f668d 100644
--- a/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json
+++ b/packages/contracts-bedrock/deploy-config/sepolia-devnet-0.json
@@ -15,8 +15,6 @@
   "l2OutputOracleStartingBlockNumber": 0,
   "l2OutputOracleProposer": "0x95014c45078354ff839f14192228108eac82e00a",
   "l2OutputOracleChallenger": "0x8c20c40180751d93e939dddee3517ae0d1ebead2",
-  "cliqueSignerAddress": "0x0000000000000000000000000000000000000000",
-  "l1UseClique": false,
   "l1BlockTime": 12,
   "l1GenesisBlockTimestamp": "0x0",
   "l1GenesisBlockNonce": "0x0",

From c46e8bb3e239204b4672225bec8ca26843375474 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Wed, 20 Nov 2024 07:08:31 +0700
Subject: [PATCH 223/451] op-chain-ops: remove legacy contracts addresses
 (#12984)

---
 op-chain-ops/contracts/common.go    | 21 ------------
 op-chain-ops/contracts/contracts.go | 50 -----------------------------
 2 files changed, 71 deletions(-)
 delete mode 100644 op-chain-ops/contracts/common.go
 delete mode 100644 op-chain-ops/contracts/contracts.go

diff --git a/op-chain-ops/contracts/common.go b/op-chain-ops/contracts/common.go
deleted file mode 100644
index a1eb5b471dbb..000000000000
--- a/op-chain-ops/contracts/common.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package contracts
-
-import (
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/urfave/cli/v2"
-)
-
-// parseAddress will parse a [common.Address] from a [cli.Context] and return
-// an error if the configured address is not correct.
-func parseAddress(ctx *cli.Context, name string) (common.Address, error) {
-	value := ctx.String(name)
-	if value == "" {
-		return common.Address{}, nil
-	}
-	if !common.IsHexAddress(value) {
-		return common.Address{}, fmt.Errorf("invalid address: %s", value)
-	}
-	return common.HexToAddress(value), nil
-}
diff --git a/op-chain-ops/contracts/contracts.go b/op-chain-ops/contracts/contracts.go
deleted file mode 100644
index def9c3746201..000000000000
--- a/op-chain-ops/contracts/contracts.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package contracts
-
-import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/urfave/cli/v2"
-)
-
-// Addresses represents the address values of various contracts. The values can
-// be easily populated via a [cli.Context].
-type Addresses struct {
-	AddressManager            common.Address
-	OptimismPortal            common.Address
-	L1StandardBridge          common.Address
-	L1CrossDomainMessenger    common.Address
-	CanonicalTransactionChain common.Address
-	StateCommitmentChain      common.Address
-}
-
-// NewAddresses populates an Addresses struct given a [cli.Context].
-// This is useful for writing scripts that interact with smart contracts.
-func NewAddresses(ctx *cli.Context) (*Addresses, error) {
-	var addresses Addresses
-	var err error
-
-	addresses.AddressManager, err = parseAddress(ctx, "address-manager-address")
-	if err != nil {
-		return nil, err
-	}
-	addresses.OptimismPortal, err = parseAddress(ctx, "optimism-portal-address")
-	if err != nil {
-		return nil, err
-	}
-	addresses.L1StandardBridge, err = parseAddress(ctx, "l1-standard-bridge-address")
-	if err != nil {
-		return nil, err
-	}
-	addresses.L1CrossDomainMessenger, err = parseAddress(ctx, "l1-crossdomain-messenger-address")
-	if err != nil {
-		return nil, err
-	}
-	addresses.CanonicalTransactionChain, err = parseAddress(ctx, "canonical-transaction-chain-address")
-	if err != nil {
-		return nil, err
-	}
-	addresses.StateCommitmentChain, err = parseAddress(ctx, "state-commitment-chain-address")
-	if err != nil {
-		return nil, err
-	}
-	return &addresses, nil
-}

From b322d5be2ad6f659c5513dd3c26ffb20ff9f2e9b Mon Sep 17 00:00:00 2001
From: blaine <blainemalone01@gmail.com>
Date: Tue, 19 Nov 2024 19:09:29 -0500
Subject: [PATCH 224/451] fix: new spolia deploy (#12956)

---
 op-deployer/pkg/deployer/standard/standard.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 516bdb650283..f8bbaa51b36e 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -134,10 +134,14 @@ func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
 	switch chainID {
 	case 1:
 		// Generated using the bootstrap command on 11/18/2024.
-		return common.HexToAddress("0x9bc0a1ed534bfb31a6be69e5b767cba332f14347"), nil
+		// Verified against compiled bytecode at:
+		// https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts-v160-artifacts-opcm-redesign-backport
+		return common.HexToAddress("0x9BC0A1eD534BFb31a6Be69e5b767Cba332f14347"), nil
 	case 11155111:
-		// Generated using the bootstrap command on 11/15/2024.
-		return common.HexToAddress("0xde9eacb994a6eb12997445f8a63a22772c5c4313"), nil
+		// Generated using the bootstrap command on 11/18/2024.
+		// Verified against compiled bytecode at:
+		// https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts-v160-artifacts-opcm-redesign-backport
+		return common.HexToAddress("0x760B1d2Dc68DC51fb6E8B2b8722B8ed08903540c"), nil
 	default:
 		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
 	}

From 9d82935652843e6d728ded9cb17ce701f4fa8a82 Mon Sep 17 00:00:00 2001
From: Raffaele <151576068+raffaele-oplabs@users.noreply.github.com>
Date: Wed, 20 Nov 2024 01:11:24 +0100
Subject: [PATCH 225/451] migrate github actions to circleci (#12928)

* migrate close-stale github action

* using external script

* completing script

* removing old github action

* example only

* removing versions

* removing tag-service
---
 .circleci/config.yml              | 95 +++++++++++++++++++------------
 .github/workflows/close-stale.yml | 18 ------
 .github/workflows/tag-service.yml | 69 ----------------------
 3 files changed, 59 insertions(+), 123 deletions(-)
 delete mode 100644 .github/workflows/close-stale.yml
 delete mode 100644 .github/workflows/tag-service.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08a5d7afd3fa..c3ca9a88aced 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,6 +41,9 @@ parameters:
   publish_contract_artifacts_dispatch:
     type: boolean
     default: false
+  stale_check_dispatch:
+    type: boolean
+    default: false
 
 orbs:
   go: circleci/go@1.8.0
@@ -347,7 +350,7 @@ jobs:
     machine:
       image: <<pipeline.parameters.base_image>>
       resource_class: "<<parameters.resource_class>>"
-      docker_layer_caching: true  # we rely on this for faster builds, and actively warm it up for builds with common stages
+      docker_layer_caching: true # we rely on this for faster builds, and actively warm it up for builds with common stages
     steps:
       - checkout
       - attach_workspace:
@@ -458,7 +461,7 @@ jobs:
                   docker save -o /tmp/docker_images/<<parameters.docker_name>>.tar $IMAGE_NAME
             - persist_to_workspace:
                 root: /tmp/docker_images
-                paths:  # only write the one file, to avoid concurrent workspace-file additions
+                paths: # only write the one file, to avoid concurrent workspace-file additions
                   - "<<parameters.docker_name>>.tar"
       - when:
           condition: "<<parameters.release>>"
@@ -471,11 +474,11 @@ jobs:
           condition:
             or:
               - and:
-                - "<<parameters.publish>>"
-                - "<<parameters.release>>"
+                  - "<<parameters.publish>>"
+                  - "<<parameters.release>>"
               - and:
-                - "<<parameters.publish>>"
-                - equal: [develop, << pipeline.git.branch >>]
+                  - "<<parameters.publish>>"
+                  - equal: [develop, << pipeline.git.branch >>]
           steps:
             - gcp-oidc-authenticate:
                 service_account_email: GCP_SERVICE_ATTESTOR_ACCOUNT_EMAIL
@@ -1001,8 +1004,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker
-      - run:
-          make -C op-program verify-reproducibility
+      - run: make -C op-program verify-reproducibility
       - notify-failures-on-develop:
           mentions: "@proofs-team"
 
@@ -1054,7 +1056,7 @@ jobs:
       - checkout
       - unless:
           condition:
-            equal: [ "develop", << pipeline.git.branch >> ]
+            equal: ["develop", << pipeline.git.branch >>]
           steps:
             - run:
                 # Scan changed files in PRs, block on new issues only (existing issues ignored)
@@ -1110,7 +1112,7 @@ jobs:
           paths:
             - "/go/pkg/mod"
 
-  bedrock-go-tests:  # just a helper, that depends on all the actual test jobs
+  bedrock-go-tests: # just a helper, that depends on all the actual test jobs
     docker:
       # Use a smaller base image to avoid pulling the huge ci-builder
       # image which is not needed for this job and sometimes misses
@@ -1272,17 +1274,29 @@ jobs:
           command: |
             goreleaser release --clean -f ./<<parameters.module>>/<<parameters.filename>>
 
+  stale-check:
+    docker:
+      - image: cimg/python:3.11
+    steps:
+      - run:
+          name: Run Stale Check Script
+          command: |
+            git clone --branch main --depth 1 https://github.com/ethereum-optimism/circleci-utils.git /tmp/circleci-utils
+            cd /tmp/circleci-utils/stale-check
+            pip3 install -r requirements.txt
+            python3 stale-check.py --repo "ethereum-optimism/${CIRCLE_PROJECT_REPONAME}" --github-token "${STALE_GITHUB_TOKEN}"
+
 workflows:
   main:
     when:
       and:
         - or:
             # Trigger on new commits
-            - equal: [ webhook, << pipeline.trigger_source >> ]
+            - equal: [webhook, << pipeline.trigger_source >>]
               # Trigger on manual triggers if explicitly requested
-            - equal: [ true, << pipeline.parameters.main_dispatch >> ]
+            - equal: [true, << pipeline.parameters.main_dispatch >>]
         - not:
-            equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+            equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       - go-mod-download
       - contracts-bedrock-build:
@@ -1426,7 +1440,7 @@ workflows:
           notify: true
           matrix:
             parameters:
-              mips_word_size: [ 32, 64 ]
+              mips_word_size: [32, 64]
       - cannon-build-test-vectors
       - todo-issues:
           name: todo-issues-check
@@ -1435,8 +1449,7 @@ workflows:
           name: shell-check
           # We don't need the `exclude` key as the orb detects the `.shellcheckrc`
           dir: .
-          ignore-dirs:
-            ./packages/contracts-bedrock/lib
+          ignore-dirs: ./packages/contracts-bedrock/lib
 
   go-release-deployer:
     jobs:
@@ -1453,7 +1466,7 @@ workflows:
   release:
     when:
       not:
-        equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+        equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       # Wait for approval on the release
       - hold:
@@ -1546,7 +1559,7 @@ workflows:
 
   scheduled-todo-issues:
     when:
-      equal: [ build_four_hours, <<pipeline.schedule.name>> ]
+      equal: [build_four_hours, <<pipeline.schedule.name>>]
     jobs:
       - todo-issues:
           name: todo-issue-checks
@@ -1555,7 +1568,7 @@ workflows:
 
   scheduled-fpp:
     when:
-      equal: [ build_hourly, <<pipeline.schedule.name>> ]
+      equal: [build_hourly, <<pipeline.schedule.name>>]
     jobs:
       - fpp-verify:
           context:
@@ -1565,8 +1578,9 @@ workflows:
   develop-publish-contract-artifacts:
     when:
       or:
-        - equal: [ "develop", <<pipeline.git.branch>> ]
-        - equal: [ true, <<pipeline.parameters.publish_contract_artifacts_dispatch>> ]
+        - equal: ["develop", <<pipeline.git.branch>>]
+        - equal:
+            [true, <<pipeline.parameters.publish_contract_artifacts_dispatch>>]
     jobs:
       - publish-contract-artifacts
 
@@ -1574,10 +1588,10 @@ workflows:
     when:
       and:
         - or:
-          - equal: [ "develop", <<pipeline.git.branch>> ]
-          - equal: [ true, <<pipeline.parameters.fault_proofs_dispatch>> ]
+            - equal: ["develop", <<pipeline.git.branch>>]
+            - equal: [true, <<pipeline.parameters.fault_proofs_dispatch>>]
         - not:
-            equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+            equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       - go-mod-download
       - cannon-prestate
@@ -1607,10 +1621,10 @@ workflows:
     when:
       and:
         - or:
-          - equal: [ "develop", <<pipeline.git.branch>> ]
-          - equal: [ true, <<pipeline.parameters.kontrol_dispatch>> ]
+            - equal: ["develop", <<pipeline.git.branch>>]
+            - equal: [true, <<pipeline.parameters.kontrol_dispatch>>]
         - not:
-           equal: [ scheduled_pipeline, << pipeline.trigger_source >> ]
+            equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
       - kontrol-tests:
           context:
@@ -1620,8 +1634,8 @@ workflows:
   scheduled-cannon-full-tests:
     when:
       or:
-        - equal: [ build_four_hours, <<pipeline.schedule.name>> ]
-        - equal: [ true, << pipeline.parameters.cannon_full_test_dispatch >> ]
+        - equal: [build_four_hours, <<pipeline.schedule.name>>]
+        - equal: [true, << pipeline.parameters.cannon_full_test_dispatch >>]
     jobs:
       - contracts-bedrock-build:
           skip_pattern: test
@@ -1633,14 +1647,14 @@ workflows:
             - slack
           matrix:
             parameters:
-              mips_word_size: [ 32, 64 ]
+              mips_word_size: [32, 64]
 
   scheduled-docker-publish:
     when:
       or:
-        - equal: [ build_hourly, <<pipeline.schedule.name>> ]
+        - equal: [build_hourly, <<pipeline.schedule.name>>]
         # Trigger on manual triggers if explicitly requested
-        - equal: [ true, << pipeline.parameters.docker_publish_dispatch >> ]
+        - equal: [true, << pipeline.parameters.docker_publish_dispatch >>]
     jobs:
       - docker-build:
           matrix:
@@ -1691,10 +1705,19 @@ workflows:
   scheduled-preimage-reproducibility:
     when:
       or:
-        - equal: [build_daily, <<pipeline.schedule.name>> ]
+        - equal: [build_daily, <<pipeline.schedule.name>>]
         # Trigger on manual triggers if explicitly requested
-        - equal: [ true, << pipeline.parameters.reproducibility_dispatch >> ]
+        - equal: [true, << pipeline.parameters.reproducibility_dispatch >>]
     jobs:
       - preimage-reproducibility:
-          context:
-            slack
+          context: slack
+
+  scheduled-stale-check:
+    when:
+      or:
+        - equal: [build_daily, <<pipeline.schedule.name>>]
+          # Trigger on manual triggers if explicitly requested
+        - equal: [true, << pipeline.parameters.stale_check_dispatch >>]
+    jobs:
+      - stale-check:
+          context: github-token-stale-check
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
deleted file mode 100644
index 68e8b4ec82c5..000000000000
--- a/.github/workflows/close-stale.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: 'Close stale issues and PRs'
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v9
-        with:
-          stale-pr-message: 'This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
-          stale-issue-label: 'S-stale'
-          exempt-pr-labels: 'S-exempt-stale'
-          days-before-issue-stale: 999
-          days-before-pr-stale: 14
-          days-before-close: 5
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tag-service.yml b/.github/workflows/tag-service.yml
deleted file mode 100644
index 439b48f13d4e..000000000000
--- a/.github/workflows/tag-service.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-name: Tag Service
-
-on:
-  workflow_dispatch:
-    inputs:
-      bump:
-        description: 'How much to bump the version by'
-        required: true
-        type: choice
-        options:
-          - major
-          - minor
-          - patch
-          - prerelease
-          - finalize-prerelease
-      service:
-        description: 'Which service to release'
-        required: true
-        type: choice
-        options:
-          - ci-builder
-          - ci-builder-rust
-          - op-node
-          - op-batcher
-          - op-proposer
-          - op-challenger
-          - op-program
-          - op-dispute-mon
-          - op-ufm
-          - da-server
-          - op-contracts
-          - op-conductor
-      prerelease:
-        description: Increment major/minor/patch as prerelease?
-        required: false
-        type: boolean
-        default: false
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    environment: op-stack-production
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Fetch tags
-        run: git fetch --tags origin --force
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-      - name: Install deps
-        run: pip install -r requirements.txt
-        working-directory: ops/tag-service
-      - run: ops/tag-service/tag-service.py --bump="$BUMP" --service="$SERVICE"
-        env:
-          INPUT_GITHUB_TOKEN: ${{ github.token }}
-          BUMP: ${{ github.event.inputs.bump }}
-          SERVICE: ${{ github.event.inputs.service }}
-        if: ${{ github.event.inputs.prerelease == 'false' }}
-      - run: ops/tag-service/tag-service.py --bump="$BUMP" --service="$SERVICE" --pre-release
-        env:
-          INPUT_GITHUB_TOKEN: ${{ github.token }}
-          BUMP: ${{ github.event.inputs.bump }}
-          SERVICE: ${{ github.event.inputs.service }}
-        if: ${{ github.event.inputs.prerelease == 'true' }}

From cccbc2de80a1690e011729a37556aedb2e8477db Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Wed, 20 Nov 2024 07:17:20 +0700
Subject: [PATCH 226/451] go: set default versions to v0.0.0 (#12989)

---
 op-alt-da/cmd/daserver/main.go     | 2 +-
 op-batcher/cmd/main.go             | 2 +-
 op-dispute-mon/version/version.go  | 2 +-
 op-node/version/version.go         | 2 +-
 op-program/host/version/version.go | 2 +-
 op-proposer/cmd/main.go            | 2 +-
 op-supervisor/cmd/main.go          | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/op-alt-da/cmd/daserver/main.go b/op-alt-da/cmd/daserver/main.go
index 3ed37bd05321..bcaa9c47280e 100644
--- a/op-alt-da/cmd/daserver/main.go
+++ b/op-alt-da/cmd/daserver/main.go
@@ -13,7 +13,7 @@ import (
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 )
 
-var Version = "v0.0.1"
+var Version = "v0.0.0"
 
 func main() {
 	oplog.SetupDefaults()
diff --git a/op-batcher/cmd/main.go b/op-batcher/cmd/main.go
index 82472006da27..39ca58b193c3 100644
--- a/op-batcher/cmd/main.go
+++ b/op-batcher/cmd/main.go
@@ -18,7 +18,7 @@ import (
 )
 
 var (
-	Version   = "v0.10.14"
+	Version   = "v0.0.0"
 	GitCommit = ""
 	GitDate   = ""
 )
diff --git a/op-dispute-mon/version/version.go b/op-dispute-mon/version/version.go
index 834fc089b19e..31ad6f3582af 100644
--- a/op-dispute-mon/version/version.go
+++ b/op-dispute-mon/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 var (
-	Version = "v0.1.0"
+	Version = "v0.0.0"
 	Meta    = "dev"
 )
 
diff --git a/op-node/version/version.go b/op-node/version/version.go
index 327ee7b49727..2456f656d45c 100644
--- a/op-node/version/version.go
+++ b/op-node/version/version.go
@@ -1,6 +1,6 @@
 package version
 
 var (
-	Version = "v0.10.14"
+	Version = "v0.0.0"
 	Meta    = "dev"
 )
diff --git a/op-program/host/version/version.go b/op-program/host/version/version.go
index 327ee7b49727..2456f656d45c 100644
--- a/op-program/host/version/version.go
+++ b/op-program/host/version/version.go
@@ -1,6 +1,6 @@
 package version
 
 var (
-	Version = "v0.10.14"
+	Version = "v0.0.0"
 	Meta    = "dev"
 )
diff --git a/op-proposer/cmd/main.go b/op-proposer/cmd/main.go
index cbb21fb28516..e5096351fdd7 100644
--- a/op-proposer/cmd/main.go
+++ b/op-proposer/cmd/main.go
@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	Version   = "v0.10.14"
+	Version   = "v0.0.0"
 	GitCommit = ""
 	GitDate   = ""
 )
diff --git a/op-supervisor/cmd/main.go b/op-supervisor/cmd/main.go
index 8e306bf9009d..5aec4e927d03 100644
--- a/op-supervisor/cmd/main.go
+++ b/op-supervisor/cmd/main.go
@@ -20,7 +20,7 @@ import (
 )
 
 var (
-	Version   = "v0.0.1"
+	Version   = "v0.0.0"
 	GitCommit = ""
 	GitDate   = ""
 )

From bb02d4b07304e63fd47f70357dca6f66236ba270 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Tue, 19 Nov 2024 23:09:27 -0500
Subject: [PATCH 227/451] feat(ctb): Vendor `RISCV.sol` (#12994)

* feat(ctb): `RISCV.sol`

semver-lock

Co-Authored-By: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-Authored-By: Taem Park <wwwee98@gmail.com>
Co-Authored-By: Park Changwan <pcw109550@gmail.com>
Co-Authored-By: protolambda <proto@protolambda.com>

* snapshots

* diff with remote in CI

* schedule diff job

* Update .circleci/config.yml

Co-authored-by: Matt Solomon <matt@mattsolomon.dev>

* remove check changed

---------

Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Co-authored-by: Taem Park <wwwee98@gmail.com>
Co-authored-by: Park Changwan <pcw109550@gmail.com>
Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
---
 .circleci/config.yml                          |   51 +
 .../snapshots/abi/RISCV.json                  |   68 +
 .../snapshots/semver-lock.json                |    4 +
 .../snapshots/storageLayout/RISCV.json        |    9 +
 .../contracts-bedrock/src/asterisc/RISCV.sol  | 1646 +++++++++++++++++
 versions.json                                 |    3 +-
 6 files changed, 1780 insertions(+), 1 deletion(-)
 create mode 100644 packages/contracts-bedrock/snapshots/abi/RISCV.json
 create mode 100644 packages/contracts-bedrock/snapshots/storageLayout/RISCV.json
 create mode 100644 packages/contracts-bedrock/src/asterisc/RISCV.sol

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3ca9a88aced..df9c263965b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,6 +26,9 @@ parameters:
   reproducibility_dispatch:
     type: boolean
     default: false
+  diff_asterisc_bytecode_dispatch:
+    type: boolean
+    default: false
   kontrol_dispatch:
     type: boolean
     default: false
@@ -242,6 +245,43 @@ jobs:
           command: python3 maketests.py && git diff --exit-code
           working_directory: cannon/mipsevm/tests/open_mips_tests
 
+  diff-asterisc-bytecode:
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
+    resource_class: medium
+    steps:
+      - checkout
+      - run:
+          name: Check `RISCV.sol` bytecode
+          working_directory: packages/contracts-bedrock
+          command: |
+            # Clone asterisc @ the pinned version to fetch remote `RISCV.sol`
+            ASTERISC_REV="$(cat ../../versions.json | jq -r .asterisc)"
+            REMOTE_ASTERISC_PATH="./src/asterisc/RISCV_Remote.sol"
+            git clone https://github.com/ethereum-optimism/asterisc \
+              -b $ASTERISC_REV && \
+              cp ./asterisc/rvsol/src/RISCV.sol $REMOTE_ASTERISC_PATH
+
+            # Replace import paths
+            sed -i -e 's/@optimism\///' $REMOTE_ASTERISC_PATH
+            # Replace contract name
+            sed -i -e 's/contract RISCV/contract RISCV_Remote/' $REMOTE_ASTERISC_PATH
+
+            # Install deps
+            forge install
+
+            # Diff bytecode, with both contracts compiled in the local environment.
+            REMOTE_ASTERISC_CODE="$(forge inspect RISCV_Remote bytecode | tr -d '\n')"
+            LOCAL_ASTERISC_CODE="$(forge inspect RISCV bytecode | tr -d '\n')"
+            if [ "$REMOTE_ASTERISC_CODE" != "$LOCAL_ASTERISC_CODE" ]; then
+              echo "Asterisc bytecode mismatch. Local version does not match remote. Diff:"
+              diff <(echo "$REMOTE_ASTERISC_CODE") <(echo "$LOCAL_ASTERISC_CODE")
+            else
+              echo "Asterisc version up to date."
+            fi
+      - notify-failures-on-develop:
+          mentions: "@clabby @proofs-team"
+
   contracts-bedrock-build:
     machine: true
     resource_class: ethereum-optimism/latitude-1
@@ -1702,6 +1742,17 @@ workflows:
             - oplabs-gcr
             - slack
 
+  scheduled-diff-asterisc-bytecode:
+    when:
+      or:
+        - equal: [build_daily, <<pipeline.schedule.name>>]
+        # Trigger on manual triggers if explicitly requested
+        - equal: [true, <<pipeline.parameters.diff_asterisc_bytecode_dispatch>>]
+    jobs:
+      - diff-asterisc-bytecode:
+          context:
+            - slack
+
   scheduled-preimage-reproducibility:
     when:
       or:
diff --git a/packages/contracts-bedrock/snapshots/abi/RISCV.json b/packages/contracts-bedrock/snapshots/abi/RISCV.json
new file mode 100644
index 000000000000..1650fd3980ec
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/abi/RISCV.json
@@ -0,0 +1,68 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "contract IPreimageOracle",
+        "name": "_oracle",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [],
+    "name": "oracle",
+    "outputs": [
+      {
+        "internalType": "contract IPreimageOracle",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "_stateData",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_proof",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "_localContext",
+        "type": "bytes32"
+      }
+    ],
+    "name": "step",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "version",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 5ba3a4b6a165..91c44e3620f4 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -135,6 +135,10 @@
     "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
     "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
+  "src/asterisc/RISCV.sol": {
+    "initCodeHash": "0xb3f9c337d694b62704b63d86d7d412a661925f254e7af376a5e02717a455487e",
+    "sourceCodeHash": "0x92a8689e26a736868f90c6c208ef01782c3d9ce196fcef0a85aef4da936c6339"
+  },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0xa3cbf121bad13c00227ea4fef128853d9a86b7ec9158de894f99b58d38d7630a",
     "sourceCodeHash": "0xd8467700c80b3e62fa37193dc6513bac35282094b686b50e162e157f704dde00"
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/RISCV.json b/packages/contracts-bedrock/snapshots/storageLayout/RISCV.json
new file mode 100644
index 000000000000..a79dc13a1d36
--- /dev/null
+++ b/packages/contracts-bedrock/snapshots/storageLayout/RISCV.json
@@ -0,0 +1,9 @@
+[
+  {
+    "bytes": "20",
+    "label": "oracle",
+    "offset": 0,
+    "slot": "0",
+    "type": "contract IPreimageOracle"
+  }
+]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/asterisc/RISCV.sol b/packages/contracts-bedrock/src/asterisc/RISCV.sol
new file mode 100644
index 000000000000..4544bd6297c8
--- /dev/null
+++ b/packages/contracts-bedrock/src/asterisc/RISCV.sol
@@ -0,0 +1,1646 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
+
+/// @title RISCV
+/// @notice The RISCV contract emulates a single RISCV hart cycle statelessly, using memory proofs to verify the
+///         instruction and optional memory access' inclusion in the memory merkle root provided in the prestate
+///         witness.
+///
+///         This contract has been vendorized from the Asterisc project. The original source code can be found at
+///         https://github.com/ethereum-optimism/asterisc
+contract RISCV is IBigStepper {
+    /// @notice The preimage oracle contract.
+    IPreimageOracle public oracle;
+
+    /// @notice The version of the contract.
+    /// @custom:semver 1.1.0-rc.1
+    string public constant version = "1.1.0-rc.1";
+
+    /// @param _oracle The preimage oracle contract.
+    constructor(IPreimageOracle _oracle) {
+        oracle = _oracle;
+    }
+
+    /// @inheritdoc IBigStepper
+    function step(bytes calldata _stateData, bytes calldata _proof, bytes32 _localContext) public returns (bytes32) {
+        assembly {
+            function revertWithCode(code) {
+                mstore(0, code)
+                revert(0, 0x20)
+            }
+
+            function preimageOraclePos() -> out {
+                // slot of preimageOraclePos field
+                out := 0
+            }
+
+            //
+            // Yul64 - functions to do 64 bit math - see yul64.go
+            //
+            function u64Mask() -> out {
+                // max uint64
+                out := shr(192, not(0)) // 256-64 = 192
+            }
+
+            function u32Mask() -> out {
+                out := U64(shr(toU256(224), not(0))) // 256-32 = 224
+            }
+
+            function toU64(v) -> out {
+                out := v
+            }
+
+            function shortToU64(v) -> out {
+                out := v
+            }
+
+            function shortToU256(v) -> out {
+                out := v
+            }
+
+            function longToU256(v) -> out {
+                out := v
+            }
+
+            function u256ToU64(v) -> out {
+                out := and(v, U256(u64Mask()))
+            }
+
+            function u64ToU256(v) -> out {
+                out := v
+            }
+
+            function mask32Signed64(v) -> out {
+                out := signExtend64(and64(v, u32Mask()), toU64(31))
+            }
+
+            function u64Mod() -> out {
+                // 1 << 64
+                out := shl(toU256(64), toU256(1))
+            }
+
+            function u64TopBit() -> out {
+                // 1 << 63
+                out := shl(toU256(63), toU256(1))
+            }
+
+            function signExtend64(v, bit) -> out {
+                switch and(v, shl(bit, 1))
+                case 0 {
+                    // fill with zeroes, by masking
+                    out := U64(and(U256(v), shr(sub(toU256(63), bit), U256(u64Mask()))))
+                }
+                default {
+                    // fill with ones, by or-ing
+                    out := U64(or(U256(v), shl(bit, shr(bit, U256(u64Mask())))))
+                }
+            }
+
+            function signExtend64To256(v) -> out {
+                switch and(U256(v), u64TopBit())
+                case 0 { out := v }
+                default { out := or(shl(toU256(64), not(0)), v) }
+            }
+
+            function add64(x, y) -> out {
+                out := U64(mod(add(U256(x), U256(y)), u64Mod()))
+            }
+
+            function sub64(x, y) -> out {
+                out := U64(mod(sub(U256(x), U256(y)), u64Mod()))
+            }
+
+            function mul64(x, y) -> out {
+                out := u256ToU64(mul(U256(x), U256(y)))
+            }
+
+            function div64(x, y) -> out {
+                out := u256ToU64(div(U256(x), U256(y)))
+            }
+
+            function sdiv64(x, y) -> out {
+                // note: signed overflow semantics are the same between Go and EVM assembly
+                out := u256ToU64(sdiv(signExtend64To256(x), signExtend64To256(y)))
+            }
+
+            function mod64(x, y) -> out {
+                out := U64(mod(U256(x), U256(y)))
+            }
+
+            function smod64(x, y) -> out {
+                out := u256ToU64(smod(signExtend64To256(x), signExtend64To256(y)))
+            }
+
+            function not64(x) -> out {
+                out := u256ToU64(not(U256(x)))
+            }
+
+            function lt64(x, y) -> out {
+                out := U64(lt(U256(x), U256(y)))
+            }
+
+            function gt64(x, y) -> out {
+                out := U64(gt(U256(x), U256(y)))
+            }
+
+            function slt64(x, y) -> out {
+                out := U64(slt(signExtend64To256(x), signExtend64To256(y)))
+            }
+
+            function sgt64(x, y) -> out {
+                out := U64(sgt(signExtend64To256(x), signExtend64To256(y)))
+            }
+
+            function eq64(x, y) -> out {
+                out := U64(eq(U256(x), U256(y)))
+            }
+
+            function iszero64(x) -> out {
+                out := iszero(U256(x))
+            }
+
+            function and64(x, y) -> out {
+                out := U64(and(U256(x), U256(y)))
+            }
+
+            function or64(x, y) -> out {
+                out := U64(or(U256(x), U256(y)))
+            }
+
+            function xor64(x, y) -> out {
+                out := U64(xor(U256(x), U256(y)))
+            }
+
+            function shl64(x, y) -> out {
+                out := u256ToU64(shl(U256(x), U256(y)))
+            }
+
+            function shr64(x, y) -> out {
+                out := U64(shr(U256(x), U256(y)))
+            }
+
+            function sar64(x, y) -> out {
+                out := u256ToU64(sar(U256(x), signExtend64To256(y)))
+            }
+
+            // type casts, no-op in yul
+            function b32asBEWord(v) -> out {
+                out := v
+            }
+            function beWordAsB32(v) -> out {
+                out := v
+            }
+            function U64(v) -> out {
+                out := v
+            }
+            function U256(v) -> out {
+                out := v
+            }
+            function toU256(v) -> out {
+                out := v
+            }
+
+            //
+            // Bit hacking util
+            //
+            function bitlen(x) -> n {
+                if gt(x, sub(shl(128, 1), 1)) {
+                    x := shr(128, x)
+                    n := add(n, 128)
+                }
+                if gt(x, sub(shl(64, 1), 1)) {
+                    x := shr(64, x)
+                    n := add(n, 64)
+                }
+                if gt(x, sub(shl(32, 1), 1)) {
+                    x := shr(32, x)
+                    n := add(n, 32)
+                }
+                if gt(x, sub(shl(16, 1), 1)) {
+                    x := shr(16, x)
+                    n := add(n, 16)
+                }
+                if gt(x, sub(shl(8, 1), 1)) {
+                    x := shr(8, x)
+                    n := add(n, 8)
+                }
+                if gt(x, sub(shl(4, 1), 1)) {
+                    x := shr(4, x)
+                    n := add(n, 4)
+                }
+                if gt(x, sub(shl(2, 1), 1)) {
+                    x := shr(2, x)
+                    n := add(n, 2)
+                }
+                if gt(x, sub(shl(1, 1), 1)) {
+                    x := shr(1, x)
+                    n := add(n, 1)
+                }
+                if gt(x, 0) { n := add(n, 1) }
+            }
+
+            function endianSwap(x) -> out {
+                for { let i := 0 } lt(i, 32) { i := add(i, 1) } {
+                    out := or(shl(8, out), and(x, 0xff))
+                    x := shr(8, x)
+                }
+            }
+
+            //
+            // State layout
+            //
+            function stateSizeMemRoot() -> out {
+                out := 32
+            }
+            function stateSizePreimageKey() -> out {
+                out := 32
+            }
+            function stateSizePreimageOffset() -> out {
+                out := 8
+            }
+            function stateSizePC() -> out {
+                out := 8
+            }
+            function stateSizeExitCode() -> out {
+                out := 1
+            }
+            function stateSizeExited() -> out {
+                out := 1
+            }
+            function stateSizeStep() -> out {
+                out := 8
+            }
+            function stateSizeHeap() -> out {
+                out := 8
+            }
+            function stateSizeLoadReservation() -> out {
+                out := 8
+            }
+            function stateSizeRegisters() -> out {
+                out := mul(8, 32)
+            }
+
+            function stateOffsetMemRoot() -> out {
+                out := 0
+            }
+            function stateOffsetPreimageKey() -> out {
+                out := add(stateOffsetMemRoot(), stateSizeMemRoot())
+            }
+            function stateOffsetPreimageOffset() -> out {
+                out := add(stateOffsetPreimageKey(), stateSizePreimageKey())
+            }
+            function stateOffsetPC() -> out {
+                out := add(stateOffsetPreimageOffset(), stateSizePreimageOffset())
+            }
+            function stateOffsetExitCode() -> out {
+                out := add(stateOffsetPC(), stateSizePC())
+            }
+            function stateOffsetExited() -> out {
+                out := add(stateOffsetExitCode(), stateSizeExitCode())
+            }
+            function stateOffsetStep() -> out {
+                out := add(stateOffsetExited(), stateSizeExited())
+            }
+            function stateOffsetHeap() -> out {
+                out := add(stateOffsetStep(), stateSizeStep())
+            }
+            function stateOffsetLoadReservation() -> out {
+                out := add(stateOffsetHeap(), stateSizeHeap())
+            }
+            function stateOffsetRegisters() -> out {
+                out := add(stateOffsetLoadReservation(), stateSizeLoadReservation())
+            }
+            function stateSize() -> out {
+                out := add(stateOffsetRegisters(), stateSizeRegisters())
+            }
+
+            //
+            // Initial EVM memory / calldata checks
+            //
+            if iszero(eq(mload(0x40), 0x80)) {
+                // expected memory check: no allocated memory (start after scratch + free-mem-ptr + zero slot = 0x80)
+                revert(0, 0)
+            }
+            if iszero(eq(_stateData.offset, 132)) {
+                // 32*4+4 = 132 expected state data offset
+                revert(0, 0)
+            }
+            if iszero(eq(calldataload(sub(_stateData.offset, 32)), stateSize())) {
+                // user-provided state size must match expected state size
+                revert(0, 0)
+            }
+            function paddedLen(v) -> out {
+                // padded to multiple of 32 bytes
+                let padding := mod(sub(32, mod(v, 32)), 32)
+                out := add(v, padding)
+            }
+            if iszero(eq(_proof.offset, add(add(_stateData.offset, paddedLen(stateSize())), 32))) {
+                // 132+stateSize+padding+32 = expected proof offset
+                revert(0, 0)
+            }
+            function proofContentOffset() -> out {
+                // since we can't reference proof.offset in functions, blame Yul
+                // 132+362+(32-362%32)+32=548
+                out := 548
+            }
+            if iszero(eq(_proof.offset, proofContentOffset())) { revert(0, 0) }
+
+            //
+            // State loading
+            //
+            function memStateOffset() -> out {
+                out := 0x80
+            }
+            // copy the state calldata into memory, so we can mutate it
+            mstore(0x40, add(memStateOffset(), stateSize())) // alloc, update free mem pointer
+            calldatacopy(memStateOffset(), _stateData.offset, stateSize()) // same format in memory as in calldata
+
+            //
+            // State access
+            //
+            function readState(offset, length) -> out {
+                out := mload(add(memStateOffset(), offset)) // note: the state variables are all big-endian encoded
+                out := shr(shl(3, sub(32, length)), out) // shift-right to right-align data and reduce to desired length
+            }
+            function writeState(offset, length, data) {
+                let memOffset := add(memStateOffset(), offset)
+                // left-aligned mask of length bytes
+                let mask := shl(shl(3, sub(32, length)), not(0))
+                let prev := mload(memOffset)
+                // align data to left
+                data := shl(shl(3, sub(32, length)), data)
+                // mask out data from previous word, and apply new data
+                let result := or(and(prev, not(mask)), data)
+                mstore(memOffset, result)
+            }
+
+            function getMemRoot() -> out {
+                out := readState(stateOffsetMemRoot(), stateSizeMemRoot())
+            }
+            function setMemRoot(v) {
+                writeState(stateOffsetMemRoot(), stateSizeMemRoot(), v)
+            }
+
+            function getPreimageKey() -> out {
+                out := readState(stateOffsetPreimageKey(), stateSizePreimageKey())
+            }
+            function setPreimageKey(k) {
+                writeState(stateOffsetPreimageKey(), stateSizePreimageKey(), k)
+            }
+
+            function getPreimageOffset() -> out {
+                out := readState(stateOffsetPreimageOffset(), stateSizePreimageOffset())
+            }
+            function setPreimageOffset(v) {
+                writeState(stateOffsetPreimageOffset(), stateSizePreimageOffset(), v)
+            }
+
+            function getPC() -> out {
+                out := readState(stateOffsetPC(), stateSizePC())
+            }
+            function setPC(v) {
+                writeState(stateOffsetPC(), stateSizePC(), v)
+            }
+
+            function getExited() -> out {
+                out := readState(stateOffsetExited(), stateSizeExited())
+            }
+            function setExited() {
+                writeState(stateOffsetExited(), stateSizeExited(), 1)
+            }
+
+            function getExitCode() -> out {
+                out := readState(stateOffsetExitCode(), stateSizeExitCode())
+            }
+            function setExitCode(v) {
+                writeState(stateOffsetExitCode(), stateSizeExitCode(), v)
+            }
+
+            function getStep() -> out {
+                out := readState(stateOffsetStep(), stateSizeStep())
+            }
+            function setStep(v) {
+                writeState(stateOffsetStep(), stateSizeStep(), v)
+            }
+
+            function getHeap() -> out {
+                out := readState(stateOffsetHeap(), stateSizeHeap())
+            }
+            function setHeap(v) {
+                writeState(stateOffsetHeap(), stateSizeHeap(), v)
+            }
+
+            function getLoadReservation() -> out {
+                out := readState(stateOffsetLoadReservation(), stateSizeLoadReservation())
+            }
+            function setLoadReservation(addr) {
+                writeState(stateOffsetLoadReservation(), stateSizeLoadReservation(), addr)
+            }
+
+            function getRegister(reg) -> out {
+                if gt64(reg, toU64(31)) { revertWithCode(0xbad4e9) } // cannot load invalid register
+
+                let offset := add64(toU64(stateOffsetRegisters()), mul64(reg, toU64(8)))
+                out := readState(offset, 8)
+            }
+            function setRegister(reg, v) {
+                if iszero64(reg) {
+                    // reg 0 must stay 0
+                    // v is a HINT, but no hints are specified by standard spec, or used by us.
+                    leave
+                }
+                if gt64(reg, toU64(31)) { revertWithCode(0xbad4e9) } // unknown register
+
+                let offset := add64(toU64(stateOffsetRegisters()), mul64(reg, toU64(8)))
+                writeState(offset, 8, v)
+            }
+
+            //
+            // State output
+            //
+            function vmStatus() -> status {
+                switch getExited()
+                case 1 {
+                    switch getExitCode()
+                    case 0 { status := 0 }
+                    // VMStatusValid
+                    case 1 { status := 1 }
+                    // VMStatusInvalid
+                    default { status := 2 } // VMStatusPanic
+                }
+                default { status := 3 } // VMStatusUnfinished
+            }
+
+            function computeStateHash() -> out {
+                // Log the RISC-V state for debugging
+                log0(memStateOffset(), stateSize())
+
+                out := keccak256(memStateOffset(), stateSize())
+                out := or(and(not(shl(248, 0xFF)), out), shl(248, vmStatus()))
+            }
+
+            //
+            // Parse - functions to parse RISC-V instructions - see parse.go
+            //
+            function parseImmTypeI(instr) -> out {
+                out := signExtend64(shr64(toU64(20), instr), toU64(11))
+            }
+
+            function parseImmTypeS(instr) -> out {
+                out :=
+                    signExtend64(
+                        or64(shl64(toU64(5), shr64(toU64(25), instr)), and64(shr64(toU64(7), instr), toU64(0x1F))),
+                        toU64(11)
+                    )
+            }
+
+            function parseImmTypeB(instr) -> out {
+                out :=
+                    signExtend64(
+                        or64(
+                            or64(
+                                shl64(toU64(1), and64(shr64(toU64(8), instr), toU64(0xF))),
+                                shl64(toU64(5), and64(shr64(toU64(25), instr), toU64(0x3F)))
+                            ),
+                            or64(
+                                shl64(toU64(11), and64(shr64(toU64(7), instr), toU64(1))),
+                                shl64(toU64(12), shr64(toU64(31), instr))
+                            )
+                        ),
+                        toU64(12)
+                    )
+            }
+
+            function parseImmTypeU(instr) -> out {
+                out := signExtend64(shr64(toU64(12), instr), toU64(19))
+            }
+
+            function parseImmTypeJ(instr) -> out {
+                out :=
+                    signExtend64(
+                        or64(
+                            or64(
+                                and64(shr64(toU64(21), instr), shortToU64(0x3FF)), // 10 bits for index 0:9
+                                shl64(toU64(10), and64(shr64(toU64(20), instr), toU64(1))) // 1 bit for index 10
+                            ),
+                            or64(
+                                shl64(toU64(11), and64(shr64(toU64(12), instr), toU64(0xFF))), // 8 bits for index 11:18
+                                shl64(toU64(19), shr64(toU64(31), instr)) // 1 bit for index 19
+                            )
+                        ),
+                        toU64(19)
+                    )
+            }
+
+            function parseOpcode(instr) -> out {
+                out := and64(instr, toU64(0x7F))
+            }
+
+            function parseRd(instr) -> out {
+                out := and64(shr64(toU64(7), instr), toU64(0x1F))
+            }
+
+            function parseFunct3(instr) -> out {
+                out := and64(shr64(toU64(12), instr), toU64(0x7))
+            }
+
+            function parseRs1(instr) -> out {
+                out := and64(shr64(toU64(15), instr), toU64(0x1F))
+            }
+
+            function parseRs2(instr) -> out {
+                out := and64(shr64(toU64(20), instr), toU64(0x1F))
+            }
+
+            function parseFunct7(instr) -> out {
+                out := shr64(toU64(25), instr)
+            }
+
+            //
+            // Memory functions
+            //
+            function proofOffset(proofIndex) -> offset {
+                // proof size: 64-5+1=60 (a 64-bit mem-address branch to 32 byte leaf, incl leaf itself), all 32 bytes
+                offset := mul64(mul64(toU64(proofIndex), toU64(60)), toU64(32))
+                offset := add64(offset, proofContentOffset())
+            }
+
+            function hashPair(a, b) -> h {
+                mstore(0, a)
+                mstore(0x20, b)
+                h := keccak256(0, 0x40)
+            }
+
+            function getMemoryB32(addr, proofIndex) -> out {
+                if and64(addr, toU64(31)) {
+                    // quick addr alignment check
+                    revertWithCode(0xbad10ad0) // addr not aligned with 32 bytes
+                }
+                let offset := proofOffset(proofIndex)
+                let leaf := calldataload(offset)
+                offset := add64(offset, toU64(32))
+
+                let path := shr64(toU64(5), addr) // 32 bytes of memory per leaf
+                let node := leaf // starting from the leaf node, work back up by combining with siblings, to reconstruct
+                    // the root
+                for { let i := 0 } lt(i, sub(64, 5)) { i := add(i, 1) } {
+                    let sibling := calldataload(offset)
+                    offset := add64(offset, toU64(32))
+                    switch and64(shr64(toU64(i), path), toU64(1))
+                    case 0 { node := hashPair(node, sibling) }
+                    case 1 { node := hashPair(sibling, node) }
+                }
+                let memRoot := getMemRoot()
+                if iszero(eq(b32asBEWord(node), b32asBEWord(memRoot))) {
+                    // verify the root matches
+                    revertWithCode(0xbadf00d1) // bad memory proof
+                }
+                out := leaf
+            }
+
+            // warning: setMemoryB32 does not verify the proof,
+            // it assumes the same memory proof has been verified with getMemoryB32
+            function setMemoryB32(addr, v, proofIndex) {
+                if and64(addr, toU64(31)) { revertWithCode(0xbad10ad0) } // addr not aligned with 32 bytes
+
+                let offset := proofOffset(proofIndex)
+                let leaf := v
+                offset := add64(offset, toU64(32))
+                let path := shr64(toU64(5), addr) // 32 bytes of memory per leaf
+                let node := leaf // starting from the leaf node, work back up by combining with siblings, to reconstruct
+                    // the root
+                for { let i := 0 } lt(i, sub(64, 5)) { i := add(i, 1) } {
+                    let sibling := calldataload(offset)
+                    offset := add64(offset, toU64(32))
+
+                    switch and64(shr64(toU64(i), path), toU64(1))
+                    case 0 { node := hashPair(node, sibling) }
+                    case 1 { node := hashPair(sibling, node) }
+                }
+                setMemRoot(node) // store new memRoot
+            }
+
+            // load unaligned, optionally signed, little-endian, integer of 1 ... 8 bytes from memory
+            function loadMem(addr, size, signed, proofIndexL, proofIndexR) -> out {
+                if gt(size, 8) { revertWithCode(0xbad512e0) } // cannot load more than 8 bytes
+                // load/verify left part
+                let leftAddr := and64(addr, not64(toU64(31)))
+                let left := b32asBEWord(getMemoryB32(leftAddr, proofIndexL))
+                let alignment := sub64(addr, leftAddr)
+
+                let right := 0
+                let rightAddr := and64(add64(addr, sub64(size, toU64(1))), not64(toU64(31)))
+                let leftShamt := sub64(sub64(toU64(32), alignment), size)
+                let rightShamt := toU64(0)
+                if iszero64(eq64(leftAddr, rightAddr)) {
+                    // if unaligned, use second proof for the right part
+                    if eq(proofIndexR, 0xff) { revertWithCode(0xbad22220) } // unexpected need for right-side proof in
+                        // loadMem
+                    // load/verify right part
+                    right := b32asBEWord(getMemoryB32(rightAddr, proofIndexR))
+                    // left content is aligned to right of 32 bytes
+                    leftShamt := toU64(0)
+                    rightShamt := sub64(sub64(toU64(64), alignment), size)
+                }
+
+                // left: prepare for byte-taking by right-aligning
+                left := shr(u64ToU256(shl64(toU64(3), leftShamt)), left)
+                // right: right-align for byte-taking by right-aligning
+                right := shr(u64ToU256(shl64(toU64(3), rightShamt)), right)
+                // loop:
+                for { let i := 0 } lt(i, size) { i := add(i, 1) } {
+                    // translate to reverse byte lookup, since we are reading little-endian memory, and need the highest
+                    // byte first.
+                    // effAddr := (addr + size - 1 - i) &^ 31
+                    let effAddr := and64(sub64(sub64(add64(addr, size), toU64(1)), toU64(i)), not64(toU64(31)))
+                    // take a byte from either left or right, depending on the effective address
+                    let b := toU256(0)
+                    switch eq64(effAddr, leftAddr)
+                    case 1 {
+                        b := and(left, toU256(0xff))
+                        left := shr(toU256(8), left)
+                    }
+                    case 0 {
+                        b := and(right, toU256(0xff))
+                        right := shr(toU256(8), right)
+                    }
+                    // append it to the output
+                    out := or64(shl64(toU64(8), out), u256ToU64(b))
+                }
+
+                if signed {
+                    let signBitShift := sub64(shl64(toU64(3), size), toU64(1))
+                    out := signExtend64(out, signBitShift)
+                }
+            }
+
+            // Splits the value into a left and a right part, each with a mask (identify data) and a patch (diff
+            // content).
+            function leftAndRight(alignment, size, value) -> leftMask, rightMask, leftPatch, rightPatch {
+                let start := alignment
+                let end := add64(alignment, size)
+                for { let i := 0 } lt(i, 64) { i := add(i, 1) } {
+                    let index := toU64(i)
+                    let leftSide := lt64(index, toU64(32))
+                    switch leftSide
+                    case 1 {
+                        leftPatch := shl(8, leftPatch)
+                        leftMask := shl(8, leftMask)
+                    }
+                    case 0 {
+                        rightPatch := shl(8, rightPatch)
+                        rightMask := shl(8, rightMask)
+                    }
+                    if and64(eq64(lt64(index, start), toU64(0)), lt64(index, end)) {
+                        // if alignment <= i < alignment+size
+                        let b := and(shr(u64ToU256(shl64(toU64(3), sub64(index, alignment))), value), toU256(0xff))
+                        switch leftSide
+                        case 1 {
+                            leftPatch := or(leftPatch, b)
+                            leftMask := or(leftMask, toU256(0xff))
+                        }
+                        case 0 {
+                            rightPatch := or(rightPatch, b)
+                            rightMask := or(rightMask, toU256(0xff))
+                        }
+                    }
+                }
+            }
+
+            function storeMemUnaligned(addr, size, value, proofIndexL, proofIndexR) {
+                if gt(size, 32) { revertWithCode(0xbad512e1) } // cannot store more than 32 bytes
+
+                let leftAddr := and64(addr, not64(toU64(31)))
+                let rightAddr := and64(add64(addr, sub64(size, toU64(1))), not64(toU64(31)))
+                let alignment := sub64(addr, leftAddr)
+                let leftMask, rightMask, leftPatch, rightPatch := leftAndRight(alignment, size, value)
+
+                // load the left base
+                let left := b32asBEWord(getMemoryB32(leftAddr, proofIndexL))
+                // apply the left patch
+                left := or(and(left, not(leftMask)), leftPatch)
+                // write the left
+                setMemoryB32(leftAddr, beWordAsB32(left), proofIndexL)
+
+                // if aligned: nothing more to do here
+                if eq64(leftAddr, rightAddr) { leave }
+                if eq(proofIndexR, 0xff) { revertWithCode(0xbad22221) } // unexpected need for right-side proof in
+                    // storeMem
+                // load the right base (with updated mem root)
+                let right := b32asBEWord(getMemoryB32(rightAddr, proofIndexR))
+                // apply the right patch
+                right := or(and(right, not(rightMask)), rightPatch)
+                // write the right (with updated mem root)
+                setMemoryB32(rightAddr, beWordAsB32(right), proofIndexR)
+            }
+
+            function storeMem(addr, size, value, proofIndexL, proofIndexR) {
+                storeMemUnaligned(addr, size, u64ToU256(value), proofIndexL, proofIndexR)
+            }
+
+            //
+            // Preimage oracle interactions
+            //
+            function writePreimageKey(addr, count) -> out {
+                // adjust count down, so we only have to read a single 32 byte leaf of memory
+                let alignment := and64(addr, toU64(31))
+                let maxData := sub64(toU64(32), alignment)
+                if gt64(count, maxData) { count := maxData }
+
+                let dat := b32asBEWord(getMemoryB32(sub64(addr, alignment), 1))
+                // shift out leading bits
+                dat := shl(u64ToU256(shl64(toU64(3), alignment)), dat)
+                // shift to right end, remove trailing bits
+                dat := shr(u64ToU256(shl64(toU64(3), sub64(toU64(32), count))), dat)
+
+                let bits := shl(toU256(3), u64ToU256(count))
+
+                let preImageKey := getPreimageKey()
+
+                // Append to key content by bit-shifting
+                let key := b32asBEWord(preImageKey)
+                key := shl(bits, key)
+                key := or(key, dat)
+
+                // We reset the pre-image value offset back to 0 (the right part of the merkle pair)
+                setPreimageKey(beWordAsB32(key))
+                setPreimageOffset(toU64(0))
+                out := count
+            }
+
+            function readPreimagePart(key, offset) -> dat, datlen {
+                let addr := sload(preimageOraclePos()) // calling Oracle.readPreimage(bytes32,uint256)
+                let memPtr := mload(0x40) // get pointer to free memory for preimage interactions
+                mstore(memPtr, shl(224, 0xe03110e1)) // (32-4)*8=224: right-pad the function selector, and then store it
+                    // as prefix
+                mstore(add(memPtr, 0x04), key)
+                mstore(add(memPtr, 0x24), offset)
+                let res := call(gas(), addr, 0, memPtr, 0x44, 0x00, 0x40) // output into scratch space
+                if res {
+                    // 1 on success
+                    dat := mload(0x00)
+                    datlen := mload(0x20)
+                    leave
+                }
+                revertWithCode(0xbadf00d0)
+            }
+
+            // Original implementation is at src/cannon/PreimageKeyLib.sol
+            // but it cannot be used because this is inside assembly block
+            function localize(preImageKey, localContext_) -> localizedKey {
+                // Grab the current free memory pointer to restore later.
+                let ptr := mload(0x40)
+                // Store the local data key and caller next to each other in memory for hashing.
+                mstore(0, preImageKey)
+                mstore(0x20, caller())
+                mstore(0x40, localContext_)
+                // Localize the key with the above `localize` operation.
+                localizedKey := or(and(keccak256(0, 0x60), not(shl(248, 0xFF))), shl(248, 1))
+                // Restore the free memory pointer.
+                mstore(0x40, ptr)
+            }
+
+            function readPreimageValue(addr, count, localContext_) -> out {
+                let preImageKey := getPreimageKey()
+                let offset := getPreimageOffset()
+                // If the preimage key is a local key, localize it in the context of the caller.
+                let preImageKeyPrefix := shr(248, preImageKey) // 256-8=248
+                if eq(preImageKeyPrefix, 1) { preImageKey := localize(preImageKey, localContext_) }
+                // make call to pre-image oracle contract
+                let pdatB32, pdatlen := readPreimagePart(preImageKey, offset)
+                if iszero64(pdatlen) {
+                    // EOF
+                    out := toU64(0)
+                    leave
+                }
+                let alignment := and64(addr, toU64(31)) // how many bytes addr is offset from being left-aligned
+                let maxData := sub64(toU64(32), alignment) // higher alignment leaves less room for data this step
+                if gt64(count, maxData) { count := maxData }
+                if gt64(count, pdatlen) {
+                    // cannot read more than pdatlen
+                    count := pdatlen
+                }
+
+                let bits := shl64(toU64(3), sub64(toU64(32), count)) // 32-count, in bits
+                let mask := not(sub(shl(u64ToU256(bits), toU256(1)), toU256(1))) // left-aligned mask for count bytes
+                let alignmentBits := u64ToU256(shl64(toU64(3), alignment))
+                mask := shr(alignmentBits, mask) // mask of count bytes, shifted by alignment
+                let pdat := shr(alignmentBits, b32asBEWord(pdatB32)) // pdat, shifted by alignment
+
+                // update pre-image reader with updated offset
+                let newOffset := add64(offset, count)
+                setPreimageOffset(newOffset)
+
+                let node := getMemoryB32(sub64(addr, alignment), 1)
+                let dat := and(b32asBEWord(node), not(mask)) // keep old bytes outside of mask
+                dat := or(dat, and(pdat, mask)) // fill with bytes from pdat
+                setMemoryB32(sub64(addr, alignment), beWordAsB32(dat), 1)
+                out := count
+            }
+
+            //
+            // Syscall handling
+            //
+            function sysCall(localContext_) {
+                let a7 := getRegister(toU64(17))
+                switch a7
+                case 93 {
+                    // exit the calling thread. No multi-thread support yet, so just exit.
+                    let a0 := getRegister(toU64(10))
+                    setExitCode(and(a0, 0xff))
+                    setExited()
+                    // program stops here, no need to change registers.
+                }
+                case 94 {
+                    // exit-group
+                    let a0 := getRegister(toU64(10))
+                    setExitCode(and(a0, 0xff))
+                    setExited()
+                }
+                case 214 {
+                    // brk
+                    // Go sys_linux_riscv64 runtime will only ever call brk(NULL), i.e. first argument (register a0) set
+                    // to 0.
+
+                    // brk(0) changes nothing about the memory, and returns the current page break
+                    let v := shl64(toU64(30), toU64(1)) // set program break at 1 GiB
+                    setRegister(toU64(10), v)
+                    setRegister(toU64(11), toU64(0)) // no error
+                }
+                case 222 {
+                    // mmap
+                    // A0 = addr (hint)
+                    let addr := getRegister(toU64(10))
+                    // A1 = n (length)
+                    let length := getRegister(toU64(11))
+                    // A2 = prot (memory protection type, can ignore)
+                    // A3 = flags (shared with other process and or written back to file)
+                    let flags := getRegister(toU64(13))
+                    // A4 = fd (file descriptor, can ignore because we support anon memory only)
+                    let fd := getRegister(toU64(14))
+                    // A5 = offset (offset in file, we don't support any non-anon memory, so we can ignore this)
+
+                    let errCode := 0
+                    // ensure MAP_ANONYMOUS is set and fd == -1
+                    switch or(iszero(and(flags, 0x20)), not(eq(fd, u64Mask())))
+                    case 1 {
+                        addr := u64Mask()
+                        errCode := toU64(0x4d)
+                    }
+                    default {
+                        switch addr
+                        case 0 {
+                            // No hint, allocate it ourselves, by as much as the requested length.
+                            // Increase the length to align it with desired page size if necessary.
+                            let align := and64(length, shortToU64(4095))
+                            if align { length := add64(length, sub64(shortToU64(4096), align)) }
+                            let prevHeap := getHeap()
+                            addr := prevHeap
+                            setHeap(add64(prevHeap, length)) // increment heap with length
+                        }
+                        default {
+                            // allow hinted memory address (leave it in A0 as return argument)
+                        }
+                    }
+
+                    setRegister(toU64(10), addr)
+                    setRegister(toU64(11), errCode)
+                }
+                case 63 {
+                    // read
+                    let fd := getRegister(toU64(10)) // A0 = fd
+                    let addr := getRegister(toU64(11)) // A1 = *buf addr
+                    let count := getRegister(toU64(12)) // A2 = count
+                    let n := 0
+                    let errCode := 0
+                    switch fd
+                    case 0 {
+                        // stdin
+                        n := toU64(0) // never read anything from stdin
+                        errCode := toU64(0)
+                    }
+                    case 3 {
+                        // hint-read
+                        // say we read it all, to continue execution after reading the hint-write ack response
+                        n := count
+                        errCode := toU64(0)
+                    }
+                    case 5 {
+                        // preimage read
+                        n := readPreimageValue(addr, count, localContext_)
+                        errCode := toU64(0)
+                    }
+                    default {
+                        n := u64Mask() //  -1 (reading error)
+                        errCode := toU64(0x4d) // EBADF
+                    }
+                    setRegister(toU64(10), n)
+                    setRegister(toU64(11), errCode)
+                }
+                case 64 {
+                    // write
+                    let fd := getRegister(toU64(10)) // A0 = fd
+                    let addr := getRegister(toU64(11)) // A1 = *buf addr
+                    let count := getRegister(toU64(12)) // A2 = count
+                    let n := 0
+                    let errCode := 0
+                    switch fd
+                    case 1 {
+                        // stdout
+                        n := count // write completes fully in single instruction step
+                        errCode := toU64(0)
+                    }
+                    case 2 {
+                        // stderr
+                        n := count // write completes fully in single instruction step
+                        errCode := toU64(0)
+                    }
+                    case 4 {
+                        // hint-write
+                        n := count
+                        errCode := toU64(0)
+                    }
+                    case 6 {
+                        // pre-image key-write
+                        n := writePreimageKey(addr, count)
+                        errCode := toU64(0) // no error
+                    }
+                    default {
+                        // any other file, including (3) hint read (5) preimage read
+                        n := u64Mask() //  -1 (writing error)
+                        errCode := toU64(0x4d) // EBADF
+                    }
+                    setRegister(toU64(10), n)
+                    setRegister(toU64(11), errCode)
+                }
+                case 25 {
+                    // fcntl - file descriptor manipulation / info lookup
+                    let fd := getRegister(toU64(10)) // A0 = fd
+                    let cmd := getRegister(toU64(11)) // A1 = cmd
+                    let out := 0
+                    let errCode := 0
+                    switch cmd
+                    case 0x1 {
+                        // F_GETFD: get file descriptor flags
+                        switch fd
+                        case 0 {
+                            // stdin
+                            out := toU64(0) // no flag set
+                        }
+                        case 1 {
+                            // stdout
+                            out := toU64(0) // no flag set
+                        }
+                        case 2 {
+                            // stderr
+                            out := toU64(0) // no flag set
+                        }
+                        case 3 {
+                            // hint-read
+                            out := toU64(0) // no flag set
+                        }
+                        case 4 {
+                            // hint-write
+                            out := toU64(0) // no flag set
+                        }
+                        case 5 {
+                            // pre-image read
+                            out := toU64(0) // no flag set
+                        }
+                        case 6 {
+                            // pre-image write
+                            out := toU64(0) // no flag set
+                        }
+                        default {
+                            out := u64Mask()
+                            errCode := toU64(0x4d) //EBADF
+                        }
+                    }
+                    case 0x3 {
+                        // F_GETFL: get file descriptor flags
+                        switch fd
+                        case 0 {
+                            // stdin
+                            out := toU64(0) // O_RDONLY
+                        }
+                        case 1 {
+                            // stdout
+                            out := toU64(1) // O_WRONLY
+                        }
+                        case 2 {
+                            // stderr
+                            out := toU64(1) // O_WRONLY
+                        }
+                        case 3 {
+                            // hint-read
+                            out := toU64(0) // O_RDONLY
+                        }
+                        case 4 {
+                            // hint-write
+                            out := toU64(1) // O_WRONLY
+                        }
+                        case 5 {
+                            // pre-image read
+                            out := toU64(0) // O_RDONLY
+                        }
+                        case 6 {
+                            // pre-image write
+                            out := toU64(1) // O_WRONLY
+                        }
+                        default {
+                            out := u64Mask()
+                            errCode := toU64(0x4d) // EBADF
+                        }
+                    }
+                    default {
+                        // no other commands: don't allow changing flags, duplicating FDs, etc.
+                        out := u64Mask()
+                        errCode := toU64(0x16) // EINVAL (cmd not recognized by this kernel)
+                    }
+                    setRegister(toU64(10), out)
+                    setRegister(toU64(11), errCode) // EBADF
+                }
+                case 56 {
+                    // openat - the Go linux runtime will try to open optional /sys/kernel files for performance hints
+                    setRegister(toU64(10), u64Mask())
+                    setRegister(toU64(11), toU64(0xd)) // EACCES - no access allowed
+                }
+                case 113 {
+                    // clock_gettime
+                    let addr := getRegister(toU64(11)) // addr of timespec struct
+                    // write 1337s + 42ns as time
+                    let value := or(shortToU256(1337), shl(shortToU256(64), toU256(42)))
+                    storeMemUnaligned(addr, toU64(16), value, 1, 2)
+                    setRegister(toU64(10), toU64(0))
+                    setRegister(toU64(11), toU64(0))
+                }
+                case 220 {
+                    // clone - not supported
+                    setRegister(toU64(10), toU64(1))
+                    setRegister(toU64(11), toU64(0))
+                }
+                case 163 {
+                    // getrlimit
+                    let res := getRegister(toU64(10))
+                    let addr := getRegister(toU64(11))
+                    switch res
+                    case 0x7 {
+                        // RLIMIT_NOFILE
+                        // first 8 bytes: soft limit. 1024 file handles max open
+                        // second 8 bytes: hard limit
+                        storeMemUnaligned(
+                            addr, toU64(16), or(shortToU256(1024), shl(toU256(64), shortToU256(1024))), 1, 2
+                        )
+                        setRegister(toU64(10), toU64(0))
+                        setRegister(toU64(11), toU64(0))
+                    }
+                    default { revertWithCode(0xf0012) } // unrecognized resource limit lookup
+                }
+                case 261 {
+                    // prlimit64 -- unsupported, we have getrlimit, is prlimit64 even called?
+                    revertWithCode(0xf001ca11) // unsupported system call
+                }
+                case 422 {
+                    // futex - not supported, for now
+                    revertWithCode(0xf001ca11) // unsupported system call
+                }
+                case 101 {
+                    // nanosleep - not supported, for now
+                    revertWithCode(0xf001ca11) // unsupported system call
+                }
+                default {
+                    // Ignore(no-op) unsupported system calls
+                    setRegister(toU64(10), toU64(0))
+                    setRegister(toU64(11), toU64(0))
+                }
+            }
+
+            //
+            // Instruction execution
+            //
+            if getExited() {
+                // early exit if we can
+                mstore(0, computeStateHash())
+                return(0, 0x20)
+            }
+            setStep(add64(getStep(), toU64(1)))
+
+            let _pc := getPC()
+            let instr := loadMem(_pc, toU64(4), false, 0, 0xff) // raw instruction
+
+            // these fields are ignored if not applicable to the instruction type / opcode
+            let opcode := parseOpcode(instr)
+            let rd := parseRd(instr) // destination register index
+            let funct3 := parseFunct3(instr)
+            let rs1 := parseRs1(instr) // source register 1 index
+            let rs2 := parseRs2(instr) // source register 2 index
+            let funct7 := parseFunct7(instr)
+
+            switch opcode
+            case 0x03 {
+                // 000_0011: memory loading
+                // LB, LH, LW, LD, LBU, LHU, LWU
+                let imm := parseImmTypeI(instr)
+                let signed := iszero64(and64(funct3, toU64(4))) // 4 = 100 -> bitflag
+                let size := shl64(and64(funct3, toU64(3)), toU64(1)) // 3 = 11 -> 1, 2, 4, 8 bytes size
+                let rs1Value := getRegister(rs1)
+                let memIndex := add64(rs1Value, signExtend64(imm, toU64(11)))
+                let rdValue := loadMem(memIndex, size, signed, 1, 2)
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x23 {
+                // 010_0011: memory storing
+                // SB, SH, SW, SD
+                let imm := parseImmTypeS(instr)
+                let size := shl64(funct3, toU64(1))
+                let value := getRegister(rs2)
+                let rs1Value := getRegister(rs1)
+                let memIndex := add64(rs1Value, signExtend64(imm, toU64(11)))
+                storeMem(memIndex, size, value, 1, 2)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x63 {
+                // 110_0011: branching
+                let rs1Value := getRegister(rs1)
+                let rs2Value := getRegister(rs2)
+                let branchHit := toU64(0)
+                switch funct3
+                case 0 {
+                    // 000 = BEQ
+                    branchHit := eq64(rs1Value, rs2Value)
+                }
+                case 1 {
+                    // 001 = BNE
+                    branchHit := and64(not64(eq64(rs1Value, rs2Value)), toU64(1))
+                }
+                case 4 {
+                    // 100 = BLT
+                    branchHit := slt64(rs1Value, rs2Value)
+                }
+                case 5 {
+                    // 101 = BGE
+                    branchHit := and64(not64(slt64(rs1Value, rs2Value)), toU64(1))
+                }
+                case 6 {
+                    // 110 = BLTU
+                    branchHit := lt64(rs1Value, rs2Value)
+                }
+                case 7 {
+                    // 111 := BGEU
+                    branchHit := and64(not64(lt64(rs1Value, rs2Value)), toU64(1))
+                }
+                switch branchHit
+                case 0 { _pc := add64(_pc, toU64(4)) }
+                default {
+                    let imm := parseImmTypeB(instr)
+                    // imm12 is a signed offset, in multiples of 2 bytes.
+                    // So it's really 13 bits with a hardcoded 0 bit.
+                    _pc := add64(_pc, imm)
+                }
+                // not like the other opcodes: nothing to write to rd register, and PC has already changed
+                setPC(_pc)
+            }
+            case 0x13 {
+                // 001_0011: immediate arithmetic and logic
+                let rs1Value := getRegister(rs1)
+                let imm := parseImmTypeI(instr)
+                let rdValue := 0
+                switch funct3
+                case 0 {
+                    // 000 = ADDI
+                    rdValue := add64(rs1Value, imm)
+                }
+                case 1 {
+                    // 001 = SLLI
+                    rdValue := shl64(and64(imm, toU64(0x3F)), rs1Value) // lower 6 bits in 64 bit mode
+                }
+                case 2 {
+                    // 010 = SLTI
+                    rdValue := slt64(rs1Value, imm)
+                }
+                case 3 {
+                    // 011 = SLTIU
+                    rdValue := lt64(rs1Value, imm)
+                }
+                case 4 {
+                    // 100 = XORI
+                    rdValue := xor64(rs1Value, imm)
+                }
+                case 5 {
+                    // 101 = SR~
+                    switch shr64(toU64(6), imm)
+                    // in rv64i the top 6 bits select the shift type
+                    case 0x00 {
+                        // 000000 = SRLI
+                        rdValue := shr64(and64(imm, toU64(0x3F)), rs1Value) // lower 6 bits in 64 bit mode
+                    }
+                    case 0x10 {
+                        // 010000 = SRAI
+                        rdValue := sar64(and64(imm, toU64(0x3F)), rs1Value) // lower 6 bits in 64 bit mode
+                    }
+                }
+                case 6 {
+                    // 110 = ORI
+                    rdValue := or64(rs1Value, imm)
+                }
+                case 7 {
+                    // 111 = ANDI
+                    rdValue := and64(rs1Value, imm)
+                }
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x1B {
+                // 001_1011: immediate arithmetic and logic signed 32 bit
+                let rs1Value := getRegister(rs1)
+                let imm := parseImmTypeI(instr)
+                let rdValue := 0
+                switch funct3
+                case 0 {
+                    // 000 = ADDIW
+                    rdValue := mask32Signed64(add64(rs1Value, imm))
+                }
+                case 1 {
+                    // 001 = SLLIW
+                    rdValue := mask32Signed64(shl64(and64(imm, toU64(0x1F)), rs1Value))
+                }
+                case 5 {
+                    // 101 = SR~
+                    let shamt := and64(imm, toU64(0x1F))
+                    switch shr64(toU64(5), imm)
+                    // top 7 bits select the shift type
+                    case 0x00 {
+                        // 0000000 = SRLIW
+                        rdValue := signExtend64(shr64(shamt, and64(rs1Value, u32Mask())), toU64(31))
+                    }
+                    case 0x20 {
+                        // 0100000 = SRAIW
+                        rdValue := signExtend64(shr64(shamt, and64(rs1Value, u32Mask())), sub64(toU64(31), shamt))
+                    }
+                }
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x33 {
+                // 011_0011: register arithmetic and logic
+                let rs1Value := getRegister(rs1)
+                let rs2Value := getRegister(rs2)
+                let rdValue := 0
+                switch funct7
+                case 1 {
+                    // RV M extension
+                    switch funct3
+                    case 0 {
+                        // 000 = MUL: signed x signed
+                        rdValue := mul64(rs1Value, rs2Value)
+                    }
+                    case 1 {
+                        // 001 = MULH: upper bits of signed x signed
+                        rdValue :=
+                            u256ToU64(shr(toU256(64), mul(signExtend64To256(rs1Value), signExtend64To256(rs2Value))))
+                    }
+                    case 2 {
+                        // 010 = MULHSU: upper bits of signed x unsigned
+                        rdValue := u256ToU64(shr(toU256(64), mul(signExtend64To256(rs1Value), u64ToU256(rs2Value))))
+                    }
+                    case 3 {
+                        // 011 = MULHU: upper bits of unsigned x unsigned
+                        rdValue := u256ToU64(shr(toU256(64), mul(u64ToU256(rs1Value), u64ToU256(rs2Value))))
+                    }
+                    case 4 {
+                        // 100 = DIV
+                        switch rs2Value
+                        case 0 { rdValue := u64Mask() }
+                        default { rdValue := sdiv64(rs1Value, rs2Value) }
+                    }
+                    case 5 {
+                        // 101 = DIVU
+                        switch rs2Value
+                        case 0 { rdValue := u64Mask() }
+                        default { rdValue := div64(rs1Value, rs2Value) }
+                    }
+                    case 6 {
+                        // 110 = REM
+                        switch rs2Value
+                        case 0 { rdValue := rs1Value }
+                        default { rdValue := smod64(rs1Value, rs2Value) }
+                    }
+                    case 7 {
+                        // 111 = REMU
+                        switch rs2Value
+                        case 0 { rdValue := rs1Value }
+                        default { rdValue := mod64(rs1Value, rs2Value) }
+                    }
+                }
+                default {
+                    switch funct3
+                    case 0 {
+                        // 000 = ADD/SUB
+                        switch funct7
+                        case 0x00 {
+                            // 0000000 = ADD
+                            rdValue := add64(rs1Value, rs2Value)
+                        }
+                        case 0x20 {
+                            // 0100000 = SUB
+                            rdValue := sub64(rs1Value, rs2Value)
+                        }
+                    }
+                    case 1 {
+                        // 001 = SLL
+                        rdValue := shl64(and64(rs2Value, toU64(0x3F)), rs1Value) // only the low 6 bits are consider in
+                            // RV6VI
+                    }
+                    case 2 {
+                        // 010 = SLT
+                        rdValue := slt64(rs1Value, rs2Value)
+                    }
+                    case 3 {
+                        // 011 = SLTU
+                        rdValue := lt64(rs1Value, rs2Value)
+                    }
+                    case 4 {
+                        // 100 = XOR
+                        rdValue := xor64(rs1Value, rs2Value)
+                    }
+                    case 5 {
+                        // 101 = SR~
+                        switch funct7
+                        case 0x00 {
+                            // 0000000 = SRL
+                            rdValue := shr64(and64(rs2Value, toU64(0x3F)), rs1Value) // logical: fill with zeroes
+                        }
+                        case 0x20 {
+                            // 0100000 = SRA
+                            rdValue := sar64(and64(rs2Value, toU64(0x3F)), rs1Value) // arithmetic: sign bit is extended
+                        }
+                    }
+                    case 6 {
+                        // 110 = OR
+                        rdValue := or64(rs1Value, rs2Value)
+                    }
+                    case 7 {
+                        // 111 = AND
+                        rdValue := and64(rs1Value, rs2Value)
+                    }
+                }
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x3B {
+                // 011_1011: register arithmetic and logic in 32 bits
+                let rs1Value := getRegister(rs1)
+                let rs2Value := getRegister(rs2)
+                let rdValue := 0
+                switch funct7
+                case 1 {
+                    // RV M extension
+                    switch funct3
+                    case 0 {
+                        // 000 = MULW
+                        rdValue := mask32Signed64(mul64(and64(rs1Value, u32Mask()), and64(rs2Value, u32Mask())))
+                    }
+                    case 4 {
+                        // 100 = DIVW
+                        switch rs2Value
+                        case 0 { rdValue := u64Mask() }
+                        default {
+                            rdValue := mask32Signed64(sdiv64(mask32Signed64(rs1Value), mask32Signed64(rs2Value)))
+                        }
+                    }
+                    case 5 {
+                        // 101 = DIVUW
+                        switch rs2Value
+                        case 0 { rdValue := u64Mask() }
+                        default {
+                            rdValue := mask32Signed64(div64(and64(rs1Value, u32Mask()), and64(rs2Value, u32Mask())))
+                        }
+                    }
+                    case 6 {
+                        // 110 = REMW
+                        switch rs2Value
+                        case 0 { rdValue := mask32Signed64(rs1Value) }
+                        default {
+                            rdValue := mask32Signed64(smod64(mask32Signed64(rs1Value), mask32Signed64(rs2Value)))
+                        }
+                    }
+                    case 7 {
+                        // 111 = REMUW
+                        switch rs2Value
+                        case 0 { rdValue := mask32Signed64(rs1Value) }
+                        default {
+                            rdValue := mask32Signed64(mod64(and64(rs1Value, u32Mask()), and64(rs2Value, u32Mask())))
+                        }
+                    }
+                }
+                default {
+                    switch funct3
+                    case 0 {
+                        // 000 = ADDW/SUBW
+                        switch funct7
+                        case 0x00 {
+                            // 0000000 = ADDW
+                            rdValue := mask32Signed64(add64(and64(rs1Value, u32Mask()), and64(rs2Value, u32Mask())))
+                        }
+                        case 0x20 {
+                            // 0100000 = SUBW
+                            rdValue := mask32Signed64(sub64(and64(rs1Value, u32Mask()), and64(rs2Value, u32Mask())))
+                        }
+                    }
+                    case 1 {
+                        // 001 = SLLW
+                        rdValue := mask32Signed64(shl64(and64(rs2Value, toU64(0x1F)), rs1Value))
+                    }
+                    case 5 {
+                        // 101 = SR~
+                        let shamt := and64(rs2Value, toU64(0x1F))
+                        switch funct7
+                        case 0x00 {
+                            // 0000000 = SRLW
+                            rdValue := signExtend64(shr64(shamt, and64(rs1Value, u32Mask())), toU64(31))
+                        }
+                        case 0x20 {
+                            // 0100000 = SRAW
+                            rdValue := signExtend64(shr64(shamt, and64(rs1Value, u32Mask())), sub64(toU64(31), shamt))
+                        }
+                    }
+                }
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x37 {
+                // 011_0111: LUI = Load upper immediate
+                let imm := parseImmTypeU(instr)
+                let rdValue := shl64(toU64(12), imm)
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x17 {
+                // 001_0111: AUIPC = Add upper immediate to PC
+                let imm := parseImmTypeU(instr)
+                let rdValue := add64(_pc, signExtend64(shl64(toU64(12), imm), toU64(31)))
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x6F {
+                // 110_1111: JAL = Jump and link
+                let imm := parseImmTypeJ(instr)
+                let rdValue := add64(_pc, toU64(4))
+                setRegister(rd, rdValue)
+                setPC(add64(_pc, signExtend64(shl64(toU64(1), imm), toU64(20)))) // signed offset in multiples of 2
+                    // bytes (last bit is there, but ignored)
+            }
+            case 0x67 {
+                // 110_0111: JALR = Jump and link register
+                let rs1Value := getRegister(rs1)
+                let imm := parseImmTypeI(instr)
+                let rdValue := add64(_pc, toU64(4))
+                setRegister(rd, rdValue)
+                setPC(and64(add64(rs1Value, signExtend64(imm, toU64(11))), xor64(u64Mask(), toU64(1)))) // least
+                    // significant bit is set to 0
+            }
+            case 0x73 {
+                // 111_0011: environment things
+                switch funct3
+                case 0 {
+                    // 000 = ECALL/EBREAK
+                    switch shr64(toU64(20), instr)
+                    // I-type, top 12 bits
+                    case 0 {
+                        // imm12 = 000000000000 ECALL
+                        sysCall(_localContext)
+                        setPC(add64(_pc, toU64(4)))
+                    }
+                    default {
+                        // imm12 = 000000000001 EBREAK
+                        setPC(add64(_pc, toU64(4))) // ignore breakpoint
+                    }
+                }
+                default {
+                    // CSR instructions
+                    setRegister(rd, toU64(0)) // ignore CSR instructions
+                    setPC(add64(_pc, toU64(4)))
+                }
+            }
+            case 0x2F {
+                // 010_1111: RV{32,64}A and RV{32,64}A atomic operations extension
+                // acquire and release bits:
+                //   aq := and64(shr64(toU64(1), funct7), toU64(1))
+                //   rl := and64(funct7, toU64(1))
+                // if none set: unordered
+                // if aq is set: no following mem ops observed before acquire mem op
+                // if rl is set: release mem op not observed before earlier mem ops
+                // if both set: sequentially consistent
+                // These are no-op here because there is no pipeline of mem ops to acquire/release.
+
+                // 0b010 == RV32A W variants
+                // 0b011 == RV64A D variants
+                let size := shl64(funct3, toU64(1))
+                if or(lt64(size, toU64(4)), gt64(size, toU64(8))) { revertWithCode(0xbada70) } // bad AMO size
+
+                let addr := getRegister(rs1)
+                if and64(addr, toU64(3)) {
+                    // quick addr alignment check
+                    revertWithCode(0xbad10ad0) // addr not aligned with 4 bytes
+                }
+
+                let op := shr64(toU64(2), funct7)
+                switch op
+                case 0x2 {
+                    // 00010 = LR = Load Reserved
+                    let v := loadMem(addr, size, true, 1, 2)
+                    setRegister(rd, v)
+                    setLoadReservation(addr)
+                }
+                case 0x3 {
+                    // 00011 = SC = Store Conditional
+                    let rdValue := toU64(1)
+                    if eq64(addr, getLoadReservation()) {
+                        let rs2Value := getRegister(rs2)
+                        storeMem(addr, size, rs2Value, 1, 2)
+                        rdValue := toU64(0)
+                    }
+                    setRegister(rd, rdValue)
+                    setLoadReservation(toU64(0))
+                }
+                default {
+                    // AMO: Atomic Memory Operation
+                    let rs2Value := getRegister(rs2)
+                    if eq64(size, toU64(4)) { rs2Value := mask32Signed64(rs2Value) }
+                    let value := rs2Value
+                    let v := loadMem(addr, size, true, 1, 2)
+                    let rdValue := v
+                    switch op
+                    case 0x0 {
+                        // 00000 = AMOADD = add
+                        v := add64(v, value)
+                    }
+                    case 0x1 {
+                        // 00001 = AMOSWAP
+                        v := value
+                    }
+                    case 0x4 {
+                        // 00100 = AMOXOR = xor
+                        v := xor64(v, value)
+                    }
+                    case 0x8 {
+                        // 01000 = AMOOR = or
+                        v := or64(v, value)
+                    }
+                    case 0xc {
+                        // 01100 = AMOAND = and
+                        v := and64(v, value)
+                    }
+                    case 0x10 {
+                        // 10000 = AMOMIN = min signed
+                        if slt64(value, v) { v := value }
+                    }
+                    case 0x14 {
+                        // 10100 = AMOMAX = max signed
+                        if sgt64(value, v) { v := value }
+                    }
+                    case 0x18 {
+                        // 11000 = AMOMINU = min unsigned
+                        if lt64(value, v) { v := value }
+                    }
+                    case 0x1c {
+                        // 11100 = AMOMAXU = max unsigned
+                        if gt64(value, v) { v := value }
+                    }
+                    default { revertWithCode(0xf001a70) } // unknown atomic operation
+
+                    storeMem(addr, size, v, 1, 3) // after overwriting 1, proof 2 is no longer valid
+                    setRegister(rd, rdValue)
+                }
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x0F {
+                // 000_1111: fence
+                // Used to impose additional ordering constraints; flushing the mem operation pipeline.
+                // This VM doesn't have a pipeline, nor additional harts, so this is a no-op.
+                // FENCE / FENCE.TSO / FENCE.I all no-op: there's nothing to synchronize.
+                setPC(add64(_pc, toU64(4)))
+            }
+            case 0x07 {
+                // FLW/FLD: floating point load word/double
+                setPC(add64(_pc, toU64(4))) // no-op this.
+            }
+            case 0x27 {
+                // FSW/FSD: floating point store word/double
+                setPC(add64(_pc, toU64(4))) // no-op this.
+            }
+            case 0x53 {
+                // FADD etc. no-op is enough to pass Go runtime check
+                setPC(add64(_pc, toU64(4))) // no-op this.
+            }
+            default { revertWithCode(0xf001c0de) } // unknown instruction opcode
+
+            mstore(0, computeStateHash())
+            return(0, 0x20)
+        }
+    }
+}
diff --git a/versions.json b/versions.json
index 5a2ae52b57f0..7778e8bf59fe 100644
--- a/versions.json
+++ b/versions.json
@@ -10,5 +10,6 @@
   "kontrol": "1.0.53",
   "just": "1.34.0",
   "binary_signer": "1.0.4",
-  "semgrep": "1.90.0"
+  "semgrep": "1.90.0",
+  "asterisc": "cl/contract-updates"
 }

From f3701d79211c3d4a3a1052a30e11eb4885ebc5cc Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 20 Nov 2024 07:40:57 +0100
Subject: [PATCH 228/451] improve delayedWeth test and coverage (#12963)

* improve delayedWeth test and coverage

* improve delayedWeth test and coverage

* fix DataAvailabilityChallenge failing fuzz test
---
 .../test/L1/DataAvailabilityChallenge.t.sol   |   1 +
 .../test/dispute/DelayedWETH.t.sol            | 104 ++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
index a2ab917a0d2b..921330060b3f 100644
--- a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
+++ b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
@@ -58,6 +58,7 @@ contract DataAvailabilityChallengeTest is CommonTest {
         // EntryPoint will revert if using amount > type(uint112).max.
         vm.assume(sender != Preinstalls.EntryPoint_v060);
         vm.assume(sender != address(dataAvailabilityChallenge));
+        vm.assume(sender != deploy.mustGetAddress("DataAvailabilityChallenge"));
         vm.assume(sender.balance == 0);
         vm.deal(sender, amount);
 
diff --git a/packages/contracts-bedrock/test/dispute/DelayedWETH.t.sol b/packages/contracts-bedrock/test/dispute/DelayedWETH.t.sol
index 6d7a9bea5134..1cbaf0c1eb25 100644
--- a/packages/contracts-bedrock/test/dispute/DelayedWETH.t.sol
+++ b/packages/contracts-bedrock/test/dispute/DelayedWETH.t.sol
@@ -64,6 +64,110 @@ contract DelayedWETH_Unlock_Test is DelayedWETH_Init {
 }
 
 contract DelayedWETH_Withdraw_Test is DelayedWETH_Init {
+    /// @dev Tests that withdrawing while unlocked and delay has passed is successful.
+    function test_withdraw_whileUnlocked_succeeds() public {
+        // Deposit some WETH.
+        vm.prank(alice);
+        delayedWeth.deposit{ value: 1 ether }();
+        uint256 balance = address(alice).balance;
+
+        // Unlock the withdrawal.
+        vm.prank(alice);
+        delayedWeth.unlock(alice, 1 ether);
+
+        // Wait for the delay.
+        vm.warp(block.timestamp + delayedWeth.delay() + 1);
+
+        // Withdraw the WETH.
+        vm.expectEmit(true, true, false, false);
+        emit Withdrawal(address(alice), 1 ether);
+        vm.prank(alice);
+        delayedWeth.withdraw(1 ether);
+        assertEq(address(alice).balance, balance + 1 ether);
+    }
+
+    /// @dev Tests that withdrawing when unlock was not called fails.
+    function test_withdraw_whileLocked_fails() public {
+        // Deposit some WETH.
+        vm.prank(alice);
+        delayedWeth.deposit{ value: 1 ether }();
+        uint256 balance = address(alice).balance;
+
+        // Withdraw fails when unlock not called.
+        vm.expectRevert("DelayedWETH: withdrawal not unlocked");
+        vm.prank(alice);
+        delayedWeth.withdraw(0 ether);
+        assertEq(address(alice).balance, balance);
+    }
+
+    /// @dev Tests that withdrawing while locked and delay has not passed fails.
+    function test_withdraw_whileLockedNotLongEnough_fails() public {
+        // Deposit some WETH.
+        vm.prank(alice);
+        delayedWeth.deposit{ value: 1 ether }();
+        uint256 balance = address(alice).balance;
+
+        // Call unlock.
+        vm.prank(alice);
+        delayedWeth.unlock(alice, 1 ether);
+
+        // Wait for the delay, but not long enough.
+        vm.warp(block.timestamp + delayedWeth.delay() - 1);
+
+        // Withdraw fails when delay not met.
+        vm.expectRevert("DelayedWETH: withdrawal delay not met");
+        vm.prank(alice);
+        delayedWeth.withdraw(1 ether);
+        assertEq(address(alice).balance, balance);
+    }
+
+    /// @dev Tests that withdrawing more than unlocked amount fails.
+    function test_withdraw_tooMuch_fails() public {
+        // Deposit some WETH.
+        vm.prank(alice);
+        delayedWeth.deposit{ value: 1 ether }();
+        uint256 balance = address(alice).balance;
+
+        // Unlock the withdrawal.
+        vm.prank(alice);
+        delayedWeth.unlock(alice, 1 ether);
+
+        // Wait for the delay.
+        vm.warp(block.timestamp + delayedWeth.delay() + 1);
+
+        // Withdraw too much fails.
+        vm.expectRevert("DelayedWETH: insufficient unlocked withdrawal");
+        vm.prank(alice);
+        delayedWeth.withdraw(2 ether);
+        assertEq(address(alice).balance, balance);
+    }
+
+    /// @dev Tests that withdrawing while paused fails.
+    function test_withdraw_whenPaused_fails() public {
+        // Deposit some WETH.
+        vm.prank(alice);
+        delayedWeth.deposit{ value: 1 ether }();
+
+        // Unlock the withdrawal.
+        vm.prank(alice);
+        delayedWeth.unlock(alice, 1 ether);
+
+        // Wait for the delay.
+        vm.warp(block.timestamp + delayedWeth.delay() + 1);
+
+        // Pause the contract.
+        address guardian = optimismPortal.guardian();
+        vm.prank(guardian);
+        superchainConfig.pause("identifier");
+
+        // Withdraw fails.
+        vm.expectRevert("DelayedWETH: contract is paused");
+        vm.prank(alice);
+        delayedWeth.withdraw(1 ether);
+    }
+}
+
+contract DelayedWETH_WithdrawFrom_Test is DelayedWETH_Init {
     /// @dev Tests that withdrawing while unlocked and delay has passed is successful.
     function test_withdraw_whileUnlocked_succeeds() public {
         // Deposit some WETH.

From 406e92e3f92ae3203dd0d555e8960d0962f75ae0 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 20 Nov 2024 08:29:59 +0100
Subject: [PATCH 229/451] improve universal and libraries tests and coverage
 (#12996)

* improve universal and libraries tests and coverage

* fixes
---
 .../test/libraries/Encoding.t.sol             | 29 ++++++++++++
 .../test/universal/SafeSend.t.sol             | 46 +++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 packages/contracts-bedrock/test/universal/SafeSend.t.sol

diff --git a/packages/contracts-bedrock/test/libraries/Encoding.t.sol b/packages/contracts-bedrock/test/libraries/Encoding.t.sol
index a301fdd97b3a..277cce328dcd 100644
--- a/packages/contracts-bedrock/test/libraries/Encoding.t.sol
+++ b/packages/contracts-bedrock/test/libraries/Encoding.t.sol
@@ -71,6 +71,18 @@ contract Encoding_Test is CommonTest {
         assertEq(legacyEncoding, bedrockEncoding);
     }
 
+    /// @dev Tests that encodeCrossDomainMessage reverts if version is greater than 1.
+    function testFuzz_encodeCrossDomainMessage_versionGreaterThanOne_reverts(uint256 nonce) external {
+        // nonce >> 240 must be greater than 1
+        uint256 minInvalidNonce = (uint256(type(uint240).max) + 1) * 2;
+        nonce = bound(nonce, minInvalidNonce, type(uint256).max);
+
+        EncodingContract encoding = new EncodingContract();
+
+        vm.expectRevert(bytes("Encoding: unknown cross domain message version"));
+        encoding.encodeCrossDomainMessage(nonce, address(this), address(this), 1, 100, hex"");
+    }
+
     /// @dev Tests deposit transaction encoding.
     function testDiff_encodeDepositTransaction_succeeds(
         address _from,
@@ -94,3 +106,20 @@ contract Encoding_Test is CommonTest {
         assertEq(txn, _txn);
     }
 }
+
+contract EncodingContract {
+    function encodeCrossDomainMessage(
+        uint256 nonce,
+        address sender,
+        address target,
+        uint256 value,
+        uint256 gasLimit,
+        bytes memory data
+    )
+        external
+        pure
+        returns (bytes memory)
+    {
+        return Encoding.encodeCrossDomainMessage(nonce, sender, target, value, gasLimit, data);
+    }
+}
diff --git a/packages/contracts-bedrock/test/universal/SafeSend.t.sol b/packages/contracts-bedrock/test/universal/SafeSend.t.sol
new file mode 100644
index 000000000000..9b2f930fd134
--- /dev/null
+++ b/packages/contracts-bedrock/test/universal/SafeSend.t.sol
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { SafeSend } from "src/universal/SafeSend.sol";
+import { CommonTest } from "test/setup/CommonTest.sol";
+
+contract SafeSendTest is CommonTest {
+    /// @notice Tests that sending to an EOA succeeds.
+    function test_send_toEOA_succeeds() public {
+        assertNotEq(alice, address(0));
+        assertNotEq(bob, address(0));
+        assertEq(bob.code.length, 0);
+
+        vm.deal(alice, 100 ether);
+
+        uint256 aliceBalanceBefore = alice.balance;
+        uint256 bobBalanceBefore = bob.balance;
+
+        vm.prank(alice);
+        SafeSend safeSend = new SafeSend{ value: 100 ether }(payable(bob));
+
+        assertEq(address(safeSend).code.length, 0);
+        assertEq(address(safeSend).balance, 0);
+        assertEq(alice.balance, aliceBalanceBefore - 100 ether);
+        assertEq(bob.balance, bobBalanceBefore + 100 ether);
+    }
+
+    /// @notice Tests that sending to a contract succeeds without executing the
+    ///         contract's code.
+    function test_send_toContract_succeeds() public {
+        // etch reverting code into bob
+        vm.etch(bob, hex"fe");
+        vm.deal(alice, 100 ether);
+
+        uint256 aliceBalanceBefore = alice.balance;
+        uint256 bobBalanceBefore = bob.balance;
+
+        vm.prank(alice);
+        SafeSend safeSend = new SafeSend{ value: 100 ether }(payable(bob));
+
+        assertEq(address(safeSend).code.length, 0);
+        assertEq(address(safeSend).balance, 0);
+        assertEq(alice.balance, aliceBalanceBefore - 100 ether);
+        assertEq(bob.balance, bobBalanceBefore + 100 ether);
+    }
+}

From f496b07568c4cf3db65199f46b93428d478f60a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:37:51 +0100
Subject: [PATCH 230/451] dependabot(docker): bump ethereum/client-go in
 /ops-bedrock (#12982)

Bumps ethereum/client-go from v1.14.11 to v1.14.12.

---
updated-dependencies:
- dependency-name: ethereum/client-go
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 ops-bedrock/l1-geth.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ops-bedrock/l1-geth.Dockerfile b/ops-bedrock/l1-geth.Dockerfile
index c84a5debf72e..50262ec94ea6 100644
--- a/ops-bedrock/l1-geth.Dockerfile
+++ b/ops-bedrock/l1-geth.Dockerfile
@@ -1,4 +1,4 @@
-FROM ethereum/client-go:v1.14.11
+FROM ethereum/client-go:v1.14.12
 
 RUN apk add --no-cache jq bash
 

From 39c3b5b6c01d65a258eeb621232accbd1e015c81 Mon Sep 17 00:00:00 2001
From: Mark Tyneway <mark.tyneway@gmail.com>
Date: Wed, 20 Nov 2024 18:46:14 +0800
Subject: [PATCH 231/451] contracts: remove op-nft (#12950)

* contracts: remove op-nft

Remove the `op-nft` package from the contracts package. None of these
contracts are maintained and can be moved to another repo if necessary.
The purpose of this commit is to reduce compilation time. Less files
to compile means less compilation time.

* fix: semver lock step - ran pre-pr.

* fix: use added/modified filter for heavy fuzz

Updates the heavy fuzz filter for CI to only check for added or
modified contracts, now excluding deleted or moved contracts.

---------

Co-authored-by: Blaine Malone <blainemalone01@gmail.com>
Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
---
 .circleci/config.yml                          |   2 +-
 .../snapshots/abi/AttestationStation.json     | 128 -----
 .../snapshots/abi/Optimist.json               | 536 -----------------
 .../snapshots/abi/OptimistAllowlist.json      | 138 -----
 .../snapshots/abi/OptimistInviter.json        | 282 ---------
 .../snapshots/semver-lock.json                |  16 -
 .../storageLayout/AttestationStation.json     |   9 -
 .../snapshots/storageLayout/Optimist.json     |  86 ---
 .../storageLayout/OptimistAllowlist.json      |   1 -
 .../storageLayout/OptimistInviter.json        |  58 --
 .../periphery/op-nft/AttestationStation.sol   |  59 --
 .../src/periphery/op-nft/Optimist.sol         | 124 ----
 .../periphery/op-nft/OptimistAllowlist.sol    | 104 ----
 .../src/periphery/op-nft/OptimistInviter.sol  | 235 --------
 .../op-nft/libraries/OptimistConstants.sol    |   9 -
 .../test/mocks/OptimistInviterHelper.sol      |  94 ---
 .../periphery/op-nft/AttestationStation.t.sol | 115 ----
 .../test/periphery/op-nft/Optimist.t.sol      | 543 ------------------
 .../periphery/op-nft/OptimistAllowlist.t.sol  | 227 --------
 .../periphery/op-nft/OptimistInviter.t.sol    | 529 -----------------
 20 files changed, 1 insertion(+), 3294 deletions(-)
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/AttestationStation.json
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/Optimist.json
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/OptimistAllowlist.json
 delete mode 100644 packages/contracts-bedrock/snapshots/abi/OptimistInviter.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/AttestationStation.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/Optimist.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/OptimistAllowlist.json
 delete mode 100644 packages/contracts-bedrock/snapshots/storageLayout/OptimistInviter.json
 delete mode 100644 packages/contracts-bedrock/src/periphery/op-nft/AttestationStation.sol
 delete mode 100644 packages/contracts-bedrock/src/periphery/op-nft/Optimist.sol
 delete mode 100644 packages/contracts-bedrock/src/periphery/op-nft/OptimistAllowlist.sol
 delete mode 100644 packages/contracts-bedrock/src/periphery/op-nft/OptimistInviter.sol
 delete mode 100644 packages/contracts-bedrock/src/periphery/op-nft/libraries/OptimistConstants.sol
 delete mode 100644 packages/contracts-bedrock/test/mocks/OptimistInviterHelper.sol
 delete mode 100644 packages/contracts-bedrock/test/periphery/op-nft/AttestationStation.t.sol
 delete mode 100644 packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol
 delete mode 100644 packages/contracts-bedrock/test/periphery/op-nft/OptimistAllowlist.t.sol
 delete mode 100644 packages/contracts-bedrock/test/periphery/op-nft/OptimistInviter.t.sol

diff --git a/.circleci/config.yml b/.circleci/config.yml
index df9c263965b1..089b13c337f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1359,7 +1359,7 @@ workflows:
           # Heavily fuzz any fuzz tests within added or modified test files.
           name: contracts-bedrock-tests-heavy-fuzz-modified
           test_parallelism: 1
-          test_list: git diff origin/develop...HEAD --name-only -- './test/**/*.t.sol' | sed 's|packages/contracts-bedrock/||'
+          test_list: git diff origin/develop...HEAD --name-only --diff-filter=AM -- './test/**/*.t.sol' | sed 's|packages/contracts-bedrock/||'
           test_timeout: 1h
           test_profile: ciheavy
       - contracts-bedrock-coverage
diff --git a/packages/contracts-bedrock/snapshots/abi/AttestationStation.json b/packages/contracts-bedrock/snapshots/abi/AttestationStation.json
deleted file mode 100644
index ba7d5f9759e7..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/AttestationStation.json
+++ /dev/null
@@ -1,128 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "about",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "key",
-            "type": "bytes32"
-          },
-          {
-            "internalType": "bytes",
-            "name": "val",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct AttestationStation.AttestationData[]",
-        "name": "_attestations",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "attest",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_about",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_key",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_val",
-        "type": "bytes"
-      }
-    ],
-    "name": "attest",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "attestations",
-    "outputs": [
-      {
-        "internalType": "bytes",
-        "name": "",
-        "type": "bytes"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "creator",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "about",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "key",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "val",
-        "type": "bytes"
-      }
-    ],
-    "name": "AttestationCreated",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/Optimist.json b/packages/contracts-bedrock/snapshots/abi/Optimist.json
deleted file mode 100644
index 96bbc0591a30..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/Optimist.json
+++ /dev/null
@@ -1,536 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_symbol",
-        "type": "string"
-      },
-      {
-        "internalType": "address",
-        "name": "_baseURIAttestor",
-        "type": "address"
-      },
-      {
-        "internalType": "contract AttestationStation",
-        "name": "_attestationStation",
-        "type": "address"
-      },
-      {
-        "internalType": "contract OptimistAllowlist",
-        "name": "_optimistAllowlist",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "ATTESTATION_STATION",
-    "outputs": [
-      {
-        "internalType": "contract AttestationStation",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "BASE_URI_ATTESTATION_KEY",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "BASE_URI_ATTESTOR",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "OPTIMIST_ALLOWLIST",
-    "outputs": [
-      {
-        "internalType": "contract OptimistAllowlist",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "baseURI",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "uri_",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "burn",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "getApproved",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "_symbol",
-        "type": "string"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      }
-    ],
-    "name": "isApprovedForAll",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      }
-    ],
-    "name": "isOnAllowList",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "allowed_",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      }
-    ],
-    "name": "mint",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "name",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "ownerOf",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      },
-      {
-        "internalType": "bytes",
-        "name": "data",
-        "type": "bytes"
-      }
-    ],
-    "name": "safeTransferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "name": "setApprovalForAll",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes4",
-        "name": "interfaceId",
-        "type": "bytes4"
-      }
-    ],
-    "name": "supportsInterface",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "symbol",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_owner",
-        "type": "address"
-      }
-    ],
-    "name": "tokenIdOfAddress",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "tokenURI",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "uri_",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "approved",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "operator",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "bool",
-        "name": "approved",
-        "type": "bool"
-      }
-    ],
-    "name": "ApprovalForAll",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "tokenId",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimistAllowlist.json b/packages/contracts-bedrock/snapshots/abi/OptimistAllowlist.json
deleted file mode 100644
index 87ac8f8a014f..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/OptimistAllowlist.json
+++ /dev/null
@@ -1,138 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "contract AttestationStation",
-        "name": "_attestationStation",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_allowlistAttestor",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_coinbaseQuestAttestor",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "_optimistInviter",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "ALLOWLIST_ATTESTOR",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "ATTESTATION_STATION",
-    "outputs": [
-      {
-        "internalType": "contract AttestationStation",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "COINBASE_QUEST_ATTESTOR",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "COINBASE_QUEST_ELIGIBLE_ATTESTATION_KEY",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "OPTIMIST_CAN_MINT_ATTESTATION_KEY",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "OPTIMIST_INVITER",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_claimer",
-        "type": "address"
-      }
-    ],
-    "name": "isAllowedToMint",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "allowed_",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/abi/OptimistInviter.json b/packages/contracts-bedrock/snapshots/abi/OptimistInviter.json
deleted file mode 100644
index a5300b20a3c1..000000000000
--- a/packages/contracts-bedrock/snapshots/abi/OptimistInviter.json
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_inviteGranter",
-        "type": "address"
-      },
-      {
-        "internalType": "contract AttestationStation",
-        "name": "_attestationStation",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "ATTESTATION_STATION",
-    "outputs": [
-      {
-        "internalType": "contract AttestationStation",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "CAN_INVITE_ATTESTATION_KEY",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "CLAIMABLE_INVITE_TYPEHASH",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "EIP712_VERSION",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "INVITE_GRANTER",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "MIN_COMMITMENT_PERIOD",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_claimer",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "issuer",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "nonce",
-            "type": "bytes32"
-          }
-        ],
-        "internalType": "struct OptimistInviter.ClaimableInvite",
-        "name": "_claimableInvite",
-        "type": "tuple"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_signature",
-        "type": "bytes"
-      }
-    ],
-    "name": "claimInvite",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_commitment",
-        "type": "bytes32"
-      }
-    ],
-    "name": "commitInvite",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "commitmentTimestamps",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "_name",
-        "type": "string"
-      }
-    ],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "inviteCounts",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address[]",
-        "name": "_accounts",
-        "type": "address[]"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_inviteCount",
-        "type": "uint256"
-      }
-    ],
-    "name": "setInviteCounts",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "usedNonces",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "version",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "uint8",
-        "name": "version",
-        "type": "uint8"
-      }
-    ],
-    "name": "Initialized",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "issuer",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "claimer",
-        "type": "address"
-      }
-    ],
-    "name": "InviteClaimed",
-    "type": "event"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 91c44e3620f4..bcbbddde3a8c 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -183,22 +183,6 @@
     "initCodeHash": "0xefc6ed9e325c2d614ea0d28c3eabfff1b345f7c6054e90253c6a091c29508267",
     "sourceCodeHash": "0xaa08a61448f485b277af57251d2089cc6a80ce0a763bf7184d48ffed5034ef69"
   },
-  "src/periphery/op-nft/AttestationStation.sol": {
-    "initCodeHash": "0x2e665d9ee554430980f64bcb6d2611a1cb03dbacfd58bb0d6f5d32951a267bde",
-    "sourceCodeHash": "0xe0bc805b22c7d04b5a9444cddd4c0e1bcb3006c69c03610494277ab2cc83f553"
-  },
-  "src/periphery/op-nft/Optimist.sol": {
-    "initCodeHash": "0x8fccdef5fb6e6d51215b39acc449faad8ba15416699c9b3af77866f4297805a3",
-    "sourceCodeHash": "0xfa9354827b642803e10415ed30ca789be1bd23d88fac14f7adaa65c6eb1c1643"
-  },
-  "src/periphery/op-nft/OptimistAllowlist.sol": {
-    "initCodeHash": "0x166dd3fc18cb238895f2faa7fdd635af48ce2c54e21ed2d6dae857c3731c4d6c",
-    "sourceCodeHash": "0x3a5f61046f729c9a70274b8b2a739382987ec5eb77705b259e8a3210a5f43462"
-  },
-  "src/periphery/op-nft/OptimistInviter.sol": {
-    "initCodeHash": "0x28dfa6676702a7abd19609cc773158d1f958210bc0a38c008d67a002dc1df862",
-    "sourceCodeHash": "0x3a0a294932d6deba043f6a2b46b4e8477ee96e7fb054d7e7229a43ce4352c68d"
-  },
   "src/safe/DeputyGuardianModule.sol": {
     "initCodeHash": "0xd95e562f395d4eb6e332f4474dffab660ada9e9da7c79f58fb6052278e0904df",
     "sourceCodeHash": "0x45daabe094de0287e244e6fea4f1887b9adc09b07c47dc77361b1678645a1470"
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/AttestationStation.json b/packages/contracts-bedrock/snapshots/storageLayout/AttestationStation.json
deleted file mode 100644
index c3c732cec14d..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/AttestationStation.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-  {
-    "bytes": "32",
-    "label": "attestations",
-    "offset": 0,
-    "slot": "0",
-    "type": "mapping(address => mapping(address => mapping(bytes32 => bytes)))"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/Optimist.json b/packages/contracts-bedrock/snapshots/storageLayout/Optimist.json
deleted file mode 100644
index 6049beb54245..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/Optimist.json
+++ /dev/null
@@ -1,86 +0,0 @@
-[
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "1600",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "1",
-    "type": "uint256[50]"
-  },
-  {
-    "bytes": "1600",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "51",
-    "type": "uint256[50]"
-  },
-  {
-    "bytes": "32",
-    "label": "_name",
-    "offset": 0,
-    "slot": "101",
-    "type": "string"
-  },
-  {
-    "bytes": "32",
-    "label": "_symbol",
-    "offset": 0,
-    "slot": "102",
-    "type": "string"
-  },
-  {
-    "bytes": "32",
-    "label": "_owners",
-    "offset": 0,
-    "slot": "103",
-    "type": "mapping(uint256 => address)"
-  },
-  {
-    "bytes": "32",
-    "label": "_balances",
-    "offset": 0,
-    "slot": "104",
-    "type": "mapping(address => uint256)"
-  },
-  {
-    "bytes": "32",
-    "label": "_tokenApprovals",
-    "offset": 0,
-    "slot": "105",
-    "type": "mapping(uint256 => address)"
-  },
-  {
-    "bytes": "32",
-    "label": "_operatorApprovals",
-    "offset": 0,
-    "slot": "106",
-    "type": "mapping(address => mapping(address => bool))"
-  },
-  {
-    "bytes": "1408",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "107",
-    "type": "uint256[44]"
-  },
-  {
-    "bytes": "1600",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "151",
-    "type": "uint256[50]"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/OptimistAllowlist.json b/packages/contracts-bedrock/snapshots/storageLayout/OptimistAllowlist.json
deleted file mode 100644
index 0637a088a01e..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimistAllowlist.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/OptimistInviter.json b/packages/contracts-bedrock/snapshots/storageLayout/OptimistInviter.json
deleted file mode 100644
index 5d1a6bbc43c9..000000000000
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimistInviter.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-  {
-    "bytes": "1",
-    "label": "_initialized",
-    "offset": 0,
-    "slot": "0",
-    "type": "uint8"
-  },
-  {
-    "bytes": "1",
-    "label": "_initializing",
-    "offset": 1,
-    "slot": "0",
-    "type": "bool"
-  },
-  {
-    "bytes": "32",
-    "label": "_HASHED_NAME",
-    "offset": 0,
-    "slot": "1",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "32",
-    "label": "_HASHED_VERSION",
-    "offset": 0,
-    "slot": "2",
-    "type": "bytes32"
-  },
-  {
-    "bytes": "1600",
-    "label": "__gap",
-    "offset": 0,
-    "slot": "3",
-    "type": "uint256[50]"
-  },
-  {
-    "bytes": "32",
-    "label": "commitmentTimestamps",
-    "offset": 0,
-    "slot": "53",
-    "type": "mapping(bytes32 => uint256)"
-  },
-  {
-    "bytes": "32",
-    "label": "usedNonces",
-    "offset": 0,
-    "slot": "54",
-    "type": "mapping(address => mapping(bytes32 => bool))"
-  },
-  {
-    "bytes": "32",
-    "label": "inviteCounts",
-    "offset": 0,
-    "slot": "55",
-    "type": "mapping(address => uint256)"
-  }
-]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/periphery/op-nft/AttestationStation.sol b/packages/contracts-bedrock/src/periphery/op-nft/AttestationStation.sol
deleted file mode 100644
index 4d15862d4358..000000000000
--- a/packages/contracts-bedrock/src/periphery/op-nft/AttestationStation.sol
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-
-/// @title AttestationStation
-/// @author Optimism Collective
-/// @author Gitcoin
-/// @notice Where attestations live.
-contract AttestationStation is ISemver {
-    /// @notice Struct representing data that is being attested.
-    /// @custom:field about Address for which the attestation is about.
-    /// @custom:field key   A bytes32 key for the attestation.
-    /// @custom:field val   The attestation as arbitrary bytes.
-    struct AttestationData {
-        address about;
-        bytes32 key;
-        bytes val;
-    }
-
-    /// @notice Maps addresses to attestations. Creator => About => Key => Value.
-    mapping(address => mapping(address => mapping(bytes32 => bytes))) public attestations;
-
-    /// @notice Emitted when Attestation is created.
-    /// @param creator Address that made the attestation.
-    /// @param about   Address attestation is about.
-    /// @param key     Key of the attestation.
-    /// @param val     Value of the attestation.
-    event AttestationCreated(address indexed creator, address indexed about, bytes32 indexed key, bytes val);
-
-    /// @notice Semantic version.
-    /// @custom:semver 1.2.1-beta.1
-    string public constant version = "1.2.1-beta.1";
-
-    /// @notice Allows anyone to create an attestation.
-    /// @param _about Address that the attestation is about.
-    /// @param _key   A key used to namespace the attestation.
-    /// @param _val   An arbitrary value stored as part of the attestation.
-    function attest(address _about, bytes32 _key, bytes memory _val) public {
-        attestations[msg.sender][_about][_key] = _val;
-
-        emit AttestationCreated(msg.sender, _about, _key, _val);
-    }
-
-    /// @notice Allows anyone to create attestations.
-    /// @param _attestations An array of AttestationData structs.
-    function attest(AttestationData[] calldata _attestations) external {
-        uint256 length = _attestations.length;
-        for (uint256 i = 0; i < length;) {
-            AttestationData memory attestation = _attestations[i];
-
-            attest(attestation.about, attestation.key, attestation.val);
-
-            unchecked {
-                ++i;
-            }
-        }
-    }
-}
diff --git a/packages/contracts-bedrock/src/periphery/op-nft/Optimist.sol b/packages/contracts-bedrock/src/periphery/op-nft/Optimist.sol
deleted file mode 100644
index b15c0f00044c..000000000000
--- a/packages/contracts-bedrock/src/periphery/op-nft/Optimist.sol
+++ /dev/null
@@ -1,124 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ERC721BurnableUpgradeable } from
-    "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";
-import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
-import { OptimistAllowlist } from "src/periphery/op-nft/OptimistAllowlist.sol";
-import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-
-/// @author Optimism Collective
-/// @author Gitcoin
-/// @title  Optimist
-/// @notice A Soul Bound Token for real humans only(tm).
-contract Optimist is ERC721BurnableUpgradeable, ISemver {
-    /// @notice Attestation key used by the attestor to attest the baseURI.
-    bytes32 public constant BASE_URI_ATTESTATION_KEY = bytes32("optimist.base-uri");
-
-    /// @notice Attestor who attests to baseURI.
-    address public immutable BASE_URI_ATTESTOR;
-
-    /// @notice Address of the AttestationStation contract.
-    AttestationStation public immutable ATTESTATION_STATION;
-
-    /// @notice Address of the OptimistAllowlist contract.
-    OptimistAllowlist public immutable OPTIMIST_ALLOWLIST;
-
-    /// @notice Semantic version.
-    /// @custom:semver 2.1.1-beta.1
-    string public constant version = "2.1.1-beta.1";
-
-    /// @param _name               Token name.
-    /// @param _symbol             Token symbol.
-    /// @param _baseURIAttestor    Address of the baseURI attestor.
-    /// @param _attestationStation Address of the AttestationStation contract.
-    /// @param _optimistAllowlist  Address of the OptimistAllowlist contract
-    constructor(
-        string memory _name,
-        string memory _symbol,
-        address _baseURIAttestor,
-        AttestationStation _attestationStation,
-        OptimistAllowlist _optimistAllowlist
-    ) {
-        BASE_URI_ATTESTOR = _baseURIAttestor;
-        ATTESTATION_STATION = _attestationStation;
-        OPTIMIST_ALLOWLIST = _optimistAllowlist;
-        initialize(_name, _symbol);
-    }
-
-    /// @notice Initializes the Optimist contract.
-    /// @param _name   Token name.
-    /// @param _symbol Token symbol.
-    function initialize(string memory _name, string memory _symbol) public initializer {
-        __ERC721_init(_name, _symbol);
-        __ERC721Burnable_init();
-    }
-
-    /// @notice Allows an address to mint an Optimist NFT. Token ID is the uint256 representation
-    ///         of the recipient's address. Recipients must be permitted to mint, eventually anyone
-    ///         will be able to mint. One token per address.
-    /// @param _recipient Address of the token recipient.
-    function mint(address _recipient) public {
-        require(isOnAllowList(_recipient), "Optimist: address is not on allowList");
-        _safeMint(_recipient, tokenIdOfAddress(_recipient));
-    }
-
-    /// @notice Returns the baseURI for all tokens.
-    /// @return uri_ BaseURI for all tokens.
-    function baseURI() public view returns (string memory uri_) {
-        uri_ = string(
-            abi.encodePacked(
-                ATTESTATION_STATION.attestations(BASE_URI_ATTESTOR, address(this), bytes32("optimist.base-uri"))
-            )
-        );
-    }
-
-    /// @notice Returns the token URI for a given token by ID
-    /// @param _tokenId Token ID to query.
-    /// @return uri_ Token URI for the given token by ID.
-    function tokenURI(uint256 _tokenId) public view virtual override returns (string memory uri_) {
-        uri_ = string(
-            abi.encodePacked(
-                baseURI(),
-                "/",
-                // Properly format the token ID as a 20 byte hex string (address).
-                Strings.toHexString(_tokenId, 20),
-                ".json"
-            )
-        );
-    }
-
-    /// @notice Checks OptimistAllowlist to determine whether a given address is allowed to mint
-    ///         the Optimist NFT. Since the Optimist NFT will also be used as part of the
-    ///         Citizens House, mints are currently restricted. Eventually anyone will be able
-    ///         to mint.
-    /// @return allowed_ Whether or not the address is allowed to mint yet.
-    function isOnAllowList(address _recipient) public view returns (bool allowed_) {
-        allowed_ = OPTIMIST_ALLOWLIST.isAllowedToMint(_recipient);
-    }
-
-    /// @notice Returns the token ID for the token owned by a given address. This is the uint256
-    ///         representation of the given address.
-    /// @return Token ID for the token owned by the given address.
-    function tokenIdOfAddress(address _owner) public pure returns (uint256) {
-        return uint256(uint160(_owner));
-    }
-
-    /// @notice Disabled for the Optimist NFT (Soul Bound Token).
-    function approve(address, uint256) public pure override {
-        revert("Optimist: soul bound token");
-    }
-
-    /// @notice Disabled for the Optimist NFT (Soul Bound Token).
-    function setApprovalForAll(address, bool) public virtual override {
-        revert("Optimist: soul bound token");
-    }
-
-    /// @notice Prevents transfers of the Optimist NFT (Soul Bound Token).
-    /// @param _from Address of the token sender.
-    /// @param _to   Address of the token recipient.
-    function _beforeTokenTransfer(address _from, address _to, uint256) internal virtual override {
-        require(_from == address(0) || _to == address(0), "Optimist: soul bound token");
-    }
-}
diff --git a/packages/contracts-bedrock/src/periphery/op-nft/OptimistAllowlist.sol b/packages/contracts-bedrock/src/periphery/op-nft/OptimistAllowlist.sol
deleted file mode 100644
index ffa46116a4c5..000000000000
--- a/packages/contracts-bedrock/src/periphery/op-nft/OptimistAllowlist.sol
+++ /dev/null
@@ -1,104 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
-import { OptimistConstants } from "src/periphery/op-nft/libraries/OptimistConstants.sol";
-
-/// @title  OptimistAllowlist
-/// @notice Source of truth for whether an address is able to mint an Optimist NFT.
-///         isAllowedToMint function checks various signals to return boolean value
-///         for whether an address is eligible or not.
-contract OptimistAllowlist is ISemver {
-    /// @notice Attestation key used by the AllowlistAttestor to manually add addresses to the
-    ///         allowlist.
-    bytes32 public constant OPTIMIST_CAN_MINT_ATTESTATION_KEY = bytes32("optimist.can-mint");
-
-    /// @notice Attestation key used by Coinbase to issue attestations for Quest participants.
-    bytes32 public constant COINBASE_QUEST_ELIGIBLE_ATTESTATION_KEY = bytes32("coinbase.quest-eligible");
-
-    /// @notice Address of the AttestationStation contract.
-    AttestationStation public immutable ATTESTATION_STATION;
-
-    /// @notice Attestor that issues 'optimist.can-mint' attestations.
-    address public immutable ALLOWLIST_ATTESTOR;
-
-    /// @notice Attestor that issues 'coinbase.quest-eligible' attestations.
-    address public immutable COINBASE_QUEST_ATTESTOR;
-
-    /// @notice Address of OptimistInviter contract that issues 'optimist.can-mint-from-invite'
-    ///         attestations.
-    address public immutable OPTIMIST_INVITER;
-
-    /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.1
-    string public constant version = "1.1.1-beta.1";
-
-    /// @param _attestationStation    Address of the AttestationStation contract.
-    /// @param _allowlistAttestor     Address of the allowlist attestor.
-    /// @param _coinbaseQuestAttestor Address of the Coinbase Quest attestor.
-    /// @param _optimistInviter       Address of the OptimistInviter contract.
-    constructor(
-        AttestationStation _attestationStation,
-        address _allowlistAttestor,
-        address _coinbaseQuestAttestor,
-        address _optimistInviter
-    ) {
-        ATTESTATION_STATION = _attestationStation;
-        ALLOWLIST_ATTESTOR = _allowlistAttestor;
-        COINBASE_QUEST_ATTESTOR = _coinbaseQuestAttestor;
-        OPTIMIST_INVITER = _optimistInviter;
-    }
-
-    /// @notice Checks whether a given address is allowed to mint the Optimist NFT yet. Since the
-    ///         Optimist NFT will also be used as part of the Citizens House, mints are currently
-    ///         restricted. Eventually anyone will be able to mint.
-    ///         Currently, address is allowed to mint if it satisfies any of the following:
-    ///          1) Has a valid 'optimist.can-mint' attestation from the allowlist attestor.
-    ///          2) Has a valid 'coinbase.quest-eligible' attestation from Coinbase Quest attestor
-    ///          3) Has a valid 'optimist.can-mint-from-invite' attestation from the OptimistInviter
-    ///             contract.
-    /// @param _claimer Address to check.
-    /// @return allowed_ Whether or not the address is allowed to mint yet.
-    function isAllowedToMint(address _claimer) public view returns (bool allowed_) {
-        allowed_ = _hasAttestationFromAllowlistAttestor(_claimer) || _hasAttestationFromCoinbaseQuestAttestor(_claimer)
-            || _hasAttestationFromOptimistInviter(_claimer);
-    }
-
-    /// @notice Checks whether an address has a valid 'optimist.can-mint' attestation from the
-    ///         allowlist attestor.
-    /// @param _claimer Address to check.
-    /// @return valid_ Whether or not the address has a valid attestation.
-    function _hasAttestationFromAllowlistAttestor(address _claimer) internal view returns (bool valid_) {
-        // Expected attestation value is bytes32("true")
-        valid_ = _hasValidAttestation(ALLOWLIST_ATTESTOR, _claimer, OPTIMIST_CAN_MINT_ATTESTATION_KEY);
-    }
-
-    /// @notice Checks whether an address has a valid attestation from the Coinbase attestor.
-    /// @param _claimer Address to check.
-    /// @return valid_ Whether or not the address has a valid attestation.
-    function _hasAttestationFromCoinbaseQuestAttestor(address _claimer) internal view returns (bool valid_) {
-        // Expected attestation value is bytes32("true")
-        valid_ = _hasValidAttestation(COINBASE_QUEST_ATTESTOR, _claimer, COINBASE_QUEST_ELIGIBLE_ATTESTATION_KEY);
-    }
-
-    /// @notice Checks whether an address has a valid attestation from the OptimistInviter contract.
-    /// @param _claimer Address to check.
-    /// @return valid_ Whether or not the address has a valid attestation.
-    function _hasAttestationFromOptimistInviter(address _claimer) internal view returns (bool valid_) {
-        // Expected attestation value is the inviter's address
-        valid_ = _hasValidAttestation(
-            OPTIMIST_INVITER, _claimer, OptimistConstants.OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY
-        );
-    }
-
-    /// @notice Checks whether an address has a valid truthy attestation.
-    ///         Any attestation val other than bytes32("") is considered truthy.
-    /// @param _creator Address that made the attestation.
-    /// @param _about   Address attestation is about.
-    /// @param _key     Key of the attestation.
-    /// @return valid_ Whether or not the address has a valid truthy attestation.
-    function _hasValidAttestation(address _creator, address _about, bytes32 _key) internal view returns (bool valid_) {
-        valid_ = ATTESTATION_STATION.attestations(_creator, _about, _key).length > 0;
-    }
-}
diff --git a/packages/contracts-bedrock/src/periphery/op-nft/OptimistInviter.sol b/packages/contracts-bedrock/src/periphery/op-nft/OptimistInviter.sol
deleted file mode 100644
index ae0ab9d92657..000000000000
--- a/packages/contracts-bedrock/src/periphery/op-nft/OptimistInviter.sol
+++ /dev/null
@@ -1,235 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-import { OptimistConstants } from "src/periphery/op-nft/libraries/OptimistConstants.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
-import { SignatureChecker } from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
-import { EIP712Upgradeable } from "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol";
-
-/// @custom:upgradeable
-/// @title  OptimistInviter
-/// @notice OptimistInviter issues "optimist.can-invite" and "optimist.can-mint-from-invite"
-///         attestations. Accounts that have invites can issue signatures that allow other
-///         accounts to claim an invite. The invitee uses a claim and reveal flow to claim the
-///         invite to an address of their choosing.
-///
-///         Parties involved:
-///          1) INVITE_GRANTER: trusted account that can allow accounts to issue invites
-///          2) issuer: account that is allowed to issue invites
-///          3) claimer: account that receives the invites
-///
-///        Flow:
-///          1) INVITE_GRANTER calls _setInviteCount to allow an issuer to issue a certain number
-///             of invites, and also creates a "optimist.can-invite" attestation for the issuer
-///          2) Off-chain, the issuer signs (EIP-712) a ClaimableInvite to produce a signature
-///          3) Off-chain, invite issuer sends the plaintext ClaimableInvite and the signature
-///             to the recipient
-///          4) claimer chooses an address they want to receive the invite on
-///          5) claimer commits the hash of the address they want to receive the invite on and the
-///             received signature keccak256(abi.encode(addressToReceiveTo, receivedSignature))
-///             using the commitInvite function
-///          6) claimer waits for the MIN_COMMITMENT_PERIOD to pass.
-///          7) claimer reveals the plaintext ClaimableInvite and the signature using the
-///             claimInvite function, receiving the "optimist.can-mint-from-invite" attestation
-contract OptimistInviter is ISemver, EIP712Upgradeable {
-    /// @notice Emitted when an invite is claimed.
-    /// @param issuer  Address that issued the signature.
-    /// @param claimer Address that claimed the invite.
-    event InviteClaimed(address indexed issuer, address indexed claimer);
-
-    /// @notice Version used for the EIP712 domain separator. This version is separated from the
-    ///         contract semver because the EIP712 domain separator is used to sign messages, and
-    ///         changing the domain separator invalidates all existing signatures. We should only
-    ///         bump this version if we make a major change to the signature scheme.
-    string public constant EIP712_VERSION = "1.0.0";
-
-    /// @notice EIP712 typehash for the ClaimableInvite type.
-    bytes32 public constant CLAIMABLE_INVITE_TYPEHASH = keccak256("ClaimableInvite(address issuer,bytes32 nonce)");
-
-    /// @notice Attestation key for that signals that an account was allowed to issue invites
-    bytes32 public constant CAN_INVITE_ATTESTATION_KEY = bytes32("optimist.can-invite");
-
-    /// @notice Granter who can set accounts' invite counts.
-    address public immutable INVITE_GRANTER;
-
-    /// @notice Address of the AttestationStation contract.
-    AttestationStation public immutable ATTESTATION_STATION;
-
-    /// @notice Minimum age of a commitment (in seconds) before it can be revealed using
-    ///         claimInvite. Currently set to 60 seconds.
-    ///
-    ///        Prevents an attacker from front-running a commitment by taking the signature in the
-    ///        claimInvite call and quickly committing and claiming it before the the claimer's
-    ///        transaction succeeds. With this, frontrunning a commitment requires that an attacker
-    ///        be able to prevent the honest claimer's claimInvite transaction from being included
-    ///        for this long.
-    uint256 public constant MIN_COMMITMENT_PERIOD = 60;
-
-    /// @notice Struct that represents a claimable invite that will be signed by the issuer.
-    /// @custom:field issuer Address that issued the signature. Reason this is explicitly included,
-    ///                      and not implicitly assumed to be the recovered address from the
-    ///                      signature is that the issuer may be using a ERC-1271 compatible
-    ///                      contract wallet, where the recovered address is not the same as the
-    ///                      issuer, or the signature is not an ECDSA signature at all.
-    /// @custom:field nonce  Pseudorandom nonce to prevent replay attacks.
-    struct ClaimableInvite {
-        address issuer;
-        bytes32 nonce;
-    }
-
-    /// @notice Maps from hashes to the timestamp when they were committed.
-    mapping(bytes32 => uint256) public commitmentTimestamps;
-
-    /// @notice Maps from addresses to nonces to whether or not they have been used.
-    mapping(address => mapping(bytes32 => bool)) public usedNonces;
-
-    /// @notice Maps from addresses to number of invites they have.
-    mapping(address => uint256) public inviteCounts;
-
-    /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.1
-    string public constant version = "1.1.1-beta.1";
-
-    /// @param _inviteGranter      Address of the invite granter.
-    /// @param _attestationStation Address of the AttestationStation contract.
-    constructor(address _inviteGranter, AttestationStation _attestationStation) {
-        INVITE_GRANTER = _inviteGranter;
-        ATTESTATION_STATION = _attestationStation;
-    }
-
-    /// @notice Initializes this contract, setting the EIP712 context.
-    ///         Only update the EIP712_VERSION when there is a change to the signature scheme.
-    ///         After the EIP712 version is changed, any signatures issued off-chain but not
-    ///         claimed yet will no longer be accepted by the claimInvite function. Please make
-    ///         sure to notify the issuers that they must re-issue their invite signatures.
-    /// @param _name Contract name.
-    function initialize(string memory _name) public initializer {
-        __EIP712_init(_name, EIP712_VERSION);
-    }
-
-    /// @notice Allows invite granter to set the number of invites an address has.
-    /// @param _accounts    An array of accounts to update the invite counts of.
-    /// @param _inviteCount Number of invites to set to.
-    function setInviteCounts(address[] calldata _accounts, uint256 _inviteCount) public {
-        // Only invite granter can grant invites
-        require(msg.sender == INVITE_GRANTER, "OptimistInviter: only invite granter can grant invites");
-
-        uint256 length = _accounts.length;
-
-        AttestationStation.AttestationData[] memory attestations = new AttestationStation.AttestationData[](length);
-
-        for (uint256 i; i < length;) {
-            // Set invite count for account to _inviteCount
-            inviteCounts[_accounts[i]] = _inviteCount;
-
-            // Create an attestation for posterity that the account is allowed to create invites
-            attestations[i] = AttestationStation.AttestationData({
-                about: _accounts[i],
-                key: CAN_INVITE_ATTESTATION_KEY,
-                val: bytes("true")
-            });
-
-            unchecked {
-                ++i;
-            }
-        }
-
-        ATTESTATION_STATION.attest(attestations);
-    }
-
-    /// @notice Allows anyone (but likely the claimer) to commit a received signature along with the
-    ///         address to claim to.
-    ///
-    ///         Before calling this function, the claimer should have received a signature from the
-    ///          issuer off-chain. The claimer then calls this function with the hash of the
-    ///         claimer's address and the received signature. This is necessary to prevent
-    ///         front-running when the invitee is claiming the invite. Without a commit and reveal
-    ///         scheme, anyone who is watching the mempool can take the signature being submitted
-    ///         and front run the transaction to claim the invite to their own address.
-    ///
-    ///         The same commitment can only be made once, and the function reverts if the
-    ///         commitment has already been made. This prevents griefing where a malicious party can
-    ///         prevent the original claimer from being able to claimInvite.
-    /// @param _commitment A hash of the claimer and signature concatenated.
-    ///                    keccak256(abi.encode(_claimer, _signature))
-    function commitInvite(bytes32 _commitment) public {
-        // Check that the commitment hasn't already been made. This prevents griefing where
-        // a malicious party continuously re-submits the same commitment, preventing the original
-        // claimer from claiming their invite by resetting the minimum commitment period.
-        require(commitmentTimestamps[_commitment] == 0, "OptimistInviter: commitment already made");
-
-        commitmentTimestamps[_commitment] = block.timestamp;
-    }
-
-    /// @notice Allows anyone to reveal a commitment and claim an invite.
-    ///         The hash, keccak256(abi.encode(_claimer, _signature)), should have been already
-    ///         committed using commitInvite. Before issuing the "optimist.can-mint-from-invite"
-    ///         attestation, this function checks that
-    ///           1) the hash corresponding to the _claimer and the _signature was committed
-    ///           2) MIN_COMMITMENT_PERIOD has passed since the commitment was made.
-    ///           3) the _signature is signed correctly by the issuer
-    ///           4) the _signature hasn't already been used to claim an invite before
-    ///           5) the _signature issuer has not used up all of their invites
-    ///         This function doesn't require that the _claimer is calling this function.
-    /// @param _claimer         Address that will be granted the invite.
-    /// @param _claimableInvite ClaimableInvite struct containing the issuer and nonce.
-    /// @param _signature       Signature signed over the claimable invite.
-    function claimInvite(address _claimer, ClaimableInvite calldata _claimableInvite, bytes memory _signature) public {
-        uint256 commitmentTimestamp = commitmentTimestamps[keccak256(abi.encode(_claimer, _signature))];
-
-        // Make sure the claimer and signature have been committed.
-        require(commitmentTimestamp > 0, "OptimistInviter: claimer and signature have not been committed yet");
-
-        // Check that MIN_COMMITMENT_PERIOD has passed since the commitment was made.
-        require(
-            commitmentTimestamp + MIN_COMMITMENT_PERIOD <= block.timestamp,
-            "OptimistInviter: minimum commitment period has not elapsed yet"
-        );
-
-        // Generate a EIP712 typed data hash to compare against the signature.
-        bytes32 digest = _hashTypedDataV4(
-            keccak256(abi.encode(CLAIMABLE_INVITE_TYPEHASH, _claimableInvite.issuer, _claimableInvite.nonce))
-        );
-
-        // Uses SignatureChecker, which supports both regular ECDSA signatures from EOAs as well as
-        // ERC-1271 signatures from contract wallets or multi-sigs. This means that if the issuer
-        // wants to revoke a signature, they can use a smart contract wallet to issue the signature,
-        // then invalidate the signature after issuing it.
-        require(
-            SignatureChecker.isValidSignatureNow(_claimableInvite.issuer, digest, _signature),
-            "OptimistInviter: invalid signature"
-        );
-
-        // The issuer's signature commits to a nonce to prevent replay attacks.
-        // This checks that the nonce has not been used for this issuer before. The nonces are
-        // scoped to the issuer address, so the same nonce can be used by different issuers without
-        // clashing.
-        require(
-            usedNonces[_claimableInvite.issuer][_claimableInvite.nonce] == false,
-            "OptimistInviter: nonce has already been used"
-        );
-
-        // Set the nonce as used for the issuer so that it cannot be replayed.
-        usedNonces[_claimableInvite.issuer][_claimableInvite.nonce] = true;
-
-        // Failing this check means that the issuer has used up all of their existing invites.
-        require(inviteCounts[_claimableInvite.issuer] > 0, "OptimistInviter: issuer has no invites");
-
-        // Reduce the issuer's invite count by 1. Can be unchecked because we check above that
-        // count is > 0.
-        unchecked {
-            --inviteCounts[_claimableInvite.issuer];
-        }
-
-        // Create the attestation that the claimer can mint from the issuer's invite.
-        // The invite issuer is included in the data of the attestation.
-        ATTESTATION_STATION.attest(
-            _claimer,
-            OptimistConstants.OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY,
-            abi.encode(_claimableInvite.issuer)
-        );
-
-        emit InviteClaimed(_claimableInvite.issuer, _claimer);
-    }
-}
diff --git a/packages/contracts-bedrock/src/periphery/op-nft/libraries/OptimistConstants.sol b/packages/contracts-bedrock/src/periphery/op-nft/libraries/OptimistConstants.sol
deleted file mode 100644
index 225f77889495..000000000000
--- a/packages/contracts-bedrock/src/periphery/op-nft/libraries/OptimistConstants.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-/// @title  OptimistConstants
-/// @notice Library for storing Optimist related constants that are shared in multiple contracts.
-library OptimistConstants {
-    /// @notice Attestation key issued by OptimistInviter allowing the attested account to mint.
-    bytes32 internal constant OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY = bytes32("optimist.can-mint-from-invite");
-}
diff --git a/packages/contracts-bedrock/test/mocks/OptimistInviterHelper.sol b/packages/contracts-bedrock/test/mocks/OptimistInviterHelper.sol
deleted file mode 100644
index ebc2289f9c10..000000000000
--- a/packages/contracts-bedrock/test/mocks/OptimistInviterHelper.sol
+++ /dev/null
@@ -1,94 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-import { OptimistInviter } from "src/periphery/op-nft/OptimistInviter.sol";
-import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-
-/// @notice Simple helper contract that helps with testing flow and signature for
-///         OptimistInviter contract. Made this a separate contract instead of including
-///         in OptimistInviter.t.sol for reusability.
-contract OptimistInviterHelper {
-    /// @notice EIP712 typehash for the ClaimableInvite type.
-    bytes32 public constant CLAIMABLE_INVITE_TYPEHASH = keccak256("ClaimableInvite(address issuer,bytes32 nonce)");
-
-    /// @notice EIP712 typehash for the EIP712Domain type that is included as part of the signature.
-    bytes32 public constant EIP712_DOMAIN_TYPEHASH =
-        keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)");
-
-    /// @notice Address of OptimistInviter contract we are testing.
-    OptimistInviter public optimistInviter;
-
-    /// @notice OptimistInviter contract name. Used to construct the EIP-712 domain.
-    string public name;
-
-    /// @notice Keeps track of current nonce to generate new nonces for each invite.
-    uint256 public currentNonce;
-
-    constructor(OptimistInviter _optimistInviter, string memory _name) {
-        optimistInviter = _optimistInviter;
-        name = _name;
-    }
-
-    /// @notice Returns the hash of the struct ClaimableInvite.
-    /// @param _claimableInvite ClaimableInvite struct to hash.
-    /// @return EIP-712 typed struct hash.
-    function getClaimableInviteStructHash(OptimistInviter.ClaimableInvite memory _claimableInvite)
-        public
-        pure
-        returns (bytes32)
-    {
-        return keccak256(abi.encode(CLAIMABLE_INVITE_TYPEHASH, _claimableInvite.issuer, _claimableInvite.nonce));
-    }
-
-    /// @notice Returns a bytes32 nonce that should change everytime. In practice, people should use
-    ///         pseudorandom nonces.
-    /// @return Nonce that should be used as part of ClaimableInvite.
-    function consumeNonce() public returns (bytes32) {
-        return bytes32(keccak256(abi.encode(currentNonce++)));
-    }
-
-    /// @notice Returns a ClaimableInvite with the issuer and current nonce.
-    /// @param _issuer Issuer to include in the ClaimableInvite.
-    /// @return ClaimableInvite that can be hashed & signed.
-    function getClaimableInviteWithNewNonce(address _issuer) public returns (OptimistInviter.ClaimableInvite memory) {
-        return OptimistInviter.ClaimableInvite(_issuer, consumeNonce());
-    }
-
-    /// @notice Computes the EIP712 digest with default correct parameters.
-    /// @param _claimableInvite ClaimableInvite struct to hash.
-    /// @return EIP-712 compatible digest.
-    function getDigest(OptimistInviter.ClaimableInvite calldata _claimableInvite) public view returns (bytes32) {
-        return getDigestWithEIP712Domain(
-            _claimableInvite,
-            bytes(name),
-            bytes(optimistInviter.EIP712_VERSION()),
-            block.chainid,
-            address(optimistInviter)
-        );
-    }
-
-    /// @notice Computes the EIP712 digest with the given domain parameters.
-    ///         Used for testing that different domain parameters fail.
-    /// @param _claimableInvite   ClaimableInvite struct to hash.
-    /// @param _name              Contract name to use in the EIP712 domain.
-    /// @param _version           Contract version to use in the EIP712 domain.
-    /// @param _chainid           Chain ID to use in the EIP712 domain.
-    /// @param _verifyingContract Address to use in the EIP712 domain.
-    /// @return EIP-712 compatible digest.
-    function getDigestWithEIP712Domain(
-        OptimistInviter.ClaimableInvite calldata _claimableInvite,
-        bytes memory _name,
-        bytes memory _version,
-        uint256 _chainid,
-        address _verifyingContract
-    )
-        public
-        pure
-        returns (bytes32)
-    {
-        bytes32 domainSeparator = keccak256(
-            abi.encode(EIP712_DOMAIN_TYPEHASH, keccak256(_name), keccak256(_version), _chainid, _verifyingContract)
-        );
-        return ECDSA.toTypedDataHash(domainSeparator, getClaimableInviteStructHash(_claimableInvite));
-    }
-}
diff --git a/packages/contracts-bedrock/test/periphery/op-nft/AttestationStation.t.sol b/packages/contracts-bedrock/test/periphery/op-nft/AttestationStation.t.sol
deleted file mode 100644
index 4c9b72254d34..000000000000
--- a/packages/contracts-bedrock/test/periphery/op-nft/AttestationStation.t.sol
+++ /dev/null
@@ -1,115 +0,0 @@
-//SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-/* Testing utilities */
-import { Test } from "forge-std/Test.sol";
-import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
-
-contract AttestationStation_Initializer is Test {
-    address alice_attestor = address(128);
-    address bob = address(256);
-    address sally = address(512);
-
-    function setUp() public {
-        // Give alice and bob some ETH
-        vm.deal(alice_attestor, 1 ether);
-
-        vm.label(alice_attestor, "alice_attestor");
-        vm.label(bob, "bob");
-        vm.label(sally, "sally");
-    }
-}
-
-contract AttestationStationTest is AttestationStation_Initializer {
-    event AttestationCreated(address indexed creator, address indexed about, bytes32 indexed key, bytes val);
-
-    function test_attest_individual_succeeds() external {
-        AttestationStation attestationStation = new AttestationStation();
-
-        vm.expectEmit(true, true, true, true);
-        emit AttestationCreated(alice_attestor, bob, bytes32("foo"), bytes("bar"));
-
-        vm.prank(alice_attestor);
-        attestationStation.attest({ _about: bob, _key: bytes32("foo"), _val: bytes("bar") });
-    }
-
-    function test_attest_single_succeeds() external {
-        AttestationStation attestationStation = new AttestationStation();
-
-        AttestationStation.AttestationData[] memory attestationDataArr = new AttestationStation.AttestationData[](1);
-
-        // alice is going to attest about bob
-        AttestationStation.AttestationData memory attestationData = AttestationStation.AttestationData({
-            about: bob,
-            key: bytes32("test-key:string"),
-            val: bytes("test-value")
-        });
-
-        // assert the attestation starts empty
-        assertEq(attestationStation.attestations(alice_attestor, attestationData.about, attestationData.key), "");
-
-        // make attestation
-        vm.prank(alice_attestor);
-        attestationDataArr[0] = attestationData;
-        attestationStation.attest(attestationDataArr);
-
-        // assert the attestation is there
-        assertEq(
-            attestationStation.attestations(alice_attestor, attestationData.about, attestationData.key),
-            attestationData.val
-        );
-
-        bytes memory new_val = bytes("new updated value");
-        // make a new attestations to same about and key
-        attestationData =
-            AttestationStation.AttestationData({ about: attestationData.about, key: attestationData.key, val: new_val });
-
-        vm.prank(alice_attestor);
-        attestationDataArr[0] = attestationData;
-        attestationStation.attest(attestationDataArr);
-
-        // assert the attestation is updated
-        assertEq(
-            attestationStation.attestations(alice_attestor, attestationData.about, attestationData.key),
-            attestationData.val
-        );
-    }
-
-    function test_attest_bulk_succeeds() external {
-        AttestationStation attestationStation = new AttestationStation();
-
-        vm.prank(alice_attestor);
-
-        AttestationStation.AttestationData[] memory attestationData = new AttestationStation.AttestationData[](3);
-        attestationData[0] = AttestationStation.AttestationData({
-            about: bob,
-            key: bytes32("test-key:string"),
-            val: bytes("test-value")
-        });
-
-        attestationData[1] =
-            AttestationStation.AttestationData({ about: bob, key: bytes32("test-key2"), val: bytes("test-value2") });
-
-        attestationData[2] = AttestationStation.AttestationData({
-            about: sally,
-            key: bytes32("test-key:string"),
-            val: bytes("test-value3")
-        });
-
-        attestationStation.attest(attestationData);
-
-        // assert the attestations are there
-        assertEq(
-            attestationStation.attestations(alice_attestor, attestationData[0].about, attestationData[0].key),
-            attestationData[0].val
-        );
-        assertEq(
-            attestationStation.attestations(alice_attestor, attestationData[1].about, attestationData[1].key),
-            attestationData[1].val
-        );
-        assertEq(
-            attestationStation.attestations(alice_attestor, attestationData[2].about, attestationData[2].key),
-            attestationData[2].val
-        );
-    }
-}
diff --git a/packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol b/packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol
deleted file mode 100644
index 2eb2f07e860f..000000000000
--- a/packages/contracts-bedrock/test/periphery/op-nft/Optimist.t.sol
+++ /dev/null
@@ -1,543 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity >=0.6.2 <0.9.0;
-
-// Testing utilities
-import { Test } from "forge-std/Test.sol";
-import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
-import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
-import { Optimist } from "src/periphery/op-nft/Optimist.sol";
-import { OptimistAllowlist } from "src/periphery/op-nft/OptimistAllowlist.sol";
-import { OptimistInviter } from "src/periphery/op-nft/OptimistInviter.sol";
-import { OptimistInviterHelper } from "test/mocks/OptimistInviterHelper.sol";
-import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-
-library Multicall {
-    bytes internal constant code =
-        hex"6080604052600436106100f35760003560e01c80634d2301cc1161008a578063a8b0574e11610059578063a8b0574e1461025a578063bce38bd714610275578063c3077fa914610288578063ee82ac5e1461029b57600080fd5b80634d2301cc146101ec57806372425d9d1461022157806382ad56cb1461023457806386d516e81461024757600080fd5b80633408e470116100c65780633408e47014610191578063399542e9146101a45780633e64a696146101c657806342cbb15c146101d957600080fd5b80630f28c97d146100f8578063174dea711461011a578063252dba421461013a57806327e86d6e1461015b575b600080fd5b34801561010457600080fd5b50425b6040519081526020015b60405180910390f35b61012d610128366004610a85565b6102ba565b6040516101119190610bbe565b61014d610148366004610a85565b6104ef565b604051610111929190610bd8565b34801561016757600080fd5b50437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0140610107565b34801561019d57600080fd5b5046610107565b6101b76101b2366004610c60565b610690565b60405161011193929190610cba565b3480156101d257600080fd5b5048610107565b3480156101e557600080fd5b5043610107565b3480156101f857600080fd5b50610107610207366004610ce2565b73ffffffffffffffffffffffffffffffffffffffff163190565b34801561022d57600080fd5b5044610107565b61012d610242366004610a85565b6106ab565b34801561025357600080fd5b5045610107565b34801561026657600080fd5b50604051418152602001610111565b61012d610283366004610c60565b61085a565b6101b7610296366004610a85565b610a1a565b3480156102a757600080fd5b506101076102b6366004610d18565b4090565b60606000828067ffffffffffffffff8111156102d8576102d8610d31565b60405190808252806020026020018201604052801561031e57816020015b6040805180820190915260008152606060208201528152602001906001900390816102f65790505b5092503660005b8281101561047757600085828151811061034157610341610d60565b6020026020010151905087878381811061035d5761035d610d60565b905060200281019061036f9190610d8f565b6040810135958601959093506103886020850185610ce2565b73ffffffffffffffffffffffffffffffffffffffff16816103ac6060870187610dcd565b6040516103ba929190610e32565b60006040518083038185875af1925050503d80600081146103f7576040519150601f19603f3d011682016040523d82523d6000602084013e6103fc565b606091505b50602080850191909152901515808452908501351761046d577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260846000fd5b5050600101610325565b508234146104e6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601a60248201527f4d756c746963616c6c333a2076616c7565206d69736d6174636800000000000060448201526064015b60405180910390fd5b50505092915050565b436060828067ffffffffffffffff81111561050c5761050c610d31565b60405190808252806020026020018201604052801561053f57816020015b606081526020019060019003908161052a5790505b5091503660005b8281101561068657600087878381811061056257610562610d60565b90506020028101906105749190610e42565b92506105836020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166105a66020850185610dcd565b6040516105b4929190610e32565b6000604051808303816000865af19150503d80600081146105f1576040519150601f19603f3d011682016040523d82523d6000602084013e6105f6565b606091505b5086848151811061060957610609610d60565b602090810291909101015290508061067d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b50600101610546565b5050509250929050565b43804060606106a086868661085a565b905093509350939050565b6060818067ffffffffffffffff8111156106c7576106c7610d31565b60405190808252806020026020018201604052801561070d57816020015b6040805180820190915260008152606060208201528152602001906001900390816106e55790505b5091503660005b828110156104e657600084828151811061073057610730610d60565b6020026020010151905086868381811061074c5761074c610d60565b905060200281019061075e9190610e76565b925061076d6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff166107906040850185610dcd565b60405161079e929190610e32565b6000604051808303816000865af19150503d80600081146107db576040519150601f19603f3d011682016040523d82523d6000602084013e6107e0565b606091505b506020808401919091529015158083529084013517610851577f08c379a000000000000000000000000000000000000000000000000000000000600052602060045260176024527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060445260646000fd5b50600101610714565b6060818067ffffffffffffffff81111561087657610876610d31565b6040519080825280602002602001820160405280156108bc57816020015b6040805180820190915260008152606060208201528152602001906001900390816108945790505b5091503660005b82811015610a105760008482815181106108df576108df610d60565b602002602001015190508686838181106108fb576108fb610d60565b905060200281019061090d9190610e42565b925061091c6020840184610ce2565b73ffffffffffffffffffffffffffffffffffffffff1661093f6020850185610dcd565b60405161094d929190610e32565b6000604051808303816000865af19150503d806000811461098a576040519150601f19603f3d011682016040523d82523d6000602084013e61098f565b606091505b506020830152151581528715610a07578051610a07576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601760248201527f4d756c746963616c6c333a2063616c6c206661696c656400000000000000000060448201526064016104dd565b506001016108c3565b5050509392505050565b6000806060610a2b60018686610690565b919790965090945092505050565b60008083601f840112610a4b57600080fd5b50813567ffffffffffffffff811115610a6357600080fd5b6020830191508360208260051b8501011115610a7e57600080fd5b9250929050565b60008060208385031215610a9857600080fd5b823567ffffffffffffffff811115610aaf57600080fd5b610abb85828601610a39565b90969095509350505050565b6000815180845260005b81811015610aed57602081850181015186830182015201610ad1565b81811115610aff576000602083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169290920160200192915050565b600082825180855260208086019550808260051b84010181860160005b84811015610bb1578583037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001895281518051151584528401516040858501819052610b9d81860183610ac7565b9a86019a9450505090830190600101610b4f565b5090979650505050505050565b602081526000610bd16020830184610b32565b9392505050565b600060408201848352602060408185015281855180845260608601915060608160051b870101935082870160005b82811015610c52577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0888703018452610c40868351610ac7565b95509284019290840190600101610c06565b509398975050505050505050565b600080600060408486031215610c7557600080fd5b83358015158114610c8557600080fd5b9250602084013567ffffffffffffffff811115610ca157600080fd5b610cad86828701610a39565b9497909650939450505050565b838152826020820152606060408201526000610cd96060830184610b32565b95945050505050565b600060208284031215610cf457600080fd5b813573ffffffffffffffffffffffffffffffffffffffff81168114610bd157600080fd5b600060208284031215610d2a57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81833603018112610dc357600080fd5b9190910192915050565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1843603018112610e0257600080fd5b83018035915067ffffffffffffffff821115610e1d57600080fd5b602001915036819003821315610a7e57600080fd5b8183823760009101908152919050565b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc1833603018112610dc357600080fd5b600082357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa1833603018112610dc357600080fdfea2646970667358221220bb2b5c71a328032f97c676ae39a1ec2148d3e5d6f73d95e9b17910152d61f16264736f6c634300080c0033";
-    address internal constant addr = 0xcA11bde05977b3631167028862bE2a173976CA11;
-}
-
-contract Optimist_Initializer is Test {
-    event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);
-    event Initialized(uint8);
-    event AttestationCreated(address indexed creator, address indexed about, bytes32 indexed key, bytes val);
-
-    string constant name = "Optimist name";
-    string constant symbol = "OPTIMISTSYMBOL";
-    string constant base_uri = "https://storageapi.fleek.co/6442819a1b05-bucket/optimist-nft/attributes";
-    AttestationStation attestationStation;
-    Optimist optimist;
-    OptimistAllowlist optimistAllowlist;
-    OptimistInviter optimistInviter;
-
-    // Helps with EIP-712 signature generation
-    OptimistInviterHelper optimistInviterHelper;
-
-    // To test multicall for claiming and minting in one call
-    IMulticall3 multicall3;
-
-    address internal carol_baseURIAttestor;
-    address internal alice_allowlistAttestor;
-    address internal eve_inviteGranter;
-    address internal ted_coinbaseAttestor;
-    address internal bob;
-    address internal sally;
-
-    /// @notice BaseURI attestor sets the baseURI of the Optimist NFT.
-    function _attestBaseURI(string memory _baseUri) internal {
-        bytes32 baseURIAttestationKey = optimist.BASE_URI_ATTESTATION_KEY();
-        AttestationStation.AttestationData[] memory attestationData = new AttestationStation.AttestationData[](1);
-        attestationData[0] =
-            AttestationStation.AttestationData(address(optimist), baseURIAttestationKey, bytes(_baseUri));
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(carol_baseURIAttestor, address(optimist), baseURIAttestationKey, bytes(_baseUri));
-        vm.prank(carol_baseURIAttestor);
-        attestationStation.attest(attestationData);
-    }
-
-    /// @notice Allowlist attestor creates an attestation for an address.
-    function _attestAllowlist(address _about) internal {
-        bytes32 attestationKey = optimistAllowlist.OPTIMIST_CAN_MINT_ATTESTATION_KEY();
-        AttestationStation.AttestationData[] memory attestationData = new AttestationStation.AttestationData[](1);
-        // we are using true but it can be any non empty value
-        attestationData[0] =
-            AttestationStation.AttestationData({ about: _about, key: attestationKey, val: bytes("true") });
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(alice_allowlistAttestor, _about, attestationKey, bytes("true"));
-
-        vm.prank(alice_allowlistAttestor);
-        attestationStation.attest(attestationData);
-
-        assertTrue(optimist.isOnAllowList(_about));
-    }
-
-    /// @notice Coinbase Quest attestor creates an attestation for an address.
-    function _attestCoinbaseQuest(address _about) internal {
-        bytes32 attestationKey = optimistAllowlist.COINBASE_QUEST_ELIGIBLE_ATTESTATION_KEY();
-        AttestationStation.AttestationData[] memory attestationData = new AttestationStation.AttestationData[](1);
-        // we are using true but it can be any non empty value
-        attestationData[0] =
-            AttestationStation.AttestationData({ about: _about, key: attestationKey, val: bytes("true") });
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(ted_coinbaseAttestor, _about, attestationKey, bytes("true"));
-
-        vm.prank(ted_coinbaseAttestor);
-        attestationStation.attest(attestationData);
-
-        assertTrue(optimist.isOnAllowList(_about));
-    }
-
-    /// @notice Issues invite, then claims it using the claimer's address.
-    function _inviteAndClaim(address _about) internal {
-        uint256 inviterPrivateKey = 0xbeefbeef;
-        address inviter = vm.addr(inviterPrivateKey);
-
-        address[] memory addresses = new address[](1);
-        addresses[0] = inviter;
-
-        vm.prank(eve_inviteGranter);
-
-        // grant invites to Inviter;
-        optimistInviter.setInviteCounts(addresses, 3);
-
-        // issue a new invite
-        OptimistInviter.ClaimableInvite memory claimableInvite =
-            optimistInviterHelper.getClaimableInviteWithNewNonce(inviter);
-
-        // EIP-712 sign with Inviter's private key
-
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(inviterPrivateKey, optimistInviterHelper.getDigest(claimableInvite));
-        bytes memory signature = abi.encodePacked(r, s, v);
-
-        bytes32 hashedCommit = keccak256(abi.encode(_about, signature));
-
-        // commit the invite
-        vm.prank(_about);
-        optimistInviter.commitInvite(hashedCommit);
-
-        // wait minimum commitment period
-        vm.warp(optimistInviter.MIN_COMMITMENT_PERIOD() + block.timestamp);
-
-        // reveal and claim the invite
-        optimistInviter.claimInvite(_about, claimableInvite, signature);
-
-        assertTrue(optimist.isOnAllowList(_about));
-    }
-
-    /// @notice Mocks the allowlistAttestor to always return true for a given address.
-    function _mockAllowlistTrueFor(address _claimer) internal {
-        vm.mockCall(
-            address(optimistAllowlist), abi.encodeCall(OptimistAllowlist.isAllowedToMint, (_claimer)), abi.encode(true)
-        );
-
-        assertTrue(optimist.isOnAllowList(_claimer));
-    }
-
-    /// @notice Returns address as uint256.
-    function _getTokenId(address _owner) internal pure returns (uint256) {
-        return uint256(uint160(address(_owner)));
-    }
-
-    function setUp() public {
-        carol_baseURIAttestor = makeAddr("carol_baseURIAttestor");
-        alice_allowlistAttestor = makeAddr("alice_allowlistAttestor");
-        eve_inviteGranter = makeAddr("eve_inviteGranter");
-        ted_coinbaseAttestor = makeAddr("ted_coinbaseAttestor");
-        bob = makeAddr("bob");
-        sally = makeAddr("sally");
-        _initializeContracts();
-    }
-
-    function _initializeContracts() internal {
-        attestationStation = new AttestationStation();
-        vm.expectEmit(true, true, false, false);
-        emit Initialized(1);
-
-        optimistInviter =
-            new OptimistInviter({ _inviteGranter: eve_inviteGranter, _attestationStation: attestationStation });
-
-        optimistInviter.initialize("OptimistInviter");
-
-        // Initialize the helper which helps sign EIP-712 signatures
-        optimistInviterHelper = new OptimistInviterHelper(optimistInviter, "OptimistInviter");
-
-        optimistAllowlist = new OptimistAllowlist({
-            _attestationStation: attestationStation,
-            _allowlistAttestor: alice_allowlistAttestor,
-            _coinbaseQuestAttestor: ted_coinbaseAttestor,
-            _optimistInviter: address(optimistInviter)
-        });
-
-        optimist = new Optimist({
-            _name: name,
-            _symbol: symbol,
-            _baseURIAttestor: carol_baseURIAttestor,
-            _attestationStation: attestationStation,
-            _optimistAllowlist: optimistAllowlist
-        });
-
-        multicall3 = IMulticall3(Multicall.addr);
-        vm.etch(Multicall.addr, Multicall.code);
-    }
-}
-
-contract OptimistTest is Optimist_Initializer {
-    /// @notice Check that constructor and initializer parameters are correctly set.
-    function test_initialize_succeeds() external view {
-        // expect name to be set
-        assertEq(optimist.name(), name);
-        // expect symbol to be set
-        assertEq(optimist.symbol(), symbol);
-        // expect attestationStation to be set
-        assertEq(address(optimist.ATTESTATION_STATION()), address(attestationStation));
-        assertEq(optimist.BASE_URI_ATTESTOR(), carol_baseURIAttestor);
-    }
-
-    /// @notice Bob should be able to mint an NFT if he is allowlisted
-    ///         by the allowlistAttestor and has a balance of 0.
-    function test_mint_afterAllowlistAttestation_succeeds() external {
-        // bob should start with 0 balance
-        assertEq(optimist.balanceOf(bob), 0);
-
-        // allowlist bob
-        _attestAllowlist(bob);
-
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-
-        // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
-        vm.expectCall(address(optimistAllowlist), data);
-
-        // mint an NFT and expect mint transfer event to be emitted
-        vm.expectEmit(true, true, true, true);
-        emit Transfer(address(0), bob, _getTokenId(bob));
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // expect the NFT to be owned by bob
-        assertEq(optimist.ownerOf(_getTokenId(bob)), bob);
-        assertEq(optimist.balanceOf(bob), 1);
-    }
-
-    /// @notice Bob should be able to mint an NFT if he claimed an invite through OptimistInviter
-    ///         and has a balance of 0.
-    function test_mint_afterInviteClaimed_succeeds() external {
-        // bob should start with 0 balance
-        assertEq(optimist.balanceOf(bob), 0);
-
-        // bob claims an invite
-        _inviteAndClaim(bob);
-
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-
-        // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
-        vm.expectCall(address(optimistAllowlist), data);
-
-        // mint an NFT and expect mint transfer event to be emitted
-        vm.expectEmit(true, true, true, true);
-        emit Transfer(address(0), bob, _getTokenId(bob));
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // expect the NFT to be owned by bob
-        assertEq(optimist.ownerOf(_getTokenId(bob)), bob);
-        assertEq(optimist.balanceOf(bob), 1);
-    }
-
-    /// @notice Bob should be able to mint an NFT if he has an attestation from Coinbase Quest
-    ///         attestor and has a balance of 0.
-    function test_mint_afterCoinbaseQuestAttestation_succeeds() external {
-        // bob should start with 0 balance
-        assertEq(optimist.balanceOf(bob), 0);
-
-        // bob receives attestation from Coinbase Quest attestor
-        _attestCoinbaseQuest(bob);
-
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-
-        // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
-        vm.expectCall(address(optimistAllowlist), data);
-
-        // mint an NFT and expect mint transfer event to be emitted
-        vm.expectEmit(true, true, true, true);
-        emit Transfer(address(0), bob, _getTokenId(bob));
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // expect the NFT to be owned by bob
-        assertEq(optimist.ownerOf(_getTokenId(bob)), bob);
-        assertEq(optimist.balanceOf(bob), 1);
-    }
-
-    /// @notice Multiple valid attestations should allow Bob to mint.
-    function test_mint_afterMultipleAttestations_succeeds() external {
-        // bob should start with 0 balance
-        assertEq(optimist.balanceOf(bob), 0);
-
-        // bob receives attestation from Coinbase Quest attestor
-        _attestCoinbaseQuest(bob);
-
-        // allowlist bob
-        _attestAllowlist(bob);
-
-        // bob claims an invite
-        _inviteAndClaim(bob);
-
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-
-        // Check that the OptimistAllowlist is checked
-        bytes memory data = abi.encodeCall(OptimistAllowlist.isAllowedToMint, (bob));
-        vm.expectCall(address(optimistAllowlist), data);
-
-        // mint an NFT and expect mint transfer event to be emitted
-        vm.expectEmit(true, true, true, true);
-        emit Transfer(address(0), bob, _getTokenId(bob));
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // expect the NFT to be owned by bob
-        assertEq(optimist.ownerOf(_getTokenId(bob)), bob);
-        assertEq(optimist.balanceOf(bob), 1);
-    }
-
-    /// @notice Sally should be able to mint a token on behalf of bob.
-    function test_mint_secondaryMinter_succeeds() external {
-        _mockAllowlistTrueFor(bob);
-
-        vm.expectEmit(true, true, true, true);
-        emit Transfer(address(0), bob, _getTokenId(bob));
-
-        // mint as sally instead of bob
-        vm.prank(sally);
-        optimist.mint(bob);
-
-        // expect the NFT to be owned by bob
-        assertEq(optimist.ownerOf(_getTokenId(bob)), bob);
-        assertEq(optimist.balanceOf(bob), 1);
-    }
-
-    /// @notice Bob should not be able to mint an NFT if he is not allowlisted.
-    function test_mint_forNonAllowlistedClaimer_reverts() external {
-        vm.prank(bob);
-        vm.expectRevert("Optimist: address is not on allowList");
-        optimist.mint(bob);
-    }
-
-    /// @notice Bob's tx should revert if he already minted.
-    function test_mint_forAlreadyMintedClaimer_reverts() external {
-        _attestAllowlist(bob);
-
-        // mint initial nft with bob
-        vm.prank(bob);
-        optimist.mint(bob);
-        // expect the NFT to be owned by bob
-        assertEq(optimist.ownerOf(_getTokenId(bob)), bob);
-        assertEq(optimist.balanceOf(bob), 1);
-
-        // attempt to mint again
-        vm.expectRevert("ERC721: token already minted");
-        optimist.mint(bob);
-    }
-
-    /// @notice The baseURI should be set by attestation station by the baseURIAttestor.
-    function test_baseURI_returnsCorrectBaseURI_succeeds() external {
-        _attestBaseURI(base_uri);
-
-        bytes memory data = abi.encodeCall(
-            attestationStation.attestations,
-            (carol_baseURIAttestor, address(optimist), optimist.BASE_URI_ATTESTATION_KEY())
-        );
-        vm.expectCall(address(attestationStation), data);
-        vm.prank(carol_baseURIAttestor);
-
-        // assert baseURI is set
-        assertEq(optimist.baseURI(), base_uri);
-    }
-
-    /// @notice tokenURI should return the token uri for a minted token.
-    function test_tokenURI_returnsCorrectTokenURI_succeeds() external {
-        // we are using true but it can be any non empty value
-        _attestBaseURI(base_uri);
-
-        // mint an NFT
-        _mockAllowlistTrueFor(bob);
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // assert tokenURI is set
-        assertEq(optimist.baseURI(), base_uri);
-        assertEq(
-            optimist.tokenURI(_getTokenId(bob)),
-            "https://storageapi.fleek.co/6442819a1b05-bucket/optimist-nft/attributes/0x1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e.json"
-        );
-    }
-
-    /// @notice Should return the token id of the owner.
-    function test_tokenIdOfAddress_returnsOwnerID_succeeds() external {
-        uint256 willTokenId = 1024;
-        address will = address(1024);
-
-        _mockAllowlistTrueFor(will);
-
-        optimist.mint(will);
-
-        assertEq(optimist.tokenIdOfAddress(will), willTokenId);
-    }
-
-    /// @notice transferFrom should revert since Optimist is a SBT.
-    function test_transferFrom_soulbound_reverts() external {
-        _mockAllowlistTrueFor(bob);
-
-        // mint as bob
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // attempt to transfer to sally
-        vm.expectRevert(bytes("Optimist: soul bound token"));
-        vm.prank(bob);
-        optimist.transferFrom(bob, sally, _getTokenId(bob));
-
-        // attempt to transfer to sally
-        vm.expectRevert(bytes("Optimist: soul bound token"));
-        vm.prank(bob);
-        optimist.safeTransferFrom(bob, sally, _getTokenId(bob));
-        // attempt to transfer to sally
-        vm.expectRevert(bytes("Optimist: soul bound token"));
-        vm.prank(bob);
-        optimist.safeTransferFrom(bob, sally, _getTokenId(bob), bytes("0x"));
-    }
-
-    /// @notice approve should revert since Optimist is a SBT.
-    function test_approve_soulbound_reverts() external {
-        _mockAllowlistTrueFor(bob);
-
-        // mint as bob
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // attempt to approve sally
-        vm.prank(bob);
-        vm.expectRevert("Optimist: soul bound token");
-        optimist.approve(address(attestationStation), _getTokenId(bob));
-
-        assertEq(optimist.getApproved(_getTokenId(bob)), address(0));
-    }
-
-    /// @notice setApprovalForAll should revert since Optimist is a SBT.
-    function test_setApprovalForAll_soulbound_reverts() external {
-        _mockAllowlistTrueFor(bob);
-
-        // mint as bob
-        vm.prank(bob);
-        optimist.mint(bob);
-        vm.prank(alice_allowlistAttestor);
-        vm.expectRevert(bytes("Optimist: soul bound token"));
-        optimist.setApprovalForAll(alice_allowlistAttestor, true);
-
-        // expect approval amount to stil be 0
-        assertEq(optimist.getApproved(_getTokenId(bob)), address(0));
-        // isApprovedForAll should return false
-        assertEq(optimist.isApprovedForAll(alice_allowlistAttestor, alice_allowlistAttestor), false);
-    }
-
-    /// @notice Only owner should be able to burn token.
-    function test_burn_byOwner_succeeds() external {
-        _mockAllowlistTrueFor(bob);
-
-        // mint as bob
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        // burn as bob
-        vm.prank(bob);
-        optimist.burn(_getTokenId(bob));
-
-        // expect bob to have no balance now
-        assertEq(optimist.balanceOf(bob), 0);
-    }
-
-    /// @notice Non-owner attempting to burn token should revert.
-    function test_burn_byNonOwner_reverts() external {
-        _mockAllowlistTrueFor(bob);
-
-        // mint as bob
-        vm.prank(bob);
-        optimist.mint(bob);
-
-        vm.expectRevert("ERC721: caller is not token owner nor approved");
-        // burn as Sally
-        vm.prank(sally);
-        optimist.burn(_getTokenId(bob));
-
-        // expect bob to have still have the token
-        assertEq(optimist.balanceOf(bob), 1);
-    }
-
-    /// @notice Should support ERC-721 interface.
-    function test_supportsInterface_returnsCorrectInterfaceForERC721_succeeds() external view {
-        bytes4 iface721 = type(IERC721).interfaceId;
-        // check that it supports ERC-721 interface
-        assertEq(optimist.supportsInterface(iface721), true);
-    }
-
-    /// @notice Checking that multi-call using the invite & claim flow works correctly, since the
-    ///         frontend will be making multicalls to improve UX. The OptimistInviter.claimInvite
-    ///         and Optimist.mint will be batched
-    function test_multicall_batchingClaimAndMint_succeeds() external {
-        uint256 inviterPrivateKey = 0xbeefbeef;
-        address inviter = vm.addr(inviterPrivateKey);
-
-        address[] memory addresses = new address[](1);
-        addresses[0] = inviter;
-
-        vm.prank(eve_inviteGranter);
-
-        // grant invites to Inviter;
-        optimistInviter.setInviteCounts(addresses, 3);
-
-        // issue a new invite
-        OptimistInviter.ClaimableInvite memory claimableInvite =
-            optimistInviterHelper.getClaimableInviteWithNewNonce(inviter);
-
-        // EIP-712 sign with Inviter's private key
-
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(inviterPrivateKey, optimistInviterHelper.getDigest(claimableInvite));
-        bytes memory signature = abi.encodePacked(r, s, v);
-
-        bytes32 hashedCommit = keccak256(abi.encode(bob, signature));
-
-        // commit the invite
-        vm.prank(bob);
-        optimistInviter.commitInvite(hashedCommit);
-
-        // wait minimum commitment period
-        vm.warp(optimistInviter.MIN_COMMITMENT_PERIOD() + block.timestamp);
-
-        IMulticall3.Call3[] memory calls = new IMulticall3.Call3[](2);
-
-        // First call is to claim the invite, receiving the attestation
-        calls[0] = IMulticall3.Call3({
-            target: address(optimistInviter),
-            callData: abi.encodeCall(OptimistInviter.claimInvite, (bob, claimableInvite, signature)),
-            allowFailure: false
-        });
-
-        // Second call is to mint the Optimist NFT
-        calls[1] = IMulticall3.Call3({
-            target: address(optimist),
-            callData: abi.encodeCall(Optimist.mint, (bob)),
-            allowFailure: false
-        });
-
-        multicall3.aggregate3(calls);
-
-        assertTrue(optimist.isOnAllowList(bob));
-        assertEq(optimist.ownerOf(_getTokenId(bob)), bob);
-        assertEq(optimist.balanceOf(bob), 1);
-    }
-}
diff --git a/packages/contracts-bedrock/test/periphery/op-nft/OptimistAllowlist.t.sol b/packages/contracts-bedrock/test/periphery/op-nft/OptimistAllowlist.t.sol
deleted file mode 100644
index c0c2aef2bce0..000000000000
--- a/packages/contracts-bedrock/test/periphery/op-nft/OptimistAllowlist.t.sol
+++ /dev/null
@@ -1,227 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-// Testing utilities
-import { Test } from "forge-std/Test.sol";
-import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
-import { OptimistAllowlist } from "src/periphery/op-nft/OptimistAllowlist.sol";
-import { OptimistInviter } from "src/periphery/op-nft/OptimistInviter.sol";
-import { OptimistInviterHelper } from "test/mocks/OptimistInviterHelper.sol";
-import { OptimistConstants } from "src/periphery/op-nft/libraries/OptimistConstants.sol";
-
-contract OptimistAllowlist_Initializer is Test {
-    event AttestationCreated(address indexed creator, address indexed about, bytes32 indexed key, bytes val);
-
-    address internal alice_allowlistAttestor;
-    address internal sally_coinbaseQuestAttestor;
-    address internal ted;
-
-    uint256 internal bobPrivateKey;
-    address internal bob;
-
-    AttestationStation attestationStation;
-    OptimistAllowlist optimistAllowlist;
-    OptimistInviter optimistInviter;
-
-    // Helps with EIP-712 signature generation
-    OptimistInviterHelper optimistInviterHelper;
-
-    function setUp() public {
-        alice_allowlistAttestor = makeAddr("alice_allowlistAttestor");
-        sally_coinbaseQuestAttestor = makeAddr("sally_coinbaseQuestAttestor");
-        ted = makeAddr("ted");
-
-        bobPrivateKey = 0xB0B0B0B0;
-        bob = vm.addr(bobPrivateKey);
-        vm.label(bob, "bob");
-
-        // Give alice and bob and sally some ETH
-        vm.deal(alice_allowlistAttestor, 1 ether);
-        vm.deal(sally_coinbaseQuestAttestor, 1 ether);
-        vm.deal(bob, 1 ether);
-        vm.deal(ted, 1 ether);
-
-        _initializeContracts();
-    }
-
-    function attestAllowlist(address _about) internal {
-        AttestationStation.AttestationData[] memory attestationData = new AttestationStation.AttestationData[](1);
-        // we are using true but it can be any non empty value
-        attestationData[0] = AttestationStation.AttestationData({
-            about: _about,
-            key: optimistAllowlist.OPTIMIST_CAN_MINT_ATTESTATION_KEY(),
-            val: bytes("true")
-        });
-        vm.prank(alice_allowlistAttestor);
-        attestationStation.attest(attestationData);
-    }
-
-    function attestCoinbaseQuest(address _about) internal {
-        AttestationStation.AttestationData[] memory attestationData = new AttestationStation.AttestationData[](1);
-        // we are using true but it can be any non empty value
-        attestationData[0] = AttestationStation.AttestationData({
-            about: _about,
-            key: optimistAllowlist.COINBASE_QUEST_ELIGIBLE_ATTESTATION_KEY(),
-            val: bytes("true")
-        });
-        vm.prank(sally_coinbaseQuestAttestor);
-        attestationStation.attest(attestationData);
-    }
-
-    function inviteAndClaim(address claimer) internal {
-        address[] memory addresses = new address[](1);
-        addresses[0] = bob;
-
-        vm.prank(alice_allowlistAttestor);
-
-        // grant invites to Bob;
-        optimistInviter.setInviteCounts(addresses, 3);
-
-        // issue a new invite
-        OptimistInviter.ClaimableInvite memory claimableInvite =
-            optimistInviterHelper.getClaimableInviteWithNewNonce(bob);
-
-        // EIP-712 sign with Bob's private key
-        bytes memory signature = _getSignature(bobPrivateKey, optimistInviterHelper.getDigest(claimableInvite));
-
-        bytes32 hashedCommit = keccak256(abi.encode(claimer, signature));
-
-        // commit the invite
-        vm.prank(claimer);
-        optimistInviter.commitInvite(hashedCommit);
-
-        // wait minimum commitment period
-        vm.warp(optimistInviter.MIN_COMMITMENT_PERIOD() + block.timestamp);
-
-        // reveal and claim the invite
-        optimistInviter.claimInvite(claimer, claimableInvite, signature);
-    }
-
-    /// @notice Get signature as a bytes blob, since SignatureChecker takes arbitrary signature blobs.
-    function _getSignature(uint256 _signingPrivateKey, bytes32 _digest) internal pure returns (bytes memory) {
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(_signingPrivateKey, _digest);
-
-        bytes memory signature = abi.encodePacked(r, s, v);
-        return signature;
-    }
-
-    function _initializeContracts() internal {
-        attestationStation = new AttestationStation();
-
-        optimistInviter = new OptimistInviter(alice_allowlistAttestor, attestationStation);
-        optimistInviter.initialize("OptimistInviter");
-
-        optimistAllowlist = new OptimistAllowlist(
-            attestationStation, alice_allowlistAttestor, sally_coinbaseQuestAttestor, address(optimistInviter)
-        );
-
-        optimistInviterHelper = new OptimistInviterHelper(optimistInviter, "OptimistInviter");
-    }
-}
-
-contract OptimistAllowlistTest is OptimistAllowlist_Initializer {
-    function test_constructor_succeeds() external view {
-        // expect attestationStation to be set
-        assertEq(address(optimistAllowlist.ATTESTATION_STATION()), address(attestationStation));
-        assertEq(optimistAllowlist.ALLOWLIST_ATTESTOR(), alice_allowlistAttestor);
-        assertEq(optimistAllowlist.COINBASE_QUEST_ATTESTOR(), sally_coinbaseQuestAttestor);
-        assertEq(address(optimistAllowlist.OPTIMIST_INVITER()), address(optimistInviter));
-    }
-
-    /// @notice Base case, a account without any relevant attestations should not be able to mint.
-    function test_isAllowedToMint_withoutAnyAttestations_fails() external view {
-        assertFalse(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice After receiving a valid allowlist attestation, the account should be able to mint.
-    function test_isAllowedToMint_fromAllowlistAttestor_succeeds() external {
-        attestAllowlist(bob);
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice After receiving a valid attestation from the Coinbase Quest attestor,
-    ///         the account should be able to mint.
-    function test_isAllowedToMint_fromCoinbaseQuestAttestor_succeeds() external {
-        attestCoinbaseQuest(bob);
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice Account that received an attestation from the OptimistInviter contract by going
-    ///         through the claim invite flow should be able to mint.
-    function test_isAllowedToMint_fromInvite_succeeds() external {
-        inviteAndClaim(bob);
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice Attestation from the wrong allowlist attestor should not allow minting.
-    function test_isAllowedToMint_fromWrongAllowlistAttestor_fails() external {
-        // Ted is not the allowlist attestor
-        vm.prank(ted);
-        attestationStation.attest(bob, optimistAllowlist.OPTIMIST_CAN_MINT_ATTESTATION_KEY(), bytes("true"));
-        assertFalse(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice Coinbase quest attestation from wrong attestor should not allow minting.
-    function test_isAllowedToMint_fromWrongCoinbaseQuestAttestor_fails() external {
-        // Ted is not the coinbase quest attestor
-        vm.prank(ted);
-        attestationStation.attest(bob, optimistAllowlist.COINBASE_QUEST_ELIGIBLE_ATTESTATION_KEY(), bytes("true"));
-        assertFalse(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice Claiming an invite on the non-official OptimistInviter contract should not allow
-    ///          minting.
-    function test_isAllowedToMint_fromWrongOptimistInviter_fails() external {
-        vm.prank(ted);
-        attestationStation.attest(bob, OptimistConstants.OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY, bytes("true"));
-        assertFalse(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice Having multiple signals, even if one is invalid, should still allow minting.
-    function test_isAllowedToMint_withMultipleAttestations_succeeds() external {
-        attestAllowlist(bob);
-        attestCoinbaseQuest(bob);
-        inviteAndClaim(bob);
-
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-
-        // A invalid attestation, as Ted is not allowlist attestor
-        vm.prank(ted);
-        attestationStation.attest(bob, optimistAllowlist.OPTIMIST_CAN_MINT_ATTESTATION_KEY(), bytes("true"));
-
-        // Since Bob has at least one valid attestation, he should be allowed to mint
-        assertTrue(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice Having falsy attestation value should not allow minting.
-    function test_isAllowedToMint_fromAllowlistAttestorWithFalsyValue_fails() external {
-        // First sends correct attestation
-        attestAllowlist(bob);
-
-        bytes32 key = optimistAllowlist.OPTIMIST_CAN_MINT_ATTESTATION_KEY();
-        vm.expectEmit(true, true, true, false);
-        emit AttestationCreated(alice_allowlistAttestor, bob, key, bytes("dsafsds"));
-
-        // Invalidates existing attestation
-        vm.prank(alice_allowlistAttestor);
-        attestationStation.attest(bob, key, bytes(""));
-
-        assertFalse(optimistAllowlist.isAllowedToMint(bob));
-    }
-
-    /// @notice Having falsy attestation value from Coinbase attestor should not allow minting.
-    function test_isAllowedToMint_fromCoinbaseQuestAttestorWithFalsyValue_fails() external {
-        // First sends correct attestation
-        attestAllowlist(bob);
-
-        bytes32 key = optimistAllowlist.OPTIMIST_CAN_MINT_ATTESTATION_KEY();
-        vm.expectEmit(true, true, true, true);
-        emit AttestationCreated(alice_allowlistAttestor, bob, key, bytes(""));
-
-        // Invalidates existing attestation
-        vm.prank(alice_allowlistAttestor);
-        attestationStation.attest(bob, key, bytes(""));
-
-        assertFalse(optimistAllowlist.isAllowedToMint(bob));
-    }
-}
diff --git a/packages/contracts-bedrock/test/periphery/op-nft/OptimistInviter.t.sol b/packages/contracts-bedrock/test/periphery/op-nft/OptimistInviter.t.sol
deleted file mode 100644
index 58e71a13a8d7..000000000000
--- a/packages/contracts-bedrock/test/periphery/op-nft/OptimistInviter.t.sol
+++ /dev/null
@@ -1,529 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
-
-// Testing utilities
-import { Test } from "forge-std/Test.sol";
-import { AttestationStation } from "src/periphery/op-nft/AttestationStation.sol";
-import { OptimistInviter } from "src/periphery/op-nft/OptimistInviter.sol";
-import { Optimist } from "src/periphery/op-nft/Optimist.sol";
-import { TestERC1271Wallet } from "test/mocks/TestERC1271Wallet.sol";
-import { OptimistInviterHelper } from "test/mocks/OptimistInviterHelper.sol";
-import { OptimistConstants } from "src/periphery/op-nft/libraries/OptimistConstants.sol";
-
-contract OptimistInviter_Initializer is Test {
-    event InviteClaimed(address indexed issuer, address indexed claimer);
-    event Initialized(uint8 version);
-    event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);
-    event AttestationCreated(address indexed creator, address indexed about, bytes32 indexed key, bytes val);
-
-    bytes32 EIP712_DOMAIN_TYPEHASH;
-
-    address internal alice_inviteGranter;
-    address internal sally;
-    address internal ted;
-    address internal eve;
-
-    address internal bob;
-    uint256 internal bobPrivateKey;
-    address internal carol;
-    uint256 internal carolPrivateKey;
-
-    TestERC1271Wallet carolERC1271Wallet;
-
-    AttestationStation attestationStation;
-    OptimistInviter optimistInviter;
-
-    OptimistInviterHelper optimistInviterHelper;
-
-    function setUp() public {
-        alice_inviteGranter = makeAddr("alice_inviteGranter");
-        sally = makeAddr("sally");
-        ted = makeAddr("ted");
-        eve = makeAddr("eve");
-
-        bobPrivateKey = 0xB0B0B0B0;
-        bob = vm.addr(bobPrivateKey);
-
-        carolPrivateKey = 0xC0C0C0C0;
-        carol = vm.addr(carolPrivateKey);
-
-        carolERC1271Wallet = new TestERC1271Wallet(carol);
-
-        // Give alice and bob and sally some ETH
-        vm.deal(alice_inviteGranter, 1 ether);
-        vm.deal(bob, 1 ether);
-        vm.deal(sally, 1 ether);
-        vm.deal(ted, 1 ether);
-        vm.deal(eve, 1 ether);
-
-        EIP712_DOMAIN_TYPEHASH =
-            keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)");
-
-        _initializeContracts();
-    }
-
-    /// @notice Instantiates an AttestationStation, and an OptimistInviter.
-    function _initializeContracts() internal {
-        attestationStation = new AttestationStation();
-
-        optimistInviter = new OptimistInviter(alice_inviteGranter, attestationStation);
-
-        vm.expectEmit(true, true, true, true, address(optimistInviter));
-        emit Initialized(1);
-        optimistInviter.initialize("OptimistInviter");
-
-        optimistInviterHelper = new OptimistInviterHelper(optimistInviter, "OptimistInviter");
-    }
-
-    function _passMinCommitmentPeriod() internal {
-        vm.warp(optimistInviter.MIN_COMMITMENT_PERIOD() + block.timestamp);
-    }
-
-    /// @notice Returns a user's current invite count, as stored in the AttestationStation.
-    function _getInviteCount(address _issuer) internal view returns (uint256) {
-        return optimistInviter.inviteCounts(_issuer);
-    }
-
-    /// @notice Returns true if claimer has the proper attestation from OptimistInviter to mint.
-    function _hasMintAttestation(address _claimer) internal view returns (bool) {
-        bytes memory attestation = attestationStation.attestations(
-            address(optimistInviter), _claimer, OptimistConstants.OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY
-        );
-        return attestation.length > 0;
-    }
-
-    /// @notice Get signature as a bytes blob, since SignatureChecker takes arbitrary signature blobs.
-    function _getSignature(uint256 _signingPrivateKey, bytes32 _digest) internal pure returns (bytes memory) {
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(_signingPrivateKey, _digest);
-
-        bytes memory signature = abi.encodePacked(r, s, v);
-        return signature;
-    }
-
-    /// @notice Signs a claimable invite with the given private key and returns the signature using
-    ///         correct EIP712 domain separator.
-    function _issueInviteAs(uint256 _privateKey)
-        internal
-        returns (OptimistInviter.ClaimableInvite memory, bytes memory)
-    {
-        return _issueInviteWithEIP712Domain(
-            _privateKey,
-            bytes("OptimistInviter"),
-            bytes(optimistInviter.EIP712_VERSION()),
-            block.chainid,
-            address(optimistInviter)
-        );
-    }
-
-    /// @notice Signs a claimable invite with the given private key and returns the signature using
-    ///         the given EIP712 domain separator. This assumes that the issuer's address is the
-    ///         corresponding public key to _issuerPrivateKey.
-    function _issueInviteWithEIP712Domain(
-        uint256 _issuerPrivateKey,
-        bytes memory _eip712Name,
-        bytes memory _eip712Version,
-        uint256 _eip712Chainid,
-        address _eip712VerifyingContract
-    )
-        internal
-        returns (OptimistInviter.ClaimableInvite memory, bytes memory)
-    {
-        address issuer = vm.addr(_issuerPrivateKey);
-        OptimistInviter.ClaimableInvite memory claimableInvite =
-            optimistInviterHelper.getClaimableInviteWithNewNonce(issuer);
-        return (
-            claimableInvite,
-            _getSignature(
-                _issuerPrivateKey,
-                optimistInviterHelper.getDigestWithEIP712Domain(
-                    claimableInvite, _eip712Name, _eip712Version, _eip712Chainid, _eip712VerifyingContract
-                )
-            )
-        );
-    }
-
-    /// @notice Commits a signature and claimer address to the OptimistInviter contract.
-    function _commitInviteAs(address _as, bytes memory _signature) internal {
-        vm.prank(_as);
-        bytes32 hashedSignature = keccak256(abi.encode(_as, _signature));
-        optimistInviter.commitInvite(hashedSignature);
-
-        // Check that the commitment was stored correctly
-        assertEq(optimistInviter.commitmentTimestamps(hashedSignature), block.timestamp);
-    }
-
-    /// @notice Signs a claimable invite with the given private key. The claimer commits then claims
-    ///         the invite. Checks that all expected events are emitted and that state is updated
-    ///         correctly. Returns the signature and invite for use in tests.
-    function _issueThenClaimShouldSucceed(
-        uint256 _issuerPrivateKey,
-        address _claimer
-    )
-        internal
-        returns (OptimistInviter.ClaimableInvite memory, bytes memory)
-    {
-        address issuer = vm.addr(_issuerPrivateKey);
-        uint256 prevInviteCount = _getInviteCount(issuer);
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) =
-            _issueInviteAs(_issuerPrivateKey);
-
-        _commitInviteAs(_claimer, signature);
-
-        // The hash(claimer ++ signature) should be committed
-        assertEq(optimistInviter.commitmentTimestamps(keccak256(abi.encode(_claimer, signature))), block.timestamp);
-
-        _passMinCommitmentPeriod();
-
-        // OptimistInviter should issue a new attestation allowing claimer to mint
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(
-            address(optimistInviter),
-            _claimer,
-            OptimistConstants.OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY,
-            abi.encode(issuer)
-        );
-
-        // Should emit an event indicating that the invite was claimed
-        vm.expectEmit(true, false, false, false, address(optimistInviter));
-        emit InviteClaimed(issuer, _claimer);
-
-        vm.prank(_claimer);
-        optimistInviter.claimInvite(_claimer, claimableInvite, signature);
-
-        // The nonce that issuer used should be marked as used
-        assertTrue(optimistInviter.usedNonces(issuer, claimableInvite.nonce));
-
-        // Issuer should have one less invite
-        assertEq(prevInviteCount - 1, _getInviteCount(issuer));
-
-        // Claimer should have the mint attestation from the OptimistInviter contract
-        assertTrue(_hasMintAttestation(_claimer));
-
-        return (claimableInvite, signature);
-    }
-
-    /// @notice Issues 3 invites to the given address. Checks that all expected events are emitted
-    ///         and that state is updated correctly.
-    function _grantInvitesTo(address _to) internal {
-        address[] memory addresses = new address[](1);
-        addresses[0] = _to;
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(
-            address(optimistInviter), _to, optimistInviter.CAN_INVITE_ATTESTATION_KEY(), bytes("true")
-        );
-
-        vm.prank(alice_inviteGranter);
-        optimistInviter.setInviteCounts(addresses, 3);
-
-        assertEq(_getInviteCount(_to), 3);
-    }
-}
-
-contract OptimistInviterTest is OptimistInviter_Initializer {
-    function test_initialize_succeeds() external view {
-        // expect attestationStation to be set
-        assertEq(address(optimistInviter.ATTESTATION_STATION()), address(attestationStation));
-        assertEq(optimistInviter.INVITE_GRANTER(), alice_inviteGranter);
-    }
-
-    /// @notice Alice the admin should be able to give Bob, Sally, and Carol 3 invites, and the
-    ///         OptimistInviter contract should increment invite counts on inviteCounts and issue
-    ///         'optimist.can-invite' attestations.
-    function test_grantInvites_adminAddingInvites_succeeds() external {
-        address[] memory addresses = new address[](3);
-        addresses[0] = bob;
-        addresses[1] = sally;
-        addresses[2] = address(carolERC1271Wallet);
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(
-            address(optimistInviter), bob, optimistInviter.CAN_INVITE_ATTESTATION_KEY(), bytes("true")
-        );
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(
-            address(optimistInviter), sally, optimistInviter.CAN_INVITE_ATTESTATION_KEY(), bytes("true")
-        );
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(
-            address(optimistInviter),
-            address(carolERC1271Wallet),
-            optimistInviter.CAN_INVITE_ATTESTATION_KEY(),
-            bytes("true")
-        );
-
-        vm.prank(alice_inviteGranter);
-        optimistInviter.setInviteCounts(addresses, 3);
-
-        assertEq(_getInviteCount(bob), 3);
-        assertEq(_getInviteCount(sally), 3);
-        assertEq(_getInviteCount(address(carolERC1271Wallet)), 3);
-    }
-
-    /// @notice Bob, who is not the invite granter, should not be able to issue invites.
-    function test_grantInvites_nonAdminAddingInvites_reverts() external {
-        address[] memory addresses = new address[](2);
-        addresses[0] = bob;
-        addresses[1] = sally;
-
-        vm.expectRevert("OptimistInviter: only invite granter can grant invites");
-        vm.prank(bob);
-        optimistInviter.setInviteCounts(addresses, 3);
-    }
-
-    /// @notice Sally should be able to commit an invite given by by Bob.
-    function test_commitInvite_committingForYourself_succeeds() external {
-        _grantInvitesTo(bob);
-        (, bytes memory signature) = _issueInviteAs(bobPrivateKey);
-
-        vm.prank(sally);
-        bytes32 hashedSignature = keccak256(abi.encode(sally, signature));
-        optimistInviter.commitInvite(hashedSignature);
-
-        assertEq(optimistInviter.commitmentTimestamps(hashedSignature), block.timestamp);
-    }
-
-    /// @notice Sally should be able to Bob's for a different claimer, Eve.
-    function test_commitInvite_committingForSomeoneElse_succeeds() external {
-        _grantInvitesTo(bob);
-        (, bytes memory signature) = _issueInviteAs(bobPrivateKey);
-
-        vm.prank(sally);
-        bytes32 hashedSignature = keccak256(abi.encode(eve, signature));
-        optimistInviter.commitInvite(hashedSignature);
-
-        assertEq(optimistInviter.commitmentTimestamps(hashedSignature), block.timestamp);
-    }
-
-    /// @notice Attempting to commit the same hash twice should revert. This prevents griefing.
-    function test_commitInvite_committingSameHashTwice_reverts() external {
-        _grantInvitesTo(bob);
-        (, bytes memory signature) = _issueInviteAs(bobPrivateKey);
-
-        vm.prank(sally);
-        bytes32 hashedSignature = keccak256(abi.encode(eve, signature));
-        optimistInviter.commitInvite(hashedSignature);
-
-        assertEq(optimistInviter.commitmentTimestamps(hashedSignature), block.timestamp);
-
-        vm.expectRevert("OptimistInviter: commitment already made");
-        optimistInviter.commitInvite(hashedSignature);
-    }
-
-    /// @notice Bob issues signature, and Sally claims the invite. Bob's invite count should be
-    ///         decremented, and Sally should be able to mint.
-    function test_claimInvite_succeeds() external {
-        _grantInvitesTo(bob);
-        _issueThenClaimShouldSucceed(bobPrivateKey, sally);
-    }
-
-    /// @notice Bob issues signature, and Ted commits the invite for Sally. Eve claims for Sally.
-    function test_claimInvite_claimForSomeoneElse_succeeds() external {
-        _grantInvitesTo(bob);
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) = _issueInviteAs(bobPrivateKey);
-
-        vm.prank(ted);
-        optimistInviter.commitInvite(keccak256(abi.encode(sally, signature)));
-        _passMinCommitmentPeriod();
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(
-            address(optimistInviter),
-            sally,
-            OptimistConstants.OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY,
-            abi.encode(bob)
-        );
-
-        // Should emit an event indicating that the invite was claimed
-        vm.expectEmit(true, true, true, true, address(optimistInviter));
-        emit InviteClaimed(bob, sally);
-
-        vm.prank(eve);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-
-        assertEq(_getInviteCount(bob), 2);
-        assertTrue(_hasMintAttestation(sally));
-        assertFalse(_hasMintAttestation(eve));
-    }
-
-    function test_claimInvite_claimBeforeMinCommitmentPeriod_reverts() external {
-        _grantInvitesTo(bob);
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) = _issueInviteAs(bobPrivateKey);
-
-        _commitInviteAs(sally, signature);
-
-        // Some time passes, but not enough to meet the minimum commitment period
-        vm.warp(block.timestamp + 10);
-
-        vm.expectRevert("OptimistInviter: minimum commitment period has not elapsed yet");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-    }
-
-    /// @notice Signature issued for previous versions of the contract should fail.
-    function test_claimInvite_usingSignatureIssuedForDifferentVersion_reverts() external {
-        _grantInvitesTo(bob);
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) = _issueInviteWithEIP712Domain(
-            bobPrivateKey, "OptimismInviter", "0.9.1", block.chainid, address(optimistInviter)
-        );
-
-        _commitInviteAs(sally, signature);
-        _passMinCommitmentPeriod();
-
-        vm.expectRevert("OptimistInviter: invalid signature");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-    }
-
-    /// @notice Replay attack for signature issued for contract on different chain (ie. mainnet)
-    ///         should fail.
-    function test_claimInvite_usingSignatureIssuedForDifferentChain_reverts() external {
-        _grantInvitesTo(bob);
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) = _issueInviteWithEIP712Domain(
-            bobPrivateKey, "OptimismInviter", bytes(optimistInviter.EIP712_VERSION()), 1, address(optimistInviter)
-        );
-
-        _commitInviteAs(sally, signature);
-        _passMinCommitmentPeriod();
-
-        vm.expectRevert("OptimistInviter: invalid signature");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-    }
-
-    /// @notice Replay attack for signature issued for instantiation of the OptimistInviter contract
-    ///         on a different address should fail.
-    function test_claimInvite_usingSignatureIssuedForDifferentContract_reverts() external {
-        _grantInvitesTo(bob);
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) = _issueInviteWithEIP712Domain(
-            bobPrivateKey, "OptimismInviter", bytes(optimistInviter.EIP712_VERSION()), block.chainid, address(0xBEEF)
-        );
-
-        _commitInviteAs(sally, signature);
-        _passMinCommitmentPeriod();
-
-        vm.expectRevert("OptimistInviter: invalid signature");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-    }
-
-    /// @notice Attempting to claim again using the same signature again should fail.
-    function test_claimInvite_replayingUsedNonce_reverts() external {
-        _grantInvitesTo(bob);
-
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) =
-            _issueThenClaimShouldSucceed(bobPrivateKey, sally);
-
-        // Sally tries to claim the invite using the same signature
-        vm.expectRevert("OptimistInviter: nonce has already been used");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-
-        // Carol tries to claim the invite using the same signature
-        _commitInviteAs(carol, signature);
-        _passMinCommitmentPeriod();
-
-        vm.expectRevert("OptimistInviter: nonce has already been used");
-        vm.prank(carol);
-        optimistInviter.claimInvite(carol, claimableInvite, signature);
-    }
-
-    /// @notice Issuing signatures through a contract that implements ERC1271 should succeed (ie.
-    ///         Gnosis Safe or other smart contract wallets). Carol is using a ERC1271 contract
-    ///         wallet that is simply backed by her private key.
-    function test_claimInvite_usingERC1271Wallet_succeeds() external {
-        _grantInvitesTo(address(carolERC1271Wallet));
-
-        OptimistInviter.ClaimableInvite memory claimableInvite =
-            optimistInviterHelper.getClaimableInviteWithNewNonce(address(carolERC1271Wallet));
-
-        bytes memory signature = _getSignature(carolPrivateKey, optimistInviterHelper.getDigest(claimableInvite));
-
-        // Sally tries to claim the invite
-        _commitInviteAs(sally, signature);
-        _passMinCommitmentPeriod();
-
-        vm.expectEmit(true, true, true, true, address(attestationStation));
-        emit AttestationCreated(
-            address(optimistInviter),
-            sally,
-            OptimistConstants.OPTIMIST_CAN_MINT_FROM_INVITE_ATTESTATION_KEY,
-            abi.encode(address(carolERC1271Wallet))
-        );
-
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-        assertEq(_getInviteCount(address(carolERC1271Wallet)), 2);
-    }
-
-    /// @notice Claimer must commit the signature before claiming the invite. Sally attempts to
-    ///         claim the Bob's invite without committing the signature first.
-    function test_claimInvite_withoutCommittingHash_reverts() external {
-        _grantInvitesTo(bob);
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) = _issueInviteAs(bobPrivateKey);
-
-        vm.expectRevert("OptimistInviter: claimer and signature have not been committed yet");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-    }
-
-    /// @notice Using a signature that doesn't correspond to the claimable invite should fail.
-    function test_claimInvite_withIncorrectSignature_reverts() external {
-        _grantInvitesTo(carol);
-        _grantInvitesTo(bob);
-        (OptimistInviter.ClaimableInvite memory bobClaimableInvite, bytes memory bobSignature) =
-            _issueInviteAs(bobPrivateKey);
-        (, bytes memory carolSignature) = _issueInviteAs(carolPrivateKey);
-
-        _commitInviteAs(sally, bobSignature);
-        _commitInviteAs(sally, carolSignature);
-
-        _passMinCommitmentPeriod();
-
-        vm.expectRevert("OptimistInviter: invalid signature");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, bobClaimableInvite, carolSignature);
-    }
-
-    /// @notice Attempting to use a signature from a issuer who never was granted invites should
-    ///         fail.
-    function test_claimInvite_whenIssuerNeverReceivedInvites_reverts() external {
-        // Bob was never granted any invites, but issues an invite for Eve
-        (OptimistInviter.ClaimableInvite memory claimableInvite, bytes memory signature) = _issueInviteAs(bobPrivateKey);
-
-        _commitInviteAs(sally, signature);
-        _passMinCommitmentPeriod();
-
-        vm.expectRevert("OptimistInviter: issuer has no invites");
-        vm.prank(sally);
-        optimistInviter.claimInvite(sally, claimableInvite, signature);
-    }
-
-    /// @notice Attempting to use a signature from a issuer who has no more invites should fail.
-    ///         Bob has 3 invites, but issues 4 invites for Sally, Carol, Ted, and Eve. Only the
-    ///         first 3 invites should be claimable. The last claimer, Eve, should not be able to
-    ///         claim the invite.
-    function test_claimInvite_whenIssuerHasNoInvitesLeft_reverts() external {
-        _grantInvitesTo(bob);
-
-        _issueThenClaimShouldSucceed(bobPrivateKey, sally);
-        _issueThenClaimShouldSucceed(bobPrivateKey, carol);
-        _issueThenClaimShouldSucceed(bobPrivateKey, ted);
-
-        assertEq(_getInviteCount(bob), 0);
-
-        (OptimistInviter.ClaimableInvite memory claimableInvite4, bytes memory signature4) =
-            _issueInviteAs(bobPrivateKey);
-
-        _commitInviteAs(eve, signature4);
-        _passMinCommitmentPeriod();
-
-        vm.expectRevert("OptimistInviter: issuer has no invites");
-        vm.prank(eve);
-        optimistInviter.claimInvite(eve, claimableInvite4, signature4);
-
-        assertEq(_getInviteCount(bob), 0);
-    }
-}

From 8a728cf72b17347c997f7495ec8938bfb97a8f13 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 20 Nov 2024 12:41:14 +0100
Subject: [PATCH 232/451] Sc/improve optimismportal test cov (#12962)

* improve optimismportal(2) test coverage

* improve optimismportal(2) test coverage

* more tests, fixes
---
 .../test/L1/OptimismPortal.t.sol              |  69 ++++++-
 .../test/L1/OptimismPortal2.t.sol             | 171 +++++++++++++++++-
 2 files changed, 234 insertions(+), 6 deletions(-)

diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index f19e7ca6f5c2..8172fb14b793 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -1006,7 +1006,10 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
             )
         );
 
-        uint256 bobBalanceBefore = address(bob).balance;
+        // Fund the portal so that we can withdraw ETH.
+        vm.store(address(optimismPortal), bytes32(uint256(61)), bytes32(uint256(0xFFFFFFFF)));
+        vm.deal(address(optimismPortal), 0xFFFFFFFF);
+        uint256 bobBalanceBefore = bob.balance;
 
         vm.expectEmit(true, true, true, true);
         emit WithdrawalProven(_withdrawalHash_noData, alice, bob);
@@ -1019,7 +1022,69 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
         emit WithdrawalFinalized(_withdrawalHash_noData, true);
         optimismPortal.finalizeWithdrawalTransaction(_defaultTx_noData);
 
-        assertEq(address(bob).balance, bobBalanceBefore + 100);
+        assertEq(bob.balance, bobBalanceBefore + 100);
+    }
+
+    /// @dev Tests that `finalizeWithdrawalTransaction` succeeds when _tx.data is empty and with a custom gas token.
+    function test_finalizeWithdrawalTransaction_noTxDataNonEtherGasToken_succeeds() external {
+        Types.WithdrawalTransaction memory _defaultTx_noData = Types.WithdrawalTransaction({
+            nonce: 0,
+            sender: alice,
+            target: bob,
+            value: 100,
+            gasLimit: 100_000,
+            data: hex""
+        });
+        // Get withdrawal proof data we can use for testing.
+        (
+            bytes32 _stateRoot_noData,
+            bytes32 _storageRoot_noData,
+            bytes32 _outputRoot_noData,
+            bytes32 _withdrawalHash_noData,
+            bytes[] memory _withdrawalProof_noData
+        ) = ffi.getProveWithdrawalTransactionInputs(_defaultTx_noData);
+        // Setup a dummy output root proof for reuse.
+        Types.OutputRootProof memory _outputRootProof_noData = Types.OutputRootProof({
+            version: bytes32(uint256(0)),
+            stateRoot: _stateRoot_noData,
+            messagePasserStorageRoot: _storageRoot_noData,
+            latestBlockhash: bytes32(uint256(0))
+        });
+
+        // Configure the oracle to return the output root we've prepared.
+        vm.mockCall(
+            address(l2OutputOracle),
+            abi.encodePacked(IL2OutputOracle.getL2Output.selector),
+            abi.encode(
+                Types.OutputProposal(
+                    _outputRoot_noData,
+                    l2OutputOracle.getL2Output(_proposedOutputIndex).timestamp,
+                    uint128(_proposedBlockNumber)
+                )
+            )
+        );
+
+        // Fund the portal so that we can withdraw ETH.
+        vm.store(address(optimismPortal), bytes32(uint256(61)), bytes32(uint256(0xFFFFFFFF)));
+        deal(address(L1Token), address(optimismPortal), 0xFFFFFFFF);
+        // modify the gas token to be non ether
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(L1Token), 18)
+        );
+        uint256 bobBalanceBefore = L1Token.balanceOf(bob);
+
+        vm.expectEmit(true, true, true, true);
+        emit WithdrawalProven(_withdrawalHash_noData, alice, bob);
+        optimismPortal.proveWithdrawalTransaction(
+            _defaultTx_noData, _proposedOutputIndex, _outputRootProof_noData, _withdrawalProof_noData
+        );
+
+        vm.warp(block.timestamp + l2OutputOracle.FINALIZATION_PERIOD_SECONDS() + 1);
+        vm.expectEmit(true, true, false, true);
+        emit WithdrawalFinalized(_withdrawalHash_noData, true);
+        optimismPortal.finalizeWithdrawalTransaction(_defaultTx_noData);
+
+        assertEq(L1Token.balanceOf(bob), bobBalanceBefore + 100);
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` reverts if the finalization period
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index d252609e5eea..083644755d3c 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -802,6 +802,169 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
         assert(address(bob).balance == bobBalanceBefore + 100);
     }
 
+    /// @dev Tests that `finalizeWithdrawalTransaction` reverts if the target reverts and caller is the
+    /// ESTIMATION_ADDRESS.
+    function test_finalizeWithdrawalTransaction_targetFailsAndCallerIsEstimationAddress_reverts() external {
+        vm.etch(bob, hex"fe"); // Contract with just the invalid opcode.
+
+        vm.prank(alice);
+        vm.expectEmit(true, true, true, true);
+        emit WithdrawalProven(_withdrawalHash, alice, bob);
+        optimismPortal2.proveWithdrawalTransaction(_defaultTx, _proposedGameIndex, _outputRootProof, _withdrawalProof);
+
+        // Warp and resolve the dispute game.
+        game.resolveClaim(0, 0);
+        game.resolve();
+        vm.warp(block.timestamp + optimismPortal2.proofMaturityDelaySeconds() + 1 seconds);
+
+        vm.startPrank(alice, Constants.ESTIMATION_ADDRESS);
+        vm.expectRevert(GasEstimation.selector);
+        optimismPortal2.finalizeWithdrawalTransaction(_defaultTx);
+    }
+
+    /// @dev Tests that `finalizeWithdrawalTransaction` succeeds when _tx.data is empty.
+    function test_finalizeWithdrawalTransaction_noTxData_succeeds() external {
+        Types.WithdrawalTransaction memory _defaultTx_noData = Types.WithdrawalTransaction({
+            nonce: 0,
+            sender: alice,
+            target: bob,
+            value: 100,
+            gasLimit: 100_000,
+            data: hex""
+        });
+        // Get withdrawal proof data we can use for testing.
+        (
+            bytes32 _stateRoot_noData,
+            bytes32 _storageRoot_noData,
+            bytes32 _outputRoot_noData,
+            bytes32 _withdrawalHash_noData,
+            bytes[] memory _withdrawalProof_noData
+        ) = ffi.getProveWithdrawalTransactionInputs(_defaultTx_noData);
+        // Setup a dummy output root proof for reuse.
+        Types.OutputRootProof memory _outputRootProof_noData = Types.OutputRootProof({
+            version: bytes32(uint256(0)),
+            stateRoot: _stateRoot_noData,
+            messagePasserStorageRoot: _storageRoot_noData,
+            latestBlockhash: bytes32(uint256(0))
+        });
+        uint256 _proposedBlockNumber_noData = 0xFF;
+        IFaultDisputeGame game_noData = IFaultDisputeGame(
+            payable(
+                address(
+                    disputeGameFactory.create(
+                        optimismPortal2.respectedGameType(),
+                        Claim.wrap(_outputRoot_noData),
+                        abi.encode(_proposedBlockNumber_noData)
+                    )
+                )
+            )
+        );
+        uint256 _proposedGameIndex_noData = disputeGameFactory.gameCount() - 1;
+        // Warp beyond the chess clocks and finalize the game.
+        vm.warp(block.timestamp + game_noData.maxClockDuration().raw() + 1 seconds);
+        // Fund the portal so that we can withdraw ETH.
+        vm.store(address(optimismPortal2), bytes32(uint256(61)), bytes32(uint256(0xFFFFFFFF)));
+        vm.deal(address(optimismPortal2), 0xFFFFFFFF);
+
+        uint256 bobBalanceBefore = bob.balance;
+
+        vm.expectEmit(address(optimismPortal2));
+        emit WithdrawalProven(_withdrawalHash_noData, alice, bob);
+        vm.expectEmit(address(optimismPortal2));
+        emit WithdrawalProvenExtension1(_withdrawalHash_noData, address(this));
+        optimismPortal2.proveWithdrawalTransaction({
+            _tx: _defaultTx_noData,
+            _disputeGameIndex: _proposedGameIndex_noData,
+            _outputRootProof: _outputRootProof_noData,
+            _withdrawalProof: _withdrawalProof_noData
+        });
+
+        // Warp and resolve the dispute game.
+        game_noData.resolveClaim(0, 0);
+        game_noData.resolve();
+        vm.warp(block.timestamp + optimismPortal2.proofMaturityDelaySeconds() + 1 seconds);
+
+        vm.expectEmit(true, true, false, true);
+        emit WithdrawalFinalized(_withdrawalHash_noData, true);
+        optimismPortal2.finalizeWithdrawalTransaction(_defaultTx_noData);
+
+        assert(bob.balance == bobBalanceBefore + 100);
+    }
+
+    /// @dev Tests that `finalizeWithdrawalTransaction` succeeds when _tx.data is empty and with a custom gas token.
+    function test_finalizeWithdrawalTransaction_noTxDataNonEtherGasToken_succeeds() external {
+        Types.WithdrawalTransaction memory _defaultTx_noData = Types.WithdrawalTransaction({
+            nonce: 0,
+            sender: alice,
+            target: bob,
+            value: 100,
+            gasLimit: 100_000,
+            data: hex""
+        });
+        // Get withdrawal proof data we can use for testing.
+        (
+            bytes32 _stateRoot_noData,
+            bytes32 _storageRoot_noData,
+            bytes32 _outputRoot_noData,
+            bytes32 _withdrawalHash_noData,
+            bytes[] memory _withdrawalProof_noData
+        ) = ffi.getProveWithdrawalTransactionInputs(_defaultTx_noData);
+        // Setup a dummy output root proof for reuse.
+        Types.OutputRootProof memory _outputRootProof_noData = Types.OutputRootProof({
+            version: bytes32(uint256(0)),
+            stateRoot: _stateRoot_noData,
+            messagePasserStorageRoot: _storageRoot_noData,
+            latestBlockhash: bytes32(uint256(0))
+        });
+        uint256 _proposedBlockNumber_noData = 0xFF;
+        IFaultDisputeGame game_noData = IFaultDisputeGame(
+            payable(
+                address(
+                    disputeGameFactory.create(
+                        optimismPortal2.respectedGameType(),
+                        Claim.wrap(_outputRoot_noData),
+                        abi.encode(_proposedBlockNumber_noData)
+                    )
+                )
+            )
+        );
+        uint256 _proposedGameIndex_noData = disputeGameFactory.gameCount() - 1;
+        // Warp beyond the chess clocks and finalize the game.
+        vm.warp(block.timestamp + game_noData.maxClockDuration().raw() + 1 seconds);
+        // Fund the portal so that we can withdraw ETH.
+        vm.store(address(optimismPortal2), bytes32(uint256(61)), bytes32(uint256(0xFFFFFFFF)));
+        deal(address(L1Token), address(optimismPortal2), 0xFFFFFFFF);
+
+        // modify the gas token to be non ether
+        vm.mockCall(
+            address(systemConfig), abi.encodeCall(systemConfig.gasPayingToken, ()), abi.encode(address(L1Token), 18)
+        );
+
+        uint256 bobBalanceBefore = L1Token.balanceOf(bob);
+
+        vm.expectEmit(address(optimismPortal2));
+        emit WithdrawalProven(_withdrawalHash_noData, alice, bob);
+        vm.expectEmit(address(optimismPortal2));
+        emit WithdrawalProvenExtension1(_withdrawalHash_noData, address(this));
+        optimismPortal2.proveWithdrawalTransaction({
+            _tx: _defaultTx_noData,
+            _disputeGameIndex: _proposedGameIndex_noData,
+            _outputRootProof: _outputRootProof_noData,
+            _withdrawalProof: _withdrawalProof_noData
+        });
+
+        // Warp and resolve the dispute game.
+        game_noData.resolveClaim(0, 0);
+        game_noData.resolve();
+        vm.warp(block.timestamp + optimismPortal2.proofMaturityDelaySeconds() + 1 seconds);
+
+        vm.expectEmit(true, true, false, true);
+        emit WithdrawalFinalized(_withdrawalHash_noData, true);
+        optimismPortal2.finalizeWithdrawalTransaction(_defaultTx_noData);
+
+        assert(L1Token.balanceOf(bob) == bobBalanceBefore + 100);
+    }
+
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
     function test_finalizeWithdrawalTransaction_provenWithdrawalHashEther_succeeds() external {
         uint256 bobBalanceBefore = address(bob).balance;
@@ -1575,7 +1738,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         );
 
         // Deposit the token into the portal
-        optimismPortal.depositERC20Transaction(_to, _mint, _value, _gasLimit, _isCreation, _data);
+        optimismPortal2.depositERC20Transaction(_to, _mint, _value, _gasLimit, _isCreation, _data);
 
         // Assert final balance equals the deposited amount
         assertEq(token.balanceOf(address(optimismPortal2)), _mint);
@@ -1657,7 +1820,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         );
 
         // Mock the token balance
-        vm.mockCall(address(token), abi.encodeCall(token.balanceOf, (address(optimismPortal))), abi.encode(0));
+        vm.mockCall(address(token), abi.encodeCall(token.balanceOf, (address(optimismPortal2))), abi.encode(0));
 
         // Call minimumGasLimit(0) before vm.expectRevert to ensure vm.expectRevert is for depositERC20Transaction
         uint64 gasLimit = optimismPortal2.minimumGasLimit(0);
@@ -1723,7 +1886,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         );
 
         // Deposit the token into the portal
-        optimismPortal2.depositERC20Transaction(address(0), _amount, 0, optimismPortal.minimumGasLimit(0), false, "");
+        optimismPortal2.depositERC20Transaction(address(0), _amount, 0, optimismPortal2.minimumGasLimit(0), false, "");
 
         // Check that the balance has been correctly updated
         assertEq(optimismPortal2.balance(), _amount);
@@ -1742,7 +1905,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
 
         // Deposit the token into the portal
         optimismPortal2.depositERC20Transaction(
-            address(bob), _defaultTx.value, 0, optimismPortal.minimumGasLimit(0), false, ""
+            address(bob), _defaultTx.value, 0, optimismPortal2.minimumGasLimit(0), false, ""
         );
 
         assertEq(optimismPortal2.balance(), _defaultTx.value);

From ca101a9ac3320265d4f68d28865fe1daed7e91a0 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 20 Nov 2024 12:42:40 +0100
Subject: [PATCH 233/451] improve dispute game tests and coverage (#12972)

* improve dispute game tests and coverage

* fixes
---
 .../test/dispute/FaultDisputeGame.t.sol       | 23 ++++++++
 .../dispute/PermissionedDisputeGame.t.sol     | 55 +++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
index 88e361a80b45..70aad007e402 100644
--- a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
@@ -449,6 +449,17 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
         gameProxy.initialize();
     }
 
+    /// @dev Tests that startingOutputRoot and it's getters are set correctly.
+    function test_startingOutputRootGetters_succeeds() public view {
+        (Hash root, uint256 l2BlockNumber) = gameProxy.startingOutputRoot();
+        (Hash anchorRoot, uint256 anchorRootBlockNumber) = anchorStateRegistry.anchors(GAME_TYPE);
+
+        assertEq(gameProxy.startingBlockNumber(), l2BlockNumber);
+        assertEq(gameProxy.startingBlockNumber(), anchorRootBlockNumber);
+        assertEq(Hash.unwrap(gameProxy.startingRootHash()), Hash.unwrap(root));
+        assertEq(Hash.unwrap(gameProxy.startingRootHash()), Hash.unwrap(anchorRoot));
+    }
+
     /// @dev Tests that the user cannot control the first 4 bytes of the CWIA data, disallowing them to control the
     ///      entrypoint when no calldata is provided to a call.
     function test_cwiaCalldata_userCannotControlSelector_succeeds() public {
@@ -1986,6 +1997,18 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
         assertEq(datLen, expectedLen);
     }
 
+    /// @dev Tests that if the game is not in progress, querying of `getChallengerDuration` reverts
+    function test_getChallengerDuration_gameNotInProgress_reverts() public {
+        // resolve the game
+        vm.warp(block.timestamp + gameProxy.maxClockDuration().raw());
+
+        gameProxy.resolveClaim(0, 0);
+        gameProxy.resolve();
+
+        vm.expectRevert(GameNotInProgress.selector);
+        gameProxy.getChallengerDuration(1);
+    }
+
     /// @dev Static unit test asserting that resolveClaim isn't possible if there's time
     ///      left for a counter.
     function test_resolution_lastSecondDisputes_succeeds() public {
diff --git a/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
index 698d8a0bd1f4..99b70b9c6dff 100644
--- a/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
@@ -198,6 +198,61 @@ contract PermissionedDisputeGame_Test is PermissionedDisputeGame_Init {
         vm.stopPrank();
     }
 
+    /// @dev Tests that step works properly.
+    function test_step_succeeds() public {
+        // Give the test contract some ether
+        vm.deal(CHALLENGER, 1_000 ether);
+
+        vm.startPrank(CHALLENGER, CHALLENGER);
+
+        // Make claims all the way down the tree.
+        (,,,, Claim disputed,,) = gameProxy.claimData(0);
+        gameProxy.attack{ value: _getRequiredBond(0) }(disputed, 0, _dummyClaim());
+        (,,,, disputed,,) = gameProxy.claimData(1);
+        gameProxy.attack{ value: _getRequiredBond(1) }(disputed, 1, _dummyClaim());
+        (,,,, disputed,,) = gameProxy.claimData(2);
+        gameProxy.attack{ value: _getRequiredBond(2) }(disputed, 2, _dummyClaim());
+        (,,,, disputed,,) = gameProxy.claimData(3);
+        gameProxy.attack{ value: _getRequiredBond(3) }(disputed, 3, _dummyClaim());
+        (,,,, disputed,,) = gameProxy.claimData(4);
+        gameProxy.attack{ value: _getRequiredBond(4) }(disputed, 4, _changeClaimStatus(_dummyClaim(), VMStatuses.PANIC));
+        (,,,, disputed,,) = gameProxy.claimData(5);
+        gameProxy.attack{ value: _getRequiredBond(5) }(disputed, 5, _dummyClaim());
+        (,,,, disputed,,) = gameProxy.claimData(6);
+        gameProxy.attack{ value: _getRequiredBond(6) }(disputed, 6, _dummyClaim());
+        (,,,, disputed,,) = gameProxy.claimData(7);
+        gameProxy.attack{ value: _getRequiredBond(7) }(disputed, 7, _dummyClaim());
+
+        // Verify game state before step
+        assertEq(uint256(gameProxy.status()), uint256(GameStatus.IN_PROGRESS));
+
+        gameProxy.addLocalData(LocalPreimageKey.DISPUTED_L2_BLOCK_NUMBER, 8, 0);
+        gameProxy.step(8, true, absolutePrestateData, hex"");
+
+        vm.warp(block.timestamp + gameProxy.maxClockDuration().raw() + 1);
+        gameProxy.resolveClaim(8, 0);
+        gameProxy.resolveClaim(7, 0);
+        gameProxy.resolveClaim(6, 0);
+        gameProxy.resolveClaim(5, 0);
+        gameProxy.resolveClaim(4, 0);
+        gameProxy.resolveClaim(3, 0);
+        gameProxy.resolveClaim(2, 0);
+        gameProxy.resolveClaim(1, 0);
+
+        gameProxy.resolveClaim(0, 0);
+        gameProxy.resolve();
+
+        assertEq(uint256(gameProxy.status()), uint256(GameStatus.CHALLENGER_WINS));
+        assertEq(gameProxy.resolvedAt().raw(), block.timestamp);
+        (, address counteredBy,,,,,) = gameProxy.claimData(0);
+        assertEq(counteredBy, CHALLENGER);
+    }
+
+    /// @dev Helper to return a pseudo-random claim
+    function _dummyClaim() internal view returns (Claim) {
+        return Claim.wrap(keccak256(abi.encode(gasleft())));
+    }
+
     /// @dev Helper to get the required bond for the given claim index.
     function _getRequiredBond(uint256 _claimIndex) internal view returns (uint256 bond_) {
         (,,,,, Position parent,) = gameProxy.claimData(_claimIndex);

From ab77ae700389482fd4d5829c2125b343a428da20 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Wed, 20 Nov 2024 21:25:04 +0800
Subject: [PATCH 234/451] add challenger account to wallets.sh (#12998)

---
 .../contracts-bedrock/scripts/getting-started/wallets.sh   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/contracts-bedrock/scripts/getting-started/wallets.sh b/packages/contracts-bedrock/scripts/getting-started/wallets.sh
index 1d3ebfc6bbd5..36a707c431cc 100755
--- a/packages/contracts-bedrock/scripts/getting-started/wallets.sh
+++ b/packages/contracts-bedrock/scripts/getting-started/wallets.sh
@@ -10,18 +10,21 @@ wallet1=$(cast wallet new)
 wallet2=$(cast wallet new)
 wallet3=$(cast wallet new)
 wallet4=$(cast wallet new)
+wallet5=$(cast wallet new)
 
 # Grab wallet addresses
 address1=$(echo "$wallet1" | awk '/Address/ { print $2 }')
 address2=$(echo "$wallet2" | awk '/Address/ { print $2 }')
 address3=$(echo "$wallet3" | awk '/Address/ { print $2 }')
 address4=$(echo "$wallet4" | awk '/Address/ { print $2 }')
+address5=$(echo "$wallet5" | awk '/Address/ { print $2 }')
 
 # Grab wallet private keys
 key1=$(echo "$wallet1" | awk '/Private key/ { print $3 }')
 key2=$(echo "$wallet2" | awk '/Private key/ { print $3 }')
 key3=$(echo "$wallet3" | awk '/Private key/ { print $3 }')
 key4=$(echo "$wallet4" | awk '/Private key/ { print $3 }')
+key5=$(echo "$wallet5" | awk '/Private key/ { print $3 }')
 
 # Print out the environment variables to copy
 echo "# Copy the following into your .envrc file:"
@@ -41,3 +44,7 @@ echo
 echo "# Sequencer account"
 echo "export GS_SEQUENCER_ADDRESS=$address4"
 echo "export GS_SEQUENCER_PRIVATE_KEY=$key4"
+echo
+echo "# Challenger account"
+echo "export GS_CHALLENGER_ADDRESS=$address5"
+echo "export GS_CHALLENGER_PRIVATE_KEY=$key5"

From d728f26819f91b129df7863a5e20b9635e08a546 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 13:25:41 +0000
Subject: [PATCH 235/451] dependabot(gomod): bump
 github.com/kurtosis-tech/kurtosis/api/golang (#12983)

Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kurtosis-tech/kurtosis/compare/1.4.1...1.4.2)

---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 4fb2c9053db5..5454732a74a0 100644
--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/klauspost/compress v1.17.11
-	github.com/kurtosis-tech/kurtosis/api/golang v1.4.1
+	github.com/kurtosis-tech/kurtosis/api/golang v1.4.2
 	github.com/libp2p/go-libp2p v0.36.2
 	github.com/libp2p/go-libp2p-mplex v0.9.0
 	github.com/libp2p/go-libp2p-pubsub v0.12.0
diff --git a/go.sum b/go.sum
index 7efcb5da40bd..60b90554c2e8 100644
--- a/go.sum
+++ b/go.sum
@@ -440,8 +440,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2 h1:izciXrFyFR+ihJ7nLTOkoIX5GzBPIp8gVKlw94gIc98=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2/go.mod h1:bWSMQK3WHVTGHX9CjxPAb/LtzcmfOxID2wdzakSWQxo=
-github.com/kurtosis-tech/kurtosis/api/golang v1.4.1 h1:V/T5k7t1iKgFof1cGhyLh396YKdTehUqO97AsTPDy+k=
-github.com/kurtosis-tech/kurtosis/api/golang v1.4.1/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.2 h1:x9jpXBGuLTWuILVUZWZtgDYY9amhyhzRVHxDFlYEJB4=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.2/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b h1:hMoIM99QKcYQqsnK4AF7Lovi9ZD9ac6lZLZ5D/jx2x8=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b/go.mod h1:4pFdrRwDz5R+Fov2ZuTaPhAVgjA2jhGh1Izf832sX7A=
 github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc h1:7IlEpSehmWcNXOFpNP24Cu5HQI3af7GCBQw//m+LnvQ=

From f2056c031ece39c681fa3e9e3690b958faf029fd Mon Sep 17 00:00:00 2001
From: Joshua Gutow <jgutow@oplabs.co>
Date: Wed, 20 Nov 2024 05:29:35 -0800
Subject: [PATCH 236/451] op-node: Add Metrics (#12408)

* op-node: Create metrics to record if sequencer is active

* op-node: Update transactions_sequenced_total metric

---------

Co-authored-by: protolambda <proto@protolambda.com>
---
 op-node/metrics/metrics.go             | 34 ++++++++++++++++++++------
 op-node/node/config_persistence.go     |  1 +
 op-node/rollup/driver/driver.go        |  1 +
 op-node/rollup/engine/build_seal.go    |  5 ++--
 op-node/rollup/engine/events.go        |  2 +-
 op-node/rollup/sequencing/sequencer.go |  4 +++
 op-service/testutils/metrics.go        |  2 +-
 7 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/op-node/metrics/metrics.go b/op-node/metrics/metrics.go
index 88d8c4d0caa3..6e1b664eca2b 100644
--- a/op-node/metrics/metrics.go
+++ b/op-node/metrics/metrics.go
@@ -35,6 +35,7 @@ type Metricer interface {
 	RecordRPCClientRequest(method string) func(err error)
 	RecordRPCClientResponse(method string, err error)
 	SetDerivationIdle(status bool)
+	SetSequencerState(active bool)
 	RecordPipelineReset()
 	RecordSequencingError()
 	RecordPublishingError()
@@ -48,7 +49,7 @@ type Metricer interface {
 	RecordL2Ref(name string, ref eth.L2BlockRef)
 	RecordUnsafePayloadsBuffer(length uint64, memSize uint64, next eth.BlockID)
 	RecordDerivedBatches(batchType string)
-	CountSequencedTxs(count int)
+	CountSequencedTxsInBlock(txns int, deposits int)
 	RecordL1ReorgDepth(d uint64)
 	RecordSequencerInconsistentL1Origin(from eth.BlockID, to eth.BlockID)
 	RecordSequencerReset()
@@ -94,6 +95,7 @@ type Metrics struct {
 	DerivationErrors *metrics.Event
 	SequencingErrors *metrics.Event
 	PublishingErrors *metrics.Event
+	SequencerActive  prometheus.Gauge
 
 	EmittedEvents   *prometheus.CounterVec
 	ProcessedEvents *prometheus.CounterVec
@@ -133,7 +135,7 @@ type Metrics struct {
 
 	L1ReorgDepth prometheus.Histogram
 
-	TransactionsSequencedTotal prometheus.Counter
+	TransactionsSequencedTotal *prometheus.CounterVec
 
 	AltDAMetrics altda.Metricer
 
@@ -209,6 +211,11 @@ func NewMetrics(procName string) *Metrics {
 		DerivationErrors: metrics.NewEvent(factory, ns, "", "derivation_errors", "derivation errors"),
 		SequencingErrors: metrics.NewEvent(factory, ns, "", "sequencing_errors", "sequencing errors"),
 		PublishingErrors: metrics.NewEvent(factory, ns, "", "publishing_errors", "p2p publishing errors"),
+		SequencerActive: factory.NewGauge(prometheus.GaugeOpts{
+			Namespace: ns,
+			Name:      "sequencer_active",
+			Help:      "1 if sequencer active, 0 otherwise",
+		}),
 
 		EmittedEvents: factory.NewCounterVec(
 			prometheus.CounterOpts{
@@ -261,12 +268,11 @@ func NewMetrics(procName string) *Metrics {
 			Help:      "Histogram of L1 Reorg Depths",
 		}),
 
-		TransactionsSequencedTotal: factory.NewGauge(prometheus.GaugeOpts{
+		TransactionsSequencedTotal: factory.NewCounterVec(prometheus.CounterOpts{
 			Namespace: ns,
 			Name:      "transactions_sequenced_total",
 			Help:      "Count of total transactions sequenced",
-		}),
-
+		}, []string{"type"}),
 		PeerCount: factory.NewGauge(prometheus.GaugeOpts{
 			Namespace: ns,
 			Subsystem: "p2p",
@@ -470,6 +476,14 @@ func (m *Metrics) SetDerivationIdle(status bool) {
 	m.DerivationIdle.Set(val)
 }
 
+func (m *Metrics) SetSequencerState(active bool) {
+	var val float64
+	if active {
+		val = 1
+	}
+	m.SequencerActive.Set(val)
+}
+
 func (m *Metrics) RecordPipelineReset() {
 	m.PipelineResets.Record()
 }
@@ -516,8 +530,9 @@ func (m *Metrics) RecordDerivedBatches(batchType string) {
 	m.DerivedBatches.Record(batchType)
 }
 
-func (m *Metrics) CountSequencedTxs(count int) {
-	m.TransactionsSequencedTotal.Add(float64(count))
+func (m *Metrics) CountSequencedTxsInBlock(txns int, deposits int) {
+	m.TransactionsSequencedTotal.WithLabelValues("deposits").Add(float64(deposits))
+	m.TransactionsSequencedTotal.WithLabelValues("txns").Add(float64(txns - deposits))
 }
 
 func (m *Metrics) RecordL1ReorgDepth(d uint64) {
@@ -686,6 +701,9 @@ func (n *noopMetricer) RecordUp() {
 func (n *noopMetricer) SetDerivationIdle(status bool) {
 }
 
+func (m *noopMetricer) SetSequencerState(active bool) {
+}
+
 func (n *noopMetricer) RecordPipelineReset() {
 }
 
@@ -725,7 +743,7 @@ func (n *noopMetricer) RecordUnsafePayloadsBuffer(length uint64, memSize uint64,
 func (n *noopMetricer) RecordDerivedBatches(batchType string) {
 }
 
-func (n *noopMetricer) CountSequencedTxs(count int) {
+func (n *noopMetricer) CountSequencedTxsInBlock(txns int, deposits int) {
 }
 
 func (n *noopMetricer) RecordL1ReorgDepth(d uint64) {
diff --git a/op-node/node/config_persistence.go b/op-node/node/config_persistence.go
index 7a30c11b9c9c..3f2b8b47537e 100644
--- a/op-node/node/config_persistence.go
+++ b/op-node/node/config_persistence.go
@@ -55,6 +55,7 @@ func (p *ActiveConfigPersistence) SequencerStopped() error {
 func (p *ActiveConfigPersistence) persist(sequencerStarted bool) error {
 	p.lock.Lock()
 	defer p.lock.Unlock()
+
 	data, err := json.Marshal(persistedState{SequencerStarted: &sequencerStarted})
 	if err != nil {
 		return fmt.Errorf("marshall new config: %w", err)
diff --git a/op-node/rollup/driver/driver.go b/op-node/rollup/driver/driver.go
index 1fd751846cf3..01a05fe2b538 100644
--- a/op-node/rollup/driver/driver.go
+++ b/op-node/rollup/driver/driver.go
@@ -49,6 +49,7 @@ type Metrics interface {
 	RecordUnsafePayloadsBuffer(length uint64, memSize uint64, next eth.BlockID)
 
 	SetDerivationIdle(idle bool)
+	SetSequencerState(active bool)
 
 	RecordL1ReorgDepth(d uint64)
 
diff --git a/op-node/rollup/engine/build_seal.go b/op-node/rollup/engine/build_seal.go
index b292681e13f1..25c1d95b8e7d 100644
--- a/op-node/rollup/engine/build_seal.go
+++ b/op-node/rollup/engine/build_seal.go
@@ -110,10 +110,11 @@ func (eq *EngDeriver) onBuildSeal(ev BuildSealEvent) {
 	eq.metrics.RecordSequencerBuildingDiffTime(buildTime - time.Duration(eq.cfg.BlockTime)*time.Second)
 
 	txnCount := len(envelope.ExecutionPayload.Transactions)
-	eq.metrics.CountSequencedTxs(txnCount)
+	depositCount, _ := lastDeposit(envelope.ExecutionPayload.Transactions)
+	eq.metrics.CountSequencedTxsInBlock(txnCount, depositCount)
 
 	eq.log.Debug("Processed new L2 block", "l2_unsafe", ref, "l1_origin", ref.L1Origin,
-		"txs", txnCount, "time", ref.Time, "seal_time", sealTime, "build_time", buildTime)
+		"txs", txnCount, "deposits", depositCount, "time", ref.Time, "seal_time", sealTime, "build_time", buildTime)
 
 	eq.emitter.Emit(BuildSealedEvent{
 		Concluding:  ev.Concluding,
diff --git a/op-node/rollup/engine/events.go b/op-node/rollup/engine/events.go
index bb4499564875..b6ba85cbcbe7 100644
--- a/op-node/rollup/engine/events.go
+++ b/op-node/rollup/engine/events.go
@@ -15,7 +15,7 @@ import (
 )
 
 type Metrics interface {
-	CountSequencedTxs(count int)
+	CountSequencedTxsInBlock(txns int, deposits int)
 
 	RecordSequencerBuildingDiffTime(duration time.Duration)
 	RecordSequencerSealingTime(duration time.Duration)
diff --git a/op-node/rollup/sequencing/sequencer.go b/op-node/rollup/sequencing/sequencer.go
index b6605d601fa7..e8b7033273ed 100644
--- a/op-node/rollup/sequencing/sequencer.go
+++ b/op-node/rollup/sequencing/sequencer.go
@@ -33,6 +33,7 @@ type L1OriginSelectorIface interface {
 }
 
 type Metrics interface {
+	SetSequencerState(active bool)
 	RecordSequencerInconsistentL1Origin(from eth.BlockID, to eth.BlockID)
 	RecordSequencerReset()
 	RecordSequencingError()
@@ -619,6 +620,7 @@ func (d *Sequencer) Init(ctx context.Context, active bool) error {
 	if active {
 		return d.forceStart()
 	} else {
+		d.metrics.SetSequencerState(false)
 		if err := d.listener.SequencerStopped(); err != nil {
 			return fmt.Errorf("failed to notify sequencer-state listener of initial stopped state: %w", err)
 		}
@@ -652,6 +654,7 @@ func (d *Sequencer) forceStart() error {
 	d.nextActionOK = true
 	d.nextAction = d.timeNow()
 	d.active.Store(true)
+	d.metrics.SetSequencerState(true)
 	d.log.Info("Sequencer has been started", "next action", d.nextAction)
 	return nil
 }
@@ -697,6 +700,7 @@ func (d *Sequencer) Stop(ctx context.Context) (common.Hash, error) {
 
 	d.nextActionOK = false
 	d.active.Store(false)
+	d.metrics.SetSequencerState(false)
 	d.log.Info("Sequencer has been stopped")
 	return d.latestHead.Hash, nil
 }
diff --git a/op-service/testutils/metrics.go b/op-service/testutils/metrics.go
index 421d32f2109c..25edee14a068 100644
--- a/op-service/testutils/metrics.go
+++ b/op-service/testutils/metrics.go
@@ -17,7 +17,7 @@ type TestDerivationMetrics struct {
 	FnRecordChannelTimedOut   func()
 }
 
-func (t *TestDerivationMetrics) CountSequencedTxs(count int) {
+func (t *TestDerivationMetrics) CountSequencedTxsInBlock(txns int, deposits int) {
 }
 
 func (t *TestDerivationMetrics) RecordSequencerBuildingDiffTime(duration time.Duration) {

From 0bfa930562bb6924cacf38b40ba3f26240937c47 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Thu, 21 Nov 2024 00:56:05 +0800
Subject: [PATCH 237/451] fix create2 collision (#12852)

---
 packages/contracts-bedrock/scripts/deploy/Deploy.s.sol | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 26ef385c2f90..6dc6a8bb90bf 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -384,6 +384,7 @@ contract Deploy is Deployer {
         );
         dii.set(dii.superchainConfigProxy.selector, mustGetAddress("SuperchainConfigProxy"));
         dii.set(dii.protocolVersionsProxy.selector, mustGetAddress("ProtocolVersionsProxy"));
+        dii.set(dii.salt.selector, _implSalt());
 
         if (_isInterop) {
             di = DeployImplementations(new DeployImplementationsInterop());

From b05ec5af2d8009d965cbd22eca6812c47a84d36a Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 20 Nov 2024 10:17:05 -0700
Subject: [PATCH 238/451] op-deployer: Safety and validation improvements
 (#12993)

- Enables support for deploying tagged versions against new chains, but behind a huge warning that requires user input to bypass. Since our tagged release versions do not contain all implementations, using op-deployer in this way will deploy contracts that haven't been governance approved. Since this workflow is useful for development but bad for prod, I've added support for it but users have to bypass a large warning that describes the risks.
- Validates the hashes of tagged version artifacts after downloading them. This prevents users from downloading tampered versions of the artifacts from GCS.
---
 .../pkg/deployer/artifacts/downloader.go      | 51 ++++++++++++++-
 .../pkg/deployer/artifacts/downloader_test.go | 61 +++++++++++++++---
 .../pkg/deployer/broadcaster/gas_estimator.go | 20 +++++-
 .../deployer/integration_test/apply_test.go   | 63 +++++++++++++++----
 .../pkg/deployer/pipeline/implementations.go  |  8 ++-
 op-deployer/pkg/deployer/pipeline/init.go     | 53 ++++++++++++++--
 op-deployer/pkg/deployer/standard/standard.go | 11 ++++
 .../pkg/deployer/state/deploy_config.go       |  5 ++
 op-service/testutils/anvil/anvil.go           |  2 +
 9 files changed, 238 insertions(+), 36 deletions(-)

diff --git a/op-deployer/pkg/deployer/artifacts/downloader.go b/op-deployer/pkg/deployer/artifacts/downloader.go
index 1303adbe86aa..7e566952e09a 100644
--- a/op-deployer/pkg/deployer/artifacts/downloader.go
+++ b/op-deployer/pkg/deployer/artifacts/downloader.go
@@ -3,8 +3,10 @@ package artifacts
 import (
 	"archive/tar"
 	"bufio"
+	"bytes"
 	"compress/gzip"
 	"context"
+	"crypto/sha256"
 	"errors"
 	"fmt"
 	"io"
@@ -15,6 +17,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 
 	"github.com/ethereum/go-ethereum/log"
@@ -41,15 +45,50 @@ func LogProgressor(lgr log.Logger) DownloadProgressor {
 func Download(ctx context.Context, loc *Locator, progress DownloadProgressor) (foundry.StatDirFs, CleanupFunc, error) {
 	var u *url.URL
 	var err error
+	var checker integrityChecker
 	if loc.IsTag() {
 		u, err = standard.ArtifactsURLForTag(loc.Tag)
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to get standard artifacts URL for tag %s: %w", loc.Tag, err)
 		}
+
+		hash, err := standard.ArtifactsHashForTag(loc.Tag)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to get standard artifacts hash for tag %s: %w", loc.Tag, err)
+		}
+
+		checker = &hashIntegrityChecker{hash: hash}
 	} else {
 		u = loc.URL
+		checker = &noopIntegrityChecker{}
 	}
 
+	return downloadURL(ctx, u, progress, checker)
+}
+
+type integrityChecker interface {
+	CheckIntegrity(data []byte) error
+}
+
+type hashIntegrityChecker struct {
+	hash common.Hash
+}
+
+func (h *hashIntegrityChecker) CheckIntegrity(data []byte) error {
+	hash := sha256.Sum256(data)
+	if hash != h.hash {
+		return fmt.Errorf("integrity check failed - expected: %x, got: %x", h.hash, hash)
+	}
+	return nil
+}
+
+type noopIntegrityChecker struct{}
+
+func (noopIntegrityChecker) CheckIntegrity(data []byte) error {
+	return nil
+}
+
+func downloadURL(ctx context.Context, u *url.URL, progress DownloadProgressor, checker integrityChecker) (foundry.StatDirFs, CleanupFunc, error) {
 	switch u.Scheme {
 	case "http", "https":
 		req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
@@ -78,7 +117,16 @@ func Download(ctx context.Context, loc *Locator, progress DownloadProgressor) (f
 			total:    resp.ContentLength,
 		}
 
-		gr, err := gzip.NewReader(pr)
+		data, err := io.ReadAll(pr)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to read response body: %w", err)
+		}
+
+		if err := checker.CheckIntegrity(data); err != nil {
+			return nil, nil, fmt.Errorf("failed to check integrity: %w", err)
+		}
+
+		gr, err := gzip.NewReader(bytes.NewReader(data))
 		if err != nil {
 			return nil, nil, fmt.Errorf("failed to create gzip reader: %w", err)
 		}
@@ -111,7 +159,6 @@ type progressReader struct {
 }
 
 func (pr *progressReader) Read(p []byte) (int, error) {
-
 	n, err := pr.r.Read(p)
 	pr.curr += int64(n)
 	if pr.progress != nil && time.Since(pr.lastPrint) > 1*time.Second {
diff --git a/op-deployer/pkg/deployer/artifacts/downloader_test.go b/op-deployer/pkg/deployer/artifacts/downloader_test.go
index e66b41f96a81..cf4ef4742c94 100644
--- a/op-deployer/pkg/deployer/artifacts/downloader_test.go
+++ b/op-deployer/pkg/deployer/artifacts/downloader_test.go
@@ -9,10 +9,12 @@ import (
 	"os"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/common"
+
 	"github.com/stretchr/testify/require"
 )
 
-func TestDownloadArtifacts(t *testing.T) {
+func TestDownloadArtifacts_MockArtifacts(t *testing.T) {
 	f, err := os.OpenFile("testdata/artifacts.tar.gz", os.O_RDONLY, 0o644)
 	require.NoError(t, err)
 	defer f.Close()
@@ -21,6 +23,9 @@ func TestDownloadArtifacts(t *testing.T) {
 		w.WriteHeader(http.StatusOK)
 		_, err := io.Copy(w, f)
 		require.NoError(t, err)
+		// Seek to beginning of file for next request
+		_, err = f.Seek(0, 0)
+		require.NoError(t, err)
 	}))
 	defer ts.Close()
 
@@ -31,14 +36,50 @@ func TestDownloadArtifacts(t *testing.T) {
 		URL: artifactsURL,
 	}
 
-	fs, cleanup, err := Download(ctx, loc, nil)
-	require.NoError(t, err)
-	require.NotNil(t, fs)
-	defer func() {
-		require.NoError(t, cleanup())
-	}()
+	t.Run("success", func(t *testing.T) {
+		fs, cleanup, err := Download(ctx, loc, nil)
+		require.NoError(t, err)
+		require.NotNil(t, fs)
+		defer func() {
+			require.NoError(t, cleanup())
+		}()
 
-	info, err := fs.Stat("WETH98.sol/WETH98.json")
-	require.NoError(t, err)
-	require.Greater(t, info.Size(), int64(0))
+		info, err := fs.Stat("WETH98.sol/WETH98.json")
+		require.NoError(t, err)
+		require.Greater(t, info.Size(), int64(0))
+	})
+
+	t.Run("bad integrity", func(t *testing.T) {
+		_, _, err := downloadURL(ctx, loc.URL, nil, &hashIntegrityChecker{
+			hash: common.Hash{'B', 'A', 'D'},
+		})
+		require.Error(t, err)
+		require.ErrorContains(t, err, "integrity check failed")
+	})
+
+	t.Run("ok integrity", func(t *testing.T) {
+		_, _, err := downloadURL(ctx, loc.URL, nil, &hashIntegrityChecker{
+			hash: common.HexToHash("0x0f814df0c4293aaaadd468ac37e6c92f0b40fd21df848076835cb2c21d2a516f"),
+		})
+		require.NoError(t, err)
+	})
+}
+
+func TestDownloadArtifacts_TaggedVersions(t *testing.T) {
+	tags := []string{
+		"op-contracts/v1.6.0",
+		"op-contracts/v1.7.0-beta.1+l2-contracts",
+	}
+	for _, tag := range tags {
+		t.Run(tag, func(t *testing.T) {
+			t.Parallel()
+
+			loc := MustNewLocatorFromTag(tag)
+			_, cleanup, err := Download(context.Background(), loc, nil)
+			t.Cleanup(func() {
+				require.NoError(t, cleanup())
+			})
+			require.NoError(t, err)
+		})
+	}
 }
diff --git a/op-deployer/pkg/deployer/broadcaster/gas_estimator.go b/op-deployer/pkg/deployer/broadcaster/gas_estimator.go
index abe76d027ec4..b04390fc8aa7 100644
--- a/op-deployer/pkg/deployer/broadcaster/gas_estimator.go
+++ b/op-deployer/pkg/deployer/broadcaster/gas_estimator.go
@@ -11,15 +11,20 @@ import (
 var (
 	// baseFeePadFactor = 50% as a divisor
 	baseFeePadFactor = big.NewInt(2)
-	// tipMulFactor = 20 as a multiplier
-	tipMulFactor = big.NewInt(20)
+	// tipMulFactor = 5 as a multiplier
+	tipMulFactor = big.NewInt(5)
 	// dummyBlobFee is a dummy value for the blob fee. Since this gas estimator will never
 	// post blobs, it's just set to 1.
 	dummyBlobFee = big.NewInt(1)
+	// maxTip is the maximum tip that can be suggested by this estimator.
+	maxTip = big.NewInt(50 * 1e9)
+	// minTip is the minimum tip that can be suggested by this estimator.
+	minTip = big.NewInt(1 * 1e9)
 )
 
 // DeployerGasPriceEstimator is a custom gas price estimator for use with op-deployer.
-// It pads the base fee by 50% and multiplies the suggested tip by 20.
+// It pads the base fee by 50% and multiplies the suggested tip by 5 up to a max of
+// 50 gwei.
 func DeployerGasPriceEstimator(ctx context.Context, client txmgr.ETHBackend) (*big.Int, *big.Int, *big.Int, error) {
 	chainHead, err := client.HeaderByNumber(ctx, nil)
 	if err != nil {
@@ -34,5 +39,14 @@ func DeployerGasPriceEstimator(ctx context.Context, client txmgr.ETHBackend) (*b
 	baseFeePad := new(big.Int).Div(chainHead.BaseFee, baseFeePadFactor)
 	paddedBaseFee := new(big.Int).Add(chainHead.BaseFee, baseFeePad)
 	paddedTip := new(big.Int).Mul(tip, tipMulFactor)
+
+	if paddedTip.Cmp(minTip) < 0 {
+		paddedTip.Set(minTip)
+	}
+
+	if paddedTip.Cmp(maxTip) > 0 {
+		paddedTip.Set(maxTip)
+	}
+
 	return paddedTip, paddedBaseFee, dummyBlobFee, nil
 }
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 0de23866946c..f977fbbb0c72 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -100,21 +100,38 @@ func TestEndToEndApply(t *testing.T) {
 	l1Client, err := ethclient.Dial(rpcURL)
 	require.NoError(t, err)
 
-	depKey := new(deployerKey)
+	pk, err := crypto.HexToECDSA("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
+	require.NoError(t, err)
+
 	l1ChainID := new(big.Int).SetUint64(defaultL1ChainID)
 	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
 	require.NoError(t, err)
-	pk, err := dk.Secret(depKey)
-	require.NoError(t, err)
 
 	l2ChainID1 := uint256.NewInt(1)
 	l2ChainID2 := uint256.NewInt(2)
 
 	loc, _ := testutil.LocalArtifacts(t)
-	intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
-	cg := ethClientCodeGetter(ctx, l1Client)
 
-	t.Run("initial chain", func(t *testing.T) {
+	t.Run("two chains one after another", func(t *testing.T) {
+		intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
+		cg := ethClientCodeGetter(ctx, l1Client)
+
+		require.NoError(t, deployer.ApplyPipeline(
+			ctx,
+			deployer.ApplyPipelineOpts{
+				L1RPCUrl:           rpcURL,
+				DeployerPrivateKey: pk,
+				Intent:             intent,
+				State:              st,
+				Logger:             lgr,
+				StateWriter:        pipeline.NoopStateWriter(),
+			},
+		))
+
+		// create a new environment with wiped state to ensure we can continue using the
+		// state from the previous deployment
+		intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID2))
+
 		require.NoError(t, deployer.ApplyPipeline(
 			ctx,
 			deployer.ApplyPipelineOpts{
@@ -131,10 +148,12 @@ func TestEndToEndApply(t *testing.T) {
 		validateOPChainDeployment(t, cg, st, intent)
 	})
 
-	t.Run("subsequent chain", func(t *testing.T) {
-		// create a new environment with wiped state to ensure we can continue using the
-		// state from the previous deployment
-		intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainID, l2ChainID2))
+	t.Run("chain with tagged artifacts", func(t *testing.T) {
+		intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
+		cg := ethClientCodeGetter(ctx, l1Client)
+
+		intent.L1ContractsLocator = artifacts.DefaultL1ContractsLocator
+		intent.L2ContractsLocator = artifacts.DefaultL2ContractsLocator
 
 		require.NoError(t, deployer.ApplyPipeline(
 			ctx,
@@ -148,6 +167,7 @@ func TestEndToEndApply(t *testing.T) {
 			},
 		))
 
+		validateSuperchainDeployment(t, st, cg)
 		validateOPChainDeployment(t, cg, st, intent)
 	})
 }
@@ -245,9 +265,26 @@ func testApplyExistingOPCM(t *testing.T, l1ChainID uint64, forkRPCUrl string, ve
 		{"DelayedWETH", releases.DelayedWETH.ImplementationAddress, st.ImplementationsDeployment.DelayedWETHImplAddress},
 	}
 	for _, tt := range implTests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.Equal(t, tt.expAddr, tt.actAddr)
-		})
+		require.Equal(t, tt.expAddr, tt.actAddr, "unexpected address for %s", tt.name)
+	}
+
+	superchain, err := standard.SuperchainFor(l1ChainIDBig.Uint64())
+	require.NoError(t, err)
+
+	managerOwner, err := standard.ManagerOwnerAddrFor(l1ChainIDBig.Uint64())
+	require.NoError(t, err)
+
+	superchainTests := []struct {
+		name    string
+		expAddr common.Address
+		actAddr common.Address
+	}{
+		{"ProxyAdmin", managerOwner, st.SuperchainDeployment.ProxyAdminAddress},
+		{"SuperchainConfig", common.Address(*superchain.Config.SuperchainConfigAddr), st.SuperchainDeployment.SuperchainConfigProxyAddress},
+		{"ProtocolVersions", common.Address(*superchain.Config.ProtocolVersionsAddr), st.SuperchainDeployment.ProtocolVersionsProxyAddress},
+	}
+	for _, tt := range superchainTests {
+		require.Equal(t, tt.expAddr, tt.actAddr, "unexpected address for %s", tt.name)
 	}
 
 	artifactsFSL2, cleanupL2, err := artifacts.Download(
diff --git a/op-deployer/pkg/deployer/pipeline/implementations.go b/op-deployer/pkg/deployer/pipeline/implementations.go
index 9e65fd4f54a3..c2d409b5c3a4 100644
--- a/op-deployer/pkg/deployer/pipeline/implementations.go
+++ b/op-deployer/pkg/deployer/pipeline/implementations.go
@@ -35,10 +35,12 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 	var err error
 	if intent.L1ContractsLocator.IsTag() && intent.DeploymentStrategy == state.DeploymentStrategyLive {
 		standardVersionsTOML, err = standard.L1VersionsDataFor(intent.L1ChainID)
-		if err != nil {
-			return fmt.Errorf("error getting standard versions TOML: %w", err)
+		if err == nil {
+			contractsRelease = intent.L1ContractsLocator.Tag
+		} else {
+			contractsRelease = "dev"
 		}
-		contractsRelease = intent.L1ContractsLocator.Tag
+
 	} else {
 		contractsRelease = "dev"
 	}
diff --git a/op-deployer/pkg/deployer/pipeline/init.go b/op-deployer/pkg/deployer/pipeline/init.go
index b5c37c246f29..88caf760f41d 100644
--- a/op-deployer/pkg/deployer/pipeline/init.go
+++ b/op-deployer/pkg/deployer/pipeline/init.go
@@ -1,11 +1,15 @@
 package pipeline
 
 import (
+	"bufio"
 	"context"
 	"crypto/rand"
 	"fmt"
+	"os"
+	"strings"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/mattn/go-isatty"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
@@ -26,7 +30,11 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 		return err
 	}
 
-	if intent.L1ContractsLocator.IsTag() {
+	opcmAddress, opcmAddrErr := standard.ManagerImplementationAddrFor(intent.L1ChainID)
+	hasPredeployedOPCM := opcmAddrErr == nil
+	isTag := intent.L1ContractsLocator.IsTag()
+
+	if isTag && hasPredeployedOPCM {
 		superCfg, err := standard.SuperchainFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting superchain config: %w", err)
@@ -45,13 +53,13 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 			SuperchainConfigProxyAddress: common.Address(*superCfg.Config.SuperchainConfigAddr),
 		}
 
-		opcmAddress, err := standard.ManagerImplementationAddrFor(intent.L1ChainID)
-		if err != nil {
-			return fmt.Errorf("error getting OPCM proxy address: %w", err)
-		}
 		st.ImplementationsDeployment = &state.ImplementationsDeployment{
 			OpcmAddress: opcmAddress,
 		}
+	} else if isTag && !hasPredeployedOPCM {
+		if err := displayWarning(); err != nil {
+			return err
+		}
 	}
 
 	l1ChainID, err := env.L1Client.ChainID(ctx)
@@ -127,3 +135,38 @@ func InitGenesisStrategy(env *Env, intent *state.Intent, st *state.State) error
 func immutableErr(field string, was, is any) error {
 	return fmt.Errorf("%s is immutable: was %v, is %v", field, was, is)
 }
+
+func displayWarning() error {
+	warning := strings.TrimPrefix(`
+####################### WARNING! WARNING WARNING! #######################
+
+You are deploying a tagged release to a chain with no pre-deployed OPCM.
+The contracts you are deploying may not be audited, or match a governance 
+approved release.
+
+USE OF THIS DEPLOYMENT IS NOT RECOMMENDED FOR PRODUCTION. USE AT YOUR OWN 
+RISK. BUGS OR LOSS OF FUNDS MAY OCCUR. WE HOPE YOU KNOW WHAT YOU ARE
+DOING.
+
+####################### WARNING! WARNING WARNING! #######################
+`, "\n")
+
+	_, _ = fmt.Fprint(os.Stderr, warning)
+
+	if isatty.IsTerminal(os.Stdout.Fd()) {
+		_, _ = fmt.Fprintf(os.Stderr, "Please confirm that you have read and understood the warning above [y/n]: ")
+
+		reader := bufio.NewReader(os.Stdin)
+		input, err := reader.ReadString('\n')
+		if err != nil {
+			return fmt.Errorf("failed to read input: %w", err)
+		}
+
+		input = strings.ToLower(strings.TrimSpace(input))
+		if input != "y" && input != "yes" {
+			return fmt.Errorf("aborted")
+		}
+	}
+
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index f8bbaa51b36e..75902424ac78 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -184,6 +184,17 @@ func ArtifactsURLForTag(tag string) (*url.URL, error) {
 	}
 }
 
+func ArtifactsHashForTag(tag string) (common.Hash, error) {
+	switch tag {
+	case "op-contracts/v1.6.0":
+		return common.HexToHash("d20a930cc0ff204c2d93b7aa60755ec7859ba4f328b881f5090c6a6a2a86dcba"), nil
+	case "op-contracts/v1.7.0-beta.1+l2-contracts":
+		return common.HexToHash("9e3ad322ec9b2775d59143ce6874892f9b04781742c603ad59165159e90b00b9"), nil
+	default:
+		return common.Hash{}, fmt.Errorf("unsupported tag: %s", tag)
+	}
+}
+
 func standardArtifactsURL(checksum string) string {
 	return fmt.Sprintf("https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-%s.tar.gz", checksum)
 }
diff --git a/op-deployer/pkg/deployer/state/deploy_config.go b/op-deployer/pkg/deployer/state/deploy_config.go
index 1a03c21d7e94..11445c2fb698 100644
--- a/op-deployer/pkg/deployer/state/deploy_config.go
+++ b/op-deployer/pkg/deployer/state/deploy_config.go
@@ -63,6 +63,11 @@ func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State,
 				EIP1559DenominatorCanyon: 250,
 				EIP1559Elasticity:        chainIntent.Eip1559Elasticity,
 			},
+
+			// STOP! This struct sets the _default_ upgrade schedule for all chains.
+			// Any upgrades you enable here will be enabled for all new deployments.
+			// In-development hardforks should never be activated here. Instead, they
+			// should be specified as overrides.
 			UpgradeScheduleDeployConfig: genesis.UpgradeScheduleDeployConfig{
 				L2GenesisRegolithTimeOffset: u64UtilPtr(0),
 				L2GenesisCanyonTimeOffset:   u64UtilPtr(0),
diff --git a/op-service/testutils/anvil/anvil.go b/op-service/testutils/anvil/anvil.go
index 7419f9da6252..50590a096a7f 100644
--- a/op-service/testutils/anvil/anvil.go
+++ b/op-service/testutils/anvil/anvil.go
@@ -38,6 +38,8 @@ func New(l1RPCURL string, logger log.Logger) (*Runner, error) {
 		"--fork-url", l1RPCURL,
 		"--port",
 		"0",
+		"--base-fee",
+		"1000000000",
 	)
 	stdout, err := proc.StdoutPipe()
 	if err != nil {

From 790e1aa608c60343ceaf02f8d47a4d1bfe767382 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 20 Nov 2024 20:03:14 +0100
Subject: [PATCH 239/451] make riscv compile without the optimizer turned on
 (#13000)

* make riscv compile without the optimizer turned on

* bump riscv.sol

* bump riscv.sol
---
 .../snapshots/semver-lock.json                |  4 +-
 .../contracts-bedrock/src/asterisc/RISCV.sol  | 38 +++++++++++--------
 versions.json                                 |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index bcbbddde3a8c..d069a2753933 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -136,8 +136,8 @@
     "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
   "src/asterisc/RISCV.sol": {
-    "initCodeHash": "0xb3f9c337d694b62704b63d86d7d412a661925f254e7af376a5e02717a455487e",
-    "sourceCodeHash": "0x92a8689e26a736868f90c6c208ef01782c3d9ce196fcef0a85aef4da936c6339"
+    "initCodeHash": "0x6b4323061187f2c8efe8de43bf1ecdc0798e2d95ad69470ed4151dadc094fedf",
+    "sourceCodeHash": "0xd824f1ead87a1214fa8a4b435f493a80b7340ec2c959d2c1e1e9e8c062a42c4a"
   },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0xa3cbf121bad13c00227ea4fef128853d9a86b7ec9158de894f99b58d38d7630a",
diff --git a/packages/contracts-bedrock/src/asterisc/RISCV.sol b/packages/contracts-bedrock/src/asterisc/RISCV.sol
index 4544bd6297c8..8b0bbb5d1d74 100644
--- a/packages/contracts-bedrock/src/asterisc/RISCV.sol
+++ b/packages/contracts-bedrock/src/asterisc/RISCV.sol
@@ -6,18 +6,17 @@ import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 
 /// @title RISCV
 /// @notice The RISCV contract emulates a single RISCV hart cycle statelessly, using memory proofs to verify the
-///         instruction and optional memory access' inclusion in the memory merkle root provided in the prestate
-///         witness.
-///
+///         instruction and optional memory access' inclusion in the memory merkle root provided in the trusted
+///         prestate witness.
 ///         This contract has been vendorized from the Asterisc project. The original source code can be found at
-///         https://github.com/ethereum-optimism/asterisc
+/// @dev https://github.com/ethereum-optimism/asterisc
 contract RISCV is IBigStepper {
     /// @notice The preimage oracle contract.
     IPreimageOracle public oracle;
 
     /// @notice The version of the contract.
-    /// @custom:semver 1.1.0-rc.1
-    string public constant version = "1.1.0-rc.1";
+    /// @custom:semver 1.1.0-rc.2
+    string public constant version = "1.1.0-rc.2";
 
     /// @param _oracle The preimage oracle contract.
     constructor(IPreimageOracle _oracle) {
@@ -646,16 +645,18 @@ contract RISCV is IBigStepper {
                     rightShamt := sub64(sub64(toU64(64), alignment), size)
                 }
 
+                let addr_ := addr
+                let size_ := size
                 // left: prepare for byte-taking by right-aligning
                 left := shr(u64ToU256(shl64(toU64(3), leftShamt)), left)
                 // right: right-align for byte-taking by right-aligning
                 right := shr(u64ToU256(shl64(toU64(3), rightShamt)), right)
                 // loop:
-                for { let i := 0 } lt(i, size) { i := add(i, 1) } {
+                for { let i := 0 } lt(i, size_) { i := add(i, 1) } {
                     // translate to reverse byte lookup, since we are reading little-endian memory, and need the highest
                     // byte first.
                     // effAddr := (addr + size - 1 - i) &^ 31
-                    let effAddr := and64(sub64(sub64(add64(addr, size), toU64(1)), toU64(i)), not64(toU64(31)))
+                    let effAddr := and64(sub64(sub64(add64(addr_, size_), toU64(1)), toU64(i)), not64(toU64(31)))
                     // take a byte from either left or right, depending on the effective address
                     let b := toU256(0)
                     switch eq64(effAddr, leftAddr)
@@ -672,7 +673,7 @@ contract RISCV is IBigStepper {
                 }
 
                 if signed {
-                    let signBitShift := sub64(shl64(toU64(3), size), toU64(1))
+                    let signBitShift := sub64(shl64(toU64(3), size_), toU64(1))
                     out := signExtend64(out, signBitShift)
                 }
             }
@@ -824,21 +825,24 @@ contract RISCV is IBigStepper {
                     count := pdatlen
                 }
 
-                let bits := shl64(toU64(3), sub64(toU64(32), count)) // 32-count, in bits
+                let addr_ := addr
+                let count_ := count
+                let bits := shl64(toU64(3), sub64(toU64(32), count_)) // 32-count, in bits
                 let mask := not(sub(shl(u64ToU256(bits), toU256(1)), toU256(1))) // left-aligned mask for count bytes
                 let alignmentBits := u64ToU256(shl64(toU64(3), alignment))
                 mask := shr(alignmentBits, mask) // mask of count bytes, shifted by alignment
                 let pdat := shr(alignmentBits, b32asBEWord(pdatB32)) // pdat, shifted by alignment
 
                 // update pre-image reader with updated offset
-                let newOffset := add64(offset, count)
+                let newOffset := add64(offset, count_)
                 setPreimageOffset(newOffset)
 
-                let node := getMemoryB32(sub64(addr, alignment), 1)
+                out := count_
+
+                let node := getMemoryB32(sub64(addr_, alignment), 1)
                 let dat := and(b32asBEWord(node), not(mask)) // keep old bytes outside of mask
                 dat := or(dat, and(pdat, mask)) // fill with bytes from pdat
-                setMemoryB32(sub64(addr, alignment), beWordAsB32(dat), 1)
-                out := count
+                setMemoryB32(sub64(addr_, alignment), beWordAsB32(dat), 1)
             }
 
             //
@@ -1141,6 +1145,7 @@ contract RISCV is IBigStepper {
 
             switch opcode
             case 0x03 {
+                let pc_ := _pc
                 // 000_0011: memory loading
                 // LB, LH, LW, LD, LBU, LHU, LWU
                 let imm := parseImmTypeI(instr)
@@ -1150,9 +1155,10 @@ contract RISCV is IBigStepper {
                 let memIndex := add64(rs1Value, signExtend64(imm, toU64(11)))
                 let rdValue := loadMem(memIndex, size, signed, 1, 2)
                 setRegister(rd, rdValue)
-                setPC(add64(_pc, toU64(4)))
+                setPC(add64(pc_, toU64(4)))
             }
             case 0x23 {
+                let pc_ := _pc
                 // 010_0011: memory storing
                 // SB, SH, SW, SD
                 let imm := parseImmTypeS(instr)
@@ -1161,7 +1167,7 @@ contract RISCV is IBigStepper {
                 let rs1Value := getRegister(rs1)
                 let memIndex := add64(rs1Value, signExtend64(imm, toU64(11)))
                 storeMem(memIndex, size, value, 1, 2)
-                setPC(add64(_pc, toU64(4)))
+                setPC(add64(pc_, toU64(4)))
             }
             case 0x63 {
                 // 110_0011: branching
diff --git a/versions.json b/versions.json
index 7778e8bf59fe..e734259955f6 100644
--- a/versions.json
+++ b/versions.json
@@ -11,5 +11,5 @@
   "just": "1.34.0",
   "binary_signer": "1.0.4",
   "semgrep": "1.90.0",
-  "asterisc": "cl/contract-updates"
+  "asterisc": "v1.1.2"
 }

From 043701852664394b12d0157f795b63bf1bd0ab92 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Wed, 20 Nov 2024 16:14:33 -0500
Subject: [PATCH 240/451] bump kona (#13003)

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index b53c7add0f87..53fd8e865be4 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -207,7 +207,7 @@ target "proofs-tools" {
   context = "."
   args = {
     CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="kona-client-v0.1.0-alpha.7"
+    KONA_VERSION="kona-client-v0.1.0-beta.1"
   }
   target="proofs-tools"
   platforms = split(",", PLATFORMS)

From b0427be0f750edb17fea06eda441ff5abc3c8a72 Mon Sep 17 00:00:00 2001
From: Vinod Damle <vdamle@users.noreply.github.com>
Date: Wed, 20 Nov 2024 17:18:23 -0500
Subject: [PATCH 241/451] op-deployer: add test for deployConfig overrides
 (#12985)

Test hard fork offset overrides

Co-authored-by: Vinod Damle <vinod@oplabs.co>
---
 .../pkg/deployer/state/deploy_config_test.go  | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 op-deployer/pkg/deployer/state/deploy_config_test.go

diff --git a/op-deployer/pkg/deployer/state/deploy_config_test.go b/op-deployer/pkg/deployer/state/deploy_config_test.go
new file mode 100644
index 000000000000..c0381507d169
--- /dev/null
+++ b/op-deployer/pkg/deployer/state/deploy_config_test.go
@@ -0,0 +1,47 @@
+package state
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCombineDeployConfig(t *testing.T) {
+	intent := Intent{
+		L1ChainID: 1,
+	}
+	chainState := ChainState{
+		ID: common.HexToHash("0x123"),
+	}
+	chainIntent := ChainIntent{
+		Eip1559Denominator:         1,
+		Eip1559Elasticity:          2,
+		BaseFeeVaultRecipient:      common.HexToAddress("0x123"),
+		L1FeeVaultRecipient:        common.HexToAddress("0x456"),
+		SequencerFeeVaultRecipient: common.HexToAddress("0x789"),
+		Roles: ChainRoles{
+			SystemConfigOwner: common.HexToAddress("0x123"),
+			L1ProxyAdminOwner: common.HexToAddress("0x456"),
+			L2ProxyAdminOwner: common.HexToAddress("0x789"),
+			UnsafeBlockSigner: common.HexToAddress("0xabc"),
+			Batcher:           common.HexToAddress("0xdef"),
+		},
+	}
+	state := State{
+		SuperchainDeployment: &SuperchainDeployment{ProtocolVersionsProxyAddress: common.HexToAddress("0x123")},
+	}
+
+	// apply hard fork overrides
+	chainIntent.DeployOverrides = map[string]any{
+		"l2GenesisGraniteTimeOffset":  "0x8",
+		"l2GenesisHoloceneTimeOffset": "0x10",
+	}
+
+	out, err := CombineDeployConfig(&intent, &chainIntent, &state, &chainState)
+	require.NoError(t, err)
+	require.Equal(t, *out.L2InitializationConfig.UpgradeScheduleDeployConfig.L2GenesisFjordTimeOffset, hexutil.Uint64(0))
+	require.Equal(t, *out.L2InitializationConfig.UpgradeScheduleDeployConfig.L2GenesisGraniteTimeOffset, hexutil.Uint64(8))
+	require.Equal(t, *out.L2InitializationConfig.UpgradeScheduleDeployConfig.L2GenesisHoloceneTimeOffset, hexutil.Uint64(16))
+}

From 240d0f846dcacbdfa80051023fc11f39a6477bfa Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Wed, 20 Nov 2024 23:20:43 +0100
Subject: [PATCH 242/451] op-alt-da: list alt-da options in alt-da category
 (#12986)

---
 op-alt-da/cli.go | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/op-alt-da/cli.go b/op-alt-da/cli.go
index 30ce2168f570..84364e47952a 100644
--- a/op-alt-da/cli.go
+++ b/op-alt-da/cli.go
@@ -57,22 +57,25 @@ func CLIFlags(envPrefix string, category string) []cli.Flag {
 			Category: category,
 		},
 		&cli.DurationFlag{
-			Name:    PutTimeoutFlagName,
-			Usage:   "Timeout for put requests. 0 means no timeout.",
-			Value:   time.Duration(0),
-			EnvVars: altDAEnvs(envPrefix, "PUT_TIMEOUT"),
+			Name:     PutTimeoutFlagName,
+			Usage:    "Timeout for put requests. 0 means no timeout.",
+			Value:    time.Duration(0),
+			EnvVars:  altDAEnvs(envPrefix, "PUT_TIMEOUT"),
+			Category: category,
 		},
 		&cli.DurationFlag{
-			Name:    GetTimeoutFlagName,
-			Usage:   "Timeout for get requests. 0 means no timeout.",
-			Value:   time.Duration(0),
-			EnvVars: altDAEnvs(envPrefix, "GET_TIMEOUT"),
+			Name:     GetTimeoutFlagName,
+			Usage:    "Timeout for get requests. 0 means no timeout.",
+			Value:    time.Duration(0),
+			EnvVars:  altDAEnvs(envPrefix, "GET_TIMEOUT"),
+			Category: category,
 		},
 		&cli.Uint64Flag{
-			Name:    MaxConcurrentRequestsFlagName,
-			Usage:   "Maximum number of concurrent requests to the DA server",
-			Value:   1,
-			EnvVars: altDAEnvs(envPrefix, "MAX_CONCURRENT_DA_REQUESTS"),
+			Name:     MaxConcurrentRequestsFlagName,
+			Usage:    "Maximum number of concurrent requests to the DA server",
+			Value:    1,
+			EnvVars:  altDAEnvs(envPrefix, "MAX_CONCURRENT_DA_REQUESTS"),
+			Category: category,
 		},
 	}
 }

From 042433b89ce38ccc15456e9673829f6783bb97ac Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 20 Nov 2024 22:31:23 -0700
Subject: [PATCH 243/451] op-deployer: Fix invalid intent panic in SR command
 (#13006)

---
 op-deployer/pkg/deployer/inspect/superchain_registry.go | 4 ++++
 op-deployer/pkg/deployer/state/intent.go                | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/op-deployer/pkg/deployer/inspect/superchain_registry.go b/op-deployer/pkg/deployer/inspect/superchain_registry.go
index 7a6fe384db64..e5ee56568b59 100644
--- a/op-deployer/pkg/deployer/inspect/superchain_registry.go
+++ b/op-deployer/pkg/deployer/inspect/superchain_registry.go
@@ -28,6 +28,10 @@ func SuperchainRegistryCLI(cliCtx *cli.Context) error {
 		return fmt.Errorf("failed to read intent: %w", err)
 	}
 
+	if err := globalIntent.Check(); err != nil {
+		return fmt.Errorf("intent check failed: %w", err)
+	}
+
 	envVars := map[string]string{}
 	envVars["SCR_CHAIN_NAME"] = ""
 	envVars["SCR_CHAIN_SHORT_NAME"] = ""
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index 860944666e9e..86e6cfc1ed47 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -1,6 +1,7 @@
 package state
 
 import (
+	"errors"
 	"fmt"
 	"math/big"
 
@@ -67,11 +68,11 @@ func (c *Intent) Check() error {
 	}
 
 	if c.L1ContractsLocator == nil {
-		c.L1ContractsLocator = artifacts.DefaultL1ContractsLocator
+		return errors.New("l1ContractsLocator must be set")
 	}
 
 	if c.L2ContractsLocator == nil {
-		c.L2ContractsLocator = artifacts.DefaultL2ContractsLocator
+		return errors.New("l2ContractsLocator must be set")
 	}
 
 	var err error

From 79306cb27e4dbf95c04230f755d324d5c4e87f00 Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Thu, 21 Nov 2024 18:14:39 +0100
Subject: [PATCH 244/451] op-program/prestates: Add op-program including
 Holocene Sepolia activations (#13012)

This is adding op-program/v1.4.0-rc.1 with absolute prestate hash
0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe
to the releases.json file.

This release contains Sepolia Holocene activation times for
OP, Base, Mode, Zora, BUT NOT Metal.

From c29b2094a3cc6edceee061441654eb3a7ace145b Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann@oplabs.co>
Date: Thu, 21 Nov 2024 19:07:19 +0100
Subject: [PATCH 245/451] make -> just migration recipe (#12883)

* build: add just modules

A lot of our build recipes share similar structures. Move some of
these to modules so we can control them centrally.

* build: add Makefile deprecation helper

This allows us to implement deprecated Makefiles as:

  DEPRECATED_TARGETS := ...
  include ../just/deprecate.mk

* build(docker): add just modules to docker context

We need to make sure our build framework is included in the docker build
context.
Also make sure just is part of the builder image.

* build(op-batcher): migrate build to just
---
 just/default.just                             |  5 ++
 just/deprecated.mk                            | 45 ++++++++++++++++
 just/git.just                                 | 26 +++++++++
 just/go.just                                  | 27 ++++++++++
 op-batcher/Makefile                           | 53 +------------------
 op-batcher/justfile                           | 35 ++++++++++++
 ops/docker/op-stack-go/Dockerfile             |  7 ++-
 .../op-stack-go/Dockerfile.dockerignore       |  2 +
 8 files changed, 148 insertions(+), 52 deletions(-)
 create mode 100644 just/default.just
 create mode 100644 just/deprecated.mk
 create mode 100644 just/git.just
 create mode 100644 just/go.just
 create mode 100644 op-batcher/justfile

diff --git a/just/default.just b/just/default.just
new file mode 100644
index 000000000000..220c27dca5c2
--- /dev/null
+++ b/just/default.just
@@ -0,0 +1,5 @@
+set shell := ["bash", "-c"]
+
+PARALLEL := num_cpus()
+
+MAP_JUST := "/usr/bin/env -S parallel --shebang --jobs " + PARALLEL + " --colsep ' ' -r " + just_executable()
diff --git a/just/deprecated.mk b/just/deprecated.mk
new file mode 100644
index 000000000000..a18d665c0548
--- /dev/null
+++ b/just/deprecated.mk
@@ -0,0 +1,45 @@
+ifeq (, $(shell which tput))
+  # CI environment typically does not support tput.
+  banner-style = $1
+else
+  # print in bold red to bring attention.
+  banner-style = $(shell tput bold)$(shell tput setaf 1)$1$(shell tput sgr0)
+endif
+
+# Variable assignments can affect the semantic of the make targets.
+# Typical use-case: setting VERSION in a release build, since CI
+# doesn't preserve the git environment.
+#
+# We need to translate:
+# "make target VAR=val" to "just VAR=val target"
+#
+# MAKEFLAGS is a string of the form:
+# "abc --foo --bar=baz -- VAR1=val1 VAR2=val2", namely:
+# - abc is the concatnation of all short flags
+# - --foo and --bar=baz are long options,
+# - -- is the separator between flags and variable assignments,
+# - VAR1=val1 and VAR2=val2 are variable assignments
+#
+# Goal: ignore all CLI flags, keep only variable assignments.
+#
+# First remove the short flags at the beginning, or the first long-flag,
+# or if there is no flag at all, the -- separator (which then makes the
+# next step a noop). If there's no flag and no variable assignment, the
+# result is empty anyway, so the wordlist call is safe (everything is a noop).
+tmp-flags = $(wordlist 2,$(words $(MAKEFLAGS)),$(MAKEFLAGS))
+# Then remove all long options, including the -- separator, if needed. That
+# leaves only variable assignments.
+just-flags = $(patsubst --%,,$(tmp-flags))
+
+define make-deprecated-target
+$1:
+	@echo
+	@printf %s\\n '$(call banner-style,"make $1 $(just-flags)" is deprecated. Please use "just $(just-flags) $1" instead.)'
+	@echo
+	just $(just-flags) $1
+endef
+
+$(foreach element,$(DEPRECATED_TARGETS),$(eval $(call make-deprecated-target,$(element))))
+
+.PHONY:
+	$(DEPRECATED_TARGETS)
diff --git a/just/git.just b/just/git.just
new file mode 100644
index 000000000000..922286d7ab5a
--- /dev/null
+++ b/just/git.just
@@ -0,0 +1,26 @@
+import 'default.just'
+
+# Set default values for git info
+GITCOMMIT := env('GITCOMMIT', `git rev-parse HEAD 2> /dev/null || true`)
+GITDATE := env('GITDATE', `git show -s --format='%ct' 2> /dev/null|| true`)
+
+_PROJECT := shell("basename $1", justfile_directory())
+
+_ALL_TAGS := shell("git tag --points-at $1 2> /dev/null || true", GITCOMMIT)
+
+_PROJECT_TAGS := shell("echo $1 | grep ^$2/ | sed s:$2/:: | sort -V", _ALL_TAGS, _PROJECT)
+
+_PREFERRED_TAG := shell("echo $1 | grep -v -- '-rc' | tail -n 1", _PROJECT_TAGS)
+
+_LAST_TAG := shell("echo $1 | tail -n 1", _PROJECT_TAGS)
+
+# Find version tag, prioritizing non-rc release tags
+VERSION := shell('if [ -z "$1" ]; then
+    if [ -z "$2" ]; then
+        echo "untagged"
+    else
+        echo "$2"
+    fi
+else
+    echo $1
+fi', _PREFERRED_TAG, _LAST_TAG)
diff --git a/just/go.just b/just/go.just
new file mode 100644
index 000000000000..5af766295099
--- /dev/null
+++ b/just/go.just
@@ -0,0 +1,27 @@
+import 'git.just'
+
+_EXTRALDFLAGS := if os() == "macos" { "-ldflags=-extldflags=-Wl,-ld_classic" } else { "" }
+
+# We use both GOOS/GOARCH and TARGETOS/TARGETARCH to set the build targets.
+# From the usage patterns, it looks like TARGETOS/TARGETARCH should take
+# precedence if set, and default to GOOS/GOARCH if not set.
+# TODO: should we just remove TARGETOS/TARGETARCH altogether eventually?
+GOOS := env('GOOS', `go env GOOS`)
+GOARCH := env('GOARCH', `go env GOARCH`)
+TARGETOS := env('TARGETOS', GOOS)
+TARGETARCH := env('TARGETARCH', GOARCH)
+
+GORACE := "0"
+
+_GORACE_FLAG := if GORACE == "1" { "-race " } else { "" }
+
+[private]
+go_build BIN PKG *FLAGS:
+    env GO111MODULE=on GOOS={{TARGETOS}} GOARCH={{TARGETARCH}} CGO_ENABLED=0 go build -v {{_GORACE_FLAG}} {{FLAGS}} -o {{BIN}} {{PKG}}
+
+[private]
+go_test SELECTOR *FLAGS:
+    go test -v {{_GORACE_FLAG}} {{FLAGS}} {{SELECTOR}}
+
+[private]
+go_fuzz FUZZ TIME='10s' PKG='': (go_test PKG _EXTRALDFLAGS "-fuzztime" TIME "-fuzz" FUZZ "-run" "NOTAREALTEST")
diff --git a/op-batcher/Makefile b/op-batcher/Makefile
index 22bb7a613861..1501e0242d9b 100644
--- a/op-batcher/Makefile
+++ b/op-batcher/Makefile
@@ -1,52 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-# Find the github tag that points to this commit. If none are found, set the version string to "untagged"
-# Prioritizes release tag, if one exists, over tags suffixed with "-rc"
-VERSION ?= $(shell tags=$$(git tag --points-at $(GITCOMMIT) | grep '^op-batcher/' | sed 's/op-batcher\///' | sort -V); \
-             preferred_tag=$$(echo "$$tags" | grep -v -- '-rc' | tail -n 1); \
-             if [ -z "$$preferred_tag" ]; then \
-                 if [ -z "$$tags" ]; then \
-                     echo "untagged"; \
-                 else \
-                     echo "$$tags" | tail -n 1; \
-                 fi \
-             else \
-                 echo $$preferred_tag; \
-             fi)
+DEPRECATED_TARGETS := op-batcher clean test fuzz
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X main.Version=$(VERSION)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
-ifeq ($(shell uname),Darwin)
-	FUZZLDFLAGS := -ldflags=-extldflags=-Wl,-ld_classic
-endif
-
-op-batcher:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-batcher ./cmd
-
-clean:
-	rm bin/op-batcher
-
-test:
-	go test -v ./...
-
-fuzz:
-	printf "%s\n" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelConfig_CheckTimeout ./batcher" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationZero ./batcher" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationTimeoutMaxChannelDuration ./batcher" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDurationTimeoutZeroMaxChannelDuration ./batcher" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelCloseTimeout ./batcher" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzChannelZeroCloseTimeout ./batcher" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzSeqWindowClose ./batcher" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzSeqWindowZeroTimeoutClose ./batcher" \
-	| parallel -j 8 {}
-
-.PHONY: \
-	op-batcher \
-	clean \
-	test \
-	fuzz
+include ../just/deprecated.mk
diff --git a/op-batcher/justfile b/op-batcher/justfile
new file mode 100644
index 000000000000..2647debbcb43
--- /dev/null
+++ b/op-batcher/justfile
@@ -0,0 +1,35 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X main.Version=" + VERSION + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-batcher"
+
+# Build op-batcher binary
+op-batcher: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
+
+# Clean build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")
+
+[private]
+batcher_fuzz_task FUZZ TIME='10s': (go_fuzz FUZZ TIME "./batcher")
+
+# Run fuzzing tests
+fuzz:
+    #!{{MAP_JUST}} batcher_fuzz_task
+    FuzzChannelConfig_CheckTimeout
+    FuzzDurationZero
+    FuzzDurationTimeoutMaxChannelDuration
+    FuzzDurationTimeoutZeroMaxChannelDuration
+    FuzzChannelCloseTimeout
+    FuzzChannelZeroCloseTimeout
+    FuzzSeqWindowClose
+    FuzzSeqWindowZeroTimeoutClose
diff --git a/ops/docker/op-stack-go/Dockerfile b/ops/docker/op-stack-go/Dockerfile
index e7e183804ab9..da0fc156f027 100644
--- a/ops/docker/op-stack-go/Dockerfile
+++ b/ops/docker/op-stack-go/Dockerfile
@@ -12,7 +12,12 @@ ARG TARGET_BASE_IMAGE=alpine:3.20
 # We may be cross-building for another platform. Specify which platform we need as builder.
 FROM --platform=$BUILDPLATFORM golang:1.22.7-alpine3.20 AS builder
 
-RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
+RUN apk add --no-cache curl tar gzip make gcc musl-dev linux-headers git jq bash
+
+# install versioned toolchain
+COPY ./versions.json .
+RUN curl -L https://github.com/casey/just/releases/download/$(jq -r .just < versions.json)/just-$(jq -r .just < versions.json)-x86_64-unknown-linux-musl.tar.gz | \
+    tar xz -C /usr/local/bin just
 
 # We copy the go.mod/sum first, so the `go mod download` does not have to re-run if dependencies do not change.
 COPY ./go.mod /app/go.mod
diff --git a/ops/docker/op-stack-go/Dockerfile.dockerignore b/ops/docker/op-stack-go/Dockerfile.dockerignore
index bd700e291e49..edf3bbc1c51d 100644
--- a/ops/docker/op-stack-go/Dockerfile.dockerignore
+++ b/ops/docker/op-stack-go/Dockerfile.dockerignore
@@ -20,3 +20,5 @@
 !/op-alt-da
 !/go.mod
 !/go.sum
+!/just
+!/versions.json

From cc2715c3d6ebef374451b598f48980ad817e0a0e Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Thu, 21 Nov 2024 14:53:20 -0500
Subject: [PATCH 246/451] cannon: Add more sync tests (#12949)

* cannon: Port go map tests

* cannon: Port pool_test.go

* cannon: Port a few more mutex tests

* cannon: Port waitgroup_test.go

* cannon: Port oncefunc_test.go (in progress)

* cannon: Port atomic_test.go (in progress)

* cannon: Port value_test.go (in progress)

* cannon: Fix atomic tests by using a test mock

* cannon: Fix test fail behavior

* cannon: Move test util to a shared module

* cannon: Use common testutil throughout

* cannon: Fix failing tests

* cannon: Add sanity check test program for test runner utils

* cannon: Add more util tests, fix step counts

* cannon: Rename test util method

* cannon: Fix panic, error handling in testutil

* cannon: Dedupe test running code

* cannon: Simplify testutil interface

* cannon: Mark mt tests as slow

* cannon: Cut debugging code from test

* cannon: Validate gc complete output

* cannon: Synchronize access to bool values
---
 cannon/mipsevm/exec/mips_instructions.go      |    4 +-
 .../multithreaded/instrumented_test.go        |   94 +-
 .../example/mt-atomic/atomic_test_copy.go     | 2567 +++++++++++++++++
 cannon/testdata/example/mt-atomic/go.mod      |    8 +
 cannon/testdata/example/mt-atomic/main.go     |   80 +
 cannon/testdata/example/mt-general/go.mod     |    5 +
 cannon/testdata/example/mt-general/main.go    |   46 +
 cannon/testdata/example/mt-map/go.mod         |    3 +
 cannon/testdata/example/mt-map/main.go        |   42 +-
 .../example/mt-map/map_reference_test_copy.go |  299 ++
 .../testdata/example/mt-map/map_test_copy.go  |  325 +++
 cannon/testdata/example/mt-mutex/go.mod       |    3 +
 cannon/testdata/example/mt-mutex/main.go      |   77 +-
 .../example/mt-mutex/mutex_test_copy.go       |  135 +
 cannon/testdata/example/mt-mutex/runtime.go   |   14 +
 cannon/testdata/example/mt-oncefunc/go.mod    |    8 +
 cannon/testdata/example/mt-oncefunc/main.go   |   22 +
 .../example/mt-oncefunc/oncefunc_test_copy.go |  265 ++
 .../example/mt-pool/export_test_copy.go       |   86 +
 cannon/testdata/example/mt-pool/go.mod        |    3 +
 cannon/testdata/example/mt-pool/main.go       |   38 +-
 .../example/mt-pool/pool_test_copy.go         |  298 ++
 .../example/mt-pool/poolqueue_copy.go         |  338 +++
 cannon/testdata/example/mt-pool/runtime.go    |   11 +
 cannon/testdata/example/mt-value/go.mod       |    8 +
 cannon/testdata/example/mt-value/main.go      |   20 +
 .../example/mt-value/value_test_copy.go       |  312 ++
 cannon/testdata/example/mt-wg/go.mod          |    3 +
 cannon/testdata/example/mt-wg/main.go         |   38 +-
 .../example/mt-wg/waitgroup_test_copy.go      |  130 +
 cannon/testdata/example/utilscheck/go.mod     |    8 +
 cannon/testdata/example/utilscheck/main.go    |   17 +
 cannon/testdata/example/utilscheck2/go.mod    |    8 +
 cannon/testdata/example/utilscheck2/main.go   |   24 +
 cannon/testdata/example/utilscheck3/go.mod    |    8 +
 cannon/testdata/example/utilscheck3/main.go   |   20 +
 cannon/testdata/example/utilscheck4/go.mod    |    8 +
 cannon/testdata/example/utilscheck4/main.go   |   17 +
 cannon/testdata/utils/go.mod                  |    5 +
 cannon/testdata/utils/testutil/testing.go     |  170 ++
 40 files changed, 5397 insertions(+), 170 deletions(-)
 create mode 100644 cannon/testdata/example/mt-atomic/atomic_test_copy.go
 create mode 100644 cannon/testdata/example/mt-atomic/go.mod
 create mode 100644 cannon/testdata/example/mt-atomic/main.go
 create mode 100644 cannon/testdata/example/mt-general/go.mod
 create mode 100644 cannon/testdata/example/mt-general/main.go
 create mode 100644 cannon/testdata/example/mt-map/map_reference_test_copy.go
 create mode 100644 cannon/testdata/example/mt-map/map_test_copy.go
 create mode 100644 cannon/testdata/example/mt-mutex/mutex_test_copy.go
 create mode 100644 cannon/testdata/example/mt-mutex/runtime.go
 create mode 100644 cannon/testdata/example/mt-oncefunc/go.mod
 create mode 100644 cannon/testdata/example/mt-oncefunc/main.go
 create mode 100644 cannon/testdata/example/mt-oncefunc/oncefunc_test_copy.go
 create mode 100644 cannon/testdata/example/mt-pool/export_test_copy.go
 create mode 100644 cannon/testdata/example/mt-pool/pool_test_copy.go
 create mode 100644 cannon/testdata/example/mt-pool/poolqueue_copy.go
 create mode 100644 cannon/testdata/example/mt-pool/runtime.go
 create mode 100644 cannon/testdata/example/mt-value/go.mod
 create mode 100644 cannon/testdata/example/mt-value/main.go
 create mode 100644 cannon/testdata/example/mt-value/value_test_copy.go
 create mode 100644 cannon/testdata/example/mt-wg/waitgroup_test_copy.go
 create mode 100644 cannon/testdata/example/utilscheck/go.mod
 create mode 100644 cannon/testdata/example/utilscheck/main.go
 create mode 100644 cannon/testdata/example/utilscheck2/go.mod
 create mode 100644 cannon/testdata/example/utilscheck2/main.go
 create mode 100644 cannon/testdata/example/utilscheck3/go.mod
 create mode 100644 cannon/testdata/example/utilscheck3/main.go
 create mode 100644 cannon/testdata/example/utilscheck4/go.mod
 create mode 100644 cannon/testdata/example/utilscheck4/main.go
 create mode 100644 cannon/testdata/utils/go.mod
 create mode 100644 cannon/testdata/utils/testutil/testing.go

diff --git a/cannon/mipsevm/exec/mips_instructions.go b/cannon/mipsevm/exec/mips_instructions.go
index c8e27e63df01..e0d91893d1a5 100644
--- a/cannon/mipsevm/exec/mips_instructions.go
+++ b/cannon/mipsevm/exec/mips_instructions.go
@@ -169,7 +169,7 @@ func SignExtendImmediate(insn uint32) Word {
 
 func assertMips64(insn uint32) {
 	if arch.IsMips32 {
-		panic(fmt.Sprintf("invalid instruction: %x", insn))
+		panic(fmt.Sprintf("invalid instruction: 0x%08x", insn))
 	}
 }
 
@@ -327,7 +327,7 @@ func ExecuteMipsInstruction(insn uint32, opcode uint32, fun uint32, rs, rt, mem
 			assertMips64(insn)
 			return Word(int64(rt) >> (((insn >> 6) & 0x1f) + 32))
 		default:
-			panic(fmt.Sprintf("invalid instruction: %x", insn))
+			panic(fmt.Sprintf("invalid instruction: 0x%08x", insn))
 		}
 	} else {
 		switch opcode {
diff --git a/cannon/mipsevm/multithreaded/instrumented_test.go b/cannon/mipsevm/multithreaded/instrumented_test.go
index 6c8fade9ff53..6add2cc020aa 100644
--- a/cannon/mipsevm/multithreaded/instrumented_test.go
+++ b/cannon/mipsevm/multithreaded/instrumented_test.go
@@ -34,20 +34,82 @@ func TestInstrumentedState_Claim(t *testing.T) {
 	testutil.RunVMTest_Claim(t, CreateInitialState, vmFactory, false)
 }
 
+func TestInstrumentedState_UtilsCheck(t *testing.T) {
+	// Sanity check that test running utilities will return a non-zero exit code on failure
+	t.Parallel()
+	cases := []struct {
+		name           string
+		expectedOutput string
+	}{
+		{name: "utilscheck", expectedOutput: "Test failed: ShouldFail"},
+		{name: "utilscheck2", expectedOutput: "Test failed: ShouldFail (subtest 2)"},
+		{name: "utilscheck3", expectedOutput: "Test panicked: ShouldFail (panic test)"},
+		{name: "utilscheck4", expectedOutput: "Test panicked: ShouldFail"},
+	}
+
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			state, meta := testutil.LoadELFProgram(t, testutil.ProgramPath(c.name), CreateInitialState, false)
+			oracle := testutil.StaticOracle(t, []byte{})
+
+			var stdOutBuf, stdErrBuf bytes.Buffer
+			us := NewInstrumentedState(state, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger(), meta)
+
+			for i := 0; i < 1_000_000; i++ {
+				if us.GetState().GetExited() {
+					break
+				}
+				_, err := us.Step(false)
+				require.NoError(t, err)
+			}
+			t.Logf("Completed in %d steps", state.Step)
+
+			require.True(t, state.Exited, "must complete program")
+			require.Equal(t, uint8(1), state.ExitCode, "exit with 1")
+			require.Contains(t, stdOutBuf.String(), c.expectedOutput)
+			require.NotContains(t, stdOutBuf.String(), "Passed test that should have failed")
+			require.Equal(t, "", stdErrBuf.String(), "should not print any errors")
+		})
+	}
+}
+
 func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
+	if os.Getenv("SKIP_SLOW_TESTS") == "true" {
+		t.Skip("Skipping slow test because SKIP_SLOW_TESTS is enabled")
+	}
+
 	t.Parallel()
 	cases := []struct {
 		name           string
 		expectedOutput []string
 		programName    string
+		steps          int
 	}{
 		{
-			name: "wg and chan test",
+			name: "general concurrency test",
 			expectedOutput: []string{
 				"waitgroup result: 42",
 				"channels result: 1234",
+				"GC complete!",
+			},
+			programName: "mt-general",
+			steps:       5_000_000,
+		},
+		{
+			name: "atomic test",
+			expectedOutput: []string{
+				"Atomic tests passed",
+			},
+			programName: "mt-atomic",
+			steps:       350_000_000,
+		},
+		{
+			name: "waitgroup test",
+			expectedOutput: []string{
+				"WaitGroup tests passed",
 			},
 			programName: "mt-wg",
+			steps:       15_000_000,
 		},
 		{
 			name: "mutex test",
@@ -55,6 +117,7 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 				"Mutex test passed",
 			},
 			programName: "mt-mutex",
+			steps:       5_000_000,
 		},
 		{
 			name: "cond test",
@@ -62,6 +125,7 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 				"Cond test passed",
 			},
 			programName: "mt-cond",
+			steps:       5_000_000,
 		},
 		{
 			name: "rwmutex test",
@@ -69,6 +133,7 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 				"RWMutex test passed",
 			},
 			programName: "mt-rwmutex",
+			steps:       5_000_000,
 		},
 		{
 			name: "once test",
@@ -76,6 +141,15 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 				"Once test passed",
 			},
 			programName: "mt-once",
+			steps:       5_000_000,
+		},
+		{
+			name: "oncefunc test",
+			expectedOutput: []string{
+				"OnceFunc tests passed",
+			},
+			programName: "mt-oncefunc",
+			steps:       15_000_000,
 		},
 		{
 			name: "map test",
@@ -83,6 +157,7 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 				"Map test passed",
 			},
 			programName: "mt-map",
+			steps:       100_000_000,
 		},
 		{
 			name: "pool test",
@@ -90,6 +165,15 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 				"Pool test passed",
 			},
 			programName: "mt-pool",
+			steps:       50_000_000,
+		},
+		{
+			name: "value test",
+			expectedOutput: []string{
+				"Value tests passed",
+			},
+			programName: "mt-value",
+			steps:       3_000_000,
 		},
 	}
 
@@ -97,12 +181,14 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
-			state, _ := testutil.LoadELFProgram(t, testutil.ProgramPath(test.programName), CreateInitialState, false)
+
+			state, meta := testutil.LoadELFProgram(t, testutil.ProgramPath(test.programName), CreateInitialState, false)
 			oracle := testutil.StaticOracle(t, []byte{})
 
 			var stdOutBuf, stdErrBuf bytes.Buffer
-			us := NewInstrumentedState(state, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger(), nil)
-			for i := 0; i < 5_000_000; i++ {
+			us := NewInstrumentedState(state, oracle, io.MultiWriter(&stdOutBuf, os.Stdout), io.MultiWriter(&stdErrBuf, os.Stderr), testutil.CreateLogger(), meta)
+
+			for i := 0; i < test.steps; i++ {
 				if us.GetState().GetExited() {
 					break
 				}
diff --git a/cannon/testdata/example/mt-atomic/atomic_test_copy.go b/cannon/testdata/example/mt-atomic/atomic_test_copy.go
new file mode 100644
index 000000000000..e0cd1ebd69ff
--- /dev/null
+++ b/cannon/testdata/example/mt-atomic/atomic_test_copy.go
@@ -0,0 +1,2567 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/atomic/atomic_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"fmt"
+	"reflect"
+	"runtime"
+	"runtime/debug"
+	"strings"
+	. "sync/atomic"
+	"testing"
+	"unsafe"
+
+	"utils/testutil"
+)
+
+// Tests of correct behavior, without contention.
+// (Does the function work as advertised?)
+//
+// Test that the Add functions add correctly.
+// Test that the CompareAndSwap functions actually
+// do the comparison and the swap correctly.
+//
+// The loop over power-of-two values is meant to
+// ensure that the operations apply to the full word size.
+// The struct fields x.before and x.after check that the
+// operations do not extend past the full word size.
+
+const (
+	magic32 = 0xdedbeef
+	magic64 = 0xdeddeadbeefbeef
+)
+
+func TestSwapInt32(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j int32
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		k := SwapInt32(&x.i, delta)
+		if x.i != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+		j = delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestSwapInt32Method(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      Int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j int32
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		k := x.i.Swap(delta)
+		if x.i.Load() != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+		j = delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestSwapUint32(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j uint32
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		k := SwapUint32(&x.i, delta)
+		if x.i != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+		j = delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestSwapUint32Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      Uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j uint32
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		k := x.i.Swap(delta)
+		if x.i.Load() != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+		j = delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestSwapInt64(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j int64
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		k := SwapInt64(&x.i, delta)
+		if x.i != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+		j = delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestSwapInt64Method(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      Int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j int64
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		k := x.i.Swap(delta)
+		if x.i.Load() != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+		j = delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestSwapUint64(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j uint64
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		k := SwapUint64(&x.i, delta)
+		if x.i != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+		j = delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestSwapUint64Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      Uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j uint64
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		k := x.i.Swap(delta)
+		if x.i.Load() != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+		j = delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestSwapUintptr(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	var j uintptr
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		k := SwapUintptr(&x.i, delta)
+		if x.i != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+		j = delta
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestSwapUintptrMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	var j uintptr
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		k := x.i.Swap(delta)
+		if x.i.Load() != delta || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+		j = delta
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+var global [1024]byte
+
+func testPointers() []unsafe.Pointer {
+	var pointers []unsafe.Pointer
+	// globals
+	for i := 0; i < 10; i++ {
+		pointers = append(pointers, unsafe.Pointer(&global[1<<i-1]))
+	}
+	// heap
+	pointers = append(pointers, unsafe.Pointer(new(byte)))
+	// nil
+	pointers = append(pointers, nil)
+	return pointers
+}
+
+var short bool = true
+
+func TestSwapPointer(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      unsafe.Pointer
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	var j unsafe.Pointer
+
+	for _, p := range testPointers() {
+		k := SwapPointer(&x.i, p)
+		if x.i != p || k != j {
+			t.Fatalf("p=%p i=%p j=%p k=%p", p, x.i, j, k)
+		}
+		j = p
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestSwapPointerMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Pointer[byte]
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	var j *byte
+	for _, p := range testPointers() {
+		p := (*byte)(p)
+		k := x.i.Swap(p)
+		if x.i.Load() != p || k != j {
+			t.Fatalf("p=%p i=%p j=%p k=%p", p, x.i.Load(), j, k)
+		}
+		j = p
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestAddInt32(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j int32
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		k := AddInt32(&x.i, delta)
+		j += delta
+		if x.i != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestAddInt32Method(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      Int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j int32
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		k := x.i.Add(delta)
+		j += delta
+		if x.i.Load() != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestAddUint32(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j uint32
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		k := AddUint32(&x.i, delta)
+		j += delta
+		if x.i != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestAddUint32Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      Uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	var j uint32
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		k := x.i.Add(delta)
+		j += delta
+		if x.i.Load() != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestAddInt64(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j int64
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		k := AddInt64(&x.i, delta)
+		j += delta
+		if x.i != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestAddInt64Method(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      Int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j int64
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		k := x.i.Add(delta)
+		j += delta
+		if x.i.Load() != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestAddUint64(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j uint64
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		k := AddUint64(&x.i, delta)
+		j += delta
+		if x.i != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestAddUint64Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      Uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	var j uint64
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		k := x.i.Add(delta)
+		j += delta
+		if x.i.Load() != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestAddUintptr(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	var j uintptr
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		k := AddUintptr(&x.i, delta)
+		j += delta
+		if x.i != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i, j, k)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestAddUintptrMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	var j uintptr
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		k := x.i.Add(delta)
+		j += delta
+		if x.i.Load() != j || k != j {
+			t.Fatalf("delta=%d i=%d j=%d k=%d", delta, x.i.Load(), j, k)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestCompareAndSwapInt32(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	for val := int32(1); val+val > val; val += val {
+		x.i = val
+		if !CompareAndSwapInt32(&x.i, val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+		x.i = val + 1
+		if CompareAndSwapInt32(&x.i, val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestCompareAndSwapInt32Method(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      Int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	for val := int32(1); val+val > val; val += val {
+		x.i.Store(val)
+		if !x.i.CompareAndSwap(val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+		x.i.Store(val + 1)
+		if x.i.CompareAndSwap(val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestCompareAndSwapUint32(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	for val := uint32(1); val+val > val; val += val {
+		x.i = val
+		if !CompareAndSwapUint32(&x.i, val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+		x.i = val + 1
+		if CompareAndSwapUint32(&x.i, val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestCompareAndSwapUint32Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      Uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	for val := uint32(1); val+val > val; val += val {
+		x.i.Store(val)
+		if !x.i.CompareAndSwap(val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+		x.i.Store(val + 1)
+		if x.i.CompareAndSwap(val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestCompareAndSwapInt64(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	for val := int64(1); val+val > val; val += val {
+		x.i = val
+		if !CompareAndSwapInt64(&x.i, val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+		x.i = val + 1
+		if CompareAndSwapInt64(&x.i, val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestCompareAndSwapInt64Method(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      Int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	for val := int64(1); val+val > val; val += val {
+		x.i.Store(val)
+		if !x.i.CompareAndSwap(val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+		x.i.Store(val + 1)
+		if x.i.CompareAndSwap(val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func testCompareAndSwapUint64(t testing.TB, cas func(*uint64, uint64, uint64) bool) {
+	var x struct {
+		before uint64
+		i      uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	for val := uint64(1); val+val > val; val += val {
+		x.i = val
+		if !cas(&x.i, val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+		x.i = val + 1
+		if cas(&x.i, val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestCompareAndSwapUint64(t *testutil.TestRunner) {
+	testCompareAndSwapUint64(t, CompareAndSwapUint64)
+}
+
+func TestCompareAndSwapUint64Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      Uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	for val := uint64(1); val+val > val; val += val {
+		x.i.Store(val)
+		if !x.i.CompareAndSwap(val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+		x.i.Store(val + 1)
+		if x.i.CompareAndSwap(val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestCompareAndSwapUintptr(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	for val := uintptr(1); val+val > val; val += val {
+		x.i = val
+		if !CompareAndSwapUintptr(&x.i, val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+		x.i = val + 1
+		if CompareAndSwapUintptr(&x.i, val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i, val+1)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestCompareAndSwapUintptrMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	for val := uintptr(1); val+val > val; val += val {
+		x.i.Store(val)
+		if !x.i.CompareAndSwap(val, val+1) {
+			t.Fatalf("should have swapped %#x %#x", val, val+1)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+		x.i.Store(val + 1)
+		if x.i.CompareAndSwap(val, val+2) {
+			t.Fatalf("should not have swapped %#x %#x", val, val+2)
+		}
+		if x.i.Load() != val+1 {
+			t.Fatalf("wrong x.i after swap: x.i=%#x val+1=%#x", x.i.Load(), val+1)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, uintptr(magicptr), uintptr(magicptr))
+	}
+}
+
+func TestCompareAndSwapPointer(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      unsafe.Pointer
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	q := unsafe.Pointer(new(byte))
+	for _, p := range testPointers() {
+		x.i = p
+		if !CompareAndSwapPointer(&x.i, p, q) {
+			t.Fatalf("should have swapped %p %p", p, q)
+		}
+		if x.i != q {
+			t.Fatalf("wrong x.i after swap: x.i=%p want %p", x.i, q)
+		}
+		if CompareAndSwapPointer(&x.i, p, nil) {
+			t.Fatalf("should not have swapped %p nil", p)
+		}
+		if x.i != q {
+			t.Fatalf("wrong x.i after swap: x.i=%p want %p", x.i, q)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestCompareAndSwapPointerMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Pointer[byte]
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	q := new(byte)
+	for _, p := range testPointers() {
+		p := (*byte)(p)
+		x.i.Store(p)
+		if !x.i.CompareAndSwap(p, q) {
+			t.Fatalf("should have swapped %p %p", p, q)
+		}
+		if x.i.Load() != q {
+			t.Fatalf("wrong x.i after swap: x.i=%p want %p", x.i.Load(), q)
+		}
+		if x.i.CompareAndSwap(p, nil) {
+			t.Fatalf("should not have swapped %p nil", p)
+		}
+		if x.i.Load() != q {
+			t.Fatalf("wrong x.i after swap: x.i=%p want %p", x.i.Load(), q)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestLoadInt32(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		k := LoadInt32(&x.i)
+		if k != x.i {
+			t.Fatalf("delta=%d i=%d k=%d", delta, x.i, k)
+		}
+		x.i += delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestLoadInt32Method(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      Int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	want := int32(0)
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		k := x.i.Load()
+		if k != want {
+			t.Fatalf("delta=%d i=%d k=%d want=%d", delta, x.i.Load(), k, want)
+		}
+		x.i.Store(k + delta)
+		want = k + delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestLoadUint32(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		k := LoadUint32(&x.i)
+		if k != x.i {
+			t.Fatalf("delta=%d i=%d k=%d", delta, x.i, k)
+		}
+		x.i += delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestLoadUint32Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      Uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	want := uint32(0)
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		k := x.i.Load()
+		if k != want {
+			t.Fatalf("delta=%d i=%d k=%d want=%d", delta, x.i.Load(), k, want)
+		}
+		x.i.Store(k + delta)
+		want = k + delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestLoadInt64(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		k := LoadInt64(&x.i)
+		if k != x.i {
+			t.Fatalf("delta=%d i=%d k=%d", delta, x.i, k)
+		}
+		x.i += delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestLoadInt64Method(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      Int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	want := int64(0)
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		k := x.i.Load()
+		if k != want {
+			t.Fatalf("delta=%d i=%d k=%d want=%d", delta, x.i.Load(), k, want)
+		}
+		x.i.Store(k + delta)
+		want = k + delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestLoadUint64(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		k := LoadUint64(&x.i)
+		if k != x.i {
+			t.Fatalf("delta=%d i=%d k=%d", delta, x.i, k)
+		}
+		x.i += delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestLoadUint64Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      Uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	want := uint64(0)
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		k := x.i.Load()
+		if k != want {
+			t.Fatalf("delta=%d i=%d k=%d want=%d", delta, x.i.Load(), k, want)
+		}
+		x.i.Store(k + delta)
+		want = k + delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestLoadUintptr(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		k := LoadUintptr(&x.i)
+		if k != x.i {
+			t.Fatalf("delta=%d i=%d k=%d", delta, x.i, k)
+		}
+		x.i += delta
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestLoadUintptrMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	want := uintptr(0)
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		k := x.i.Load()
+		if k != want {
+			t.Fatalf("delta=%d i=%d k=%d want=%d", delta, x.i.Load(), k, want)
+		}
+		x.i.Store(k + delta)
+		want = k + delta
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestLoadPointer(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      unsafe.Pointer
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	for _, p := range testPointers() {
+		x.i = p
+		k := LoadPointer(&x.i)
+		if k != p {
+			t.Fatalf("p=%x k=%x", p, k)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestLoadPointerMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Pointer[byte]
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	for _, p := range testPointers() {
+		p := (*byte)(p)
+		x.i.Store(p)
+		k := x.i.Load()
+		if k != p {
+			t.Fatalf("p=%x k=%x", p, k)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestStoreInt32(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	v := int32(0)
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		StoreInt32(&x.i, v)
+		if x.i != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i, v)
+		}
+		v += delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestStoreInt32Method(t *testutil.TestRunner) {
+	var x struct {
+		before int32
+		i      Int32
+		after  int32
+	}
+	x.before = magic32
+	x.after = magic32
+	v := int32(0)
+	for delta := int32(1); delta+delta > delta; delta += delta {
+		x.i.Store(v)
+		if x.i.Load() != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i.Load(), v)
+		}
+		v += delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestStoreUint32(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	v := uint32(0)
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		StoreUint32(&x.i, v)
+		if x.i != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i, v)
+		}
+		v += delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestStoreUint32Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint32
+		i      Uint32
+		after  uint32
+	}
+	x.before = magic32
+	x.after = magic32
+	v := uint32(0)
+	for delta := uint32(1); delta+delta > delta; delta += delta {
+		x.i.Store(v)
+		if x.i.Load() != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i.Load(), v)
+		}
+		v += delta
+	}
+	if x.before != magic32 || x.after != magic32 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic32, magic32)
+	}
+}
+
+func TestStoreInt64(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	v := int64(0)
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		StoreInt64(&x.i, v)
+		if x.i != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i, v)
+		}
+		v += delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestStoreInt64Method(t *testutil.TestRunner) {
+	var x struct {
+		before int64
+		i      Int64
+		after  int64
+	}
+	magic64 := int64(magic64)
+	x.before = magic64
+	x.after = magic64
+	v := int64(0)
+	for delta := int64(1); delta+delta > delta; delta += delta {
+		x.i.Store(v)
+		if x.i.Load() != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i.Load(), v)
+		}
+		v += delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestStoreUint64(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	v := uint64(0)
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		StoreUint64(&x.i, v)
+		if x.i != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i, v)
+		}
+		v += delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestStoreUint64Method(t *testutil.TestRunner) {
+	var x struct {
+		before uint64
+		i      Uint64
+		after  uint64
+	}
+	magic64 := uint64(magic64)
+	x.before = magic64
+	x.after = magic64
+	v := uint64(0)
+	for delta := uint64(1); delta+delta > delta; delta += delta {
+		x.i.Store(v)
+		if x.i.Load() != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i.Load(), v)
+		}
+		v += delta
+	}
+	if x.before != magic64 || x.after != magic64 {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magic64, magic64)
+	}
+}
+
+func TestStoreUintptr(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	v := uintptr(0)
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		StoreUintptr(&x.i, v)
+		if x.i != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i, v)
+		}
+		v += delta
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestStoreUintptrMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Uintptr
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	v := uintptr(0)
+	for delta := uintptr(1); delta+delta > delta; delta += delta {
+		x.i.Store(v)
+		if x.i.Load() != v {
+			t.Fatalf("delta=%d i=%d v=%d", delta, x.i.Load(), v)
+		}
+		v += delta
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestStorePointer(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      unsafe.Pointer
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	for _, p := range testPointers() {
+		StorePointer(&x.i, p)
+		if x.i != p {
+			t.Fatalf("x.i=%p p=%p", x.i, p)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+func TestStorePointerMethod(t *testutil.TestRunner) {
+	var x struct {
+		before uintptr
+		i      Pointer[byte]
+		after  uintptr
+	}
+	var m uint64 = magic64
+	magicptr := uintptr(m)
+	x.before = magicptr
+	x.after = magicptr
+	for _, p := range testPointers() {
+		p := (*byte)(p)
+		x.i.Store(p)
+		if x.i.Load() != p {
+			t.Fatalf("x.i=%p p=%p", x.i.Load(), p)
+		}
+	}
+	if x.before != magicptr || x.after != magicptr {
+		t.Fatalf("wrong magic: %#x _ %#x != %#x _ %#x", x.before, x.after, magicptr, magicptr)
+	}
+}
+
+// Tests of correct behavior, with contention.
+// (Is the function atomic?)
+//
+// For each function, we write a "hammer" function that repeatedly
+// uses the atomic operation to add 1 to a value. After running
+// multiple hammers in parallel, check that we end with the correct
+// total.
+// Swap can't add 1, so it uses a different scheme.
+// The functions repeatedly generate a pseudo-random number such that
+// low bits are equal to high bits, swap, check that the old value
+// has low and high bits equal.
+
+var hammer32 = map[string]func(*uint32, int){
+	"SwapInt32":             hammerSwapInt32,
+	"SwapUint32":            hammerSwapUint32,
+	"SwapUintptr":           hammerSwapUintptr32,
+	"AddInt32":              hammerAddInt32,
+	"AddUint32":             hammerAddUint32,
+	"AddUintptr":            hammerAddUintptr32,
+	"CompareAndSwapInt32":   hammerCompareAndSwapInt32,
+	"CompareAndSwapUint32":  hammerCompareAndSwapUint32,
+	"CompareAndSwapUintptr": hammerCompareAndSwapUintptr32,
+
+	"SwapInt32Method":             hammerSwapInt32Method,
+	"SwapUint32Method":            hammerSwapUint32Method,
+	"SwapUintptrMethod":           hammerSwapUintptr32Method,
+	"AddInt32Method":              hammerAddInt32Method,
+	"AddUint32Method":             hammerAddUint32Method,
+	"AddUintptrMethod":            hammerAddUintptr32Method,
+	"CompareAndSwapInt32Method":   hammerCompareAndSwapInt32Method,
+	"CompareAndSwapUint32Method":  hammerCompareAndSwapUint32Method,
+	"CompareAndSwapUintptrMethod": hammerCompareAndSwapUintptr32Method,
+}
+
+func init() {
+	var v uint64 = 1 << 50
+	if uintptr(v) != 0 {
+		// 64-bit system; clear uintptr tests
+		delete(hammer32, "SwapUintptr")
+		delete(hammer32, "AddUintptr")
+		delete(hammer32, "CompareAndSwapUintptr")
+		delete(hammer32, "SwapUintptrMethod")
+		delete(hammer32, "AddUintptrMethod")
+		delete(hammer32, "CompareAndSwapUintptrMethod")
+	}
+}
+
+func hammerSwapInt32(uaddr *uint32, count int) {
+	addr := (*int32)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint32(seed+i)<<16 | uint32(seed+i)<<16>>16
+		old := uint32(SwapInt32(addr, int32(new)))
+		if old>>16 != old<<16>>16 {
+			panic(fmt.Sprintf("SwapInt32 is not atomic: %v", old))
+		}
+	}
+}
+
+func hammerSwapInt32Method(uaddr *uint32, count int) {
+	addr := (*Int32)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint32(seed+i)<<16 | uint32(seed+i)<<16>>16
+		old := uint32(addr.Swap(int32(new)))
+		if old>>16 != old<<16>>16 {
+			panic(fmt.Sprintf("SwapInt32 is not atomic: %v", old))
+		}
+	}
+}
+
+func hammerSwapUint32(addr *uint32, count int) {
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint32(seed+i)<<16 | uint32(seed+i)<<16>>16
+		old := SwapUint32(addr, new)
+		if old>>16 != old<<16>>16 {
+			panic(fmt.Sprintf("SwapUint32 is not atomic: %v", old))
+		}
+	}
+}
+
+func hammerSwapUint32Method(uaddr *uint32, count int) {
+	addr := (*Uint32)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint32(seed+i)<<16 | uint32(seed+i)<<16>>16
+		old := addr.Swap(new)
+		if old>>16 != old<<16>>16 {
+			panic(fmt.Sprintf("SwapUint32 is not atomic: %v", old))
+		}
+	}
+}
+
+func hammerSwapUintptr32(uaddr *uint32, count int) {
+	// only safe when uintptr is 32-bit.
+	// not called on 64-bit systems.
+	addr := (*uintptr)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uintptr(seed+i)<<16 | uintptr(seed+i)<<16>>16
+		old := SwapUintptr(addr, new)
+		if old>>16 != old<<16>>16 {
+			panic(fmt.Sprintf("SwapUintptr is not atomic: %#08x", old))
+		}
+	}
+}
+
+func hammerSwapUintptr32Method(uaddr *uint32, count int) {
+	// only safe when uintptr is 32-bit.
+	// not called on 64-bit systems.
+	addr := (*Uintptr)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uintptr(seed+i)<<16 | uintptr(seed+i)<<16>>16
+		old := addr.Swap(new)
+		if old>>16 != old<<16>>16 {
+			panic(fmt.Sprintf("Uintptr.Swap is not atomic: %#08x", old))
+		}
+	}
+}
+
+func hammerAddInt32(uaddr *uint32, count int) {
+	addr := (*int32)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		AddInt32(addr, 1)
+	}
+}
+
+func hammerAddInt32Method(uaddr *uint32, count int) {
+	addr := (*Int32)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		addr.Add(1)
+	}
+}
+
+func hammerAddUint32(addr *uint32, count int) {
+	for i := 0; i < count; i++ {
+		AddUint32(addr, 1)
+	}
+}
+
+func hammerAddUint32Method(uaddr *uint32, count int) {
+	addr := (*Uint32)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		addr.Add(1)
+	}
+}
+
+func hammerAddUintptr32(uaddr *uint32, count int) {
+	// only safe when uintptr is 32-bit.
+	// not called on 64-bit systems.
+	addr := (*uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		AddUintptr(addr, 1)
+	}
+}
+
+func hammerAddUintptr32Method(uaddr *uint32, count int) {
+	// only safe when uintptr is 32-bit.
+	// not called on 64-bit systems.
+	addr := (*Uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		addr.Add(1)
+	}
+}
+
+func hammerCompareAndSwapInt32(uaddr *uint32, count int) {
+	addr := (*int32)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := LoadInt32(addr)
+			if CompareAndSwapInt32(addr, v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapInt32Method(uaddr *uint32, count int) {
+	addr := (*Int32)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := addr.Load()
+			if addr.CompareAndSwap(v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUint32(addr *uint32, count int) {
+	for i := 0; i < count; i++ {
+		for {
+			v := LoadUint32(addr)
+			if CompareAndSwapUint32(addr, v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUint32Method(uaddr *uint32, count int) {
+	addr := (*Uint32)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := addr.Load()
+			if addr.CompareAndSwap(v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUintptr32(uaddr *uint32, count int) {
+	// only safe when uintptr is 32-bit.
+	// not called on 64-bit systems.
+	addr := (*uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := LoadUintptr(addr)
+			if CompareAndSwapUintptr(addr, v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUintptr32Method(uaddr *uint32, count int) {
+	// only safe when uintptr is 32-bit.
+	// not called on 64-bit systems.
+	addr := (*Uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := addr.Load()
+			if addr.CompareAndSwap(v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func TestHammer32(t *testutil.TestRunner) {
+	const p = 4
+	n := 100000
+	if short {
+		n = 1000
+	}
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(p))
+
+	for name, testf := range hammer32 {
+		c := make(chan int)
+		var val uint32
+		for i := 0; i < p; i++ {
+			go func() {
+				defer func() {
+					if err := recover(); err != nil {
+						t.Error(err.(string))
+					}
+					c <- 1
+				}()
+				testf(&val, n)
+			}()
+		}
+		for i := 0; i < p; i++ {
+			<-c
+		}
+		if !strings.HasPrefix(name, "Swap") && val != uint32(n)*p {
+			t.Fatalf("%s: val=%d want %d", name, val, n*p)
+		}
+	}
+}
+
+var hammer64 = map[string]func(*uint64, int){
+	"SwapInt64":             hammerSwapInt64,
+	"SwapUint64":            hammerSwapUint64,
+	"SwapUintptr":           hammerSwapUintptr64,
+	"AddInt64":              hammerAddInt64,
+	"AddUint64":             hammerAddUint64,
+	"AddUintptr":            hammerAddUintptr64,
+	"CompareAndSwapInt64":   hammerCompareAndSwapInt64,
+	"CompareAndSwapUint64":  hammerCompareAndSwapUint64,
+	"CompareAndSwapUintptr": hammerCompareAndSwapUintptr64,
+
+	"SwapInt64Method":             hammerSwapInt64Method,
+	"SwapUint64Method":            hammerSwapUint64Method,
+	"SwapUintptrMethod":           hammerSwapUintptr64Method,
+	"AddInt64Method":              hammerAddInt64Method,
+	"AddUint64Method":             hammerAddUint64Method,
+	"AddUintptrMethod":            hammerAddUintptr64Method,
+	"CompareAndSwapInt64Method":   hammerCompareAndSwapInt64Method,
+	"CompareAndSwapUint64Method":  hammerCompareAndSwapUint64Method,
+	"CompareAndSwapUintptrMethod": hammerCompareAndSwapUintptr64Method,
+}
+
+func init() {
+	var v uint64 = 1 << 50
+	if uintptr(v) == 0 {
+		// 32-bit system; clear uintptr tests
+		delete(hammer64, "SwapUintptr")
+		delete(hammer64, "SwapUintptrMethod")
+		delete(hammer64, "AddUintptr")
+		delete(hammer64, "AddUintptrMethod")
+		delete(hammer64, "CompareAndSwapUintptr")
+		delete(hammer64, "CompareAndSwapUintptrMethod")
+	}
+}
+
+func hammerSwapInt64(uaddr *uint64, count int) {
+	addr := (*int64)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint64(seed+i)<<32 | uint64(seed+i)<<32>>32
+		old := uint64(SwapInt64(addr, int64(new)))
+		if old>>32 != old<<32>>32 {
+			panic(fmt.Sprintf("SwapInt64 is not atomic: %v", old))
+		}
+	}
+}
+
+func hammerSwapInt64Method(uaddr *uint64, count int) {
+	addr := (*Int64)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint64(seed+i)<<32 | uint64(seed+i)<<32>>32
+		old := uint64(addr.Swap(int64(new)))
+		if old>>32 != old<<32>>32 {
+			panic(fmt.Sprintf("SwapInt64 is not atomic: %v", old))
+		}
+	}
+}
+
+func hammerSwapUint64(addr *uint64, count int) {
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint64(seed+i)<<32 | uint64(seed+i)<<32>>32
+		old := SwapUint64(addr, new)
+		if old>>32 != old<<32>>32 {
+			panic(fmt.Sprintf("SwapUint64 is not atomic: %v", old))
+		}
+	}
+}
+
+func hammerSwapUint64Method(uaddr *uint64, count int) {
+	addr := (*Uint64)(unsafe.Pointer(uaddr))
+	seed := int(uintptr(unsafe.Pointer(&count)))
+	for i := 0; i < count; i++ {
+		new := uint64(seed+i)<<32 | uint64(seed+i)<<32>>32
+		old := addr.Swap(new)
+		if old>>32 != old<<32>>32 {
+			panic(fmt.Sprintf("SwapUint64 is not atomic: %v", old))
+		}
+	}
+}
+
+const arch32 = unsafe.Sizeof(uintptr(0)) == 4
+
+func hammerSwapUintptr64(uaddr *uint64, count int) {
+	// only safe when uintptr is 64-bit.
+	// not called on 32-bit systems.
+	if !arch32 {
+		addr := (*uintptr)(unsafe.Pointer(uaddr))
+		seed := int(uintptr(unsafe.Pointer(&count)))
+		for i := 0; i < count; i++ {
+			new := uintptr(seed+i)<<32 | uintptr(seed+i)<<32>>32
+			old := SwapUintptr(addr, new)
+			if old>>32 != old<<32>>32 {
+				panic(fmt.Sprintf("SwapUintptr is not atomic: %v", old))
+			}
+		}
+	}
+}
+
+func hammerSwapUintptr64Method(uaddr *uint64, count int) {
+	// only safe when uintptr is 64-bit.
+	// not called on 32-bit systems.
+	if !arch32 {
+		addr := (*Uintptr)(unsafe.Pointer(uaddr))
+		seed := int(uintptr(unsafe.Pointer(&count)))
+		for i := 0; i < count; i++ {
+			new := uintptr(seed+i)<<32 | uintptr(seed+i)<<32>>32
+			old := addr.Swap(new)
+			if old>>32 != old<<32>>32 {
+				panic(fmt.Sprintf("SwapUintptr is not atomic: %v", old))
+			}
+		}
+	}
+}
+
+func hammerAddInt64(uaddr *uint64, count int) {
+	addr := (*int64)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		AddInt64(addr, 1)
+	}
+}
+
+func hammerAddInt64Method(uaddr *uint64, count int) {
+	addr := (*Int64)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		addr.Add(1)
+	}
+}
+
+func hammerAddUint64(addr *uint64, count int) {
+	for i := 0; i < count; i++ {
+		AddUint64(addr, 1)
+	}
+}
+
+func hammerAddUint64Method(uaddr *uint64, count int) {
+	addr := (*Uint64)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		addr.Add(1)
+	}
+}
+
+func hammerAddUintptr64(uaddr *uint64, count int) {
+	// only safe when uintptr is 64-bit.
+	// not called on 32-bit systems.
+	addr := (*uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		AddUintptr(addr, 1)
+	}
+}
+
+func hammerAddUintptr64Method(uaddr *uint64, count int) {
+	// only safe when uintptr is 64-bit.
+	// not called on 32-bit systems.
+	addr := (*Uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		addr.Add(1)
+	}
+}
+
+func hammerCompareAndSwapInt64(uaddr *uint64, count int) {
+	addr := (*int64)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := LoadInt64(addr)
+			if CompareAndSwapInt64(addr, v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapInt64Method(uaddr *uint64, count int) {
+	addr := (*Int64)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := addr.Load()
+			if addr.CompareAndSwap(v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUint64(addr *uint64, count int) {
+	for i := 0; i < count; i++ {
+		for {
+			v := LoadUint64(addr)
+			if CompareAndSwapUint64(addr, v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUint64Method(uaddr *uint64, count int) {
+	addr := (*Uint64)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := addr.Load()
+			if addr.CompareAndSwap(v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUintptr64(uaddr *uint64, count int) {
+	// only safe when uintptr is 64-bit.
+	// not called on 32-bit systems.
+	addr := (*uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := LoadUintptr(addr)
+			if CompareAndSwapUintptr(addr, v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func hammerCompareAndSwapUintptr64Method(uaddr *uint64, count int) {
+	// only safe when uintptr is 64-bit.
+	// not called on 32-bit systems.
+	addr := (*Uintptr)(unsafe.Pointer(uaddr))
+	for i := 0; i < count; i++ {
+		for {
+			v := addr.Load()
+			if addr.CompareAndSwap(v, v+1) {
+				break
+			}
+		}
+	}
+}
+
+func TestHammer64(t *testutil.TestRunner) {
+	const p = 4
+	n := 100000
+	if short {
+		n = 1000
+	}
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(p))
+
+	for name, testf := range hammer64 {
+		c := make(chan int)
+		var val uint64
+		for i := 0; i < p; i++ {
+			go func() {
+				defer func() {
+					if err := recover(); err != nil {
+						t.Error(err.(string))
+					}
+					c <- 1
+				}()
+				testf(&val, n)
+			}()
+		}
+		for i := 0; i < p; i++ {
+			<-c
+		}
+		if !strings.HasPrefix(name, "Swap") && val != uint64(n)*p {
+			t.Fatalf("%s: val=%d want %d", name, val, n*p)
+		}
+	}
+}
+
+func hammerStoreLoadInt32(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*int32)(paddr)
+	v := LoadInt32(addr)
+	vlo := v & ((1 << 16) - 1)
+	vhi := v >> 16
+	if vlo != vhi {
+		t.Fatalf("Int32: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<16
+	if vlo == 1e4 {
+		new = 0
+	}
+	StoreInt32(addr, new)
+}
+
+func hammerStoreLoadInt32Method(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*int32)(paddr)
+	v := LoadInt32(addr)
+	vlo := v & ((1 << 16) - 1)
+	vhi := v >> 16
+	if vlo != vhi {
+		t.Fatalf("Int32: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<16
+	if vlo == 1e4 {
+		new = 0
+	}
+	StoreInt32(addr, new)
+}
+
+func hammerStoreLoadUint32(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*uint32)(paddr)
+	v := LoadUint32(addr)
+	vlo := v & ((1 << 16) - 1)
+	vhi := v >> 16
+	if vlo != vhi {
+		t.Fatalf("Uint32: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<16
+	if vlo == 1e4 {
+		new = 0
+	}
+	StoreUint32(addr, new)
+}
+
+func hammerStoreLoadUint32Method(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*Uint32)(paddr)
+	v := addr.Load()
+	vlo := v & ((1 << 16) - 1)
+	vhi := v >> 16
+	if vlo != vhi {
+		t.Fatalf("Uint32: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<16
+	if vlo == 1e4 {
+		new = 0
+	}
+	addr.Store(new)
+}
+
+func hammerStoreLoadInt64(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*int64)(paddr)
+	v := LoadInt64(addr)
+	vlo := v & ((1 << 32) - 1)
+	vhi := v >> 32
+	if vlo != vhi {
+		t.Fatalf("Int64: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<32
+	StoreInt64(addr, new)
+}
+
+func hammerStoreLoadInt64Method(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*Int64)(paddr)
+	v := addr.Load()
+	vlo := v & ((1 << 32) - 1)
+	vhi := v >> 32
+	if vlo != vhi {
+		t.Fatalf("Int64: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<32
+	addr.Store(new)
+}
+
+func hammerStoreLoadUint64(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*uint64)(paddr)
+	v := LoadUint64(addr)
+	vlo := v & ((1 << 32) - 1)
+	vhi := v >> 32
+	if vlo != vhi {
+		t.Fatalf("Uint64: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<32
+	StoreUint64(addr, new)
+}
+
+func hammerStoreLoadUint64Method(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*Uint64)(paddr)
+	v := addr.Load()
+	vlo := v & ((1 << 32) - 1)
+	vhi := v >> 32
+	if vlo != vhi {
+		t.Fatalf("Uint64: %#x != %#x", vlo, vhi)
+	}
+	new := v + 1 + 1<<32
+	addr.Store(new)
+}
+
+func hammerStoreLoadUintptr(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*uintptr)(paddr)
+	v := LoadUintptr(addr)
+	new := v
+	if arch32 {
+		vlo := v & ((1 << 16) - 1)
+		vhi := v >> 16
+		if vlo != vhi {
+			t.Fatalf("Uintptr: %#x != %#x", vlo, vhi)
+		}
+		new = v + 1 + 1<<16
+		if vlo == 1e4 {
+			new = 0
+		}
+	} else {
+		vlo := v & ((1 << 32) - 1)
+		vhi := v >> 32
+		if vlo != vhi {
+			t.Fatalf("Uintptr: %#x != %#x", vlo, vhi)
+		}
+		inc := uint64(1 + 1<<32)
+		new = v + uintptr(inc)
+	}
+	StoreUintptr(addr, new)
+}
+
+//go:nocheckptr
+func hammerStoreLoadUintptrMethod(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*Uintptr)(paddr)
+	v := addr.Load()
+	new := v
+	if arch32 {
+		vlo := v & ((1 << 16) - 1)
+		vhi := v >> 16
+		if vlo != vhi {
+			t.Fatalf("Uintptr: %#x != %#x", vlo, vhi)
+		}
+		new = v + 1 + 1<<16
+		if vlo == 1e4 {
+			new = 0
+		}
+	} else {
+		vlo := v & ((1 << 32) - 1)
+		vhi := v >> 32
+		if vlo != vhi {
+			t.Fatalf("Uintptr: %#x != %#x", vlo, vhi)
+		}
+		inc := uint64(1 + 1<<32)
+		new = v + uintptr(inc)
+	}
+	addr.Store(new)
+}
+
+// This code is just testing that LoadPointer/StorePointer operate
+// atomically; it's not actually calculating pointers.
+//
+//go:nocheckptr
+func hammerStoreLoadPointer(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*unsafe.Pointer)(paddr)
+	v := uintptr(LoadPointer(addr))
+	new := v
+	if arch32 {
+		vlo := v & ((1 << 16) - 1)
+		vhi := v >> 16
+		if vlo != vhi {
+			t.Fatalf("Pointer: %#x != %#x", vlo, vhi)
+		}
+		new = v + 1 + 1<<16
+		if vlo == 1e4 {
+			new = 0
+		}
+	} else {
+		vlo := v & ((1 << 32) - 1)
+		vhi := v >> 32
+		if vlo != vhi {
+			t.Fatalf("Pointer: %#x != %#x", vlo, vhi)
+		}
+		inc := uint64(1 + 1<<32)
+		new = v + uintptr(inc)
+	}
+	StorePointer(addr, unsafe.Pointer(new))
+}
+
+// This code is just testing that LoadPointer/StorePointer operate
+// atomically; it's not actually calculating pointers.
+//
+//go:nocheckptr
+func hammerStoreLoadPointerMethod(t testing.TB, paddr unsafe.Pointer) {
+	addr := (*Pointer[byte])(paddr)
+	v := uintptr(unsafe.Pointer(addr.Load()))
+	new := v
+	if arch32 {
+		vlo := v & ((1 << 16) - 1)
+		vhi := v >> 16
+		if vlo != vhi {
+			t.Fatalf("Pointer: %#x != %#x", vlo, vhi)
+		}
+		new = v + 1 + 1<<16
+		if vlo == 1e4 {
+			new = 0
+		}
+	} else {
+		vlo := v & ((1 << 32) - 1)
+		vhi := v >> 32
+		if vlo != vhi {
+			t.Fatalf("Pointer: %#x != %#x", vlo, vhi)
+		}
+		inc := uint64(1 + 1<<32)
+		new = v + uintptr(inc)
+	}
+	addr.Store((*byte)(unsafe.Pointer(new)))
+}
+
+func TestHammerStoreLoad(t *testutil.TestRunner) {
+	tests := []func(testing.TB, unsafe.Pointer){
+		hammerStoreLoadInt32, hammerStoreLoadUint32,
+		hammerStoreLoadUintptr, hammerStoreLoadPointer,
+		hammerStoreLoadInt32Method, hammerStoreLoadUint32Method,
+		hammerStoreLoadUintptrMethod, hammerStoreLoadPointerMethod,
+		hammerStoreLoadInt64, hammerStoreLoadUint64,
+		hammerStoreLoadInt64Method, hammerStoreLoadUint64Method,
+	}
+	n := int(1e6)
+	if short {
+		n = int(1e4)
+	}
+	const procs = 8
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(procs))
+	// Disable the GC because hammerStoreLoadPointer invokes
+	// write barriers on values that aren't real pointers.
+	defer debug.SetGCPercent(debug.SetGCPercent(-1))
+	// Ensure any in-progress GC is finished.
+	runtime.GC()
+	for _, tt := range tests {
+		c := make(chan int)
+		var val uint64
+		for p := 0; p < procs; p++ {
+			go func() {
+				for i := 0; i < n; i++ {
+					tt(t, unsafe.Pointer(&val))
+				}
+				c <- 1
+			}()
+		}
+		for p := 0; p < procs; p++ {
+			<-c
+		}
+	}
+}
+
+func TestStoreLoadSeqCst32(t *testutil.TestRunner) {
+	if runtime.NumCPU() == 1 {
+		t.Skipf("Skipping test on %v processor machine", runtime.NumCPU())
+	}
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(4))
+	N := int32(1e3)
+	if short {
+		N = int32(1e2)
+	}
+	c := make(chan bool, 2)
+	X := [2]int32{}
+	ack := [2][3]int32{{-1, -1, -1}, {-1, -1, -1}}
+	for p := 0; p < 2; p++ {
+		go func(me int) {
+			he := 1 - me
+			for i := int32(1); i < N; i++ {
+				StoreInt32(&X[me], i)
+				my := LoadInt32(&X[he])
+				StoreInt32(&ack[me][i%3], my)
+				for w := 1; LoadInt32(&ack[he][i%3]) == -1; w++ {
+					if w%1000 == 0 {
+						runtime.Gosched()
+					}
+				}
+				his := LoadInt32(&ack[he][i%3])
+				if (my != i && my != i-1) || (his != i && his != i-1) {
+					t.Errorf("invalid values: %d/%d (%d)", my, his, i)
+					break
+				}
+				if my != i && his != i {
+					t.Errorf("store/load are not sequentially consistent: %d/%d (%d)", my, his, i)
+					break
+				}
+				StoreInt32(&ack[me][(i-1)%3], -1)
+			}
+			c <- true
+		}(p)
+	}
+	<-c
+	<-c
+}
+
+func TestStoreLoadSeqCst64(t *testutil.TestRunner) {
+	if runtime.NumCPU() == 1 {
+		t.Skipf("Skipping test on %v processor machine", runtime.NumCPU())
+	}
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(4))
+	N := int64(1e3)
+	if short {
+		N = int64(1e2)
+	}
+	c := make(chan bool, 2)
+	X := [2]int64{}
+	ack := [2][3]int64{{-1, -1, -1}, {-1, -1, -1}}
+	for p := 0; p < 2; p++ {
+		go func(me int) {
+			he := 1 - me
+			for i := int64(1); i < N; i++ {
+				StoreInt64(&X[me], i)
+				my := LoadInt64(&X[he])
+				StoreInt64(&ack[me][i%3], my)
+				for w := 1; LoadInt64(&ack[he][i%3]) == -1; w++ {
+					if w%1000 == 0 {
+						runtime.Gosched()
+					}
+				}
+				his := LoadInt64(&ack[he][i%3])
+				if (my != i && my != i-1) || (his != i && his != i-1) {
+					t.Errorf("invalid values: %d/%d (%d)", my, his, i)
+					break
+				}
+				if my != i && his != i {
+					t.Errorf("store/load are not sequentially consistent: %d/%d (%d)", my, his, i)
+					break
+				}
+				StoreInt64(&ack[me][(i-1)%3], -1)
+			}
+			c <- true
+		}(p)
+	}
+	<-c
+	<-c
+}
+
+func TestStoreLoadRelAcq32(t *testutil.TestRunner) {
+	if runtime.NumCPU() == 1 {
+		t.Skipf("Skipping test on %v processor machine", runtime.NumCPU())
+	}
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(4))
+	N := int32(1e3)
+	if short {
+		N = int32(1e2)
+	}
+	c := make(chan bool, 2)
+	type Data struct {
+		signal int32
+		pad1   [128]int8
+		data1  int32
+		pad2   [128]int8
+		data2  float32
+	}
+	var X Data
+	for p := int32(0); p < 2; p++ {
+		go func(p int32) {
+			for i := int32(1); i < N; i++ {
+				if (i+p)%2 == 0 {
+					X.data1 = i
+					X.data2 = float32(i)
+					StoreInt32(&X.signal, i)
+				} else {
+					for w := 1; LoadInt32(&X.signal) != i; w++ {
+						if w%1000 == 0 {
+							runtime.Gosched()
+						}
+					}
+					d1 := X.data1
+					d2 := X.data2
+					if d1 != i || d2 != float32(i) {
+						t.Errorf("incorrect data: %d/%g (%d)", d1, d2, i)
+						break
+					}
+				}
+			}
+			c <- true
+		}(p)
+	}
+	<-c
+	<-c
+}
+
+func TestStoreLoadRelAcq64(t *testutil.TestRunner) {
+	if runtime.NumCPU() == 1 {
+		t.Skipf("Skipping test on %v processor machine", runtime.NumCPU())
+	}
+	defer runtime.GOMAXPROCS(runtime.GOMAXPROCS(4))
+	N := int64(1e3)
+	if short {
+		N = int64(1e2)
+	}
+	c := make(chan bool, 2)
+	type Data struct {
+		signal int64
+		pad1   [128]int8
+		data1  int64
+		pad2   [128]int8
+		data2  float64
+	}
+	var X Data
+	for p := int64(0); p < 2; p++ {
+		go func(p int64) {
+			for i := int64(1); i < N; i++ {
+				if (i+p)%2 == 0 {
+					X.data1 = i
+					X.data2 = float64(i)
+					StoreInt64(&X.signal, i)
+				} else {
+					for w := 1; LoadInt64(&X.signal) != i; w++ {
+						if w%1000 == 0 {
+							runtime.Gosched()
+						}
+					}
+					d1 := X.data1
+					d2 := X.data2
+					if d1 != i || d2 != float64(i) {
+						t.Errorf("incorrect data: %d/%g (%d)", d1, d2, i)
+						break
+					}
+				}
+			}
+			c <- true
+		}(p)
+	}
+	<-c
+	<-c
+}
+
+func shouldPanic(t testing.TB, name string, f func()) {
+	defer func() {
+		// Check that all GC maps are sane.
+		runtime.GC()
+
+		err := recover()
+		want := "unaligned 64-bit atomic operation"
+		if err == nil {
+			t.Errorf("%s did not panic", name)
+		} else if s, _ := err.(string); s != want {
+			t.Errorf("%s: wanted panic %q, got %q", name, want, err)
+		}
+	}()
+	f()
+}
+
+func TestUnaligned64(t *testutil.TestRunner) {
+	// Unaligned 64-bit atomics on 32-bit systems are
+	// a continual source of pain. Test that on 32-bit systems they crash
+	// instead of failing silently.
+	if !arch32 {
+		t.Skip("test only runs on 32-bit systems")
+	}
+
+	x := make([]uint32, 4)
+	p := (*uint64)(unsafe.Pointer(&x[1])) // misaligned
+
+	shouldPanic(t, "LoadUint64", func() { LoadUint64(p) })
+	shouldPanic(t, "LoadUint64Method", func() { (*Uint64)(unsafe.Pointer(p)).Load() })
+	shouldPanic(t, "StoreUint64", func() { StoreUint64(p, 1) })
+	shouldPanic(t, "StoreUint64Method", func() { (*Uint64)(unsafe.Pointer(p)).Store(1) })
+	shouldPanic(t, "CompareAndSwapUint64", func() { CompareAndSwapUint64(p, 1, 2) })
+	shouldPanic(t, "CompareAndSwapUint64Method", func() { (*Uint64)(unsafe.Pointer(p)).CompareAndSwap(1, 2) })
+	shouldPanic(t, "AddUint64", func() { AddUint64(p, 3) })
+	shouldPanic(t, "AddUint64Method", func() { (*Uint64)(unsafe.Pointer(p)).Add(3) })
+}
+
+func TestAutoAligned64(t *testutil.TestRunner) {
+	var signed struct {
+		_ uint32
+		i Int64
+	}
+	if o := reflect.TypeOf(&signed).Elem().Field(1).Offset; o != 8 {
+		t.Fatalf("Int64 offset = %d, want 8", o)
+	}
+	if p := reflect.ValueOf(&signed).Elem().Field(1).Addr().Pointer(); p&7 != 0 {
+		t.Fatalf("Int64 pointer = %#x, want 8-aligned", p)
+	}
+
+	var unsigned struct {
+		_ uint32
+		i Uint64
+	}
+	if o := reflect.TypeOf(&unsigned).Elem().Field(1).Offset; o != 8 {
+		t.Fatalf("Uint64 offset = %d, want 8", o)
+	}
+	if p := reflect.ValueOf(&unsigned).Elem().Field(1).Addr().Pointer(); p&7 != 0 {
+		t.Fatalf("Int64 pointer = %#x, want 8-aligned", p)
+	}
+}
+
+func TestNilDeref(t *testutil.TestRunner) {
+	funcs := [...]func(){
+		func() { CompareAndSwapInt32(nil, 0, 0) },
+		func() { (*Int32)(nil).CompareAndSwap(0, 0) },
+		func() { CompareAndSwapInt64(nil, 0, 0) },
+		func() { (*Int64)(nil).CompareAndSwap(0, 0) },
+		func() { CompareAndSwapUint32(nil, 0, 0) },
+		func() { (*Uint32)(nil).CompareAndSwap(0, 0) },
+		func() { CompareAndSwapUint64(nil, 0, 0) },
+		func() { (*Uint64)(nil).CompareAndSwap(0, 0) },
+		func() { CompareAndSwapUintptr(nil, 0, 0) },
+		func() { (*Uintptr)(nil).CompareAndSwap(0, 0) },
+		func() { CompareAndSwapPointer(nil, nil, nil) },
+		func() { (*Pointer[byte])(nil).CompareAndSwap(nil, nil) },
+		func() { SwapInt32(nil, 0) },
+		func() { (*Int32)(nil).Swap(0) },
+		func() { SwapUint32(nil, 0) },
+		func() { (*Uint32)(nil).Swap(0) },
+		func() { SwapInt64(nil, 0) },
+		func() { (*Int64)(nil).Swap(0) },
+		func() { SwapUint64(nil, 0) },
+		func() { (*Uint64)(nil).Swap(0) },
+		func() { SwapUintptr(nil, 0) },
+		func() { (*Uintptr)(nil).Swap(0) },
+		func() { SwapPointer(nil, nil) },
+		func() { (*Pointer[byte])(nil).Swap(nil) },
+		func() { AddInt32(nil, 0) },
+		func() { (*Int32)(nil).Add(0) },
+		func() { AddUint32(nil, 0) },
+		func() { (*Uint32)(nil).Add(0) },
+		func() { AddInt64(nil, 0) },
+		func() { (*Int64)(nil).Add(0) },
+		func() { AddUint64(nil, 0) },
+		func() { (*Uint64)(nil).Add(0) },
+		func() { AddUintptr(nil, 0) },
+		func() { (*Uintptr)(nil).Add(0) },
+		func() { LoadInt32(nil) },
+		func() { (*Int32)(nil).Load() },
+		func() { LoadInt64(nil) },
+		func() { (*Int64)(nil).Load() },
+		func() { LoadUint32(nil) },
+		func() { (*Uint32)(nil).Load() },
+		func() { LoadUint64(nil) },
+		func() { (*Uint64)(nil).Load() },
+		func() { LoadUintptr(nil) },
+		func() { (*Uintptr)(nil).Load() },
+		func() { LoadPointer(nil) },
+		func() { (*Pointer[byte])(nil).Load() },
+		func() { StoreInt32(nil, 0) },
+		func() { (*Int32)(nil).Store(0) },
+		func() { StoreInt64(nil, 0) },
+		func() { (*Int64)(nil).Store(0) },
+		func() { StoreUint32(nil, 0) },
+		func() { (*Uint32)(nil).Store(0) },
+		func() { StoreUint64(nil, 0) },
+		func() { (*Uint64)(nil).Store(0) },
+		func() { StoreUintptr(nil, 0) },
+		func() { (*Uintptr)(nil).Store(0) },
+		func() { StorePointer(nil, nil) },
+		func() { (*Pointer[byte])(nil).Store(nil) },
+	}
+	for _, f := range funcs {
+		func() {
+			defer func() {
+				runtime.GC()
+				recover()
+			}()
+			f()
+		}()
+	}
+}
+
+// Test that this compiles.
+// When atomic.Pointer used _ [0]T, it did not.
+type List struct {
+	Next Pointer[List]
+}
diff --git a/cannon/testdata/example/mt-atomic/go.mod b/cannon/testdata/example/mt-atomic/go.mod
new file mode 100644
index 000000000000..042386cf702d
--- /dev/null
+++ b/cannon/testdata/example/mt-atomic/go.mod
@@ -0,0 +1,8 @@
+module atomic
+
+go 1.22
+
+toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/mt-atomic/main.go b/cannon/testdata/example/mt-atomic/main.go
new file mode 100644
index 000000000000..9d683c5bd598
--- /dev/null
+++ b/cannon/testdata/example/mt-atomic/main.go
@@ -0,0 +1,80 @@
+package main
+
+import (
+	"fmt"
+
+	"utils/testutil"
+)
+
+func main() {
+	testutil.RunTest(TestSwapInt32, "TestSwapInt32")
+	testutil.RunTest(TestSwapInt32Method, "TestSwapInt32Method")
+	testutil.RunTest(TestSwapUint32, "TestSwapUint32")
+	testutil.RunTest(TestSwapUint32Method, "TestSwapUint32Method")
+	testutil.RunTest(TestSwapInt64, "TestSwapInt64")
+	testutil.RunTest(TestSwapInt64Method, "TestSwapInt64Method")
+	testutil.RunTest(TestSwapUint64, "TestSwapUint64")
+	testutil.RunTest(TestSwapUint64Method, "TestSwapUint64Method")
+	testutil.RunTest(TestSwapUintptr, "TestSwapUintptr")
+	testutil.RunTest(TestSwapUintptrMethod, "TestSwapUintptrMethod")
+	testutil.RunTest(TestSwapPointer, "TestSwapPointer")
+	testutil.RunTest(TestSwapPointerMethod, "TestSwapPointerMethod")
+	testutil.RunTest(TestAddInt32, "TestAddInt32")
+	testutil.RunTest(TestAddInt32Method, "TestAddInt32Method")
+	testutil.RunTest(TestAddUint32, "TestAddUint32")
+	testutil.RunTest(TestAddUint32Method, "TestAddUint32Method")
+	testutil.RunTest(TestAddInt64, "TestAddInt64")
+	testutil.RunTest(TestAddInt64Method, "TestAddInt64Method")
+	testutil.RunTest(TestAddUint64, "TestAddUint64")
+	testutil.RunTest(TestAddUint64Method, "TestAddUint64Method")
+	testutil.RunTest(TestAddUintptr, "TestAddUintptr")
+	testutil.RunTest(TestAddUintptrMethod, "TestAddUintptrMethod")
+	testutil.RunTest(TestCompareAndSwapInt32, "TestCompareAndSwapInt32")
+	testutil.RunTest(TestCompareAndSwapInt32Method, "TestCompareAndSwapInt32Method")
+	testutil.RunTest(TestCompareAndSwapUint32, "TestCompareAndSwapUint32")
+	testutil.RunTest(TestCompareAndSwapUint32Method, "TestCompareAndSwapUint32Method")
+	testutil.RunTest(TestCompareAndSwapInt64, "TestCompareAndSwapInt64")
+	testutil.RunTest(TestCompareAndSwapInt64Method, "TestCompareAndSwapInt64Method")
+	testutil.RunTest(TestCompareAndSwapUint64, "TestCompareAndSwapUint64")
+	testutil.RunTest(TestCompareAndSwapUint64Method, "TestCompareAndSwapUint64Method")
+	testutil.RunTest(TestCompareAndSwapUintptr, "TestCompareAndSwapUintptr")
+	testutil.RunTest(TestCompareAndSwapUintptrMethod, "TestCompareAndSwapUintptrMethod")
+	testutil.RunTest(TestCompareAndSwapPointer, "TestCompareAndSwapPointer")
+	testutil.RunTest(TestCompareAndSwapPointerMethod, "TestCompareAndSwapPointerMethod")
+	testutil.RunTest(TestLoadInt32, "TestLoadInt32")
+	testutil.RunTest(TestLoadInt32Method, "TestLoadInt32Method")
+	testutil.RunTest(TestLoadUint32, "TestLoadUint32")
+	testutil.RunTest(TestLoadUint32Method, "TestLoadUint32Method")
+	testutil.RunTest(TestLoadInt64, "TestLoadInt64")
+	testutil.RunTest(TestLoadInt64Method, "TestLoadInt64Method")
+	testutil.RunTest(TestLoadUint64, "TestLoadUint64")
+	testutil.RunTest(TestLoadUint64Method, "TestLoadUint64Method")
+	testutil.RunTest(TestLoadUintptr, "TestLoadUintptr")
+	testutil.RunTest(TestLoadUintptrMethod, "TestLoadUintptrMethod")
+	testutil.RunTest(TestLoadPointer, "TestLoadPointer")
+	testutil.RunTest(TestLoadPointerMethod, "TestLoadPointerMethod")
+	testutil.RunTest(TestStoreInt32, "TestStoreInt32")
+	testutil.RunTest(TestStoreInt32Method, "TestStoreInt32Method")
+	testutil.RunTest(TestStoreUint32, "TestStoreUint32")
+	testutil.RunTest(TestStoreUint32Method, "TestStoreUint32Method")
+	testutil.RunTest(TestStoreInt64, "TestStoreInt64")
+	testutil.RunTest(TestStoreInt64Method, "TestStoreInt64Method")
+	testutil.RunTest(TestStoreUint64, "TestStoreUint64")
+	testutil.RunTest(TestStoreUint64Method, "TestStoreUint64Method")
+	testutil.RunTest(TestStoreUintptr, "TestStoreUintptr")
+	testutil.RunTest(TestStoreUintptrMethod, "TestStoreUintptrMethod")
+	testutil.RunTest(TestStorePointer, "TestStorePointer")
+	testutil.RunTest(TestStorePointerMethod, "TestStorePointerMethod")
+	testutil.RunTest(TestHammer32, "TestHammer32")
+	testutil.RunTest(TestHammer64, "TestHammer64")
+	testutil.RunTest(TestAutoAligned64, "TestAutoAligned64")
+	testutil.RunTest(TestNilDeref, "TestNilDeref")
+	testutil.RunTest(TestStoreLoadSeqCst32, "TestStoreLoadSeqCst32")
+	testutil.RunTest(TestStoreLoadSeqCst64, "TestStoreLoadSeqCst64")
+	testutil.RunTest(TestStoreLoadRelAcq32, "TestStoreLoadRelAcq32")
+	testutil.RunTest(TestStoreLoadRelAcq64, "TestStoreLoadRelAcq64")
+	testutil.RunTest(TestUnaligned64, "TestUnaligned64")
+	testutil.RunTest(TestHammerStoreLoad, "TestHammerStoreLoad")
+
+	fmt.Println("Atomic tests passed")
+}
diff --git a/cannon/testdata/example/mt-general/go.mod b/cannon/testdata/example/mt-general/go.mod
new file mode 100644
index 000000000000..3a7bf3680f5f
--- /dev/null
+++ b/cannon/testdata/example/mt-general/go.mod
@@ -0,0 +1,5 @@
+module mtgeneral
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/example/mt-general/main.go b/cannon/testdata/example/mt-general/main.go
new file mode 100644
index 000000000000..bc871f56e524
--- /dev/null
+++ b/cannon/testdata/example/mt-general/main.go
@@ -0,0 +1,46 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"sync"
+	"sync/atomic"
+)
+
+func main() {
+	// try some concurrency!
+	var wg sync.WaitGroup
+	wg.Add(2)
+	var x atomic.Int32
+	go func() {
+		x.Add(2)
+		wg.Done()
+	}()
+	go func() {
+		x.Add(40)
+		wg.Done()
+	}()
+	wg.Wait()
+	fmt.Printf("waitgroup result: %d\n", x.Load())
+
+	// channels
+	a := make(chan int, 1)
+	b := make(chan int)
+	c := make(chan int)
+	go func() {
+		t0 := <-a
+		b <- t0
+	}()
+	go func() {
+		t1 := <-b
+		c <- t1
+	}()
+	a <- 1234
+	out := <-c
+	fmt.Printf("channels result: %d\n", out)
+
+	// try a GC! (the runtime might not have run one yet)
+	runtime.GC()
+	_, _ = os.Stdout.Write([]byte("GC complete!\n"))
+}
diff --git a/cannon/testdata/example/mt-map/go.mod b/cannon/testdata/example/mt-map/go.mod
index 1d7b890f7f1a..7290b372361e 100644
--- a/cannon/testdata/example/mt-map/go.mod
+++ b/cannon/testdata/example/mt-map/go.mod
@@ -3,3 +3,6 @@ module map
 go 1.22
 
 toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/mt-map/main.go b/cannon/testdata/example/mt-map/main.go
index 085319b88d87..577a19a3ed8a 100644
--- a/cannon/testdata/example/mt-map/main.go
+++ b/cannon/testdata/example/mt-map/main.go
@@ -2,42 +2,18 @@ package main
 
 import (
 	"fmt"
-	"sync"
+
+	"utils/testutil"
 )
 
 func main() {
-	var m sync.Map
-
-	m.Store("hello", "world")
-	m.Store("foo", "bar")
-	m.Store("baz", "qux")
-
-	m.Delete("foo")
-	m.Load("baz")
-
-	go func() {
-		m.CompareAndDelete("hello", "world")
-		m.LoadAndDelete("baz")
-	}()
-
-	var wg sync.WaitGroup
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go func() {
-			m.Load("hello")
-			m.Load("baz")
-			m.Range(func(k, v interface{}) bool {
-				m.Load("hello")
-				m.Load("baz")
-				return true
-			})
-			m.CompareAndSwap("hello", "world", "Go")
-			m.LoadOrStore("hello", "world")
-			wg.Done()
-		}()
-	}
-
-	wg.Wait()
+	testutil.RunTest(TestMapMatchesRWMutex, "TestMapMatchesRWMutex")
+	testutil.RunTest(TestMapMatchesDeepCopy, "TestMapMatchesDeepCopy")
+	testutil.RunTest(TestConcurrentRange, "TestConcurrentRange")
+	testutil.RunTest(TestIssue40999, "TestIssue40999")
+	testutil.RunTest(TestMapRangeNestedCall, "TestMapRangeNestedCall")
+	testutil.RunTest(TestCompareAndSwap_NonExistingKey, "TestCompareAndSwap_NonExistingKey")
+	testutil.RunTest(TestMapRangeNoAllocations, "TestMapRangeNoAllocations")
 
 	fmt.Println("Map test passed")
 }
diff --git a/cannon/testdata/example/mt-map/map_reference_test_copy.go b/cannon/testdata/example/mt-map/map_reference_test_copy.go
new file mode 100644
index 000000000000..3beeb1501c55
--- /dev/null
+++ b/cannon/testdata/example/mt-map/map_reference_test_copy.go
@@ -0,0 +1,299 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/map_reference_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+package main
+
+import (
+	"sync"
+	"sync/atomic"
+)
+
+// This file contains reference map implementations for unit-tests.
+
+// mapInterface is the interface Map implements.
+type mapInterface interface {
+	Load(any) (any, bool)
+	Store(key, value any)
+	LoadOrStore(key, value any) (actual any, loaded bool)
+	LoadAndDelete(key any) (value any, loaded bool)
+	Delete(any)
+	Swap(key, value any) (previous any, loaded bool)
+	CompareAndSwap(key, old, new any) (swapped bool)
+	CompareAndDelete(key, old any) (deleted bool)
+	Range(func(key, value any) (shouldContinue bool))
+}
+
+var (
+	_ mapInterface = &RWMutexMap{}
+	_ mapInterface = &DeepCopyMap{}
+)
+
+// RWMutexMap is an implementation of mapInterface using a sync.RWMutex.
+type RWMutexMap struct {
+	mu    sync.RWMutex
+	dirty map[any]any
+}
+
+func (m *RWMutexMap) Load(key any) (value any, ok bool) {
+	m.mu.RLock()
+	value, ok = m.dirty[key]
+	m.mu.RUnlock()
+	return
+}
+
+func (m *RWMutexMap) Store(key, value any) {
+	m.mu.Lock()
+	if m.dirty == nil {
+		m.dirty = make(map[any]any)
+	}
+	m.dirty[key] = value
+	m.mu.Unlock()
+}
+
+func (m *RWMutexMap) LoadOrStore(key, value any) (actual any, loaded bool) {
+	m.mu.Lock()
+	actual, loaded = m.dirty[key]
+	if !loaded {
+		actual = value
+		if m.dirty == nil {
+			m.dirty = make(map[any]any)
+		}
+		m.dirty[key] = value
+	}
+	m.mu.Unlock()
+	return actual, loaded
+}
+
+func (m *RWMutexMap) Swap(key, value any) (previous any, loaded bool) {
+	m.mu.Lock()
+	if m.dirty == nil {
+		m.dirty = make(map[any]any)
+	}
+
+	previous, loaded = m.dirty[key]
+	m.dirty[key] = value
+	m.mu.Unlock()
+	return
+}
+
+func (m *RWMutexMap) LoadAndDelete(key any) (value any, loaded bool) {
+	m.mu.Lock()
+	value, loaded = m.dirty[key]
+	if !loaded {
+		m.mu.Unlock()
+		return nil, false
+	}
+	delete(m.dirty, key)
+	m.mu.Unlock()
+	return value, loaded
+}
+
+func (m *RWMutexMap) Delete(key any) {
+	m.mu.Lock()
+	delete(m.dirty, key)
+	m.mu.Unlock()
+}
+
+func (m *RWMutexMap) CompareAndSwap(key, old, new any) (swapped bool) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.dirty == nil {
+		return false
+	}
+
+	value, loaded := m.dirty[key]
+	if loaded && value == old {
+		m.dirty[key] = new
+		return true
+	}
+	return false
+}
+
+func (m *RWMutexMap) CompareAndDelete(key, old any) (deleted bool) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.dirty == nil {
+		return false
+	}
+
+	value, loaded := m.dirty[key]
+	if loaded && value == old {
+		delete(m.dirty, key)
+		return true
+	}
+	return false
+}
+
+func (m *RWMutexMap) Range(f func(key, value any) (shouldContinue bool)) {
+	m.mu.RLock()
+	keys := make([]any, 0, len(m.dirty))
+	for k := range m.dirty {
+		keys = append(keys, k)
+	}
+	m.mu.RUnlock()
+
+	for _, k := range keys {
+		v, ok := m.Load(k)
+		if !ok {
+			continue
+		}
+		if !f(k, v) {
+			break
+		}
+	}
+}
+
+// DeepCopyMap is an implementation of mapInterface using a Mutex and
+// atomic.Value.  It makes deep copies of the map on every write to avoid
+// acquiring the Mutex in Load.
+type DeepCopyMap struct {
+	mu    sync.Mutex
+	clean atomic.Value
+}
+
+func (m *DeepCopyMap) Load(key any) (value any, ok bool) {
+	clean, _ := m.clean.Load().(map[any]any)
+	value, ok = clean[key]
+	return value, ok
+}
+
+func (m *DeepCopyMap) Store(key, value any) {
+	m.mu.Lock()
+	dirty := m.dirty()
+	dirty[key] = value
+	m.clean.Store(dirty)
+	m.mu.Unlock()
+}
+
+func (m *DeepCopyMap) LoadOrStore(key, value any) (actual any, loaded bool) {
+	clean, _ := m.clean.Load().(map[any]any)
+	actual, loaded = clean[key]
+	if loaded {
+		return actual, loaded
+	}
+
+	m.mu.Lock()
+	// Reload clean in case it changed while we were waiting on m.mu.
+	clean, _ = m.clean.Load().(map[any]any)
+	actual, loaded = clean[key]
+	if !loaded {
+		dirty := m.dirty()
+		dirty[key] = value
+		actual = value
+		m.clean.Store(dirty)
+	}
+	m.mu.Unlock()
+	return actual, loaded
+}
+
+func (m *DeepCopyMap) Swap(key, value any) (previous any, loaded bool) {
+	m.mu.Lock()
+	dirty := m.dirty()
+	previous, loaded = dirty[key]
+	dirty[key] = value
+	m.clean.Store(dirty)
+	m.mu.Unlock()
+	return
+}
+
+func (m *DeepCopyMap) LoadAndDelete(key any) (value any, loaded bool) {
+	m.mu.Lock()
+	dirty := m.dirty()
+	value, loaded = dirty[key]
+	delete(dirty, key)
+	m.clean.Store(dirty)
+	m.mu.Unlock()
+	return
+}
+
+func (m *DeepCopyMap) Delete(key any) {
+	m.mu.Lock()
+	dirty := m.dirty()
+	delete(dirty, key)
+	m.clean.Store(dirty)
+	m.mu.Unlock()
+}
+
+func (m *DeepCopyMap) CompareAndSwap(key, old, new any) (swapped bool) {
+	clean, _ := m.clean.Load().(map[any]any)
+	if previous, ok := clean[key]; !ok || previous != old {
+		return false
+	}
+
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	dirty := m.dirty()
+	value, loaded := dirty[key]
+	if loaded && value == old {
+		dirty[key] = new
+		m.clean.Store(dirty)
+		return true
+	}
+	return false
+}
+
+func (m *DeepCopyMap) CompareAndDelete(key, old any) (deleted bool) {
+	clean, _ := m.clean.Load().(map[any]any)
+	if previous, ok := clean[key]; !ok || previous != old {
+		return false
+	}
+
+	m.mu.Lock()
+	defer m.mu.Unlock()
+
+	dirty := m.dirty()
+	value, loaded := dirty[key]
+	if loaded && value == old {
+		delete(dirty, key)
+		m.clean.Store(dirty)
+		return true
+	}
+	return false
+}
+
+func (m *DeepCopyMap) Range(f func(key, value any) (shouldContinue bool)) {
+	clean, _ := m.clean.Load().(map[any]any)
+	for k, v := range clean {
+		if !f(k, v) {
+			break
+		}
+	}
+}
+
+func (m *DeepCopyMap) dirty() map[any]any {
+	clean, _ := m.clean.Load().(map[any]any)
+	dirty := make(map[any]any, len(clean)+1)
+	for k, v := range clean {
+		dirty[k] = v
+	}
+	return dirty
+}
diff --git a/cannon/testdata/example/mt-map/map_test_copy.go b/cannon/testdata/example/mt-map/map_test_copy.go
new file mode 100644
index 000000000000..7b8806698f9f
--- /dev/null
+++ b/cannon/testdata/example/mt-map/map_test_copy.go
@@ -0,0 +1,325 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/map_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+package main
+
+import (
+	"math/rand"
+	"reflect"
+	"runtime"
+	"sync"
+	"sync/atomic"
+	"testing"
+	"testing/quick"
+
+	"utils/testutil"
+)
+
+type mapOp string
+
+const (
+	opLoad             = mapOp("Load")
+	opStore            = mapOp("Store")
+	opLoadOrStore      = mapOp("LoadOrStore")
+	opLoadAndDelete    = mapOp("LoadAndDelete")
+	opDelete           = mapOp("Delete")
+	opSwap             = mapOp("Swap")
+	opCompareAndSwap   = mapOp("CompareAndSwap")
+	opCompareAndDelete = mapOp("CompareAndDelete")
+)
+
+var mapOps = [...]mapOp{
+	opLoad,
+	opStore,
+	opLoadOrStore,
+	opLoadAndDelete,
+	opDelete,
+	opSwap,
+	opCompareAndSwap,
+	opCompareAndDelete,
+}
+
+// mapCall is a quick.Generator for calls on mapInterface.
+type mapCall struct {
+	op   mapOp
+	k, v any
+}
+
+func (c mapCall) apply(m mapInterface) (any, bool) {
+	switch c.op {
+	case opLoad:
+		return m.Load(c.k)
+	case opStore:
+		m.Store(c.k, c.v)
+		return nil, false
+	case opLoadOrStore:
+		return m.LoadOrStore(c.k, c.v)
+	case opLoadAndDelete:
+		return m.LoadAndDelete(c.k)
+	case opDelete:
+		m.Delete(c.k)
+		return nil, false
+	case opSwap:
+		return m.Swap(c.k, c.v)
+	case opCompareAndSwap:
+		if m.CompareAndSwap(c.k, c.v, rand.Int()) {
+			m.Delete(c.k)
+			return c.v, true
+		}
+		return nil, false
+	case opCompareAndDelete:
+		if m.CompareAndDelete(c.k, c.v) {
+			if _, ok := m.Load(c.k); !ok {
+				return nil, true
+			}
+		}
+		return nil, false
+	default:
+		panic("invalid mapOp")
+	}
+}
+
+type mapResult struct {
+	value any
+	ok    bool
+}
+
+func randValue(r *rand.Rand) any {
+	b := make([]byte, r.Intn(4))
+	for i := range b {
+		b[i] = 'a' + byte(rand.Intn(26))
+	}
+	return string(b)
+}
+
+func (mapCall) Generate(r *rand.Rand, size int) reflect.Value {
+	c := mapCall{op: mapOps[rand.Intn(len(mapOps))], k: randValue(r)}
+	switch c.op {
+	case opStore, opLoadOrStore:
+		c.v = randValue(r)
+	}
+	return reflect.ValueOf(c)
+}
+
+func applyCalls(m mapInterface, calls []mapCall) (results []mapResult, final map[any]any) {
+	for _, c := range calls {
+		v, ok := c.apply(m)
+		results = append(results, mapResult{v, ok})
+	}
+
+	final = make(map[any]any)
+	m.Range(func(k, v any) bool {
+		final[k] = v
+		return true
+	})
+
+	return results, final
+}
+
+func applyMap(calls []mapCall) ([]mapResult, map[any]any) {
+	return applyCalls(new(sync.Map), calls)
+}
+
+func applyRWMutexMap(calls []mapCall) ([]mapResult, map[any]any) {
+	return applyCalls(new(RWMutexMap), calls)
+}
+
+func applyDeepCopyMap(calls []mapCall) ([]mapResult, map[any]any) {
+	return applyCalls(new(DeepCopyMap), calls)
+}
+
+func TestMapMatchesRWMutex(t *testutil.TestRunner) {
+	if err := quick.CheckEqual(applyMap, applyRWMutexMap, nil); err != nil {
+		t.Error(err)
+	}
+}
+
+func TestMapMatchesDeepCopy(t *testutil.TestRunner) {
+	if err := quick.CheckEqual(applyMap, applyDeepCopyMap, nil); err != nil {
+		t.Error(err)
+	}
+}
+
+func TestConcurrentRange(t *testutil.TestRunner) {
+	const mapSize = 1 << 10
+
+	m := new(sync.Map)
+	for n := int64(1); n <= mapSize; n++ {
+		m.Store(n, int64(n))
+	}
+
+	done := make(chan struct{})
+	var wg sync.WaitGroup
+	defer func() {
+		close(done)
+		wg.Wait()
+	}()
+	for g := int64(runtime.GOMAXPROCS(0)); g > 0; g-- {
+		r := rand.New(rand.NewSource(g))
+		wg.Add(1)
+		go func(g int64) {
+			defer wg.Done()
+			for i := int64(0); ; i++ {
+				select {
+				case <-done:
+					return
+				default:
+				}
+				for n := int64(1); n < mapSize; n++ {
+					if r.Int63n(mapSize) == 0 {
+						m.Store(n, n*i*g)
+					} else {
+						m.Load(n)
+					}
+				}
+			}
+		}(g)
+	}
+
+	//iters := 1 << 10
+	//if testing.Short() {
+	//	iters = 16
+	//}
+	iters := 16
+	for n := iters; n > 0; n-- {
+		seen := make(map[int64]bool, mapSize)
+
+		m.Range(func(ki, vi any) bool {
+			k, v := ki.(int64), vi.(int64)
+			if v%k != 0 {
+				t.Fatalf("while Storing multiples of %v, Range saw value %v", k, v)
+			}
+			if seen[k] {
+				t.Fatalf("Range visited key %v twice", k)
+			}
+			seen[k] = true
+			return true
+		})
+
+		if len(seen) != mapSize {
+			t.Fatalf("Range visited %v elements of %v-element Map", len(seen), mapSize)
+		}
+	}
+}
+
+func TestIssue40999(t *testutil.TestRunner) {
+	var m sync.Map
+
+	// Since the miss-counting in missLocked (via Delete)
+	// compares the miss count with len(m.dirty),
+	// add an initial entry to bias len(m.dirty) above the miss count.
+	m.Store(nil, struct{}{})
+
+	var finalized uint32
+
+	// Set finalizers that count for collected keys. A non-zero count
+	// indicates that keys have not been leaked.
+	for atomic.LoadUint32(&finalized) == 0 {
+		p := new(int)
+		runtime.SetFinalizer(p, func(*int) {
+			atomic.AddUint32(&finalized, 1)
+		})
+		m.Store(p, struct{}{})
+		m.Delete(p)
+		runtime.GC()
+	}
+}
+
+func TestMapRangeNestedCall(t *testutil.TestRunner) { // Issue 46399
+	var m sync.Map
+	for i, v := range [3]string{"hello", "world", "Go"} {
+		m.Store(i, v)
+	}
+	m.Range(func(key, value any) bool {
+		m.Range(func(key, value any) bool {
+			// We should be able to load the key offered in the Range callback,
+			// because there are no concurrent Delete involved in this tested map.
+			if v, ok := m.Load(key); !ok || !reflect.DeepEqual(v, value) {
+				t.Fatalf("Nested Range loads unexpected value, got %+v want %+v", v, value)
+			}
+
+			// We didn't keep 42 and a value into the map before, if somehow we loaded
+			// a value from such a key, meaning there must be an internal bug regarding
+			// nested range in the Map.
+			if _, loaded := m.LoadOrStore(42, "dummy"); loaded {
+				t.Fatalf("Nested Range loads unexpected value, want store a new value")
+			}
+
+			// Try to Store then LoadAndDelete the corresponding value with the key
+			// 42 to the Map. In this case, the key 42 and associated value should be
+			// removed from the Map. Therefore any future range won't observe key 42
+			// as we checked in above.
+			val := "sync.Map"
+			m.Store(42, val)
+			if v, loaded := m.LoadAndDelete(42); !loaded || !reflect.DeepEqual(v, val) {
+				t.Fatalf("Nested Range loads unexpected value, got %v, want %v", v, val)
+			}
+			return true
+		})
+
+		// Remove key from Map on-the-fly.
+		m.Delete(key)
+		return true
+	})
+
+	// After a Range of Delete, all keys should be removed and any
+	// further Range won't invoke the callback. Hence length remains 0.
+	length := 0
+	m.Range(func(key, value any) bool {
+		length++
+		return true
+	})
+
+	if length != 0 {
+		t.Fatalf("Unexpected sync.Map size, got %v want %v", length, 0)
+	}
+}
+
+func TestCompareAndSwap_NonExistingKey(t *testutil.TestRunner) {
+	m := &sync.Map{}
+	if m.CompareAndSwap(m, nil, 42) {
+		// See https://go.dev/issue/51972#issuecomment-1126408637.
+		t.Fatalf("CompareAndSwap on a non-existing key succeeded")
+	}
+}
+
+func TestMapRangeNoAllocations(t *testutil.TestRunner) { // Issue 62404
+	var m sync.Map
+	allocs := testing.AllocsPerRun(10, func() {
+		m.Range(func(key, value any) bool {
+			return true
+		})
+	})
+	if allocs > 0 {
+		t.Errorf("AllocsPerRun of m.Range = %v; want 0", allocs)
+	}
+}
diff --git a/cannon/testdata/example/mt-mutex/go.mod b/cannon/testdata/example/mt-mutex/go.mod
index 368cf9be0ae5..3aceb4c8cebf 100644
--- a/cannon/testdata/example/mt-mutex/go.mod
+++ b/cannon/testdata/example/mt-mutex/go.mod
@@ -3,3 +3,6 @@ module mutex
 go 1.22
 
 toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/mt-mutex/main.go b/cannon/testdata/example/mt-mutex/main.go
index 4f96e5d2308d..1a3b75c231bc 100644
--- a/cannon/testdata/example/mt-mutex/main.go
+++ b/cannon/testdata/example/mt-mutex/main.go
@@ -1,82 +1,15 @@
-// Portions of this code are derived from code written by The Go Authors.
-// See original source: https://github.com/golang/go/blob/400433af3660905ecaceaf19ddad3e6c24b141df/src/sync/mutex_test.go
-//
-// --- Original License Notice ---
-//
-// Copyright 2009 The Go Authors.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google LLC nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package main
 
 import (
 	"fmt"
-	"os"
-	"sync"
+
+	"utils/testutil"
 )
 
 func main() {
-	TestMutex()
-}
-
-func TestMutex() {
-	m := new(sync.Mutex)
+	testutil.RunTest(TestSemaphore, "TestSemaphore")
+	testutil.RunTest(TestMutex, "TestMutex")
+	testutil.RunTest(TestMutexFairness, "TestMutexFairness")
 
-	m.Lock()
-	if m.TryLock() {
-		_, _ = fmt.Fprintln(os.Stderr, "TryLock succeeded with mutex locked")
-		os.Exit(1)
-	}
-	m.Unlock()
-	if !m.TryLock() {
-		_, _ = fmt.Fprintln(os.Stderr, "TryLock failed with mutex unlocked")
-		os.Exit(1)
-	}
-	m.Unlock()
-
-	c := make(chan bool)
-	for i := 0; i < 10; i++ {
-		go HammerMutex(m, 1000, c)
-	}
-	for i := 0; i < 10; i++ {
-		<-c
-	}
 	fmt.Println("Mutex test passed")
 }
-
-func HammerMutex(m *sync.Mutex, loops int, cdone chan bool) {
-	for i := 0; i < loops; i++ {
-		if i%3 == 0 {
-			if m.TryLock() {
-				m.Unlock()
-			}
-			continue
-		}
-		m.Lock()
-		m.Unlock()
-	}
-	cdone <- true
-}
diff --git a/cannon/testdata/example/mt-mutex/mutex_test_copy.go b/cannon/testdata/example/mt-mutex/mutex_test_copy.go
new file mode 100644
index 000000000000..d3ed9343c3d4
--- /dev/null
+++ b/cannon/testdata/example/mt-mutex/mutex_test_copy.go
@@ -0,0 +1,135 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/mutex_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"runtime"
+	. "sync"
+	"time"
+
+	"utils/testutil"
+)
+
+func HammerSemaphore(s *uint32, loops int, cdone chan bool) {
+	for i := 0; i < loops; i++ {
+		Runtime_Semacquire(s)
+		Runtime_Semrelease(s, false, 0)
+	}
+	cdone <- true
+}
+
+func TestSemaphore(t *testutil.TestRunner) {
+	s := new(uint32)
+	*s = 1
+	c := make(chan bool)
+	for i := 0; i < 10; i++ {
+		go HammerSemaphore(s, 1000, c)
+	}
+	for i := 0; i < 10; i++ {
+		<-c
+	}
+}
+
+func HammerMutex(m *Mutex, loops int, cdone chan bool) {
+	for i := 0; i < loops; i++ {
+		if i%3 == 0 {
+			if m.TryLock() {
+				m.Unlock()
+			}
+			continue
+		}
+		m.Lock()
+		m.Unlock()
+	}
+	cdone <- true
+}
+
+func TestMutex(t *testutil.TestRunner) {
+	if n := runtime.SetMutexProfileFraction(1); n != 0 {
+		t.Logf("got mutexrate %d expected 0", n)
+	}
+	defer runtime.SetMutexProfileFraction(0)
+
+	m := new(Mutex)
+
+	m.Lock()
+	if m.TryLock() {
+		t.Fatalf("TryLock succeeded with mutex locked")
+	}
+	m.Unlock()
+	if !m.TryLock() {
+		t.Fatalf("TryLock failed with mutex unlocked")
+	}
+	m.Unlock()
+
+	c := make(chan bool)
+	for i := 0; i < 10; i++ {
+		go HammerMutex(m, 1000, c)
+	}
+	for i := 0; i < 10; i++ {
+		<-c
+	}
+}
+
+func TestMutexFairness(t *testutil.TestRunner) {
+	var mu Mutex
+	stop := make(chan bool)
+	defer close(stop)
+	go func() {
+		for {
+			mu.Lock()
+			time.Sleep(100 * time.Microsecond)
+			mu.Unlock()
+			select {
+			case <-stop:
+				return
+			default:
+			}
+		}
+	}()
+	done := make(chan bool, 1)
+	go func() {
+		for i := 0; i < 10; i++ {
+			time.Sleep(100 * time.Microsecond)
+			mu.Lock()
+			mu.Unlock()
+		}
+		done <- true
+	}()
+	select {
+	case <-done:
+	case <-time.After(10 * time.Second):
+		t.Fatalf("can't acquire Mutex in 10 seconds")
+	}
+}
diff --git a/cannon/testdata/example/mt-mutex/runtime.go b/cannon/testdata/example/mt-mutex/runtime.go
new file mode 100644
index 000000000000..8d70cb10b354
--- /dev/null
+++ b/cannon/testdata/example/mt-mutex/runtime.go
@@ -0,0 +1,14 @@
+package main
+
+import (
+	_ "unsafe" // Required for go:linkname
+)
+
+var Runtime_Semacquire = runtime_Semacquire
+var Runtime_Semrelease = runtime_Semrelease
+
+//go:linkname runtime_Semacquire sync.runtime_Semacquire
+func runtime_Semacquire(s *uint32)
+
+//go:linkname runtime_Semrelease sync.runtime_Semrelease
+func runtime_Semrelease(s *uint32, handoff bool, skipframes int)
diff --git a/cannon/testdata/example/mt-oncefunc/go.mod b/cannon/testdata/example/mt-oncefunc/go.mod
new file mode 100644
index 000000000000..e0f45e8c8790
--- /dev/null
+++ b/cannon/testdata/example/mt-oncefunc/go.mod
@@ -0,0 +1,8 @@
+module oncefunc
+
+go 1.22
+
+toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/mt-oncefunc/main.go b/cannon/testdata/example/mt-oncefunc/main.go
new file mode 100644
index 000000000000..d5b0badc292a
--- /dev/null
+++ b/cannon/testdata/example/mt-oncefunc/main.go
@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+
+	"utils/testutil"
+)
+
+func main() {
+	testutil.RunTest(TestOnceFunc, "TestOnceFunc")
+	testutil.RunTest(TestOnceValue, "TestOnceValue")
+	testutil.RunTest(TestOnceValues, "TestOnceValues")
+	testutil.RunTest(TestOnceFuncPanic, "TestOnceFuncPanic")
+	testutil.RunTest(TestOnceValuePanic, "TestOnceValuePanic")
+	testutil.RunTest(TestOnceValuesPanic, "TestOnceValuesPanic")
+	testutil.RunTest(TestOnceFuncPanicNil, "TestOnceFuncPanicNil")
+	testutil.RunTest(TestOnceFuncGoexit, "TestOnceFuncGoexit")
+	testutil.RunTest(TestOnceFuncPanicTraceback, "TestOnceFuncPanicTraceback")
+	testutil.RunTest(TestOnceXGC, "TestOnceXGC")
+
+	fmt.Println("OnceFunc tests passed")
+}
diff --git a/cannon/testdata/example/mt-oncefunc/oncefunc_test_copy.go b/cannon/testdata/example/mt-oncefunc/oncefunc_test_copy.go
new file mode 100644
index 000000000000..fdbe93c260aa
--- /dev/null
+++ b/cannon/testdata/example/mt-oncefunc/oncefunc_test_copy.go
@@ -0,0 +1,265 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/oncefunc_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"bytes"
+	"math"
+	"runtime"
+	"runtime/debug"
+	"sync"
+	"sync/atomic"
+	"testing"
+	_ "unsafe"
+
+	"utils/testutil"
+)
+
+// We assume that the Once.Do tests have already covered parallelism.
+
+func TestOnceFunc(t *testutil.TestRunner) {
+	calls := 0
+	f := sync.OnceFunc(func() { calls++ })
+	allocs := testing.AllocsPerRun(10, f)
+	if calls != 1 {
+		t.Errorf("want calls==1, got %d", calls)
+	}
+	if allocs != 0 {
+		t.Errorf("want 0 allocations per call, got %v", allocs)
+	}
+}
+
+func TestOnceValue(t *testutil.TestRunner) {
+	calls := 0
+	f := sync.OnceValue(func() int {
+		calls++
+		return calls
+	})
+	allocs := testing.AllocsPerRun(10, func() { f() })
+	value := f()
+	if calls != 1 {
+		t.Errorf("want calls==1, got %d", calls)
+	}
+	if value != 1 {
+		t.Errorf("want value==1, got %d", value)
+	}
+	if allocs != 0 {
+		t.Errorf("want 0 allocations per call, got %v", allocs)
+	}
+}
+
+func TestOnceValues(t *testutil.TestRunner) {
+	calls := 0
+	f := sync.OnceValues(func() (int, int) {
+		calls++
+		return calls, calls + 1
+	})
+	allocs := testing.AllocsPerRun(10, func() { f() })
+	v1, v2 := f()
+	if calls != 1 {
+		t.Errorf("want calls==1, got %d", calls)
+	}
+	if v1 != 1 || v2 != 2 {
+		t.Errorf("want v1==1 and v2==2, got %d and %d", v1, v2)
+	}
+	if allocs != 0 {
+		t.Errorf("want 0 allocations per call, got %v", allocs)
+	}
+}
+
+func testOncePanicX(t testing.TB, calls *int, f func()) {
+	testOncePanicWith(t, calls, f, func(label string, p any) {
+		if p != "x" {
+			t.Fatalf("%s: want panic %v, got %v", label, "x", p)
+		}
+	})
+}
+
+func testOncePanicWith(t testing.TB, calls *int, f func(), check func(label string, p any)) {
+	// Check that the each call to f panics with the same value, but the
+	// underlying function is only called once.
+	for _, label := range []string{"first time", "second time"} {
+		var p any
+		panicked := true
+		func() {
+			defer func() {
+				p = recover()
+			}()
+			f()
+			panicked = false
+		}()
+		if !panicked {
+			t.Fatalf("%s: f did not panic", label)
+		}
+		check(label, p)
+	}
+	if *calls != 1 {
+		t.Errorf("want calls==1, got %d", *calls)
+	}
+}
+
+func TestOnceFuncPanic(t *testutil.TestRunner) {
+	calls := 0
+	f := sync.OnceFunc(func() {
+		calls++
+		panic("x")
+	})
+	testOncePanicX(t, &calls, f)
+}
+
+func TestOnceValuePanic(t *testutil.TestRunner) {
+	calls := 0
+	f := sync.OnceValue(func() int {
+		calls++
+		panic("x")
+	})
+	testOncePanicX(t, &calls, func() { f() })
+}
+
+func TestOnceValuesPanic(t *testutil.TestRunner) {
+	calls := 0
+	f := sync.OnceValues(func() (int, int) {
+		calls++
+		panic("x")
+	})
+	testOncePanicX(t, &calls, func() { f() })
+}
+
+func TestOnceFuncPanicNil(t *testutil.TestRunner) {
+	calls := 0
+	f := sync.OnceFunc(func() {
+		calls++
+		panic(nil)
+	})
+	testOncePanicWith(t, &calls, f, func(label string, p any) {
+		switch p.(type) {
+		case nil, *runtime.PanicNilError:
+			return
+		}
+		t.Fatalf("%s: want nil panic, got %v", label, p)
+	})
+}
+
+func TestOnceFuncGoexit(t *testutil.TestRunner) {
+	// If f calls Goexit, the results are unspecified. But check that f doesn't
+	// get called twice.
+	calls := 0
+	f := sync.OnceFunc(func() {
+		calls++
+		runtime.Goexit()
+	})
+	var wg sync.WaitGroup
+	for i := 0; i < 2; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			defer func() { recover() }()
+			f()
+		}()
+		wg.Wait()
+	}
+	if calls != 1 {
+		t.Errorf("want calls==1, got %d", calls)
+	}
+}
+
+func TestOnceFuncPanicTraceback(t *testutil.TestRunner) {
+	// Test that on the first invocation of a OnceFunc, the stack trace goes all
+	// the way to the origin of the panic.
+	f := sync.OnceFunc(onceFuncPanic)
+
+	defer func() {
+		if p := recover(); p != "x" {
+			t.Fatalf("want panic %v, got %v", "x", p)
+		}
+		stack := debug.Stack()
+		//want := "sync_test.onceFuncPanic"
+		want := "main.onceFuncPanic"
+		if !bytes.Contains(stack, []byte(want)) {
+			t.Fatalf("want stack containing %v, got:\n%s", want, string(stack))
+		}
+	}()
+	f()
+}
+
+func onceFuncPanic() {
+	panic("x")
+}
+
+func TestOnceXGC(t *testutil.TestRunner) {
+	fns := map[string]func([]byte) func(){
+		"OnceFunc": func(buf []byte) func() {
+			return sync.OnceFunc(func() { buf[0] = 1 })
+		},
+		"OnceValue": func(buf []byte) func() {
+			f := sync.OnceValue(func() any { buf[0] = 1; return nil })
+			return func() { f() }
+		},
+		"OnceValues": func(buf []byte) func() {
+			f := sync.OnceValues(func() (any, any) { buf[0] = 1; return nil, nil })
+			return func() { f() }
+		},
+	}
+	for n, fn := range fns {
+		t.Run(n, func(t testing.TB) {
+			buf := make([]byte, 1024)
+			var gc atomic.Bool
+			runtime.SetFinalizer(&buf[0], func(_ *byte) {
+				gc.Store(true)
+			})
+			f := fn(buf)
+			gcwaitfin()
+			if gc.Load() != false {
+				t.Fatal("wrapped function garbage collected too early")
+			}
+			f()
+			gcwaitfin()
+			if gc.Load() != true {
+				// Even if f is still alive, the function passed to Once(Func|Value|Values)
+				// is not kept alive after the first call to f.
+				t.Fatal("wrapped function should be garbage collected, but still live")
+			}
+			f()
+		})
+	}
+}
+
+// gcwaitfin performs garbage collection and waits for all finalizers to run.
+func gcwaitfin() {
+	runtime.GC()
+	runtime_blockUntilEmptyFinalizerQueue(math.MaxInt64)
+}
+
+//go:linkname runtime_blockUntilEmptyFinalizerQueue runtime.blockUntilEmptyFinalizerQueue
+func runtime_blockUntilEmptyFinalizerQueue(int64) bool
diff --git a/cannon/testdata/example/mt-pool/export_test_copy.go b/cannon/testdata/example/mt-pool/export_test_copy.go
new file mode 100644
index 000000000000..37b7c4a92bf5
--- /dev/null
+++ b/cannon/testdata/example/mt-pool/export_test_copy.go
@@ -0,0 +1,86 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/export_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+// Export for testing.
+// var Runtime_Semacquire = runtime_Semacquire
+// var Runtime_Semrelease = runtime_Semrelease
+var Runtime_procPin = runtime_procPin
+var Runtime_procUnpin = runtime_procUnpin
+
+// poolDequeue testing.
+type PoolDequeue interface {
+	PushHead(val any) bool
+	PopHead() (any, bool)
+	PopTail() (any, bool)
+}
+
+func NewPoolDequeue(n int) PoolDequeue {
+	d := &poolDequeue{
+		vals: make([]eface, n),
+	}
+	// For testing purposes, set the head and tail indexes close
+	// to wrapping around.
+	d.headTail.Store(d.pack(1<<dequeueBits-500, 1<<dequeueBits-500))
+	return d
+}
+
+func (d *poolDequeue) PushHead(val any) bool {
+	return d.pushHead(val)
+}
+
+func (d *poolDequeue) PopHead() (any, bool) {
+	return d.popHead()
+}
+
+func (d *poolDequeue) PopTail() (any, bool) {
+	return d.popTail()
+}
+
+func NewPoolChain() PoolDequeue {
+	return new(poolChain)
+}
+
+func (c *poolChain) PushHead(val any) bool {
+	c.pushHead(val)
+	return true
+}
+
+func (c *poolChain) PopHead() (any, bool) {
+	return c.popHead()
+}
+
+func (c *poolChain) PopTail() (any, bool) {
+	return c.popTail()
+}
diff --git a/cannon/testdata/example/mt-pool/go.mod b/cannon/testdata/example/mt-pool/go.mod
index f57bdf9b81e0..06b49a26398e 100644
--- a/cannon/testdata/example/mt-pool/go.mod
+++ b/cannon/testdata/example/mt-pool/go.mod
@@ -3,3 +3,6 @@ module pool
 go 1.22
 
 toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/mt-pool/main.go b/cannon/testdata/example/mt-pool/main.go
index 267710f3ea3a..2c138b07cd97 100644
--- a/cannon/testdata/example/mt-pool/main.go
+++ b/cannon/testdata/example/mt-pool/main.go
@@ -2,37 +2,19 @@ package main
 
 import (
 	"fmt"
-	"sync"
+
+	"utils/testutil"
 )
 
 func main() {
-	var x sync.Pool
-
-	x.Put(1)
-	x.Put(2)
-
-	// try some concurrency!
-	var wg sync.WaitGroup
-	wg.Add(2)
-	go func() {
-		x.Put(3)
-		wg.Done()
-	}()
-	go func() {
-		x.Put(4)
-		wg.Done()
-	}()
-
-	wg.Wait()
-
-	wg.Add(4)
-	for i := 0; i < 4; i++ {
-		go func() {
-			x.Get()
-			wg.Done()
-		}()
-	}
-	wg.Wait()
+	testutil.RunTest(TestPool, "TestPool")
+	testutil.RunTest(TestPoolNew, "TestPoolNew")
+	testutil.RunTest(TestPoolGC, "TestPoolGC")
+	testutil.RunTest(TestPoolRelease, "TestPoolRelease")
+	testutil.RunTest(TestPoolStress, "TestPoolStress")
+	testutil.RunTest(TestPoolDequeue, "TestPoolDequeue")
+	testutil.RunTest(TestPoolChain, "TestPoolChain")
+	testutil.RunTest(TestNilPool, "TestNilPool")
 
 	fmt.Println("Pool test passed")
 }
diff --git a/cannon/testdata/example/mt-pool/pool_test_copy.go b/cannon/testdata/example/mt-pool/pool_test_copy.go
new file mode 100644
index 000000000000..962cbfce7b5e
--- /dev/null
+++ b/cannon/testdata/example/mt-pool/pool_test_copy.go
@@ -0,0 +1,298 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/pool_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"runtime"
+	"runtime/debug"
+	. "sync"
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"utils/testutil"
+)
+
+var short bool = true
+
+func TestPool(t *testutil.TestRunner) {
+	// disable GC so we can control when it happens.
+	defer debug.SetGCPercent(debug.SetGCPercent(-1))
+	var p Pool
+	if p.Get() != nil {
+		t.Fatal("expected empty")
+	}
+
+	// Make sure that the goroutine doesn't migrate to another P
+	// between Put and Get calls.
+	Runtime_procPin()
+	p.Put("a")
+	p.Put("b")
+	if g := p.Get(); g != "a" {
+		t.Fatalf("got %#v; want a", g)
+	}
+	if g := p.Get(); g != "b" {
+		t.Fatalf("got %#v; want b", g)
+	}
+	if g := p.Get(); g != nil {
+		t.Fatalf("got %#v; want nil", g)
+	}
+	Runtime_procUnpin()
+
+	// Put in a large number of objects so they spill into
+	// stealable space.
+	for i := 0; i < 100; i++ {
+		p.Put("c")
+	}
+	// After one GC, the victim cache should keep them alive.
+	runtime.GC()
+	if g := p.Get(); g != "c" {
+		t.Fatalf("got %#v; want c after GC", g)
+	}
+	// A second GC should drop the victim cache.
+	runtime.GC()
+	if g := p.Get(); g != nil {
+		t.Fatalf("got %#v; want nil after second GC", g)
+	}
+}
+
+func TestPoolNew(t *testutil.TestRunner) {
+	// disable GC so we can control when it happens.
+	defer debug.SetGCPercent(debug.SetGCPercent(-1))
+
+	i := 0
+	p := Pool{
+		New: func() any {
+			i++
+			return i
+		},
+	}
+	if v := p.Get(); v != 1 {
+		t.Fatalf("got %v; want 1", v)
+	}
+	if v := p.Get(); v != 2 {
+		t.Fatalf("got %v; want 2", v)
+	}
+
+	// Make sure that the goroutine doesn't migrate to another P
+	// between Put and Get calls.
+	Runtime_procPin()
+	p.Put(42)
+	if v := p.Get(); v != 42 {
+		t.Fatalf("got %v; want 42", v)
+	}
+	Runtime_procUnpin()
+
+	if v := p.Get(); v != 3 {
+		t.Fatalf("got %v; want 3", v)
+	}
+}
+
+// Test that Pool does not hold pointers to previously cached resources.
+func TestPoolGC(t *testutil.TestRunner) {
+	testPool(t, true)
+}
+
+// Test that Pool releases resources on GC.
+func TestPoolRelease(t *testutil.TestRunner) {
+	testPool(t, false)
+}
+
+func testPool(t testing.TB, drain bool) {
+	var p Pool
+	const N = 100
+loop:
+	for try := 0; try < 3; try++ {
+		if try == 1 && short {
+			break
+		}
+		var fin, fin1 uint32
+		for i := 0; i < N; i++ {
+			v := new(string)
+			runtime.SetFinalizer(v, func(vv *string) {
+				atomic.AddUint32(&fin, 1)
+			})
+			p.Put(v)
+		}
+		if drain {
+			for i := 0; i < N; i++ {
+				p.Get()
+			}
+		}
+		for i := 0; i < 5; i++ {
+			runtime.GC()
+			time.Sleep(time.Duration(i*100+10) * time.Millisecond)
+			// 1 pointer can remain on stack or elsewhere
+			if fin1 = atomic.LoadUint32(&fin); fin1 >= N-1 {
+				continue loop
+			}
+		}
+		t.Fatalf("only %v out of %v resources are finalized on try %v", fin1, N, try)
+	}
+}
+
+func TestPoolStress(t *testutil.TestRunner) {
+	const P = 10
+	N := int(1e6)
+	if short {
+		N /= 100
+	}
+	var p Pool
+	done := make(chan bool)
+	for i := 0; i < P; i++ {
+		go func() {
+			var v any = 0
+			for j := 0; j < N; j++ {
+				if v == nil {
+					v = 0
+				}
+				p.Put(v)
+				v = p.Get()
+				if v != nil && v.(int) != 0 {
+					t.Errorf("expect 0, got %v", v)
+					break
+				}
+			}
+			done <- true
+		}()
+	}
+	for i := 0; i < P; i++ {
+		<-done
+	}
+}
+
+func TestPoolDequeue(t *testutil.TestRunner) {
+	testPoolDequeue(t, NewPoolDequeue(16))
+}
+
+func TestPoolChain(t *testutil.TestRunner) {
+	testPoolDequeue(t, NewPoolChain())
+}
+
+func testPoolDequeue(t testing.TB, d PoolDequeue) {
+	const P = 10
+	var N int = 2e6
+	if short {
+		N = 1e3
+	}
+	have := make([]int32, N)
+	var stop int32
+	var wg WaitGroup
+	record := func(val int) {
+		atomic.AddInt32(&have[val], 1)
+		if val == N-1 {
+			atomic.StoreInt32(&stop, 1)
+		}
+	}
+
+	// Start P-1 consumers.
+	for i := 1; i < P; i++ {
+		wg.Add(1)
+		go func() {
+			fail := 0
+			for atomic.LoadInt32(&stop) == 0 {
+				val, ok := d.PopTail()
+				if ok {
+					fail = 0
+					record(val.(int))
+				} else {
+					// Speed up the test by
+					// allowing the pusher to run.
+					if fail++; fail%100 == 0 {
+						runtime.Gosched()
+					}
+				}
+			}
+			wg.Done()
+		}()
+	}
+
+	// Start 1 producer.
+	nPopHead := 0
+	wg.Add(1)
+	go func() {
+		for j := 0; j < N; j++ {
+			for !d.PushHead(j) {
+				// Allow a popper to run.
+				runtime.Gosched()
+			}
+			if j%10 == 0 {
+				val, ok := d.PopHead()
+				if ok {
+					nPopHead++
+					record(val.(int))
+				}
+			}
+		}
+		wg.Done()
+	}()
+	wg.Wait()
+
+	// Check results.
+	for i, count := range have {
+		if count != 1 {
+			t.Errorf("expected have[%d] = 1, got %d", i, count)
+		}
+	}
+	// Check that at least some PopHeads succeeded. We skip this
+	// check in short mode because it's common enough that the
+	// queue will stay nearly empty all the time and a PopTail
+	// will happen during the window between every PushHead and
+	// PopHead.
+	if !short && nPopHead == 0 {
+		t.Errorf("popHead never succeeded")
+	}
+}
+
+func TestNilPool(t *testutil.TestRunner) {
+	catch := func() {
+		if recover() == nil {
+			t.Error("expected panic")
+		}
+	}
+
+	var p *Pool
+	t.Run("Get", func(t testing.TB) {
+		defer catch()
+		if p.Get() != nil {
+			t.Error("expected empty")
+		}
+		t.Error("should have panicked already")
+	})
+	t.Run("Put", func(t testing.TB) {
+		defer catch()
+		p.Put("a")
+		t.Error("should have panicked already")
+	})
+}
diff --git a/cannon/testdata/example/mt-pool/poolqueue_copy.go b/cannon/testdata/example/mt-pool/poolqueue_copy.go
new file mode 100644
index 000000000000..5aa7b1ffa7b9
--- /dev/null
+++ b/cannon/testdata/example/mt-pool/poolqueue_copy.go
@@ -0,0 +1,338 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/poolqueue.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"sync/atomic"
+	"unsafe"
+)
+
+// poolDequeue is a lock-free fixed-size single-producer,
+// multi-consumer queue. The single producer can both push and pop
+// from the head, and consumers can pop from the tail.
+//
+// It has the added feature that it nils out unused slots to avoid
+// unnecessary retention of objects. This is important for sync.Pool,
+// but not typically a property considered in the literature.
+type poolDequeue struct {
+	// headTail packs together a 32-bit head index and a 32-bit
+	// tail index. Both are indexes into vals modulo len(vals)-1.
+	//
+	// tail = index of oldest data in queue
+	// head = index of next slot to fill
+	//
+	// Slots in the range [tail, head) are owned by consumers.
+	// A consumer continues to own a slot outside this range until
+	// it nils the slot, at which point ownership passes to the
+	// producer.
+	//
+	// The head index is stored in the most-significant bits so
+	// that we can atomically add to it and the overflow is
+	// harmless.
+	headTail atomic.Uint64
+
+	// vals is a ring buffer of interface{} values stored in this
+	// dequeue. The size of this must be a power of 2.
+	//
+	// vals[i].typ is nil if the slot is empty and non-nil
+	// otherwise. A slot is still in use until *both* the tail
+	// index has moved beyond it and typ has been set to nil. This
+	// is set to nil atomically by the consumer and read
+	// atomically by the producer.
+	vals []eface
+}
+
+type eface struct {
+	typ, val unsafe.Pointer
+}
+
+const dequeueBits = 32
+
+// dequeueLimit is the maximum size of a poolDequeue.
+//
+// This must be at most (1<<dequeueBits)/2 because detecting fullness
+// depends on wrapping around the ring buffer without wrapping around
+// the index. We divide by 4 so this fits in an int on 32-bit.
+const dequeueLimit = (1 << dequeueBits) / 4
+
+// dequeueNil is used in poolDequeue to represent interface{}(nil).
+// Since we use nil to represent empty slots, we need a sentinel value
+// to represent nil.
+type dequeueNil *struct{}
+
+func (d *poolDequeue) unpack(ptrs uint64) (head, tail uint32) {
+	const mask = 1<<dequeueBits - 1
+	head = uint32((ptrs >> dequeueBits) & mask)
+	tail = uint32(ptrs & mask)
+	return
+}
+
+func (d *poolDequeue) pack(head, tail uint32) uint64 {
+	const mask = 1<<dequeueBits - 1
+	return (uint64(head) << dequeueBits) |
+		uint64(tail&mask)
+}
+
+// pushHead adds val at the head of the queue. It returns false if the
+// queue is full. It must only be called by a single producer.
+func (d *poolDequeue) pushHead(val any) bool {
+	ptrs := d.headTail.Load()
+	head, tail := d.unpack(ptrs)
+	if (tail+uint32(len(d.vals)))&(1<<dequeueBits-1) == head {
+		// Queue is full.
+		return false
+	}
+	slot := &d.vals[head&uint32(len(d.vals)-1)]
+
+	// Check if the head slot has been released by popTail.
+	typ := atomic.LoadPointer(&slot.typ)
+	if typ != nil {
+		// Another goroutine is still cleaning up the tail, so
+		// the queue is actually still full.
+		return false
+	}
+
+	// The head slot is free, so we own it.
+	if val == nil {
+		val = dequeueNil(nil)
+	}
+	*(*any)(unsafe.Pointer(slot)) = val
+
+	// Increment head. This passes ownership of slot to popTail
+	// and acts as a store barrier for writing the slot.
+	d.headTail.Add(1 << dequeueBits)
+	return true
+}
+
+// popHead removes and returns the element at the head of the queue.
+// It returns false if the queue is empty. It must only be called by a
+// single producer.
+func (d *poolDequeue) popHead() (any, bool) {
+	var slot *eface
+	for {
+		ptrs := d.headTail.Load()
+		head, tail := d.unpack(ptrs)
+		if tail == head {
+			// Queue is empty.
+			return nil, false
+		}
+
+		// Confirm tail and decrement head. We do this before
+		// reading the value to take back ownership of this
+		// slot.
+		head--
+		ptrs2 := d.pack(head, tail)
+		if d.headTail.CompareAndSwap(ptrs, ptrs2) {
+			// We successfully took back slot.
+			slot = &d.vals[head&uint32(len(d.vals)-1)]
+			break
+		}
+	}
+
+	val := *(*any)(unsafe.Pointer(slot))
+	if val == dequeueNil(nil) {
+		val = nil
+	}
+	// Zero the slot. Unlike popTail, this isn't racing with
+	// pushHead, so we don't need to be careful here.
+	*slot = eface{}
+	return val, true
+}
+
+// popTail removes and returns the element at the tail of the queue.
+// It returns false if the queue is empty. It may be called by any
+// number of consumers.
+func (d *poolDequeue) popTail() (any, bool) {
+	var slot *eface
+	for {
+		ptrs := d.headTail.Load()
+		head, tail := d.unpack(ptrs)
+		if tail == head {
+			// Queue is empty.
+			return nil, false
+		}
+
+		// Confirm head and tail (for our speculative check
+		// above) and increment tail. If this succeeds, then
+		// we own the slot at tail.
+		ptrs2 := d.pack(head, tail+1)
+		if d.headTail.CompareAndSwap(ptrs, ptrs2) {
+			// Success.
+			slot = &d.vals[tail&uint32(len(d.vals)-1)]
+			break
+		}
+	}
+
+	// We now own slot.
+	val := *(*any)(unsafe.Pointer(slot))
+	if val == dequeueNil(nil) {
+		val = nil
+	}
+
+	// Tell pushHead that we're done with this slot. Zeroing the
+	// slot is also important so we don't leave behind references
+	// that could keep this object live longer than necessary.
+	//
+	// We write to val first and then publish that we're done with
+	// this slot by atomically writing to typ.
+	slot.val = nil
+	atomic.StorePointer(&slot.typ, nil)
+	// At this point pushHead owns the slot.
+
+	return val, true
+}
+
+// poolChain is a dynamically-sized version of poolDequeue.
+//
+// This is implemented as a doubly-linked list queue of poolDequeues
+// where each dequeue is double the size of the previous one. Once a
+// dequeue fills up, this allocates a new one and only ever pushes to
+// the latest dequeue. Pops happen from the other end of the list and
+// once a dequeue is exhausted, it gets removed from the list.
+type poolChain struct {
+	// head is the poolDequeue to push to. This is only accessed
+	// by the producer, so doesn't need to be synchronized.
+	head *poolChainElt
+
+	// tail is the poolDequeue to popTail from. This is accessed
+	// by consumers, so reads and writes must be atomic.
+	tail *poolChainElt
+}
+
+type poolChainElt struct {
+	poolDequeue
+
+	// next and prev link to the adjacent poolChainElts in this
+	// poolChain.
+	//
+	// next is written atomically by the producer and read
+	// atomically by the consumer. It only transitions from nil to
+	// non-nil.
+	//
+	// prev is written atomically by the consumer and read
+	// atomically by the producer. It only transitions from
+	// non-nil to nil.
+	next, prev *poolChainElt
+}
+
+func storePoolChainElt(pp **poolChainElt, v *poolChainElt) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(pp)), unsafe.Pointer(v))
+}
+
+func loadPoolChainElt(pp **poolChainElt) *poolChainElt {
+	return (*poolChainElt)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(pp))))
+}
+
+func (c *poolChain) pushHead(val any) {
+	d := c.head
+	if d == nil {
+		// Initialize the chain.
+		const initSize = 8 // Must be a power of 2
+		d = new(poolChainElt)
+		d.vals = make([]eface, initSize)
+		c.head = d
+		storePoolChainElt(&c.tail, d)
+	}
+
+	if d.pushHead(val) {
+		return
+	}
+
+	// The current dequeue is full. Allocate a new one of twice
+	// the size.
+	newSize := len(d.vals) * 2
+	if newSize >= dequeueLimit {
+		// Can't make it any bigger.
+		newSize = dequeueLimit
+	}
+
+	d2 := &poolChainElt{prev: d}
+	d2.vals = make([]eface, newSize)
+	c.head = d2
+	storePoolChainElt(&d.next, d2)
+	d2.pushHead(val)
+}
+
+func (c *poolChain) popHead() (any, bool) {
+	d := c.head
+	for d != nil {
+		if val, ok := d.popHead(); ok {
+			return val, ok
+		}
+		// There may still be unconsumed elements in the
+		// previous dequeue, so try backing up.
+		d = loadPoolChainElt(&d.prev)
+	}
+	return nil, false
+}
+
+func (c *poolChain) popTail() (any, bool) {
+	d := loadPoolChainElt(&c.tail)
+	if d == nil {
+		return nil, false
+	}
+
+	for {
+		// It's important that we load the next pointer
+		// *before* popping the tail. In general, d may be
+		// transiently empty, but if next is non-nil before
+		// the pop and the pop fails, then d is permanently
+		// empty, which is the only condition under which it's
+		// safe to drop d from the chain.
+		d2 := loadPoolChainElt(&d.next)
+
+		if val, ok := d.popTail(); ok {
+			return val, ok
+		}
+
+		if d2 == nil {
+			// This is the only dequeue. It's empty right
+			// now, but could be pushed to in the future.
+			return nil, false
+		}
+
+		// The tail of the chain has been drained, so move on
+		// to the next dequeue. Try to drop it from the chain
+		// so the next pop doesn't have to look at the empty
+		// dequeue again.
+		if atomic.CompareAndSwapPointer((*unsafe.Pointer)(unsafe.Pointer(&c.tail)), unsafe.Pointer(d), unsafe.Pointer(d2)) {
+			// We won the race. Clear the prev pointer so
+			// the garbage collector can collect the empty
+			// dequeue and so popHead doesn't back up
+			// further than necessary.
+			storePoolChainElt(&d2.prev, nil)
+		}
+		d = d2
+	}
+}
diff --git a/cannon/testdata/example/mt-pool/runtime.go b/cannon/testdata/example/mt-pool/runtime.go
new file mode 100644
index 000000000000..1b6dbe3e6cd5
--- /dev/null
+++ b/cannon/testdata/example/mt-pool/runtime.go
@@ -0,0 +1,11 @@
+package main
+
+import (
+	_ "unsafe" // Required for go:linkname
+)
+
+//go:linkname runtime_procPin runtime.procPin
+func runtime_procPin() int
+
+//go:linkname runtime_procUnpin runtime.procUnpin
+func runtime_procUnpin()
diff --git a/cannon/testdata/example/mt-value/go.mod b/cannon/testdata/example/mt-value/go.mod
new file mode 100644
index 000000000000..602687cbcca2
--- /dev/null
+++ b/cannon/testdata/example/mt-value/go.mod
@@ -0,0 +1,8 @@
+module mtvalue
+
+go 1.22
+
+toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/mt-value/main.go b/cannon/testdata/example/mt-value/main.go
new file mode 100644
index 000000000000..51fd1b2b7300
--- /dev/null
+++ b/cannon/testdata/example/mt-value/main.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+
+	"utils/testutil"
+)
+
+func main() {
+	testutil.RunTest(TestValue, "TestValue")
+	testutil.RunTest(TestValueLarge, "TestValueLarge")
+	testutil.RunTest(TestValuePanic, "TestValuePanic")
+	testutil.RunTest(TestValueConcurrent, "TestValueConcurrent")
+	testutil.RunTest(TestValue_Swap, "TestValue_Swap")
+	testutil.RunTest(TestValueSwapConcurrent, "TestValueSwapConcurrent")
+	testutil.RunTest(TestValue_CompareAndSwap, "TestValue_CompareAndSwap")
+	testutil.RunTest(TestValueCompareAndSwapConcurrent, "TestValueCompareAndSwapConcurrent")
+
+	fmt.Println("Value tests passed")
+}
diff --git a/cannon/testdata/example/mt-value/value_test_copy.go b/cannon/testdata/example/mt-value/value_test_copy.go
new file mode 100644
index 000000000000..32ccc0067408
--- /dev/null
+++ b/cannon/testdata/example/mt-value/value_test_copy.go
@@ -0,0 +1,312 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/atomic/value_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	"math/rand"
+	"runtime"
+	"strconv"
+	"sync"
+	"sync/atomic"
+	. "sync/atomic"
+	"testing"
+
+	"utils/testutil"
+)
+
+var short bool = true
+
+func TestValue(t *testutil.TestRunner) {
+	var v Value
+	if v.Load() != nil {
+		t.Fatal("initial Value is not nil")
+	}
+	v.Store(42)
+	x := v.Load()
+	if xx, ok := x.(int); !ok || xx != 42 {
+		t.Fatalf("wrong value: got %+v, want 42", x)
+	}
+	v.Store(84)
+	x = v.Load()
+	if xx, ok := x.(int); !ok || xx != 84 {
+		t.Fatalf("wrong value: got %+v, want 84", x)
+	}
+}
+
+func TestValueLarge(t *testutil.TestRunner) {
+	var v Value
+	v.Store("foo")
+	x := v.Load()
+	if xx, ok := x.(string); !ok || xx != "foo" {
+		t.Fatalf("wrong value: got %+v, want foo", x)
+	}
+	v.Store("barbaz")
+	x = v.Load()
+	if xx, ok := x.(string); !ok || xx != "barbaz" {
+		t.Fatalf("wrong value: got %+v, want barbaz", x)
+	}
+}
+
+func TestValuePanic(t *testutil.TestRunner) {
+	const nilErr = "sync/atomic: store of nil value into Value"
+	const badErr = "sync/atomic: store of inconsistently typed value into Value"
+	var v Value
+	func() {
+		defer func() {
+			err := recover()
+			if err != nilErr {
+				t.Fatalf("inconsistent store panic: got '%v', want '%v'", err, nilErr)
+			}
+		}()
+		v.Store(nil)
+	}()
+	v.Store(42)
+	func() {
+		defer func() {
+			err := recover()
+			if err != badErr {
+				t.Fatalf("inconsistent store panic: got '%v', want '%v'", err, badErr)
+			}
+		}()
+		v.Store("foo")
+	}()
+	func() {
+		defer func() {
+			err := recover()
+			if err != nilErr {
+				t.Fatalf("inconsistent store panic: got '%v', want '%v'", err, nilErr)
+			}
+		}()
+		v.Store(nil)
+	}()
+}
+
+func TestValueConcurrent(t *testutil.TestRunner) {
+	tests := [][]any{
+		{uint16(0), ^uint16(0), uint16(1 + 2<<8), uint16(3 + 4<<8)},
+		{uint32(0), ^uint32(0), uint32(1 + 2<<16), uint32(3 + 4<<16)},
+		{uint64(0), ^uint64(0), uint64(1 + 2<<32), uint64(3 + 4<<32)},
+		{complex(0, 0), complex(1, 2), complex(3, 4), complex(5, 6)},
+	}
+	p := 4 * runtime.GOMAXPROCS(0)
+	N := int(1e5)
+	if short {
+		p /= 2
+		//N = 1e3
+		N = 1e2
+	}
+	for _, test := range tests {
+		var v Value
+		done := make(chan bool, p)
+		for i := 0; i < p; i++ {
+			go func() {
+				r := rand.New(rand.NewSource(rand.Int63()))
+				expected := true
+			loop:
+				for j := 0; j < N; j++ {
+					x := test[r.Intn(len(test))]
+					v.Store(x)
+					x = v.Load()
+					for _, x1 := range test {
+						if x == x1 {
+							continue loop
+						}
+					}
+					t.Logf("loaded unexpected value %+v, want %+v", x, test)
+					expected = false
+					break
+				}
+				done <- expected
+			}()
+		}
+		for i := 0; i < p; i++ {
+			if !<-done {
+				t.FailNow()
+			}
+		}
+	}
+}
+
+func BenchmarkValueRead(b *testing.B) {
+	var v Value
+	v.Store(new(int))
+	b.RunParallel(func(pb *testing.PB) {
+		for pb.Next() {
+			x := v.Load().(*int)
+			if *x != 0 {
+				b.Fatalf("wrong value: got %v, want 0", *x)
+			}
+		}
+	})
+}
+
+var Value_SwapTests = []struct {
+	init any
+	new  any
+	want any
+	err  any
+}{
+	{init: nil, new: nil, err: "sync/atomic: swap of nil value into Value"},
+	{init: nil, new: true, want: nil, err: nil},
+	{init: true, new: "", err: "sync/atomic: swap of inconsistently typed value into Value"},
+	{init: true, new: false, want: true, err: nil},
+}
+
+func TestValue_Swap(t *testutil.TestRunner) {
+	for i, tt := range Value_SwapTests {
+		t.Run(strconv.Itoa(i), func(t testing.TB) {
+			var v Value
+			if tt.init != nil {
+				v.Store(tt.init)
+			}
+			defer func() {
+				err := recover()
+				switch {
+				case tt.err == nil && err != nil:
+					t.Errorf("should not panic, got %v", err)
+				case tt.err != nil && err == nil:
+					t.Errorf("should panic %v, got <nil>", tt.err)
+				}
+			}()
+			if got := v.Swap(tt.new); got != tt.want {
+				t.Errorf("got %v, want %v", got, tt.want)
+			}
+			if got := v.Load(); got != tt.new {
+				t.Errorf("got %v, want %v", got, tt.new)
+			}
+		})
+	}
+}
+
+func TestValueSwapConcurrent(t *testutil.TestRunner) {
+	var v Value
+	var count uint64
+	var g sync.WaitGroup
+	var m, n uint64 = 10000, 10000
+	if short {
+		//m = 1000
+		//n = 1000
+		m = 10
+		n = 10
+	}
+	for i := uint64(0); i < m*n; i += n {
+		i := i
+		g.Add(1)
+		go func() {
+			var c uint64
+			for new := i; new < i+n; new++ {
+				if old := v.Swap(new); old != nil {
+					c += old.(uint64)
+				}
+			}
+			atomic.AddUint64(&count, c)
+			g.Done()
+		}()
+	}
+	g.Wait()
+	if want, got := (m*n-1)*(m*n)/2, count+v.Load().(uint64); got != want {
+		t.Errorf("sum from 0 to %d was %d, want %v", m*n-1, got, want)
+	}
+}
+
+var heapA, heapB = struct{ uint }{0}, struct{ uint }{0}
+
+var Value_CompareAndSwapTests = []struct {
+	init any
+	new  any
+	old  any
+	want bool
+	err  any
+}{
+	{init: nil, new: nil, old: nil, err: "sync/atomic: compare and swap of nil value into Value"},
+	{init: nil, new: true, old: "", err: "sync/atomic: compare and swap of inconsistently typed values into Value"},
+	{init: nil, new: true, old: true, want: false, err: nil},
+	{init: nil, new: true, old: nil, want: true, err: nil},
+	{init: true, new: "", err: "sync/atomic: compare and swap of inconsistently typed value into Value"},
+	{init: true, new: true, old: false, want: false, err: nil},
+	{init: true, new: true, old: true, want: true, err: nil},
+	{init: heapA, new: struct{ uint }{1}, old: heapB, want: true, err: nil},
+}
+
+func TestValue_CompareAndSwap(t *testutil.TestRunner) {
+	for i, tt := range Value_CompareAndSwapTests {
+		t.Run(strconv.Itoa(i), func(t testing.TB) {
+			var v Value
+			if tt.init != nil {
+				v.Store(tt.init)
+			}
+			defer func() {
+				err := recover()
+				switch {
+				case tt.err == nil && err != nil:
+					t.Errorf("got %v, wanted no panic", err)
+				case tt.err != nil && err == nil:
+					t.Errorf("did not panic, want %v", tt.err)
+				}
+			}()
+			if got := v.CompareAndSwap(tt.old, tt.new); got != tt.want {
+				t.Errorf("got %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestValueCompareAndSwapConcurrent(t *testutil.TestRunner) {
+	var v Value
+	var w sync.WaitGroup
+	v.Store(0)
+	m, n := 1000, 100
+	if short {
+		//m = 100
+		//n = 100
+		m = 10
+		n = 10
+	}
+	for i := 0; i < m; i++ {
+		i := i
+		w.Add(1)
+		go func() {
+			for j := i; j < m*n; runtime.Gosched() {
+				if v.CompareAndSwap(j, j+1) {
+					j += m
+				}
+			}
+			w.Done()
+		}()
+	}
+	w.Wait()
+	if stop := v.Load().(int); stop != m*n {
+		t.Errorf("did not get to %v, stopped at %v", m*n, stop)
+	}
+}
diff --git a/cannon/testdata/example/mt-wg/go.mod b/cannon/testdata/example/mt-wg/go.mod
index c8a518a535b5..0c10638b3d1d 100644
--- a/cannon/testdata/example/mt-wg/go.mod
+++ b/cannon/testdata/example/mt-wg/go.mod
@@ -3,3 +3,6 @@ module wg
 go 1.22
 
 toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/mt-wg/main.go b/cannon/testdata/example/mt-wg/main.go
index 841125c6b925..cfdb3e56b8ed 100644
--- a/cannon/testdata/example/mt-wg/main.go
+++ b/cannon/testdata/example/mt-wg/main.go
@@ -2,39 +2,15 @@ package main
 
 import (
 	"fmt"
-	"sync"
-	"sync/atomic"
+
+	"utils/testutil"
 )
 
 func main() {
-	// try some concurrency!
-	var wg sync.WaitGroup
-	wg.Add(2)
-	var x atomic.Int32
-	go func() {
-		x.Add(2)
-		wg.Done()
-	}()
-	go func() {
-		x.Add(40)
-		wg.Done()
-	}()
-	wg.Wait()
-	fmt.Printf("waitgroup result: %d\n", x.Load())
+	testutil.RunTest(TestWaitGroup, "TestWaitGroup")
+	testutil.RunTest(TestWaitGroupMisuse, "TestWaitGroupMisuse")
+	testutil.RunTest(TestWaitGroupRace, "TestWaitGroupRace")
+	testutil.RunTest(TestWaitGroupAlign, "TestWaitGroupAlign")
 
-	// channels
-	a := make(chan int, 1)
-	b := make(chan int)
-	c := make(chan int)
-	go func() {
-		t0 := <-a
-		b <- t0
-	}()
-	go func() {
-		t1 := <-b
-		c <- t1
-	}()
-	a <- 1234
-	out := <-c
-	fmt.Printf("channels result: %d\n", out)
+	fmt.Println("WaitGroup tests passed")
 }
diff --git a/cannon/testdata/example/mt-wg/waitgroup_test_copy.go b/cannon/testdata/example/mt-wg/waitgroup_test_copy.go
new file mode 100644
index 000000000000..81f0cd0ce4cd
--- /dev/null
+++ b/cannon/testdata/example/mt-wg/waitgroup_test_copy.go
@@ -0,0 +1,130 @@
+// This file is based on code written by The Go Authors.
+// See original source: https://github.com/golang/go/blob/go1.22.7/src/sync/waitgroup_test.go
+//
+// --- Original License Notice ---
+//
+// Copyright (c) 2009 The Go Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package main
+
+import (
+	. "sync"
+	"sync/atomic"
+	"testing"
+
+	"utils/testutil"
+)
+
+func testWaitGroup(t testing.TB, wg1 *WaitGroup, wg2 *WaitGroup) {
+	n := 16
+	wg1.Add(n)
+	wg2.Add(n)
+	exited := make(chan bool, n)
+	for i := 0; i != n; i++ {
+		go func() {
+			wg1.Done()
+			wg2.Wait()
+			exited <- true
+		}()
+	}
+	wg1.Wait()
+	for i := 0; i != n; i++ {
+		select {
+		case <-exited:
+			t.Fatal("WaitGroup released group too soon")
+		default:
+		}
+		wg2.Done()
+	}
+	for i := 0; i != n; i++ {
+		<-exited // Will block if barrier fails to unlock someone.
+	}
+}
+
+func TestWaitGroup(t *testutil.TestRunner) {
+	wg1 := &WaitGroup{}
+	wg2 := &WaitGroup{}
+
+	// Run the same test a few times to ensure barrier is in a proper state.
+	for i := 0; i != 8; i++ {
+		testWaitGroup(t, wg1, wg2)
+	}
+}
+
+func TestWaitGroupMisuse(t *testutil.TestRunner) {
+	defer func() {
+		err := recover()
+		if err != "sync: negative WaitGroup counter" {
+			t.Fatalf("Unexpected panic: %#v", err)
+		}
+	}()
+	wg := &WaitGroup{}
+	wg.Add(1)
+	wg.Done()
+	wg.Done()
+	t.Fatal("Should panic")
+}
+
+func TestWaitGroupRace(t *testutil.TestRunner) {
+	// Run this test for about 1ms.
+	for i := 0; i < 1000; i++ {
+		wg := &WaitGroup{}
+		n := new(int32)
+		// spawn goroutine 1
+		wg.Add(1)
+		go func() {
+			atomic.AddInt32(n, 1)
+			wg.Done()
+		}()
+		// spawn goroutine 2
+		wg.Add(1)
+		go func() {
+			atomic.AddInt32(n, 1)
+			wg.Done()
+		}()
+		// Wait for goroutine 1 and 2
+		wg.Wait()
+		if atomic.LoadInt32(n) != 2 {
+			t.Fatal("Spurious wakeup from Wait")
+		}
+	}
+}
+
+func TestWaitGroupAlign(t *testutil.TestRunner) {
+	type X struct {
+		x  byte
+		wg WaitGroup
+	}
+	var x X
+	x.wg.Add(1)
+	go func(x *X) {
+		x.wg.Done()
+	}(&x)
+	x.wg.Wait()
+}
diff --git a/cannon/testdata/example/utilscheck/go.mod b/cannon/testdata/example/utilscheck/go.mod
new file mode 100644
index 000000000000..5a109a7ca8cd
--- /dev/null
+++ b/cannon/testdata/example/utilscheck/go.mod
@@ -0,0 +1,8 @@
+module utilscheck
+
+go 1.22
+
+toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/utilscheck/main.go b/cannon/testdata/example/utilscheck/main.go
new file mode 100644
index 000000000000..ad66a3211ad8
--- /dev/null
+++ b/cannon/testdata/example/utilscheck/main.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"fmt"
+
+	"utils/testutil"
+)
+
+func main() {
+	testutil.RunTest(ShouldFail, "ShouldFail")
+
+	fmt.Println("Passed test that should have failed")
+}
+
+func ShouldFail(t *testutil.TestRunner) {
+	t.Fail()
+}
diff --git a/cannon/testdata/example/utilscheck2/go.mod b/cannon/testdata/example/utilscheck2/go.mod
new file mode 100644
index 000000000000..ee0430168ad1
--- /dev/null
+++ b/cannon/testdata/example/utilscheck2/go.mod
@@ -0,0 +1,8 @@
+module utilscheck2
+
+go 1.22
+
+toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/utilscheck2/main.go b/cannon/testdata/example/utilscheck2/main.go
new file mode 100644
index 000000000000..6fc619f18fe2
--- /dev/null
+++ b/cannon/testdata/example/utilscheck2/main.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"utils/testutil"
+)
+
+func main() {
+	testutil.RunTest(ShouldFail, "ShouldFail")
+
+	fmt.Println("Passed test that should have failed")
+}
+
+func ShouldFail(t *testutil.TestRunner) {
+	t.Run("subtest 1", func(t testing.TB) {
+		// Do something
+	})
+
+	t.Run("subtest 2", func(t testing.TB) {
+		t.Fail()
+	})
+}
diff --git a/cannon/testdata/example/utilscheck3/go.mod b/cannon/testdata/example/utilscheck3/go.mod
new file mode 100644
index 000000000000..3bc116499beb
--- /dev/null
+++ b/cannon/testdata/example/utilscheck3/go.mod
@@ -0,0 +1,8 @@
+module utilscheck3
+
+go 1.22
+
+toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/utilscheck3/main.go b/cannon/testdata/example/utilscheck3/main.go
new file mode 100644
index 000000000000..248c891808b0
--- /dev/null
+++ b/cannon/testdata/example/utilscheck3/main.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"utils/testutil"
+)
+
+func main() {
+	testutil.RunTest(ShouldFail, "ShouldFail")
+
+	fmt.Println("Passed test that should have failed")
+}
+
+func ShouldFail(t *testutil.TestRunner) {
+	t.Run("panic test", func(t testing.TB) {
+		panic("oops")
+	})
+}
diff --git a/cannon/testdata/example/utilscheck4/go.mod b/cannon/testdata/example/utilscheck4/go.mod
new file mode 100644
index 000000000000..7f80460beb9e
--- /dev/null
+++ b/cannon/testdata/example/utilscheck4/go.mod
@@ -0,0 +1,8 @@
+module utilscheck4
+
+go 1.22
+
+toolchain go1.22.0
+
+require utils v0.0.0
+replace utils => ../../utils
diff --git a/cannon/testdata/example/utilscheck4/main.go b/cannon/testdata/example/utilscheck4/main.go
new file mode 100644
index 000000000000..deb78e2cb4d3
--- /dev/null
+++ b/cannon/testdata/example/utilscheck4/main.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"fmt"
+
+	"utils/testutil"
+)
+
+func main() {
+	testutil.RunTest(ShouldFail, "ShouldFail")
+
+	fmt.Println("Passed test that should have failed")
+}
+
+func ShouldFail(t *testutil.TestRunner) {
+	panic("oops")
+}
diff --git a/cannon/testdata/utils/go.mod b/cannon/testdata/utils/go.mod
new file mode 100644
index 000000000000..45f262e0b16d
--- /dev/null
+++ b/cannon/testdata/utils/go.mod
@@ -0,0 +1,5 @@
+module utils
+
+go 1.22
+
+toolchain go1.22.0
diff --git a/cannon/testdata/utils/testutil/testing.go b/cannon/testdata/utils/testutil/testing.go
new file mode 100644
index 000000000000..f6c79c63655e
--- /dev/null
+++ b/cannon/testdata/utils/testutil/testing.go
@@ -0,0 +1,170 @@
+package testutil
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"sync"
+	"testing"
+)
+
+func RunTest(testFunc func(*TestRunner), name string) {
+	goRunTest(name, testFunc, newTestRunner(name))
+}
+
+type TestRunner struct {
+	*mockT
+	baseName string
+}
+
+func newTestRunner(baseName string) *TestRunner {
+	return &TestRunner{mockT: newMockT(), baseName: baseName}
+}
+
+func (r *TestRunner) Run(name string, testFunc func(t testing.TB)) bool {
+	testName := r.baseName
+	if name != "" {
+		testName = fmt.Sprintf("%v (%v)", r.baseName, name)
+	}
+
+	var tester testing.TB = r
+	goRunTest(testName, testFunc, tester)
+	return !r.Failed()
+}
+
+func goRunTest[T testing.TB](testName string, testFunc func(t T), t T) {
+	var wg sync.WaitGroup
+	wg.Add(1)
+
+	go func() {
+		defer func() {
+			if err := recover(); err != nil {
+				fmt.Printf("Test panicked: %v\n\t%v", testName, err)
+				os.Exit(1)
+			}
+
+			if t.Failed() {
+				fmt.Printf("Test failed: %v\n", testName)
+				os.Exit(1)
+			} else if t.Skipped() {
+				fmt.Printf("Test skipped: %v\n", testName)
+			} else {
+				fmt.Printf("Test passed: %v\n", testName)
+			}
+
+			wg.Done()
+		}()
+
+		testFunc(t)
+	}()
+
+	wg.Wait()
+}
+
+type mockT struct {
+	*testing.T
+	mu      sync.Mutex
+	failed  bool
+	skipped bool
+}
+
+var _ testing.TB = (*mockT)(nil)
+
+func newMockT() *mockT {
+	return &mockT{}
+}
+
+func (t *mockT) Cleanup(func()) {
+	t.Fatalf("Cleanup not supported")
+}
+
+func (t *mockT) Error(args ...any) {
+	fmt.Print(args...)
+	t.fail()
+}
+
+func (t *mockT) Errorf(format string, args ...any) {
+	fmt.Printf(format, args...)
+	t.fail()
+}
+
+func (t *mockT) Fail() {
+	t.fail()
+}
+
+func (t *mockT) FailNow() {
+	fmt.Println("Fatal")
+	t.fail()
+}
+
+func (t *mockT) Failed() bool {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	return t.failed
+}
+
+func (t *mockT) Fatal(args ...any) {
+	fmt.Print(args...)
+	t.fail()
+}
+
+func (t *mockT) Fatalf(format string, args ...any) {
+	fmt.Printf(format, args...)
+	t.fail()
+}
+
+func (t *mockT) Helper() {}
+
+func (t *mockT) Log(args ...any) {
+	fmt.Print(args...)
+}
+
+func (t *mockT) Logf(format string, args ...any) {
+	fmt.Printf(format, args...)
+}
+
+func (t *mockT) Name() string {
+	return ""
+}
+
+func (t *mockT) Setenv(key, value string) {
+	t.Fatalf("Setenv not supported")
+}
+
+func (t *mockT) Skip(args ...any) {
+	fmt.Println(args...)
+	t.skip()
+}
+
+func (t *mockT) SkipNow() {
+	t.skip()
+}
+
+func (t *mockT) Skipf(format string, args ...any) {
+	fmt.Printf(format, args...)
+	t.skip()
+}
+func (t *mockT) Skipped() bool {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	return t.skipped
+}
+
+func (t *mockT) skip() {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.skipped = true
+	runtime.Goexit()
+}
+
+func (t *mockT) fail() {
+	t.mu.Lock()
+	defer t.mu.Unlock()
+	t.failed = true
+	runtime.Goexit()
+}
+
+func (t *mockT) TempDir() string {
+	t.Fatalf("TempDir not supported")
+	return ""
+}

From 34046982191c21a5e72ed9c825347262c513942c Mon Sep 17 00:00:00 2001
From: AgusDuha <81362284+agusduha@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:46:19 -0300
Subject: [PATCH 247/451] feat: add sender to ERC7802 events (#132) (#13020)

---
 .../snapshots/abi/OptimismSuperchainERC20.json       | 12 ++++++++++++
 .../snapshots/abi/SuperchainWETH.json                | 12 ++++++++++++
 .../contracts-bedrock/snapshots/semver-lock.json     | 10 +++++-----
 .../src/L2/OptimismSuperchainERC20.sol               |  4 ++--
 .../contracts-bedrock/src/L2/SuperchainERC20.sol     |  8 ++++----
 packages/contracts-bedrock/src/L2/SuperchainWETH.sol |  8 ++++----
 .../contracts-bedrock/src/L2/interfaces/IERC7802.sol |  6 ++++--
 .../contracts-bedrock/test/L2/SuperchainERC20.t.sol  |  4 ++--
 .../contracts-bedrock/test/L2/SuperchainWETH.t.sol   | 12 ++++++------
 9 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json b/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json
index 24ac8a88fab4..fbe697b864d8 100644
--- a/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismSuperchainERC20.json
@@ -454,6 +454,12 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
       }
     ],
     "name": "CrosschainBurn",
@@ -473,6 +479,12 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
       }
     ],
     "name": "CrosschainMint",
diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
index 32d84df7d889..a8b4365d742e 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
@@ -306,6 +306,12 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
       }
     ],
     "name": "CrosschainBurn",
@@ -325,6 +331,12 @@
         "internalType": "uint256",
         "name": "amount",
         "type": "uint256"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
       }
     ],
     "name": "CrosschainMint",
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index d069a2753933..c24e3f8cb6f0 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -104,8 +104,8 @@
     "sourceCodeHash": "0xa76133db7f449ae742f9ba988ad86ccb5672475f61298b9fefe411b63b63e9f6"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0x5bc5824030ecdb531e1f615d207cb73cdaa702e198769445d0ddbe717271eba9",
-    "sourceCodeHash": "0x0819c9411a155dca592d19b60c4176954202e4fe5d632a4ffbf88d465461252c"
+    "initCodeHash": "0x22fed5371ad9b4c2711ce5cbee889d332887aa5f5ff6b37e36c31acefe3bbeee",
+    "sourceCodeHash": "0xf68baaee0a09ea51d5a4e821df79976c0914369ebc8e5fd27bbbf89072254fc8"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
     "initCodeHash": "0x23dba3ceb9e58646695c306996c9e15251ac79acc6339c1a93d10a4c79da6dab",
@@ -121,15 +121,15 @@
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-    "sourceCodeHash": "0xcf39c16893cace1e7d61350bfff05a27f3ce8da8eb0ac02cb5ac7bf603f163fa"
+    "sourceCodeHash": "0x77adb9ea7a9e9cf3dc5943607dcacacf7a703bd110d2a5627e7075b766aae29f"
   },
   "src/L2/SuperchainTokenBridge.sol": {
     "initCodeHash": "0x1cd2afdae6dd1b6ebc17f1d529e7d74c9b8b21b02db8589b8e389e2d5523d775",
     "sourceCodeHash": "0x617aa994f659c5d8ebd54128d994f86f5b175ceca095b024b8524a7898e8ae62"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0x5aef986a7c9c102b1e9b3068e2a2b66adce0a71dd5f39e03694622bf494f8d97",
-    "sourceCodeHash": "0xa62101a23b860e97f393027c898082a1c73d50679eceb6c6793844af29702359"
+    "initCodeHash": "0x90aad5698e09994909331dd9665d99a8d5a53e45ba792bf47e4c2efbd48f7699",
+    "sourceCodeHash": "0x35f0ffcfa027f736b496f3fd2640c043648a49ce325083486ce27f63bfec6d08"
   },
   "src/L2/WETH.sol": {
     "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
index c323d8b7577b..86f73f1d6f95 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
@@ -58,8 +58,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.9
-    string public constant override version = "1.0.0-beta.9";
+    /// @custom:semver 1.0.0-beta.10
+    string public constant override version = "1.0.0-beta.10";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
index b9e6bbfbf780..6d40ff943764 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
@@ -13,9 +13,9 @@ import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 ///         the Superchain. Allows the SuperchainTokenBridge to mint and burn tokens as needed.
 abstract contract SuperchainERC20 is ERC20, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.5
+    /// @custom:semver 1.0.0-beta.6
     function version() external view virtual returns (string memory) {
-        return "1.0.0-beta.5";
+        return "1.0.0-beta.6";
     }
 
     /// @notice Allows the SuperchainTokenBridge to mint tokens.
@@ -26,7 +26,7 @@ abstract contract SuperchainERC20 is ERC20, IERC7802, ISemver {
 
         _mint(_to, _amount);
 
-        emit CrosschainMint(_to, _amount);
+        emit CrosschainMint(_to, _amount, msg.sender);
     }
 
     /// @notice Allows the SuperchainTokenBridge to burn tokens.
@@ -37,7 +37,7 @@ abstract contract SuperchainERC20 is ERC20, IERC7802, ISemver {
 
         _burn(_from, _amount);
 
-        emit CrosschainBurn(_from, _amount);
+        emit CrosschainBurn(_from, _amount, msg.sender);
     }
 
     /// @inheritdoc IERC165
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index 29e179eba82c..d5c37d9cc763 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -24,8 +24,8 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 ///         do not use a custom gas token.
 contract SuperchainWETH is WETH98, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.10
-    string public constant version = "1.0.0-beta.10";
+    /// @custom:semver 1.0.0-beta.11
+    string public constant version = "1.0.0-beta.11";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
@@ -74,7 +74,7 @@ contract SuperchainWETH is WETH98, IERC7802, ISemver {
             IETHLiquidity(Predeploys.ETH_LIQUIDITY).mint(_amount);
         }
 
-        emit CrosschainMint(_to, _amount);
+        emit CrosschainMint(_to, _amount, msg.sender);
     }
 
     /// @notice Allows the SuperchainTokenBridge to burn tokens.
@@ -90,7 +90,7 @@ contract SuperchainWETH is WETH98, IERC7802, ISemver {
             IETHLiquidity(Predeploys.ETH_LIQUIDITY).burn{ value: _amount }();
         }
 
-        emit CrosschainBurn(_from, _amount);
+        emit CrosschainBurn(_from, _amount, msg.sender);
     }
 
     /// @inheritdoc IERC165
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol b/packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol
index 469230e822d1..38c92d01d8d2 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol
@@ -9,12 +9,14 @@ interface IERC7802 is IERC165 {
     /// @notice Emitted when a crosschain transfer mints tokens.
     /// @param to       Address of the account tokens are being minted for.
     /// @param amount   Amount of tokens minted.
-    event CrosschainMint(address indexed to, uint256 amount);
+    /// @param sender   Address of the account that finilized the crosschain transfer.
+    event CrosschainMint(address indexed to, uint256 amount, address indexed sender);
 
     /// @notice Emitted when a crosschain transfer burns tokens.
     /// @param from     Address of the account tokens are being burned from.
     /// @param amount   Amount of tokens burned.
-    event CrosschainBurn(address indexed from, uint256 amount);
+    /// @param sender   Address of the account that initiated the crosschain transfer.
+    event CrosschainBurn(address indexed from, uint256 amount, address indexed sender);
 
     /// @notice Mint tokens through a crosschain transfer.
     /// @param _to     Address to mint tokens to.
diff --git a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
index 87f723a9345b..2afb4ba03d15 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
@@ -62,7 +62,7 @@ contract SuperchainERC20Test is Test {
 
         // Look for the emit of the `CrosschainMint` event
         vm.expectEmit(address(superchainERC20));
-        emit IERC7802.CrosschainMint(_to, _amount);
+        emit IERC7802.CrosschainMint(_to, _amount, SUPERCHAIN_TOKEN_BRIDGE);
 
         // Call the `mint` function with the bridge caller
         vm.prank(SUPERCHAIN_TOKEN_BRIDGE);
@@ -105,7 +105,7 @@ contract SuperchainERC20Test is Test {
 
         // Look for the emit of the `CrosschainBurn` event
         vm.expectEmit(address(superchainERC20));
-        emit IERC7802.CrosschainBurn(_from, _amount);
+        emit IERC7802.CrosschainBurn(_from, _amount, SUPERCHAIN_TOKEN_BRIDGE);
 
         // Call the `burn` function with the bridge caller
         vm.prank(SUPERCHAIN_TOKEN_BRIDGE);
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index e342a53b6026..88ff2ada8953 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -28,10 +28,10 @@ contract SuperchainWETH_Test is CommonTest {
     event Withdrawal(address indexed src, uint256 wad);
 
     /// @notice Emitted when a crosschain transfer mints tokens.
-    event CrosschainMint(address indexed to, uint256 amount);
+    event CrosschainMint(address indexed to, uint256 amount, address indexed sender);
 
     /// @notice Emitted when a crosschain transfer burns tokens.
-    event CrosschainBurn(address indexed from, uint256 amount);
+    event CrosschainBurn(address indexed from, uint256 amount, address indexed sender);
 
     address internal constant ZERO_ADDRESS = address(0);
 
@@ -162,7 +162,7 @@ contract SuperchainWETH_Test is CommonTest {
 
         // Look for the emit of the `CrosschainMint` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainMint(_to, _amount);
+        emit CrosschainMint(_to, _amount, Predeploys.SUPERCHAIN_TOKEN_BRIDGE);
 
         // Mock the `isCustomGasToken` function to return false
         _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(false));
@@ -195,7 +195,7 @@ contract SuperchainWETH_Test is CommonTest {
 
         // Look for the emit of the `CrosschainMint` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainMint(_to, _amount);
+        emit CrosschainMint(_to, _amount, Predeploys.SUPERCHAIN_TOKEN_BRIDGE);
 
         // Mock the `isCustomGasToken` function to return false
         _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(true));
@@ -248,7 +248,7 @@ contract SuperchainWETH_Test is CommonTest {
 
         // Look for the emit of the `CrosschainBurn` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainBurn(_from, _amount);
+        emit CrosschainBurn(_from, _amount, Predeploys.SUPERCHAIN_TOKEN_BRIDGE);
 
         // Mock the `isCustomGasToken` function to return false
         _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(false));
@@ -290,7 +290,7 @@ contract SuperchainWETH_Test is CommonTest {
 
         // Look for the emit of the `CrosschainBurn` event
         vm.expectEmit(address(superchainWeth));
-        emit CrosschainBurn(_from, _amount);
+        emit CrosschainBurn(_from, _amount, Predeploys.SUPERCHAIN_TOKEN_BRIDGE);
 
         // Expect to not call the `burn` function in the `ETHLiquidity` contract
         vm.expectCall(Predeploys.ETH_LIQUIDITY, abi.encodeCall(IETHLiquidity.burn, ()), 0);

From ccb544d0b1dca4eaa7695d636e70f4f20d448842 Mon Sep 17 00:00:00 2001
From: AgusDuha <81362284+agusduha@users.noreply.github.com>
Date: Thu, 21 Nov 2024 18:31:58 -0300
Subject: [PATCH 248/451] feat: add dependency set check to L2ToL2CDM (#134)
 (#13019)

---
 .../abi/L2ToL2CrossDomainMessenger.json       |  5 +++
 .../snapshots/semver-lock.json                |  4 +-
 .../src/L2/L2ToL2CrossDomainMessenger.sol     |  9 ++++-
 .../IL2ToL2CrossDomainMessenger.sol           |  3 ++
 .../test/L2/L2ToL2CrossDomainMessenger.t.sol  | 39 ++++++++++++++++++-
 5 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json b/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json
index 6434233930db..9f51cc1c3a27 100644
--- a/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2ToL2CrossDomainMessenger.json
@@ -247,6 +247,11 @@
     "name": "IdOriginNotL2ToL2CrossDomainMessenger",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "InvalidChainId",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "MessageAlreadyRelayed",
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index c24e3f8cb6f0..444f4522c657 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -100,8 +100,8 @@
     "sourceCodeHash": "0xd08a2e6514dbd44e16aa312a1b27b2841a9eab5622cbd05a39c30f543fad673c"
   },
   "src/L2/L2ToL2CrossDomainMessenger.sol": {
-    "initCodeHash": "0x2a1a1ee4f47175ce661ee8e4e50cfa879b082dcb5278b1d66ddda00ed77bb744",
-    "sourceCodeHash": "0xa76133db7f449ae742f9ba988ad86ccb5672475f61298b9fefe411b63b63e9f6"
+    "initCodeHash": "0xc1c80c662aafebb639f62f17d9fefd6954947fd43dc31c278950727491471a94",
+    "sourceCodeHash": "0xac12ab96ffe91c75bfe74768271a725e1cbe3996b16284171440dd71bcc215b6"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
     "initCodeHash": "0x22fed5371ad9b4c2711ce5cbee889d332887aa5f5ff6b37e36c31acefe3bbeee",
diff --git a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
index 6b1d7327dbc0..bf53133484d6 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
@@ -8,6 +8,7 @@ import { CrossL2Inbox, Identifier } from "src/L2/CrossL2Inbox.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { TransientReentrancyAware } from "src/libraries/TransientContext.sol";
+import { IDependencySet } from "src/L2/interfaces/IDependencySet.sol";
 
 /// @notice Thrown when a non-written slot in transient storage is attempted to be read from.
 error NotEntered();
@@ -39,6 +40,9 @@ error ReentrantCall();
 /// @notice Thrown when a call to the target contract during message relay fails.
 error TargetCallFailed();
 
+/// @notice Thrown when attempting to use a chain ID that is not in the dependency set.
+error InvalidChainId();
+
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000023
 /// @title L2ToL2CrossDomainMessenger
@@ -65,8 +69,8 @@ contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
     uint16 public constant messageVersion = uint16(0);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.10
-    string public constant version = "1.0.0-beta.10";
+    /// @custom:semver 1.0.0-beta.11
+    string public constant version = "1.0.0-beta.11";
 
     /// @notice Mapping of message hashes to boolean receipt values. Note that a message will only be present in this
     ///         mapping if it has successfully been relayed on this chain, and can therefore not be relayed again.
@@ -130,6 +134,7 @@ contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
         if (_destination == block.chainid) revert MessageDestinationSameChain();
         if (_target == Predeploys.CROSS_L2_INBOX) revert MessageTargetCrossL2Inbox();
         if (_target == Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER) revert MessageTargetL2ToL2CrossDomainMessenger();
+        if (!IDependencySet(Predeploys.L1_BLOCK_ATTRIBUTES).isInDependencySet(_destination)) revert InvalidChainId();
 
         uint256 nonce = messageNonce();
         emit SentMessage(_destination, _target, nonce, msg.sender, _message);
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol
index 00ca4906b5c4..89311cf18f01 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol
@@ -42,6 +42,9 @@ interface IL2ToL2CrossDomainMessenger {
     /// @notice Thrown when a call to the target contract during message relay fails.
     error TargetCallFailed();
 
+    /// @notice Thrown when attempting to use a chain ID that is not in the dependency set.
+    error InvalidChainId();
+
     /// @notice Emitted whenever a message is sent to a destination
     /// @param destination  Chain ID of the destination chain.
     /// @param target       Target contract or wallet address.
diff --git a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
index 1e5e04edc25b..0775eb588d2a 100644
--- a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
@@ -22,7 +22,9 @@ import {
     MessageTargetL2ToL2CrossDomainMessenger,
     MessageAlreadyRelayed,
     ReentrantCall,
-    TargetCallFailed
+    TargetCallFailed,
+    IDependencySet,
+    InvalidChainId
 } from "src/L2/L2ToL2CrossDomainMessenger.sol";
 
 /// @title L2ToL2CrossDomainMessengerWithModifiableTransientStorage
@@ -85,6 +87,13 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure that the target contract is not CrossL2Inbox or L2ToL2CrossDomainMessenger
         vm.assume(_target != Predeploys.CROSS_L2_INBOX && _target != Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
 
+        // Mock the call over the `isInDependencySet` function to return true
+        vm.mockCall(
+            Predeploys.L1_BLOCK_ATTRIBUTES,
+            abi.encodeCall(IDependencySet.isInDependencySet, (_destination)),
+            abi.encode(true)
+        );
+
         // Get the current message nonce
         uint256 messageNonce = l2ToL2CrossDomainMessenger.messageNonce();
 
@@ -193,6 +202,34 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         });
     }
 
+    /// @notice Tests the `sendMessage` function reverts when the `destination` is not in the dependency set.
+    function testFuzz_sendMessage_notInDependencySet_reverts(
+        uint256 _destination,
+        address _target,
+        bytes calldata _message
+    )
+        external
+    {
+        // Ensure the destination is not the same as the source, otherwise the function will revert
+        vm.assume(_destination != block.chainid);
+
+        // Ensure that the target contract is not CrossL2Inbox or L2ToL2CrossDomainMessenger
+        vm.assume(_target != Predeploys.CROSS_L2_INBOX && _target != Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
+
+        // Mock the call over the `isInDependencySet` function to return false
+        vm.mockCall(
+            Predeploys.L1_BLOCK_ATTRIBUTES,
+            abi.encodeCall(IDependencySet.isInDependencySet, (_destination)),
+            abi.encode(false)
+        );
+
+        // Expect a revert with the InvalidChainId selector
+        vm.expectRevert(InvalidChainId.selector);
+
+        // Call `sendMessage` with a destination that is not in the dependency set to provoke revert
+        l2ToL2CrossDomainMessenger.sendMessage(_destination, _target, _message);
+    }
+
     /// @dev Tests that the `relayMessage` function succeeds and emits the correct RelayedMessage event.
     function testFuzz_relayMessage_succeeds(
         uint256 _source,

From 8f5c20ee7724e69dc76634ff88377ace16ea2eb0 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 21 Nov 2024 23:27:53 +0100
Subject: [PATCH 249/451] improve Legacy Contract tests (#13022)

* improve DeployerWhitelist test

* fix L1BlockNumber fallback test

* fixes
---
 .../test/legacy/DeployerWhitelist.t.sol       | 99 ++++++++++++++++++-
 .../test/legacy/L1BlockNumber.t.sol           |  2 +-
 2 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
index 3f140e9a0725..76a0e6aa084f 100644
--- a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
+++ b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
@@ -10,6 +10,11 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeployerWhitelist_Test is Test {
     IDeployerWhitelist list;
+    address owner = address(12345);
+
+    event OwnerChanged(address oldOwner, address newOwner);
+    event WhitelistDisabled(address oldOwner);
+    event WhitelistStatusChanged(address deployer, bool whitelisted);
 
     /// @dev Sets up the test suite.
     function setUp() public {
@@ -27,10 +32,96 @@ contract DeployerWhitelist_Test is Test {
     }
 
     /// @dev Tests that `setOwner` correctly sets the contract owner.
-    function test_storageSlots_succeeds() external {
-        vm.prank(list.owner());
-        list.setOwner(address(1));
+    function test_setOwner_succeeds(address _owner) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+        _owner = address(uint160(bound(uint160(_owner), 1, type(uint160).max)));
+
+        vm.prank(owner);
+        vm.expectEmit(true, true, true, true);
+        emit OwnerChanged(owner, _owner);
+        list.setOwner(_owner);
+
+        assertEq(list.owner(), _owner);
+    }
+
+    /// @dev Tests that `setOwner` reverts when the caller is not the owner.
+    function test_setOwner_reverts(address _caller, address _owner) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.assume(_caller != owner);
+
+        vm.prank(_caller);
+        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
+        list.setOwner(_owner);
+    }
+
+    /// @dev Tests that `setOwner` reverts when the new owner is the zero address.
+    function test_setOwner_reverts_zeroAddress() external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.prank(owner);
+        vm.expectRevert(bytes("DeployerWhitelist: can only be disabled via enableArbitraryContractDeployment"));
+        list.setOwner(address(0));
+    }
+
+    /// @dev Tests that `enableArbitraryContractDeployment` correctly disables the whitelist.
+    function test_enableArbitraryContractDeployment_succeeds() external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.prank(owner);
+        vm.expectEmit(true, true, true, true);
+        emit WhitelistDisabled(owner);
+        list.enableArbitraryContractDeployment();
+
+        assertEq(list.owner(), address(0));
+
+        // Any address is allowed to deploy contracts even if they are not whitelisted
+        assertEq(list.whitelist(address(1)), false);
+        assertEq(list.isDeployerAllowed(address(1)), true);
+    }
+
+    /// @dev Tests that `enableArbitraryContractDeployment` reverts when the caller is not the owner.
+    function test_enableArbitraryContractDeployment_reverts(address _caller) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.assume(_caller != owner);
+
+        vm.prank(_caller);
+        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
+        list.enableArbitraryContractDeployment();
+    }
+
+    /// @dev Tests that `setWhitelistedDeployer` correctly sets the whitelist status of a deployer.
+    function test_setWhitelistedDeployer_succeeds(address _deployer, bool _isWhitelisted) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.prank(owner);
+        vm.expectEmit(true, true, true, true);
+        emit WhitelistStatusChanged(_deployer, _isWhitelisted);
+        list.setWhitelistedDeployer(_deployer, _isWhitelisted);
+
+        assertEq(list.whitelist(_deployer), _isWhitelisted);
+
+        // _deployer is whitelisted or not (and arbitrary contract deployment is not enabled)
+        assertNotEq(list.owner(), address(0));
+        assertEq(list.isDeployerAllowed(_deployer), _isWhitelisted);
+    }
+
+    /// @dev Tests that `setWhitelistedDeployer` reverts when the caller is not the owner.
+    function test_setWhitelistedDeployer_reverts(address _caller, address _deployer, bool _isWhitelisted) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.assume(_caller != owner);
 
-        assertEq(bytes32(uint256(1)), vm.load(address(list), bytes32(uint256(0))));
+        vm.prank(_caller);
+        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
+        list.setWhitelistedDeployer(_deployer, _isWhitelisted);
     }
 }
diff --git a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
index 49758739d2da..aa8d2545106a 100644
--- a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
@@ -49,7 +49,7 @@ contract L1BlockNumberTest is Test {
 
     /// @dev Tests that `fallback` is correctly dispatched.
     function test_fallback_succeeds() external {
-        (bool success, bytes memory ret) = address(bn).call(hex"");
+        (bool success, bytes memory ret) = address(bn).call(hex"11");
         assertEq(success, true);
         assertEq(ret, abi.encode(number));
     }

From e52030dba4d6130874f80e80900961c342c8c074 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Thu, 21 Nov 2024 19:22:51 -0500
Subject: [PATCH 250/451] chore(op-challenger): Update kona native mode flag
 (#13023)

---
 .../game/fault/trace/vm/kona_server_executor.go          | 9 ++++-----
 op-e2e/actions/proofs/helpers/kona.go                    | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/op-challenger/game/fault/trace/vm/kona_server_executor.go b/op-challenger/game/fault/trace/vm/kona_server_executor.go
index baaa253088fc..ffb74d9a31b8 100644
--- a/op-challenger/game/fault/trace/vm/kona_server_executor.go
+++ b/op-challenger/game/fault/trace/vm/kona_server_executor.go
@@ -9,8 +9,7 @@ import (
 )
 
 type KonaExecutor struct {
-	nativeMode    bool
-	clientBinPath string
+	nativeMode bool
 }
 
 var _ OracleServerExecutor = (*KonaExecutor)(nil)
@@ -19,8 +18,8 @@ func NewKonaExecutor() *KonaExecutor {
 	return &KonaExecutor{nativeMode: false}
 }
 
-func NewNativeKonaExecutor(clientBinPath string) *KonaExecutor {
-	return &KonaExecutor{nativeMode: true, clientBinPath: clientBinPath}
+func NewNativeKonaExecutor() *KonaExecutor {
+	return &KonaExecutor{nativeMode: true}
 }
 
 func (s *KonaExecutor) OracleCommand(cfg Config, dataDir string, inputs utils.LocalGameInputs) ([]string, error) {
@@ -37,7 +36,7 @@ func (s *KonaExecutor) OracleCommand(cfg Config, dataDir string, inputs utils.Lo
 	}
 
 	if s.nativeMode {
-		args = append(args, "--exec", s.clientBinPath)
+		args = append(args, "--native")
 	} else {
 		args = append(args, "--server")
 		args = append(args, "--data-dir", dataDir)
diff --git a/op-e2e/actions/proofs/helpers/kona.go b/op-e2e/actions/proofs/helpers/kona.go
index 9d34a98dda01..dc9b98cd8097 100644
--- a/op-e2e/actions/proofs/helpers/kona.go
+++ b/op-e2e/actions/proofs/helpers/kona.go
@@ -16,15 +16,14 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-var konaHostPath, konaClientPath string
+var konaHostPath string
 
 func init() {
 	konaHostPath = os.Getenv("KONA_HOST_PATH")
-	konaClientPath = os.Getenv("KONA_CLIENT_PATH")
 }
 
 func IsKonaConfigured() bool {
-	return konaHostPath != "" && konaClientPath != ""
+	return konaHostPath != ""
 }
 
 func RunKonaNative(
@@ -57,7 +56,7 @@ func RunKonaNative(
 		L2Claim:       fixtureInputs.L2Claim,
 		L2BlockNumber: big.NewInt(int64(fixtureInputs.L2BlockNumber)),
 	}
-	hostCmd, err := vm.NewNativeKonaExecutor(konaClientPath).OracleCommand(vmCfg, workDir, inputs)
+	hostCmd, err := vm.NewNativeKonaExecutor().OracleCommand(vmCfg, workDir, inputs)
 	require.NoError(t, err)
 
 	cmd := exec.Command(hostCmd[0], hostCmd[1:]...)

From 5aa14b374ec906d32a824b4c7acbcb06366a88d0 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Fri, 22 Nov 2024 12:42:39 +0800
Subject: [PATCH 251/451] op-batcher: fix a deadlock (#13014)

* fix a deadlock

* add comment
---
 op-batcher/batcher/driver.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index dde08ac84193..08cf867aed43 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -557,8 +557,11 @@ func (l *BatchSubmitter) throttlingLoop(ctx context.Context) {
 			// We'd probably hit this error right after startup, so a short shutdown duration should suffice.
 			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 			defer cancel()
-			// Always returns nil. An error is only returned to expose this function as an RPC.
-			_ = l.StopBatchSubmitting(ctx)
+			// Call StopBatchSubmitting in another goroutine to avoid deadlock.
+			go func() {
+				// Always returns nil. An error is only returned to expose this function as an RPC.
+				_ = l.StopBatchSubmitting(ctx)
+			}()
 			return
 		} else if err != nil {
 			l.Log.Error("SetMaxDASize rpc failed, retrying.", "err", err)

From 99810e0b39a44ca2a801adf732acb2d7557b32d6 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 22 Nov 2024 09:46:35 -0700
Subject: [PATCH 252/451] Revert "improve Legacy Contract tests (#13022)"
 (#13031)

This reverts commit 8f5c20ee7724e69dc76634ff88377ace16ea2eb0.
---
 .../test/legacy/DeployerWhitelist.t.sol       | 99 +------------------
 .../test/legacy/L1BlockNumber.t.sol           |  2 +-
 2 files changed, 5 insertions(+), 96 deletions(-)

diff --git a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
index 76a0e6aa084f..3f140e9a0725 100644
--- a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
+++ b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
@@ -10,11 +10,6 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeployerWhitelist_Test is Test {
     IDeployerWhitelist list;
-    address owner = address(12345);
-
-    event OwnerChanged(address oldOwner, address newOwner);
-    event WhitelistDisabled(address oldOwner);
-    event WhitelistStatusChanged(address deployer, bool whitelisted);
 
     /// @dev Sets up the test suite.
     function setUp() public {
@@ -32,96 +27,10 @@ contract DeployerWhitelist_Test is Test {
     }
 
     /// @dev Tests that `setOwner` correctly sets the contract owner.
-    function test_setOwner_succeeds(address _owner) external {
-        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
-        assertEq(list.owner(), owner);
-        _owner = address(uint160(bound(uint160(_owner), 1, type(uint160).max)));
-
-        vm.prank(owner);
-        vm.expectEmit(true, true, true, true);
-        emit OwnerChanged(owner, _owner);
-        list.setOwner(_owner);
-
-        assertEq(list.owner(), _owner);
-    }
-
-    /// @dev Tests that `setOwner` reverts when the caller is not the owner.
-    function test_setOwner_reverts(address _caller, address _owner) external {
-        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
-        assertEq(list.owner(), owner);
-
-        vm.assume(_caller != owner);
-
-        vm.prank(_caller);
-        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
-        list.setOwner(_owner);
-    }
-
-    /// @dev Tests that `setOwner` reverts when the new owner is the zero address.
-    function test_setOwner_reverts_zeroAddress() external {
-        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
-        assertEq(list.owner(), owner);
-
-        vm.prank(owner);
-        vm.expectRevert(bytes("DeployerWhitelist: can only be disabled via enableArbitraryContractDeployment"));
-        list.setOwner(address(0));
-    }
-
-    /// @dev Tests that `enableArbitraryContractDeployment` correctly disables the whitelist.
-    function test_enableArbitraryContractDeployment_succeeds() external {
-        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
-        assertEq(list.owner(), owner);
-
-        vm.prank(owner);
-        vm.expectEmit(true, true, true, true);
-        emit WhitelistDisabled(owner);
-        list.enableArbitraryContractDeployment();
-
-        assertEq(list.owner(), address(0));
-
-        // Any address is allowed to deploy contracts even if they are not whitelisted
-        assertEq(list.whitelist(address(1)), false);
-        assertEq(list.isDeployerAllowed(address(1)), true);
-    }
-
-    /// @dev Tests that `enableArbitraryContractDeployment` reverts when the caller is not the owner.
-    function test_enableArbitraryContractDeployment_reverts(address _caller) external {
-        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
-        assertEq(list.owner(), owner);
-
-        vm.assume(_caller != owner);
-
-        vm.prank(_caller);
-        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
-        list.enableArbitraryContractDeployment();
-    }
-
-    /// @dev Tests that `setWhitelistedDeployer` correctly sets the whitelist status of a deployer.
-    function test_setWhitelistedDeployer_succeeds(address _deployer, bool _isWhitelisted) external {
-        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
-        assertEq(list.owner(), owner);
-
-        vm.prank(owner);
-        vm.expectEmit(true, true, true, true);
-        emit WhitelistStatusChanged(_deployer, _isWhitelisted);
-        list.setWhitelistedDeployer(_deployer, _isWhitelisted);
-
-        assertEq(list.whitelist(_deployer), _isWhitelisted);
-
-        // _deployer is whitelisted or not (and arbitrary contract deployment is not enabled)
-        assertNotEq(list.owner(), address(0));
-        assertEq(list.isDeployerAllowed(_deployer), _isWhitelisted);
-    }
-
-    /// @dev Tests that `setWhitelistedDeployer` reverts when the caller is not the owner.
-    function test_setWhitelistedDeployer_reverts(address _caller, address _deployer, bool _isWhitelisted) external {
-        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
-        assertEq(list.owner(), owner);
-
-        vm.assume(_caller != owner);
+    function test_storageSlots_succeeds() external {
+        vm.prank(list.owner());
+        list.setOwner(address(1));
 
-        vm.prank(_caller);
-        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
-        list.setWhitelistedDeployer(_deployer, _isWhitelisted);
+        assertEq(bytes32(uint256(1)), vm.load(address(list), bytes32(uint256(0))));
     }
 }
diff --git a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
index aa8d2545106a..49758739d2da 100644
--- a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
@@ -49,7 +49,7 @@ contract L1BlockNumberTest is Test {
 
     /// @dev Tests that `fallback` is correctly dispatched.
     function test_fallback_succeeds() external {
-        (bool success, bytes memory ret) = address(bn).call(hex"11");
+        (bool success, bytes memory ret) = address(bn).call(hex"");
         assertEq(success, true);
         assertEq(ret, abi.encode(number));
     }

From 1c36df3e43a2ce5f1d61fafdfccb570b31e10abb Mon Sep 17 00:00:00 2001
From: Sam Stokes <35908605+bitwiseguy@users.noreply.github.com>
Date: Fri, 22 Nov 2024 11:58:14 -0500
Subject: [PATCH 253/451] op-node: log mgasps across block building/inserting
 lifecycle (#12907)

* op-node: log mgasps across block processing lifecycle

* op-node: add 'import_time' field to block processing log

* op-node: make log message more descriptive

* op-node: log legacy codepath for InsertUnsafePayload

* op-node: include final ForkchoiceUpdate in block insertion time

* op-node: remove unused BuildTime field from events

* op-node: encapsulate log logic in TryUpdateEngineEvent methods

* op-node: linter fix

* op-node: add comment and adjust sync log wording

* op-node: fix BlockHash, BlockNumber in log

* op-node: seq add BuildStarted to PayloadProcessEvent

* op-node: refactor getBlockProcessingMetrics, protect against divide-by-zero
---
 op-node/rollup/engine/build_seal.go           | 13 ++--
 op-node/rollup/engine/build_sealed.go         | 14 +++--
 op-node/rollup/engine/engine_controller.go    | 14 +++++
 op-node/rollup/engine/events.go               | 61 ++++++++++++++++++-
 op-node/rollup/engine/payload_process.go      | 14 ++++-
 op-node/rollup/engine/payload_success.go      | 18 +++---
 op-node/rollup/sequencing/sequencer.go        |  9 +--
 .../rollup/sequencing/sequencer_chaos_test.go |  8 ++-
 8 files changed, 124 insertions(+), 27 deletions(-)

diff --git a/op-node/rollup/engine/build_seal.go b/op-node/rollup/engine/build_seal.go
index 25c1d95b8e7d..cd3ca8888271 100644
--- a/op-node/rollup/engine/build_seal.go
+++ b/op-node/rollup/engine/build_seal.go
@@ -113,14 +113,15 @@ func (eq *EngDeriver) onBuildSeal(ev BuildSealEvent) {
 	depositCount, _ := lastDeposit(envelope.ExecutionPayload.Transactions)
 	eq.metrics.CountSequencedTxsInBlock(txnCount, depositCount)
 
-	eq.log.Debug("Processed new L2 block", "l2_unsafe", ref, "l1_origin", ref.L1Origin,
+	eq.log.Debug("Built new L2 block", "l2_unsafe", ref, "l1_origin", ref.L1Origin,
 		"txs", txnCount, "deposits", depositCount, "time", ref.Time, "seal_time", sealTime, "build_time", buildTime)
 
 	eq.emitter.Emit(BuildSealedEvent{
-		Concluding:  ev.Concluding,
-		DerivedFrom: ev.DerivedFrom,
-		Info:        ev.Info,
-		Envelope:    envelope,
-		Ref:         ref,
+		Concluding:   ev.Concluding,
+		DerivedFrom:  ev.DerivedFrom,
+		BuildStarted: ev.BuildStarted,
+		Info:         ev.Info,
+		Envelope:     envelope,
+		Ref:          ref,
 	})
 }
diff --git a/op-node/rollup/engine/build_sealed.go b/op-node/rollup/engine/build_sealed.go
index eb2680850a75..5ceff489ecc6 100644
--- a/op-node/rollup/engine/build_sealed.go
+++ b/op-node/rollup/engine/build_sealed.go
@@ -1,6 +1,8 @@
 package engine
 
 import (
+	"time"
+
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
@@ -10,7 +12,8 @@ type BuildSealedEvent struct {
 	// if payload should be promoted to (local) safe (must also be pending safe, see DerivedFrom)
 	Concluding bool
 	// payload is promoted to pending-safe if non-zero
-	DerivedFrom eth.L1BlockRef
+	DerivedFrom  eth.L1BlockRef
+	BuildStarted time.Time
 
 	Info     eth.PayloadInfo
 	Envelope *eth.ExecutionPayloadEnvelope
@@ -25,10 +28,11 @@ func (eq *EngDeriver) onBuildSealed(ev BuildSealedEvent) {
 	// If a (pending) safe block, immediately process the block
 	if ev.DerivedFrom != (eth.L1BlockRef{}) {
 		eq.emitter.Emit(PayloadProcessEvent{
-			Concluding:  ev.Concluding,
-			DerivedFrom: ev.DerivedFrom,
-			Envelope:    ev.Envelope,
-			Ref:         ev.Ref,
+			Concluding:   ev.Concluding,
+			DerivedFrom:  ev.DerivedFrom,
+			Envelope:     ev.Envelope,
+			Ref:          ev.Ref,
+			BuildStarted: ev.BuildStarted,
 		})
 	}
 }
diff --git a/op-node/rollup/engine/engine_controller.go b/op-node/rollup/engine/engine_controller.go
index b088e382f07f..907238e84a9e 100644
--- a/op-node/rollup/engine/engine_controller.go
+++ b/op-node/rollup/engine/engine_controller.go
@@ -330,6 +330,7 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
 		}
 	}
 	// Insert the payload & then call FCU
+	newPayloadStart := time.Now()
 	status, err := e.engine.NewPayload(ctx, envelope.ExecutionPayload, envelope.ParentBeaconBlockRoot)
 	if err != nil {
 		return derive.NewTemporaryError(fmt.Errorf("failed to update insert payload: %w", err))
@@ -342,6 +343,7 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
 		return derive.NewTemporaryError(fmt.Errorf("cannot process unsafe payload: new - %v; parent: %v; err: %w",
 			payload.ID(), payload.ParentID(), eth.NewPayloadErr(payload, status)))
 	}
+	newPayloadFinish := time.Now()
 
 	// Mark the new payload as valid
 	fc := eth.ForkchoiceState{
@@ -361,6 +363,7 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
 	}
 	logFn := e.logSyncProgressMaybe()
 	defer logFn()
+	fcu2Start := time.Now()
 	fcRes, err := e.engine.ForkchoiceUpdate(ctx, &fc, nil)
 	if err != nil {
 		var rpcErr rpc.Error
@@ -380,6 +383,7 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
 		return derive.NewTemporaryError(fmt.Errorf("cannot prepare unsafe chain for new payload: new - %v; parent: %v; err: %w",
 			payload.ID(), payload.ParentID(), eth.ForkchoiceUpdateErr(fcRes.PayloadStatus)))
 	}
+	fcu2Finish := time.Now()
 	e.SetUnsafeHead(ref)
 	e.needFCUCall = false
 	e.emitter.Emit(UnsafeUpdateEvent{Ref: ref})
@@ -397,6 +401,16 @@ func (e *EngineController) InsertUnsafePayload(ctx context.Context, envelope *et
 		})
 	}
 
+	totalTime := fcu2Finish.Sub(newPayloadStart)
+	e.log.Info("Inserted new L2 unsafe block (synchronous)",
+		"hash", envelope.ExecutionPayload.BlockHash,
+		"number", uint64(envelope.ExecutionPayload.BlockNumber),
+		"newpayload_time", common.PrettyDuration(newPayloadFinish.Sub(newPayloadStart)),
+		"fcu2_time", common.PrettyDuration(fcu2Finish.Sub(fcu2Start)),
+		"total_time", common.PrettyDuration(totalTime),
+		"mgas", float64(envelope.ExecutionPayload.GasUsed)/1000000,
+		"mgasps", float64(envelope.ExecutionPayload.GasUsed)*1000/float64(totalTime))
+
 	return nil
 }
 
diff --git a/op-node/rollup/engine/events.go b/op-node/rollup/engine/events.go
index b6ba85cbcbe7..fbc8b7b1db2f 100644
--- a/op-node/rollup/engine/events.go
+++ b/op-node/rollup/engine/events.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -203,12 +204,67 @@ func (ev TryBackupUnsafeReorgEvent) String() string {
 	return "try-backup-unsafe-reorg"
 }
 
-type TryUpdateEngineEvent struct{}
+type TryUpdateEngineEvent struct {
+	// These fields will be zero-value (BuildStarted,InsertStarted=time.Time{}, Envelope=nil) if
+	// this event is emitted outside of engineDeriver.onPayloadSuccess
+	BuildStarted  time.Time
+	InsertStarted time.Time
+	Envelope      *eth.ExecutionPayloadEnvelope
+}
 
 func (ev TryUpdateEngineEvent) String() string {
 	return "try-update-engine"
 }
 
+// Checks for the existence of the Envelope field, which is only
+// added by the PayloadSuccessEvent
+func (ev TryUpdateEngineEvent) triggeredByPayloadSuccess() bool {
+	return ev.Envelope != nil
+}
+
+// Returns key/value pairs that can be logged and are useful for plotting
+// block build/insert time as a way to measure performance.
+func (ev TryUpdateEngineEvent) getBlockProcessingMetrics() []interface{} {
+	fcuFinish := time.Now()
+	payload := ev.Envelope.ExecutionPayload
+
+	logValues := []interface{}{
+		"hash", payload.BlockHash,
+		"number", uint64(payload.BlockNumber),
+		"state_root", payload.StateRoot,
+		"timestamp", uint64(payload.Timestamp),
+		"parent", payload.ParentHash,
+		"prev_randao", payload.PrevRandao,
+		"fee_recipient", payload.FeeRecipient,
+		"txs", len(payload.Transactions),
+	}
+
+	var totalTime time.Duration
+	var mgasps float64
+	if !ev.BuildStarted.IsZero() {
+		totalTime = fcuFinish.Sub(ev.BuildStarted)
+		logValues = append(logValues,
+			"build_time", common.PrettyDuration(ev.InsertStarted.Sub(ev.BuildStarted)),
+			"insert_time", common.PrettyDuration(fcuFinish.Sub(ev.InsertStarted)),
+		)
+	} else if !ev.InsertStarted.IsZero() {
+		totalTime = fcuFinish.Sub(ev.InsertStarted)
+	}
+
+	// Avoid divide-by-zero for mgasps
+	if totalTime > 0 {
+		mgasps = float64(payload.GasUsed) * 1000 / float64(totalTime)
+	}
+
+	logValues = append(logValues,
+		"total_time", common.PrettyDuration(totalTime),
+		"mgas", float64(payload.GasUsed)/1000000,
+		"mgasps", mgasps,
+	)
+
+	return logValues
+}
+
 type ForceEngineResetEvent struct {
 	Unsafe, Safe, Finalized eth.L2BlockRef
 }
@@ -322,6 +378,9 @@ func (d *EngDeriver) OnEvent(ev event.Event) bool {
 			} else {
 				d.emitter.Emit(rollup.CriticalErrorEvent{Err: fmt.Errorf("unexpected TryUpdateEngine error type: %w", err)})
 			}
+		} else if x.triggeredByPayloadSuccess() {
+			logValues := x.getBlockProcessingMetrics()
+			d.log.Info("Inserted new L2 unsafe block", logValues...)
 		}
 	case ProcessUnsafePayloadEvent:
 		ref, err := derive.PayloadToBlockRef(d.cfg, x.Envelope.ExecutionPayload)
diff --git a/op-node/rollup/engine/payload_process.go b/op-node/rollup/engine/payload_process.go
index 62d7ded47f0d..272fce3febcf 100644
--- a/op-node/rollup/engine/payload_process.go
+++ b/op-node/rollup/engine/payload_process.go
@@ -3,6 +3,7 @@ package engine
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
@@ -12,7 +13,8 @@ type PayloadProcessEvent struct {
 	// if payload should be promoted to (local) safe (must also be pending safe, see DerivedFrom)
 	Concluding bool
 	// payload is promoted to pending-safe if non-zero
-	DerivedFrom eth.L1BlockRef
+	DerivedFrom  eth.L1BlockRef
+	BuildStarted time.Time
 
 	Envelope *eth.ExecutionPayloadEnvelope
 	Ref      eth.L2BlockRef
@@ -26,6 +28,7 @@ func (eq *EngDeriver) onPayloadProcess(ev PayloadProcessEvent) {
 	ctx, cancel := context.WithTimeout(eq.ctx, payloadProcessTimeout)
 	defer cancel()
 
+	insertStart := time.Now()
 	status, err := eq.ec.engine.NewPayload(ctx,
 		ev.Envelope.ExecutionPayload, ev.Envelope.ParentBeaconBlockRoot)
 	if err != nil {
@@ -49,7 +52,14 @@ func (eq *EngDeriver) onPayloadProcess(ev PayloadProcessEvent) {
 		})
 		return
 	case eth.ExecutionValid:
-		eq.emitter.Emit(PayloadSuccessEvent(ev))
+		eq.emitter.Emit(PayloadSuccessEvent{
+			Concluding:    ev.Concluding,
+			DerivedFrom:   ev.DerivedFrom,
+			BuildStarted:  ev.BuildStarted,
+			InsertStarted: insertStart,
+			Envelope:      ev.Envelope,
+			Ref:           ev.Ref,
+		})
 		return
 	default:
 		eq.emitter.Emit(rollup.EngineTemporaryErrorEvent{
diff --git a/op-node/rollup/engine/payload_success.go b/op-node/rollup/engine/payload_success.go
index c00d8e81ea77..17d8b0163b5f 100644
--- a/op-node/rollup/engine/payload_success.go
+++ b/op-node/rollup/engine/payload_success.go
@@ -1,6 +1,8 @@
 package engine
 
 import (
+	"time"
+
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
@@ -8,7 +10,9 @@ type PayloadSuccessEvent struct {
 	// if payload should be promoted to (local) safe (must also be pending safe, see DerivedFrom)
 	Concluding bool
 	// payload is promoted to pending-safe if non-zero
-	DerivedFrom eth.L1BlockRef
+	DerivedFrom   eth.L1BlockRef
+	BuildStarted  time.Time
+	InsertStarted time.Time
 
 	Envelope *eth.ExecutionPayloadEnvelope
 	Ref      eth.L2BlockRef
@@ -30,11 +34,9 @@ func (eq *EngDeriver) onPayloadSuccess(ev PayloadSuccessEvent) {
 		})
 	}
 
-	payload := ev.Envelope.ExecutionPayload
-	eq.log.Info("Inserted block", "hash", payload.BlockHash, "number", uint64(payload.BlockNumber),
-		"state_root", payload.StateRoot, "timestamp", uint64(payload.Timestamp), "parent", payload.ParentHash,
-		"prev_randao", payload.PrevRandao, "fee_recipient", payload.FeeRecipient,
-		"txs", len(payload.Transactions), "concluding", ev.Concluding, "derived_from", ev.DerivedFrom)
-
-	eq.emitter.Emit(TryUpdateEngineEvent{})
+	eq.emitter.Emit(TryUpdateEngineEvent{
+		BuildStarted:  ev.BuildStarted,
+		InsertStarted: ev.InsertStarted,
+		Envelope:      ev.Envelope,
+	})
 }
diff --git a/op-node/rollup/sequencing/sequencer.go b/op-node/rollup/sequencing/sequencer.go
index e8b7033273ed..2476b9b639f9 100644
--- a/op-node/rollup/sequencing/sequencer.go
+++ b/op-node/rollup/sequencing/sequencer.go
@@ -282,10 +282,11 @@ func (d *Sequencer) onBuildSealed(x engine.BuildSealedEvent) {
 	d.asyncGossip.Gossip(x.Envelope)
 	// Now after having gossiped the block, try to put it in our own canonical chain
 	d.emitter.Emit(engine.PayloadProcessEvent{
-		Concluding:  x.Concluding,
-		DerivedFrom: x.DerivedFrom,
-		Envelope:    x.Envelope,
-		Ref:         x.Ref,
+		Concluding:   x.Concluding,
+		DerivedFrom:  x.DerivedFrom,
+		BuildStarted: x.BuildStarted,
+		Envelope:     x.Envelope,
+		Ref:          x.Ref,
 	})
 	d.latest.Ref = x.Ref
 	d.latestSealed = x.Ref
diff --git a/op-node/rollup/sequencing/sequencer_chaos_test.go b/op-node/rollup/sequencing/sequencer_chaos_test.go
index d5000fbed339..93ba254c1b54 100644
--- a/op-node/rollup/sequencing/sequencer_chaos_test.go
+++ b/op-node/rollup/sequencing/sequencer_chaos_test.go
@@ -216,7 +216,13 @@ func (c *ChaoticEngine) OnEvent(ev event.Event) bool {
 				c.clockRandomIncrement(0, time.Second*3)
 			}
 			c.unsafe = x.Ref
-			c.emitter.Emit(engine.PayloadSuccessEvent(x))
+			c.emitter.Emit(engine.PayloadSuccessEvent{
+				Concluding:   x.Concluding,
+				DerivedFrom:  x.DerivedFrom,
+				BuildStarted: x.BuildStarted,
+				Envelope:     x.Envelope,
+				Ref:          x.Ref,
+			})
 			// With event delay, the engine would update and signal the new forkchoice.
 			c.emitter.Emit(engine.ForkchoiceRequestEvent{})
 		}

From ae24f01d19355e7511b805afda933b7e918e8cdf Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 22 Nov 2024 10:02:57 -0700
Subject: [PATCH 254/451] op-service: Remove txmgr queue timing test (#13032)

The tests in the txmgr queue were asserting that calls complete within a certain time window. This was causing flakes, particularly when the CI runner was under load. Generally we should avoid tests that use fixed durations as a way of asserting that code functions correctly.
---
 op-service/txmgr/queue_test.go | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/op-service/txmgr/queue_test.go b/op-service/txmgr/queue_test.go
index 549142c8592a..00219b913ad8 100644
--- a/op-service/txmgr/queue_test.go
+++ b/op-service/txmgr/queue_test.go
@@ -58,12 +58,11 @@ func (b *mockBackendWithNonce) NonceAt(ctx context.Context, account common.Addre
 
 func TestQueue_Send(t *testing.T) {
 	testCases := []struct {
-		name   string        // name of the test
-		max    uint64        // max concurrency of the queue
-		calls  []queueCall   // calls to the queue
-		txs    []testTx      // txs to generate from the factory (and potentially error in send)
-		nonces []uint64      // expected sent tx nonces after all calls are made
-		total  time.Duration // approx. total time it should take to complete all queue calls
+		name   string      // name of the test
+		max    uint64      // max concurrency of the queue
+		calls  []queueCall // calls to the queue
+		txs    []testTx    // txs to generate from the factory (and potentially error in send)
+		nonces []uint64    // expected sent tx nonces after all calls are made
 	}{
 		{
 			name: "success",
@@ -77,7 +76,6 @@ func TestQueue_Send(t *testing.T) {
 				{},
 			},
 			nonces: []uint64{0, 1},
-			total:  1 * time.Second,
 		},
 		{
 			name: "no limit",
@@ -91,7 +89,6 @@ func TestQueue_Send(t *testing.T) {
 				{},
 			},
 			nonces: []uint64{0, 1},
-			total:  1 * time.Second,
 		},
 		{
 			name: "single threaded",
@@ -105,7 +102,6 @@ func TestQueue_Send(t *testing.T) {
 				{},
 			},
 			nonces: []uint64{0},
-			total:  1 * time.Second,
 		},
 		{
 			name: "single threaded blocking",
@@ -122,7 +118,6 @@ func TestQueue_Send(t *testing.T) {
 				{},
 			},
 			nonces: []uint64{0, 1, 2},
-			total:  3 * time.Second,
 		},
 		{
 			name: "dual threaded blocking",
@@ -143,7 +138,6 @@ func TestQueue_Send(t *testing.T) {
 				{},
 			},
 			nonces: []uint64{0, 1, 2, 3, 4},
-			total:  3 * time.Second,
 		},
 		{
 			name: "subsequent txs fail after tx failure",
@@ -159,7 +153,6 @@ func TestQueue_Send(t *testing.T) {
 				{},
 			},
 			nonces: []uint64{0, 1},
-			total:  1 * time.Second,
 		},
 	}
 	for _, test := range testCases {
@@ -209,7 +202,6 @@ func TestQueue_Send(t *testing.T) {
 			queue := NewQueue[int](ctx, mgr, test.max)
 
 			// make all the queue calls given in the test case
-			start := time.Now()
 			receiptChs := make([]chan TxReceipt[int], len(test.calls))
 			for i, c := range test.calls {
 				msg := fmt.Sprintf("Call %d", i)
@@ -223,10 +215,6 @@ func TestQueue_Send(t *testing.T) {
 			}
 			// wait for the queue to drain (all txs complete or failed)
 			_ = queue.Wait()
-			duration := time.Since(start)
-			// expect the execution time within a certain window
-			now := time.Now()
-			require.WithinDuration(t, now.Add(test.total), now.Add(duration), 500*time.Millisecond, "unexpected queue transaction timing")
 			// check that the nonces match
 			slices.Sort(nonces)
 			require.Equal(t, test.nonces, nonces, "expected nonces do not match")

From f9a38de214fd272bb193680f94b09803e50b17b5 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Sat, 23 Nov 2024 01:26:22 +0800
Subject: [PATCH 255/451] show more info for ErrInvalidChannelTimeout (#13008)

---
 op-batcher/batcher/channel_config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-batcher/batcher/channel_config.go b/op-batcher/batcher/channel_config.go
index 45dc1d4dcfa4..e62ea26eee45 100644
--- a/op-batcher/batcher/channel_config.go
+++ b/op-batcher/batcher/channel_config.go
@@ -104,7 +104,7 @@ func (cc *ChannelConfig) Check() error {
 	// The [ChannelTimeout] must be larger than the [SubSafetyMargin].
 	// Otherwise, new blocks would always be considered timed out.
 	if cc.ChannelTimeout < cc.SubSafetyMargin {
-		return ErrInvalidChannelTimeout
+		return fmt.Errorf("%w: %d < %d", ErrInvalidChannelTimeout, cc.ChannelTimeout, cc.SubSafetyMargin)
 	}
 
 	// The max frame size must at least be able to accommodate the constant

From d139cc98322022e7b6aed7cea5e5d3ec4b5f2d82 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 22 Nov 2024 12:30:32 -0500
Subject: [PATCH 256/451] fix(ci): contracts test names check failures (#13034)

lint-forge-tests-check-no-build was causing issues in CI because
it was running as part of contracts-bedrock-checks which depends
on contracts-bedrock-build. contracts-bedrock-build builds the
contract files EXCEPT for tests whenever contracts-bedrock has
changed. This means that contracts-bedrock-build would not build
any test files and therefore lint-forge-tests-check-no-build would
not find any test files to check and the job would do nothing.
However, when contracts-bedrock is NOT changed, the build job gets
the full set of artifacts INCLUDING test artifacts from the cache.
This would trigger the full check to actually be run and it would
properly fail.

This PR moves that particular check into contracts-bedrock-tests
so that it's guaranteed to have all of the compiled contracts.
---
 .circleci/config.yml | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 089b13c337f1..797e7f206554 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -684,6 +684,10 @@ jobs:
           name: Build go-ffi
           command: just build-go-ffi
           working_directory: packages/contracts-bedrock
+      - run:
+          name: Lint forge test names
+          command: just lint-forge-tests-check-no-build
+          working_directory: packages/contracts-bedrock
       - run:
           name: Run tests
           command: |
@@ -750,22 +754,7 @@ jobs:
       - run-contracts-check:
           command: unused-imports-check-no-build
       - run-contracts-check:
-          command: lint-forge-tests-check-no-build
-
-  contracts-bedrock-validate-spacers:
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
-    resource_class: medium
-    steps:
-      - checkout
-      - attach_workspace: { at: "." }
-      - install-contracts-dependencies
-      - check-changed:
-          patterns: contracts-bedrock
-      - run:
-          name: validate spacers
-          command: just validate-spacers-no-build
-          working_directory: packages/contracts-bedrock
+          command: validate-spacers-no-build
 
   todo-issues:
     parameters:
@@ -1366,9 +1355,6 @@ workflows:
       - contracts-bedrock-checks:
           requires:
             - contracts-bedrock-build
-      - contracts-bedrock-validate-spacers:
-          requires:
-            - contracts-bedrock-build
       - semgrep-scan:
           name: semgrep-scan-local
           scan_command: semgrep scan --timeout=100 --config .semgrep/rules/ --error .

From 38db65294e86b8edf98468cfd9f9d030e709f03f Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 22 Nov 2024 13:31:32 -0500
Subject: [PATCH 257/451] fix(ci): lint test names after running tests (#13037)

Moves the task for linting test names to after the tests job so
that the contract artifacts actually exist. We don't compile
everything ahead of time and rely on forge test to do the
compilation in an effort to cut down total compile time.
---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 797e7f206554..74115994f470 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -684,10 +684,6 @@ jobs:
           name: Build go-ffi
           command: just build-go-ffi
           working_directory: packages/contracts-bedrock
-      - run:
-          name: Lint forge test names
-          command: just lint-forge-tests-check-no-build
-          working_directory: packages/contracts-bedrock
       - run:
           name: Run tests
           command: |
@@ -707,6 +703,10 @@ jobs:
             FOUNDRY_PROFILE: ci
           working_directory: packages/contracts-bedrock
           when: on_fail
+      - run:
+          name: Lint forge test names
+          command: just lint-forge-tests-check-no-build
+          working_directory: packages/contracts-bedrock
       - save_cache:
           name: Save Go build cache
           key: golang-build-cache-contracts-bedrock-tests-{{ checksum "go.sum" }}

From 43ccf8eab7f9745bb194f63b6edb5dbe9ea905d7 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 22 Nov 2024 19:45:12 +0100
Subject: [PATCH 258/451] add more tests (#13036)

---
 .../test/L1/L2OutputOracle.t.sol              | 25 +++++++++++++++++++
 .../test/L2/GasPriceOracle.t.sol              | 20 +++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
index 490ae07c927d..5719d3fa558e 100644
--- a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
+++ b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
@@ -99,6 +99,31 @@ contract L2OutputOracle_getter_Test is L2OutputOracle_TestBase {
         l2OutputOracle.getL2Output(nextOutputIndex + 1);
     }
 
+    /// @dev Tests that `getL2OutputAfter` of an L2 block number returns the L2 output of the `getL2OutputIndexAfter` of
+    /// that block number.
+    function test_getL2OutputAfter_succeeds() external {
+        uint8 iterations = 5;
+
+        Types.OutputProposal memory output;
+        Types.OutputProposal memory expectedOutput;
+
+        for (uint8 i; i < iterations; i++) {
+            proposeAnotherOutput();
+        }
+
+        uint256 latestBlockNumber = l2OutputOracle.latestBlockNumber();
+        for (uint8 i = iterations - 1; i > 0; i--) {
+            uint256 index = l2OutputOracle.getL2OutputIndexAfter(latestBlockNumber);
+            output = l2OutputOracle.getL2OutputAfter(latestBlockNumber);
+            expectedOutput = l2OutputOracle.getL2Output(index);
+            assertEq(output.outputRoot, expectedOutput.outputRoot);
+            assertEq(output.timestamp, expectedOutput.timestamp);
+            assertEq(output.l2BlockNumber, expectedOutput.l2BlockNumber);
+
+            latestBlockNumber -= l2OutputOracle.SUBMISSION_INTERVAL();
+        }
+    }
+
     /// @dev Tests that `getL2OutputIndexAfter` returns the correct value
     ///      when the input is the exact block number of the proposal.
     function test_getL2OutputIndexAfter_sameBlock_succeeds() external {
diff --git a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
index 0a1d97c9351e..f013325ef7e7 100644
--- a/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
+++ b/packages/contracts-bedrock/test/L2/GasPriceOracle.t.sol
@@ -117,6 +117,26 @@ contract GasPriceOracleBedrock_Test is GasPriceOracle_Test {
         vm.expectRevert("GasPriceOracle: Fjord can only be activated after Ecotone");
         gasPriceOracle.setFjord();
     }
+
+    /// @dev Tests that `getL1Fee` returns the expected value when both fjord and ecotone are not active
+    function test_getL1Fee_whenFjordAndEcotoneNotActive_succeeds() external {
+        vm.store(address(gasPriceOracle), bytes32(uint256(0)), bytes32(0));
+        bytes memory data = hex"1111";
+
+        uint256 price = gasPriceOracle.getL1Fee(data);
+        assertEq(price, 28_600); // ((((16 * data.length(i.e 2)) * (68 * 16)) + l1FeeOverhead(i.e. 310)) *
+            // l1BaseFee(i.e. 2M) *
+            // l1FeeScalar(i.e. 10)) / 1e6
+    }
+
+    /// @dev Tests that `getL1GasUsed` returns the expected value when both fjord and ecotone are not active
+    function test_getL1GasUsed_whenFjordAndEcotoneNotActive_succeeds() external {
+        vm.store(address(gasPriceOracle), bytes32(uint256(0)), bytes32(0));
+        bytes memory data = hex"1111";
+
+        uint256 gas = gasPriceOracle.getL1GasUsed(data);
+        assertEq(gas, 1_430); // 1398 + (16 * data.length(i.e 2))
+    }
 }
 
 contract GasPriceOracleEcotone_Test is GasPriceOracle_Test {

From 131320e47679f31c08a512c74123645b3a39171f Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 22 Nov 2024 13:45:17 -0500
Subject: [PATCH 259/451] feat: improve DeployerWhitelist tests (#13035)

Co-authored-by: Michael Amadi <amadimichaeld@gmail.com>
---
 .../test/legacy/DeployerWhitelist.t.sol       | 105 +++++++++++++++++-
 .../test/legacy/L1BlockNumber.t.sol           |   2 +-
 2 files changed, 102 insertions(+), 5 deletions(-)

diff --git a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
index 3f140e9a0725..6d0abaea8d2e 100644
--- a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
+++ b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
@@ -10,6 +10,11 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeployerWhitelist_Test is Test {
     IDeployerWhitelist list;
+    address owner = address(12345);
+
+    event OwnerChanged(address oldOwner, address newOwner);
+    event WhitelistDisabled(address oldOwner);
+    event WhitelistStatusChanged(address deployer, bool whitelisted);
 
     /// @dev Sets up the test suite.
     function setUp() public {
@@ -27,10 +32,102 @@ contract DeployerWhitelist_Test is Test {
     }
 
     /// @dev Tests that `setOwner` correctly sets the contract owner.
-    function test_storageSlots_succeeds() external {
-        vm.prank(list.owner());
-        list.setOwner(address(1));
+    function test_setOwner_succeeds(address _owner) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+        _owner = address(uint160(bound(uint160(_owner), 1, type(uint160).max)));
+
+        vm.prank(owner);
+        vm.expectEmit(true, true, true, true);
+        emit OwnerChanged(owner, _owner);
+        list.setOwner(_owner);
+
+        assertEq(list.owner(), _owner);
+    }
+
+    /// @dev Tests that `setOwner` reverts when the caller is not the owner.
+    function test_setOwner_callerNotOwner_reverts(address _caller, address _owner) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.assume(_caller != owner);
+
+        vm.prank(_caller);
+        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
+        list.setOwner(_owner);
+    }
+
+    /// @dev Tests that `setOwner` reverts when the new owner is the zero address.
+    function test_setOwner_zeroAddress_reverts() external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.prank(owner);
+        vm.expectRevert(bytes("DeployerWhitelist: can only be disabled via enableArbitraryContractDeployment"));
+        list.setOwner(address(0));
+    }
+
+    /// @dev Tests that `enableArbitraryContractDeployment` correctly disables the whitelist.
+    function test_enableArbitraryContractDeployment_succeeds() external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.prank(owner);
+        vm.expectEmit(true, true, true, true);
+        emit WhitelistDisabled(owner);
+        list.enableArbitraryContractDeployment();
+
+        assertEq(list.owner(), address(0));
+
+        // Any address is allowed to deploy contracts even if they are not whitelisted
+        assertEq(list.whitelist(address(1)), false);
+        assertEq(list.isDeployerAllowed(address(1)), true);
+    }
+
+    /// @dev Tests that `enableArbitraryContractDeployment` reverts when the caller is not the owner.
+    function test_enableArbitraryContractDeployment_callerNotOwner_reverts(address _caller) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.assume(_caller != owner);
+
+        vm.prank(_caller);
+        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
+        list.enableArbitraryContractDeployment();
+    }
+
+    /// @dev Tests that `setWhitelistedDeployer` correctly sets the whitelist status of a deployer.
+    function test_setWhitelistedDeployer_succeeds(address _deployer, bool _isWhitelisted) external {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.prank(owner);
+        vm.expectEmit(true, true, true, true);
+        emit WhitelistStatusChanged(_deployer, _isWhitelisted);
+        list.setWhitelistedDeployer(_deployer, _isWhitelisted);
+
+        assertEq(list.whitelist(_deployer), _isWhitelisted);
+
+        // _deployer is whitelisted or not (and arbitrary contract deployment is not enabled)
+        assertNotEq(list.owner(), address(0));
+        assertEq(list.isDeployerAllowed(_deployer), _isWhitelisted);
+    }
+
+    /// @dev Tests that `setWhitelistedDeployer` reverts when the caller is not the owner.
+    function test_setWhitelistedDeployer_callerNotOwner_reverts(
+        address _caller,
+        address _deployer,
+        bool _isWhitelisted
+    )
+        external
+    {
+        vm.store(address(list), bytes32(uint256(0)), bytes32(uint256(uint160(owner))));
+        assertEq(list.owner(), owner);
+
+        vm.assume(_caller != owner);
 
-        assertEq(bytes32(uint256(1)), vm.load(address(list), bytes32(uint256(0))));
+        vm.prank(_caller);
+        vm.expectRevert(bytes("DeployerWhitelist: function can only be called by the owner of this contract"));
+        list.setWhitelistedDeployer(_deployer, _isWhitelisted);
     }
 }
diff --git a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
index 49758739d2da..aa8d2545106a 100644
--- a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
@@ -49,7 +49,7 @@ contract L1BlockNumberTest is Test {
 
     /// @dev Tests that `fallback` is correctly dispatched.
     function test_fallback_succeeds() external {
-        (bool success, bytes memory ret) = address(bn).call(hex"");
+        (bool success, bytes memory ret) = address(bn).call(hex"11");
         assertEq(success, true);
         assertEq(ret, abi.encode(number));
     }

From 974ee6ff9f6c04086dd524f64cd59431f15c8eba Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Fri, 22 Nov 2024 20:11:44 +0100
Subject: [PATCH 260/451] ctb: Fix Holocene upgrade script (#13015)

* ctb: Fix Holocene upgrade script

* improve README

* pass deploy-config as parameter to just run, other improvements

* remove commented-out variables
---
 .../scripts/upgrades/holocene/.env.example    |  8 +---
 .../scripts/upgrades/holocene/README.md       | 17 ++++++-
 .../scripts/upgrades/holocene/justfile        | 11 +++--
 .../scripts/upgrades/holocene/scripts/main.sh | 46 +++++++++----------
 .../holocene/scripts/proofs-bundle.sh         | 16 +++----
 .../holocene/scripts/sc-ops-proofs.sh         | 16 +++----
 .../holocene/scripts/sc-ops-sys-cfg.sh        |  8 ++--
 .../holocene/scripts/sys-cfg-bundle.sh        | 10 ++--
 .../upgrades/holocene/upgrade.dockerfile      |  3 ++
 9 files changed, 76 insertions(+), 59 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example b/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
index 02d67a4bad06..2d7d84e67aa9 100644
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
@@ -2,6 +2,8 @@
 #               ↓  Required  ↓               #
 ##############################################
 
+# NOTE: The deploy config must be provided as a first argument to `just run`!
+
 # The network to deploy the contracts to.
 # Must be one of 'mainnet', 'sepolia'
 NETWORK=
@@ -15,12 +17,6 @@ ETH_RPC_URL=
 # Private key used to deploy the new contracts for this upgrade
 PRIVATE_KEY=
 
-# Path to the deploy config JSON file
-DEPLOY_CONFIG_PATH=
-
-# Path to the folder where output artifacts will be stored
-OUTPUT_FOLDER_PATH=
-
 # Address of deployed `PreimageOracle` contract.
 PREIMAGE_ORACLE_ADDR=
 
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/README.md b/packages/contracts-bedrock/scripts/upgrades/holocene/README.md
index f16127ffebbd..a671362bff85 100644
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/README.md
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/README.md
@@ -37,5 +37,20 @@ cp .env.example .env && vim .env
 #    - Deploy the new smart contract implementations.
 #    - Optionally, generate a safe upgrade bundle.
 #    - Optionally, generate a `superchain-ops` upgrade task.
-just run
+#
+#    The first argument must be the absolute path to your deploy-config.json.
+#    You can optionally specify an output folder path different from the default `output/` as a
+#    second argument to `just run`, also as an absolute path.
+just run $(realpath path/to/deploy-config.json)
 ```
+
+Note that in order to build the Docker image, you have to allow Docker to use at least 16GB of
+memory, or the Solidity compilations may fail. Docker's default is only 8GB.
+
+The `deploy-config.json` that you use for your chain must set the latest `faultGameAbsolutePrestate`
+value, not the one at deployment. There's currently one available that includes the Sepolia
+Superchain Holocene activations for Base, OP, Mode and Zora:
+`0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe`
+
+If you want to make local modifications to the scripts in `scripts/`, you need to build the Docker
+image again with `just build-image` before running `just run`.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/justfile b/packages/contracts-bedrock/scripts/upgrades/holocene/justfile
index 08cdc771ac92..ac08df681324 100644
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/justfile
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/justfile
@@ -4,16 +4,19 @@ default:
 
 # Run the deployment / upgrade generation image. If the image is not present locally,
 # it will be built.
-run *args='':
+run deploy-config-path output-folder-path="$(pwd)/output/" *args='':
   #!/bin/bash
   if [ ! "$(docker images -q op-holocene-upgrade:local 2> /dev/null)" ]; then
     just build-image
   fi
 
+  mkdir -p {{output-folder-path}}
+
   # Run the deployment.
-  docker run \
+  docker run -it \
     --rm \
-    -v $OUTPUT_FOLDER_PATH/:/output \
+    -v {{output-folder-path}}:/output \
+    -v {{deploy-config-path}}:/app/packages/contracts-bedrock/deploy-config/deploy-config.json \
     --env-file=.env \
     op-holocene-upgrade:local {{args}}
 
@@ -22,5 +25,5 @@ build-image:
   docker build \
   -t op-holocene-upgrade:local \
   -f upgrade.dockerfile \
-  --build-arg REV=op-contracts/v1.8.0-rc.1 \
+  --build-arg REV=op-contracts/v1.8.0-rc.2 \
   .
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
index 95fe1a43c231..7ae6a55ed72a 100755
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
@@ -37,8 +37,7 @@ export NETWORK="${NETWORK:?NETWORK must be set}"
 export ETHERSCAN_API_KEY=${ETHERSCAN_API_KEY:?ETHERSCAN_API_KEY must be set}
 export ETH_RPC_URL=${ETH_RPC_URL:?ETH_RPC_URL must be set}
 export PRIVATE_KEY=${PRIVATE_KEY:?PRIVATE_KEY must be set}
-export BASE_DEPLOY_CONFIG_PATH=${DEPLOY_CONFIG_PATH:?DEPLOY_CONFIG_PATH must be set}
-export OUTPUT_FOLDER_PATH=${OUTPUT_FOLDER_PATH:?OUTPUT_FOLDER_PATH must be set}
+export OUTPUT_FOLDER_PATH="/output"
 export SYSTEM_CONFIG_IMPL_ADDR=${SYSTEM_CONFIG_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "system_config")}
 export MIPS_IMPL_ADDR=${MIPS_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "mips")}
 export PREIMAGE_ORACLE_ADDR=${PREIMAGE_ORACLE_ADDR:?PREIMAGE_ORACLE_ADDR must be set}
@@ -53,8 +52,8 @@ export USE_PERMISSIONLESS_FAULT_PROOFS=${USE_PERMISSIONLESS_FAULT_PROOFS:?USE_PE
 
 # Sanity check FP configuration.
 if [[ $USE_PERMISSIONLESS_FAULT_PROOFS == true && $USE_FAULT_PROOFS == false ]]; then
-    echo "Error: USE_PERMISSIONLESS_FAULT_PROOFS cannot be true if USE_FAULT_PROOFS is false"
-    exit 1
+  echo "Error: USE_PERMISSIONLESS_FAULT_PROOFS cannot be true if USE_FAULT_PROOFS is false"
+  exit 1
 fi
 
 # Make the output folder, if it doesn't exist
@@ -63,26 +62,28 @@ mkdir -p "$OUTPUT_FOLDER_PATH"
 # Find the contracts-bedrock directory
 CONTRACTS_BEDROCK_DIR=$(pwd)
 while [[ "$CONTRACTS_BEDROCK_DIR" != "/" && "${CONTRACTS_BEDROCK_DIR##*/}" != "contracts-bedrock" ]]; do
-    CONTRACTS_BEDROCK_DIR=$(dirname "$CONTRACTS_BEDROCK_DIR")
+  CONTRACTS_BEDROCK_DIR=$(dirname "$CONTRACTS_BEDROCK_DIR")
 done
 
 # Error out if we couldn't find it for some reason
 if [[ "$CONTRACTS_BEDROCK_DIR" == "/" ]]; then
-    echo "Error: 'contracts-bedrock' directory not found"
-    exit 1
+  echo "Error: 'contracts-bedrock' directory not found"
+  exit 1
 fi
 
-# Set file paths from command-line arguments
+# The deploy config is mounted via Docker to this file
 export DEPLOY_CONFIG_PATH="$CONTRACTS_BEDROCK_DIR/deploy-config/deploy-config.json"
 
-# Copy the files into the paths so that the script can actually access it
-cp "$BASE_DEPLOY_CONFIG_PATH" "$DEPLOY_CONFIG_PATH"
-
-# Run deploy.sh
+# Run deploy.sh if deployments.json does not exist
 DEPLOY_LOG_PATH="$OUTPUT_FOLDER_PATH/deploy.log"
-if ! "$SCRIPT_DIR/deploy.sh" | tee "$DEPLOY_LOG_PATH"; then
+DEPLOYMENTS_JSON_PATH="$OUTPUT_FOLDER_PATH/deployments.json"
+if [[ ! -f "$DEPLOYMENTS_JSON_PATH" ]]; then
+  if ! "$SCRIPT_DIR/deploy.sh" | tee "$DEPLOY_LOG_PATH"; then
     echo "Error: deploy.sh failed"
     exit 1
+  fi
+else
+  prompt "Skipping deployment as $DEPLOYMENTS_JSON_PATH already exists. Continue?"
 fi
 
 # Extract the addresses from the deployment logs
@@ -102,8 +103,7 @@ reqenv "FDG_IMPL"
 reqenv "PDG_IMPL"
 
 # Generate deployments.json with extracted addresses
-DEPLOYMENTS_JSON_PATH="$OUTPUT_FOLDER_PATH/deployments.json"
-cat << EOF > "$DEPLOYMENTS_JSON_PATH"
+cat <<EOF >"$DEPLOYMENTS_JSON_PATH"
 {
   "SystemConfig": "$SYSTEM_CONFIG_IMPL",
   "MIPS": "$MIPS_IMPL",
@@ -121,16 +121,16 @@ prompt "Generate safe upgrade bundle for SystemConfig?"
 
 # Generate the system config upgrade bundle
 if ! "$SCRIPT_DIR/sys-cfg-bundle.sh"; then
-    echo "Error: sys-cfg-bundle.sh failed"
-    exit 1
+  echo "Error: sys-cfg-bundle.sh failed"
+  exit 1
 fi
 
 prompt "Generate superchain-ops upgrade task for SystemConfig upgrade bundle?"
 
 # Generate the superchain-ops upgrade task
 if ! "$SCRIPT_DIR/sc-ops-sys-cfg.sh"; then
-    echo "Error: sc-ops-sys-cfg.sh failed"
-    exit 1
+  echo "Error: sc-ops-sys-cfg.sh failed"
+  exit 1
 fi
 
 if [[ $USE_FAULT_PROOFS == true ]]; then
@@ -138,15 +138,15 @@ if [[ $USE_FAULT_PROOFS == true ]]; then
 
   # Generate the proofs contracts' upgrade bundle
   if ! "$SCRIPT_DIR/proofs-bundle.sh"; then
-      echo "Error: proofs-bundle.sh failed"
-      exit 1
+    echo "Error: proofs-bundle.sh failed"
+    exit 1
   fi
 
   prompt "Generate superchain-ops upgrade task for proofs contracts upgrade bundle?"
 
   # Generate the superchain-ops upgrade task
   if ! "$SCRIPT_DIR/sc-ops-proofs.sh"; then
-      echo "Error: sc-ops-proofs.sh failed"
-      exit 1
+    echo "Error: sc-ops-proofs.sh failed"
+    exit 1
   fi
 fi
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
index 85295d3040f1..bc0b0c7ff314 100755
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
@@ -31,24 +31,24 @@ TX_1_PAYLOAD=$(cast calldata "setImplementation(uint32,address)" 1 "$PDG_IMPL")
 TX_2_PAYLOAD=$(cast calldata "setImplementation(uint32,address)" 0 "$FDG_IMPL")
 
 # Replace variables
-sed -i '' "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
-sed -i '' "s/\$PDG_IMPL/$PDG_IMPL/g" "$BUNDLE_PATH"
-sed -i '' "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
-sed -i '' "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
+sed -i "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
+sed -i "s/\$PDG_IMPL/$PDG_IMPL/g" "$BUNDLE_PATH"
+sed -i "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
+sed -i "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
 
 # Conditionally, if the FDG is being deployed, append the bundle extension
 if [ "$USE_PERMISSIONLESS_FAULT_PROOFS" == true ]; then
   echo "✨ USE_PERMISSIONLESS_FAULT_PROOFS=true | Adding FDG deployment to upgrade bundle."
   jq --argjson fdg_extension "$(cat ./templates/fdg_bundle_extension.json)" \
     '.transactions += [$fdg_extension]' \
-    "$BUNDLE_PATH" > "$BUNDLE_PATH.tmp"
+    "$BUNDLE_PATH" >"$BUNDLE_PATH.tmp"
   mv "$BUNDLE_PATH.tmp" "$BUNDLE_PATH"
 
   # Replace variables
-  sed -i '' "s/\$FDG_IMPL/$FDG_IMPL/g" "$BUNDLE_PATH"
-  sed -i '' "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
+  sed -i "s/\$FDG_IMPL/$FDG_IMPL/g" "$BUNDLE_PATH"
+  sed -i "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
 fi
 
-sed -i '' "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$BUNDLE_PATH"
+sed -i "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$BUNDLE_PATH"
 
 echo "✨ Generated proof contracts upgrade bundle at \"$BUNDLE_PATH\""
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
index d4ff18db5738..ec386727d3bd 100755
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
@@ -27,9 +27,9 @@ cp -R "$SCRIPT_DIR/../templates/proofs-sc-ops-task/." "$TASK_DIR/"
 msup render -i "$TASK_DIR/input.json" -o "$TASK_DIR/OVERVIEW.md"
 
 # Generate the README
-sed -i '' "s/\$MIPS_IMPL/$MIPS_IMPL/g" "$TASK_DIR/README.md"
-sed -i '' "s/\$FDG_IMPL/$FDG_IMPL/g" "$TASK_DIR/README.md"
-sed -i '' "s/\$PDG_IMPL/$PDG_IMPL/g" "$TASK_DIR/README.md"
+sed -i "s/\$MIPS_IMPL/$MIPS_IMPL/g" "$TASK_DIR/README.md"
+sed -i "s/\$FDG_IMPL/$FDG_IMPL/g" "$TASK_DIR/README.md"
+sed -i "s/\$PDG_IMPL/$PDG_IMPL/g" "$TASK_DIR/README.md"
 
 # Generate the validation doc
 OLD_FDG=$(cast call "$DISPUTE_GAME_FACTORY_PROXY_ADDR" "gameImpls(uint32)" 0)
@@ -40,8 +40,8 @@ PADDED_OLD_PDG=$(cast 2u "$OLD_PDG")
 PADDED_FDG_IMPL=$(cast 2u "$FDG_IMPL")
 PADDED_PDG_IMPL=$(cast 2u "$PDG_IMPL")
 
-sed -i '' "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
-sed -i '' "s/\$OLD_FDG/$PADDED_OLD_FDG/g" "$TASK_DIR/VALIDATION.md"
-sed -i '' "s/\$FDG_IMPL/$PADDED_FDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
-sed -i '' "s/\$PDG_IMPL/$PADDED_PDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
-sed -i '' "s/\$OLD_PDG/$PADDED_OLD_PDG/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$OLD_FDG/$PADDED_OLD_FDG/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$FDG_IMPL/$PADDED_FDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$PDG_IMPL/$PADDED_PDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$OLD_PDG/$PADDED_OLD_PDG/g" "$TASK_DIR/VALIDATION.md"
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
index b0e4a57b32b7..a87de445d3d5 100755
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
@@ -25,7 +25,7 @@ cp -R "$SCRIPT_DIR/../templates/sys-cfg-sc-ops-task/." "$TASK_DIR/"
 msup render -i "$TASK_DIR/input.json" -o "$TASK_DIR/OVERVIEW.md"
 
 # Generate the README
-sed -i '' "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$TASK_DIR/README.md"
+sed -i "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$TASK_DIR/README.md"
 
 # Generate the validation doc
 OLD_SYS_CFG=$(cast impl "$SYSTEM_CONFIG_PROXY_ADDR")
@@ -33,6 +33,6 @@ OLD_SYS_CFG=$(cast impl "$SYSTEM_CONFIG_PROXY_ADDR")
 PADDED_OLD_SYS_CFG=$(cast 2u "$OLD_SYS_CFG")
 PADDED_SYS_CFG=$(cast 2u "$SYSTEM_CONFIG_IMPL")
 
-sed -i '' "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
-sed -i '' "s/\$OLD_SYS_CFG/$PADDED_OLD_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
-sed -i '' "s/\$SYSTEM_CONFIG_IMPL/$PADDED_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$OLD_SYS_CFG/$PADDED_OLD_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
+sed -i "s/\$SYSTEM_CONFIG_IMPL/$PADDED_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
index 64c34088ebf5..bde4917e6b82 100755
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
@@ -26,10 +26,10 @@ cp ./templates/sys_cfg_upgrade_bundle_template.json "$BUNDLE_PATH"
 TX_1_PAYLOAD=$(cast calldata "upgrade(address,address)" "$SYSTEM_CONFIG_PROXY_ADDR" "$SYSTEM_CONFIG_IMPL")
 
 # Replace variables
-sed -i '' "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
-sed -i '' "s/\$PROXY_ADMIN_ADDR/$PROXY_ADMIN_ADDR/g" "$BUNDLE_PATH"
-sed -i '' "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$BUNDLE_PATH"
-sed -i '' "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$BUNDLE_PATH"
-sed -i '' "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
+sed -i "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
+sed -i "s/\$PROXY_ADMIN_ADDR/$PROXY_ADMIN_ADDR/g" "$BUNDLE_PATH"
+sed -i "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$BUNDLE_PATH"
+sed -i "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$BUNDLE_PATH"
+sed -i "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
 
 echo "✨ Generated SystemConfig upgrade bundle at \"$BUNDLE_PATH\""
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile b/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile
index f91ff8dadd83..33166fe6e5ad 100644
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile
@@ -58,5 +58,8 @@ RUN forge script ./scripts/upgrades/holocene/DeployUpgrade.s.sol || true
 # Set the working directory to where upgrade.sh is located
 WORKDIR /app/packages/contracts-bedrock/scripts/upgrades/holocene
 
+# allows to use modified local scripts
+COPY scripts/*.sh ./scripts/
+
 # Set the entrypoint to the main.sh script
 ENTRYPOINT ["./scripts/main.sh"]

From ec45fa68c6de5855ae938bca932a7e6bff2a8c5a Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 22 Nov 2024 21:25:42 +0100
Subject: [PATCH 261/451] improve drippie & faucet tests and coverage (#13040)

* improve drippie & faucet tests and coverage

* Update packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol

Co-authored-by: smartcontracts <kelvin@optimism.io>

* Update packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol

Co-authored-by: smartcontracts <kelvin@optimism.io>

---------

Co-authored-by: smartcontracts <kelvin@optimism.io>
---
 .../test/periphery/drippie/Drippie.t.sol       | 18 +++++++-----------
 .../test/periphery/faucet/Faucet.t.sol         | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol b/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol
index 0e6755b0e63c..c5791e06868b 100644
--- a/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol
+++ b/packages/contracts-bedrock/test/periphery/drippie/Drippie.t.sol
@@ -16,10 +16,6 @@ import { SimpleStorage } from "test/mocks/SimpleStorage.sol";
 contract TestDrippie is Drippie {
     constructor(address owner) Drippie(owner) { }
 
-    function dripStatus(string memory name) external view returns (Drippie.DripStatus) {
-        return drips[name].status;
-    }
-
     function dripStateLast(string memory name) external view returns (uint256) {
         return drips[name].last;
     }
@@ -131,12 +127,12 @@ contract Drippie_Test is Test {
         vm.prank(drippie.owner());
         drippie.create(dripName, cfg);
 
-        Drippie.DripStatus status = drippie.dripStatus(dripName);
+        Drippie.DripStatus status = drippie.getDripStatus(dripName);
         Drippie.DripConfig memory config = drippie.dripConfig(dripName);
 
         assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));
 
-        assertEq(config.interval, cfg.interval);
+        assertEq(drippie.getDripInterval(dripName), cfg.interval);
         assertEq(config.reentrant, cfg.reentrant);
         assertEq(address(config.dripcheck), address(cfg.dripcheck));
         assertEq(config.checkparams, cfg.checkparams);
@@ -186,7 +182,7 @@ contract Drippie_Test is Test {
         address owner = drippie.owner();
 
         {
-            Drippie.DripStatus status = drippie.dripStatus(dripName);
+            Drippie.DripStatus status = drippie.getDripStatus(dripName);
             assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));
         }
 
@@ -198,7 +194,7 @@ contract Drippie_Test is Test {
         drippie.status(dripName, Drippie.DripStatus.ACTIVE);
 
         {
-            Drippie.DripStatus status = drippie.dripStatus(dripName);
+            Drippie.DripStatus status = drippie.getDripStatus(dripName);
             assertEq(uint256(status), uint256(Drippie.DripStatus.ACTIVE));
         }
 
@@ -210,7 +206,7 @@ contract Drippie_Test is Test {
         drippie.status(dripName, Drippie.DripStatus.PAUSED);
 
         {
-            Drippie.DripStatus status = drippie.dripStatus(dripName);
+            Drippie.DripStatus status = drippie.getDripStatus(dripName);
             assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));
         }
     }
@@ -252,7 +248,7 @@ contract Drippie_Test is Test {
 
         drippie.status(dripName, Drippie.DripStatus.ARCHIVED);
 
-        Drippie.DripStatus status = drippie.dripStatus(dripName);
+        Drippie.DripStatus status = drippie.getDripStatus(dripName);
         assertEq(uint256(status), uint256(Drippie.DripStatus.ARCHIVED));
     }
 
@@ -463,7 +459,7 @@ contract Drippie_Test is Test {
     function test_not_active_reverts() external {
         _createDefaultDrip(dripName);
 
-        Drippie.DripStatus status = drippie.dripStatus(dripName);
+        Drippie.DripStatus status = drippie.getDripStatus(dripName);
         assertEq(uint256(status), uint256(Drippie.DripStatus.PAUSED));
 
         vm.prank(drippie.owner());
diff --git a/packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol b/packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol
index a0ef75f28d55..b5f156cf1a85 100644
--- a/packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol
+++ b/packages/contracts-bedrock/test/periphery/faucet/Faucet.t.sol
@@ -103,6 +103,24 @@ contract FaucetTest is Faucet_Initializer {
         assertEq(faucet.ADMIN(), faucetContractAdmin);
     }
 
+    function test_configure_whenAdmin_succeeds() external {
+        vm.startPrank(faucetContractAdmin);
+        faucet.configure(optimistNftFam, Faucet.ModuleConfig("OptimistNftModule", true, 1 days, 1 ether));
+
+        (string memory name, bool enabled, uint256 ttl, uint256 amount) = faucet.modules(optimistNftFam);
+        assertEq(name, "OptimistNftModule");
+        assertEq(enabled, true);
+        assertEq(ttl, 1 days);
+        assertEq(amount, 1 ether);
+
+        assertTrue(faucet.isModuleEnabled(optimistNftFam));
+    }
+
+    function test_configure_whenNotAdmin_reverts() external {
+        vm.expectRevert("Faucet: function can only be called by admin");
+        faucet.configure(optimistNftFam, Faucet.ModuleConfig("OptimistNftModule", true, 1 days, 1 ether));
+    }
+
     function test_authAdmin_drip_succeeds() external {
         _enableFaucetAuthModules();
         bytes32 nonce = faucetHelper.consumeNonce();

From 6a871c54512ebdb749f46ccb7d27b1b60510eba1 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 22 Nov 2024 13:30:28 -0700
Subject: [PATCH 262/451] ci: Lower no output timeout by default (#13039)

Most of the time there's no output from our Go tests, it means there's a bug. Lowering the timeout here will reduce the amount of time we spend waiting for jobs to fail. For long-running tests like fault proofs, the value is configured at 20m since those tests take longer.
---
 .circleci/config.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74115994f470..5d93297da0e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -876,6 +876,7 @@ jobs:
           at: "."
       - run:
           name: run tests
+          no_output_timeout: 5m
           command: |
             mkdir -p ./tmp/test-results && mkdir -p ./tmp/testlogs
 
@@ -936,6 +937,10 @@ jobs:
         description: Indicates that slow tests should be skipped
         type: boolean
         default: false
+      no_output_timeout:
+        description: Timeout for running tests
+        type: string
+        default: 5m
     machine: true
     resource_class: <<parameters.resource_class>>
     steps:
@@ -955,7 +960,7 @@ jobs:
           command: go tool dist list | grep mips
       - run:
           name: run tests
-          no_output_timeout: 20m
+          no_output_timeout: <<parameters.no_output_timeout>>
           command: |
             mkdir -p ./tmp/testlogs
             mkdir -p ./tmp/test-results
@@ -1635,6 +1640,7 @@ workflows:
           module: op-e2e
           target: test-cannon
           notify: true
+          no_output_timeout: 20m
           mentions: "@proofs-team"
           resource_class: ethereum-optimism/latitude-fps-1
           requires:

From 80465cd6c428d13166fce351741492f354621643 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 22 Nov 2024 23:06:38 +0100
Subject: [PATCH 263/451] add test for L1ChugSplashProxy (#13045)

* add test for L1ChugSplashProxy

* fixes

* fixes
---
 .../test/legacy/L1ChugSplashProxy.t.sol       | 182 ++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol

diff --git a/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
new file mode 100644
index 000000000000..04a73f4998ae
--- /dev/null
+++ b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
@@ -0,0 +1,182 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.15;
+
+// Testing utilities
+import { Test } from "forge-std/Test.sol";
+
+// Target contract
+import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+contract Owner {
+    bool public isUpgrading;
+
+    function setIsUpgrading(bool _isUpgrading) public {
+        isUpgrading = _isUpgrading;
+    }
+}
+
+contract Implementation {
+    function setCode(bytes memory) public pure returns (uint256) {
+        return 1;
+    }
+
+    function setStorage(bytes32, bytes32) public pure returns (uint256) {
+        return 2;
+    }
+
+    function setOwner(address) public pure returns (uint256) {
+        return 3;
+    }
+
+    function getOwner() public pure returns (uint256) {
+        return 4;
+    }
+
+    function getImplementation() public pure returns (uint256) {
+        return 5;
+    }
+}
+
+contract L1ChugSplashProxy_Test is Test {
+    IL1ChugSplashProxy proxy;
+    address impl;
+    address owner = makeAddr("owner");
+    address alice = makeAddr("alice");
+
+    function setUp() public {
+        proxy = IL1ChugSplashProxy(
+            DeployUtils.create1({
+                _name: "L1ChugSplashProxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1ChugSplashProxy.__constructor__, (owner)))
+            })
+        );
+        vm.prank(owner);
+        assertEq(proxy.getOwner(), owner);
+
+        vm.prank(owner);
+        proxy.setCode(type(Implementation).runtimeCode);
+
+        vm.prank(owner);
+        impl = proxy.getImplementation();
+    }
+
+    /// @notice Tests that the owner can deploy a new implementation with a given runtime code
+    function test_setCode_whenOwner_succeeds() public {
+        vm.prank(owner);
+        proxy.setCode(hex"604260005260206000f3");
+
+        vm.prank(owner);
+        assertNotEq(proxy.getImplementation(), impl);
+    }
+
+    /// @notice Tests that when not the owner, `setCode` delegatecalls the implementation
+    function test_setCode_whenNotOwner_works() public view {
+        uint256 ret = Implementation(address(proxy)).setCode(hex"604260005260206000f3");
+        assertEq(ret, 1);
+    }
+
+    /// @notice Tests that when the owner deploys the same bytecode as the existing implementation,
+    ///         it does not deploy a new implementation
+    function test_setCode_whenOwnerSameBytecode_works() public {
+        vm.prank(owner);
+        proxy.setCode(type(Implementation).runtimeCode);
+
+        // does not deploy new implementation
+        vm.prank(owner);
+        assertEq(proxy.getImplementation(), impl);
+    }
+
+    /// @notice Tests that when the owner calls `setCode` with insufficient gas to complete the implementation
+    ///         contract's deployment, it reverts.
+    /// @dev    If this solc version/settings change and modifying this proves time consuming, we can just remove it.
+    function test_setCode_whenOwnerAndDeployOutOfGas_reverts() public {
+        vm.prank(owner);
+        vm.expectRevert(bytes("L1ChugSplashProxy: code was not correctly deployed")); // Ran out of gas
+        proxy.setCode{ gas: 65_000 }(
+            hex"fefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe"
+        );
+    }
+
+    /// @notice Tests that when the caller is not the owner and the implementation is not set, all calls reverts
+    function test_calls_whenNotOwnerNoImplementation_reverts() public {
+        proxy = IL1ChugSplashProxy(
+            DeployUtils.create1({
+                _name: "L1ChugSplashProxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1ChugSplashProxy.__constructor__, (owner)))
+            })
+        );
+
+        vm.expectRevert(bytes("L1ChugSplashProxy: implementation is not set yet"));
+        Implementation(address(proxy)).setCode(hex"604260005260206000f3");
+    }
+
+    /// @notice Tests that when the caller is not the owner but the owner has marked `isUpgrading` as true, the call
+    ///         reverts
+    function test_calls_whenUpgrading_reverts() public {
+        Owner ownerContract = new Owner();
+        vm.prank(owner);
+        proxy.setOwner(address(ownerContract));
+
+        ownerContract.setIsUpgrading(true);
+
+        vm.expectRevert(bytes("L1ChugSplashProxy: system is currently being upgraded"));
+        Implementation(address(proxy)).setCode(hex"604260005260206000f3");
+    }
+
+    /// @notice Tests that the owner can set storage of the proxy
+    function test_setStorage_whenOwner_works() public {
+        vm.prank(owner);
+        proxy.setStorage(bytes32(0), bytes32(uint256(42)));
+        assertEq(vm.load(address(proxy), bytes32(0)), bytes32(uint256(42)));
+    }
+
+    /// @notice Tests that when not the owner, `setStorage` delegatecalls the implementation
+    function test_setStorage_whenNotOwner_works() public view {
+        uint256 ret = Implementation(address(proxy)).setStorage(bytes32(0), bytes32(uint256(42)));
+        assertEq(ret, 2);
+        assertEq(vm.load(address(proxy), bytes32(0)), bytes32(uint256(0)));
+    }
+
+    /// @notice Tests that the owner can set the owner of the proxy
+    function test_setOwner_whenOwner_works() public {
+        vm.prank(owner);
+        proxy.setOwner(alice);
+
+        vm.prank(alice);
+        assertEq(proxy.getOwner(), alice);
+    }
+
+    /// @notice Tests that when not the owner, `setOwner` delegatecalls the implementation
+    function test_setOwner_whenNotOwner_works() public {
+        uint256 ret = Implementation(address(proxy)).setOwner(alice);
+        assertEq(ret, 3);
+
+        vm.prank(owner);
+        assertEq(proxy.getOwner(), owner);
+    }
+
+    /// @notice Tests that the owner can get the owner of the proxy
+    function test_getOwner_whenOwner_works() public {
+        vm.prank(owner);
+        assertEq(proxy.getOwner(), owner);
+    }
+
+    /// @notice Tests that when not the owner, `getOwner` delegatecalls the implementation
+    function test_getOwner_whenNotOwner_works() public view {
+        uint256 ret = Implementation(address(proxy)).getOwner();
+        assertEq(ret, 4);
+    }
+
+    /// @notice Tests that the owner can get the implementation of the proxy
+    function test_getImplementation_whenOwner_works() public {
+        vm.prank(owner);
+        assertEq(proxy.getImplementation(), impl);
+    }
+
+    /// @notice Tests that when not the owner, `getImplementation` delegatecalls the implementation
+    function test_getImplementation_whenNotOwner_works() public view {
+        uint256 ret = Implementation(address(proxy)).getImplementation();
+        assertEq(ret, 5);
+    }
+}

From 44367b028fea19bebbc34daf16d68b549ce35105 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Sat, 23 Nov 2024 16:33:33 +0100
Subject: [PATCH 264/451] add LegacyMintableERC20 tests (#13049)

* add LegacyMintableERC20 tests

* fixes
---
 .../test/legacy/LegacyMintableERC20.t.sol     | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol

diff --git a/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol b/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
new file mode 100644
index 000000000000..061b6eee6c5f
--- /dev/null
+++ b/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+// Testing utilities
+import { CommonTest } from "test/setup/CommonTest.sol";
+
+import { LegacyMintableERC20 } from "src/legacy/LegacyMintableERC20.sol";
+import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
+
+contract LegacyMintableERC20_Test is CommonTest {
+    LegacyMintableERC20 legacyMintableERC20;
+
+    function setUp() public override {
+        super.setUp();
+
+        legacyMintableERC20 = new LegacyMintableERC20(address(l2StandardBridge), address(L1Token), "_L2Token_", "_L2T_");
+    }
+
+    /// @notice Tests that the constructor sets the correct values
+    function test_constructor_works() public view {
+        assertEq(legacyMintableERC20.l2Bridge(), address(l2StandardBridge));
+        assertEq(legacyMintableERC20.l1Token(), address(L1Token));
+        assertEq(legacyMintableERC20.name(), "_L2Token_");
+        assertEq(legacyMintableERC20.symbol(), "_L2T_");
+        assertEq(legacyMintableERC20.decimals(), 18);
+    }
+
+    /// @notice Tests that the contract supports the correct interfaces
+    function test_supportsInterface_works() public view {
+        assertEq(legacyMintableERC20.supportsInterface(bytes4(keccak256("supportsInterface(bytes4)"))), true);
+        assertEq(
+            legacyMintableERC20.supportsInterface(
+                ILegacyMintableERC20.l1Token.selector ^ ILegacyMintableERC20.mint.selector
+                    ^ ILegacyMintableERC20.burn.selector
+            ),
+            true
+        );
+    }
+
+    /// @notice Tests that the mint function works when called by the bridge
+    function test_mint_byBridge_succeeds() public {
+        vm.prank(address(l2StandardBridge));
+        legacyMintableERC20.mint(address(this), 1000);
+        assertEq(legacyMintableERC20.balanceOf(address(this)), 1000);
+    }
+
+    /// @notice Tests that the mint function fails when called by an address other than the bridge
+    function test_mint_byNonBridge_reverts() public {
+        vm.expectRevert(bytes("Only L2 Bridge can mint and burn"));
+        legacyMintableERC20.mint(address(this), 1000);
+    }
+
+    /// @notice Tests that the burn function works when called by the bridge
+    function test_burn_byBridge_succeeds() public {
+        vm.prank(address(l2StandardBridge));
+        legacyMintableERC20.mint(address(this), 1000);
+
+        vm.prank(address(l2StandardBridge));
+        legacyMintableERC20.burn(address(this), 1000);
+        assertEq(legacyMintableERC20.balanceOf(address(this)), 0);
+    }
+
+    /// @notice Tests that the burn function fails when called by an address other than the bridge
+    function test_burn_byNonBridge_reverts() public {
+        vm.expectRevert(bytes("Only L2 Bridge can mint and burn"));
+        legacyMintableERC20.burn(address(this), 1000);
+    }
+}

From 7719c8538b8d911519f861fc70085e7a3b4e6787 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Sun, 24 Nov 2024 19:44:02 +0100
Subject: [PATCH 265/451] fixes (#13052)

---
 .../test/legacy/L1ChugSplashProxy.t.sol       | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
index 04a73f4998ae..dcfab12cb600 100644
--- a/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Test } from "forge-std/Test.sol";
+import { VmSafe } from "forge-std/Vm.sol";
 
 // Target contract
 import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
@@ -91,9 +92,28 @@ contract L1ChugSplashProxy_Test is Test {
     ///         contract's deployment, it reverts.
     /// @dev    If this solc version/settings change and modifying this proves time consuming, we can just remove it.
     function test_setCode_whenOwnerAndDeployOutOfGas_reverts() public {
+        // The values below are best gotten by removing the gas limit parameter from the call and running the test with
+        // a
+        // verbosity of `-vvvv` then setting the value to a few thousand gas lower than the gas used by the call.
+        // A faster way to do this for forge coverage cases, is to comment out the optimizer and optimizer runs in
+        // the foundry.toml file and then run forge test. This is faster because forge test only compiles modified
+        // contracts unlike forge coverage.
+        uint256 gasLimit;
+
+        // Because forge coverage always runs with the optimizer disabled,
+        // if forge coverage is run before testing this with forge test or forge snapshot, forge clean should be
+        // run first so that it recompiles the contracts using the foundry.toml optimizer settings.
+        if (vm.isContext(VmSafe.ForgeContext.Coverage)) {
+            gasLimit = 95_000;
+        } else if (vm.isContext(VmSafe.ForgeContext.Test) || vm.isContext(VmSafe.ForgeContext.Snapshot)) {
+            gasLimit = 65_000;
+        } else {
+            revert("SafeCall_Test: unknown context");
+        }
+
         vm.prank(owner);
         vm.expectRevert(bytes("L1ChugSplashProxy: code was not correctly deployed")); // Ran out of gas
-        proxy.setCode{ gas: 65_000 }(
+        proxy.setCode{ gas: gasLimit }(
             hex"fefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe"
         );
     }

From 418f0cca260789a359dcd2d19fa7fa44cceda085 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 25 Nov 2024 10:06:07 -0700
Subject: [PATCH 266/451] ci: Convert all Go tests into a single job (#13046)

* ci: Convert all Go tests into a single job

Takes all the go-e2e and go-test jobs and combines them into one single super-job. This has the following benefits:

1. We can centralize all config for Go tests in one place and simplify our CI pipeline.
2. It leaves parallelism up to the Go runtime, which is more efficient.
4. It makes our test reporting more accurate.

As part of this PR, I also:

1. Created a new resource class just for Go tests. It runs on the large Latitude runner, but limits the number of parallel go test jobs to 3 to prevent resource starvation.
2. Enabled test retries on `gotestsum`. This should reduce the number of flakes we see from the Go tests by retrying them up to 2 times in the event that they fail. Failures are still captured by the test reporting, so we can address them.

* code review updates
---
 .circleci/config.yml | 180 +++++++++++++++----------------------------
 1 file changed, 63 insertions(+), 117 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d93297da0e7..8bba906ec4e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -867,60 +867,8 @@ jobs:
           path: tmp/testlogs
           when: always
 
-  go-test:
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
-    steps:
-      - checkout
-      - attach_workspace:
-          at: "."
-      - run:
-          name: run tests
-          no_output_timeout: 5m
-          command: |
-            mkdir -p ./tmp/test-results && mkdir -p ./tmp/testlogs
-
-            packages=(
-              op-batcher
-              op-chain-ops
-              op-node
-              op-proposer
-              op-challenger
-              op-dispute-mon
-              op-conductor
-              op-program
-              op-service
-              op-supervisor
-              op-deployer
-            )
-            formatted_packages=""
-            for package in "${packages[@]}"; do
-              formatted_packages="$formatted_packages ./$package/..."
-            done
-
-            export ENABLE_ANVIL=true
-            export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io"
-            export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io"
-
-            gotestsum --format=testname \
-              --junitfile=./tmp/test-results/results.xml \
-              --jsonfile=./tmp/testlogs/log.json \
-              -- -coverpkg=github.com/ethereum-optimism/optimism/... \
-              -coverprofile=coverage.out $formatted_packages
-      - store_test_results:
-          path: ./tmp/test-results
-      - store_artifacts:
-          path: ./tmp/testlogs
-          when: always
-
-  go-e2e-test:
+  go-tests:
     parameters:
-      module:
-        description: Go Module Name
-        type: string
-      target:
-        description: The make target to execute
-        type: string
       notify:
         description: Whether to notify on failure
         type: boolean
@@ -932,56 +880,60 @@ jobs:
       resource_class:
         description: Machine resource class
         type: string
-        default: ethereum-optimism/latitude-1
-      skip_slow_tests:
-        description: Indicates that slow tests should be skipped
-        type: boolean
-        default: false
+        default: ethereum-optimism/latitude-1-go-e2e
       no_output_timeout:
         description: Timeout for running tests
         type: string
         default: 5m
+      environment_overrides:
+        description: Environment overrides
+        type: string
+        default: ""
+      packages:
+        description: List of packages to test
+        type: string
     machine: true
     resource_class: <<parameters.resource_class>>
     steps:
       - checkout
       - attach_workspace:
-          at: ./tmp/workspace
-      - run:
-          name: Load devnet-allocs and artifacts
-          command: |
-            mkdir -p .devnet
-            cp -r ./tmp/workspace/.devnet* .
-            cp -r ./tmp/workspace/packages/contracts-bedrock/forge-artifacts packages/contracts-bedrock/forge-artifacts
-            cp ./tmp/workspace/packages/contracts-bedrock/deploy-config/devnetL1.json packages/contracts-bedrock/deploy-config/devnetL1.json
-            cp -r ./tmp/workspace/packages/contracts-bedrock/deployments/devnetL1 packages/contracts-bedrock/deployments/devnetL1
-      - run:
-          name: print go's available MIPS targets
-          command: go tool dist list | grep mips
+          at: "."
       - run:
           name: run tests
           no_output_timeout: <<parameters.no_output_timeout>>
           command: |
-            mkdir -p ./tmp/testlogs
-            mkdir -p ./tmp/test-results
+            mkdir -p ./tmp/test-results && mkdir -p ./tmp/testlogs
+            
+            cd op-e2e && make pre-test && cd ..
+
+            packages=(
+              <<parameters.packages>>
+            )
+            formatted_packages=""
+            for package in "${packages[@]}"; do
+              formatted_packages="$formatted_packages ./$package/..."
+            done
 
-            # The below env var gets overridden when running make test-cannon, but we
-            # need to explicitly set it here to prevent Cannon from running when we don't
-            # want it to.
             export OP_E2E_CANNON_ENABLED="false"
-            export OP_E2E_SKIP_SLOW_TEST=<<parameters.skip_slow_tests>>
-            # Note: We don't use circle CI test splits because we need to split by test name, not by package. There is an additional
-            # constraint that gotestsum does not currently (nor likely will) accept files from different packages when building.
-            JUNIT_FILE=../tmp/test-results/<<parameters.module>>_<<parameters.target>>.xml JSON_LOG_FILE=../tmp/testlogs/test.log make <<parameters.target>>
-          working_directory: <<parameters.module>>
+            export OP_E2E_SKIP_SLOW_TEST=true
+            export OP_E2E_USE_HTTP=true
+            export ENABLE_ANVIL=true
+            export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io"
+            export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io"
+            
+            <<parameters.environment_overrides>>
+
+            gotestsum --format=testname \
+              --junitfile=./tmp/test-results/results.xml \
+              --jsonfile=./tmp/testlogs/log.json \
+              --rerun-fails=2 \
+              --packages="$formatted_packages" \
+              -- -coverprofile=coverage.out
+      - store_test_results:
+          path: ./tmp/test-results
       - store_artifacts:
           path: ./tmp/testlogs
           when: always
-      - store_artifacts:
-          path: ./tmp/test-results
-          when: always
-      - store_test_results:
-          path: ./tmp/test-results
       - when:
           condition: "<<parameters.notify>>"
           steps:
@@ -1389,33 +1341,31 @@ workflows:
           on_changes: op-e2e,packages/contracts-bedrock/src
           uses_artifacts: true
           requires: ["contracts-bedrock-build"]
-      - go-test:
-          name: go-test-all
-          requires:
-            - contracts-bedrock-build
       - go-test-kurtosis:
           name: op-deployer-integration
           module: op-deployer
           test_directory: ./pkg/deployer/integration_test
           uses_artifacts: true
           requires: ["contracts-bedrock-build"]
-      - go-e2e-test:
-          name: op-e2e-HTTP-tests
-          module: op-e2e
-          target: test-http
-          requires:
-            - contracts-bedrock-build
-      - go-e2e-test:
-          name: op-e2e-action-tests
-          module: op-e2e
-          target: test-actions
-          requires:
-            - contracts-bedrock-build
-      - go-e2e-test:
-          name: op-e2e-fault-proof-tests
-          module: op-e2e
-          target: test-fault-proofs
-          skip_slow_tests: true
+      - go-tests:
+          packages: |
+            op-batcher
+            op-chain-ops
+            op-node
+            op-proposer
+            op-challenger
+            op-dispute-mon
+            op-conductor
+            op-program
+            op-service
+            op-supervisor
+            op-deployer
+            op-e2e/system
+            op-e2e/e2eutils
+            op-e2e/opgeth
+            op-e2e/interop
+            op-e2e/actions
+            op-e2e/faultproofs
           requires:
             - contracts-bedrock-build
             - cannon-prestate
@@ -1432,16 +1382,13 @@ workflows:
             - go-mod-download
             - op-deployer-integration
             - op-program-compat
-            - op-e2e-HTTP-tests
-            - op-e2e-fault-proof-tests
-            - op-e2e-action-tests
             # Not needed for the devnet but we want to make sure they build successfully
             - cannon-docker-build
             - op-dispute-mon-docker-build
             - op-program-docker-build
             - op-supervisor-docker-build
             - proofs-tools-docker-build
-            - go-test-all
+            - go-tests
       - docker-build:
           name: <<matrix.docker_name>>-docker-build
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
@@ -1635,17 +1582,16 @@ workflows:
           skip_pattern: test
           context:
             - slack
-      - go-e2e-test:
+      - go-tests:
           name: op-e2e-cannon-tests
-          module: op-e2e
-          target: test-cannon
           notify: true
-          no_output_timeout: 20m
           mentions: "@proofs-team"
+          no_output_timeout: 20m
           resource_class: ethereum-optimism/latitude-fps-1
-          requires:
-            - contracts-bedrock-build
-            - cannon-prestate
+          environment_overrides: |
+            export OP_E2E_CANNON_ENABLED="true"
+          packages: |
+            op-e2e/faultproofs
           context:
             - slack
 

From 816b75a8e04ecdb10bfd0fedbcb287f2bbd9c820 Mon Sep 17 00:00:00 2001
From: Mael Regnery <mael@mqli.fr>
Date: Mon, 25 Nov 2024 18:19:21 +0100
Subject: [PATCH 267/451] fix: use eth_getBlockReceipts for Infura RPC kind
 (#12969)

* fix: use eth_getBlockReceipts for Infura RPC kind

* fix infura test
---
 op-service/sources/receipts_rpc.go  | 3 +--
 op-service/sources/receipts_test.go | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/op-service/sources/receipts_rpc.go b/op-service/sources/receipts_rpc.go
index ecf2c8582210..962c7391a76b 100644
--- a/op-service/sources/receipts_rpc.go
+++ b/op-service/sources/receipts_rpc.go
@@ -329,8 +329,7 @@ func AvailableReceiptsFetchingMethods(kind RPCProviderKind) ReceiptsFetchingMeth
 	case RPCKindQuickNode:
 		return DebugGetRawReceipts | EthGetBlockReceipts | EthGetTransactionReceiptBatch
 	case RPCKindInfura:
-		// Infura is big, but sadly does not support more optimized receipts fetching methods (yet?)
-		return EthGetTransactionReceiptBatch
+		return EthGetBlockReceipts | EthGetTransactionReceiptBatch
 	case RPCKindParity:
 		return ParityGetBlockReceipts | EthGetTransactionReceiptBatch
 	case RPCKindNethermind:
diff --git a/op-service/sources/receipts_test.go b/op-service/sources/receipts_test.go
index 088a3d9b22cb..230fcf0e72b5 100644
--- a/op-service/sources/receipts_test.go
+++ b/op-service/sources/receipts_test.go
@@ -283,7 +283,7 @@ func TestEthClient_FetchReceipts(t *testing.T) {
 		{
 			name:         "infura",
 			providerKind: RPCKindInfura,
-			setup:        fallbackCase(4, EthGetTransactionReceiptBatch),
+			setup:        fallbackCase(4, EthGetBlockReceipts, EthGetTransactionReceiptBatch),
 		},
 		{
 			name:         "nethermind",

From c1731a54054c7363b653becbdbca6ba22c2d3623 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Mon, 25 Nov 2024 10:33:09 -0800
Subject: [PATCH 268/451] cannon: Bump step count for 64-bit map_test (#13065)

---
 cannon/mipsevm/multithreaded/instrumented_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cannon/mipsevm/multithreaded/instrumented_test.go b/cannon/mipsevm/multithreaded/instrumented_test.go
index 6add2cc020aa..659a5b7a5c29 100644
--- a/cannon/mipsevm/multithreaded/instrumented_test.go
+++ b/cannon/mipsevm/multithreaded/instrumented_test.go
@@ -157,7 +157,7 @@ func TestInstrumentedState_MultithreadedProgram(t *testing.T) {
 				"Map test passed",
 			},
 			programName: "mt-map",
-			steps:       100_000_000,
+			steps:       150_000_000,
 		},
 		{
 			name: "pool test",

From cff136196c497cb4c97ddb8fe925166b1e58f268 Mon Sep 17 00:00:00 2001
From: chuangjinglu <chuangjinglu@outlook.com>
Date: Tue, 26 Nov 2024 02:40:48 +0800
Subject: [PATCH 269/451] chore: fix some function names in interface comment
 (#13048)

Signed-off-by: chuangjinglu <chuangjinglu@outlook.com>
---
 op-conductor/consensus/iface.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-conductor/consensus/iface.go b/op-conductor/consensus/iface.go
index e0dcb6efd5a7..2de955c1201e 100644
--- a/op-conductor/consensus/iface.go
+++ b/op-conductor/consensus/iface.go
@@ -72,9 +72,9 @@ type Consensus interface {
 	// ClusterMembership returns the current cluster membership configuration and associated version.
 	ClusterMembership() (*ClusterMembership, error)
 
-	// CommitPayload commits latest unsafe payload to the FSM in a strongly consistent fashion.
+	// CommitUnsafePayload commits latest unsafe payload to the FSM in a strongly consistent fashion.
 	CommitUnsafePayload(payload *eth.ExecutionPayloadEnvelope) error
-	// LatestUnsafeBlock returns the latest unsafe payload from FSM in a strongly consistent fashion.
+	// LatestUnsafePayload returns the latest unsafe payload from FSM in a strongly consistent fashion.
 	LatestUnsafePayload() (*eth.ExecutionPayloadEnvelope, error)
 
 	// Shutdown shuts down the consensus protocol client.

From ea7f56c519f2e536fcbbcc26300cce5ecce0926c Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 25 Nov 2024 12:36:17 -0700
Subject: [PATCH 270/451] ci: Increase test timeout (#13067)

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8bba906ec4e8..789ce0b8c569 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -928,7 +928,7 @@ jobs:
               --jsonfile=./tmp/testlogs/log.json \
               --rerun-fails=2 \
               --packages="$formatted_packages" \
-              -- -coverprofile=coverage.out
+              -- -coverprofile=coverage.out -timeout=60m
       - store_test_results:
           path: ./tmp/test-results
       - store_artifacts:

From 8f69ac78712d89b1dd018efa09e1edfc97a75314 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 25 Nov 2024 15:00:19 -0700
Subject: [PATCH 271/451] op-deployer: Add a proxy to handle RPC failures
 (#13068)

* op-deployer: Add a proxy to handle RPC failures

Anvil is very finnicky when it comes to RPC responses. It'll blow up if it encounters any HTTP error, and does not support retries. This PR adds a locally-hosted proxy which sits between Anvil and the fork RPC source and handles retries automatically.

* lint

* lint again

* ignore lint
---
 .../deployer/integration_test/apply_test.go   |  10 +-
 op-e2e/e2eutils/retryproxy/proxy.go           | 160 ++++++++++++++++++
 2 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 op-e2e/e2eutils/retryproxy/proxy.go

diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index f977fbbb0c72..682aaccfbc0a 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -16,6 +16,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/retryproxy"
+
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/inspect"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -195,8 +197,14 @@ func testApplyExistingOPCM(t *testing.T, l1ChainID uint64, forkRPCUrl string, ve
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
 	defer cancel()
 
+	retryProxy := retryproxy.New(lgr, forkRPCUrl)
+	require.NoError(t, retryProxy.Start())
+	t.Cleanup(func() {
+		require.NoError(t, retryProxy.Stop())
+	})
+
 	runner, err := anvil.New(
-		forkRPCUrl,
+		retryProxy.Endpoint(),
 		lgr,
 	)
 	require.NoError(t, err)
diff --git a/op-e2e/e2eutils/retryproxy/proxy.go b/op-e2e/e2eutils/retryproxy/proxy.go
new file mode 100644
index 000000000000..a74d5d8c8699
--- /dev/null
+++ b/op-e2e/e2eutils/retryproxy/proxy.go
@@ -0,0 +1,160 @@
+package retryproxy
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-service/retry"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+var copyHeaders = []string{
+	"Content-Type",
+}
+
+type RetryProxy struct {
+	lgr        log.Logger
+	upstream   string
+	client     *http.Client
+	strategy   retry.Strategy
+	maxRetries int
+	srv        *http.Server
+	listenPort int
+}
+
+type Option func(*RetryProxy)
+
+func New(lgr log.Logger, upstream string, opts ...Option) *RetryProxy {
+	strategy := &retry.ExponentialStrategy{
+		Min:       250 * time.Millisecond,
+		Max:       5 * time.Second,
+		MaxJitter: 250 * time.Millisecond,
+	}
+
+	prox := &RetryProxy{
+		lgr:        lgr.New("module", "retryproxy"),
+		upstream:   upstream,
+		client:     &http.Client{},
+		strategy:   strategy,
+		maxRetries: 5,
+	}
+
+	for _, opt := range opts {
+		opt(prox)
+	}
+
+	return prox
+}
+
+func (p *RetryProxy) Start() error {
+	errC := make(chan error, 1)
+
+	go func() {
+		ln, err := net.Listen("tcp", "127.0.0.1:0")
+		if err != nil {
+			errC <- fmt.Errorf("failed to listen: %w", err)
+		}
+
+		p.listenPort = ln.Addr().(*net.TCPAddr).Port
+
+		p.srv = &http.Server{
+			Addr:    "127.0.0.1:0",
+			Handler: p,
+		}
+		errC <- p.srv.Serve(ln)
+	}()
+
+	timer := time.NewTimer(100 * time.Millisecond)
+	select {
+	case err := <-errC:
+		return fmt.Errorf("failed to start server: %w", err)
+	case <-timer.C:
+		p.lgr.Info("server started", "port", p.listenPort)
+		return nil
+	}
+}
+
+func (p *RetryProxy) Stop() error {
+	if p.srv == nil {
+		return nil
+	}
+
+	return p.srv.Shutdown(context.Background())
+}
+
+func (p *RetryProxy) Endpoint() string {
+	return fmt.Sprintf("http://127.0.0.1:%d", p.listenPort)
+}
+
+func (p *RetryProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPost {
+		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+		return
+	}
+
+	defer r.Body.Close()
+	reqBody, err := io.ReadAll(r.Body)
+	if err != nil {
+		p.lgr.Error("failed to read request body", "err", err)
+		http.Error(w, "failed to read request body", http.StatusInternalServerError)
+		return
+	}
+
+	//nolint:bodyClose
+	res, resBody, err := retry.Do2(r.Context(), p.maxRetries, p.strategy, func() (*http.Response, []byte, error) {
+		ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
+		defer cancel()
+		res, err := p.doProxyReq(ctx, reqBody)
+		if err != nil {
+			p.lgr.Warn("failed to proxy request", "err", err)
+			return nil, nil, err
+		}
+
+		defer res.Body.Close()
+		resBody, err := io.ReadAll(res.Body)
+		if err != nil {
+			p.lgr.Warn("failed to read response body", "err", err)
+			return nil, nil, err
+		}
+
+		return res, resBody, nil
+	})
+	if err != nil {
+		p.lgr.Error("permanently failed to proxy request", "err", err)
+		http.Error(w, "failed to proxy request", http.StatusBadGateway)
+		return
+	}
+
+	for _, h := range copyHeaders {
+		w.Header().Set(h, res.Header.Get(h))
+	}
+
+	w.WriteHeader(http.StatusOK)
+	if _, err := io.Copy(w, bytes.NewReader(resBody)); err != nil {
+		p.lgr.Error("failed to copy response", "err", err)
+		http.Error(w, "failed to copy response", http.StatusInternalServerError)
+	}
+}
+
+func (p *RetryProxy) doProxyReq(ctx context.Context, body []byte) (*http.Response, error) {
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, p.upstream, bytes.NewReader(body))
+	if err != nil {
+		panic(fmt.Errorf("failed to create request: %w", err))
+	}
+	res, err := p.client.Do(req)
+	if err != nil {
+		p.lgr.Warn("failed to proxy request", "err", err)
+		return nil, err
+	}
+	status := res.StatusCode
+	if status != 200 {
+		p.lgr.Warn("unexpected status code", "status", status)
+		return nil, fmt.Errorf("unexpected status code: %d", status)
+	}
+	return res, nil
+}

From cf83fd94ca1cd7c03164b2066ba04606c3fd34d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:00:28 -0700
Subject: [PATCH 272/451] dependabot(gomod): bump github.com/stretchr/testify
 from 1.9.0 to 1.10.0 (#13075)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.9.0...v1.10.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 5454732a74a0..ef2c5bee53e9 100644
--- a/go.mod
+++ b/go.mod
@@ -44,7 +44,7 @@ require (
 	github.com/pkg/profile v1.7.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/protolambda/ctxlock v0.1.0
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.27.5
 	golang.org/x/crypto v0.28.0
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
diff --git a/go.sum b/go.sum
index 60b90554c2e8..12ffc4994536 100644
--- a/go.sum
+++ b/go.sum
@@ -778,8 +778,9 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk=
 github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=

From ce751a0119281e0fdd3786cf617ab989100531ec Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Mon, 25 Nov 2024 17:20:54 -0500
Subject: [PATCH 273/451] feat: delete unused deploy functions (#13083)

* feat: delete unused deploy functions

* feat: Delete some more unused code

* fix: Unused imports
---
 .../scripts/deploy/Deploy.s.sol               | 211 +-----------------
 1 file changed, 1 insertion(+), 210 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 6dc6a8bb90bf..bfe062370a68 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -25,7 +25,6 @@ import {
 } from "scripts/deploy/DeployImplementations.s.sol";
 
 // Contracts
-import { StorageSetter } from "src/universal/StorageSetter.sol";
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 
 // Libraries
@@ -44,8 +43,6 @@ import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
 import { ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
@@ -54,11 +51,7 @@ import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol"
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
-import { IMIPS2 } from "src/cannon/interfaces/IMIPS2.sol";
 import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
-import { IResolvedDelegateProxy } from "src/legacy/interfaces/IResolvedDelegateProxy.sol";
 
 /// @title Deploy
 /// @notice Script used to deploy a bedrock system. The entire system is deployed within the `run` function.
@@ -502,102 +495,10 @@ contract Deploy is Deployer {
         initializeDataAvailabilityChallenge();
     }
 
-    ////////////////////////////////////////////////////////////////
-    //              Non-Proxied Deployment Functions              //
-    ////////////////////////////////////////////////////////////////
-
-    /// @notice Deploy the AddressManager
-    function deployAddressManager() public broadcast returns (address addr_) {
-        // Use create instead of create2 because we need the owner to be set to msg.sender but
-        // forge will automatically use the create2 factory which messes up the sender.
-        IAddressManager manager = IAddressManager(
-            DeployUtils.create1AndSave({
-                _save: this,
-                _name: "AddressManager",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IAddressManager.__constructor__, ()))
-            })
-        );
-        require(manager.owner() == msg.sender);
-        addr_ = address(manager);
-    }
-
-    /// @notice Deploys the ProxyAdmin contract. Should NOT be used for the Superchain.
-    function deployProxyAdmin() public broadcast returns (address addr_) {
-        // Deploy the ProxyAdmin contract.
-        IProxyAdmin admin = IProxyAdmin(
-            DeployUtils.create2AndSave({
-                _save: this,
-                _salt: _implSalt(),
-                _name: "ProxyAdmin",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxyAdmin.__constructor__, (msg.sender)))
-            })
-        );
-
-        // Make sure the owner was set to the deployer.
-        require(admin.owner() == msg.sender);
-
-        // Set the address manager if it is not already set.
-        IAddressManager addressManager = IAddressManager(mustGetAddress("AddressManager"));
-        if (admin.addressManager() != addressManager) {
-            admin.setAddressManager(addressManager);
-        }
-
-        // Make sure the address manager is set properly.
-        require(admin.addressManager() == addressManager);
-
-        // Return the address of the deployed contract.
-        addr_ = address(admin);
-    }
-
-    /// @notice Deploy the StorageSetter contract, used for upgrades.
-    function deployStorageSetter() public broadcast returns (address addr_) {
-        console.log("Deploying StorageSetter");
-        StorageSetter setter = new StorageSetter{ salt: _implSalt() }();
-        console.log("StorageSetter deployed at: %s", address(setter));
-        string memory version = setter.version();
-        console.log("StorageSetter version: %s", version);
-        addr_ = address(setter);
-    }
-
     ////////////////////////////////////////////////////////////////
     //                Proxy Deployment Functions                  //
     ////////////////////////////////////////////////////////////////
 
-    /// @notice Deploy the L1StandardBridgeProxy using a ChugSplashProxy
-    function deployL1StandardBridgeProxy() public broadcast returns (address addr_) {
-        address proxyAdmin = mustGetAddress("ProxyAdmin");
-        IL1ChugSplashProxy proxy = IL1ChugSplashProxy(
-            DeployUtils.create2AndSave({
-                _save: this,
-                _salt: _implSalt(),
-                _name: "L1ChugSplashProxy",
-                _nick: "L1StandardBridgeProxy",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1ChugSplashProxy.__constructor__, (proxyAdmin)))
-            })
-        );
-        require(EIP1967Helper.getAdmin(address(proxy)) == proxyAdmin);
-        addr_ = address(proxy);
-    }
-
-    /// @notice Deploy the L1CrossDomainMessengerProxy using a ResolvedDelegateProxy
-    function deployL1CrossDomainMessengerProxy() public broadcast returns (address addr_) {
-        IResolvedDelegateProxy proxy = IResolvedDelegateProxy(
-            DeployUtils.create2AndSave({
-                _save: this,
-                _salt: _implSalt(),
-                _name: "ResolvedDelegateProxy",
-                _nick: "L1CrossDomainMessengerProxy",
-                _args: DeployUtils.encodeConstructor(
-                    abi.encodeCall(
-                        IResolvedDelegateProxy.__constructor__,
-                        (IAddressManager(mustGetAddress("AddressManager")), "OVM_L1CrossDomainMessenger")
-                    )
-                )
-            })
-        );
-        addr_ = address(proxy);
-    }
-
     /// @notice Deploys an ERC1967Proxy contract with the ProxyAdmin as the owner.
     /// @param _name The name of the proxy contract to be deployed.
     /// @return addr_ The address of the deployed proxy contract.
@@ -696,95 +597,6 @@ contract Deploy is Deployer {
         addr_ = address(oracle);
     }
 
-    /// @notice Deploy Mips VM. Deploys either MIPS or MIPS64 depending on the environment
-    function deployMips() public broadcast returns (address addr_) {
-        addr_ = DeployUtils.create2AndSave({
-            _save: this,
-            _salt: _implSalt(),
-            _name: Config.useMultithreadedCannon() ? "MIPS64" : "MIPS",
-            _args: DeployUtils.encodeConstructor(
-                abi.encodeCall(IMIPS2.__constructor__, (IPreimageOracle(mustGetAddress("PreimageOracle"))))
-            )
-        });
-        save("Mips", address(addr_));
-    }
-
-    /// @notice Deploy the AnchorStateRegistry
-    function deployAnchorStateRegistry() public broadcast returns (address addr_) {
-        IAnchorStateRegistry anchorStateRegistry = IAnchorStateRegistry(
-            DeployUtils.create2AndSave({
-                _save: this,
-                _salt: _implSalt(),
-                _name: "AnchorStateRegistry",
-                _args: DeployUtils.encodeConstructor(
-                    abi.encodeCall(
-                        IAnchorStateRegistry.__constructor__,
-                        (IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy")))
-                    )
-                )
-            })
-        );
-
-        addr_ = address(anchorStateRegistry);
-    }
-
-    /// @notice Deploy the L1StandardBridge
-    function deployL1StandardBridge() public broadcast returns (address addr_) {
-        IL1StandardBridge bridge = IL1StandardBridge(
-            DeployUtils.create2AndSave({
-                _save: this,
-                _salt: _implSalt(),
-                _name: "L1StandardBridge",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1StandardBridge.__constructor__, ()))
-            })
-        );
-
-        // Override the `L1StandardBridge` contract to the deployed implementation. This is necessary
-        // to check the `L1StandardBridge` implementation alongside dependent contracts, which
-        // are always proxies.
-        Types.ContractSet memory contracts = _proxies();
-        contracts.L1StandardBridge = address(bridge);
-        ChainAssertions.checkL1StandardBridge({ _contracts: contracts, _isProxy: false });
-
-        addr_ = address(bridge);
-    }
-
-    /// @notice Deploy the L1ERC721Bridge
-    function deployL1ERC721Bridge() public broadcast returns (address addr_) {
-        IL1ERC721Bridge bridge = IL1ERC721Bridge(
-            DeployUtils.create2AndSave({
-                _save: this,
-                _salt: _implSalt(),
-                _name: "L1ERC721Bridge",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IL1ERC721Bridge.__constructor__, ()))
-            })
-        );
-
-        // Override the `L1ERC721Bridge` contract to the deployed implementation. This is necessary
-        // to check the `L1ERC721Bridge` implementation alongside dependent contracts, which
-        // are always proxies.
-        Types.ContractSet memory contracts = _proxies();
-        contracts.L1ERC721Bridge = address(bridge);
-
-        ChainAssertions.checkL1ERC721Bridge({ _contracts: contracts, _isProxy: false });
-
-        addr_ = address(bridge);
-    }
-
-    /// @notice Transfer ownership of the address manager to the ProxyAdmin
-    function transferAddressManagerOwnership() public broadcast {
-        console.log("Transferring AddressManager ownership to IProxyAdmin");
-        IAddressManager addressManager = IAddressManager(mustGetAddress("AddressManager"));
-        address owner = addressManager.owner();
-        address proxyAdmin = mustGetAddress("ProxyAdmin");
-        if (owner != proxyAdmin) {
-            addressManager.transferOwnership(proxyAdmin);
-            console.log("AddressManager ownership transferred to %s", proxyAdmin);
-        }
-
-        require(addressManager.owner() == proxyAdmin);
-    }
-
     /// @notice Deploy the DataAvailabilityChallenge
     function deployDataAvailabilityChallenge() public broadcast returns (address addr_) {
         IDataAvailabilityChallenge dac = IDataAvailabilityChallenge(
@@ -1047,28 +859,6 @@ contract Deploy is Deployer {
         });
     }
 
-    /// @notice Sets the implementation for the `PERMISSIONED_CANNON` game type in the `DisputeGameFactory`
-    function setPermissionedCannonFaultGameImplementation(bool _allowUpgrade) public broadcast {
-        console.log("Setting Cannon PermissionedDisputeGame implementation");
-        IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
-        IDelayedWETH weth = IDelayedWETH(mustGetAddress("PermissionedDelayedWETHProxy"));
-
-        // Deploys and sets the Permissioned FaultDisputeGame implementation in the factory.
-        _setFaultGameImplementation({
-            _factory: factory,
-            _allowUpgrade: _allowUpgrade,
-            _params: FaultDisputeGameParams({
-                anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
-                weth: weth,
-                gameType: GameTypes.PERMISSIONED_CANNON,
-                absolutePrestate: loadMipsAbsolutePrestate(),
-                faultVm: IBigStepper(mustGetAddress("Mips")),
-                maxGameDepth: cfg.faultGameMaxDepth(),
-                maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
-            })
-        });
-    }
-
     /// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
     function setAlphabetFaultGameImplementation(bool _allowUpgrade) public onlyDevnet broadcast {
         console.log("Setting Alphabet FaultDisputeGame implementation");
@@ -1272,6 +1062,7 @@ contract Deploy is Deployer {
         });
     }
 
+    /// @notice Reset the initialized value on a proxy contract so that it can be initialized again
     function resetInitializedProxy(string memory _contractName) internal {
         console.log("resetting initialized value on %s Proxy", _contractName);
         address proxy = mustGetAddress(string.concat(_contractName, "Proxy"));

From 2b589dfd0bfe371f99dcab24f21ff9dd60938561 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Mon, 25 Nov 2024 17:21:12 -0500
Subject: [PATCH 274/451] maint: clean src imports (#13056)

Cleans up import statments in all contracts within the src/
directory. We should probably add a semgrep rule or a check that
confirms that everything looks good. I'll leave that part for
another commit.
---
 .../snapshots/semver-lock.json                | 126 +++++++++---------
 .../src/L1/OPContractsManager.sol             |  11 +-
 .../src/L1/OPContractsManagerInterop.sol      |   3 +
 .../src/L1/OptimismPortalInterop.sol          |  10 +-
 .../src/L1/ProtocolVersions.sol               |  11 +-
 .../src/L1/SuperchainConfig.sol               |  11 +-
 .../src/L1/SystemConfigInterop.sol            |   8 +-
 .../L1/interfaces/IOptimismPortalInterop.sol  |   2 +-
 .../contracts-bedrock/src/L2/BaseFeeVault.sol |  10 +-
 .../src/L2/CrossDomainOwnable.sol             |   3 +
 .../contracts-bedrock/src/L2/CrossL2Inbox.sol |   9 +-
 packages/contracts-bedrock/src/L2/L1Block.sol |   9 +-
 .../src/L2/L1BlockInterop.sol                 |   4 +-
 .../contracts-bedrock/src/L2/L1FeeVault.sol   |  10 +-
 .../src/L2/L2StandardBridge.sol               |   6 +-
 .../src/L2/L2StandardBridgeInterop.sol        |   4 +-
 .../src/L2/L2ToL1MessagePasser.sol            |   7 +-
 .../src/L2/L2ToL2CrossDomainMessenger.sol     |  13 +-
 .../src/L2/OptimismSuperchainERC20.sol        |  15 ++-
 .../src/L2/OptimismSuperchainERC20Beacon.sol  |   9 +-
 .../src/L2/OptimismSuperchainERC20Factory.sol |  15 ++-
 .../src/L2/SequencerFeeVault.sol              |  10 +-
 .../src/L2/SuperchainERC20.sol                |  17 ++-
 .../contracts-bedrock/src/asterisc/RISCV.sol  |   5 +-
 .../contracts-bedrock/src/cannon/MIPS.sol     |  11 +-
 .../contracts-bedrock/src/cannon/MIPS2.sol    |  11 +-
 .../contracts-bedrock/src/cannon/MIPS64.sol   |  11 +-
 .../cannon/libraries/MIPS64Instructions.sol   |   1 +
 .../src/cannon/libraries/MIPS64Memory.sol     |   1 +
 .../src/cannon/libraries/MIPS64State.sol      |   1 +
 .../src/cannon/libraries/MIPS64Syscalls.sol   |   1 +
 .../src/cannon/libraries/MIPSInstructions.sol |   1 +
 .../src/cannon/libraries/MIPSMemory.sol       |   1 +
 .../src/cannon/libraries/MIPSState.sol        |   1 +
 .../src/cannon/libraries/MIPSSyscalls.sol     |   1 +
 .../src/dispute/lib/Errors.sol                |   1 +
 .../src/dispute/lib/LibUDT.sol                |   1 +
 .../src/dispute/lib/Types.sol                 |   1 +
 .../src/governance/GovernanceToken.sol        |   1 +
 .../src/legacy/AddressManager.sol             |   1 +
 .../src/legacy/DeployerWhitelist.sol          |   5 +-
 .../src/legacy/L1ChugSplashProxy.sol          |   3 +
 .../src/legacy/LegacyMessagePasser.sol        |   5 +-
 .../src/legacy/LegacyMintableERC20.sol        |   3 +
 .../src/legacy/ResolvedDelegateProxy.sol      |   1 +
 .../src/libraries/Arithmetic.sol              |   1 +
 .../src/libraries/Constants.sol               |   1 +
 .../src/libraries/Encoding.sol                |   1 +
 .../src/libraries/GasPayingToken.sol          |   3 +-
 .../src/libraries/Hashing.sol                 |   1 +
 .../src/libraries/rlp/RLPReader.sol           |   3 +-
 .../src/libraries/trie/MerkleTrie.sol         |   5 +-
 .../src/libraries/trie/SecureMerkleTrie.sol   |   3 +-
 .../src/periphery/AssetReceiver.sol           |   3 +-
 .../src/periphery/Transactor.sol              |   1 +
 .../src/periphery/TransferOnion.sol           |   3 +
 .../src/periphery/drippie/Drippie.sol         |   7 +-
 .../drippie/dripchecks/CheckBalanceLow.sol    |   3 +-
 .../drippie/dripchecks/CheckGelatoLow.sol     |   3 +-
 .../drippie/dripchecks/CheckSecrets.sol       |   3 +-
 .../drippie/dripchecks/CheckTrue.sol          |   3 +-
 .../src/periphery/faucet/Faucet.sol           |   9 +-
 .../authmodules/AdminFaucetAuthModule.sol     |   7 +-
 .../faucet/authmodules/IFaucetAuthModule.sol  |   3 +-
 .../src/safe/LivenessGuard.sol                |  13 +-
 .../src/safe/LivenessModule.sol               |   9 +-
 .../src/universal/CrossDomainMessenger.sol    |   1 +
 .../src/universal/ERC721Bridge.sol            |   9 +-
 .../src/universal/OptimismMintableERC20.sol   |  13 +-
 .../OptimismMintableERC20Factory.sol          |   9 +-
 .../src/universal/OptimismMintableERC721.sol  |  11 +-
 .../OptimismMintableERC721Factory.sol         |   7 +-
 .../contracts-bedrock/src/universal/Proxy.sol |   1 +
 .../src/universal/StandardBridge.sol          |  18 ++-
 .../src/universal/StorageSetter.sol           |   9 +-
 .../vendor/eas/resolver/ISchemaResolver.sol   |   2 +-
 .../test/L1/OptimismPortalInterop.t.sol       |  14 +-
 .../test/L1/SystemConfigInterop.t.sol         |   2 +-
 .../test/L2/L1BlockInterop.t.sol              |  14 +-
 .../test/L2/L2ToL2CrossDomainMessenger.t.sol  |  22 +--
 .../test/legacy/L1BlockNumber.t.sol           |  12 +-
 81 files changed, 389 insertions(+), 231 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 444f4522c657..c387881a61f2 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -20,8 +20,8 @@
     "sourceCodeHash": "0x4132ff37d267cb12224b75ea806c0aa7d25407b0d66ce526d7fcda8f7d223882"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0xd038cc35325d023499151264232d75fa4ecc81f04a8c8353e6b50c43af224d6e",
-    "sourceCodeHash": "0xa13f3ab2b8744015290dbabe5f20fdd44774607e6a7ad3e5e016303fc4aa8c12"
+    "initCodeHash": "0xdc41db13327e1f51ce996c088538c227a82c37d62906eca1aa456d71fa605ff3",
+    "sourceCodeHash": "0x08aca8a70f42a0556f0fc7b1cd4d4aaf152215ab246c132e23074558497fe03b"
   },
   "src/L1/OptimismPortal.sol": {
     "initCodeHash": "0x152167cfa18635ae4918a6eb3371a599cfa084418c0a652799cdb48bfc0ee0cc",
@@ -32,32 +32,32 @@
     "sourceCodeHash": "0x66ac1212760db53a2bb1839e4cd17dc071d9273b8e6fb80646b79e91b3371c1a"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x39f66ac74341ec235fbdd0d79546283210bd8ac35a2ab2c4bd36c9722ce18411",
-    "sourceCodeHash": "0xbb98144285b9530e336f957d10b20363b350876597e30fd34821940896a2bae8"
+    "initCodeHash": "0x902ce448a29a72805cd74b7fc62519fa3d12338851b518b7d01e8a40ba232c72",
+    "sourceCodeHash": "0x8de1b2d4675624a2a3aee135ad8780a07ca91002a5952f2b6501fdf20c92b753"
   },
   "src/L1/ProtocolVersions.sol": {
-    "initCodeHash": "0xefd4806e8737716d5d2022ca2e9e9fba0a0cb5714b026166b58e472222c7d15f",
-    "sourceCodeHash": "0x15205131bf420aa6d03c558bb75dd49cd7439caed7ccdcbfd89c4170a48c94f5"
+    "initCodeHash": "0x98dc9a7ecd1919a8cf4bcca4fb28b112641b2aa5132fb5467a349fb80974957a",
+    "sourceCodeHash": "0x9b953cdbc049492d20a15d48a9081977a91f8e7c72eee3792d86871e70b1a40a"
   },
   "src/L1/SuperchainConfig.sol": {
-    "initCodeHash": "0xfca12d9016c746e5c275b186e0ca40cfd65cf45a5665aab7589a669fea3abb47",
-    "sourceCodeHash": "0x39489a85bc3a5c8560f82d41b31bf7fe22f5b648f4ed538f61695a73092ea9eb"
+    "initCodeHash": "0xebe9a9dbf6df5288fae3634a9d71ce12bd8acb461086de28a2fb4239097dcf80",
+    "sourceCodeHash": "0xd931c19a85a070119f5b670d1f4dc90512847b408aa4ee29c98231257cf0c77c"
   },
   "src/L1/SystemConfig.sol": {
     "initCodeHash": "0x0eda38e2fb2687a324289f04ec8ad0d2afe51f45219d074740fb4a0e24ea6569",
     "sourceCodeHash": "0x6dbbe8716ca8cd2fba3da8dcae0ca0c4b1f3e9dd04220fb24a15666b23300927"
   },
   "src/L1/SystemConfigInterop.sol": {
-    "initCodeHash": "0x443fd84f8dbc38f03e59a56b99099b5e4b28de3e860a5d16c1a21101745622a4",
-    "sourceCodeHash": "0x5c2e00cd8939a538eb38580d76e70d27dd1e8e6cd9328e1978468981017736e6"
+    "initCodeHash": "0x845af4e83836221a014f46544fe2a29c66706513b7eed39c59f0505d2662731a",
+    "sourceCodeHash": "0x8df468eb79cf68ee38bada32e7d7c87449c129f1955d464fa774977c770715c7"
   },
   "src/L2/BaseFeeVault.sol": {
-    "initCodeHash": "0xbf49824cf37e201181484a8a423fcad8f504dc925921a2b28e83398197858dec",
-    "sourceCodeHash": "0x983e8e248c61e362ba6a01dd2e217a535c9bb828dc0b4421f5f27e0577f2e14c"
+    "initCodeHash": "0xc23d0437deb5c2e9f8831b9325c77e9d07467c9286f81c0ef47cfef4e242f96b",
+    "sourceCodeHash": "0x2f3f64d4307a081311222b34afa76e587aca3789367f6ea77bc1bfb6d9b39563"
   },
   "src/L2/CrossL2Inbox.sol": {
-    "initCodeHash": "0x31ecaebf368ab3333e80c6dc004b3c9f9a31f813c3138ab388bb3eead9f1b4ee",
-    "sourceCodeHash": "0xa1779d84a14332dcdd167293171d0fe2629d759a23d7cc34ffe2bde7e1605dbc"
+    "initCodeHash": "0x753a7685c4ab405b71a19a7f8aa20a2517b4943bee5d5e616a6fccd8f0531993",
+    "sourceCodeHash": "0xc74277f9502338def330444413ff77157e200110cd7f57cd9a18f9ffe4a18a6c"
   },
   "src/L2/ETHLiquidity.sol": {
     "initCodeHash": "0x713c18f95a6a746d0703f475f3ae10c106c9b9ecb64d881a2e61b8969b581371",
@@ -68,16 +68,16 @@
     "sourceCodeHash": "0xa12ce15ded3cca681b2fc9facaebbb45d740dd6f9c9496333c1c46689c9a2d99"
   },
   "src/L2/L1Block.sol": {
-    "initCodeHash": "0xa919d2aa76a7ecdfd076e2b1dbece499cc85706075f16eb6fa7b1a0fa7b38c1b",
-    "sourceCodeHash": "0x692cfcbc06dba6328f6e5c6b500741df04e4bdf730b2069aeb5d168355ea7b6f"
+    "initCodeHash": "0xb25ff86c5b199f0e4db9f814f3d107cd929278a39e838c541af79d49d472b646",
+    "sourceCodeHash": "0xa44964dc0178949b83fc4100c03933c6d6f66e9654ce6b4aff5847a889a189d4"
   },
   "src/L2/L1BlockInterop.sol": {
-    "initCodeHash": "0x62e9cc59daaf72066ac20597a666db33e9a7b3f7be71a3d47ea4841a9aca9d07",
-    "sourceCodeHash": "0xe57627347366d74029a0d24f0b45d7b9cf82b81c94681d0f633d5e5c37c8de4a"
+    "initCodeHash": "0xb59a6a62926084b9979e337183ee54b4c4e9ceeda7e39bd70bd7b4228464d2e0",
+    "sourceCodeHash": "0x5681bb385bf1685cb204a612ef8a891e91763e699c7738a3a97b171852d585b5"
   },
   "src/L2/L1FeeVault.sol": {
-    "initCodeHash": "0xbf49824cf37e201181484a8a423fcad8f504dc925921a2b28e83398197858dec",
-    "sourceCodeHash": "0xc7cda130f2bb3648e04d5a480082aa1789e16456c1280954d822b05d30100b2d"
+    "initCodeHash": "0xc23d0437deb5c2e9f8831b9325c77e9d07467c9286f81c0ef47cfef4e242f96b",
+    "sourceCodeHash": "0x3f0acc4427d6f72debe4393c746b759c7c736f28b8c4f42391de622c9be3bcb3"
   },
   "src/L2/L2CrossDomainMessenger.sol": {
     "initCodeHash": "0xc496495496b96ea0eaf417c5e56b295836c12db3e6aafe2e607563e7a50b5b65",
@@ -88,40 +88,40 @@
     "sourceCodeHash": "0xf8569c75b801f38f8a5a41e94e90f159ddc5f5412804b26e3e564755a50631b8"
   },
   "src/L2/L2StandardBridge.sol": {
-    "initCodeHash": "0xcb4aa19f0cd43a35cb5c65f26c3cfd7c41f1d1e5bcc15aef6096d385df7272c9",
-    "sourceCodeHash": "0x89771b53b7f6e64d943afb2a4bf15395efcf20d5302b76a18e52fa7cce8cdc56"
+    "initCodeHash": "0x959ce0daeb14884127cff4d701b294fb29b5d7c2d890ec4fdf704c451164811e",
+    "sourceCodeHash": "0xd5f91687a178254714203c702afe0c2343c45c4684b914aa873dcb641e73e725"
   },
   "src/L2/L2StandardBridgeInterop.sol": {
-    "initCodeHash": "0xc4eaece28d2cfca3c51247c3cce320a167a83c7fd13aea5736549d2b25e0b139",
-    "sourceCodeHash": "0x9e80044adf5f83c30b520ee153b75be5a152081c9e1271e7e618ecfccd1fb4ac"
+    "initCodeHash": "0x745f5e3a0deb6cd8fa5a339c83cc91f9ce63de570a7ed23e2da645bebaa79494",
+    "sourceCodeHash": "0x0ca6d8900a02c213acca44c8cb56df816fa1bebd6903a9ea6d4c21525c936c12"
   },
   "src/L2/L2ToL1MessagePasser.sol": {
-    "initCodeHash": "0x13fe3729beb9ed966c97bef09acb9fe5043fe651d453145073d05f2567fa988d",
-    "sourceCodeHash": "0xd08a2e6514dbd44e16aa312a1b27b2841a9eab5622cbd05a39c30f543fad673c"
+    "initCodeHash": "0xe65929ad618380e7f005f042a0a9c8e662ad10d6e1c53bfb7f518a54b848fd79",
+    "sourceCodeHash": "0xd61a1face234756e99b7ab8383eef40e62833a91f727a77997d6f0e384526637"
   },
   "src/L2/L2ToL2CrossDomainMessenger.sol": {
-    "initCodeHash": "0xc1c80c662aafebb639f62f17d9fefd6954947fd43dc31c278950727491471a94",
-    "sourceCodeHash": "0xac12ab96ffe91c75bfe74768271a725e1cbe3996b16284171440dd71bcc215b6"
+    "initCodeHash": "0x085c83fd07ce54b9d007e548008dd9d4c31d19cae9b9ca3aa1496191f84499fa",
+    "sourceCodeHash": "0x20d6a4f42b3169c17f938cfe479de7bd558c6ded816e1fcfddcdc5d86583b42b"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0x22fed5371ad9b4c2711ce5cbee889d332887aa5f5ff6b37e36c31acefe3bbeee",
-    "sourceCodeHash": "0xf68baaee0a09ea51d5a4e821df79976c0914369ebc8e5fd27bbbf89072254fc8"
+    "initCodeHash": "0x0e76b7ffa8af16f1bc5f74a55eb3ed64016228032b67c5f45afa7fd6fe4acf7e",
+    "sourceCodeHash": "0x92f370d0e167b7cec0deaded71d9c4a5a8303a2b921320123d3c32eeca1cc100"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
-    "initCodeHash": "0x23dba3ceb9e58646695c306996c9e15251ac79acc6339c1a93d10a4c79da6dab",
-    "sourceCodeHash": "0xf4379e49665823c877f5732f35068435ce06e2394fce6910a5e113d16cdc9f95"
+    "initCodeHash": "0xb032e99f5c205c8b474da89887e350277cdd05b99ee28374b97bfae18ef7a72c",
+    "sourceCodeHash": "0xc9ec1a022f82a3b463fad11d2cd6ade74bb0801ae797fdc0494840587fc595dd"
   },
   "src/L2/OptimismSuperchainERC20Factory.sol": {
-    "initCodeHash": "0x18a362c57f08b611db98dfde96121385e938f995c84e3547c1c03fd49f9db2fd",
-    "sourceCodeHash": "0x450cd89d0aae7bbc85ff57a14a6d3468c24c6743f25943f6d895d34b1456c456"
+    "initCodeHash": "0xe6a098346699c3df248050fc3301197661d391f8e4849a93f00afeac17cae317",
+    "sourceCodeHash": "0x51980d07914ae48fd632aa54df24f3d6e2d335d0223a1d2ddd4ca5ced1797c16"
   },
   "src/L2/SequencerFeeVault.sol": {
-    "initCodeHash": "0xcaadbf08057b5d47f7704257e9385a29e42a7a08c818646d109c5952d3d35218",
-    "sourceCodeHash": "0x05bbc6039e5a9ff38987e7b9b89c69e2ee8aa4b7ca20dd002ea1bbd3d70f27f3"
+    "initCodeHash": "0xf05acc7dcb80474e48ea36a3511bd4cbb35da065ed6280918b87a47c13a22cfc",
+    "sourceCodeHash": "0x3c0d09bd700b9db218445ecce76006574cabfe8c40c2156a6787c8a1360d7835"
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-    "sourceCodeHash": "0x77adb9ea7a9e9cf3dc5943607dcacacf7a703bd110d2a5627e7075b766aae29f"
+    "sourceCodeHash": "0x4c40f0249c1c9871efd2e957dd9c769cc52b88d896385dd4d547f82eb06284be"
   },
   "src/L2/SuperchainTokenBridge.sol": {
     "initCodeHash": "0x1cd2afdae6dd1b6ebc17f1d529e7d74c9b8b21b02db8589b8e389e2d5523d775",
@@ -136,20 +136,20 @@
     "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
   "src/asterisc/RISCV.sol": {
-    "initCodeHash": "0x6b4323061187f2c8efe8de43bf1ecdc0798e2d95ad69470ed4151dadc094fedf",
-    "sourceCodeHash": "0xd824f1ead87a1214fa8a4b435f493a80b7340ec2c959d2c1e1e9e8c062a42c4a"
+    "initCodeHash": "0x8d47aa0b81d7fe6bd0aeac18f26d7c0b285f58740bb9d92dac0ddf706c85309f",
+    "sourceCodeHash": "0xaebcda0a16da65fc7833672073ea6872c40d1ba722f0a6515c4a293e380f96c6"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0xa3cbf121bad13c00227ea4fef128853d9a86b7ec9158de894f99b58d38d7630a",
-    "sourceCodeHash": "0xd8467700c80b3e62fa37193dc6513bac35282094b686b50e162e157f704dde00"
+    "initCodeHash": "0xb4aec227019dacd6194d6aeb9ca68c23c60b95618d18a4ebc09243514aeb1f05",
+    "sourceCodeHash": "0x4d43b3f2918486aa76d2d59ac42e4f6aa2f58538c7e95a5cb99b63c9588b5f1c"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0xc38c76ab3aad78c81ca01b3235b402614972d6604b22fda1e870f1bf47be1194",
-    "sourceCodeHash": "0x3d38b1924669d1bde756f1306601c764a6d31f428ac72667a3dd194b3388210d"
+    "initCodeHash": "0xe3879b5772820d837bc1c77c32a1200eb26cf901d9302dff9f0e9759331e380e",
+    "sourceCodeHash": "0x1c45a8f4c8c9ded7043d63965cb114d17f801c6cd4d8233cb16838c5f9a02675"
   },
   "src/cannon/MIPS64.sol": {
-    "initCodeHash": "0x93aa8d7f9fd3c22276c0d303a3fefdf8f73cc55807b35e483bba64c92d02aaef",
-    "sourceCodeHash": "0x171d66c651fdad2ac9c287da92689815a5b09589945ada092179508ad2326306"
+    "initCodeHash": "0xa4a761f480a26ec1926c5a8b4831440211c0441bd41d503b0aad189e030d35dc",
+    "sourceCodeHash": "0x7ddcf8584f9bd92abd1eb45bc198f5b0ec54acaf292f60e919d674cc56fb8abc"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
@@ -172,48 +172,48 @@
     "sourceCodeHash": "0x730eff9147294c115a0a53e7e75771bcc4a517beb48457140ab929a8d1510893"
   },
   "src/legacy/DeployerWhitelist.sol": {
-    "initCodeHash": "0x0b8177ed75b69eddbb9ce6537683f69a9935efed86a1d6faa8feaafbd151c1bd",
-    "sourceCodeHash": "0xc8fe9571fcf8fcb51a4dcb00ffa97f43a9ce811c323c4926e710b28c90a9005f"
+    "initCodeHash": "0xf232863fde5cd65368bcb4a79b41b5a4a09c59ede5070f82fd3f13f681bea7d8",
+    "sourceCodeHash": "0xd8d65492470907907d75574c1260fb349903af22c89098ea091439fc809310a9"
   },
   "src/legacy/L1BlockNumber.sol": {
     "initCodeHash": "0x542955f1a84b304eaf291f76633b03e4c87c2654f7eff46c3bea94d27346ea1f",
     "sourceCodeHash": "0x898c239e6367a0971a075df18030a033cdada26983fa8a5cd6e7b88ec90d4958"
   },
   "src/legacy/LegacyMessagePasser.sol": {
-    "initCodeHash": "0xefc6ed9e325c2d614ea0d28c3eabfff1b345f7c6054e90253c6a091c29508267",
-    "sourceCodeHash": "0xaa08a61448f485b277af57251d2089cc6a80ce0a763bf7184d48ffed5034ef69"
+    "initCodeHash": "0x11802672c929c4e92faeb7bee66617574b249b60a210f11ce29a5caa0e3d6bac",
+    "sourceCodeHash": "0x851ab8a2cd40798fce25698d4cfdb9dbf9c4c1e53f3cc8d1a325a6dd368807b0"
   },
   "src/safe/DeputyGuardianModule.sol": {
     "initCodeHash": "0xd95e562f395d4eb6e332f4474dffab660ada9e9da7c79f58fb6052278e0904df",
     "sourceCodeHash": "0x45daabe094de0287e244e6fea4f1887b9adc09b07c47dc77361b1678645a1470"
   },
   "src/safe/LivenessGuard.sol": {
-    "initCodeHash": "0x9ac0b039b1591f7c00cf11cb758d118c9b42e6e08250b619d6b6fd605a43d5ee",
-    "sourceCodeHash": "0xc1a968b0c6fbc4d82c2821c917b273feaaa224d258886b394416e84ee250d026"
+    "initCodeHash": "0xd449cef5d62dea387f5c4fd18382f5427532c443d29b3dcf0f645dbb6756ccb4",
+    "sourceCodeHash": "0x745f72d907d9a8e95b5fdfe9fd9a910456f2417c42b81b0a3a764c20c13d7ed7"
   },
   "src/safe/LivenessModule.sol": {
-    "initCodeHash": "0xcfccdd9e423c95a0ddc6e09ccb6333d5fc8429ed2b8fc872f1290d392ae13aad",
-    "sourceCodeHash": "0xd1479c60087f352385b6d5379ef3cc07839f671d617626b4c94ece91da781ef2"
+    "initCodeHash": "0xb16fd6cdfe5125dbb065ab1b6fcd7a58665e9fc4907b1089c8a496576be5d4f7",
+    "sourceCodeHash": "0x17e70b1d4ffc876fde920eaeb5874ff8a39dfa03b1e24044dc73aff2820db1ef"
   },
   "src/universal/OptimismMintableERC20.sol": {
-    "initCodeHash": "0x9cd677275b175812f1d5f90a127dbf7b3592714fd842a7a0de3988d716ca3eac",
-    "sourceCodeHash": "0x5611d8082f68af566554d7f09640b4b1f0e3efee4da1372b68fc7fc538a35ac7"
+    "initCodeHash": "0xc97c9502af8e83f1d9bd81f711c3d73db298dfdba465f463b3faa43a8208ed47",
+    "sourceCodeHash": "0x7e7ada21d7e5fb92521dad343ff71da9bdabd6e04882c81b8c8f74854f755ba6"
   },
   "src/universal/OptimismMintableERC20Factory.sol": {
-    "initCodeHash": "0x03ad07bd7f89a29f1850fa8b5d377daf0e1d5aef6cb458a127df520549e8e8e6",
-    "sourceCodeHash": "0xdb6ec93782a4a217475195507740794a4f5553b9032e7ba31dc48b81f579a940"
+    "initCodeHash": "0x4ba75c8864565ac14aa213d2aacda58ce0f82b197fa72393328ac6968edb54fb",
+    "sourceCodeHash": "0xcd09be31be4e0fda6d329bd6ac6dccded3f029514be4908860db4d757ebb7bc7"
   },
   "src/universal/OptimismMintableERC721.sol": {
-    "initCodeHash": "0x8aa309f2676d5267b6c9e411f88dc6e4badce414b8d66b330df3f60e9836380e",
-    "sourceCodeHash": "0x03bf7ad4d2b751bdead9930fc8f89b8e55d40dd4b2f5670fd339e87ae81f8b49"
+    "initCodeHash": "0xc7c5dbc9d19314f8ad00bd867a9186d04e7471502671c3daa23d90c1e3e16320",
+    "sourceCodeHash": "0x089ee309a0d9061646ab7a2781f80e5d94a74cc38fe808a3696e3984683d0a89"
   },
   "src/universal/OptimismMintableERC721Factory.sol": {
-    "initCodeHash": "0x5ea977ba35558c3b75bebe28900548c763d205e40d6cf7660292b8e96bf3aea8",
-    "sourceCodeHash": "0x063ca3a0a2e3c592173af6157e383b5aaeff752000f98648a5c71260bb26590a"
+    "initCodeHash": "0xf62b7daa5e5005d989d9afb177c314868bef48641a7069ddf1d6c6656e064929",
+    "sourceCodeHash": "0x2ea30e241a348bfdd3dae41375b8a5db8c6eb609650f49a0945e6d453b5b6a41"
   },
   "src/universal/StorageSetter.sol": {
-    "initCodeHash": "0x21b3059e9b13b330f76d02b61f61dcfa3abf3517a0b56afa0895c4b8291740bf",
-    "sourceCodeHash": "0xc1ea12a87e3a7ef9c950f0a41a4e35b60d4d9c4c816ff671dbfca663861c16f4"
+    "initCodeHash": "0x049f3c86965e575a370b14f7f49f3f15436ffb5ee1059615bb708659d7aae7de",
+    "sourceCodeHash": "0x5dc6b0b4ae4ab29085c52f74a4498d8a3d04928b844491749cd7186623e8b967"
   },
   "src/vendor/eas/EAS.sol": {
     "initCodeHash": "0xf96d1ebc530ed95e2dffebcfa2b4a1f18103235e6352d97838b77b7a2c14567b",
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
index a2a5a5f215b0..c0978e66cad6 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { Blueprint } from "src/libraries/Blueprint.sol";
 import { Constants } from "src/libraries/Constants.sol";
+import { Claim, Duration, GameType, GameTypes } from "src/dispute/lib/Types.sol";
 
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
@@ -11,16 +14,12 @@ import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-
 import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
-
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
 import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
-import { Claim, Duration, GameType, GameTypes } from "src/dispute/lib/Types.sol";
-
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
@@ -115,8 +114,8 @@ contract OPContractsManager is ISemver {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.0.0-beta.21
-    string public constant version = "1.0.0-beta.21";
+    /// @custom:semver 1.0.0-beta.22
+    string public constant version = "1.0.0-beta.22";
 
     /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
     /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
index 79e0efda9735..3366087bd872 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
+
+// Interfaces
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
 import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
index 4c238c415d34..abad969dffa3 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
@@ -3,13 +3,15 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { OptimismPortal2 } from "src/L1/OptimismPortal2.sol";
-import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { Unauthorized } from "src/libraries/PortalErrors.sol";
 
+// Interfaces
+import { IL1BlockInterop, ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+
 /// @custom:proxied true
 /// @title OptimismPortalInterop
 /// @notice The OptimismPortal is a low-level contract responsible for passing messages between L1
@@ -23,9 +25,9 @@ contract OptimismPortalInterop is OptimismPortal2 {
         OptimismPortal2(_proofMaturityDelaySeconds, _disputeGameFinalityDelaySeconds)
     { }
 
-    /// @custom:semver +interop-beta.2
+    /// @custom:semver +interop-beta.3
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.2");
+        return string.concat(super.version(), "+interop-beta.3");
     }
 
     /// @notice Sets static configuration options for the L2 system.
@@ -48,7 +50,7 @@ contract OptimismPortalInterop is OptimismPortal2 {
                 uint256(0), // value
                 uint64(SYSTEM_DEPOSIT_GAS_LIMIT), // gasLimit
                 false, // isCreation,
-                abi.encodeCall(L1BlockInterop.setConfig, (_type, _value))
+                abi.encodeCall(IL1BlockInterop.setConfig, (_type, _value))
             )
         );
     }
diff --git a/packages/contracts-bedrock/src/L1/ProtocolVersions.sol b/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
index 8d4982ecea0c..83fe4a90b632 100644
--- a/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
+++ b/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
@@ -1,10 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
+// Libraries
 import { Storage } from "src/libraries/Storage.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
 /// @notice ProtocolVersion is a numeric identifier of the protocol version.
 type ProtocolVersion is uint256;
 
@@ -36,8 +41,8 @@ contract ProtocolVersions is OwnableUpgradeable, ISemver {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.3
-    string public constant version = "1.0.1-beta.3";
+    /// @custom:semver 1.0.1-beta.4
+    string public constant version = "1.0.1-beta.4";
 
     /// @notice Constructs the ProtocolVersion contract. Cannot set
     ///         the owner to `address(0)` due to the Ownable contract's
diff --git a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
index 51b13936c81b..5cac41ece63a 100644
--- a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
@@ -1,10 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
+// Libraries
 import { Storage } from "src/libraries/Storage.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
 /// @custom:proxied true
 /// @custom:audit none This contracts is not yet audited.
 /// @title SuperchainConfig
@@ -36,8 +41,8 @@ contract SuperchainConfig is Initializable, ISemver {
     event ConfigUpdate(UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.1
-    string public constant version = "1.1.1-beta.1";
+    /// @custom:semver 1.1.1-beta.2
+    string public constant version = "1.1.1-beta.2";
 
     /// @notice Constructs the SuperchainConfig contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
index 9e9503fe6236..1bdc8ddc5863 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
@@ -3,9 +3,7 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { IOptimismPortalInterop as IOptimismPortal } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { SystemConfig } from "src/L1/SystemConfig.sol";
-import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Libraries
 import { Constants } from "src/libraries/Constants.sol";
@@ -14,7 +12,9 @@ import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { Storage } from "src/libraries/Storage.sol";
 
 // Interfaces
+import { IOptimismPortalInterop as IOptimismPortal } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
 
 /// @custom:proxied true
 /// @title SystemConfigInterop
@@ -68,9 +68,9 @@ contract SystemConfigInterop is SystemConfig {
         Storage.setAddress(DEPENDENCY_MANAGER_SLOT, _dependencyManager);
     }
 
-    /// @custom:semver +interop-beta.4
+    /// @custom:semver +interop-beta.5
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.4");
+        return string.concat(super.version(), "+interop-beta.5");
     }
 
     /// @notice Internal setter for the gas paying token address, includes validation.
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
index 521c7232e125..5e8acc45c8c8 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
@@ -7,7 +7,7 @@ import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
 import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ConfigType } from "src/L2/L1BlockInterop.sol";
+import { ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
 
 interface IOptimismPortalInterop {
     error AlreadyFinalized();
diff --git a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
index 2fd33b9290bf..4dd6a87023be 100644
--- a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
@@ -1,19 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+// Contracts
 import { FeeVault } from "src/L2/FeeVault.sol";
 
+// Libraries
 import { Types } from "src/libraries/Types.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000019
 /// @title BaseFeeVault
 /// @notice The BaseFeeVault accumulates the base fee that is paid by transactions.
 contract BaseFeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.3
-    string public constant version = "1.5.0-beta.3";
+    /// @custom:semver 1.5.0-beta.4
+    string public constant version = "1.5.0-beta.4";
 
     /// @notice Constructs the BaseFeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
diff --git a/packages/contracts-bedrock/src/L2/CrossDomainOwnable.sol b/packages/contracts-bedrock/src/L2/CrossDomainOwnable.sol
index 3b532f589001..658cfc50f8b5 100644
--- a/packages/contracts-bedrock/src/L2/CrossDomainOwnable.sol
+++ b/packages/contracts-bedrock/src/L2/CrossDomainOwnable.sol
@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Contracts
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+
+// Libraries
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 
 /// @title CrossDomainOwnable
diff --git a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
index b330dfb0ceb4..ca9129f710aa 100644
--- a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
+++ b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
@@ -1,10 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
+// Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { TransientContext, TransientReentrancyAware } from "src/libraries/TransientContext.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
+
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IDependencySet } from "src/L2/interfaces/IDependencySet.sol";
 import { IL1BlockInterop } from "src/L2/interfaces/IL1BlockInterop.sol";
 
@@ -73,8 +76,8 @@ contract CrossL2Inbox is ISemver, TransientReentrancyAware {
     address internal constant DEPOSITOR_ACCOUNT = 0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.9
-    string public constant version = "1.0.0-beta.9";
+    /// @custom:semver 1.0.0-beta.10
+    string public constant version = "1.0.0-beta.10";
 
     /// @notice Emitted when a cross chain message is being executed.
     /// @param msgHash Hash of message payload being executed.
diff --git a/packages/contracts-bedrock/src/L2/L1Block.sol b/packages/contracts-bedrock/src/L2/L1Block.sol
index 0b2ffd2c5782..1f7a935339a2 100644
--- a/packages/contracts-bedrock/src/L2/L1Block.sol
+++ b/packages/contracts-bedrock/src/L2/L1Block.sol
@@ -1,11 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+// Libraries
 import { Constants } from "src/libraries/Constants.sol";
 import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
 import { NotDepositor } from "src/libraries/L1BlockErrors.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000015
 /// @title L1Block
@@ -57,9 +60,9 @@ contract L1Block is ISemver, IGasToken {
     /// @notice The latest L1 blob base fee.
     uint256 public blobBaseFee;
 
-    /// @custom:semver 1.5.1-beta.3
+    /// @custom:semver 1.5.1-beta.4
     function version() public pure virtual returns (string memory) {
-        return "1.5.1-beta.3";
+        return "1.5.1-beta.4";
     }
 
     /// @notice Returns the gas paying token, its decimals, name and symbol.
diff --git a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
index 2cf6bd96c7d4..b3a5cf51be1d 100644
--- a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
@@ -49,9 +49,9 @@ contract L1BlockInterop is L1Block {
     /// keccak256(abi.encode(uint256(keccak256("l1Block.identifier.isDeposit")) - 1)) & ~bytes32(uint256(0xff))
     uint256 internal constant IS_DEPOSIT_SLOT = 0x921bd3a089295c6e5540e8fba8195448d253efd6f2e3e495b499b627dc36a300;
 
-    /// @custom:semver +interop-beta.1
+    /// @custom:semver +interop-beta.2
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.1");
+        return string.concat(super.version(), "+interop-beta.2");
     }
 
     /// @notice Returns whether the call was triggered from a a deposit or not.
diff --git a/packages/contracts-bedrock/src/L2/L1FeeVault.sol b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
index c80c40b98493..3e69806ce53c 100644
--- a/packages/contracts-bedrock/src/L2/L1FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
@@ -1,19 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+// Contracts
 import { FeeVault } from "src/L2/FeeVault.sol";
 
+// Libraries
 import { Types } from "src/libraries/Types.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
 /// @custom:proxied true
 /// @custom:predeploy 0x420000000000000000000000000000000000001A
 /// @title L1FeeVault
 /// @notice The L1FeeVault accumulates the L1 portion of the transaction fees.
 contract L1FeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.3
-    string public constant version = "1.5.0-beta.3";
+    /// @custom:semver 1.5.0-beta.4
+    string public constant version = "1.5.0-beta.4";
 
     /// @notice Constructs the L1FeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
index 63bda3209fbb..d2cb6f815564 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
@@ -3,7 +3,6 @@ pragma solidity 0.8.15;
 
 // Contracts
 import { StandardBridge } from "src/universal/StandardBridge.sol";
-import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
@@ -11,6 +10,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 
 /// @custom:proxied true
@@ -58,9 +58,9 @@ contract L2StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.11.1-beta.3
+    /// @custom:semver 1.11.1-beta.4
     function version() public pure virtual returns (string memory) {
-        return "1.11.1-beta.3";
+        return "1.11.1-beta.4";
     }
 
     /// @notice Constructs the L2StandardBridge contract.
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
index e17ef29dd964..622d92187238 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
@@ -40,9 +40,9 @@ contract L2StandardBridgeInterop is L2StandardBridge {
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
     /// @notice Semantic version.
-    /// @custom:semver +interop-beta.2
+    /// @custom:semver +interop-beta.3
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.2");
+        return string.concat(super.version(), "+interop-beta.3");
     }
 
     /// @notice Converts `amount` of `from` token to `to` token.
diff --git a/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol b/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol
index 94b8213983e1..9492b3fada15 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol
@@ -1,10 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { Types } from "src/libraries/Types.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 import { Burn } from "src/libraries/Burn.sol";
+
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @custom:proxied true
@@ -48,8 +51,8 @@ contract L2ToL1MessagePasser is ISemver {
     /// @param amount Amount of ETh that was burned.
     event WithdrawerBalanceBurnt(uint256 indexed amount);
 
-    /// @custom:semver 1.1.1-beta.1
-    string public constant version = "1.1.1-beta.1";
+    /// @custom:semver 1.1.1-beta.2
+    string public constant version = "1.1.1-beta.2";
 
     /// @notice Allows users to withdraw ETH by sending directly to this contract.
     receive() external payable {
diff --git a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
index bf53133484d6..731d36c97879 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
@@ -1,14 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
+// Libraries
 import { Encoding } from "src/libraries/Encoding.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { CrossL2Inbox, Identifier } from "src/L2/CrossL2Inbox.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { TransientReentrancyAware } from "src/libraries/TransientContext.sol";
+
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IDependencySet } from "src/L2/interfaces/IDependencySet.sol";
+import { ICrossL2Inbox, Identifier } from "src/L2/interfaces/ICrossL2Inbox.sol";
 
 /// @notice Thrown when a non-written slot in transient storage is attempted to be read from.
 error NotEntered();
@@ -69,8 +72,8 @@ contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
     uint16 public constant messageVersion = uint16(0);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.11
-    string public constant version = "1.0.0-beta.11";
+    /// @custom:semver 1.0.0-beta.12
+    string public constant version = "1.0.0-beta.12";
 
     /// @notice Mapping of message hashes to boolean receipt values. Note that a message will only be present in this
     ///         mapping if it has successfully been relayed on this chain, and can therefore not be relayed again.
@@ -164,7 +167,7 @@ contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
         }
 
         // Signal that this is a cross chain call that needs to have the identifier validated
-        CrossL2Inbox(Predeploys.CROSS_L2_INBOX).validateMessage(_id, keccak256(_sentMessage));
+        ICrossL2Inbox(Predeploys.CROSS_L2_INBOX).validateMessage(_id, keccak256(_sentMessage));
 
         // Decode the payload
         (uint256 destination, address target, uint256 nonce, address sender, bytes memory message) =
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
index 86f73f1d6f95..b39f544f47e5 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
@@ -1,12 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
-import { SuperchainERC20 } from "src/L2/SuperchainERC20.sol";
+// Contracts
 import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
+import { SuperchainERC20 } from "src/L2/SuperchainERC20.sol";
+
+// Libraries
+import { Predeploys } from "src/libraries/Predeploys.sol";
 import { ZeroAddress, Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 
+// Interfaces
+import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
+
 /// @custom:proxied true
 /// @title OptimismSuperchainERC20
 /// @notice OptimismSuperchainERC20 is a standard extension of the base ERC20 token contract that unifies ERC20 token
@@ -58,8 +63,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.10
-    string public constant override version = "1.0.0-beta.10";
+    /// @custom:semver 1.0.0-beta.11
+    string public constant override version = "1.0.0-beta.11";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
index e2b3dc437b0f..3ac981f07426 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
+import { Predeploys } from "src/libraries/Predeploys.sol";
+
+// Interfaces
 import { IBeacon } from "@openzeppelin/contracts/proxy/beacon/IBeacon.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
 
 /// @custom:proxied true
 /// @custom:predeployed 0x4200000000000000000000000000000000000027
@@ -11,8 +14,8 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 /// @notice OptimismSuperchainERC20Beacon is the beacon proxy for the OptimismSuperchainERC20 implementation.
 contract OptimismSuperchainERC20Beacon is IBeacon, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.2
-    string public constant version = "1.0.0-beta.2";
+    /// @custom:semver 1.0.0-beta.3
+    string public constant version = "1.0.0-beta.3";
 
     /// @inheritdoc IBeacon
     function implementation() external pure override returns (address) {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
index 454e3b455d62..4639c72c68a8 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
@@ -1,11 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { OptimismSuperchainERC20 } from "src/L2/OptimismSuperchainERC20.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
+// Contracts
 import { BeaconProxy } from "@openzeppelin/contracts-v5/proxy/beacon/BeaconProxy.sol";
+import { OptimismSuperchainERC20 } from "src/L2/OptimismSuperchainERC20.sol";
+
+// Libraries
 import { CREATE3 } from "@rari-capital/solmate/src/utils/CREATE3.sol";
+import { Predeploys } from "src/libraries/Predeploys.sol";
+
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @custom:proxied
 /// @custom:predeployed 0x4200000000000000000000000000000000000026
@@ -22,8 +27,8 @@ contract OptimismSuperchainERC20Factory is ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.4
-    string public constant version = "1.0.0-beta.4";
+    /// @custom:semver 1.0.0-beta.5
+    string public constant version = "1.0.0-beta.5";
 
     /// @notice Mapping of the deployed OptimismSuperchainERC20 to the remote token address.
     ///         This is used to keep track of the token deployments.
diff --git a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
index 69a78219e5bd..71861c828f4d 100644
--- a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
@@ -1,19 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+// Contracts
 import { FeeVault } from "src/L2/FeeVault.sol";
 
+// Libraries
 import { Types } from "src/libraries/Types.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000011
 /// @title SequencerFeeVault
 /// @notice The SequencerFeeVault is the contract that holds any fees paid to the Sequencer during
 ///         transaction processing and block production.
 contract SequencerFeeVault is FeeVault, ISemver {
-    /// @custom:semver 1.5.0-beta.3
-    string public constant version = "1.5.0-beta.3";
+    /// @custom:semver 1.5.0-beta.4
+    string public constant version = "1.5.0-beta.4";
 
     /// @notice Constructs the SequencerFeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
diff --git a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
index 6d40ff943764..10273d9bd369 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
@@ -1,21 +1,26 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { Predeploys } from "src/libraries/Predeploys.sol";
+// Contracts
 import { ERC20 } from "@solady-v0.0.245/tokens/ERC20.sol";
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
+// Libraries
+import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 
+// Interfaces
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+
 /// @title SuperchainERC20
 /// @notice A standard ERC20 extension implementing IERC7802 for unified cross-chain fungibility across
 ///         the Superchain. Allows the SuperchainTokenBridge to mint and burn tokens as needed.
 abstract contract SuperchainERC20 is ERC20, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.6
+    /// @custom:semver 1.0.0-beta.7
     function version() external view virtual returns (string memory) {
-        return "1.0.0-beta.6";
+        return "1.0.0-beta.7";
     }
 
     /// @notice Allows the SuperchainTokenBridge to mint tokens.
diff --git a/packages/contracts-bedrock/src/asterisc/RISCV.sol b/packages/contracts-bedrock/src/asterisc/RISCV.sol
index 8b0bbb5d1d74..50afd85fe6c0 100644
--- a/packages/contracts-bedrock/src/asterisc/RISCV.sol
+++ b/packages/contracts-bedrock/src/asterisc/RISCV.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Interfaces
 import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 
@@ -15,8 +16,8 @@ contract RISCV is IBigStepper {
     IPreimageOracle public oracle;
 
     /// @notice The version of the contract.
-    /// @custom:semver 1.1.0-rc.2
-    string public constant version = "1.1.0-rc.2";
+    /// @custom:semver 1.1.0-rc.3
+    string public constant version = "1.1.0-rc.3";
 
     /// @param _oracle The preimage oracle contract.
     constructor(IPreimageOracle _oracle) {
diff --git a/packages/contracts-bedrock/src/cannon/MIPS.sol b/packages/contracts-bedrock/src/cannon/MIPS.sol
index 5efab0ce98f1..62b3084f74a8 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS.sol
@@ -1,14 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "./interfaces/IPreimageOracle.sol";
+// Libraries
 import { MIPSInstructions as ins } from "src/cannon/libraries/MIPSInstructions.sol";
 import { MIPSSyscalls as sys } from "src/cannon/libraries/MIPSSyscalls.sol";
 import { MIPSState as st } from "src/cannon/libraries/MIPSState.sol";
 import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";
 import { InvalidRMWInstruction } from "src/cannon/libraries/CannonErrors.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+
 /// @title MIPS
 /// @notice The MIPS contract emulates a single MIPS instruction.
 ///         Note that delay slots are isolated instructions:
@@ -44,8 +47,8 @@ contract MIPS is ISemver {
     }
 
     /// @notice The semantic version of the MIPS contract.
-    /// @custom:semver 1.2.1-beta.7
-    string public constant version = "1.2.1-beta.7";
+    /// @custom:semver 1.2.1-beta.8
+    string public constant version = "1.2.1-beta.8";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index 1d73473fde24..d28238980f38 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "./interfaces/IPreimageOracle.sol";
+// Libraries
 import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";
 import { MIPSSyscalls as sys } from "src/cannon/libraries/MIPSSyscalls.sol";
 import { MIPSState as st } from "src/cannon/libraries/MIPSState.sol";
@@ -12,6 +11,10 @@ import {
     InvalidMemoryProof, InvalidRMWInstruction, InvalidSecondMemoryProof
 } from "src/cannon/libraries/CannonErrors.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+
 /// @title MIPS2
 /// @notice The MIPS2 contract emulates a single MIPS instruction.
 ///         It differs from MIPS.sol in that it supports multi-threading.
@@ -60,8 +63,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.22
-    string public constant version = "1.0.0-beta.22";
+    /// @custom:semver 1.0.0-beta.23
+    string public constant version = "1.0.0-beta.23";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/MIPS64.sol b/packages/contracts-bedrock/src/cannon/MIPS64.sol
index 53dd0649405d..bb2f4369c2a5 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS64.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS64.sol
@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "./interfaces/IPreimageOracle.sol";
+// Libraries
 import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
 import { MIPS64Syscalls as sys } from "src/cannon/libraries/MIPS64Syscalls.sol";
 import { MIPS64State as st } from "src/cannon/libraries/MIPS64State.sol";
@@ -13,6 +12,10 @@ import {
     InvalidMemoryProof, InvalidRMWInstruction, InvalidSecondMemoryProof
 } from "src/cannon/libraries/CannonErrors.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+
 /// @title MIPS64
 /// @notice The MIPS64 contract emulates a single MIPS instruction.
 ///         It differs from MIPS.sol in that it supports MIPS64 instructions and multi-tasking.
@@ -64,8 +67,8 @@ contract MIPS64 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS64 contract.
-    /// @custom:semver 1.0.0-beta.4
-    string public constant version = "1.0.0-beta.4";
+    /// @custom:semver 1.0.0-beta.5
+    string public constant version = "1.0.0-beta.5";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
index d24ec036e819..7494135ace1a 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
 import { MIPS64State as st } from "src/cannon/libraries/MIPS64State.sol";
 import { MIPS64Arch as arch } from "src/cannon/libraries/MIPS64Arch.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
index 9ed97396e10f..f6e0633466ef 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { InvalidMemoryProof } from "src/cannon/libraries/CannonErrors.sol";
 
 library MIPS64Memory {
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
index 09678148f3e6..09c347841b94 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { InvalidExitedValue } from "src/cannon/libraries/CannonErrors.sol";
 
 library MIPS64State {
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
index 10954c64748e..d4b706da4b59 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
 import { MIPS64State as st } from "src/cannon/libraries/MIPS64State.sol";
 import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
index fa4d1451b54b..f2af43da0fea 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";
 import { MIPSState as st } from "src/cannon/libraries/MIPSState.sol";
 
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
index 015955954b5a..b78cc04a8951 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { InvalidMemoryProof } from "src/cannon/libraries/CannonErrors.sol";
 
 library MIPSMemory {
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol
index f9631e29e082..22fb608bcf56 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { InvalidExitedValue } from "src/cannon/libraries/CannonErrors.sol";
 
 library MIPSState {
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
index ec0cfdded894..8e3516c0c1e5 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";
 import { MIPSState as st } from "src/cannon/libraries/MIPSState.sol";
 import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
diff --git a/packages/contracts-bedrock/src/dispute/lib/Errors.sol b/packages/contracts-bedrock/src/dispute/lib/Errors.sol
index 6e95bfa5a342..0dd4af187505 100644
--- a/packages/contracts-bedrock/src/dispute/lib/Errors.sol
+++ b/packages/contracts-bedrock/src/dispute/lib/Errors.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
+// Libraries
 import { GameType, Hash, Claim } from "src/dispute/lib/LibUDT.sol";
 
 ////////////////////////////////////////////////////////////////
diff --git a/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol b/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol
index bfc110f09526..780738a79743 100644
--- a/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol
+++ b/packages/contracts-bedrock/src/dispute/lib/LibUDT.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
+// Libraries
 import { Position } from "src/dispute/lib/LibPosition.sol";
 
 using LibClaim for Claim global;
diff --git a/packages/contracts-bedrock/src/dispute/lib/Types.sol b/packages/contracts-bedrock/src/dispute/lib/Types.sol
index 70df7b7912ba..74106888fb05 100644
--- a/packages/contracts-bedrock/src/dispute/lib/Types.sol
+++ b/packages/contracts-bedrock/src/dispute/lib/Types.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
+// Libraries
 import {
     Position,
     Hash,
diff --git a/packages/contracts-bedrock/src/governance/GovernanceToken.sol b/packages/contracts-bedrock/src/governance/GovernanceToken.sol
index 6fb1041555a0..3843c3241b2b 100644
--- a/packages/contracts-bedrock/src/governance/GovernanceToken.sol
+++ b/packages/contracts-bedrock/src/governance/GovernanceToken.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { ERC20Burnable } from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
 import { ERC20Votes, ERC20Permit } from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";
diff --git a/packages/contracts-bedrock/src/legacy/AddressManager.sol b/packages/contracts-bedrock/src/legacy/AddressManager.sol
index daaac412e0a0..e3b2e9274cc9 100644
--- a/packages/contracts-bedrock/src/legacy/AddressManager.sol
+++ b/packages/contracts-bedrock/src/legacy/AddressManager.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 
 /// @custom:legacy true
diff --git a/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol b/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol
index a7a6313edf4b..e247f65ffb99 100644
--- a/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol
+++ b/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @custom:legacy true
@@ -41,8 +42,8 @@ contract DeployerWhitelist is ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.1
-    string public constant version = "1.1.1-beta.1";
+    /// @custom:semver 1.1.1-beta.2
+    string public constant version = "1.1.1-beta.2";
 
     /// @notice Adds or removes an address from the deployment whitelist.
     /// @param _deployer      Address to update permissions for.
diff --git a/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol b/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol
index 28125a23f90f..b6a5363e2fbf 100644
--- a/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol
+++ b/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol
@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { Constants } from "src/libraries/Constants.sol";
+
+// Interfaces
 import { IL1ChugSplashDeployer } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
 
 /// @custom:legacy true
diff --git a/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol b/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol
index b90d1263f7a9..d215f29bdc7e 100644
--- a/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol
+++ b/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @custom:legacy true
@@ -14,8 +15,8 @@ contract LegacyMessagePasser is ISemver {
     mapping(bytes32 => bool) public sentMessages;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.1
-    string public constant version = "1.1.1-beta.1";
+    /// @custom:semver 1.1.1-beta.2
+    string public constant version = "1.1.1-beta.2";
 
     /// @notice Passes a message to L1.
     /// @param _message Message to pass to L1.
diff --git a/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol b/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
index b3b588258242..8efd0bf0c493 100644
--- a/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
+++ b/packages/contracts-bedrock/src/legacy/LegacyMintableERC20.sol
@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+// Interfaces
 import { ILegacyMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 
 /// @title LegacyMintableERC20
diff --git a/packages/contracts-bedrock/src/legacy/ResolvedDelegateProxy.sol b/packages/contracts-bedrock/src/legacy/ResolvedDelegateProxy.sol
index 3005456570ff..d4e4a96f7ff1 100644
--- a/packages/contracts-bedrock/src/legacy/ResolvedDelegateProxy.sol
+++ b/packages/contracts-bedrock/src/legacy/ResolvedDelegateProxy.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { AddressManager } from "src/legacy/AddressManager.sol";
 
 /// @custom:legacy true
diff --git a/packages/contracts-bedrock/src/libraries/Arithmetic.sol b/packages/contracts-bedrock/src/libraries/Arithmetic.sol
index dfd47274f7f9..140affaa718d 100644
--- a/packages/contracts-bedrock/src/libraries/Arithmetic.sol
+++ b/packages/contracts-bedrock/src/libraries/Arithmetic.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Libraries
 import { SignedMath } from "@openzeppelin/contracts/utils/math/SignedMath.sol";
 import { FixedPointMathLib } from "@rari-capital/solmate/src/utils/FixedPointMathLib.sol";
 
diff --git a/packages/contracts-bedrock/src/libraries/Constants.sol b/packages/contracts-bedrock/src/libraries/Constants.sol
index 1cbd61d21a5e..6a99410b5bcf 100644
--- a/packages/contracts-bedrock/src/libraries/Constants.sol
+++ b/packages/contracts-bedrock/src/libraries/Constants.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Interfaces
 import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
 
 /// @title Constants
diff --git a/packages/contracts-bedrock/src/libraries/Encoding.sol b/packages/contracts-bedrock/src/libraries/Encoding.sol
index 84d5f732f5f6..5aa4ee7d3d8a 100644
--- a/packages/contracts-bedrock/src/libraries/Encoding.sol
+++ b/packages/contracts-bedrock/src/libraries/Encoding.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Libraries
 import { Types } from "src/libraries/Types.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { RLPWriter } from "src/libraries/rlp/RLPWriter.sol";
diff --git a/packages/contracts-bedrock/src/libraries/GasPayingToken.sol b/packages/contracts-bedrock/src/libraries/GasPayingToken.sol
index 37c06840bd59..bf53367476b5 100644
--- a/packages/contracts-bedrock/src/libraries/GasPayingToken.sol
+++ b/packages/contracts-bedrock/src/libraries/GasPayingToken.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Libraries
+import { LibString } from "@solady/utils/LibString.sol";
 import { Storage } from "src/libraries/Storage.sol";
 import { Constants } from "src/libraries/Constants.sol";
-import { LibString } from "@solady/utils/LibString.sol";
 
 /// @title IGasToken
 /// @notice Implemented by contracts that are aware of the custom gas token used
diff --git a/packages/contracts-bedrock/src/libraries/Hashing.sol b/packages/contracts-bedrock/src/libraries/Hashing.sol
index 0f0f15678f97..b736ad9e4b7e 100644
--- a/packages/contracts-bedrock/src/libraries/Hashing.sol
+++ b/packages/contracts-bedrock/src/libraries/Hashing.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Libraries
 import { Types } from "src/libraries/Types.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 
diff --git a/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol b/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol
index 559c53391f70..f342658cb45c 100644
--- a/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol
+++ b/packages/contracts-bedrock/src/libraries/rlp/RLPReader.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.8;
 
+// Libraries
 import {
     EmptyItem,
     UnexpectedString,
@@ -8,7 +9,7 @@ import {
     ContentLengthMismatch,
     InvalidHeader,
     UnexpectedList
-} from "./RLPErrors.sol";
+} from "src/libraries/rlp/RLPErrors.sol";
 
 /// @custom:attribution https://github.com/hamdiallam/Solidity-RLP
 /// @title RLPReader
diff --git a/packages/contracts-bedrock/src/libraries/trie/MerkleTrie.sol b/packages/contracts-bedrock/src/libraries/trie/MerkleTrie.sol
index fa500894b165..cbbf9fdf3d65 100644
--- a/packages/contracts-bedrock/src/libraries/trie/MerkleTrie.sol
+++ b/packages/contracts-bedrock/src/libraries/trie/MerkleTrie.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Bytes } from "../Bytes.sol";
-import { RLPReader } from "../rlp/RLPReader.sol";
+// Libraries
+import { Bytes } from "src/libraries/Bytes.sol";
+import { RLPReader } from "src/libraries/rlp/RLPReader.sol";
 
 /// @title MerkleTrie
 /// @notice MerkleTrie is a small library for verifying standard Ethereum Merkle-Patricia trie
diff --git a/packages/contracts-bedrock/src/libraries/trie/SecureMerkleTrie.sol b/packages/contracts-bedrock/src/libraries/trie/SecureMerkleTrie.sol
index e8eab17917a1..56992fba9972 100644
--- a/packages/contracts-bedrock/src/libraries/trie/SecureMerkleTrie.sol
+++ b/packages/contracts-bedrock/src/libraries/trie/SecureMerkleTrie.sol
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { MerkleTrie } from "./MerkleTrie.sol";
+// Libraries
+import { MerkleTrie } from "src/libraries/trie/MerkleTrie.sol";
 
 /// @title SecureMerkleTrie
 /// @notice SecureMerkleTrie is a thin wrapper around the MerkleTrie library that hashes the input
diff --git a/packages/contracts-bedrock/src/periphery/AssetReceiver.sol b/packages/contracts-bedrock/src/periphery/AssetReceiver.sol
index ce59d8ef753e..0ee2d52a29bc 100644
--- a/packages/contracts-bedrock/src/periphery/AssetReceiver.sol
+++ b/packages/contracts-bedrock/src/periphery/AssetReceiver.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Contracts
 import { ERC20 } from "@rari-capital/solmate/src/tokens/ERC20.sol";
 import { ERC721 } from "@rari-capital/solmate/src/tokens/ERC721.sol";
-import { Transactor } from "./Transactor.sol";
+import { Transactor } from "src/periphery/Transactor.sol";
 
 /// @title AssetReceiver
 /// @notice AssetReceiver is a minimal contract for receiving funds assets in the form of either
diff --git a/packages/contracts-bedrock/src/periphery/Transactor.sol b/packages/contracts-bedrock/src/periphery/Transactor.sol
index 01c8cc384ad1..168367b4109e 100644
--- a/packages/contracts-bedrock/src/periphery/Transactor.sol
+++ b/packages/contracts-bedrock/src/periphery/Transactor.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+// Contracts
 import { Owned } from "@rari-capital/solmate/src/auth/Owned.sol";
 
 /// @title Transactor
diff --git a/packages/contracts-bedrock/src/periphery/TransferOnion.sol b/packages/contracts-bedrock/src/periphery/TransferOnion.sol
index db473a1828ce..292eb9c34232 100644
--- a/packages/contracts-bedrock/src/periphery/TransferOnion.sol
+++ b/packages/contracts-bedrock/src/periphery/TransferOnion.sol
@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { ReentrancyGuard } from "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+// Libraries
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /// @title  TransferOnion
diff --git a/packages/contracts-bedrock/src/periphery/drippie/Drippie.sol b/packages/contracts-bedrock/src/periphery/drippie/Drippie.sol
index 014694813e46..c7240d015a97 100644
--- a/packages/contracts-bedrock/src/periphery/drippie/Drippie.sol
+++ b/packages/contracts-bedrock/src/periphery/drippie/Drippie.sol
@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { AssetReceiver } from "../AssetReceiver.sol";
-import { IDripCheck } from "./IDripCheck.sol";
+// Contracts
+import { AssetReceiver } from "src/periphery/AssetReceiver.sol";
+
+// Interfaces
+import { IDripCheck } from "src/periphery/drippie/IDripCheck.sol";
 
 /// @title Drippie
 /// @notice Drippie is a system for managing automated contract interactions. A specific interaction
diff --git a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckBalanceLow.sol b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckBalanceLow.sol
index ff7121051c76..d889a4fa4422 100644
--- a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckBalanceLow.sol
+++ b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckBalanceLow.sol
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { IDripCheck } from "../IDripCheck.sol";
+// Interfaces
+import { IDripCheck } from "src/periphery/drippie/IDripCheck.sol";
 
 /// @title CheckBalanceLow
 /// @notice DripCheck for checking if an account's balance is below a given threshold.
diff --git a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol
index a5ef463f89e6..7324e451c7dd 100644
--- a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol
+++ b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { IDripCheck } from "../IDripCheck.sol";
+// Interfaces
 import { IGelatoTreasury } from "src/vendor/interfaces/IGelatoTreasury.sol";
+import { IDripCheck } from "src/periphery/drippie/IDripCheck.sol";
 
 /// @title CheckGelatoLow
 /// @notice DripCheck for checking if an account's Gelato ETH balance is below some threshold.
diff --git a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckSecrets.sol b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckSecrets.sol
index 5cfc4251b456..f255c2e6964e 100644
--- a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckSecrets.sol
+++ b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckSecrets.sol
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { IDripCheck } from "../IDripCheck.sol";
+// Interfaces
+import { IDripCheck } from "src/periphery/drippie/IDripCheck.sol";
 
 /// @title CheckSecrets
 /// @notice DripCheck that checks if specific secrets exist (or not). Supports having a secret that
diff --git a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckTrue.sol b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckTrue.sol
index 1ce7138945c3..18d4956f8e69 100644
--- a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckTrue.sol
+++ b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckTrue.sol
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { IDripCheck } from "../IDripCheck.sol";
+// Interfaces
+import { IDripCheck } from "src/periphery/drippie/IDripCheck.sol";
 
 /// @title CheckTrue
 /// @notice DripCheck that always returns true.
diff --git a/packages/contracts-bedrock/src/periphery/faucet/Faucet.sol b/packages/contracts-bedrock/src/periphery/faucet/Faucet.sol
index cce6a83b3e13..66cab547317b 100644
--- a/packages/contracts-bedrock/src/periphery/faucet/Faucet.sol
+++ b/packages/contracts-bedrock/src/periphery/faucet/Faucet.sol
@@ -1,10 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { IFaucetAuthModule } from "src/periphery/faucet/authmodules/IFaucetAuthModule.sol";
-import { SafeCall } from "src/libraries/SafeCall.sol";
+// Contracts
 import { SafeSend } from "src/universal/SafeSend.sol";
 
+// Libraries
+import { SafeCall } from "src/libraries/SafeCall.sol";
+
+// Interfaces
+import { IFaucetAuthModule } from "src/periphery/faucet/authmodules/IFaucetAuthModule.sol";
+
 /// @title  Faucet
 /// @notice Faucet contract that drips ETH to users.
 contract Faucet {
diff --git a/packages/contracts-bedrock/src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol b/packages/contracts-bedrock/src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol
index 115810d9d139..c9077943610a 100644
--- a/packages/contracts-bedrock/src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol
+++ b/packages/contracts-bedrock/src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol
@@ -1,10 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/draft-EIP712.sol";
 import { SignatureChecker } from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
-import { IFaucetAuthModule } from "./IFaucetAuthModule.sol";
-import { Faucet } from "../Faucet.sol";
+
+// Interfaces
+import { IFaucetAuthModule } from "src/periphery/faucet/authmodules/IFaucetAuthModule.sol";
+import { Faucet } from "src/periphery/faucet/Faucet.sol";
 
 /// @title  AdminFaucetAuthModule
 /// @notice FaucetAuthModule that allows an admin to sign off on a given faucet drip. Takes an admin
diff --git a/packages/contracts-bedrock/src/periphery/faucet/authmodules/IFaucetAuthModule.sol b/packages/contracts-bedrock/src/periphery/faucet/authmodules/IFaucetAuthModule.sol
index a94071dd2bef..b4d91febf4a1 100644
--- a/packages/contracts-bedrock/src/periphery/faucet/authmodules/IFaucetAuthModule.sol
+++ b/packages/contracts-bedrock/src/periphery/faucet/authmodules/IFaucetAuthModule.sol
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Faucet } from "../Faucet.sol";
+// Contracts
+import { Faucet } from "src/periphery/faucet/Faucet.sol";
 
 /// @title  IFaucetAuthModule
 /// @notice Interface for faucet authentication modules.
diff --git a/packages/contracts-bedrock/src/safe/LivenessGuard.sol b/packages/contracts-bedrock/src/safe/LivenessGuard.sol
index aa9a231a4b25..f5966a9e1469 100644
--- a/packages/contracts-bedrock/src/safe/LivenessGuard.sol
+++ b/packages/contracts-bedrock/src/safe/LivenessGuard.sol
@@ -1,12 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Safe
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { Guard as BaseGuard } from "safe-contracts/base/GuardManager.sol";
-import { SafeSigners } from "src/safe/SafeSigners.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
+// Libraries
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import { SafeSigners } from "src/safe/SafeSigners.sol";
+
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @title LivenessGuard
 /// @notice This Guard contract is used to track the liveness of Safe owners.
@@ -25,8 +30,8 @@ contract LivenessGuard is ISemver, BaseGuard {
     event OwnerRecorded(address owner);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.2
-    string public constant version = "1.0.1-beta.2";
+    /// @custom:semver 1.0.1-beta.3
+    string public constant version = "1.0.1-beta.3";
 
     /// @notice The safe account for which this contract will be the guard.
     Safe internal immutable SAFE;
diff --git a/packages/contracts-bedrock/src/safe/LivenessModule.sol b/packages/contracts-bedrock/src/safe/LivenessModule.sol
index cd41c6e2dd53..50ab03d450c9 100644
--- a/packages/contracts-bedrock/src/safe/LivenessModule.sol
+++ b/packages/contracts-bedrock/src/safe/LivenessModule.sol
@@ -1,10 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Safe
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
 import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
+
+// Contracts
 import { LivenessGuard } from "src/safe/LivenessGuard.sol";
+
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @title LivenessModule
@@ -53,8 +58,8 @@ contract LivenessModule is ISemver {
     uint256 internal constant GUARD_STORAGE_SLOT = 0x4a204f620c8c5ccdca3fd54d003badd85ba500436a431f0cbda4f558c93c34c8;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.2.1-beta.1
-    string public constant version = "1.2.1-beta.1";
+    /// @custom:semver 1.2.1-beta.2
+    string public constant version = "1.2.1-beta.2";
 
     // Constructor to initialize the Safe and baseModule instances
     constructor(
diff --git a/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol b/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
index 66c724d3eba9..85d801f0a1a6 100644
--- a/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/universal/CrossDomainMessenger.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
diff --git a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
index 52217fab713c..3c6d7fe816f6 100644
--- a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
@@ -1,10 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+// Contracts
 import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
+// Libraries
+import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+
+// Interfaces
+import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+
 /// @title ERC721Bridge
 /// @notice ERC721Bridge is a base contract for the L1 and L2 ERC721 bridges.
 abstract contract ERC721Bridge is Initializable {
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
index 34d601cbb65b..0e25cd339384 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
@@ -1,13 +1,18 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { ERC20Permit } from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
+
+// Libraries
+import { Preinstalls } from "src/libraries/Preinstalls.sol";
+
+// Interfaces
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
 import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 /// @title OptimismMintableERC20
 /// @notice OptimismMintableERC20 is a standard extension of the base ERC20 token contract designed
@@ -42,8 +47,8 @@ contract OptimismMintableERC20 is ERC20Permit, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.0-beta.2
-    string public constant version = "1.4.0-beta.2";
+    /// @custom:semver 1.4.0-beta.3
+    string public constant version = "1.4.0-beta.3";
 
     /// @notice Getter function for the permit2 address. It deterministically deployed
     ///         so it will always be at the same address. It is also included as a preinstall,
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
index d7a9cd3372cd..4f4b01602cc6 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
+import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
+
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
 
 /// @custom:proxied true
@@ -48,8 +51,8 @@ contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20F
     ///         the OptimismMintableERC20 token contract since this contract
     ///         is responsible for deploying OptimismMintableERC20 contracts.
     /// @notice Semantic version.
-    /// @custom:semver 1.10.1-beta.4
-    string public constant version = "1.10.1-beta.4";
+    /// @custom:semver 1.10.1-beta.5
+    string public constant version = "1.10.1-beta.5";
 
     /// @notice Constructs the OptimismMintableERC20Factory contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
index 9dd05e10d1fe..140c6ce5e6d6 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
@@ -1,11 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { ERC721Enumerable } from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+
+// Libraries
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
+
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
 
 /// @title OptimismMintableERC721
 /// @notice This contract is the remote representation for some token that lives on another network,
@@ -41,8 +46,8 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.3
-    string public constant version = "1.3.1-beta.3";
+    /// @custom:semver 1.3.1-beta.4
+    string public constant version = "1.3.1-beta.4";
 
     /// @param _bridge        Address of the bridge on this network.
     /// @param _remoteChainId Chain ID where the remote token is deployed.
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
index 7350e0fae0de..da05e8f4f340 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
@@ -1,7 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Contracts
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
+
+// Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 
 /// @title OptimismMintableERC721Factory
@@ -25,8 +28,8 @@ contract OptimismMintableERC721Factory is ISemver {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.1-beta.4
-    string public constant version = "1.4.1-beta.4";
+    /// @custom:semver 1.4.1-beta.5
+    string public constant version = "1.4.1-beta.5";
 
     /// @notice The semver MUST be bumped any time that there is a change in
     ///         the OptimismMintableERC721 token contract since this contract
diff --git a/packages/contracts-bedrock/src/universal/Proxy.sol b/packages/contracts-bedrock/src/universal/Proxy.sol
index b50b08efca83..4fd53dae06ba 100644
--- a/packages/contracts-bedrock/src/universal/Proxy.sol
+++ b/packages/contracts-bedrock/src/universal/Proxy.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
+// Libraries
 import { Constants } from "src/libraries/Constants.sol";
 
 /// @title Proxy
diff --git a/packages/contracts-bedrock/src/universal/StandardBridge.sol b/packages/contracts-bedrock/src/universal/StandardBridge.sol
index 57af2247a65a..dceb2fd41471 100644
--- a/packages/contracts-bedrock/src/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/StandardBridge.sol
@@ -1,17 +1,21 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
+// Contracts
+import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+
+// Libraries
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
+import { Constants } from "src/libraries/Constants.sol";
+
+// Interfaces
+import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
 import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
 import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
-import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import { Constants } from "src/libraries/Constants.sol";
 
 /// @custom:upgradeable
 /// @title StandardBridge
@@ -294,7 +298,7 @@ abstract contract StandardBridge is Initializable {
                 "StandardBridge: wrong remote token for Optimism Mintable ERC20 local token"
             );
 
-            OptimismMintableERC20(_localToken).mint(_to, _amount);
+            IOptimismMintableERC20(_localToken).mint(_to, _amount);
         } else {
             deposits[_localToken][_remoteToken] = deposits[_localToken][_remoteToken] - _amount;
             IERC20(_localToken).safeTransfer(_to, _amount);
@@ -364,7 +368,7 @@ abstract contract StandardBridge is Initializable {
                 "StandardBridge: wrong remote token for Optimism Mintable ERC20 local token"
             );
 
-            OptimismMintableERC20(_localToken).burn(_from, _amount);
+            IOptimismMintableERC20(_localToken).burn(_from, _amount);
         } else {
             IERC20(_localToken).safeTransferFrom(_from, address(this), _amount);
             deposits[_localToken][_remoteToken] = deposits[_localToken][_remoteToken] + _amount;
diff --git a/packages/contracts-bedrock/src/universal/StorageSetter.sol b/packages/contracts-bedrock/src/universal/StorageSetter.sol
index 5bd53a75b366..e6e4b5df545c 100644
--- a/packages/contracts-bedrock/src/universal/StorageSetter.sol
+++ b/packages/contracts-bedrock/src/universal/StorageSetter.sol
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+// Libraries
 import { Storage } from "src/libraries/Storage.sol";
 
+// Interfaces
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+
 /// @title StorageSetter
 /// @notice A simple contract that allows setting arbitrary storage slots.
 ///         WARNING: this contract is not safe to be called by untrusted parties.
@@ -16,8 +19,8 @@ contract StorageSetter is ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.2.1-beta.2
-    string public constant version = "1.2.1-beta.2";
+    /// @custom:semver 1.2.1-beta.3
+    string public constant version = "1.2.1-beta.3";
 
     /// @notice Stores a bytes32 `_value` at `_slot`. Any storage slots that
     ///         are packed should be set through this interface.
diff --git a/packages/contracts-bedrock/src/vendor/eas/resolver/ISchemaResolver.sol b/packages/contracts-bedrock/src/vendor/eas/resolver/ISchemaResolver.sol
index 51aac1ece23b..d2089f83af86 100644
--- a/packages/contracts-bedrock/src/vendor/eas/resolver/ISchemaResolver.sol
+++ b/packages/contracts-bedrock/src/vendor/eas/resolver/ISchemaResolver.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { Attestation } from "../Common.sol";
+import { Attestation } from "src/vendor/eas/Common.sol";
 
 /// @title ISchemaResolver
 /// @notice The interface of an optional schema resolver.
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
index bd6d3b5d7de9..c39bf0ee0f7c 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-// Testing utilities
+// Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
@@ -9,12 +9,8 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import "src/libraries/PortalErrors.sol";
 
-// Target contract dependencies
-import "src/libraries/PortalErrors.sol";
-import { OptimismPortalInterop } from "src/L1/OptimismPortalInterop.sol";
-import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
-
 // Interfaces
+import { IL1BlockInterop, ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
 import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
 
 contract OptimismPortalInterop_Test is CommonTest {
@@ -35,7 +31,7 @@ contract OptimismPortalInterop_Test is CommonTest {
             _mint: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.SET_GAS_PAYING_TOKEN, _value))
+            _data: abi.encodeCall(IL1BlockInterop.setConfig, (ConfigType.SET_GAS_PAYING_TOKEN, _value))
         });
 
         vm.prank(address(_optimismPortalInterop().systemConfig()));
@@ -58,7 +54,7 @@ contract OptimismPortalInterop_Test is CommonTest {
             _mint: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.ADD_DEPENDENCY, _value))
+            _data: abi.encodeCall(IL1BlockInterop.setConfig, (ConfigType.ADD_DEPENDENCY, _value))
         });
 
         vm.prank(address(_optimismPortalInterop().systemConfig()));
@@ -81,7 +77,7 @@ contract OptimismPortalInterop_Test is CommonTest {
             _mint: 0,
             _gasLimit: 200_000,
             _isCreation: false,
-            _data: abi.encodeCall(L1BlockInterop.setConfig, (ConfigType.REMOVE_DEPENDENCY, _value))
+            _data: abi.encodeCall(IL1BlockInterop.setConfig, (ConfigType.REMOVE_DEPENDENCY, _value))
         });
 
         vm.prank(address(_optimismPortalInterop().systemConfig()));
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index 78337fc3b4d0..5132dc40e04c 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -6,7 +6,6 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { ConfigType } from "src/L2/L1BlockInterop.sol";
 
 // Libraries
 import { Constants } from "src/libraries/Constants.sol";
@@ -17,6 +16,7 @@ import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
 import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
 import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
+import { ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
 
 contract SystemConfigInterop_Test is CommonTest {
     /// @notice Marked virtual to be overridden in
diff --git a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
index c8779342c3bf..01d3e6108f91 100644
--- a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-// Testing utilities
+// Testing
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { StaticConfig } from "src/libraries/StaticConfig.sol";
-
-// Target contract dependencies
-import { L1BlockInterop, ConfigType } from "src/L2/L1BlockInterop.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import "src/libraries/L1BlockErrors.sol";
 
+// Interfaces
+import { IL1BlockInterop, ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+
 contract L1BlockInteropTest is CommonTest {
     event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
     event DependencyAdded(uint256 indexed chainId);
@@ -199,8 +199,8 @@ contract L1BlockInteropTest is CommonTest {
     }
 
     /// @dev Returns the L1BlockInterop instance.
-    function _l1BlockInterop() internal view returns (L1BlockInterop) {
-        return L1BlockInterop(address(l1Block));
+    function _l1BlockInterop() internal view returns (IL1BlockInterop) {
+        return IL1BlockInterop(address(l1Block));
     }
 }
 
@@ -261,7 +261,7 @@ contract L1BlockInteropSetL1BlockValuesInterop_Test is L1BlockInteropTest {
 
         vm.prank(_l1BlockInterop().DEPOSITOR_ACCOUNT());
         (bool success,) = address(l1Block).call(
-            abi.encodePacked(L1BlockInterop.setL1BlockValuesInterop.selector, setValuesEcotoneCalldata)
+            abi.encodePacked(IL1BlockInterop.setL1BlockValuesInterop.selector, setValuesEcotoneCalldata)
         );
         assertTrue(success, "function call failed");
 
diff --git a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
index 0775eb588d2a..fcfa375c1b53 100644
--- a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
@@ -10,7 +10,6 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 
 // Target contract
-import { CrossL2Inbox, Identifier } from "src/L2/CrossL2Inbox.sol";
 import {
     L2ToL2CrossDomainMessenger,
     NotEntered,
@@ -27,6 +26,9 @@ import {
     InvalidChainId
 } from "src/L2/L2ToL2CrossDomainMessenger.sol";
 
+// Interfaces
+import { ICrossL2Inbox, Identifier } from "src/L2/interfaces/ICrossL2Inbox.sol";
+
 /// @title L2ToL2CrossDomainMessengerWithModifiableTransientStorage
 /// @dev L2ToL2CrossDomainMessenger contract with methods to modify the transient storage.
 ///      This is used to test the transient storage of L2ToL2CrossDomainMessenger.
@@ -264,7 +266,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -308,7 +310,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -371,7 +373,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -452,7 +454,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -534,7 +536,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -573,7 +575,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -615,7 +617,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -665,7 +667,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
@@ -715,7 +717,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure the CrossL2Inbox validates this message
         vm.mockCall({
             callee: Predeploys.CROSS_L2_INBOX,
-            data: abi.encodeCall(CrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
+            data: abi.encodeCall(ICrossL2Inbox.validateMessage, (id, keccak256(sentMessage))),
             returnData: ""
         });
 
diff --git a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
index aa8d2545106a..203605f3b1bb 100644
--- a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
@@ -4,16 +4,16 @@ pragma solidity 0.8.15;
 // Testing
 import { Test } from "forge-std/Test.sol";
 
-// Contracts
-import { IL1BlockNumber } from "src/legacy/interfaces/IL1BlockNumber.sol";
-import { L1Block } from "src/L2/L1Block.sol";
-
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
+// Interfaces
+import { IL1BlockNumber } from "src/legacy/interfaces/IL1BlockNumber.sol";
+import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+
 contract L1BlockNumberTest is Test {
-    L1Block lb;
+    IL1Block lb;
     IL1BlockNumber bn;
 
     uint64 constant number = 99;
@@ -21,7 +21,7 @@ contract L1BlockNumberTest is Test {
     /// @dev Sets up the test suite.
     function setUp() external {
         vm.etch(Predeploys.L1_BLOCK_ATTRIBUTES, vm.getDeployedCode("L1Block.sol:L1Block"));
-        lb = L1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
+        lb = IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES);
         bn = IL1BlockNumber(
             DeployUtils.create1({
                 _name: "L1BlockNumber",

From 9fb5aa2eb3291402bbc8822535f2889abc5e9ae5 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 25 Nov 2024 22:22:32 +0000
Subject: [PATCH 275/451] upload to codecov using orb (#13062)

---
 .circleci/config.yml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 789ce0b8c569..8e25f5b509a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,6 +53,7 @@ orbs:
   gcp-cli: circleci/gcp-cli@3.0.1
   slack: circleci/slack@4.10.1
   shellcheck: circleci/shellcheck@3.2.0
+  codecov: codecov/codecov@5.0.3
 commands:
   gcp-oidc-authenticate:
     description: "Authenticate with GCP using a CircleCI OIDC token."
@@ -202,10 +203,10 @@ jobs:
                   gotestsum --format=testname --junitfile=../tmp/test-results/cannon-32.xml --jsonfile=../tmp/testlogs/log-32.json \
                   -- -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage-32.out ./...
                 working_directory: cannon
-            - run:
-                name: Upload Cannon coverage
-                command: codecov --verbose --clean --flags cannon-go-tests-32 -f ./coverage-32.out
-                working_directory: cannon
+            - codecov/upload:
+                disable_search: true
+                files: ./cannon/coverage-32.out
+                flags: cannon-go-tests-32
       - when:
           condition:
             equal: [64, <<parameters.mips_word_size>>]
@@ -217,10 +218,10 @@ jobs:
                   gotestsum --format=testname --junitfile=../tmp/test-results/cannon-64.xml --jsonfile=../tmp/testlogs/log-64.json \
                   -- --tags=cannon64 -parallel=$(nproc) -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage-64.out ./...
                 working_directory: cannon
-            - run:
-                name: Upload Cannon coverage
-                command: codecov --verbose --clean --flags cannon-go-tests-64 -f ./coverage-64.out
-                working_directory: cannon
+            - codecov/upload:
+                disable_search: true
+                files: ./cannon/coverage-64.out
+                flags: cannon-go-tests-64
       - store_test_results:
           path: ./tmp/test-results
       - store_artifacts:
@@ -606,11 +607,10 @@ jobs:
           environment:
             FOUNDRY_PROFILE: ci
           working_directory: packages/contracts-bedrock
-      - run:
-          name: upload coverage
-          command: codecov --verbose --clean --flags contracts-bedrock-tests
-          environment:
-            FOUNDRY_PROFILE: ci
+      - codecov/upload:
+          disable_search: true
+          files: ./packages/contracts-bedrock/coverage/lcov.info
+          flags: contracts-bedrock-tests
 
   contracts-bedrock-tests:
     docker:
@@ -903,7 +903,7 @@ jobs:
           no_output_timeout: <<parameters.no_output_timeout>>
           command: |
             mkdir -p ./tmp/test-results && mkdir -p ./tmp/testlogs
-            
+
             cd op-e2e && make pre-test && cd ..
 
             packages=(
@@ -920,7 +920,7 @@ jobs:
             export ENABLE_ANVIL=true
             export SEPOLIA_RPC_URL="https://ci-sepolia-l1-archive.optimism.io"
             export MAINNET_RPC_URL="https://ci-mainnet-l1-archive.optimism.io"
-            
+
             <<parameters.environment_overrides>>
 
             gotestsum --format=testname \
@@ -929,6 +929,9 @@ jobs:
               --rerun-fails=2 \
               --packages="$formatted_packages" \
               -- -coverprofile=coverage.out -timeout=60m
+      - codecov/upload:
+          disable_search: true
+          files: ./coverage.out
       - store_test_results:
           path: ./tmp/test-results
       - store_artifacts:

From 70d90208f430488d7d2ab611a44e8c71bbe0c106 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Mon, 25 Nov 2024 17:35:09 -0500
Subject: [PATCH 276/451] feat: reorder Deploy.s.sol helpers (#13084)

* feat: delete unused deploy functions

* feat: Delete some more unused code

* fix: Unused imports

* feat: reorder Deploy.s.sol helpers
---
 .../scripts/deploy/Deploy.s.sol               | 118 +++++++++---------
 1 file changed, 61 insertions(+), 57 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index bfe062370a68..2cbed1c5568b 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -180,28 +180,6 @@ contract Deploy is Deployer {
         });
     }
 
-    ////////////////////////////////////////////////////////////////
-    //            State Changing Helper Functions                 //
-    ////////////////////////////////////////////////////////////////
-
-    /// @notice Transfer ownership of the ProxyAdmin contract to the final system owner
-    function transferProxyAdminOwnership() public broadcast {
-        // Get the ProxyAdmin contract.
-        IProxyAdmin proxyAdmin = IProxyAdmin(mustGetAddress("ProxyAdmin"));
-
-        // Transfer ownership to the final system owner if necessary.
-        address owner = proxyAdmin.owner();
-        address finalSystemOwner = cfg.finalSystemOwner();
-        if (owner != finalSystemOwner) {
-            proxyAdmin.transferOwnership(finalSystemOwner);
-            console.log("ProxyAdmin ownership transferred to final system owner at: %s", finalSystemOwner);
-        }
-
-        // Make sure the ProxyAdmin owner is set to the final system owner.
-        owner = proxyAdmin.owner();
-        require(owner == finalSystemOwner, "Deploy: ProxyAdmin ownership not transferred to final system owner");
-    }
-
     ////////////////////////////////////////////////////////////////
     //                    SetUp and Run                           //
     ////////////////////////////////////////////////////////////////
@@ -304,7 +282,7 @@ contract Deploy is Deployer {
             bytes32 typeHash = keccak256(bytes(cfg.daCommitmentType()));
             bytes32 keccakHash = keccak256(bytes("KeccakCommitment"));
             if (typeHash == keccakHash) {
-                setupOpAltDA();
+                deployOpAltDA();
             }
         }
 
@@ -488,7 +466,7 @@ contract Deploy is Deployer {
     }
 
     /// @notice Add AltDA setup to the OP chain
-    function setupOpAltDA() public {
+    function deployOpAltDA() public {
         console.log("Deploying OP AltDA");
         deployDataAvailabilityChallengeProxy();
         deployDataAvailabilityChallenge();
@@ -729,6 +707,61 @@ contract Deploy is Deployer {
         ChainAssertions.checkOptimismPortal({ _contracts: _proxies(), _cfg: cfg, _isProxy: true });
     }
 
+    /// @notice Initialize the DataAvailabilityChallenge
+    function initializeDataAvailabilityChallenge() public broadcast {
+        console.log("Upgrading and initializing DataAvailabilityChallenge proxy");
+        address dataAvailabilityChallengeProxy = mustGetAddress("DataAvailabilityChallengeProxy");
+        address dataAvailabilityChallenge = mustGetAddress("DataAvailabilityChallenge");
+
+        address finalSystemOwner = cfg.finalSystemOwner();
+        uint256 daChallengeWindow = cfg.daChallengeWindow();
+        uint256 daResolveWindow = cfg.daResolveWindow();
+        uint256 daBondSize = cfg.daBondSize();
+        uint256 daResolverRefundPercentage = cfg.daResolverRefundPercentage();
+
+        IProxyAdmin proxyAdmin = IProxyAdmin(payable(mustGetAddress("ProxyAdmin")));
+        proxyAdmin.upgradeAndCall({
+            _proxy: payable(dataAvailabilityChallengeProxy),
+            _implementation: dataAvailabilityChallenge,
+            _data: abi.encodeCall(
+                IDataAvailabilityChallenge.initialize,
+                (finalSystemOwner, daChallengeWindow, daResolveWindow, daBondSize, daResolverRefundPercentage)
+            )
+        });
+
+        IDataAvailabilityChallenge dac = IDataAvailabilityChallenge(payable(dataAvailabilityChallengeProxy));
+        string memory version = dac.version();
+        console.log("DataAvailabilityChallenge version: %s", version);
+
+        require(dac.owner() == finalSystemOwner);
+        require(dac.challengeWindow() == daChallengeWindow);
+        require(dac.resolveWindow() == daResolveWindow);
+        require(dac.bondSize() == daBondSize);
+        require(dac.resolverRefundPercentage() == daResolverRefundPercentage);
+    }
+
+    ////////////////////////////////////////////////////////////////
+    //         Ownership Transfer Helper Functions                //
+    ////////////////////////////////////////////////////////////////
+
+    /// @notice Transfer ownership of the ProxyAdmin contract to the final system owner
+    function transferProxyAdminOwnership() public broadcast {
+        // Get the ProxyAdmin contract.
+        IProxyAdmin proxyAdmin = IProxyAdmin(mustGetAddress("ProxyAdmin"));
+
+        // Transfer ownership to the final system owner if necessary.
+        address owner = proxyAdmin.owner();
+        address finalSystemOwner = cfg.finalSystemOwner();
+        if (owner != finalSystemOwner) {
+            proxyAdmin.transferOwnership(finalSystemOwner);
+            console.log("ProxyAdmin ownership transferred to final system owner at: %s", finalSystemOwner);
+        }
+
+        // Make sure the ProxyAdmin owner is set to the final system owner.
+        owner = proxyAdmin.owner();
+        require(owner == finalSystemOwner, "Deploy: ProxyAdmin ownership not transferred to final system owner");
+    }
+
     /// @notice Transfer ownership of the DisputeGameFactory contract to the final system owner
     function transferDisputeGameFactoryOwnership() public broadcast {
         console.log("Transferring DisputeGameFactory ownership to Safe");
@@ -785,6 +818,10 @@ contract Deploy is Deployer {
         });
     }
 
+    ///////////////////////////////////////////////////////////
+    //         Proofs setup helper functions                 //
+    ///////////////////////////////////////////////////////////
+
     /// @notice Load the appropriate mips absolute prestate for devenets depending on config environment.
     function loadMipsAbsolutePrestate() internal returns (Claim mipsAbsolutePrestate_) {
         if (block.chainid == Chains.LocalDevnet || block.chainid == Chains.GethDevnet) {
@@ -984,39 +1021,6 @@ contract Deploy is Deployer {
         );
     }
 
-    /// @notice Initialize the DataAvailabilityChallenge
-    function initializeDataAvailabilityChallenge() public broadcast {
-        console.log("Upgrading and initializing DataAvailabilityChallenge proxy");
-        address dataAvailabilityChallengeProxy = mustGetAddress("DataAvailabilityChallengeProxy");
-        address dataAvailabilityChallenge = mustGetAddress("DataAvailabilityChallenge");
-
-        address finalSystemOwner = cfg.finalSystemOwner();
-        uint256 daChallengeWindow = cfg.daChallengeWindow();
-        uint256 daResolveWindow = cfg.daResolveWindow();
-        uint256 daBondSize = cfg.daBondSize();
-        uint256 daResolverRefundPercentage = cfg.daResolverRefundPercentage();
-
-        IProxyAdmin proxyAdmin = IProxyAdmin(payable(mustGetAddress("ProxyAdmin")));
-        proxyAdmin.upgradeAndCall({
-            _proxy: payable(dataAvailabilityChallengeProxy),
-            _implementation: dataAvailabilityChallenge,
-            _data: abi.encodeCall(
-                IDataAvailabilityChallenge.initialize,
-                (finalSystemOwner, daChallengeWindow, daResolveWindow, daBondSize, daResolverRefundPercentage)
-            )
-        });
-
-        IDataAvailabilityChallenge dac = IDataAvailabilityChallenge(payable(dataAvailabilityChallengeProxy));
-        string memory version = dac.version();
-        console.log("DataAvailabilityChallenge version: %s", version);
-
-        require(dac.owner() == finalSystemOwner);
-        require(dac.challengeWindow() == daChallengeWindow);
-        require(dac.resolveWindow() == daResolveWindow);
-        require(dac.bondSize() == daBondSize);
-        require(dac.resolverRefundPercentage() == daResolverRefundPercentage);
-    }
-
     /// @notice Get the DeployInput struct to use for testing
     function getDeployInput() public view returns (OPContractsManager.DeployInput memory) {
         OutputRoot memory testOutputRoot = OutputRoot({

From efbe102213d9f66ec77a10f2d6fb65ae09298365 Mon Sep 17 00:00:00 2001
From: Zach Howard <zach@oplabs.co>
Date: Mon, 25 Nov 2024 20:28:45 -0500
Subject: [PATCH 277/451] Use circleci-ip-ranges for fpp-verify (#13093)

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e25f5b509a0..0368861be016 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1112,6 +1112,7 @@ jobs:
       - run: echo Done
 
   fpp-verify:
+    circleci_ip_ranges: true
     docker:
       - image: cimg/go:1.21
     steps:

From d5dfd515a844ce16b8488af6a95fd45d95ed7e78 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Tue, 26 Nov 2024 11:40:21 +1000
Subject: [PATCH 278/451] op-dispute-mon: Wrap L1 RPC client with timeouts.
 (#13059)

Requires moving from ethclient.Client to sources.L1Client since ethclient.Client requires a *rpc.Client which doesn't have any support for request timeouts.
---
 op-dispute-mon/mon/extract/head_enricher.go   |  8 +--
 .../mon/extract/head_enricher_test.go         | 11 ++--
 op-dispute-mon/mon/monitor.go                 | 58 +++++++++----------
 op-dispute-mon/mon/monitor_test.go            | 27 +++------
 op-dispute-mon/mon/service.go                 | 38 +++++++-----
 5 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/op-dispute-mon/mon/extract/head_enricher.go b/op-dispute-mon/mon/extract/head_enricher.go
index 943e648f771d..4162c9e896d6 100644
--- a/op-dispute-mon/mon/extract/head_enricher.go
+++ b/op-dispute-mon/mon/extract/head_enricher.go
@@ -5,15 +5,15 @@ import (
 	"fmt"
 
 	monTypes "github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
 )
 
 var _ Enricher = (*L1HeadBlockNumEnricher)(nil)
 
 type BlockFetcher interface {
-	HeaderByHash(ctx context.Context, block common.Hash) (*types.Header, error)
+	L1BlockRefByHash(ctx context.Context, block common.Hash) (eth.L1BlockRef, error)
 }
 
 type L1HeadBlockNumEnricher struct {
@@ -25,10 +25,10 @@ func NewL1HeadBlockNumEnricher(client BlockFetcher) *L1HeadBlockNumEnricher {
 }
 
 func (e *L1HeadBlockNumEnricher) Enrich(ctx context.Context, _ rpcblock.Block, _ GameCaller, game *monTypes.EnrichedGameData) error {
-	header, err := e.client.HeaderByHash(ctx, game.L1Head)
+	header, err := e.client.L1BlockRefByHash(ctx, game.L1Head)
 	if err != nil {
 		return fmt.Errorf("failed to retrieve header for L1 head block %v: %w", game.L1Head, err)
 	}
-	game.L1HeadNum = header.Number.Uint64()
+	game.L1HeadNum = header.Number
 	return nil
 }
diff --git a/op-dispute-mon/mon/extract/head_enricher_test.go b/op-dispute-mon/mon/extract/head_enricher_test.go
index c0cb03b86b7a..3c54c09516a7 100644
--- a/op-dispute-mon/mon/extract/head_enricher_test.go
+++ b/op-dispute-mon/mon/extract/head_enricher_test.go
@@ -3,13 +3,12 @@ package extract
 import (
 	"context"
 	"errors"
-	"math/big"
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
 	"github.com/ethereum/go-ethereum/common"
-	gethTypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/require"
 )
 
@@ -39,11 +38,11 @@ type stubBlockFetcher struct {
 	err error
 }
 
-func (s *stubBlockFetcher) HeaderByHash(_ context.Context, _ common.Hash) (*gethTypes.Header, error) {
+func (s *stubBlockFetcher) L1BlockRefByHash(_ context.Context, _ common.Hash) (eth.L1BlockRef, error) {
 	if s.err != nil {
-		return nil, s.err
+		return eth.L1BlockRef{}, s.err
 	}
-	return &gethTypes.Header{
-		Number: new(big.Int).SetUint64(s.num),
+	return eth.L1BlockRef{
+		Number: s.num,
 	}, nil
 }
diff --git a/op-dispute-mon/mon/monitor.go b/op-dispute-mon/mon/monitor.go
index 5f7764adccbd..3fb14525e24e 100644
--- a/op-dispute-mon/mon/monitor.go
+++ b/op-dispute-mon/mon/monitor.go
@@ -3,11 +3,11 @@ package mon
 import (
 	"context"
 	"fmt"
-	"math/big"
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
 	"github.com/ethereum-optimism/optimism/op-service/clock"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
@@ -15,8 +15,7 @@ import (
 
 type ForecastResolution func(games []*types.EnrichedGameData, ignoredCount, failedCount int)
 type Monitor func(games []*types.EnrichedGameData)
-type BlockHashFetcher func(ctx context.Context, number *big.Int) (common.Hash, error)
-type BlockNumberFetcher func(ctx context.Context) (uint64, error)
+type HeadBlockFetcher func(ctx context.Context) (eth.L1BlockRef, error)
 type Extract func(ctx context.Context, blockHash common.Hash, minTimestamp uint64) ([]*types.EnrichedGameData, int, int, error)
 
 type MonitorMetrics interface {
@@ -35,11 +34,10 @@ type gameMonitor struct {
 	gameWindow      time.Duration
 	monitorInterval time.Duration
 
-	forecast         ForecastResolution
-	monitors         []Monitor
-	extract          Extract
-	fetchBlockHash   BlockHashFetcher
-	fetchBlockNumber BlockNumberFetcher
+	forecast       ForecastResolution
+	monitors       []Monitor
+	extract        Extract
+	fetchHeadBlock HeadBlockFetcher
 }
 
 func newGameMonitor(
@@ -49,40 +47,34 @@ func newGameMonitor(
 	metrics MonitorMetrics,
 	monitorInterval time.Duration,
 	gameWindow time.Duration,
-	fetchBlockHash BlockHashFetcher,
-	fetchBlockNumber BlockNumberFetcher,
+	fetchHeadBlock HeadBlockFetcher,
 	extract Extract,
 	forecast ForecastResolution,
 	monitors ...Monitor) *gameMonitor {
 	return &gameMonitor{
-		logger:           logger,
-		clock:            cl,
-		ctx:              ctx,
-		done:             make(chan struct{}),
-		metrics:          metrics,
-		monitorInterval:  monitorInterval,
-		gameWindow:       gameWindow,
-		forecast:         forecast,
-		monitors:         monitors,
-		extract:          extract,
-		fetchBlockNumber: fetchBlockNumber,
-		fetchBlockHash:   fetchBlockHash,
+		logger:          logger,
+		clock:           cl,
+		ctx:             ctx,
+		done:            make(chan struct{}),
+		metrics:         metrics,
+		monitorInterval: monitorInterval,
+		gameWindow:      gameWindow,
+		forecast:        forecast,
+		monitors:        monitors,
+		extract:         extract,
+		fetchHeadBlock:  fetchHeadBlock,
 	}
 }
 
 func (m *gameMonitor) monitorGames() error {
 	start := m.clock.Now()
-	blockNumber, err := m.fetchBlockNumber(m.ctx)
+	headBlock, err := m.fetchHeadBlock(m.ctx)
 	if err != nil {
 		return fmt.Errorf("failed to fetch block number: %w", err)
 	}
-	m.logger.Debug("Fetched block number", "blockNumber", blockNumber)
-	blockHash, err := m.fetchBlockHash(context.Background(), new(big.Int).SetUint64(blockNumber))
-	if err != nil {
-		return fmt.Errorf("failed to fetch block hash: %w", err)
-	}
+	m.logger.Debug("Fetched current head block", "block", headBlock)
 	minGameTimestamp := clock.MinCheckedTimestamp(m.clock, m.gameWindow)
-	enrichedGames, ignored, failed, err := m.extract(m.ctx, blockHash, minGameTimestamp)
+	enrichedGames, ignored, failed, err := m.extract(m.ctx, headBlock.Hash, minGameTimestamp)
 	if err != nil {
 		return fmt.Errorf("failed to load games: %w", err)
 	}
@@ -92,7 +84,13 @@ func (m *gameMonitor) monitorGames() error {
 	}
 	timeTaken := m.clock.Since(start)
 	m.metrics.RecordMonitorDuration(timeTaken)
-	m.logger.Info("Completed monitoring update", "blockNumber", blockNumber, "blockHash", blockHash, "duration", timeTaken, "games", len(enrichedGames), "ignored", ignored, "failed", failed)
+	m.logger.Info("Completed monitoring update",
+		"blockNumber", headBlock.Number,
+		"blockHash", headBlock.Hash,
+		"duration", timeTaken,
+		"games", len(enrichedGames),
+		"ignored", ignored,
+		"failed", failed)
 	return nil
 }
 
diff --git a/op-dispute-mon/mon/monitor_test.go b/op-dispute-mon/mon/monitor_test.go
index 1181c57b4ecb..2161e6af14ca 100644
--- a/op-dispute-mon/mon/monitor_test.go
+++ b/op-dispute-mon/mon/monitor_test.go
@@ -3,7 +3,6 @@ package mon
 import (
 	"context"
 	"errors"
-	"math/big"
 	"testing"
 	"time"
 
@@ -11,6 +10,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-dispute-mon/metrics"
 	monTypes "github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
 	"github.com/ethereum-optimism/optimism/op-service/clock"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
@@ -24,21 +24,11 @@ var (
 func TestMonitor_MonitorGames(t *testing.T) {
 	t.Parallel()
 
-	t.Run("FailedFetchBlocknumber", func(t *testing.T) {
+	t.Run("FailedFetchHeadBlock", func(t *testing.T) {
 		monitor, _, _, _ := setupMonitorTest(t)
 		boom := errors.New("boom")
-		monitor.fetchBlockNumber = func(ctx context.Context) (uint64, error) {
-			return 0, boom
-		}
-		err := monitor.monitorGames()
-		require.ErrorIs(t, err, boom)
-	})
-
-	t.Run("FailedFetchBlockHash", func(t *testing.T) {
-		monitor, _, _, _ := setupMonitorTest(t)
-		boom := errors.New("boom")
-		monitor.fetchBlockHash = func(ctx context.Context, number *big.Int) (common.Hash, error) {
-			return common.Hash{}, boom
+		monitor.fetchHeadBlock = func(ctx context.Context) (eth.L1BlockRef, error) {
+			return eth.L1BlockRef{}, boom
 		}
 		err := monitor.monitorGames()
 		require.ErrorIs(t, err, boom)
@@ -108,11 +98,8 @@ func newEnrichedGameData(proxy common.Address, timestamp uint64) *monTypes.Enric
 
 func setupMonitorTest(t *testing.T) (*gameMonitor, *mockExtractor, *mockForecast, []*mockMonitor) {
 	logger := testlog.Logger(t, log.LvlDebug)
-	fetchBlockNum := func(ctx context.Context) (uint64, error) {
-		return 1, nil
-	}
-	fetchBlockHash := func(ctx context.Context, number *big.Int) (common.Hash, error) {
-		return common.Hash{}, nil
+	fetchHeadBlock := func(ctx context.Context) (eth.L1BlockRef, error) {
+		return eth.L1BlockRef{Number: 1, Hash: common.Hash{0xaa}}, nil
 	}
 	monitorInterval := 100 * time.Millisecond
 	cl := clock.NewAdvancingClock(10 * time.Millisecond)
@@ -122,7 +109,7 @@ func setupMonitorTest(t *testing.T) (*gameMonitor, *mockExtractor, *mockForecast
 	monitor1 := &mockMonitor{}
 	monitor2 := &mockMonitor{}
 	monitor3 := &mockMonitor{}
-	monitor := newGameMonitor(context.Background(), logger, cl, metrics.NoopMetrics, monitorInterval, 10*time.Second, fetchBlockHash, fetchBlockNum,
+	monitor := newGameMonitor(context.Background(), logger, cl, metrics.NoopMetrics, monitorInterval, 10*time.Second, fetchHeadBlock,
 		extractor.Extract, forecast.Forecast, monitor1.Check, monitor2.Check, monitor3.Check)
 	return monitor, extractor, forecast, []*mockMonitor{monitor1, monitor2, monitor3}
 }
diff --git a/op-dispute-mon/mon/service.go b/op-dispute-mon/mon/service.go
index 083e391b9111..c44f082d3a88 100644
--- a/op-dispute-mon/mon/service.go
+++ b/op-dispute-mon/mon/service.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math/big"
 	"sync/atomic"
+	"time"
 
 	"github.com/ethereum-optimism/optimism/op-dispute-mon/mon/bonds"
 	"github.com/ethereum-optimism/optimism/op-dispute-mon/mon/types"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
+	rpcclient "github.com/ethereum-optimism/optimism/op-service/client"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-dispute-mon/config"
@@ -47,7 +47,9 @@ type Service struct {
 	withdrawals  *WithdrawalMonitor
 	rollupClient *sources.RollupClient
 
-	l1Client *ethclient.Client
+	l1RPC    rpcclient.RPC
+	l1Client *sources.L1Client
+	l1Caller *batching.MultiCaller
 
 	pprofService *oppprof.Service
 	metricsSrv   *httputil.HTTPServer
@@ -120,7 +122,7 @@ func (s *Service) initWithdrawalMonitor() {
 }
 
 func (s *Service) initGameCallerCreator() {
-	s.game = extract.NewGameCallerCreator(s.metrics, batching.NewMultiCaller(s.l1Client.Client(), batching.DefaultBatchSize))
+	s.game = extract.NewGameCallerCreator(s.metrics, s.l1Caller)
 }
 
 func (s *Service) initExtractor(cfg *config.Config) {
@@ -159,10 +161,20 @@ func (s *Service) initOutputRollupClient(ctx context.Context, cfg *config.Config
 }
 
 func (s *Service) initL1Client(ctx context.Context, cfg *config.Config) error {
-	l1Client, err := dial.DialEthClientWithTimeout(ctx, dial.DefaultDialTimeout, s.logger, cfg.L1EthRpc)
+	l1RPC, err := dial.DialRPCClientWithTimeout(ctx, dial.DefaultDialTimeout, s.logger, cfg.L1EthRpc)
 	if err != nil {
 		return fmt.Errorf("failed to dial L1: %w", err)
 	}
+	s.l1RPC = rpcclient.NewBaseRPCClient(l1RPC, rpcclient.WithCallTimeout(30*time.Second))
+	s.l1Caller = batching.NewMultiCaller(s.l1RPC, batching.DefaultBatchSize)
+	// The RPC is trusted because the majority of data comes from contract calls which are not verified even when the
+	// RPC is untrusted and also avoids needing to update op-dispute-mon for L1 hard forks that change the header.
+	// Note that receipts are never fetched so the RPCKind has no actual effect.
+	clCfg := sources.L1ClientSimpleConfig(true, sources.RPCKindAny, 100)
+	l1Client, err := sources.NewL1Client(s.l1RPC, s.logger, s.metrics, clCfg)
+	if err != nil {
+		return fmt.Errorf("failed to init l1 client: %w", err)
+	}
 	s.l1Client = l1Client
 	return nil
 }
@@ -203,24 +215,18 @@ func (s *Service) initMetricsServer(cfg *opmetrics.CLIConfig) error {
 }
 
 func (s *Service) initFactoryContract(cfg *config.Config) error {
-	factoryContract := contracts.NewDisputeGameFactoryContract(s.metrics, cfg.GameFactoryAddress,
-		batching.NewMultiCaller(s.l1Client.Client(), batching.DefaultBatchSize))
+	factoryContract := contracts.NewDisputeGameFactoryContract(s.metrics, cfg.GameFactoryAddress, s.l1Caller)
 	s.factoryContract = factoryContract
 	return nil
 }
 
 func (s *Service) initMonitor(ctx context.Context, cfg *config.Config) {
-	blockHashFetcher := func(ctx context.Context, blockNumber *big.Int) (common.Hash, error) {
-		block, err := s.l1Client.BlockByNumber(ctx, blockNumber)
-		if err != nil {
-			return common.Hash{}, fmt.Errorf("failed to fetch block by number: %w", err)
-		}
-		return block.Hash(), nil
+	headBlockFetcher := func(ctx context.Context) (eth.L1BlockRef, error) {
+		return s.l1Client.L1BlockRefByLabel(ctx, "latest")
 	}
 	l2ChallengesMonitor := NewL2ChallengesMonitor(s.logger, s.metrics)
 	updateTimeMonitor := NewUpdateTimeMonitor(s.cl, s.metrics)
-	s.monitor = newGameMonitor(ctx, s.logger, s.cl, s.metrics, cfg.MonitorInterval, cfg.GameWindow, blockHashFetcher,
-		s.l1Client.BlockNumber,
+	s.monitor = newGameMonitor(ctx, s.logger, s.cl, s.metrics, cfg.MonitorInterval, cfg.GameWindow, headBlockFetcher,
 		s.extractor.Extract,
 		s.forecast.Forecast,
 		s.bonds.CheckBonds,

From 915a1a32cf17d3ba9eef6a1954e4ba6211085acc Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 25 Nov 2024 22:04:21 -0700
Subject: [PATCH 279/451] op-e2e: Build the op-program client upfront (#13095)

Now that multiple test processes are running at once, multiple threads are compiling the op-program client in the tests. This PR builds the client upfront to avoid this condition.
---
 .circleci/config.yml                 |  4 ++++
 op-e2e/system/proofs/build_helper.go | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0368861be016..1ca140e060be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -898,6 +898,10 @@ jobs:
       - checkout
       - attach_workspace:
           at: "."
+      - run:
+          name: build op-program-client
+          command: make op-program-client
+          working_directory: op-program
       - run:
           name: run tests
           no_output_timeout: <<parameters.no_output_timeout>>
diff --git a/op-e2e/system/proofs/build_helper.go b/op-e2e/system/proofs/build_helper.go
index 42201279867b..9bad76b9dcb1 100644
--- a/op-e2e/system/proofs/build_helper.go
+++ b/op-e2e/system/proofs/build_helper.go
@@ -2,7 +2,9 @@ package proofs
 
 import (
 	"context"
+	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -12,6 +14,15 @@ import (
 
 // BuildOpProgramClient builds the `op-program` client executable and returns the path to the resulting executable
 func BuildOpProgramClient(t *testing.T) string {
+	clientPath, err := filepath.Abs("../../../op-program/bin/op-program-client")
+	require.NoError(t, err)
+
+	_, err = os.Stat(clientPath)
+	if err == nil {
+		return clientPath
+	}
+	require.ErrorIs(t, err, os.ErrNotExist)
+
 	t.Log("Building op-program-client")
 	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
 	defer cancel()

From f25db964bd90116acc3c628f7b93c9359bf5edee Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 25 Nov 2024 23:04:44 -0700
Subject: [PATCH 280/451] ci: bump no output timeout (#13096)

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1ca140e060be..9d76db1d4ba9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -884,7 +884,7 @@ jobs:
       no_output_timeout:
         description: Timeout for running tests
         type: string
-        default: 5m
+        default: 10m
       environment_overrides:
         description: Environment overrides
         type: string

From 77d35a51ea0a0dc0caa50c9efb79ec2eae4bd094 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 26 Nov 2024 04:44:31 -0700
Subject: [PATCH 281/451] op-batcher: Don't log DA post failures on context
 cancel (#13089)

This was causing flakes.
---
 op-batcher/batcher/driver.go           | 6 +++++-
 op-e2e/system/altda/concurrent_test.go | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 08cf867aed43..93c1425c58bc 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -782,7 +782,11 @@ func (l *BatchSubmitter) publishToAltDAAndL1(txdata txData, queue *txmgr.Queue[t
 		// So we prefer to mimic the behavior of txmgr and cancel all pending DA/txmgr requests when the batcher is stopped.
 		comm, err := l.AltDA.SetInput(l.shutdownCtx, txdata.CallData())
 		if err != nil {
-			l.Log.Error("Failed to post input to Alt DA", "error", err)
+			// Don't log context cancelled events because they are expected,
+			// and can happen after tests complete which causes a panic.
+			if !errors.Is(err, context.Canceled) {
+				l.Log.Error("Failed to post input to Alt DA", "error", err)
+			}
 			// requeue frame if we fail to post to the DA Provider so it can be retried
 			// note: this assumes that the da server caches requests, otherwise it might lead to resubmissions of the blobs
 			l.recordFailedDARequest(txdata.ID(), err)
diff --git a/op-e2e/system/altda/concurrent_test.go b/op-e2e/system/altda/concurrent_test.go
index 32506e5c4a10..e53c7f0f811b 100644
--- a/op-e2e/system/altda/concurrent_test.go
+++ b/op-e2e/system/altda/concurrent_test.go
@@ -34,7 +34,9 @@ func TestBatcherConcurrentAltDARequests(t *testing.T) {
 	cfg.DisableBatcher = true
 	sys, err := cfg.Start(t)
 	require.NoError(t, err, "Error starting up system")
-	defer sys.Close()
+	t.Cleanup(func() {
+		sys.Close()
+	})
 
 	// make every request take 5 seconds, such that only concurrent requests will be able to make progress fast enough
 	sys.FakeAltDAServer.SetPutRequestLatency(5 * time.Second)

From 75a367fc44e296db8db6d013e5b2ec8ca3c31315 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 26 Nov 2024 04:57:54 -0700
Subject: [PATCH 282/451] op-node: Noop RemovePeer when closing (#13091)

Sometimes, disconnection events happen after the sync client is closed. This can (among other things) lead to panics in tests due to logs occurring after the test has exited. This PR makes RemovePeer a noop when `s.closingPeers == true`, which is the same functionality as `AddPeer`.
---
 op-node/p2p/sync.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op-node/p2p/sync.go b/op-node/p2p/sync.go
index c8777fe51f92..1b2cc570a2e9 100644
--- a/op-node/p2p/sync.go
+++ b/op-node/p2p/sync.go
@@ -346,6 +346,9 @@ func (s *SyncClient) AddPeer(id peer.ID) {
 func (s *SyncClient) RemovePeer(id peer.ID) {
 	s.peersLock.Lock()
 	defer s.peersLock.Unlock()
+	if s.closingPeers {
+		return
+	}
 	cancel, ok := s.peers[id]
 	if !ok {
 		s.log.Warn("cannot remove peer from sync duties, peer was not registered", "peer", id)

From b707cd8ea9cb7f7b3571131584f81c79db02c336 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Tue, 26 Nov 2024 11:59:58 +0000
Subject: [PATCH 283/451] Update dependency on superchain-registry to bring in
 Unichain Sepolia `holocene_time` (#13098)

* update superchain-registry dependency

brings in the unichain sepolia holocene_time

* update dependency on op-geth
---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index ef2c5bee53e9..7ef9af899b0f 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/crate-crypto/go-kzg-4844 v1.0.0
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
-	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241119111730-bee358f6d6e6
+	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048
 	github.com/ethereum/go-ethereum v1.14.11
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
@@ -250,7 +250,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.2-rc.2
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.3-rc.1
 
 //replace github.com/ethereum/go-ethereum => ../go-ethereum
 
diff --git a/go.sum b/go.sum
index 12ffc4994536..2d20e1e8272e 100644
--- a/go.sum
+++ b/go.sum
@@ -187,10 +187,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.2-rc.2 h1:3suWTU9DwBdY8Yy/ZgZLB/yBy3TwpntpkUn61mZgNpY=
-github.com/ethereum-optimism/op-geth v1.101411.2-rc.2/go.mod h1:dITJzx1KXsV2KusscsktidEb00blTSyFhalq8CjfsUY=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241119111730-bee358f6d6e6 h1:+AIYWDX7FeWRLnBVqPiwireTacLLGGww1slGyv+YN0o=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241119111730-bee358f6d6e6/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
+github.com/ethereum-optimism/op-geth v1.101411.3-rc.1 h1:iG5pKldU6e3FZaZJEYzG1H3RsTjARRaLF/MmVkb9JhQ=
+github.com/ethereum-optimism/op-geth v1.101411.3-rc.1/go.mod h1:zBADVb3+aon0Idb3uEg/1TFpep+Jdkz3ge9SLFDBXOo=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048 h1:kb220NeqVRRt/XP5JHt3i4zpLsYNCdWMM/0tDnOFk3o=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
 github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=

From c898ed148c2ee64a283b30e8454c419277b8dd45 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Tue, 26 Nov 2024 09:19:46 -0500
Subject: [PATCH 284/451] feat: remove _allowUpgrade flag from game impl
 setters in deploy script (#13087)

---
 .../scripts/deploy/Deploy.s.sol                | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 2cbed1c5568b..2135b69aaf25 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -456,9 +456,9 @@ contract Deploy is Deployer {
             _data: abi.encodeCall(IDelayedWETH.initialize, (msg.sender, ISuperchainConfig(superchainConfigProxy)))
         });
 
-        setAlphabetFaultGameImplementation({ _allowUpgrade: false });
-        setFastFaultGameImplementation({ _allowUpgrade: false });
-        setCannonFaultGameImplementation({ _allowUpgrade: false });
+        setAlphabetFaultGameImplementation();
+        setFastFaultGameImplementation();
+        setCannonFaultGameImplementation();
 
         transferDisputeGameFactoryOwnership();
         transferDelayedWETHOwnership();
@@ -875,7 +875,7 @@ contract Deploy is Deployer {
     }
 
     /// @notice Sets the implementation for the `CANNON` game type in the `DisputeGameFactory`
-    function setCannonFaultGameImplementation(bool _allowUpgrade) public broadcast {
+    function setCannonFaultGameImplementation() public broadcast {
         console.log("Setting Cannon FaultDisputeGame implementation");
         IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
         IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
@@ -883,7 +883,6 @@ contract Deploy is Deployer {
         // Set the Cannon FaultDisputeGame implementation in the factory.
         _setFaultGameImplementation({
             _factory: factory,
-            _allowUpgrade: _allowUpgrade,
             _params: FaultDisputeGameParams({
                 anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
                 weth: weth,
@@ -897,7 +896,7 @@ contract Deploy is Deployer {
     }
 
     /// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
-    function setAlphabetFaultGameImplementation(bool _allowUpgrade) public onlyDevnet broadcast {
+    function setAlphabetFaultGameImplementation() public onlyDevnet broadcast {
         console.log("Setting Alphabet FaultDisputeGame implementation");
         IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
         IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
@@ -905,7 +904,6 @@ contract Deploy is Deployer {
         Claim outputAbsolutePrestate = Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate()));
         _setFaultGameImplementation({
             _factory: factory,
-            _allowUpgrade: _allowUpgrade,
             _params: FaultDisputeGameParams({
                 anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
                 weth: weth,
@@ -920,7 +918,7 @@ contract Deploy is Deployer {
     }
 
     /// @notice Sets the implementation for the `ALPHABET` game type in the `DisputeGameFactory`
-    function setFastFaultGameImplementation(bool _allowUpgrade) public onlyDevnet broadcast {
+    function setFastFaultGameImplementation() public onlyDevnet broadcast {
         console.log("Setting Fast FaultDisputeGame implementation");
         IDisputeGameFactory factory = IDisputeGameFactory(mustGetAddress("DisputeGameFactoryProxy"));
         IDelayedWETH weth = IDelayedWETH(mustGetAddress("DelayedWETHProxy"));
@@ -939,7 +937,6 @@ contract Deploy is Deployer {
         );
         _setFaultGameImplementation({
             _factory: factory,
-            _allowUpgrade: _allowUpgrade,
             _params: FaultDisputeGameParams({
                 anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
                 weth: weth,
@@ -956,12 +953,11 @@ contract Deploy is Deployer {
     /// @notice Sets the implementation for the given fault game type in the `DisputeGameFactory`.
     function _setFaultGameImplementation(
         IDisputeGameFactory _factory,
-        bool _allowUpgrade,
         FaultDisputeGameParams memory _params
     )
         internal
     {
-        if (address(_factory.gameImpls(_params.gameType)) != address(0) && !_allowUpgrade) {
+        if (address(_factory.gameImpls(_params.gameType)) != address(0)) {
             console.log(
                 "[WARN] DisputeGameFactoryProxy: `FaultDisputeGame` implementation already set for game type: %s",
                 vm.toString(GameType.unwrap(_params.gameType))

From f633e8568fff16430d54871c84ad74b9242c0704 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Tue, 26 Nov 2024 10:54:07 -0500
Subject: [PATCH 285/451] feat: remove unused onlyTestnetOrDevnet modifier
 (#13086)

---
 .../contracts-bedrock/scripts/deploy/Deploy.s.sol    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 2135b69aaf25..9e688f29ae6d 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -97,18 +97,6 @@ contract Deploy is Deployer {
         }
     }
 
-    /// @notice Modifier that will only allow a function to be called on a public
-    ///         testnet or devnet.
-    modifier onlyTestnetOrDevnet() {
-        uint256 chainid = block.chainid;
-        if (
-            chainid == Chains.Goerli || chainid == Chains.Sepolia || chainid == Chains.LocalDevnet
-                || chainid == Chains.GethDevnet
-        ) {
-            _;
-        }
-    }
-
     /// @notice Modifier that wraps a function with statediff recording.
     ///         The returned AccountAccess[] array is then written to
     ///         the `snapshots/state-diff/<name>.json` output file.

From 7726c1aa49de661e13d73dcbcb5218b6af110df5 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Wed, 27 Nov 2024 01:57:38 +1000
Subject: [PATCH 286/451] op-deployer: Simplify and fix bootstrap disputegame
 (#13094)

* op-deployer: Load CLI options into the bootstrap disputegame config

* op-deployer: Simplify bootstrap disputegame to only deploy the disputegame contract
---
 .../pkg/deployer/bootstrap/delayed_weth.go    |  21 ++-
 .../deployer/bootstrap/delayed_weth_test.go   |  45 ++++++
 .../pkg/deployer/bootstrap/dispute_game.go    |  74 ++++++++--
 .../deployer/bootstrap/dispute_game_test.go   |  66 +++++++++
 op-deployer/pkg/deployer/bootstrap/flags.go   |   8 +-
 op-deployer/pkg/deployer/opcm/dispute_game.go |   8 +-
 .../pkg/deployer/opcm/dispute_game_test.go    |  15 +-
 .../scripts/deploy/DeployDisputeGame.s.sol    | 138 ++----------------
 8 files changed, 217 insertions(+), 158 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/delayed_weth_test.go
 create mode 100644 op-deployer/pkg/deployer/bootstrap/dispute_game_test.go

diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index 451b0741f245..67b1b66760a8 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -69,22 +69,31 @@ func DelayedWETHCLI(cliCtx *cli.Context) error {
 	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
 	oplog.SetGlobalLogHandler(l.Handler())
 
+	config, err := NewDelayedWETHConfigFromClI(cliCtx, l)
+	if err != nil {
+		return err
+	}
+
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+
+	return DelayedWETH(ctx, config)
+}
+
+func NewDelayedWETHConfigFromClI(cliCtx *cli.Context, l log.Logger) (DelayedWETHConfig, error) {
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
 	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
 	artifactsLocator := new(artifacts2.Locator)
 	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
-		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+		return DelayedWETHConfig{}, fmt.Errorf("failed to parse artifacts URL: %w", err)
 	}
-
-	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
-
-	return DelayedWETH(ctx, DelayedWETHConfig{
+	config := DelayedWETHConfig{
 		L1RPCUrl:         l1RPCUrl,
 		PrivateKey:       privateKey,
 		Logger:           l,
 		ArtifactsLocator: artifactsLocator,
-	})
+	}
+	return config, nil
 }
 
 func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth_test.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth_test.go
new file mode 100644
index 000000000000..5e3b667b9b2a
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth_test.go
@@ -0,0 +1,45 @@
+package bootstrap
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/cliapp"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+	"github.com/urfave/cli/v2"
+)
+
+func TestNewDelayedWETHConfigFromCLI(t *testing.T) {
+	ctx, err := parseCLIArgs(DelayedWETHFlags,
+		"--artifacts-locator", "tag://op-contracts/v1.6.0",
+		"--l1-rpc-url", "http://foo",
+		"--private-key", "0x123456")
+	require.NoError(t, err)
+
+	logger := testlog.Logger(t, log.LvlInfo)
+	cfg, err := NewDelayedWETHConfigFromClI(ctx, logger)
+	require.NoError(t, err)
+	require.Same(t, logger, cfg.Logger)
+	require.Equal(t, "op-contracts/v1.6.0", cfg.ArtifactsLocator.Tag)
+	require.True(t, cfg.ArtifactsLocator.IsTag())
+	require.Equal(t, "0x123456", cfg.PrivateKey)
+}
+
+func parseCLIArgs(flags []cli.Flag, args ...string) (*cli.Context, error) {
+	app := cli.NewApp()
+	app.Flags = cliapp.ProtectFlags(flags)
+	var ctx *cli.Context
+	app.Action = func(c *cli.Context) error {
+		ctx = c
+		return nil
+	}
+	argsWithCmd := make([]string, len(args)+1)
+	argsWithCmd[0] = "bootstrap"
+	copy(argsWithCmd[1:], args)
+	err := app.Run(argsWithCmd)
+	if err != nil {
+		return nil, err
+	}
+	return ctx, nil
+}
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
index d3efe36f9ca8..f33f51060534 100644
--- a/op-deployer/pkg/deployer/bootstrap/dispute_game.go
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -7,6 +7,9 @@ import (
 	"strings"
 
 	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/snapshots"
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 
@@ -36,9 +39,7 @@ type DisputeGameConfig struct {
 
 	privateKeyECDSA *ecdsa.PrivateKey
 
-	MinProposalSizeBytes     uint64
-	ChallengePeriodSeconds   uint64
-	MipsVersion              uint64
+	Vm                       common.Address
 	GameKind                 string
 	GameType                 uint32
 	AbsolutePrestate         common.Hash
@@ -84,22 +85,44 @@ func DisputeGameCLI(cliCtx *cli.Context) error {
 	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
 	oplog.SetGlobalLogHandler(l.Handler())
 
+	cfg, err := NewDisputeGameConfigFromCLI(cliCtx, l)
+	if err != nil {
+		return err
+	}
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+	return DisputeGame(ctx, cfg)
+}
+
+func NewDisputeGameConfigFromCLI(cliCtx *cli.Context, l log.Logger) (DisputeGameConfig, error) {
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
 	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
 	artifactsLocator := new(artifacts2.Locator)
 	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
-		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+		return DisputeGameConfig{}, fmt.Errorf("failed to parse artifacts URL: %w", err)
 	}
 
-	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
-
-	return DisputeGame(ctx, DisputeGameConfig{
+	cfg := DisputeGameConfig{
 		L1RPCUrl:         l1RPCUrl,
 		PrivateKey:       privateKey,
 		Logger:           l,
 		ArtifactsLocator: artifactsLocator,
-	})
+
+		Vm:                       common.HexToAddress(cliCtx.String(VmFlagName)),
+		GameKind:                 cliCtx.String(GameKindFlagName),
+		GameType:                 uint32(cliCtx.Uint64(GameTypeFlagName)),
+		AbsolutePrestate:         common.HexToHash(cliCtx.String(AbsolutePrestateFlagName)),
+		MaxGameDepth:             cliCtx.Uint64(MaxGameDepthFlagName),
+		SplitDepth:               cliCtx.Uint64(SplitDepthFlagName),
+		ClockExtension:           cliCtx.Uint64(ClockExtensionFlagName),
+		MaxClockDuration:         cliCtx.Uint64(MaxClockDurationFlagName),
+		DelayedWethProxy:         common.HexToAddress(cliCtx.String(DelayedWethProxyFlagName)),
+		AnchorStateRegistryProxy: common.HexToAddress(cliCtx.String(AnchorStateRegistryProxyFlagName)),
+		L2ChainId:                cliCtx.Uint64(L2ChainIdFlagName),
+		Proposer:                 common.HexToAddress(cliCtx.String(ProposerFlagName)),
+		Challenger:               common.HexToAddress(cliCtx.String(ChallengerFlagName)),
+	}
+	return cfg, nil
 }
 
 func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
@@ -175,6 +198,25 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		release = "dev"
 	}
 
+	// We need to etch the VM and PreimageOracle addresses so that they have nonzero code
+	// and the checks in the FaultDisputeGame constructor pass.
+	oracleAddr, err := loadOracleAddr(ctx, l1Client, cfg.Vm)
+	if err != nil {
+		return err
+	}
+	addresses := []common.Address{
+		cfg.Vm,
+		oracleAddr,
+	}
+	for _, addr := range addresses {
+		code, err := l1Client.CodeAt(ctx, addr, nil)
+		if err != nil {
+			return fmt.Errorf("failed to get code for %v: %w", addr, err)
+		}
+		host.ImportAccount(addr, types.Account{
+			Code: code,
+		})
+	}
 	lgr.Info("deploying dispute game", "release", release)
 
 	dgo, err := opcm.DeployDisputeGame(
@@ -182,9 +224,7 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		opcm.DeployDisputeGameInput{
 			Release:                  release,
 			StandardVersionsToml:     standardVersionsTOML,
-			MipsVersion:              cfg.MipsVersion,
-			MinProposalSizeBytes:     cfg.MinProposalSizeBytes,
-			ChallengePeriodSeconds:   cfg.ChallengePeriodSeconds,
+			VmAddress:                cfg.Vm,
 			GameKind:                 cfg.GameKind,
 			GameType:                 cfg.GameType,
 			AbsolutePrestate:         cfg.AbsolutePrestate,
@@ -214,3 +254,15 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 	}
 	return nil
 }
+
+func loadOracleAddr(ctx context.Context, l1Client *ethclient.Client, vmAddr common.Address) (common.Address, error) {
+	callData, err := snapshots.LoadMIPSABI().Pack("oracle")
+	if err != nil {
+		return common.Address{}, fmt.Errorf("failed to create vm.oracle() calldata: %w", err)
+	}
+	result, err := l1Client.CallContract(ctx, ethereum.CallMsg{Data: callData, To: &vmAddr}, nil)
+	if err != nil {
+		return common.Address{}, fmt.Errorf("failed to call vm.oracle(): %w", err)
+	}
+	return common.BytesToAddress(result), nil
+}
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game_test.go b/op-deployer/pkg/deployer/bootstrap/dispute_game_test.go
new file mode 100644
index 000000000000..e24ae3754dfe
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game_test.go
@@ -0,0 +1,66 @@
+package bootstrap
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestNewDisputeGameConfigFromCLI(t *testing.T) {
+	ctx, err := parseCLIArgs(DisputeGameFlags,
+		"--artifacts-locator", "tag://op-contracts/v1.6.0",
+		"--l1-rpc-url", "http://foo",
+		"--private-key", "0x123456",
+
+		"--game-type", "2",
+		"--delayed-weth-proxy", common.Address{0xaa}.Hex(),
+		"--anchor-state-registry-proxy", common.Address{0xbb}.Hex(),
+		"--l2-chain-id", "901",
+		"--proposer", common.Address{0xcc}.Hex(),
+		"--challenger", common.Address{0xdd}.Hex(),
+		"--vm", common.Address{0xee}.Hex(),
+	)
+	require.NoError(t, err)
+
+	logger := testlog.Logger(t, log.LvlInfo)
+	cfg, err := NewDisputeGameConfigFromCLI(ctx, logger)
+	require.NoError(t, err)
+	require.Same(t, logger, cfg.Logger)
+	require.Equal(t, "op-contracts/v1.6.0", cfg.ArtifactsLocator.Tag)
+	require.True(t, cfg.ArtifactsLocator.IsTag())
+	require.Equal(t, "0x123456", cfg.PrivateKey)
+	require.Equal(t, "FaultDisputeGame", cfg.GameKind)
+	require.Equal(t, uint32(2), cfg.GameType)
+	require.Equal(t, standard.DisputeAbsolutePrestate, cfg.AbsolutePrestate)
+	require.Equal(t, standard.DisputeMaxGameDepth, cfg.MaxGameDepth)
+	require.Equal(t, standard.DisputeSplitDepth, cfg.SplitDepth)
+	require.Equal(t, standard.DisputeClockExtension, cfg.ClockExtension)
+	require.Equal(t, standard.DisputeMaxClockDuration, cfg.MaxClockDuration)
+	require.Equal(t, common.Address{0xaa}, cfg.DelayedWethProxy)
+	require.Equal(t, common.Address{0xbb}, cfg.AnchorStateRegistryProxy)
+	require.Equal(t, common.Address{0xcc}, cfg.Proposer)
+	require.Equal(t, common.Address{0xdd}, cfg.Challenger)
+	require.Equal(t, common.Address{0xee}, cfg.Vm)
+	require.Equal(t, uint64(901), cfg.L2ChainId)
+
+	// Check all fields are set to ensure any newly added fields don't get missed.
+	cfgRef := reflect.ValueOf(cfg)
+	cfgType := reflect.TypeOf(cfg)
+	var unsetFields []string
+	for i := 0; i < cfgRef.NumField(); i++ {
+		field := cfgType.Field(i)
+		if field.Type == reflect.TypeOf(cfg.privateKeyECDSA) {
+			// privateKeyECDSA is only set when Check() is called so skip it.
+			continue
+		}
+		if cfgRef.Field(i).IsZero() {
+			unsetFields = append(unsetFields, field.Name)
+		}
+	}
+	require.Empty(t, unsetFields, "Found unset fields in config")
+}
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index 73f99e7b4325..b35e96a5f6a1 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -16,6 +16,7 @@ const (
 	ProofMaturityDelaySecondsFlagName       = "proof-maturity-delay-seconds"
 	DisputeGameFinalityDelaySecondsFlagName = "dispute-game-finality-delay-seconds"
 	MIPSVersionFlagName                     = "mips-version"
+	VmFlagName                              = "vm"
 	GameKindFlagName                        = "game-kind"
 	GameTypeFlagName                        = "game-type"
 	AbsolutePrestateFlagName                = "absolute-prestate"
@@ -73,6 +74,11 @@ var (
 		EnvVars: deployer.PrefixEnvVar("MIPS_VERSION"),
 		Value:   standard.MIPSVersion,
 	}
+	VmFlag = &cli.StringFlag{
+		Name:    VmFlagName,
+		Usage:   "VM contract address.",
+		EnvVars: deployer.PrefixEnvVar("VM"),
+	}
 	GameKindFlag = &cli.StringFlag{
 		Name:    GameKindFlagName,
 		Usage:   "Game kind (FaultDisputeGame or PermissionedDisputeGame).",
@@ -173,7 +179,7 @@ var DisputeGameFlags = []cli.Flag{
 	ArtifactsLocatorFlag,
 	MinProposalSizeBytesFlag,
 	ChallengePeriodSecondsFlag,
-	MIPSVersionFlag,
+	VmFlag,
 	GameKindFlag,
 	GameTypeFlag,
 	AbsolutePrestateFlag,
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game.go b/op-deployer/pkg/deployer/opcm/dispute_game.go
index 0e117c040d83..481a401d07db 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game.go
@@ -11,9 +11,7 @@ import (
 type DeployDisputeGameInput struct {
 	Release                  string
 	StandardVersionsToml     string
-	MipsVersion              uint64
-	MinProposalSizeBytes     uint64
-	ChallengePeriodSeconds   uint64
+	VmAddress                common.Address
 	GameKind                 string
 	GameType                 uint32
 	AbsolutePrestate         common.Hash
@@ -33,9 +31,7 @@ func (input *DeployDisputeGameInput) InputSet() bool {
 }
 
 type DeployDisputeGameOutput struct {
-	DisputeGameImpl         common.Address
-	MipsSingleton           common.Address
-	PreimageOracleSingleton common.Address
+	DisputeGameImpl common.Address
 }
 
 func (output *DeployDisputeGameOutput) CheckOutput(input common.Address) error {
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game_test.go b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
index f39849be4403..2b2d33f9efe0 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game_test.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/stretchr/testify/require"
 )
@@ -26,13 +27,15 @@ func TestDeployDisputeGame(t *testing.T) {
 
 	standardVersionsTOML, err := standard.L1VersionsDataFor(11155111)
 	require.NoError(t, err)
+	vmAddr := common.Address{'V'}
+	host.ImportAccount(vmAddr, types.Account{Code: vmCode})
+	// Address has to match the one returned by vmCode for oracle()(address)
+	host.ImportAccount(common.HexToAddress("0x92240135b46fc1142dA181f550aE8f595B858854"), types.Account{Code: oracleCode})
 
 	input := DeployDisputeGameInput{
 		Release:                  "dev",
 		StandardVersionsToml:     standardVersionsTOML,
-		MipsVersion:              1,
-		MinProposalSizeBytes:     standard.MinProposalSizeBytes,
-		ChallengePeriodSeconds:   standard.ChallengePeriodSeconds,
+		VmAddress:                vmAddr,
 		GameKind:                 "PermissionedDisputeGame",
 		GameType:                 1,
 		AbsolutePrestate:         common.Hash{'A'},
@@ -51,6 +54,8 @@ func TestDeployDisputeGame(t *testing.T) {
 	require.NoError(t, err)
 
 	require.NotEmpty(t, output.DisputeGameImpl)
-	require.NotEmpty(t, output.MipsSingleton)
-	require.NotEmpty(t, output.PreimageOracleSingleton)
 }
+
+// Code to etch so that the VM oracle() method and the oracle challengePeriod() methods work (they return immutables)
+var vmCode = common.FromHex("0x608060405234801561001057600080fd5b50600436106100415760003560e01c806354fd4d50146100465780637dc0d1d014610098578063e14ced32146100dc575b600080fd5b6100826040518060400160405280600c81526020017f312e322e312d626574612e37000000000000000000000000000000000000000081525081565b60405161008f919061269c565b60405180910390f35b60405173ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000092240135b46fc1142da181f550ae8f595b85885416815260200161008f565b6100ef6100ea366004612751565b6100fd565b60405190815260200161008f565b6000610107612612565b6080811461011457600080fd5b6040516106001461012457600080fd5b6084871461013157600080fd5b6101a4851461013f57600080fd5b8635608052602087013560a052604087013560e090811c60c09081526044890135821c82526048890135821c61010052604c890135821c610120526050890135821c61014052605489013590911c61016052605888013560f890811c610180526059890135901c6101a0819052605a89013590911c6101c05260628801906101e09060018111156101f5576040517f0136cc76000000000000000000000000000000000000000000000000000000008152600481fd5b506020810181511461020657600080fd5b60200160005b602081101561023057823560e01c825260049092019160209091019060010161020c565b5050508061012001511561024e57610246610408565b9150506103ff565b6101408101805160010167ffffffffffffffff16905260006101a4905060008060006102838560600151866000015186610559565b9250925092508163ffffffff1660001480156102a557508063ffffffff16600c145b156102bf576102b387610583565b955050505050506103ff565b63ffffffff8216603014806102da575063ffffffff82166038145b156102ea576102b385848461095d565b6000610364866040805160808101825260008082526020820181905291810182905260608101919091526040518060800160405280836060015163ffffffff168152602001836080015163ffffffff1681526020018360a0015163ffffffff1681526020018360c0015163ffffffff168152509050919050565b6040805160e0810182528281526101608901516020820152885191810191909152610524606082015263ffffffff808716608083015285811660a0830152841660c08201529091506103b581610b78565b50508752815163ffffffff9081166060808a01919091526020840151821660808a01526040840151821660a08a01528301511660c08801526103f5610408565b9750505050505050505b95945050505050565b60408051608051815260a051602082015260dc519181019190915260fc51604482015261011c51604882015261013c51604c82015261015c51605082015261017c5160548201526101805161019f5160588301526101a0516101bf5160598401526101d851605a84015260009261020092909160628301919060018111156104b5576040517f0136cc76000000000000000000000000000000000000000000000000000000008152600481fd5b60005b60208110156104dc57601c86015184526020909501946004909301926001016104b8565b506000835283830384a06000945080600181146104fc5760039550610524565b828015610514576001811461051d5760029650610522565b60009650610522565b600196505b505b50505081900390207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1660f89190911b17919050565b6000806000610569858786611001565b925050603f601a83901c8116915082165b93509350939050565b600061058d612612565b608090506000806000806105c48561016001516040810151608082015160a083015160c084015160e0909401519294919390929091565b509350935093509350600080610ffa63ffffffff168663ffffffff1603610609576105f485858960e00151611053565b63ffffffff1660e08a0152909250905061086c565b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff03363ffffffff871601610642576340000000915061086c565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefe863ffffffff871601610678576001915061086c565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffef6a63ffffffff8716016106cc57600161012088015260ff85166101008801526106bf610408565b9998505050505050505050565b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff05d63ffffffff8716016107ca5760006040518061012001604052808763ffffffff1681526020018663ffffffff1681526020018563ffffffff16815260200189602001518152602001896040015163ffffffff1681526020018b81526020017f00000000000000000000000092240135b46fc1142da181f550ae8f595b85885473ffffffffffffffffffffffffffffffffffffffff16815260200161079a6101a4600160ff16610380020190565b8152895160209091015290506107af816110e7565b50508b5263ffffffff1660408b0152909350915061086c9050565b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff05c63ffffffff87160161082f5760208701516040880151610815918791879187916105248d51611367565b63ffffffff1660408b015260208a0152909250905061086c565b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff02963ffffffff87160161086c57610866858561145d565b90925090505b60006108e6886040805160808101825260008082526020820181905291810182905260608101919091526040518060800160405280836060015163ffffffff168152602001836080015163ffffffff1681526020018360a0015163ffffffff1681526020018360c0015163ffffffff168152509050919050565b61016089015163ffffffff85811660408084019190915285821660e0909301929092526020830180518083168086526004909101831682526060808e01919091529051821660808d015291830151811660a08c0152908201511660c08a0152905061094f610408565b9a9950505050505050505050565b610160830151600090601f601585901c169082908260208110610982576109826127c5565b60200201519050601f601086901c16600061099c8761159c565b905082810163fffffffc166000610524905060006109bf8b600001518484611001565b905060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd063ffffffff8b16016109f7575080610a93565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc863ffffffff8b1601610a615760008c61016001518763ffffffff1660208110610a4357610a436127c5565b60200201519050610a558585836115b3565b8d525060019050610a93565b6040517fecf79d0d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000610b0d8d6040805160808101825260008082526020820181905291810182905260608101919091526040518060800160405280836060015163ffffffff168152602001836080015163ffffffff1681526020018360a0015163ffffffff1681526020018360c0015163ffffffff168152509050919050565b9050610b22818e610160015189856001611655565b610b5f8d82805163ffffffff9081166060808501919091526020830151821660808501526040830151821660a0850152909101511660c090910152565b610b67610408565b9d9c50505050505050505050505050565b604081015160a0820151600090819063ffffffff1660021480610ba557508360a0015163ffffffff166003145b15610bfe57608084015184516020808201519087015160a088015163f0000000909216630ffffffc600295861b161793610bf8939263ffffffff1614610bec57601f610bef565b60005b60ff168461172a565b50610ffa565b60808401516020808601516000928392601f601083901c8116939260151c16908110610c2c57610c2c6127c5565b602002015160a0880151909350819063ffffffff161580610c5757508760a0015163ffffffff16601c145b15610c985787602001518263ffffffff1660208110610c7857610c786127c5565b60200201519250600b886080015163ffffffff16901c601f169050610d77565b60208860a0015163ffffffff161015610d12578760a0015163ffffffff16600c1480610cce57508760a0015163ffffffff16600d145b80610ce357508760a0015163ffffffff16600e145b15610cf857876080015161ffff169250610d77565b610d0b886080015161ffff1660106117fd565b9250610d77565b60288860a0015163ffffffff16101580610d3657508760a0015163ffffffff166022145b80610d4b57508760a0015163ffffffff166026145b15610d775787602001518263ffffffff1660208110610d6c57610d6c6127c5565b602002015192508190505b60048860a0015163ffffffff1610158015610d9c575060088860a0015163ffffffff16105b80610db157508760a0015163ffffffff166001145b15610ddd57610dd4886000015189602001518a60a001518b608001518689611870565b50505050610ffa565b600063ffffffff9050600060208a60a0015163ffffffff1610610e4d57610e0d8a6080015161ffff1660106117fd565b8601955060008663fffffffc169050610e2f8b60400151828d60600151611001565b915060288b60a0015163ffffffff1610610e4b57809250600093505b505b6000610e698b608001518c60a001518d60c001518a8a87611ab3565b63ffffffff1690508a60a0015163ffffffff166000148015610e96575060088b60c0015163ffffffff1610155b8015610eac5750601c8b60c0015163ffffffff16105b15610fb2578a60c0015163ffffffff1660081480610ed457508a60c0015163ffffffff166009145b15610f1357610f078b600001518c602001518d60c0015163ffffffff16600814610efe5786610f01565b60005b8a61172a565b50505050505050610ffa565b8a60c0015163ffffffff16600a03610f40578a5160208c0151610f079190868a63ffffffff8b1615611655565b8a60c0015163ffffffff16600b03610f6e578a5160208c0151610f079190868a63ffffffff8b161515611655565b60108b60c0015163ffffffff1610158015610f935750601c8b60c0015163ffffffff16105b15610fb257610f078b600001518c602001518d60c001518a8a89612121565b8263ffffffff1663ffffffff14610fdc57610fd2838c60600151836115b3565b9950600198508297505b610ff28b600001518c6020015186846001611655565b505050505050505b9193909250565b60008061100f8585856123da565b90925090508061104b576040517f8e77b2b700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b509392505050565b6000808284610fff81161561106d57610fff811661100003015b8663ffffffff166000036110d95784935090810190636000000063ffffffff831611806110a557508463ffffffff168263ffffffff16105b806110bb57508563ffffffff168163ffffffff16105b156110d4575063ffffffff92506016915083905061057a565b6110dd565b8693505b5093509350939050565b610100810151608082015182516000928392918390819063ffffffff161561135e57865163ffffffff167ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffb01611318576000876020015163fffffffc169050600061115c896101000151838b60e00151611001565b60608a015190915060001a6001036111de576111d889606001518a60a0015160408051600093845233602052918152606090922091527effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001790565b60608a01525b6000808a60c0015173ffffffffffffffffffffffffffffffffffffffff1663e03110e18c606001518d608001516040518363ffffffff1660e01b815260040161123792919091825263ffffffff16602082015260400190565b6040805180830381865afa158015611253573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061127791906127f4565b60208d015160408e0151929450909250906003821660048190038481101561129d578094505b50838210156112aa578193505b8460088502610100031c9450846008828660040303021b9450600180600883600403021b036001806008878560040303021b039150811981169050858119881617965050506112fe868e60e00151876115b3565b929b5050509689019695506001945091925061135e915050565b865163ffffffff167ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd01611352578660400151955061135e565b63ffffffff9550600994505b91939550919395565b600080858563ffffffff8b1660011480611387575063ffffffff8b166002145b80611398575063ffffffff8b166004145b156113a55788935061144f565b7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa63ffffffff8c16016114435760006113e5868c63fffffffc1689611001565b90508860038c166004038b8110156113fb57809b505b8b965086900360089081029290921c7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600193880293841b0116911b1791506000905061144f565b63ffffffff9350600992505b975097509750979350505050565b60008063ffffffff83166001036114f95763ffffffff84161580611487575063ffffffff84166001145b80611498575063ffffffff84166002145b806114a9575063ffffffff84166005145b806114ba575063ffffffff84166003145b806114cb575063ffffffff84166006145b806114dc575063ffffffff84166004145b156114ea5760009150611595565b5063ffffffff90506009611595565b8263ffffffff1660030361158a5763ffffffff84161580611520575063ffffffff84166005145b80611531575063ffffffff84166003145b1561153f5760009150611595565b63ffffffff84166001148061155a575063ffffffff84166002145b8061156b575063ffffffff84166006145b8061157c575063ffffffff84166004145b156114ea5760019150611595565b5063ffffffff905060165b9250929050565b60006115ad8261ffff1660106117fd565b92915050565b60006115be83612485565b60038416156115cc57600080fd5b6020830192601f8516601c0360031b83811b913563ffffffff90911b1916178460051c60005b601b81101561164a5760208601953582821c600116801561161a576001811461162f57611640565b60008581526020839052604090209450611640565b600082815260208690526040902094505b50506001016115f2565b509095945050505050565b60208363ffffffff16106116ca576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152600e60248201527f76616c696420726567697374657200000000000000000000000000000000000060448201526064015b60405180910390fd5b63ffffffff8316158015906116dc5750805b1561170b5781848463ffffffff16602081106116fa576116fa6127c5565b63ffffffff90921660209290920201525b5050505060208101805163ffffffff8082169093526004019091169052565b836000015160040163ffffffff16846020015163ffffffff16146117aa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601260248201527f6a756d7020696e2064656c617920736c6f74000000000000000000000000000060448201526064016116c1565b835160208501805163ffffffff90811687528381169091528316156117f65780600801848463ffffffff16602081106117e5576117e56127c5565b63ffffffff90921660209290920201525b5050505050565b600063ffffffff8381167fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80850183169190911c821615159160016020869003821681901b830191861691821b92911b018261185a57600061185c565b815b90861663ffffffff16179250505092915050565b6000866000015160040163ffffffff16876020015163ffffffff16146118f2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f6272616e636820696e2064656c617920736c6f7400000000000000000000000060448201526064016116c1565b8463ffffffff166004148061190d57508463ffffffff166005145b15611984576000868463ffffffff166020811061192c5761192c6127c5565b602002015190508063ffffffff168363ffffffff1614801561195457508563ffffffff166004145b8061197c57508063ffffffff168363ffffffff161415801561197c57508563ffffffff166005145b915050611a56565b8463ffffffff166006036119a15760008260030b13159050611a56565b8463ffffffff166007036119bd5760008260030b139050611a56565b8463ffffffff16600103611a5657601f601085901c1660008190036119e65760008360030b1291505b8063ffffffff16601003611a1057875160080163ffffffff166103e08801526000600384900b1291505b8063ffffffff16600103611a295760008360030b121591505b8063ffffffff16601103611a5457875160080163ffffffff166103e08801526000600384900b121591505b505b8651602088015163ffffffff1688528115611a97576002611a7c8661ffff1660106117fd565b63ffffffff90811690911b8201600401166020890152611aa9565b60208801805160040163ffffffff1690525b5050505050505050565b600063ffffffff86161580611ae0575060088663ffffffff1610158015611ae05750600f8663ffffffff16105b15611ee0578560088114611b235760098114611b2c57600a8114611b3557600b8114611b3e57600c8114611b4757600d8114611b5057600e8114611b5957611b5e565b60209550611b5e565b60219550611b5e565b602a9550611b5e565b602b9550611b5e565b60249550611b5e565b60259550611b5e565b602695505b508463ffffffff16600003611b83575063ffffffff8216601f600688901c161b612117565b8463ffffffff16600203611ba7575063ffffffff8216601f600688901c161c612117565b8463ffffffff16600303611bdb57601f600688901c16611bd363ffffffff8516821c60208390036117fd565b915050612117565b8463ffffffff16600403611bfb575063ffffffff8216601f84161b612117565b8463ffffffff16600603611c1b575063ffffffff8216601f84161c612117565b8463ffffffff16600703611c4357601f8416611bd363ffffffff8516821c60208390036117fd565b8463ffffffff16600803611c58575082612117565b8463ffffffff16600903611c6d575082612117565b8463ffffffff16600a03611c82575082612117565b8463ffffffff16600b03611c97575082612117565b8463ffffffff16600c03611cac575082612117565b8463ffffffff16600f03611cc1575082612117565b8463ffffffff16601003611cd6575082612117565b8463ffffffff16601103611ceb575082612117565b8463ffffffff16601203611d00575082612117565b8463ffffffff16601303611d15575082612117565b8463ffffffff16601803611d2a575082612117565b8463ffffffff16601903611d3f575082612117565b8463ffffffff16601a03611d54575082612117565b8463ffffffff16601b03611d69575082612117565b8463ffffffff16602003611d805750828201612117565b8463ffffffff16602103611d975750828201612117565b8463ffffffff16602203611dae5750818303612117565b8463ffffffff16602303611dc55750818303612117565b8463ffffffff16602403611ddc5750828216612117565b8463ffffffff16602503611df35750828217612117565b8463ffffffff16602603611e0a5750828218612117565b8463ffffffff16602703611e22575082821719612117565b8463ffffffff16602a03611e51578260030b8460030b12611e44576000611e47565b60015b60ff169050612117565b8463ffffffff16602b03611e79578263ffffffff168463ffffffff1610611e44576000611e47565b6040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601360248201527f696e76616c696420696e737472756374696f6e0000000000000000000000000060448201526064016116c1565b611e79565b8563ffffffff16601c03611f60578463ffffffff16600203611f055750828202612117565b8463ffffffff1660201480611f2057508463ffffffff166021145b15611edb578463ffffffff16602003611f37579219925b60005b6380000000851615611f59576401fffffffe600195861b169401611f3a565b9050612117565b8563ffffffff16600f03611f81575065ffffffff0000601083901b16612117565b8563ffffffff16602003611f9c57611f59848360018061251e565b8563ffffffff16602103611fb857611f5984836002600161251e565b8563ffffffff16602203611fe6575063ffffffff60086003851602811681811b198416918316901b17612117565b8563ffffffff1660230361200257611f5984836004600161251e565b8563ffffffff1660240361201e57611f5984836001600061251e565b8563ffffffff1660250361203a57611f5984836002600061251e565b8563ffffffff1660260361206b575063ffffffff60086003851602601803811681811c198416918316901c17612117565b8563ffffffff1660280361208657611f598483600186612566565b8563ffffffff166029036120a157611f598483600286612566565b8563ffffffff16602a036120cf575063ffffffff60086003851602811681811c198316918416901c17612117565b8563ffffffff16602b036120ea57611f598483600486612566565b8563ffffffff16602e03611e79575063ffffffff60086003851602601803811681811b198316918416901b175b9695505050505050565b60008463ffffffff1660100361213c57506060860151612382565b8463ffffffff1660110361215b5763ffffffff84166060880152612382565b8463ffffffff1660120361217457506040860151612382565b8463ffffffff166013036121935763ffffffff84166040880152612382565b8463ffffffff166018036121c75763ffffffff600385810b9085900b02602081901c821660608a0152166040880152612382565b8463ffffffff166019036121f85763ffffffff84811681851602602081901c821660608a0152166040880152612382565b8463ffffffff16601a036122bb578260030b600003612273576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d4950533a206469766973696f6e206279207a65726f0000000000000000000060448201526064016116c1565b8260030b8460030b8161228857612288612818565b0763ffffffff166060880152600383810b9085900b816122aa576122aa612818565b0563ffffffff166040880152612382565b8463ffffffff16601b03612382578263ffffffff16600003612339576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601660248201527f4d4950533a206469766973696f6e206279207a65726f0000000000000000000060448201526064016116c1565b8263ffffffff168463ffffffff168161235457612354612818565b0663ffffffff90811660608901528381169085168161237557612375612818565b0463ffffffff1660408801525b63ffffffff8216156123b85780868363ffffffff16602081106123a7576123a76127c5565b63ffffffff90921660209290920201525b50505060208401805163ffffffff808216909652600401909416909352505050565b6000806123e683612485565b60038416156123f457600080fd5b6020830192358460051c8160005b601b81101561245a5760208701963583821c600116801561242a576001811461243f57612450565b60008481526020839052604090209350612450565b600082815260208590526040902093505b5050600101612402565b508714925050811561247c57601f8516601c0360031b81901c63ffffffff1692505b50935093915050565b36610380820181101561251a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602360248201527f636865636b207468617420746865726520697320656e6f7567682063616c6c6460448201527f617461000000000000000000000000000000000000000000000000000000000060648201526084016116c1565b5050565b60008060008061252e888761259a565b925092509250828263ffffffff168863ffffffff16901c169350841561255b5761255884826117fd565b93505b505050949350505050565b6000806000612575878661259a565b5063ffffffff868316811691811691821b9216901b1987161792505050949350505050565b600080806407fffffff8600385901b16816125b6826020612847565b63ffffffff9081161c905060006125ce600188612847565b198816600316905060006125e3886004612847565b9050888216600060036125f68385612847565b959c63ffffffff909616901b9a50949850929650505050505050565b6040805161018081018252600080825260208201819052918101829052606081018290526080810182905260a0810182905260c0810182905260e0810182905261010081018290526101208101829052610140810191909152610160810161267861267d565b905290565b6040518061040001604052806020906020820280368337509192915050565b600060208083528351808285015260005b818110156126c9578581018301518582016040015282016126ad565b818111156126db576000604083870101525b50601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016929092016040019392505050565b60008083601f84011261272157600080fd5b50813567ffffffffffffffff81111561273957600080fd5b60208301915083602082850101111561159557600080fd5b60008060008060006060868803121561276957600080fd5b853567ffffffffffffffff8082111561278157600080fd5b61278d89838a0161270f565b909750955060208801359150808211156127a657600080fd5b506127b38882890161270f565b96999598509660400135949350505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b6000806040838503121561280757600080fd5b505080516020909101519092909150565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600063ffffffff8381169083168181101561288b577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b03939250505056fea164736f6c634300080f000a")
+var oracleCode = common.FromHex("0x6080604052600436106101d85760003560e01c80639d53a64811610102578063ddcd58de11610095578063ec5efcbc11610064578063ec5efcbc14610681578063f3f480d9146106a1578063faf37bc7146106d4578063fef2b4ed146106e757600080fd5b8063ddcd58de146105d4578063e03110e11461060c578063e159261114610641578063ea7139501461066157600080fd5b8063b5e7154c116100d1578063b5e7154c14610555578063d18534b51461056c578063da35c6641461058c578063dd24f9bf146105a157600080fd5b80639d53a6481461048e5780639d7e8769146104dd578063b2e67ba8146104fd578063b4801e611461053557600080fd5b806361238bde1161017a5780637ac54767116101495780637ac54767146103ca5780638542cf50146103ea578063882856ef146104355780638dc4be111461046e57600080fd5b806361238bde1461031e5780636551927b146103565780637051472e1461038e5780637917de1d146103aa57600080fd5b80633909af5c116101b65780633909af5c146102715780634d52b4c91461029357806352f0f3ad146102a857806354fd4d50146102c857600080fd5b8063013cf08b146101dd5780630359a5631461022e5780632055b36b1461025c575b600080fd5b3480156101e957600080fd5b506101fd6101f8366004612e29565b610714565b6040805173ffffffffffffffffffffffffffffffffffffffff90931683526020830191909152015b60405180910390f35b34801561023a57600080fd5b5061024e610249366004612e6b565b610759565b604051908152602001610225565b34801561026857600080fd5b5061024e601081565b34801561027d57600080fd5b5061029161028c366004613073565b610891565b005b34801561029f57600080fd5b5061024e610ae8565b3480156102b457600080fd5b5061024e6102c336600461315f565b610b03565b3480156102d457600080fd5b506103116040518060400160405280600581526020017f312e312e3200000000000000000000000000000000000000000000000000000081525081565b60405161022591906131c6565b34801561032a57600080fd5b5061024e610339366004613217565b600160209081526000928352604080842090915290825290205481565b34801561036257600080fd5b5061024e610371366004612e6b565b601560209081526000928352604080842090915290825290205481565b34801561039a57600080fd5b5061024e6703782dace9d9000081565b3480156103b657600080fd5b506102916103c536600461327b565b610bd9565b3480156103d657600080fd5b5061024e6103e5366004612e29565b6110dc565b3480156103f657600080fd5b50610425610405366004613217565b600260209081526000928352604080842090915290825290205460ff1681565b6040519015158152602001610225565b34801561044157600080fd5b50610455610450366004613317565b6110f3565b60405167ffffffffffffffff9091168152602001610225565b34801561047a57600080fd5b5061029161048936600461334a565b61114d565b34801561049a57600080fd5b5061024e6104a9366004612e6b565b73ffffffffffffffffffffffffffffffffffffffff9091166000908152601860209081526040808320938352929052205490565b3480156104e957600080fd5b506102916104f8366004613396565b611248565b34801561050957600080fd5b5061024e610518366004612e6b565b601760209081526000928352604080842090915290825290205481565b34801561054157600080fd5b5061024e610550366004613317565b6113ff565b34801561056157600080fd5b5061024e620186a081565b34801561057857600080fd5b50610291610587366004613073565b611431565b34801561059857600080fd5b5060135461024e565b3480156105ad57600080fd5b507f000000000000000000000000000000000000000000000000000000000001ec3061024e565b3480156105e057600080fd5b5061024e6105ef366004612e6b565b601660209081526000928352604080842090915290825290205481565b34801561061857600080fd5b5061062c610627366004613217565b611840565b60408051928352602083019190915201610225565b34801561064d57600080fd5b5061029161065c36600461334a565b611931565b34801561066d57600080fd5b5061029161067c366004613422565b611a39565b34801561068d57600080fd5b5061029161069c366004613491565b611b98565b3480156106ad57600080fd5b507f000000000000000000000000000000000000000000000000000000000001518061024e565b6102916106e2366004613519565b611d1e565b3480156106f357600080fd5b5061024e610702366004612e29565b60006020819052908152604090205481565b6013818154811061072457600080fd5b60009182526020909120600290910201805460019091015473ffffffffffffffffffffffffffffffffffffffff909116915082565b73ffffffffffffffffffffffffffffffffffffffff82166000908152601560209081526040808320848452909152812054819061079c9060601c63ffffffff1690565b63ffffffff16905060005b6010811015610889578160011660010361082f5773ffffffffffffffffffffffffffffffffffffffff85166000908152601460209081526040808320878452909152902081601081106107fc576107fc613555565b01546040805160208101929092528101849052606001604051602081830303815290604052805190602001209250610870565b826003826010811061084357610843613555565b01546040805160208101939093528201526060016040516020818303038152906040528051906020012092505b60019190911c9080610881816135b3565b9150506107a7565b505092915050565b600061089d8a8a610759565b90506108c086868360208b01356108bb6108b68d6135eb565b611fea565b61202a565b80156108de57506108de83838360208801356108bb6108b68a6135eb565b610914576040517f09bde33900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b86604001358860405160200161092a91906136ba565b6040516020818303038152906040528051906020012014610977576040517f1968a90200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b83602001358760200135600161098d91906136f8565b146109c4576040517f9a3b119900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610a0c886109d28680613710565b8080601f01602080910402602001604051908101604052809392919081815260200183838082843760009201919091525061208b92505050565b610a15886121e6565b836040013588604051602001610a2b91906136ba565b6040516020818303038152906040528051906020012003610a78576040517f9843145b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff8a1660009081526015602090815260408083208c8452909152902080547fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000166001179055610adc8a8a3361298e565b50505050505050505050565b6001610af660106002613897565b610b0091906138a3565b81565b6000610b0f8686612a47565b9050610b1c8360086136f8565b82101580610b2a5750602083115b15610b61576040517ffe25498700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000602081815260c085901b82526008959095528251828252600286526040808320858452875280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660019081179091558484528752808320948352938652838220558181529384905292205592915050565b60608115610bf257610beb8686612af4565b9050610c2c565b85858080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509293505050505b3360009081526014602090815260408083208b845290915280822081516102008101928390529160109082845b815481526020019060010190808311610c5957505050505090506000601560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008b81526020019081526020016000205490506000610cda8260601c63ffffffff1690565b63ffffffff169050333214610d1b576040517fba092d1600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610d2b8260801c63ffffffff1690565b63ffffffff16600003610d6a576040517f87138d5c00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610d748260c01c90565b67ffffffffffffffff1615610db5576040517f475a253500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b898114610dee576040517f60f95d5a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610dfb89898d8886612b6d565b83516020850160888204881415608883061715610e20576307b1daf16000526004601cfd5b60405160c8810160405260005b83811015610ed0578083018051835260208101516020840152604081015160408401526060810151606084015260808101516080840152508460888301526088810460051b8b013560a883015260c882206001860195508560005b610200811015610ec5576001821615610ea55782818b0152610ec5565b8981015160009081526020938452604090209260019290921c9101610e88565b505050608801610e2d565b50505050600160106002610ee49190613897565b610eee91906138a3565b811115610f27576040517f6229572300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b610f9c610f3a8360401c63ffffffff1690565b610f4a9063ffffffff168a6136f8565b60401b7fffffffffffffffffffffffffffffffffffffffff00000000ffffffffffffffff606084901b167fffffffffffffffffffffffffffffffff0000000000000000ffffffffffffffff8516171790565b915084156110295777ffffffffffffffffffffffffffffffffffffffffffffffff82164260c01b179150610fd68260801c63ffffffff1690565b63ffffffff16610fec8360401c63ffffffff1690565b63ffffffff1614611029576040517f7b1dafd100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3360009081526014602090815260408083208e8452909152902061104f90846010612d9f565b503360008181526018602090815260408083208f8452825280832080546001810182559084528284206004820401805460039092166008026101000a67ffffffffffffffff818102199093164390931602919091179055838352601582528083208f8452909152812084905560609190911b81523690601437366014016000a05050505050505050505050565b600381601081106110ec57600080fd5b0154905081565b6018602052826000526040600020602052816000526040600020818154811061111b57600080fd5b906000526020600020906004918282040191900660080292509250509054906101000a900467ffffffffffffffff1681565b60443560008060088301861061116b5763fe2549876000526004601cfd5b60c083901b60805260888386823786600882030151915060206000858360025afa90508061119857600080fd5b50600080517effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0400000000000000000000000000000000000000000000000000000000000000178082526002602090815260408084208a8552825280842080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001660019081179091558385528252808420998452988152888320939093558152908190529490942055505050565b600080603087600037602060006030600060025afa806112705763f91129696000526004601cfd5b6000517effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f010000000000000000000000000000000000000000000000000000000000000017608081815260a08c905260c08b905260308a60e037603088609083013760008060c083600a5afa9250826112f2576309bde3396000526004601cfd5b602886106113085763fe2549876000526004601cfd5b6000602882015278200000000000000000000000000000000000000000000000008152600881018b905285810151935060308a8237603081019b909b52505060509098207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0500000000000000000000000000000000000000000000000000000000000000176000818152600260209081526040808320868452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600190811790915584845282528083209583529481528482209a909a559081528089529190912096909655505050505050565b6014602052826000526040600020602052816000526040600020816010811061142757600080fd5b0154925083915050565b73ffffffffffffffffffffffffffffffffffffffff891660009081526015602090815260408083208b845290915290205467ffffffffffffffff8116156114a4576040517fc334f06900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6114ae8160c01c90565b67ffffffffffffffff166000036114f1576040517f55d4cbf900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000001518061151c8260c01c90565b6115309067ffffffffffffffff16426138a3565b11611567576040517f55d4cbf900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60006115738b8b610759565b905061158c87878360208c01356108bb6108b68e6135eb565b80156115aa57506115aa84848360208901356108bb6108b68b6135eb565b6115e0576040517f09bde33900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8760400135896040516020016115f691906136ba565b6040516020818303038152906040528051906020012014611643576040517f1968a90200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b84602001358860200135600161165991906136f8565b14158061168b575060016116738360601c63ffffffff1690565b61167d91906138ba565b63ffffffff16856020013514155b156116c2576040517f9a3b119900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6116d0896109d28780613710565b6116d9896121e6565b60006116e48a612cc0565b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0200000000000000000000000000000000000000000000000000000000000000179050600061173b8460a01c63ffffffff1690565b67ffffffffffffffff169050600160026000848152602001908152602001600020600083815260200190815260200160002060006101000a81548160ff021916908315150217905550601760008e73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008d8152602001908152602001600020546001600084815260200190815260200160002060008381526020019081526020016000208190555061180d8460801c63ffffffff1690565b600083815260208190526040902063ffffffff9190911690556118318d8d8161298e565b50505050505050505050505050565b6000828152600260209081526040808320848452909152812054819060ff166118c9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152601460248201527f7072652d696d616765206d757374206578697374000000000000000000000000604482015260640160405180910390fd5b50600083815260208181526040909120546118e58160086136f8565b6118f08560206136f8565b1061190e57836119018260086136f8565b61190b91906138a3565b91505b506000938452600160209081526040808620948652939052919092205492909150565b60443560008060088301861061194f5763fe2549876000526004601cfd5b60c083901b6080526088838682378087017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80151908490207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f02000000000000000000000000000000000000000000000000000000000000001760008181526002602090815260408083208b8452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600190811790915584845282528083209a83529981528982209390935590815290819052959095209190915550505050565b60008060008060808860601b81528760c01b6014820152858782601c0137601c860181207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f0600000000000000000000000000000000000000000000000000000000000000179350604088026260216001603f5a021015611ac35763dd629f866000526004601cfd5b6000808783601c018c5afa94503d6001019150600882018a10611aee5763fe2549876000526004601cfd5b60c082901b81526008018481533d6000600183013e89017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8015160008481526002602090815260408083208d8452825280832080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016600190811790915587845282528083209c83529b81528b8220929092559384528390529790912096909655505050505050565b6000611ba48686610759565b9050611bbd83838360208801356108bb6108b68a6135eb565b611bf3576040517f09bde33900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b602084013515611c2f576040517f9a3b119900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b611c37612ddd565b611c45816109d28780613710565b611c4e816121e6565b846040013581604051602001611c6491906136ba565b6040516020818303038152906040528051906020012003611cb1576040517f9843145b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b73ffffffffffffffffffffffffffffffffffffffff87166000908152601560209081526040808320898452909152902080547fffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000166001179055611d1587873361298e565b50505050505050565b6703782dace9d90000341015611d60576040517fe92c469f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b333214611d99576040517fba092d1600000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b611da48160086138df565b63ffffffff168263ffffffff1610611de8576040517ffe25498700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7f000000000000000000000000000000000000000000000000000000000001ec308163ffffffff161015611e48576040517f7b1dafd100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b336000908152601560209081526040808320868452909152902054611e738160801c63ffffffff1690565b63ffffffff1615611eb0576040517f0dc149f000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b608082901b7fffffffffffffffffffffffff00000000ffffffffffffffffffffffffffffffff60a085901b167fffffffffffffffff0000000000000000ffffffffffffffffffffffffffffffff83161717336000818152601560209081526040808320898452825280832094909455835180850185528381528082018981526013805460018101825590855291517f66de8ffda797e3de9c05e8fc57b3bf0ec28a930d40b0d285d93c06501cf6a090600290930292830180547fffffffffffffffffffffffff00000000000000000000000000000000000000001673ffffffffffffffffffffffffffffffffffffffff909216919091179055517f66de8ffda797e3de9c05e8fc57b3bf0ec28a930d40b0d285d93c06501cf6a0919091015591815260168252828120968152959052909320349055505050565b600081600001518260200151836040015160405160200161200d93929190613907565b604051602081830303815290604052805190602001209050919050565b60008160005b601081101561207e578060051b880135600186831c16600181146120635760008481526020839052604090209350612074565b600082815260208590526040902093505b5050600101612030565b5090931495945050505050565b608881511461209957600080fd5b602081016020830161211a565b8260031b8201518060001a8160011a60081b178160021a60101b8260031a60181b17178160041a60201b8260051a60281b178260061a60301b8360071a60381b1717179050612114816120ff868560059190911b015190565b1867ffffffffffffffff16600586901b840152565b50505050565b612126600083836120a6565b612132600183836120a6565b61213e600283836120a6565b61214a600383836120a6565b612156600483836120a6565b612162600583836120a6565b61216e600683836120a6565b61217a600783836120a6565b612186600883836120a6565b612192600983836120a6565b61219e600a83836120a6565b6121aa600b83836120a6565b6121b6600c83836120a6565b6121c2600d83836120a6565b6121ce600e83836120a6565b6121da600f83836120a6565b612114601083836120a6565b6040805178010000000000008082800000000000808a8000000080008000602082015279808b00000000800000018000000080008081800000000000800991810191909152788a00000000000000880000000080008009000000008000000a60608201527b8000808b800000000000008b8000000000008089800000000000800360808201527f80000000000080028000000000000080000000000000800a800000008000000a60a08201527f800000008000808180000000000080800000000080000001800000008000800860c082015260009060e0016040516020818303038152906040529050602082016020820161286e565b6102808101516101e082015161014083015160a0840151845118189118186102a082015161020083015161016084015160c0850151602086015118189118186102c083015161022084015161018085015160e0860151604087015118189118186102e08401516102408501516101a0860151610100870151606088015118189118186103008501516102608601516101c0870151610120880151608089015118189118188084603f1c6123998660011b67ffffffffffffffff1690565b18188584603f1c6123b48660011b67ffffffffffffffff1690565b18188584603f1c6123cf8660011b67ffffffffffffffff1690565b181895508483603f1c6123ec8560011b67ffffffffffffffff1690565b181894508387603f1c6124098960011b67ffffffffffffffff1690565b60208b01518b51861867ffffffffffffffff168c5291189190911897508118600181901b603f9190911c18935060c08801518118601481901c602c9190911b1867ffffffffffffffff1660208901526101208801518718602c81901c60149190911b1867ffffffffffffffff1660c08901526102c08801518618600381901c603d9190911b1867ffffffffffffffff166101208901526101c08801518718601981901c60279190911b1867ffffffffffffffff166102c08901526102808801518218602e81901c60129190911b1867ffffffffffffffff166101c089015260408801518618600281901c603e9190911b1867ffffffffffffffff166102808901526101808801518618601581901c602b9190911b1867ffffffffffffffff1660408901526101a08801518518602781901c60199190911b1867ffffffffffffffff166101808901526102608801518718603881901c60089190911b1867ffffffffffffffff166101a08901526102e08801518518600881901c60389190911b1867ffffffffffffffff166102608901526101e08801518218601781901c60299190911b1867ffffffffffffffff166102e089015260808801518718602581901c601b9190911b1867ffffffffffffffff166101e08901526103008801518718603281901c600e9190911b1867ffffffffffffffff1660808901526102a08801518118603e81901c60029190911b1867ffffffffffffffff166103008901526101008801518518600981901c60379190911b1867ffffffffffffffff166102a08901526102008801518118601381901c602d9190911b1867ffffffffffffffff1661010089015260a08801518218601c81901c60249190911b1867ffffffffffffffff1661020089015260608801518518602481901c601c9190911b1867ffffffffffffffff1660a08901526102408801518518602b81901c60159190911b1867ffffffffffffffff1660608901526102208801518618603181901c600f9190911b1867ffffffffffffffff166102408901526101608801518118603681901c600a9190911b1867ffffffffffffffff166102208901525060e08701518518603a81901c60069190911b1867ffffffffffffffff166101608801526101408701518118603d81901c60039190911b1867ffffffffffffffff1660e0880152505067ffffffffffffffff81166101408601525b5050505050565b600582811b8201805160018501831b8401805160028701851b8601805160038901871b8801805160048b0190981b8901805167ffffffffffffffff861985168918811690995283198a16861889169096528819861683188816909352841986168818871690528419831684189095169052919391929190611d15565b612808600082612781565b612813600582612781565b61281e600a82612781565b612829600f82612781565b612834601482612781565b50565b612840816122dc565b612849816127fd565b600383901b820151815160c09190911c9061211490821867ffffffffffffffff168352565b61287a60008284612837565b61288660018284612837565b61289260028284612837565b61289e60038284612837565b6128aa60048284612837565b6128b660058284612837565b6128c260068284612837565b6128ce60078284612837565b6128da60088284612837565b6128e660098284612837565b6128f2600a8284612837565b6128fe600b8284612837565b61290a600c8284612837565b612916600d8284612837565b612922600e8284612837565b61292e600f8284612837565b61293a60108284612837565b61294660118284612837565b61295260128284612837565b61295e60138284612837565b61296a60148284612837565b61297660158284612837565b61298260168284612837565b61211460178284612837565b73ffffffffffffffffffffffffffffffffffffffff83811660009081526016602090815260408083208684529091528082208054908390559051909284169083908381818185875af1925050503d8060008114612a07576040519150601f19603f3d011682016040523d82523d6000602084013e612a0c565b606091505b505090508061277a576040517f83e6cc6b00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b7f01000000000000000000000000000000000000000000000000000000000000007effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff831617612aed818360408051600093845233602052918152606090922091527effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001790565b9392505050565b6060604051905081602082018181018286833760888306808015612b3d5760888290038501848101848103803687375060806001820353506001845160001a1784538652612b54565b608836843760018353608060878401536088850186525b5050505050601f19603f82510116810160405292915050565b6000612b7f8260a01c63ffffffff1690565b67ffffffffffffffff1690506000612b9d8360801c63ffffffff1690565b63ffffffff1690506000612bb78460401c63ffffffff1690565b63ffffffff169050600883108015612bcd575080155b15612c015760c082901b6000908152883560085283513382526017602090815260408084208a855290915290912055612cb6565b60088310158015612c1f575080612c196008856138a3565b93508310155b8015612c335750612c3087826136f8565b83105b15612cb6576000612c4482856138a3565b905087612c528260206136f8565b10158015612c5e575085155b15612c95576040517ffe25498700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b3360009081526017602090815260408083208a845290915290209089013590555b5050505050505050565b6000612d43565b66ff00ff00ff00ff8160081c1667ff00ff00ff00ff00612cf18360081b67ffffffffffffffff1690565b1617905065ffff0000ffff8160101c1667ffff0000ffff0000612d1e8360101b67ffffffffffffffff1690565b1617905060008160201c612d3c8360201b67ffffffffffffffff1690565b1792915050565b60808201516020830190612d5b90612cc7565b612cc7565b6040820151612d6990612cc7565b60401b17612d81612d5660018460059190911b015190565b825160809190911b90612d9390612cc7565b60c01b17179392505050565b8260108101928215612dcd579160200282015b82811115612dcd578251825591602001919060010190612db2565b50612dd9929150612df5565b5090565b6040518060200160405280612df0612e0a565b905290565b5b80821115612dd95760008155600101612df6565b6040518061032001604052806019906020820280368337509192915050565b600060208284031215612e3b57600080fd5b5035919050565b803573ffffffffffffffffffffffffffffffffffffffff81168114612e6657600080fd5b919050565b60008060408385031215612e7e57600080fd5b612e8783612e42565b946020939093013593505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b604051610320810167ffffffffffffffff81118282101715612ee857612ee8612e95565b60405290565b6040516060810167ffffffffffffffff81118282101715612ee857612ee8612e95565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe016810167ffffffffffffffff81118282101715612f5857612f58612e95565b604052919050565b803567ffffffffffffffff81168114612e6657600080fd5b6000610320808385031215612f8c57600080fd5b604051602080820182811067ffffffffffffffff82111715612fb057612fb0612e95565b806040525081935085601f860112612fc757600080fd5b612fcf612ec4565b928501928087851115612fe157600080fd5b865b8581101561300157612ff481612f60565b8352918301918301612fe3565b509092525091949350505050565b60006060828403121561302157600080fd5b50919050565b60008083601f84011261303957600080fd5b50813567ffffffffffffffff81111561305157600080fd5b6020830191508360208260051b850101111561306c57600080fd5b9250929050565b60008060008060008060008060006103e08a8c03121561309257600080fd5b61309b8a612e42565b985060208a013597506130b18b60408c01612f78565b96506103608a013567ffffffffffffffff808211156130cf57600080fd5b6130db8d838e0161300f565b97506103808c01359150808211156130f257600080fd5b6130fe8d838e01613027565b90975095506103a08c013591508082111561311857600080fd5b6131248d838e0161300f565b94506103c08c013591508082111561313b57600080fd5b506131488c828d01613027565b915080935050809150509295985092959850929598565b600080600080600060a0868803121561317757600080fd5b505083359560208501359550604085013594606081013594506080013592509050565b60005b838110156131b557818101518382015260200161319d565b838111156121145750506000910152565b60208152600082518060208401526131e581604085016020870161319a565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000806040838503121561322a57600080fd5b50508035926020909101359150565b60008083601f84011261324b57600080fd5b50813567ffffffffffffffff81111561326357600080fd5b60208301915083602082850101111561306c57600080fd5b600080600080600080600060a0888a03121561329657600080fd5b8735965060208801359550604088013567ffffffffffffffff808211156132bc57600080fd5b6132c88b838c01613239565b909750955060608a01359150808211156132e157600080fd5b506132ee8a828b01613027565b9094509250506080880135801515811461330757600080fd5b8091505092959891949750929550565b60008060006060848603121561332c57600080fd5b61333584612e42565b95602085013595506040909401359392505050565b60008060006040848603121561335f57600080fd5b83359250602084013567ffffffffffffffff81111561337d57600080fd5b61338986828701613239565b9497909650939450505050565b600080600080600080600060a0888a0312156133b157600080fd5b8735965060208801359550604088013567ffffffffffffffff808211156133d757600080fd5b6133e38b838c01613239565b909750955060608a01359150808211156133fc57600080fd5b506134098a828b01613239565b989b979a50959894979596608090950135949350505050565b60008060008060006080868803121561343a57600080fd5b8535945061344a60208701612e42565b935061345860408701612f60565b9250606086013567ffffffffffffffff81111561347457600080fd5b61348088828901613239565b969995985093965092949392505050565b6000806000806000608086880312156134a957600080fd5b6134b286612e42565b945060208601359350604086013567ffffffffffffffff808211156134d657600080fd5b6134e289838a0161300f565b945060608801359150808211156134f857600080fd5b5061348088828901613027565b803563ffffffff81168114612e6657600080fd5b60008060006060848603121561352e57600080fd5b8335925061353e60208501613505565b915061354c60408501613505565b90509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036135e4576135e4613584565b5060010190565b6000606082360312156135fd57600080fd5b613605612eee565b823567ffffffffffffffff8082111561361d57600080fd5b9084019036601f83011261363057600080fd5b813560208282111561364457613644612e95565b613674817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f85011601612f11565b9250818352368183860101111561368a57600080fd5b81818501828501376000918301810191909152908352848101359083015250604092830135928101929092525090565b81516103208201908260005b60198110156136ef57825167ffffffffffffffff168252602092830192909101906001016136c6565b50505092915050565b6000821982111561370b5761370b613584565b500190565b60008083357fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe184360301811261374557600080fd5b83018035915067ffffffffffffffff82111561376057600080fd5b60200191503681900382131561306c57600080fd5b600181815b808511156137ce57817fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff048211156137b4576137b4613584565b808516156137c157918102915b93841c939080029061377a565b509250929050565b6000826137e557506001613891565b816137f257506000613891565b816001811461380857600281146138125761382e565b6001915050613891565b60ff84111561382357613823613584565b50506001821b613891565b5060208310610133831016604e8410600b8410161715613851575081810a613891565b61385b8383613775565b807fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0482111561388d5761388d613584565b0290505b92915050565b6000612aed83836137d6565b6000828210156138b5576138b5613584565b500390565b600063ffffffff838116908316818110156138d7576138d7613584565b039392505050565b600063ffffffff8083168185168083038211156138fe576138fe613584565b01949350505050565b6000845161391981846020890161319a565b9190910192835250602082015260400191905056fea164736f6c634300080f000a")
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
index c128260a21da..153e4b65fdb4 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
@@ -18,8 +18,6 @@ import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDi
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
 
 /// @title DeployDisputeGameInput
 contract DeployDisputeGameInput is BaseDeployIO {
@@ -27,13 +25,6 @@ contract DeployDisputeGameInput is BaseDeployIO {
     string internal _release;
     string internal _standardVersionsToml;
 
-    // Specify which MIPS version to use.
-    uint256 internal _mipsVersion;
-
-    // All inputs required to deploy PreimageOracle.
-    uint256 internal _minProposalSizeBytes;
-    uint256 internal _challengePeriodSeconds;
-
     // Specify which game kind is being deployed here.
     string internal _gameKind;
 
@@ -46,6 +37,7 @@ contract DeployDisputeGameInput is BaseDeployIO {
     uint256 internal _maxClockDuration;
     IDelayedWETH internal _delayedWethProxy;
     IAnchorStateRegistry internal _anchorStateRegistryProxy;
+    IBigStepper internal _vm;
     uint256 internal _l2ChainId;
 
     // Additional inputs required to deploy PermissionedDisputeGame.
@@ -53,16 +45,7 @@ contract DeployDisputeGameInput is BaseDeployIO {
     address internal _challenger;
 
     function set(bytes4 _sel, uint256 _value) public {
-        if (_sel == this.mipsVersion.selector) {
-            require(_value == 1 || _value == 2, "DeployDisputeGame: unknown mips version");
-            _mipsVersion = _value;
-        } else if (_sel == this.minProposalSizeBytes.selector) {
-            require(_value != 0, "DeployDisputeGame: minProposalSizeBytes cannot be zero");
-            _minProposalSizeBytes = _value;
-        } else if (_sel == this.challengePeriodSeconds.selector) {
-            require(_value != 0, "DeployDisputeGame: challengePeriodSeconds cannot be zero");
-            _challengePeriodSeconds = _value;
-        } else if (_sel == this.gameType.selector) {
+        if (_sel == this.gameType.selector) {
             require(_value <= type(uint32).max, "DeployDisputeGame: gameType must fit inside uint32");
             _gameType = _value;
         } else if (_sel == this.maxGameDepth.selector) {
@@ -88,7 +71,9 @@ contract DeployDisputeGameInput is BaseDeployIO {
     }
 
     function set(bytes4 _sel, address _value) public {
-        if (_sel == this.delayedWethProxy.selector) {
+        if (_sel == this.vmAddress.selector) {
+            _vm = IBigStepper(_value);
+        } else if (_sel == this.delayedWethProxy.selector) {
             require(_value != address(0), "DeployDisputeGame: delayedWethProxy cannot be zero address");
             _delayedWethProxy = IDelayedWETH(payable(_value));
         } else if (_sel == this.anchorStateRegistryProxy.selector) {
@@ -133,20 +118,8 @@ contract DeployDisputeGameInput is BaseDeployIO {
         return _standardVersionsToml;
     }
 
-    function mipsVersion() public view returns (uint256) {
-        require(_mipsVersion != 0, "DeployDisputeGame: mipsVersion not set");
-        require(_mipsVersion == 1 || _mipsVersion == 2, "DeployDisputeGame: unknown mips version");
-        return _mipsVersion;
-    }
-
-    function minProposalSizeBytes() public view returns (uint256) {
-        require(_minProposalSizeBytes != 0, "DeployDisputeGame: minProposalSizeBytes not set");
-        return _minProposalSizeBytes;
-    }
-
-    function challengePeriodSeconds() public view returns (uint256) {
-        require(_challengePeriodSeconds != 0, "DeployDisputeGame: challengePeriodSeconds not set");
-        return _challengePeriodSeconds;
+    function vmAddress() public view returns (IBigStepper) {
+        return _vm;
     }
 
     function gameKind() public view returns (string memory) {
@@ -228,65 +201,30 @@ contract DeployDisputeGameOutput is BaseDeployIO {
     // PermissionedDisputeGame is used as the type here because it has all of the same functions as
     // FaultDisputeGame but with the added proposer and challenger fields.
     IPermissionedDisputeGame internal _disputeGameImpl;
-    IMIPS internal _mipsSingleton;
-    IPreimageOracle internal _preimageOracleSingleton;
 
     function set(bytes4 _sel, address _value) public {
         if (_sel == this.disputeGameImpl.selector) {
             require(_value != address(0), "DeployDisputeGame: disputeGameImpl cannot be zero address");
             _disputeGameImpl = IPermissionedDisputeGame(_value);
-        } else if (_sel == this.mipsSingleton.selector) {
-            require(_value != address(0), "DeployDisputeGame: mipsSingleton cannot be zero address");
-            _mipsSingleton = IMIPS(_value);
-        } else if (_sel == this.preimageOracleSingleton.selector) {
-            require(_value != address(0), "DeployDisputeGame: preimageOracleSingleton cannot be zero address");
-            _preimageOracleSingleton = IPreimageOracle(_value);
         } else {
             revert("DeployDisputeGame: unknown selector");
         }
     }
 
     function checkOutput(DeployDisputeGameInput _dgi) public view {
-        DeployUtils.assertValidContractAddress(address(_preimageOracleSingleton));
-        DeployUtils.assertValidContractAddress(address(_mipsSingleton));
         DeployUtils.assertValidContractAddress(address(_disputeGameImpl));
         assertValidDeploy(_dgi);
     }
 
-    function preimageOracleSingleton() public view returns (IPreimageOracle) {
-        DeployUtils.assertValidContractAddress(address(_preimageOracleSingleton));
-        return _preimageOracleSingleton;
-    }
-
-    function mipsSingleton() public view returns (IMIPS) {
-        DeployUtils.assertValidContractAddress(address(_mipsSingleton));
-        return _mipsSingleton;
-    }
-
     function disputeGameImpl() public view returns (IPermissionedDisputeGame) {
         DeployUtils.assertValidContractAddress(address(_disputeGameImpl));
         return _disputeGameImpl;
     }
 
     function assertValidDeploy(DeployDisputeGameInput _dgi) public view {
-        assertValidPreimageOracleSingleton(_dgi);
-        assertValidMipsSingleton(_dgi);
         assertValidDisputeGameImpl(_dgi);
     }
 
-    function assertValidPreimageOracleSingleton(DeployDisputeGameInput _dgi) internal view {
-        IPreimageOracle oracle = preimageOracleSingleton();
-
-        require(oracle.minProposalSize() == _dgi.minProposalSizeBytes(), "PO-10");
-        require(oracle.challengePeriod() == _dgi.challengePeriodSeconds(), "PO-20");
-    }
-
-    function assertValidMipsSingleton(DeployDisputeGameInput) internal view {
-        IMIPS mips = mipsSingleton();
-
-        require(address(mips.oracle()) == address(preimageOracleSingleton()), "MIPS-10");
-    }
-
     function assertValidDisputeGameImpl(DeployDisputeGameInput _dgi) internal view {
         IPermissionedDisputeGame game = disputeGameImpl();
 
@@ -295,7 +233,7 @@ contract DeployDisputeGameOutput is BaseDeployIO {
         require(game.splitDepth() == _dgi.splitDepth(), "DG-30");
         require(game.clockExtension().raw() == uint64(_dgi.clockExtension()), "DG-40");
         require(game.maxClockDuration().raw() == uint64(_dgi.maxClockDuration()), "DG-50");
-        require(game.vm() == IBigStepper(address(mipsSingleton())), "DG-60");
+        require(game.vm() == _dgi.vmAddress(), "DG-60");
         require(game.weth() == _dgi.delayedWethProxy(), "DG-70");
         require(game.anchorStateRegistry() == _dgi.anchorStateRegistryProxy(), "DG-80");
         require(game.l2ChainId() == _dgi.l2ChainId(), "DG-90");
@@ -326,68 +264,10 @@ contract DeployDisputeGame is Script {
     }
 
     function run(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) public {
-        deployPreimageOracleSingleton(_dgi, _dgo);
-        deployMipsSingleton(_dgi, _dgo);
         deployDisputeGameImpl(_dgi, _dgo);
         _dgo.checkOutput(_dgi);
     }
 
-    function deployPreimageOracleSingleton(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) internal {
-        string memory release = _dgi.release();
-        string memory stdVerToml = _dgi.standardVersionsToml();
-        string memory contractName = "preimage_oracle";
-        IPreimageOracle singleton;
-
-        address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
-        if (existingImplementation != address(0)) {
-            singleton = IPreimageOracle(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
-            uint256 minProposalSizeBytes = _dgi.minProposalSizeBytes();
-            uint256 challengePeriodSeconds = _dgi.challengePeriodSeconds();
-            vm.broadcast(msg.sender);
-            singleton = IPreimageOracle(
-                DeployUtils.create1({
-                    _name: "PreimageOracle",
-                    _args: DeployUtils.encodeConstructor(
-                        abi.encodeCall(IPreimageOracle.__constructor__, (minProposalSizeBytes, challengePeriodSeconds))
-                    )
-                })
-            );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
-        }
-
-        vm.label(address(singleton), "PreimageOracleSingleton");
-        _dgo.set(_dgo.preimageOracleSingleton.selector, address(singleton));
-    }
-
-    function deployMipsSingleton(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) internal {
-        string memory release = _dgi.release();
-        string memory stdVerToml = _dgi.standardVersionsToml();
-        string memory contractName = "mips";
-        IMIPS singleton;
-
-        address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
-        if (existingImplementation != address(0)) {
-            singleton = IMIPS(payable(existingImplementation));
-        } else if (isDevelopRelease(release)) {
-            uint256 mipsVersion = _dgi.mipsVersion();
-            IPreimageOracle preimageOracle = IPreimageOracle(address(_dgo.preimageOracleSingleton()));
-            vm.broadcast(msg.sender);
-            singleton = IMIPS(
-                DeployUtils.create1({
-                    _name: mipsVersion == 1 ? "MIPS" : "MIPS64",
-                    _args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS.__constructor__, (preimageOracle)))
-                })
-            );
-        } else {
-            revert(string.concat("DeployImplementations: failed to deploy release ", release));
-        }
-
-        vm.label(address(singleton), "MIPSSingleton");
-        _dgo.set(_dgo.mipsSingleton.selector, address(singleton));
-    }
-
     function deployDisputeGameImpl(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) internal {
         // Shove the arguments into a struct to avoid stack-too-deep errors.
         DisputeGameConstructorArgs memory args = DisputeGameConstructorArgs({
@@ -397,7 +277,7 @@ contract DeployDisputeGame is Script {
             splitDepth: _dgi.splitDepth(),
             clockExtension: Duration.wrap(uint64(_dgi.clockExtension())),
             maxClockDuration: Duration.wrap(uint64(_dgi.maxClockDuration())),
-            gameVm: IBigStepper(address(_dgo.mipsSingleton())),
+            gameVm: IBigStepper(address(_dgi.vmAddress())),
             delayedWethProxy: _dgi.delayedWethProxy(),
             anchorStateRegistryProxy: _dgi.anchorStateRegistryProxy(),
             l2ChainId: _dgi.l2ChainId(),

From 4f8e9b519c9d10535d438cfe617f3f014df12d01 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 26 Nov 2024 08:59:41 -0700
Subject: [PATCH 287/451] ci: Tweak test timeouts (#13097)

---
 .circleci/config.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d76db1d4ba9..2cc977adffd2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -882,6 +882,10 @@ jobs:
         type: string
         default: ethereum-optimism/latitude-1-go-e2e
       no_output_timeout:
+        description: Timeout for when CircleCI kills the job if there's no output
+        type: string
+        default: 60m
+      test_timeout:
         description: Timeout for running tests
         type: string
         default: 10m
@@ -932,7 +936,7 @@ jobs:
               --jsonfile=./tmp/testlogs/log.json \
               --rerun-fails=2 \
               --packages="$formatted_packages" \
-              -- -coverprofile=coverage.out -timeout=60m
+              -- -coverprofile=coverage.out -timeout=<<parameters.test_timeout>>
       - codecov/upload:
           disable_search: true
           files: ./coverage.out
@@ -1594,7 +1598,8 @@ workflows:
           name: op-e2e-cannon-tests
           notify: true
           mentions: "@proofs-team"
-          no_output_timeout: 20m
+          no_output_timeout: 60m
+          test_timeout: 59m
           resource_class: ethereum-optimism/latitude-fps-1
           environment_overrides: |
             export OP_E2E_CANNON_ENABLED="true"

From 9200bff0f39fb6034ca6a27a2d57da80c87ef1f4 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Tue, 26 Nov 2024 12:58:32 -0500
Subject: [PATCH 288/451] fix: restore asterisc bytecode, vendor (#13104)

Restores the correct asterisc RISCV bytecode, moves the contract
to the vendor folder, and changes CI so that it performs the check
on the asterisc bytecode when attempting to merge into develop.
---
 .circleci/config.yml                               | 14 ++------------
 .../contracts-bedrock/snapshots/semver-lock.json   |  8 ++++----
 .../src/{ => vendor}/asterisc/RISCV.sol            |  6 ++----
 3 files changed, 8 insertions(+), 20 deletions(-)
 rename packages/contracts-bedrock/src/{ => vendor}/asterisc/RISCV.sol (99%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2cc977adffd2..1467e9e24bf2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -258,7 +258,7 @@ jobs:
           command: |
             # Clone asterisc @ the pinned version to fetch remote `RISCV.sol`
             ASTERISC_REV="$(cat ../../versions.json | jq -r .asterisc)"
-            REMOTE_ASTERISC_PATH="./src/asterisc/RISCV_Remote.sol"
+            REMOTE_ASTERISC_PATH="./src/vendor/asterisc/RISCV_Remote.sol"
             git clone https://github.com/ethereum-optimism/asterisc \
               -b $ASTERISC_REV && \
               cp ./asterisc/rvsol/src/RISCV.sol $REMOTE_ASTERISC_PATH
@@ -1324,6 +1324,7 @@ workflows:
       - contracts-bedrock-checks:
           requires:
             - contracts-bedrock-build
+      - diff-asterisc-bytecode
       - semgrep-scan:
           name: semgrep-scan-local
           scan_command: semgrep scan --timeout=100 --config .semgrep/rules/ --error .
@@ -1693,17 +1694,6 @@ workflows:
             - oplabs-gcr
             - slack
 
-  scheduled-diff-asterisc-bytecode:
-    when:
-      or:
-        - equal: [build_daily, <<pipeline.schedule.name>>]
-        # Trigger on manual triggers if explicitly requested
-        - equal: [true, <<pipeline.parameters.diff_asterisc_bytecode_dispatch>>]
-    jobs:
-      - diff-asterisc-bytecode:
-          context:
-            - slack
-
   scheduled-preimage-reproducibility:
     when:
       or:
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index c387881a61f2..bfbae2fe97d8 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -135,10 +135,6 @@
     "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
     "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
-  "src/asterisc/RISCV.sol": {
-    "initCodeHash": "0x8d47aa0b81d7fe6bd0aeac18f26d7c0b285f58740bb9d92dac0ddf706c85309f",
-    "sourceCodeHash": "0xaebcda0a16da65fc7833672073ea6872c40d1ba722f0a6515c4a293e380f96c6"
-  },
   "src/cannon/MIPS.sol": {
     "initCodeHash": "0xb4aec227019dacd6194d6aeb9ca68c23c60b95618d18a4ebc09243514aeb1f05",
     "sourceCodeHash": "0x4d43b3f2918486aa76d2d59ac42e4f6aa2f58538c7e95a5cb99b63c9588b5f1c"
@@ -215,6 +211,10 @@
     "initCodeHash": "0x049f3c86965e575a370b14f7f49f3f15436ffb5ee1059615bb708659d7aae7de",
     "sourceCodeHash": "0x5dc6b0b4ae4ab29085c52f74a4498d8a3d04928b844491749cd7186623e8b967"
   },
+  "src/vendor/asterisc/RISCV.sol": {
+    "initCodeHash": "0x6b4323061187f2c8efe8de43bf1ecdc0798e2d95ad69470ed4151dadc094fedf",
+    "sourceCodeHash": "0x26cae049cf171efcc84c946a400704c30ebec5dba4f1548d1f1529f68f56c1ec"
+  },
   "src/vendor/eas/EAS.sol": {
     "initCodeHash": "0xf96d1ebc530ed95e2dffebcfa2b4a1f18103235e6352d97838b77b7a2c14567b",
     "sourceCodeHash": "0xbeca762929db37f1c7a2067e136c616f563ca18e85871ad7ae2d3ff55a16e6cb"
diff --git a/packages/contracts-bedrock/src/asterisc/RISCV.sol b/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
similarity index 99%
rename from packages/contracts-bedrock/src/asterisc/RISCV.sol
rename to packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
index 50afd85fe6c0..09fa93a0fcdb 100644
--- a/packages/contracts-bedrock/src/asterisc/RISCV.sol
+++ b/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-// Interfaces
 import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 
@@ -9,15 +8,14 @@ import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 /// @notice The RISCV contract emulates a single RISCV hart cycle statelessly, using memory proofs to verify the
 ///         instruction and optional memory access' inclusion in the memory merkle root provided in the trusted
 ///         prestate witness.
-///         This contract has been vendorized from the Asterisc project. The original source code can be found at
 /// @dev https://github.com/ethereum-optimism/asterisc
 contract RISCV is IBigStepper {
     /// @notice The preimage oracle contract.
     IPreimageOracle public oracle;
 
     /// @notice The version of the contract.
-    /// @custom:semver 1.1.0-rc.3
-    string public constant version = "1.1.0-rc.3";
+    /// @custom:semver 1.1.0-rc.2
+    string public constant version = "1.1.0-rc.2";
 
     /// @param _oracle The preimage oracle contract.
     constructor(IPreimageOracle _oracle) {

From 51a036d2eca82ad947f4446733cffe12b55e96f4 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 26 Nov 2024 11:27:21 -0700
Subject: [PATCH 289/451] op-node: Fix panic after closing P2P (#13106)

When the op-node is closed, it also closes the P2P node. To prevent future usage, `n.p2pNode` is set to `nil`. However, the AsyncGossiper can still sometimes send gossip messages to the `OpNode` struct after close. Since `n.p2pNode` is `nil` at this point, the node would panic. This PR updates the `OpNode` implementation to check for this case. Access is protected via a mutex to prevent concurrency problems.
---
 op-node/node/node.go | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/op-node/node/node.go b/op-node/node/node.go
index 2727552b8190..8bf8040b465c 100644
--- a/op-node/node/node.go
+++ b/op-node/node/node.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	gosync "sync"
 	"sync/atomic"
 	"time"
 
@@ -60,6 +61,7 @@ type OpNode struct {
 	l2Source  *sources.EngineClient // L2 Execution Engine RPC bindings
 	server    *rpcServer            // RPC server hosting the rollup-node API
 	p2pNode   *p2p.NodeP2P          // P2P node functionality
+	p2pMu     gosync.Mutex          // protects p2pNode
 	p2pSigner p2p.Signer            // p2p gossip application messages will be signed with this signer
 	tracer    Tracer                // tracer to get events for testing/debugging
 	runCfg    *RuntimeConfig        // runtime configurables
@@ -434,8 +436,9 @@ func (n *OpNode) initRPCServer(cfg *Config) error {
 	if err != nil {
 		return err
 	}
-	if n.p2pEnabled() {
-		server.EnableP2P(p2p.NewP2PAPIBackend(n.p2pNode, n.log, n.metrics))
+
+	if p2pNode := n.getP2PNodeIfEnabled(); p2pNode != nil {
+		server.EnableP2P(p2p.NewP2PAPIBackend(p2pNode, n.log, n.metrics))
 	}
 	if cfg.RPC.EnableAdmin {
 		server.EnableAdminAPI(NewAdminAPI(n.l2Driver, n.metrics, n.log))
@@ -487,6 +490,8 @@ func (n *OpNode) p2pEnabled() bool {
 }
 
 func (n *OpNode) initP2P(cfg *Config) (err error) {
+	n.p2pMu.Lock()
+	defer n.p2pMu.Unlock()
 	if n.p2pNode != nil {
 		panic("p2p node already initialized")
 	}
@@ -580,13 +585,13 @@ func (n *OpNode) PublishL2Payload(ctx context.Context, envelope *eth.ExecutionPa
 	n.tracer.OnPublishL2Payload(ctx, envelope)
 
 	// publish to p2p, if we are running p2p at all
-	if n.p2pEnabled() {
+	if p2pNode := n.getP2PNodeIfEnabled(); p2pNode != nil {
 		payload := envelope.ExecutionPayload
 		if n.p2pSigner == nil {
 			return fmt.Errorf("node has no p2p signer, payload %s cannot be published", payload.ID())
 		}
 		n.log.Info("Publishing signed execution payload on p2p", "id", payload.ID())
-		return n.p2pNode.GossipOut().PublishL2Payload(ctx, envelope, n.p2pSigner)
+		return p2pNode.GossipOut().PublishL2Payload(ctx, envelope, n.p2pSigner)
 	}
 	// if p2p is not enabled then we just don't publish the payload
 	return nil
@@ -594,7 +599,7 @@ func (n *OpNode) PublishL2Payload(ctx context.Context, envelope *eth.ExecutionPa
 
 func (n *OpNode) OnUnsafeL2Payload(ctx context.Context, from peer.ID, envelope *eth.ExecutionPayloadEnvelope) error {
 	// ignore if it's from ourselves
-	if n.p2pEnabled() && from == n.p2pNode.Host().ID() {
+	if p2pNode := n.getP2PNodeIfEnabled(); p2pNode != nil && from == p2pNode.Host().ID() {
 		return nil
 	}
 
@@ -615,7 +620,7 @@ func (n *OpNode) OnUnsafeL2Payload(ctx context.Context, from peer.ID, envelope *
 }
 
 func (n *OpNode) RequestL2Range(ctx context.Context, start, end eth.L2BlockRef) error {
-	if n.p2pEnabled() && n.p2pNode.AltSyncEnabled() {
+	if p2pNode := n.getP2PNodeIfEnabled(); p2pNode != nil && p2pNode.AltSyncEnabled() {
 		if unixTimeStale(start.Time, 12*time.Hour) {
 			n.log.Debug(
 				"ignoring request to sync L2 range, timestamp is too old for p2p",
@@ -624,7 +629,7 @@ func (n *OpNode) RequestL2Range(ctx context.Context, start, end eth.L2BlockRef)
 				"start_time", start.Time)
 			return nil
 		}
-		return n.p2pNode.RequestL2Range(ctx, start, end)
+		return p2pNode.RequestL2Range(ctx, start, end)
 	}
 	n.log.Debug("ignoring request to sync L2 range, no sync method available", "start", start, "end", end)
 	return nil
@@ -636,7 +641,7 @@ func unixTimeStale(timestamp uint64, duration time.Duration) bool {
 }
 
 func (n *OpNode) P2P() p2p.Node {
-	return n.p2pNode
+	return n.getP2PNodeIfEnabled()
 }
 
 func (n *OpNode) RuntimeConfig() ReadonlyRuntimeConfig {
@@ -671,6 +676,8 @@ func (n *OpNode) Stop(ctx context.Context) error {
 			result = multierror.Append(result, fmt.Errorf("error stopping sequencer: %w", err))
 		}
 	}
+
+	n.p2pMu.Lock()
 	if n.p2pNode != nil {
 		if err := n.p2pNode.Close(); err != nil {
 			result = multierror.Append(result, fmt.Errorf("failed to close p2p node: %w", err))
@@ -678,6 +685,8 @@ func (n *OpNode) Stop(ctx context.Context) error {
 		// Prevent further use of p2p.
 		n.p2pNode = nil
 	}
+	n.p2pMu.Unlock()
+
 	if n.p2pSigner != nil {
 		if err := n.p2pSigner.Close(); err != nil {
 			result = multierror.Append(result, fmt.Errorf("failed to close p2p signer: %w", err))
@@ -778,3 +787,13 @@ func (n *OpNode) HTTPEndpoint() string {
 	}
 	return fmt.Sprintf("http://%s", n.server.Addr().String())
 }
+
+func (n *OpNode) getP2PNodeIfEnabled() *p2p.NodeP2P {
+	if !n.p2pEnabled() {
+		return nil
+	}
+
+	n.p2pMu.Lock()
+	defer n.p2pMu.Unlock()
+	return n.p2pNode
+}

From c73f45b6e2d84bef960e71a092496f50d76046d3 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Tue, 26 Nov 2024 13:51:15 -0500
Subject: [PATCH 290/451] maint: minor cleanup of foundry configuration
 (#13102)

Very small cleanup of the foundry config file.
---
 packages/contracts-bedrock/foundry.toml | 53 +++++++++++++------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 6bd441ca3cdb..5812b129f913 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -1,15 +1,22 @@
 ################################################################
-#                   PROFILE: DEFAULT (Local)                   #
+#                   PROFILE: DEFAULT (local)                   #
 ################################################################
 
 [profile.default]
 
-# Compilation settings
 src = 'src'
 out = 'forge-artifacts'
 script = 'scripts'
+build_info_path = 'artifacts/build-info'
+
 optimizer = true
 optimizer_runs = 999999
+
+extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
+bytecode_hash = 'none'
+ast = true
+evm_version = "cancun"
+
 remappings = [
   '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts',
   '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts',
@@ -24,22 +31,7 @@ remappings = [
   'kontrol-cheatcodes/=lib/kontrol-cheatcodes/src',
   'gelato/=lib/automate/contracts'
 ]
-extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
-bytecode_hash = 'none'
-build_info_path = 'artifacts/build-info'
-ast = true
-evm_version = "cancun"
-# 5159 error code is selfdestruct error code
-ignored_error_codes = ["transient-storage", "code-size", "init-code-size", 5159]
 
-# We set the gas limit to max int64 to avoid running out of gas during testing, since the default
-# gas limit is 1B and some of our tests require more gas than that, such as `test_callWithMinGas_noLeakageLow_succeeds`.
-# We use this gas limit since it was the default gas limit prior to https://github.com/foundry-rs/foundry/pull/8274.
-# Due to toml-rs limitations, if you increase the gas limit above this value it must be a string.
-gas_limit = 9223372036854775807
-
-# Test / Script Runner Settings
-ffi = true
 fs_permissions = [
   { access='read-write', path='./.resource-metering.csv' },
   { access='read-write', path='./snapshots/' },
@@ -52,7 +44,17 @@ fs_permissions = [
   { access='read', path='./kout-deployment' },
   { access='read', path='./test/fixtures' },
 ]
-libs = ["node_modules", "lib"]
+
+# 5159 error code is selfdestruct error code
+ignored_error_codes = ["transient-storage", "code-size", "init-code-size", 5159]
+ffi = true
+
+# We set the gas limit to max int64 to avoid running out of gas during testing, since the default
+# gas limit is 1B and some of our tests require more gas than that, such as
+# test_callWithMinGas_noLeakageLow_succeeds. We use this gas limit since it was the default gas
+# limit prior to https://github.com/foundry-rs/foundry/pull/8274. Due to toml-rs limitations, if
+# you increase the gas limit above this value it must be a string.
+gas_limit = 9223372036854775807
 
 [fuzz]
 runs = 64
@@ -67,17 +69,19 @@ wrap_comments=true
 #                         PROFILE: CI                          #
 ################################################################
 
-[profile.ci]
-fuzz = { runs = 512 }
+[profile.ci.fuzz]
+runs = 512
 
 [profile.ci.invariant]
 runs = 256
 depth = 32
 
-[profile.ciheavy]
-# fuzz = { runs = 20000 }
-# temporary reduce fuzz runs to unblock CI
-fuzz = { runs = 200 }
+################################################################
+#                       PROFILE: CIHEAVY                       #
+################################################################
+
+[profile.ciheavy.fuzz]
+runs = 20000
 
 [profile.ciheavy.invariant]
 runs = 128
@@ -93,7 +97,6 @@ optimizer = false
 ################################################################
 #                         PROFILE: KONTROL                     #
 ################################################################
-# See test/kontrol/README.md for an explanation of how the profiles are configured
 
 [profile.kprove]
 src = 'test/kontrol/proofs'

From e8744d5355b400e5b6282989dff3f470f4f9200c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 12:33:43 -0700
Subject: [PATCH 291/451] dependabot(gomod): bump github.com/minio/minio-go/v7
 (#13109)

Bumps [github.com/minio/minio-go/v7](https://github.com/minio/minio-go) from 7.0.80 to 7.0.81.
- [Release notes](https://github.com/minio/minio-go/releases)
- [Commits](https://github.com/minio/minio-go/compare/v7.0.80...v7.0.81)

---
updated-dependencies:
- dependency-name: github.com/minio/minio-go/v7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 7ef9af899b0f..593ee186ad16 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/libp2p/go-libp2p-pubsub v0.12.0
 	github.com/libp2p/go-libp2p-testing v0.12.0
 	github.com/mattn/go-isatty v0.0.20
-	github.com/minio/minio-go/v7 v7.0.80
+	github.com/minio/minio-go/v7 v7.0.81
 	github.com/multiformats/go-base32 v0.1.0
 	github.com/multiformats/go-multiaddr v0.14.0
 	github.com/multiformats/go-multiaddr-dns v0.4.0
diff --git a/go.sum b/go.sum
index 2d20e1e8272e..9b62f53e6c81 100644
--- a/go.sum
+++ b/go.sum
@@ -524,8 +524,8 @@ github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod h1:cGKTAVKx4S
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.80 h1:2mdUHXEykRdY/BigLt3Iuu1otL0JTogT0Nmltg0wujk=
-github.com/minio/minio-go/v7 v7.0.80/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
+github.com/minio/minio-go/v7 v7.0.81 h1:SzhMN0TQ6T/xSBu6Nvw3M5M8voM+Ht8RH3hE8S7zxaA=
+github.com/minio/minio-go/v7 v7.0.81/go.mod h1:84gmIilaX4zcvAWWzJ5Z1WI5axN+hAbM5w25xf8xvC0=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=

From 980b261fdd81c9caef657a3929f2c4ae0ec3a897 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 19:49:21 +0000
Subject: [PATCH 292/451] dependabot(gomod): bump
 github.com/multiformats/go-multiaddr-dns (#13110)

Bumps [github.com/multiformats/go-multiaddr-dns](https://github.com/multiformats/go-multiaddr-dns) from 0.4.0 to 0.4.1.
- [Release notes](https://github.com/multiformats/go-multiaddr-dns/releases)
- [Commits](https://github.com/multiformats/go-multiaddr-dns/compare/v0.4.0...v0.4.1)

---
updated-dependencies:
- dependency-name: github.com/multiformats/go-multiaddr-dns
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 593ee186ad16..3e36ecc8325f 100644
--- a/go.mod
+++ b/go.mod
@@ -37,7 +37,7 @@ require (
 	github.com/minio/minio-go/v7 v7.0.81
 	github.com/multiformats/go-base32 v0.1.0
 	github.com/multiformats/go-multiaddr v0.14.0
-	github.com/multiformats/go-multiaddr-dns v0.4.0
+	github.com/multiformats/go-multiaddr-dns v0.4.1
 	github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/pkg/errors v0.9.1
diff --git a/go.sum b/go.sum
index 9b62f53e6c81..4302fb00204c 100644
--- a/go.sum
+++ b/go.sum
@@ -551,8 +551,8 @@ github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a
 github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
 github.com/multiformats/go-multiaddr v0.14.0 h1:bfrHrJhrRuh/NXH5mCnemjpbGjzRw/b+tJFOD41g2tU=
 github.com/multiformats/go-multiaddr v0.14.0/go.mod h1:6EkVAxtznq2yC3QT5CM1UTAwG0GTP3EWAIcjHuzQ+r4=
-github.com/multiformats/go-multiaddr-dns v0.4.0 h1:P76EJ3qzBXpUXZ3twdCDx/kvagMsNo0LMFXpyms/zgU=
-github.com/multiformats/go-multiaddr-dns v0.4.0/go.mod h1:7hfthtB4E4pQwirrz+J0CcDUfbWzTqEzVyYKKIKpgkc=
+github.com/multiformats/go-multiaddr-dns v0.4.1 h1:whi/uCLbDS3mSEUMb1MsoT4uzUeZB0N32yzufqS0i5M=
+github.com/multiformats/go-multiaddr-dns v0.4.1/go.mod h1:7hfthtB4E4pQwirrz+J0CcDUfbWzTqEzVyYKKIKpgkc=
 github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
 github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
 github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g=

From 98a1d928686f83250184f3946eb5b066a6c5d61b Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Wed, 27 Nov 2024 06:53:47 +1000
Subject: [PATCH 293/451] op-challenger: Allow specifying a chain ID as
 network. (#13027)

op-program supports custom configs identified by chain ID so make sure op-challenger can pass through a chain ID option even if it isn't a known network.
---
 op-challenger/cmd/main_test.go      |  7 +++++++
 op-challenger/config/config.go      |  6 +++++-
 op-challenger/config/config_test.go | 12 ++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/op-challenger/cmd/main_test.go b/op-challenger/cmd/main_test.go
index 1de92468306c..daa4e44f26ba 100644
--- a/op-challenger/cmd/main_test.go
+++ b/op-challenger/cmd/main_test.go
@@ -177,6 +177,13 @@ func TestNetwork(t *testing.T) {
 	t.Run("UnknownNetwork", func(t *testing.T) {
 		verifyArgsInvalid(t, "unknown chain: not-a-network", addRequiredArgsExcept(types.TraceTypeAlphabet, "--game-factory-address", "--network=not-a-network"))
 	})
+
+	t.Run("ChainIDAllowedWhenGameFactoryAddressSupplied", func(t *testing.T) {
+		addr := common.Address{0xbb, 0xcc, 0xdd}
+		cfg := configForArgs(t, addRequiredArgsExcept(types.TraceTypeAlphabet, "--game-factory-address", "--network=1234", "--game-factory-address="+addr.Hex()))
+		require.Equal(t, addr, cfg.GameFactoryAddress)
+		require.Equal(t, "1234", cfg.Cannon.Network)
+	})
 }
 
 func TestGameAllowlist(t *testing.T) {
diff --git a/op-challenger/config/config.go b/op-challenger/config/config.go
index 9f4a5f5f375b..6faf7c9fdca3 100644
--- a/op-challenger/config/config.go
+++ b/op-challenger/config/config.go
@@ -6,6 +6,7 @@ import (
 	"net/url"
 	"runtime"
 	"slices"
+	"strconv"
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/vm"
@@ -230,7 +231,10 @@ func (c Config) Check() error {
 				return ErrCannonNetworkAndL2Genesis
 			}
 			if ch := chaincfg.ChainByName(c.Cannon.Network); ch == nil {
-				return fmt.Errorf("%w: %v", ErrCannonNetworkUnknown, c.Cannon.Network)
+				// Check if this looks like a chain ID that could be a custom chain configuration.
+				if _, err := strconv.ParseUint(c.Cannon.Network, 10, 32); err != nil {
+					return fmt.Errorf("%w: %v", ErrCannonNetworkUnknown, c.Cannon.Network)
+				}
 			}
 		}
 		if c.CannonAbsolutePreState == "" && c.CannonAbsolutePreStateBaseURL == nil {
diff --git a/op-challenger/config/config_test.go b/op-challenger/config/config_test.go
index 0d922b77fe9b..bf910ab83e85 100644
--- a/op-challenger/config/config_test.go
+++ b/op-challenger/config/config_test.go
@@ -232,6 +232,18 @@ func TestCannonRequiredArgs(t *testing.T) {
 			require.ErrorIs(t, cfg.Check(), ErrCannonNetworkUnknown)
 		})
 
+		t.Run(fmt.Sprintf("TestNetworkMayBeAnyChainID-%v", traceType), func(t *testing.T) {
+			cfg := validConfig(traceType)
+			cfg.Cannon.Network = "467294"
+			require.NoError(t, cfg.Check())
+		})
+
+		t.Run(fmt.Sprintf("TestNetworkInvalidWhenNotEntirelyNumeric-%v", traceType), func(t *testing.T) {
+			cfg := validConfig(traceType)
+			cfg.Cannon.Network = "467294a"
+			require.ErrorIs(t, cfg.Check(), ErrCannonNetworkUnknown)
+		})
+
 		t.Run(fmt.Sprintf("TestDebugInfoEnabled-%v", traceType), func(t *testing.T) {
 			cfg := validConfig(traceType)
 			require.True(t, cfg.Cannon.DebugInfo)

From 72eb3116c2f6ff573099a8cafc8f35415138850c Mon Sep 17 00:00:00 2001
From: tre <tremarkley@gmail.com>
Date: Tue, 26 Nov 2024 14:11:00 -0800
Subject: [PATCH 294/451] feat(protoype): enable superchainWETH native
 transfers (#12710)

---
 .../snapshots/abi/SuperchainWETH.json         | 119 ++++++++++
 .../snapshots/semver-lock.json                |   4 +-
 .../src/L2/SuperchainWETH.sol                 |  80 ++++++-
 .../src/L2/interfaces/ISuperchainWETH.sol     |   8 +
 .../test/L2/SuperchainWETH.t.sol              | 209 +++++++++++++++++-
 5 files changed, 412 insertions(+), 8 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
index a8b4365d742e..e8df09a80640 100644
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainWETH.json
@@ -143,6 +143,53 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "relayETH",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "_chainId",
+        "type": "uint256"
+      }
+    ],
+    "name": "sendETH",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "msgHash_",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "payable",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -361,6 +408,68 @@
     "name": "Deposit",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "source",
+        "type": "uint256"
+      }
+    ],
+    "name": "RelayETH",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "destination",
+        "type": "uint256"
+      }
+    ],
+    "name": "SendETH",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -405,6 +514,11 @@
     "name": "Withdrawal",
     "type": "event"
   },
+  {
+    "inputs": [],
+    "name": "InvalidCrossDomainSender",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "NotCustomGasToken",
@@ -414,5 +528,10 @@
     "inputs": [],
     "name": "Unauthorized",
     "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "ZeroAddress",
+    "type": "error"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index bfbae2fe97d8..35696bc7bf16 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -128,8 +128,8 @@
     "sourceCodeHash": "0x617aa994f659c5d8ebd54128d994f86f5b175ceca095b024b8524a7898e8ae62"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0x90aad5698e09994909331dd9665d99a8d5a53e45ba792bf47e4c2efbd48f7699",
-    "sourceCodeHash": "0x35f0ffcfa027f736b496f3fd2640c043648a49ce325083486ce27f63bfec6d08"
+    "initCodeHash": "0xac4cab1ee7f0a5de8362ddc37e1de92e816aee3fdd4e31c0ba0fd9b03568f0f0",
+    "sourceCodeHash": "0x1fc6439f7a5fac2e264d5e057593844d252cdaa12c2b1eaa2fb08cbb911a9f35"
   },
   "src/L2/WETH.sol": {
     "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index d5c37d9cc763..912f1aa3d865 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -5,16 +5,18 @@ pragma solidity 0.8.15;
 import { WETH98 } from "src/universal/WETH98.sol";
 
 // Libraries
+import { NotCustomGasToken, Unauthorized, ZeroAddress } from "src/libraries/errors/CommonErrors.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
+import { SafeSend } from "src/universal/SafeSend.sol";
 
 // Interfaces
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
 import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
 import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErrors.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000024
@@ -23,9 +25,26 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 ///         within the superchain. SuperchainWETH can be converted into native ETH on chains that
 ///         do not use a custom gas token.
 contract SuperchainWETH is WETH98, IERC7802, ISemver {
+    /// @notice Thrown when attempting to relay a message and the cross domain message sender is not SuperchainWETH.
+    error InvalidCrossDomainSender();
+
+    /// @notice Emitted when ETH is sent from one chain to another.
+    /// @param from          Address of the sender.
+    /// @param to            Address of the recipient.
+    /// @param amount        Amount of ETH sent.
+    /// @param destination   Chain ID of the destination chain.
+    event SendETH(address indexed from, address indexed to, uint256 amount, uint256 destination);
+
+    /// @notice Emitted whenever ETH is successfully relayed on this chain.
+    /// @param from          Address of the msg.sender of sendETH on the source chain.
+    /// @param to            Address of the recipient.
+    /// @param amount        Amount of ETH relayed.
+    /// @param source        Chain ID of the source chain.
+    event RelayETH(address indexed from, address indexed to, uint256 amount, uint256 source);
+
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.11
-    string public constant version = "1.0.0-beta.11";
+    /// @custom:semver 1.0.0-beta.12
+    string public constant version = "1.0.0-beta.12";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
@@ -69,8 +88,9 @@ contract SuperchainWETH is WETH98, IERC7802, ISemver {
 
         _mint(_to, _amount);
 
-        // Mint from ETHLiquidity contract.
+        // Withdraw from ETHLiquidity contract.
         if (!IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).isCustomGasToken()) {
+            // NOTE: 'mint' will soon change to 'withdraw'.
             IETHLiquidity(Predeploys.ETH_LIQUIDITY).mint(_amount);
         }
 
@@ -85,8 +105,9 @@ contract SuperchainWETH is WETH98, IERC7802, ISemver {
 
         _burn(_from, _amount);
 
-        // Burn to ETHLiquidity contract.
+        // Deposit to ETHLiquidity contract.
         if (!IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).isCustomGasToken()) {
+            // NOTE: 'burn' will soon change to 'deposit'.
             IETHLiquidity(Predeploys.ETH_LIQUIDITY).burn{ value: _amount }();
         }
 
@@ -98,4 +119,53 @@ contract SuperchainWETH is WETH98, IERC7802, ISemver {
         return _interfaceId == type(IERC7802).interfaceId || _interfaceId == type(IERC20).interfaceId
             || _interfaceId == type(IERC165).interfaceId;
     }
+
+    /// @notice Sends ETH to some target address on another chain.
+    /// @param _to       Address to send ETH to.
+    /// @param _chainId  Chain ID of the destination chain.
+    /// @return msgHash_ Hash of the message sent.
+    function sendETH(address _to, uint256 _chainId) external payable returns (bytes32 msgHash_) {
+        if (_to == address(0)) revert ZeroAddress();
+
+        if (IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).isCustomGasToken()) {
+            revert NotCustomGasToken();
+        }
+
+        // NOTE: 'burn' will soon change to 'deposit'.
+        IETHLiquidity(Predeploys.ETH_LIQUIDITY).burn{ value: msg.value }();
+
+        msgHash_ = IL2ToL2CrossDomainMessenger(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER).sendMessage({
+            _destination: _chainId,
+            _target: address(this),
+            _message: abi.encodeCall(this.relayETH, (msg.sender, _to, msg.value))
+        });
+
+        emit SendETH(msg.sender, _to, msg.value, _chainId);
+    }
+
+    /// @notice Relays ETH received from another chain.
+    /// @param _from       Address of the msg.sender of sendETH on the source chain.
+    /// @param _to         Address to relay ETH to.
+    /// @param _amount     Amount of ETH to relay.
+    function relayETH(address _from, address _to, uint256 _amount) external {
+        if (msg.sender != Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER) revert Unauthorized();
+
+        (address crossDomainMessageSender, uint256 source) =
+            IL2ToL2CrossDomainMessenger(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER).crossDomainMessageContext();
+
+        if (crossDomainMessageSender != address(this)) revert InvalidCrossDomainSender();
+
+        if (IL1Block(Predeploys.L1_BLOCK_ATTRIBUTES).isCustomGasToken()) {
+            // Since ETH is not the native asset on custom gas token chains, send SuperchainWETH to the recipient.
+            _mint(_to, _amount);
+        } else {
+            // NOTE: 'mint' will soon change to 'withdraw'.
+            IETHLiquidity(Predeploys.ETH_LIQUIDITY).mint(_amount);
+
+            // This is a forced ETH send to the recipient, the recipient should NOT expect to be called.
+            new SafeSend{ value: _amount }(payable(_to));
+        }
+
+        emit RelayETH(_from, _to, _amount, source);
+    }
 }
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
index fa10b237dbb5..4a4bbe35372f 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
@@ -8,10 +8,18 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 interface ISuperchainWETH is IWETH98, IERC7802, ISemver {
     error Unauthorized();
     error NotCustomGasToken();
+    error InvalidCrossDomainSender();
+    error ZeroAddress();
+
+    event SendETH(address indexed from, address indexed to, uint256 amount, uint256 destination);
+
+    event RelayETH(address indexed from, address indexed to, uint256 amount, uint256 source);
 
     function balanceOf(address src) external view returns (uint256);
     function withdraw(uint256 _amount) external;
     function supportsInterface(bytes4 _interfaceId) external view returns (bool);
+    function sendETH(address _to, uint256 _chainId) external payable returns (bytes32 msgHash_);
+    function relayETH(address _from, address _to, uint256 _amount) external;
 
     function __constructor__() external;
 }
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index 88ff2ada8953..c47bec6252d7 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -6,7 +6,7 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { NotCustomGasToken } from "src/libraries/errors/CommonErrors.sol";
+import { NotCustomGasToken, Unauthorized, ZeroAddress } from "src/libraries/errors/CommonErrors.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 // Interfaces
@@ -14,6 +14,7 @@ import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
 import { ISuperchainWETH } from "src/L2/interfaces/ISuperchainWETH.sol";
 import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
 
 /// @title SuperchainWETH_Test
 /// @notice Contract for testing the SuperchainWETH contract.
@@ -33,6 +34,10 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Emitted when a crosschain transfer burns tokens.
     event CrosschainBurn(address indexed from, uint256 amount, address indexed sender);
 
+    event SendETH(address indexed from, address indexed to, uint256 amount, uint256 destination);
+
+    event RelayETH(address indexed from, address indexed to, uint256 amount, uint256 source);
+
     address internal constant ZERO_ADDRESS = address(0);
 
     /// @notice Test setup.
@@ -475,4 +480,206 @@ contract SuperchainWETH_Test is CommonTest {
         vm.assume(_interfaceId != type(IERC20).interfaceId);
         assertFalse(superchainWeth.supportsInterface(_interfaceId));
     }
+
+    /// @notice Tests the `sendETH` function reverts when the address `_to` is zero.
+    function testFuzz_sendETH_zeroAddressTo_reverts(address _sender, uint256 _amount, uint256 _chainId) public {
+        // Expect the revert with `ZeroAddress` selector
+        vm.expectRevert(ZeroAddress.selector);
+
+        vm.deal(_sender, _amount);
+        vm.prank(_sender);
+        // Call the `sendETH` function with the zero address as `_to`
+        superchainWeth.sendETH{ value: _amount }(ZERO_ADDRESS, _chainId);
+    }
+
+    /// @notice Tests the `sendETH` function burns the sender ETH, sends the message, and emits the `SendETH`
+    /// event.
+    function testFuzz_sendETH_fromNonCustomGasTokenChain_succeeds(
+        address _sender,
+        address _to,
+        uint256 _amount,
+        uint256 _chainId,
+        bytes32 _msgHash
+    )
+        external
+    {
+        // Assume
+        vm.assume(_sender != ZERO_ADDRESS);
+        vm.assume(_to != ZERO_ADDRESS);
+        _amount = bound(_amount, 0, type(uint248).max - 1);
+
+        // Arrange
+        vm.deal(_sender, _amount);
+        _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(false));
+
+        // Get the total balance of `_sender` before the send to compare later on the assertions
+        uint256 _senderBalanceBefore = _sender.balance;
+
+        // Look for the emit of the `SendETH` event
+        vm.expectEmit(address(superchainWeth));
+        emit SendETH(_sender, _to, _amount, _chainId);
+
+        // Expect the call to the `burn` function in the `ETHLiquidity` contract
+        vm.expectCall(Predeploys.ETH_LIQUIDITY, abi.encodeCall(IETHLiquidity.burn, ()), 1);
+
+        // Mock the call over the `sendMessage` function and expect it to be called properly
+        bytes memory _message = abi.encodeCall(superchainWeth.relayETH, (_sender, _to, _amount));
+        _mockAndExpect(
+            Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER,
+            abi.encodeCall(IL2ToL2CrossDomainMessenger.sendMessage, (_chainId, address(superchainWeth), _message)),
+            abi.encode(_msgHash)
+        );
+
+        // Call the `sendETH` function
+        vm.prank(_sender);
+        bytes32 _returnedMsgHash = superchainWeth.sendETH{ value: _amount }(_to, _chainId);
+
+        // Check the message hash was generated correctly
+        assertEq(_msgHash, _returnedMsgHash);
+
+        // Check the total supply and balance of `_sender` after the send were updated correctly
+        assertEq(_sender.balance, _senderBalanceBefore - _amount);
+    }
+
+    /// @notice Tests the `sendETH` function reverts when called on a custom gas token chain.
+    function testFuzz_sendETH_fromCustomGasTokenChain_fails(
+        address _sender,
+        address _to,
+        uint256 _amount,
+        uint256 _chainId
+    )
+        external
+    {
+        // Assume
+        vm.assume(_sender != ZERO_ADDRESS);
+        vm.assume(_to != ZERO_ADDRESS);
+        _amount = bound(_amount, 0, type(uint248).max - 1);
+
+        // Arrange
+        vm.deal(_sender, _amount);
+        _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(true));
+
+        // Call the `sendETH` function
+        vm.prank(_sender);
+        vm.expectRevert(NotCustomGasToken.selector);
+        superchainWeth.sendETH{ value: _amount }(_to, _chainId);
+    }
+
+    /// @notice Tests the `relayETH` function reverts when the caller is not the L2ToL2CrossDomainMessenger.
+    function testFuzz_relayETH_notMessenger_reverts(address _caller, address _to, uint256 _amount) public {
+        // Ensure the caller is not the messenger
+        vm.assume(_caller != Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
+
+        // Expect the revert with `Unauthorized` selector
+        vm.expectRevert(Unauthorized.selector);
+
+        // Call the `relayETH` function with the non-messenger caller
+        vm.prank(_caller);
+        superchainWeth.relayETH(_caller, _to, _amount);
+    }
+
+    /// @notice Tests the `relayETH` function reverts when the `crossDomainMessageSender` that sent the message is not
+    /// the same SuperchainWETH.
+    function testFuzz_relayETH_notCrossDomainSender_reverts(
+        address _crossDomainMessageSender,
+        uint256 _source,
+        address _to,
+        uint256 _amount
+    )
+        public
+    {
+        vm.assume(_crossDomainMessageSender != address(superchainWeth));
+
+        // Mock the call over the `crossDomainMessageContext` function setting a wrong sender
+        vm.mockCall(
+            Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER,
+            abi.encodeCall(IL2ToL2CrossDomainMessenger.crossDomainMessageContext, ()),
+            abi.encode(_crossDomainMessageSender, _source)
+        );
+
+        // Expect the revert with `InvalidCrossDomainSender` selector
+        vm.expectRevert(ISuperchainWETH.InvalidCrossDomainSender.selector);
+
+        // Call the `relayETH` function with the sender caller
+        vm.prank(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
+        superchainWeth.relayETH(_crossDomainMessageSender, _to, _amount);
+    }
+
+    /// @notice Tests the `relayETH` function succeeds and sends SuperchainWETH to the recipient on a custom gas token
+    /// chain.
+    function testFuzz_relayETH_fromCustomGasTokenChain_succeeds(
+        address _from,
+        address _to,
+        uint256 _amount,
+        uint256 _source
+    )
+        public
+    {
+        // Assume
+        vm.assume(_to != ZERO_ADDRESS);
+        _amount = bound(_amount, 0, type(uint248).max - 1);
+
+        // Get the balance of `_to` before the mint to compare later on the assertions
+        uint256 _toBalanceBefore = superchainWeth.balanceOf(_to);
+
+        // Look for the emit of the `Transfer` event
+        vm.expectEmit(address(superchainWeth));
+        emit Transfer(ZERO_ADDRESS, _to, _amount);
+
+        // Look for the emit of the `RelayETH` event
+        vm.expectEmit(address(superchainWeth));
+        emit RelayETH(_from, _to, _amount, _source);
+
+        // Arrange
+        _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(true));
+        _mockAndExpect(
+            Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER,
+            abi.encodeCall(IL2ToL2CrossDomainMessenger.crossDomainMessageContext, ()),
+            abi.encode(address(superchainWeth), _source)
+        );
+        // Expect to not call the `mint` function in the `ETHLiquidity` contract
+        vm.expectCall(Predeploys.ETH_LIQUIDITY, abi.encodeCall(IETHLiquidity.mint, (_amount)), 0);
+
+        // Act
+        vm.prank(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
+        superchainWeth.relayETH(_from, _to, _amount);
+
+        // Check the total supply and balance of `_to` after the mint were updated correctly
+        assertEq(superchainWeth.balanceOf(_to), _toBalanceBefore + _amount);
+        assertEq(superchainWeth.totalSupply(), 0);
+        assertEq(address(superchainWeth).balance, 0);
+    }
+
+    /// @notice Tests the `relayETH` function relays the proper amount of ETH and emits the `RelayETH` event.
+    function testFuzz_relayETH_succeeds(address _from, address _to, uint256 _amount, uint256 _source) public {
+        // Assume
+        vm.assume(_to != ZERO_ADDRESS);
+        assumePayable(_to);
+        _amount = bound(_amount, 0, type(uint248).max - 1);
+
+        // Arrange
+        vm.deal(address(superchainWeth), _amount);
+        vm.deal(Predeploys.ETH_LIQUIDITY, _amount);
+        _mockAndExpect(address(l1Block), abi.encodeCall(l1Block.isCustomGasToken, ()), abi.encode(false));
+        _mockAndExpect(
+            Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER,
+            abi.encodeCall(IL2ToL2CrossDomainMessenger.crossDomainMessageContext, ()),
+            abi.encode(address(superchainWeth), _source)
+        );
+
+        uint256 _toBalanceBefore = _to.balance;
+
+        // Look for the emit of the `RelayETH` event
+        vm.expectEmit(address(superchainWeth));
+        emit RelayETH(_from, _to, _amount, _source);
+
+        // Expect the call to the `mint` function in the `ETHLiquidity` contract
+        vm.expectCall(Predeploys.ETH_LIQUIDITY, abi.encodeCall(IETHLiquidity.mint, (_amount)), 1);
+
+        // Call the `RelayETH` function with the messenger caller
+        vm.prank(Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
+        superchainWeth.relayETH(_from, _to, _amount);
+
+        assertEq(_to.balance, _toBalanceBefore + _amount);
+    }
 }

From 91099581e7e129921d794b0a8580ef2c5bb445d8 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 27 Nov 2024 10:44:07 -0500
Subject: [PATCH 295/451] fix: SuperchainWETH test flake (#13115)

Fixes a flake that existed inside of the SuperchainWETH test suite.
Was caught by the heavy fuzz test.
---
 .../test/L2/SuperchainWETH.t.sol                | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index c47bec6252d7..621acaa3aefd 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -329,8 +329,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the internal mint function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_internalMintFunction_reverts(address _caller, address _to, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("_mint(address,uint256)", _to, _amount); // nosemgrep:
-            // sol-style-use-abi-encodecall
+        // nosemgrep: sol-style-use-abi-encodecall
+        bytes memory _calldata = abi.encodeWithSignature("_mint(address,uint256)", _to, _amount);
         vm.expectRevert(bytes(""));
 
         // Act
@@ -344,8 +344,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the mint function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_mintFunction_reverts(address _caller, address _to, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("mint(address,uint256)", _to, _amount); // nosemgrep:
-            // sol-style-use-abi-encodecall
+        // nosemgrep: sol-style-use-abi-encodecall
+        bytes memory _calldata = abi.encodeWithSignature("mint(address,uint256)", _to, _amount);
         vm.expectRevert(bytes(""));
 
         // Act
@@ -359,8 +359,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the internal burn function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_internalBurnFunction_reverts(address _caller, address _from, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("_burn(address,uint256)", _from, _amount); // nosemgrep:
-            // sol-style-use-abi-encodecall
+        // nosemgrep: sol-style-use-abi-encodecall
+        bytes memory _calldata = abi.encodeWithSignature("_burn(address,uint256)", _from, _amount);
         vm.expectRevert(bytes(""));
 
         // Act
@@ -374,8 +374,8 @@ contract SuperchainWETH_Test is CommonTest {
     /// @notice Test that the burn function reverts to protect against accidentally changing the visibility.
     function testFuzz_calling_burnFuunction_reverts(address _caller, address _from, uint256 _amount) public {
         // Arrange
-        bytes memory _calldata = abi.encodeWithSignature("burn(address,uint256)", _from, _amount); // nosemgrep:
-            // sol-style-use-abi-encodecall
+        // nosemgrep: sol-style-use-abi-encodecall
+        bytes memory _calldata = abi.encodeWithSignature("burn(address,uint256)", _from, _amount);
         vm.expectRevert(bytes(""));
 
         // Act
@@ -504,6 +504,7 @@ contract SuperchainWETH_Test is CommonTest {
         external
     {
         // Assume
+        vm.assume(_sender != address(ethLiquidity));
         vm.assume(_sender != ZERO_ADDRESS);
         vm.assume(_to != ZERO_ADDRESS);
         _amount = bound(_amount, 0, type(uint248).max - 1);

From c8f4b3a0e05c0710345626b71c0f1937ccd845f0 Mon Sep 17 00:00:00 2001
From: Sam Stokes <35908605+bitwiseguy@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:43:37 -0500
Subject: [PATCH 296/451] op-deployer: add intent-config-type (#12970)

* op-deployer: add config-intent-type

* op-deployer: revert name change of GasLimit

* op-deployer: add Intent.setStandardValues and Intent.validateStandardValues

* op-deployer: improve standard intent-config err messages

* op-deployr: chain intent custom err types

* op-deployer: add unit test for inent.validateStandardValues

* linter fix

* add intent-config-type custom

* add intent-config-type strict

* add intent-config-type standard-overrides,strict-overrides

* refactor intent.ConfigType validation methods, add intent NewIntent* funcs

* add TestValidateCustomValues, refactor contract tag check

* remove duplicate chainIntent.Check() code

* fix SuperchainRoles.ProxyAdminOwner for standard chains
---
 op-deployer/pkg/deployer/apply.go             |   3 +
 op-deployer/pkg/deployer/artifacts/locator.go |   6 +-
 op-deployer/pkg/deployer/flags.go             |  15 +-
 op-deployer/pkg/deployer/init.go              |  57 +--
 .../deployer/integration_test/apply_test.go   |   6 +-
 op-deployer/pkg/deployer/pipeline/init.go     |   4 +-
 op-deployer/pkg/deployer/standard/standard.go |  38 +-
 .../pkg/deployer/state/chain_intent.go        |  82 +++++
 op-deployer/pkg/deployer/state/intent.go      | 337 +++++++++++++-----
 op-deployer/pkg/deployer/state/intent_test.go |  89 +++++
 10 files changed, 478 insertions(+), 159 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/state/chain_intent.go
 create mode 100644 op-deployer/pkg/deployer/state/intent_test.go

diff --git a/op-deployer/pkg/deployer/apply.go b/op-deployer/pkg/deployer/apply.go
index f02716c655a5..b4ff343de351 100644
--- a/op-deployer/pkg/deployer/apply.go
+++ b/op-deployer/pkg/deployer/apply.go
@@ -141,6 +141,9 @@ func ApplyPipeline(
 	opts ApplyPipelineOpts,
 ) error {
 	intent := opts.Intent
+	if err := intent.Check(); err != nil {
+		return err
+	}
 	st := opts.State
 
 	progressor := func(curr, total int64) {
diff --git a/op-deployer/pkg/deployer/artifacts/locator.go b/op-deployer/pkg/deployer/artifacts/locator.go
index aa44d43644c8..42b838f66a7c 100644
--- a/op-deployer/pkg/deployer/artifacts/locator.go
+++ b/op-deployer/pkg/deployer/artifacts/locator.go
@@ -70,11 +70,7 @@ func (a *Locator) MarshalText() ([]byte, error) {
 		return []byte(a.URL.String()), nil
 	}
 
-	if a.Tag != "" {
-		return []byte("tag://" + a.Tag), nil
-	}
-
-	return nil, fmt.Errorf("no URL, path or tag set")
+	return []byte("tag://" + a.Tag), nil
 }
 
 func (a *Locator) IsTag() bool {
diff --git a/op-deployer/pkg/deployer/flags.go b/op-deployer/pkg/deployer/flags.go
index 2611957f0ad3..a58d35bbbb8d 100644
--- a/op-deployer/pkg/deployer/flags.go
+++ b/op-deployer/pkg/deployer/flags.go
@@ -20,6 +20,7 @@ const (
 	OutdirFlagName             = "outdir"
 	PrivateKeyFlagName         = "private-key"
 	DeploymentStrategyFlagName = "deployment-strategy"
+	IntentConfigTypeFlagName   = "intent-config-type"
 )
 
 var (
@@ -35,7 +36,7 @@ var (
 		Name:    L1ChainIDFlagName,
 		Usage:   "Chain ID of the L1 chain.",
 		EnvVars: PrefixEnvVar("L1_CHAIN_ID"),
-		Value:   900,
+		Value:   11155111,
 	}
 	L2ChainIDsFlag = &cli.StringFlag{
 		Name:    L2ChainIDsFlagName,
@@ -62,6 +63,17 @@ var (
 		EnvVars: PrefixEnvVar("DEPLOYMENT_STRATEGY"),
 		Value:   string(state.DeploymentStrategyLive),
 	}
+	IntentConfigTypeFlag = &cli.StringFlag{
+		Name: IntentConfigTypeFlagName,
+		Usage: fmt.Sprintf("Intent config type to use. Options: %s (default), %s, %s, %s, %s",
+			state.IntentConfigTypeStandard,
+			state.IntentConfigTypeCustom,
+			state.IntentConfigTypeStrict,
+			state.IntentConfigTypeStandardOverrides,
+			state.IntentConfigTypeStrictOverrides),
+		EnvVars: PrefixEnvVar("INTENT_CONFIG_TYPE"),
+		Value:   string(state.IntentConfigTypeStandard),
+	}
 )
 
 var GlobalFlags = append([]cli.Flag{}, oplog.CLIFlags(EnvVarPrefix)...)
@@ -71,6 +83,7 @@ var InitFlags = []cli.Flag{
 	L2ChainIDsFlag,
 	WorkdirFlag,
 	DeploymentStrategyFlag,
+	IntentConfigTypeFlag,
 }
 
 var ApplyFlags = []cli.Flag{
diff --git a/op-deployer/pkg/deployer/init.go b/op-deployer/pkg/deployer/init.go
index 3a8ae27d2ae7..deca136558cb 100644
--- a/op-deployer/pkg/deployer/init.go
+++ b/op-deployer/pkg/deployer/init.go
@@ -7,19 +7,17 @@ import (
 	"path"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
-
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
 	op_service "github.com/ethereum-optimism/optimism/op-service"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/urfave/cli/v2"
 )
 
 type InitConfig struct {
 	DeploymentStrategy state.DeploymentStrategy
+	IntentConfigType   state.IntentConfigType
 	L1ChainID          uint64
 	Outdir             string
 	L2ChainIDs         []common.Hash
@@ -51,6 +49,7 @@ func InitCLI() func(ctx *cli.Context) error {
 		l1ChainID := ctx.Uint64(L1ChainIDFlagName)
 		outdir := ctx.String(OutdirFlagName)
 		l2ChainIDsRaw := ctx.String(L2ChainIDsFlagName)
+		intentConfigType := ctx.String(IntentConfigTypeFlagName)
 
 		if len(l2ChainIDsRaw) == 0 {
 			return fmt.Errorf("must specify at least one L2 chain ID")
@@ -68,6 +67,7 @@ func InitCLI() func(ctx *cli.Context) error {
 
 		err := Init(InitConfig{
 			DeploymentStrategy: state.DeploymentStrategy(deploymentStrategy),
+			IntentConfigType:   state.IntentConfigType(intentConfigType),
 			L1ChainID:          l1ChainID,
 			Outdir:             outdir,
 			L2ChainIDs:         l2ChainIDs,
@@ -86,55 +86,12 @@ func Init(cfg InitConfig) error {
 		return fmt.Errorf("invalid config for init: %w", err)
 	}
 
-	intent := &state.Intent{
-		DeploymentStrategy: cfg.DeploymentStrategy,
-		L1ChainID:          cfg.L1ChainID,
-		FundDevAccounts:    true,
-		L1ContractsLocator: artifacts.DefaultL1ContractsLocator,
-		L2ContractsLocator: artifacts.DefaultL2ContractsLocator,
-	}
-
-	l1ChainIDBig := intent.L1ChainIDBig()
-
-	dk, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
+	intent, err := state.NewIntent(cfg.IntentConfigType, cfg.DeploymentStrategy, cfg.L1ChainID, cfg.L2ChainIDs)
 	if err != nil {
-		return fmt.Errorf("failed to create dev keys: %w", err)
-	}
-
-	addrFor := func(key devkeys.Key) common.Address {
-		// The error below should never happen, so panic if it does.
-		addr, err := dk.Address(key)
-		if err != nil {
-			panic(err)
-		}
-		return addr
-	}
-	intent.SuperchainRoles = &state.SuperchainRoles{
-		ProxyAdminOwner:       addrFor(devkeys.L1ProxyAdminOwnerRole.Key(l1ChainIDBig)),
-		ProtocolVersionsOwner: addrFor(devkeys.SuperchainProtocolVersionsOwner.Key(l1ChainIDBig)),
-		Guardian:              addrFor(devkeys.SuperchainConfigGuardianKey.Key(l1ChainIDBig)),
-	}
-
-	for _, l2ChainID := range cfg.L2ChainIDs {
-		l2ChainIDBig := l2ChainID.Big()
-		intent.Chains = append(intent.Chains, &state.ChainIntent{
-			ID:                         l2ChainID,
-			BaseFeeVaultRecipient:      addrFor(devkeys.BaseFeeVaultRecipientRole.Key(l2ChainIDBig)),
-			L1FeeVaultRecipient:        addrFor(devkeys.L1FeeVaultRecipientRole.Key(l2ChainIDBig)),
-			SequencerFeeVaultRecipient: addrFor(devkeys.SequencerFeeVaultRecipientRole.Key(l2ChainIDBig)),
-			Eip1559Denominator:         50,
-			Eip1559Elasticity:          6,
-			Roles: state.ChainRoles{
-				L1ProxyAdminOwner: addrFor(devkeys.L1ProxyAdminOwnerRole.Key(l2ChainIDBig)),
-				L2ProxyAdminOwner: addrFor(devkeys.L2ProxyAdminOwnerRole.Key(l2ChainIDBig)),
-				SystemConfigOwner: addrFor(devkeys.SystemConfigOwner.Key(l2ChainIDBig)),
-				UnsafeBlockSigner: addrFor(devkeys.SequencerP2PRole.Key(l2ChainIDBig)),
-				Batcher:           addrFor(devkeys.BatcherRole.Key(l2ChainIDBig)),
-				Proposer:          addrFor(devkeys.ProposerRole.Key(l2ChainIDBig)),
-				Challenger:        addrFor(devkeys.ChallengerRole.Key(l2ChainIDBig)),
-			},
-		})
+		return err
 	}
+	intent.DeploymentStrategy = cfg.DeploymentStrategy
+	intent.ConfigType = cfg.IntentConfigType
 
 	st := &state.State{
 		Version: 1,
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 682aaccfbc0a..98a5c89b8511 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -714,6 +714,7 @@ func newIntent(
 	l2Loc *artifacts.Locator,
 ) (*state.Intent, *state.State) {
 	intent := &state.Intent{
+		ConfigType:         state.IntentConfigTypeCustom,
 		DeploymentStrategy: state.DeploymentStrategyLive,
 		L1ChainID:          l1ChainID.Uint64(),
 		SuperchainRoles: &state.SuperchainRoles{
@@ -740,8 +741,9 @@ func newChainIntent(t *testing.T, dk *devkeys.MnemonicDevKeys, l1ChainID *big.In
 		BaseFeeVaultRecipient:      addrFor(t, dk, devkeys.BaseFeeVaultRecipientRole.Key(l1ChainID)),
 		L1FeeVaultRecipient:        addrFor(t, dk, devkeys.L1FeeVaultRecipientRole.Key(l1ChainID)),
 		SequencerFeeVaultRecipient: addrFor(t, dk, devkeys.SequencerFeeVaultRecipientRole.Key(l1ChainID)),
-		Eip1559Denominator:         50,
-		Eip1559Elasticity:          6,
+		Eip1559DenominatorCanyon:   standard.Eip1559DenominatorCanyon,
+		Eip1559Denominator:         standard.Eip1559Denominator,
+		Eip1559Elasticity:          standard.Eip1559Elasticity,
 		Roles: state.ChainRoles{
 			L1ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
 			L2ProxyAdminOwner: addrFor(t, dk, devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
diff --git a/op-deployer/pkg/deployer/pipeline/init.go b/op-deployer/pkg/deployer/pipeline/init.go
index 88caf760f41d..f7be4eae03de 100644
--- a/op-deployer/pkg/deployer/pipeline/init.go
+++ b/op-deployer/pkg/deployer/pipeline/init.go
@@ -141,10 +141,10 @@ func displayWarning() error {
 ####################### WARNING! WARNING WARNING! #######################
 
 You are deploying a tagged release to a chain with no pre-deployed OPCM.
-The contracts you are deploying may not be audited, or match a governance 
+The contracts you are deploying may not be audited, or match a governance
 approved release.
 
-USE OF THIS DEPLOYMENT IS NOT RECOMMENDED FOR PRODUCTION. USE AT YOUR OWN 
+USE OF THIS DEPLOYMENT IS NOT RECOMMENDED FOR PRODUCTION. USE AT YOUR OWN
 RISK. BUGS OR LOSS OF FUNDS MAY OCCUR. WE HOPE YOU KNOW WHAT YOU ARE
 DOING.
 
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 75902424ac78..d2fe5e5d942b 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -26,6 +26,9 @@ const (
 	DisputeSplitDepth               uint64 = 30
 	DisputeClockExtension           uint64 = 10800
 	DisputeMaxClockDuration         uint64 = 302400
+	Eip1559DenominatorCanyon        uint64 = 250
+	Eip1559Denominator              uint64 = 50
+	Eip1559Elasticity               uint64 = 6
 
 	ContractsV160Tag        = "op-contracts/v1.6.0"
 	ContractsV170Beta1L2Tag = "op-contracts/v1.7.0-beta.1+l2-contracts"
@@ -97,6 +100,28 @@ func L1VersionsFor(chainID uint64) (L1Versions, error) {
 	}
 }
 
+func GuardianAddressFor(chainID uint64) (common.Address, error) {
+	switch chainID {
+	case 1:
+		return common.HexToAddress("0x09f7150D8c019BeF34450d6920f6B3608ceFdAf2"), nil
+	case 11155111:
+		return common.HexToAddress("0x7a50f00e8D05b95F98fE38d8BeE366a7324dCf7E"), nil
+	default:
+		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
+func ChallengerAddressFor(chainID uint64) (common.Address, error) {
+	switch chainID {
+	case 1:
+		return common.HexToAddress("0x9BA6e03D8B90dE867373Db8cF1A58d2F7F006b3A"), nil
+	case 11155111:
+		return common.HexToAddress("0xfd1D2e729aE8eEe2E146c033bf4400fE75284301"), nil
+	default:
+		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
 func SuperchainFor(chainID uint64) (*superchain.Superchain, error) {
 	switch chainID {
 	case 1:
@@ -115,7 +140,7 @@ func ChainNameFor(chainID uint64) (string, error) {
 	case 11155111:
 		return "sepolia", nil
 	default:
-		return "", fmt.Errorf("unrecognized chain ID: %d", chainID)
+		return "", fmt.Errorf("unrecognized l1 chain ID: %d", chainID)
 	}
 }
 
@@ -173,6 +198,17 @@ func SystemOwnerAddrFor(chainID uint64) (common.Address, error) {
 	}
 }
 
+func L1ProxyAdminOwner(chainID uint64) (common.Address, error) {
+	switch chainID {
+	case 1:
+		return common.HexToAddress("0x5a0Aae59D09fccBdDb6C6CcEB07B7279367C3d2A"), nil
+	case 11155111:
+		return common.HexToAddress("0x1Eb2fFc903729a0F03966B917003800b145F56E2"), nil
+	default:
+		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
 func ArtifactsURLForTag(tag string) (*url.URL, error) {
 	switch tag {
 	case "op-contracts/v1.6.0":
diff --git a/op-deployer/pkg/deployer/state/chain_intent.go b/op-deployer/pkg/deployer/state/chain_intent.go
new file mode 100644
index 000000000000..bb6693f56b88
--- /dev/null
+++ b/op-deployer/pkg/deployer/state/chain_intent.go
@@ -0,0 +1,82 @@
+package state
+
+import (
+	"fmt"
+	"reflect"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type ChainIntent struct {
+	ID                         common.Hash               `json:"id" toml:"id"`
+	BaseFeeVaultRecipient      common.Address            `json:"baseFeeVaultRecipient" toml:"baseFeeVaultRecipient"`
+	L1FeeVaultRecipient        common.Address            `json:"l1FeeVaultRecipient" toml:"l1FeeVaultRecipient"`
+	SequencerFeeVaultRecipient common.Address            `json:"sequencerFeeVaultRecipient" toml:"sequencerFeeVaultRecipient"`
+	Eip1559DenominatorCanyon   uint64                    `json:"eip1559DenominatorCanyon" toml:"eip1559DenominatorCanyon"`
+	Eip1559Denominator         uint64                    `json:"eip1559Denominator" toml:"eip1559Denominator"`
+	Eip1559Elasticity          uint64                    `json:"eip1559Elasticity" toml:"eip1559Elasticity"`
+	Roles                      ChainRoles                `json:"roles" toml:"roles"`
+	DeployOverrides            map[string]any            `json:"deployOverrides" toml:"deployOverrides"`
+	DangerousAltDAConfig       genesis.AltDADeployConfig `json:"dangerousAltDAConfig,omitempty" toml:"dangerousAltDAConfig,omitempty"`
+}
+
+type ChainRoles struct {
+	L1ProxyAdminOwner common.Address `json:"l1ProxyAdminOwner" toml:"l1ProxyAdminOwner"`
+	L2ProxyAdminOwner common.Address `json:"l2ProxyAdminOwner" toml:"l2ProxyAdminOwner"`
+	SystemConfigOwner common.Address `json:"systemConfigOwner" toml:"systemConfigOwner"`
+	UnsafeBlockSigner common.Address `json:"unsafeBlockSigner" toml:"unsafeBlockSigner"`
+	Batcher           common.Address `json:"batcher" toml:"batcher"`
+	Proposer          common.Address `json:"proposer" toml:"proposer"`
+	Challenger        common.Address `json:"challenger" toml:"challenger"`
+}
+
+var ErrChainRoleZeroAddress = fmt.Errorf("ChainRole is set to zero address")
+var ErrFeeVaultZeroAddress = fmt.Errorf("chain has a fee vault set to zero address")
+var ErrNonStandardValue = fmt.Errorf("chain contains non-standard config value")
+var ErrEip1559ZeroValue = fmt.Errorf("eip1559 param is set to zero value")
+
+func (c *ChainIntent) Check() error {
+	if c.ID == emptyHash {
+		return fmt.Errorf("id must be set")
+	}
+
+	if err := c.Roles.CheckNoZeroAddresses(); err != nil {
+		return err
+	}
+
+	if c.Eip1559DenominatorCanyon == 0 ||
+		c.Eip1559Denominator == 0 ||
+		c.Eip1559Elasticity == 0 {
+		return fmt.Errorf("%w: chainId=%s", ErrEip1559ZeroValue, c.ID)
+	}
+	if c.BaseFeeVaultRecipient == emptyAddress ||
+		c.L1FeeVaultRecipient == emptyAddress ||
+		c.SequencerFeeVaultRecipient == emptyAddress {
+		return fmt.Errorf("%w: chainId=%s", ErrFeeVaultZeroAddress, c.ID)
+	}
+
+	if c.DangerousAltDAConfig.UseAltDA {
+		return c.DangerousAltDAConfig.Check(nil)
+	}
+
+	return nil
+}
+
+// Returns an error if any fields in ChainRoles is set to common.Address{}
+func (cr *ChainRoles) CheckNoZeroAddresses() error {
+	val := reflect.ValueOf(*cr)
+	typ := reflect.TypeOf(*cr)
+
+	// Iterate through all the fields
+	for i := 0; i < val.NumField(); i++ {
+		fieldValue := val.Field(i)
+		fieldName := typ.Field(i).Name
+
+		if fieldValue.Interface() == (common.Address{}) {
+			return fmt.Errorf("%w: %s", ErrChainRoleZeroAddress, fieldName)
+		}
+	}
+
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index 86e6cfc1ed47..ab76eb4fb4f6 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-
-	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+	"net/url"
+	"reflect"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
@@ -32,63 +32,191 @@ func (d DeploymentStrategy) Check() error {
 	}
 }
 
+type IntentConfigType string
+
+const (
+	IntentConfigTypeStandard          IntentConfigType = "standard"
+	IntentConfigTypeCustom            IntentConfigType = "custom"
+	IntentConfigTypeStrict            IntentConfigType = "strict"
+	IntentConfigTypeStandardOverrides IntentConfigType = "standard-overrides"
+	IntentConfigTypeStrictOverrides   IntentConfigType = "strict-overrides"
+)
+
 var emptyAddress common.Address
+var emptyHash common.Hash
 
 type Intent struct {
-	DeploymentStrategy DeploymentStrategy `json:"deploymentStrategy" toml:"deploymentStrategy"`
+	DeploymentStrategy    DeploymentStrategy `json:"deploymentStrategy" toml:"deploymentStrategy"`
+	ConfigType            IntentConfigType   `json:"configType" toml:"configType"`
+	L1ChainID             uint64             `json:"l1ChainID" toml:"l1ChainID"`
+	SuperchainRoles       *SuperchainRoles   `json:"superchainRoles" toml:"superchainRoles,omitempty"`
+	FundDevAccounts       bool               `json:"fundDevAccounts" toml:"fundDevAccounts"`
+	UseInterop            bool               `json:"useInterop" toml:"useInterop"`
+	L1ContractsLocator    *artifacts.Locator `json:"l1ContractsLocator" toml:"l1ContractsLocator"`
+	L2ContractsLocator    *artifacts.Locator `json:"l2ContractsLocator" toml:"l2ContractsLocator"`
+	Chains                []*ChainIntent     `json:"chains" toml:"chains"`
+	GlobalDeployOverrides map[string]any     `json:"globalDeployOverrides" toml:"globalDeployOverrides"`
+}
+
+type SuperchainRoles struct {
+	ProxyAdminOwner       common.Address `json:"proxyAdminOwner" toml:"proxyAdminOwner"`
+	ProtocolVersionsOwner common.Address `json:"protocolVersionsOwner" toml:"protocolVersionsOwner"`
+	Guardian              common.Address `json:"guardian" toml:"guardian"`
+}
+
+var ErrSuperchainRoleZeroAddress = errors.New("SuperchainRole is set to zero address")
+var ErrL1ContractsLocatorUndefined = errors.New("L1ContractsLocator undefined")
+var ErrL2ContractsLocatorUndefined = errors.New("L2ContractsLocator undefined")
 
-	L1ChainID uint64 `json:"l1ChainID" toml:"l1ChainID"`
+func (s *SuperchainRoles) CheckNoZeroAddresses() error {
+	val := reflect.ValueOf(*s)
+	typ := reflect.TypeOf(*s)
 
-	SuperchainRoles *SuperchainRoles `json:"superchainRoles" toml:"superchainRoles,omitempty"`
+	// Iterate through all the fields
+	for i := 0; i < val.NumField(); i++ {
+		fieldValue := val.Field(i)
+		fieldName := typ.Field(i).Name
+
+		if fieldValue.Interface() == (common.Address{}) {
+			return fmt.Errorf("%w: %s", ErrSuperchainRoleZeroAddress, fieldName)
+		}
+	}
+	return nil
+}
 
-	FundDevAccounts bool `json:"fundDevAccounts" toml:"fundDevAccounts"`
+func (c *Intent) L1ChainIDBig() *big.Int {
+	return big.NewInt(int64(c.L1ChainID))
+}
 
-	UseInterop bool `json:"useInterop" toml:"useInterop"`
+func (c *Intent) validateCustomConfig() error {
+	if c.L1ContractsLocator == nil ||
+		(c.L1ContractsLocator.Tag == "" && c.L1ContractsLocator.URL == &url.URL{}) {
+		return ErrL1ContractsLocatorUndefined
+	}
+	if c.L2ContractsLocator == nil ||
+		(c.L2ContractsLocator.Tag == "" && c.L2ContractsLocator.URL == &url.URL{}) {
+		return ErrL2ContractsLocatorUndefined
+	}
 
-	L1ContractsLocator *artifacts.Locator `json:"l1ContractsLocator" toml:"l1ContractsLocator"`
+	if err := c.SuperchainRoles.CheckNoZeroAddresses(); err != nil {
+		return err
+	}
 
-	L2ContractsLocator *artifacts.Locator `json:"l2ContractsLocator" toml:"l2ContractsLocator"`
+	if len(c.Chains) == 0 {
+		return errors.New("must define at least one l2 chain")
+	}
 
-	Chains []*ChainIntent `json:"chains" toml:"chains"`
+	for _, chain := range c.Chains {
+		if err := chain.Check(); err != nil {
+			return err
+		}
+	}
 
-	GlobalDeployOverrides map[string]any `json:"globalDeployOverrides" toml:"globalDeployOverrides"`
+	return nil
 }
 
-func (c *Intent) L1ChainIDBig() *big.Int {
-	return big.NewInt(int64(c.L1ChainID))
+func (c *Intent) validateStrictConfig() error {
+	if err := c.validateStandardValues(); err != nil {
+		return err
+	}
+
+	challenger, _ := standard.ChallengerAddressFor(c.L1ChainID)
+	l1ProxyAdminOwner, _ := standard.L1ProxyAdminOwner(c.L1ChainID)
+	for chainIndex := range c.Chains {
+		if c.Chains[chainIndex].Roles.Challenger != challenger {
+			return fmt.Errorf("invalid challenger address for chain: %s", c.Chains[chainIndex].ID)
+		}
+		if c.Chains[chainIndex].Roles.L1ProxyAdminOwner != l1ProxyAdminOwner {
+			return fmt.Errorf("invalid l1ProxyAdminOwner address for chain: %s", c.Chains[chainIndex].ID)
+		}
+	}
+
+	return nil
 }
 
-func (c *Intent) Check() error {
-	if c.DeploymentStrategy != DeploymentStrategyLive && c.DeploymentStrategy != DeploymentStrategyGenesis {
-		return fmt.Errorf("deploymentStrategy must be 'live' or 'local'")
+// Ensures the following:
+//  1. no zero-values for non-standard fields (user should have populated these)
+//  2. no non-standard values for standard fields (user should not have changed these)
+func (c *Intent) validateStandardValues() error {
+	if err := c.checkL1Prod(); err != nil {
+		return err
+	}
+	if err := c.checkL2Prod(); err != nil {
+		return err
 	}
 
+	standardSuperchainRoles, err := getStandardSuperchainRoles(c.L1ChainID)
+	if err != nil {
+		return fmt.Errorf("error getting standard superchain roles: %w", err)
+	}
+	if *c.SuperchainRoles != *standardSuperchainRoles {
+		return fmt.Errorf("SuperchainRoles does not match standard value")
+	}
+
+	for _, chain := range c.Chains {
+		if err := chain.Check(); err != nil {
+			return err
+		}
+		if chain.Eip1559DenominatorCanyon != standard.Eip1559DenominatorCanyon ||
+			chain.Eip1559Denominator != standard.Eip1559Denominator ||
+			chain.Eip1559Elasticity != standard.Eip1559Elasticity {
+			return fmt.Errorf("%w: chainId=%s", ErrNonStandardValue, chain.ID)
+		}
+	}
+
+	return nil
+}
+
+func getStandardSuperchainRoles(l1ChainId uint64) (*SuperchainRoles, error) {
+	superCfg, err := standard.SuperchainFor(l1ChainId)
+	if err != nil {
+		return nil, fmt.Errorf("error getting superchain config: %w", err)
+	}
+
+	proxyAdminOwner, _ := standard.L1ProxyAdminOwner(l1ChainId)
+	guardian, _ := standard.GuardianAddressFor(l1ChainId)
+
+	superchainRoles := &SuperchainRoles{
+		ProxyAdminOwner:       proxyAdminOwner,
+		ProtocolVersionsOwner: common.Address(*superCfg.Config.ProtocolVersionsAddr),
+		Guardian:              guardian,
+	}
+
+	return superchainRoles, nil
+}
+
+func (c *Intent) Check() error {
 	if c.L1ChainID == 0 {
-		return fmt.Errorf("l1ChainID must be set")
+		return fmt.Errorf("l1ChainID cannot be 0")
+	}
+
+	if err := c.DeploymentStrategy.Check(); err != nil {
+		return err
 	}
 
 	if c.L1ContractsLocator == nil {
-		return errors.New("l1ContractsLocator must be set")
+		return ErrL1ContractsLocatorUndefined
 	}
 
 	if c.L2ContractsLocator == nil {
-		return errors.New("l2ContractsLocator must be set")
+		return ErrL2ContractsLocatorUndefined
 	}
 
 	var err error
-	if c.L1ContractsLocator.IsTag() {
-		err = c.checkL1Prod()
-	} else {
-		err = c.checkL1Dev()
+	switch c.ConfigType {
+	case IntentConfigTypeStandard:
+		err = c.validateStandardValues()
+	case IntentConfigTypeCustom:
+		err = c.validateCustomConfig()
+	case IntentConfigTypeStrict:
+		err = c.validateStrictConfig()
+	case IntentConfigTypeStandardOverrides, IntentConfigTypeStrictOverrides:
+		err = c.validateCustomConfig()
+	default:
+		return fmt.Errorf("intent-config-type unsupported: %s", c.ConfigType)
 	}
 	if err != nil {
-		return err
-	}
-
-	if c.L2ContractsLocator.IsTag() {
-		if err := c.checkL2Prod(); err != nil {
-			return err
-		}
+		return fmt.Errorf("failed to validate intent-config-type=%s: %w", c.ConfigType, err)
 	}
 
 	return nil
@@ -121,100 +249,113 @@ func (c *Intent) checkL1Prod() error {
 	return nil
 }
 
-func (c *Intent) checkL1Dev() error {
-	if c.SuperchainRoles.ProxyAdminOwner == emptyAddress {
-		return fmt.Errorf("proxyAdminOwner must be set")
-	}
-
-	if c.SuperchainRoles.ProtocolVersionsOwner == emptyAddress {
-		c.SuperchainRoles.ProtocolVersionsOwner = c.SuperchainRoles.ProxyAdminOwner
-	}
-
-	if c.SuperchainRoles.Guardian == emptyAddress {
-		c.SuperchainRoles.Guardian = c.SuperchainRoles.ProxyAdminOwner
-	}
-
-	return nil
-}
-
 func (c *Intent) checkL2Prod() error {
 	_, err := standard.ArtifactsURLForTag(c.L2ContractsLocator.Tag)
 	return err
 }
 
-type SuperchainRoles struct {
-	ProxyAdminOwner common.Address `json:"proxyAdminOwner" toml:"proxyAdminOwner"`
-
-	ProtocolVersionsOwner common.Address `json:"protocolVersionsOwner" toml:"protocolVersionsOwner"`
-
-	Guardian common.Address `json:"guardian" toml:"guardian"`
-}
-
-type ChainIntent struct {
-	ID common.Hash `json:"id" toml:"id"`
-
-	BaseFeeVaultRecipient common.Address `json:"baseFeeVaultRecipient" toml:"baseFeeVaultRecipient"`
-
-	L1FeeVaultRecipient common.Address `json:"l1FeeVaultRecipient" toml:"l1FeeVaultRecipient"`
+func NewIntent(configType IntentConfigType, deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2ChainIds []common.Hash) (Intent, error) {
+	switch configType {
+	case IntentConfigTypeCustom:
+		return NewIntentCustom(deploymentStrategy, l1ChainId, l2ChainIds)
 
-	SequencerFeeVaultRecipient common.Address `json:"sequencerFeeVaultRecipient" toml:"sequencerFeeVaultRecipient"`
+	case IntentConfigTypeStandard:
+		return NewIntentStandard(deploymentStrategy, l1ChainId, l2ChainIds)
 
-	Eip1559Denominator uint64 `json:"eip1559Denominator" toml:"eip1559Denominator"`
+	case IntentConfigTypeStandardOverrides:
+		return NewIntentStandardOverrides(deploymentStrategy, l1ChainId, l2ChainIds)
 
-	Eip1559Elasticity uint64 `json:"eip1559Elasticity" toml:"eip1559Elasticity"`
+	case IntentConfigTypeStrict:
+		return NewIntentStrict(deploymentStrategy, l1ChainId, l2ChainIds)
 
-	Roles ChainRoles `json:"roles" toml:"roles"`
+	case IntentConfigTypeStrictOverrides:
+		return NewIntentStrictOverrides(deploymentStrategy, l1ChainId, l2ChainIds)
 
-	DeployOverrides map[string]any `json:"deployOverrides" toml:"deployOverrides"`
-
-	DangerousAltDAConfig genesis.AltDADeployConfig `json:"dangerousAltDAConfig,omitempty" toml:"dangerousAltDAConfig,omitempty"`
+	default:
+		return Intent{}, fmt.Errorf("intent config type not supported")
+	}
 }
 
-type ChainRoles struct {
-	L1ProxyAdminOwner common.Address `json:"l1ProxyAdminOwner" toml:"l1ProxyAdminOwner"`
-
-	L2ProxyAdminOwner common.Address `json:"l2ProxyAdminOwner" toml:"l2ProxyAdminOwner"`
-
-	SystemConfigOwner common.Address `json:"systemConfigOwner" toml:"systemConfigOwner"`
-
-	UnsafeBlockSigner common.Address `json:"unsafeBlockSigner" toml:"unsafeBlockSigner"`
-
-	Batcher common.Address `json:"batcher" toml:"batcher"`
-
-	Proposer common.Address `json:"proposer" toml:"proposer"`
+// Sets all Intent fields to their zero value with the expectation that the
+// user will populate the values before running 'apply'
+func NewIntentCustom(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2ChainIds []common.Hash) (Intent, error) {
+	intent := Intent{
+		DeploymentStrategy: deploymentStrategy,
+		ConfigType:         IntentConfigTypeCustom,
+		L1ChainID:          l1ChainId,
+		L1ContractsLocator: &artifacts.Locator{URL: &url.URL{}},
+		L2ContractsLocator: &artifacts.Locator{URL: &url.URL{}},
+		SuperchainRoles:    &SuperchainRoles{},
+	}
 
-	Challenger common.Address `json:"challenger" toml:"challenger"`
+	for _, l2ChainID := range l2ChainIds {
+		intent.Chains = append(intent.Chains, &ChainIntent{
+			ID: l2ChainID,
+		})
+	}
+	return intent, nil
 }
 
-func (c *ChainIntent) Check() error {
-	var emptyHash common.Hash
-	if c.ID == emptyHash {
-		return fmt.Errorf("id must be set")
+func NewIntentStandard(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2ChainIds []common.Hash) (Intent, error) {
+	intent := Intent{
+		DeploymentStrategy: deploymentStrategy,
+		ConfigType:         IntentConfigTypeStandard,
+		L1ChainID:          l1ChainId,
+		L1ContractsLocator: artifacts.DefaultL1ContractsLocator,
+		L2ContractsLocator: artifacts.DefaultL2ContractsLocator,
 	}
 
-	if c.Roles.L1ProxyAdminOwner == emptyAddress {
-		return fmt.Errorf("proxyAdminOwner must be set")
+	superchainRoles, err := getStandardSuperchainRoles(l1ChainId)
+	if err != nil {
+		return Intent{}, fmt.Errorf("error getting standard superchain roles: %w", err)
 	}
-
-	if c.Roles.SystemConfigOwner == emptyAddress {
-		c.Roles.SystemConfigOwner = c.Roles.L1ProxyAdminOwner
+	intent.SuperchainRoles = superchainRoles
+
+	for _, l2ChainID := range l2ChainIds {
+		intent.Chains = append(intent.Chains, &ChainIntent{
+			ID:                       l2ChainID,
+			Eip1559DenominatorCanyon: standard.Eip1559DenominatorCanyon,
+			Eip1559Denominator:       standard.Eip1559Denominator,
+			Eip1559Elasticity:        standard.Eip1559Elasticity,
+		})
 	}
+	return intent, nil
+}
 
-	if c.Roles.L2ProxyAdminOwner == emptyAddress {
-		return fmt.Errorf("l2ProxyAdminOwner must be set")
+func NewIntentStandardOverrides(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2ChainIds []common.Hash) (Intent, error) {
+	intent, err := NewIntentStandard(deploymentStrategy, l1ChainId, l2ChainIds)
+	if err != nil {
+		return Intent{}, err
 	}
+	intent.ConfigType = IntentConfigTypeStandardOverrides
 
-	if c.Roles.UnsafeBlockSigner == emptyAddress {
-		return fmt.Errorf("unsafeBlockSigner must be set")
+	return intent, nil
+}
+
+// Same as NewIntentStandard, but also sets l2 Challenger and L1ProxyAdminOwner
+// addresses to standard values
+func NewIntentStrict(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2ChainIds []common.Hash) (Intent, error) {
+	intent, err := NewIntentStandard(deploymentStrategy, l1ChainId, l2ChainIds)
+	if err != nil {
+		return Intent{}, err
 	}
+	intent.ConfigType = IntentConfigTypeStrict
 
-	if c.Roles.Batcher == emptyAddress {
-		return fmt.Errorf("batcher must be set")
+	challenger, _ := standard.ChallengerAddressFor(l1ChainId)
+	l1ProxyAdminOwner, _ := standard.ManagerOwnerAddrFor(l1ChainId)
+	for chainIndex := range intent.Chains {
+		intent.Chains[chainIndex].Roles.Challenger = challenger
+		intent.Chains[chainIndex].Roles.L1ProxyAdminOwner = l1ProxyAdminOwner
 	}
+	return intent, nil
+}
 
-	if c.DangerousAltDAConfig.UseAltDA {
-		return c.DangerousAltDAConfig.Check(nil)
+func NewIntentStrictOverrides(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2ChainIds []common.Hash) (Intent, error) {
+	intent, err := NewIntentStrict(deploymentStrategy, l1ChainId, l2ChainIds)
+	if err != nil {
+		return Intent{}, err
 	}
+	intent.ConfigType = IntentConfigTypeStrictOverrides
 
-	return nil
+	return intent, nil
 }
diff --git a/op-deployer/pkg/deployer/state/intent_test.go b/op-deployer/pkg/deployer/state/intent_test.go
new file mode 100644
index 000000000000..1d8c12375f88
--- /dev/null
+++ b/op-deployer/pkg/deployer/state/intent_test.go
@@ -0,0 +1,89 @@
+package state
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
+)
+
+func TestValidateStandardValues(t *testing.T) {
+	intent, err := NewIntentStandard(DeploymentStrategyLive, 1, []common.Hash{common.HexToHash("0x336")})
+	require.NoError(t, err)
+
+	err = intent.Check()
+	require.Error(t, err)
+	require.ErrorIs(t, err, ErrChainRoleZeroAddress)
+
+	setChainRoles(&intent)
+	err = intent.Check()
+	require.Error(t, err)
+	require.ErrorIs(t, err, ErrFeeVaultZeroAddress)
+
+	setFeeAddresses(&intent)
+	err = intent.Check()
+	require.NoError(t, err)
+
+	intent.Chains[0].Eip1559Denominator = 3 // set to non-standard value
+	err = intent.Check()
+	require.Error(t, err)
+	require.ErrorIs(t, err, ErrNonStandardValue)
+}
+
+func TestValidateCustomValues(t *testing.T) {
+	intent, err := NewIntentCustom(DeploymentStrategyLive, 1, []common.Hash{common.HexToHash("0x336")})
+	require.NoError(t, err)
+
+	err = intent.Check()
+	require.Error(t, err)
+	require.ErrorIs(t, err, ErrSuperchainRoleZeroAddress)
+
+	setSuperchainRoles(&intent)
+	err = intent.Check()
+	require.Error(t, err)
+	require.ErrorIs(t, err, ErrChainRoleZeroAddress)
+
+	setChainRoles(&intent)
+	err = intent.Check()
+	require.Error(t, err)
+	require.ErrorIs(t, err, ErrEip1559ZeroValue)
+
+	setEip1559Params(&intent)
+	err = intent.Check()
+	require.Error(t, err)
+	require.ErrorIs(t, err, ErrFeeVaultZeroAddress)
+
+	setFeeAddresses(&intent)
+	err = intent.Check()
+	require.NoError(t, err)
+}
+
+func setSuperchainRoles(intent *Intent) {
+	intent.SuperchainRoles = &SuperchainRoles{
+		ProxyAdminOwner:       common.HexToAddress("0xa"),
+		ProtocolVersionsOwner: common.HexToAddress("0xb"),
+		Guardian:              common.HexToAddress("0xc"),
+	}
+}
+
+func setEip1559Params(intent *Intent) {
+	intent.Chains[0].Eip1559Denominator = 5000
+	intent.Chains[0].Eip1559DenominatorCanyon = 5000
+	intent.Chains[0].Eip1559Elasticity = 5000
+}
+
+func setChainRoles(intent *Intent) {
+	intent.Chains[0].Roles.L1ProxyAdminOwner = common.HexToAddress("0x01")
+	intent.Chains[0].Roles.L2ProxyAdminOwner = common.HexToAddress("0x02")
+	intent.Chains[0].Roles.SystemConfigOwner = common.HexToAddress("0x03")
+	intent.Chains[0].Roles.UnsafeBlockSigner = common.HexToAddress("0x04")
+	intent.Chains[0].Roles.Batcher = common.HexToAddress("0x05")
+	intent.Chains[0].Roles.Proposer = common.HexToAddress("0x06")
+	intent.Chains[0].Roles.Challenger = common.HexToAddress("0x07")
+}
+
+func setFeeAddresses(intent *Intent) {
+	intent.Chains[0].BaseFeeVaultRecipient = common.HexToAddress("0x08")
+	intent.Chains[0].L1FeeVaultRecipient = common.HexToAddress("0x09")
+	intent.Chains[0].SequencerFeeVaultRecipient = common.HexToAddress("0x0A")
+}

From 601af96c8285f27c967d3058c7a2311b46544316 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 27 Nov 2024 13:05:25 -0700
Subject: [PATCH 297/451] op-deployer: Bring back error checking in
 getStandardSuperchainRoles (#13129)

---
 op-deployer/pkg/deployer/state/intent.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index ab76eb4fb4f6..067ea5bead6d 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -173,8 +173,14 @@ func getStandardSuperchainRoles(l1ChainId uint64) (*SuperchainRoles, error) {
 		return nil, fmt.Errorf("error getting superchain config: %w", err)
 	}
 
-	proxyAdminOwner, _ := standard.L1ProxyAdminOwner(l1ChainId)
-	guardian, _ := standard.GuardianAddressFor(l1ChainId)
+	proxyAdminOwner, err := standard.L1ProxyAdminOwner(l1ChainId)
+	if err != nil {
+		return nil, fmt.Errorf("error getting L1ProxyAdminOwner: %w", err)
+	}
+	guardian, err := standard.GuardianAddressFor(l1ChainId)
+	if err != nil {
+		return nil, fmt.Errorf("error getting guardian address: %w", err)
+	}
 
 	superchainRoles := &SuperchainRoles{
 		ProxyAdminOwner:       proxyAdminOwner,

From 2bbfd5dc783dff57cb42f4da8c971c5f1db4204d Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 27 Nov 2024 12:55:13 -0800
Subject: [PATCH 298/451] make: Remove unused install-geth target (#13130)

---
 Makefile         | 11 -----------
 op-e2e/README.md |  1 -
 2 files changed, 12 deletions(-)

diff --git a/Makefile b/Makefile
index 9830a3060cb2..4ea83bab36e1 100644
--- a/Makefile
+++ b/Makefile
@@ -173,9 +173,6 @@ nuke: clean devnet-clean ## Completely clean the project directory
 
 ## Prepares for running a local devnet
 pre-devnet: submodules $(DEVNET_CANNON_PRESTATE_FILES)
-	@if ! [ -x "$$(command -v geth)" ]; then \
-		make install-geth; \
-	fi
 	@if ! [ -x "$$(command -v eth2-testnet-genesis)" ]; then \
 		make install-eth2-testnet-genesis; \
 	fi
@@ -247,14 +244,6 @@ update-op-geth: ## Updates the Geth version used in the project
 	./ops/scripts/update-op-geth.py
 .PHONY: update-op-geth
 
-install-geth: ## Installs or updates Geth if versions do not match
-	./ops/scripts/geth-version-checker.sh && \
-	 	(echo "Geth versions match, not installing geth..."; true) || \
- 		(echo "Versions do not match, installing geth!"; \
- 			go install -v github.com/ethereum/go-ethereum/cmd/geth@$(shell jq -r .geth < versions.json); \
- 			echo "Installed geth!"; true)
-.PHONY: install-geth
-
 install-eth2-testnet-genesis:
 	go install -v github.com/protolambda/eth2-testnet-genesis@$(shell jq -r .eth2_testnet_genesis < versions.json)
 .PHONY: install-eth2-testnet-genesis
diff --git a/op-e2e/README.md b/op-e2e/README.md
index d6f096194224..a52eaab63259 100644
--- a/op-e2e/README.md
+++ b/op-e2e/README.md
@@ -5,7 +5,6 @@ created with the `bedrock-devnet` package. To create this state,
 run the following commands from the root of the repository:
 
 ```bash
-make install-geth
 make cannon-prestate
 make devnet-allocs
 ```

From cf13a17a06c22e1882b94d5a7e567912af6c5555 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann@oplabs.co>
Date: Wed, 27 Nov 2024 22:07:37 +0100
Subject: [PATCH 299/451] build: migrate op-node and op-proposer to just
 (#13042)

* build(just): factor out flags code

This will enable making use of JUSTFLAGS in the main Makefile for
migrated targets.

* fix(just): parallel support

For some unclear reason runs in CI environment are invalid (they
generate some "empty" calls to the private target).
Sidestep the issue for now.

* build(just): add more helpers

- VERSION_META variable
- go_generate target

* build(op-proposer): migrate build to just

* build(op-node): migrate build to just

* fix(build): rewire just-migrated targets

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 Makefile             |  9 ++++--
 just/default.just    |  5 ++--
 just/deprecated.mk   | 34 ++++++-----------------
 just/flags.mk        | 24 ++++++++++++++++
 just/git.just        |  2 ++
 just/go.just         |  4 +++
 op-batcher/justfile  | 19 +++++++------
 op-node/Makefile     | 66 ++------------------------------------------
 op-node/justfile     | 49 ++++++++++++++++++++++++++++++++
 op-proposer/Makefile | 35 ++---------------------
 op-proposer/justfile | 20 ++++++++++++++
 11 files changed, 130 insertions(+), 137 deletions(-)
 create mode 100644 just/flags.mk
 create mode 100644 op-node/justfile
 create mode 100644 op-proposer/justfile

diff --git a/Makefile b/Makefile
index 4ea83bab36e1..4c901d2158ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+# provide JUSTFLAGS for just-backed targets
+include ./just/flags.mk
+
 COMPOSEFLAGS=-d
 ITESTS_L2_HOST=http://localhost:9545
 BEDROCK_TAGS_REMOTE?=origin
@@ -94,7 +97,7 @@ submodules: ## Updates git submodules
 
 
 op-node: ## Builds op-node binary
-	make -C ./op-node op-node
+	just $(JUSTFLAGS) ./op-node/op-node
 .PHONY: op-node
 
 generate-mocks-op-node: ## Generates mocks for op-node
@@ -106,11 +109,11 @@ generate-mocks-op-service: ## Generates mocks for op-service
 .PHONY: generate-mocks-op-service
 
 op-batcher: ## Builds op-batcher binary
-	make -C ./op-batcher op-batcher
+	just $(JUSTFLAGS) ./op-batcher/op-batcher
 .PHONY: op-batcher
 
 op-proposer: ## Builds op-proposer binary
-	make -C ./op-proposer op-proposer
+	just $(JUSTFLAGS) ./op-proposer/op-proposer
 .PHONY: op-proposer
 
 op-challenger: ## Builds op-challenger binary
diff --git a/just/default.just b/just/default.just
index 220c27dca5c2..92503b23ba58 100644
--- a/just/default.just
+++ b/just/default.just
@@ -1,5 +1,6 @@
 set shell := ["bash", "-c"]
 
-PARALLEL := num_cpus()
+PARALLEL_JOBS := num_cpus()
 
-MAP_JUST := "/usr/bin/env -S parallel --shebang --jobs " + PARALLEL + " --colsep ' ' -r " + just_executable()
+# TODO: this fails in CI for some reason
+MAP_JUST := "/usr/bin/env -S parallel --shebang --jobs " + PARALLEL_JOBS + " --colsep ' ' -r " + just_executable()
diff --git a/just/deprecated.mk b/just/deprecated.mk
index a18d665c0548..655f901348d6 100644
--- a/just/deprecated.mk
+++ b/just/deprecated.mk
@@ -1,42 +1,24 @@
 ifeq (, $(shell which tput))
   # CI environment typically does not support tput.
   banner-style = $1
+else ifeq (, $(TERM))
+  # Terminal type not set, so tput would fail.
+  banner-style = $1
 else
   # print in bold red to bring attention.
   banner-style = $(shell tput bold)$(shell tput setaf 1)$1$(shell tput sgr0)
 endif
 
-# Variable assignments can affect the semantic of the make targets.
-# Typical use-case: setting VERSION in a release build, since CI
-# doesn't preserve the git environment.
-#
-# We need to translate:
-# "make target VAR=val" to "just VAR=val target"
-#
-# MAKEFLAGS is a string of the form:
-# "abc --foo --bar=baz -- VAR1=val1 VAR2=val2", namely:
-# - abc is the concatnation of all short flags
-# - --foo and --bar=baz are long options,
-# - -- is the separator between flags and variable assignments,
-# - VAR1=val1 and VAR2=val2 are variable assignments
-#
-# Goal: ignore all CLI flags, keep only variable assignments.
-#
-# First remove the short flags at the beginning, or the first long-flag,
-# or if there is no flag at all, the -- separator (which then makes the
-# next step a noop). If there's no flag and no variable assignment, the
-# result is empty anyway, so the wordlist call is safe (everything is a noop).
-tmp-flags = $(wordlist 2,$(words $(MAKEFLAGS)),$(MAKEFLAGS))
-# Then remove all long options, including the -- separator, if needed. That
-# leaves only variable assignments.
-just-flags = $(patsubst --%,,$(tmp-flags))
+SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(SELF_DIR)/flags.mk
 
 define make-deprecated-target
 $1:
 	@echo
-	@printf %s\\n '$(call banner-style,"make $1 $(just-flags)" is deprecated. Please use "just $(just-flags) $1" instead.)'
+	@printf %s\\n '$(call banner-style,Deprecated make call: make $1 $(JUSTFLAGS))'
+	@printf %s\\n '$(call banner-style,Consider using just instead: just $(JUSTFLAGS) $1)'
 	@echo
-	just $(just-flags) $1
+	just $(JUSTFLAGS) $1
 endef
 
 $(foreach element,$(DEPRECATED_TARGETS),$(eval $(call make-deprecated-target,$(element))))
diff --git a/just/flags.mk b/just/flags.mk
new file mode 100644
index 000000000000..121a3eb70e98
--- /dev/null
+++ b/just/flags.mk
@@ -0,0 +1,24 @@
+# Variable assignments can affect the semantic of the make targets.
+# Typical use-case: setting VERSION in a release build, since CI
+# doesn't preserve the git environment.
+#
+# We need to translate:
+# "make target VAR=val" to "just VAR=val target"
+#
+# MAKEFLAGS is a string of the form:
+# "abc --foo --bar=baz -- VAR1=val1 VAR2=val2", namely:
+# - abc is the concatnation of all short flags
+# - --foo and --bar=baz are long options,
+# - -- is the separator between flags and variable assignments,
+# - VAR1=val1 and VAR2=val2 are variable assignments
+#
+# Goal: ignore all CLI flags, keep only variable assignments.
+#
+# First remove the short flags at the beginning, or the first long-flag,
+# or if there is no flag at all, the -- separator (which then makes the
+# next step a noop). If there's no flag and no variable assignment, the
+# result is empty anyway, so the wordlist call is safe (everything is a noop).
+tmp-flags := $(wordlist 2,$(words $(MAKEFLAGS)),$(MAKEFLAGS))
+# Then remove all long options, including the -- separator, if needed. That
+# leaves only variable assignments.
+JUSTFLAGS := $(patsubst --%,,$(tmp-flags))
\ No newline at end of file
diff --git a/just/git.just b/just/git.just
index 922286d7ab5a..ac50e4e762d1 100644
--- a/just/git.just
+++ b/just/git.just
@@ -24,3 +24,5 @@ VERSION := shell('if [ -z "$1" ]; then
 else
     echo $1
 fi', _PREFERRED_TAG, _LAST_TAG)
+
+VERSION_META := ""
diff --git a/just/go.just b/just/go.just
index 5af766295099..3a394e3ec94c 100644
--- a/just/go.just
+++ b/just/go.just
@@ -25,3 +25,7 @@ go_test SELECTOR *FLAGS:
 
 [private]
 go_fuzz FUZZ TIME='10s' PKG='': (go_test PKG _EXTRALDFLAGS "-fuzztime" TIME "-fuzz" FUZZ "-run" "NOTAREALTEST")
+
+[private]
+go_generate SELECTOR *FLAGS:
+    go generate -v {{FLAGS}} {{SELECTOR}}
\ No newline at end of file
diff --git a/op-batcher/justfile b/op-batcher/justfile
index 2647debbcb43..a0c671ebd28a 100644
--- a/op-batcher/justfile
+++ b/op-batcher/justfile
@@ -24,12 +24,13 @@ batcher_fuzz_task FUZZ TIME='10s': (go_fuzz FUZZ TIME "./batcher")
 
 # Run fuzzing tests
 fuzz:
-    #!{{MAP_JUST}} batcher_fuzz_task
-    FuzzChannelConfig_CheckTimeout
-    FuzzDurationZero
-    FuzzDurationTimeoutMaxChannelDuration
-    FuzzDurationTimeoutZeroMaxChannelDuration
-    FuzzChannelCloseTimeout
-    FuzzChannelZeroCloseTimeout
-    FuzzSeqWindowClose
-    FuzzSeqWindowZeroTimeoutClose
+    printf "%s\n" \
+        "FuzzChannelConfig_CheckTimeout" \
+        "FuzzDurationZero" \
+        "FuzzDurationTimeoutMaxChannelDuration" \
+        "FuzzDurationTimeoutZeroMaxChannelDuration" \
+        "FuzzChannelCloseTimeout" \
+        "FuzzChannelZeroCloseTimeout" \
+        "FuzzSeqWindowClose" \
+        "FuzzSeqWindowZeroTimeoutClose" \
+    | parallel -j {{PARALLEL_JOBS}} {{just_executable()}} batcher_fuzz_task {}
diff --git a/op-node/Makefile b/op-node/Makefile
index c1d480d9b71a..b63f489925ac 100644
--- a/op-node/Makefile
+++ b/op-node/Makefile
@@ -1,65 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-# Find the github tag that points to this commit. If none are found, set the version string to "untagged"
-# Prioritizes release tag, if one exists, over tags suffixed with "-rc"
-VERSION ?= $(shell tags=$$(git tag --points-at $(GITCOMMIT) | grep '^op-node/' | sed 's/op-node\///' | sort -V); \
-             preferred_tag=$$(echo "$$tags" | grep -v -- '-rc' | tail -n 1); \
-             if [ -z "$$preferred_tag" ]; then \
-                 if [ -z "$$tags" ]; then \
-                     echo "untagged"; \
-                 else \
-                     echo "$$tags" | tail -n 1; \
-                 fi \
-             else \
-                 echo $$preferred_tag; \
-             fi)
+DEPRECATED_TARGETS := op-node clean test fuzz generate-mocks readme
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-node/version.Version=$(VERSION)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-node/version.Meta=$(VERSION_META)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
-ifeq ($(shell uname),Darwin)
-	FUZZLDFLAGS := -ldflags=-extldflags=-Wl,-ld_classic
-endif
-
-op-node:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-node ./cmd/main.go
-
-clean:
-	rm bin/op-node
-
-test:
-	go test -v ./...
-
-fuzz:
-	printf "%s\n" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoBedrockRoundTrip ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoEcotoneRoundTrip ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzL1InfoAgainstContract ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzUnmarshallLogEvent ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseFrames ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzFrameUnmarshalBinary ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzBatchRoundTrip ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDeriveDepositsRoundTrip ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDeriveDepositsBadVersion ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseL1InfoDepositTxDataValid ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzParseL1InfoDepositTxDataBadLength ./rollup/derive" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzRejectCreateBlockBadTimestamp ./rollup/driver" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDecodeDepositTxDataToL1Info ./rollup/driver" \
-	| parallel -j 8 {}
-
-generate-mocks:
-	go generate ./...
-
-readme:
-	doctoc README.md
-
-.PHONY: \
-	op-node \
-	clean \
-	test \
-	fuzz \
-	readme
+include ../just/deprecated.mk
diff --git a/op-node/justfile b/op-node/justfile
new file mode 100644
index 000000000000..46aadcc84b39
--- /dev/null
+++ b/op-node/justfile
@@ -0,0 +1,49 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-node/version.Version=" + VERSION + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-node/version.Meta=" + VERSION_META + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-node"
+
+# Build op-node binary
+op-node: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
+
+# Clean build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")
+
+# Generate mocks
+generate-mocks: (go_generate "./...")
+
+# Update readme
+readme:
+    doctoc README.md
+
+[private]
+node_fuzz_task FUZZ TIME='10s': (go_fuzz FUZZ TIME "./rollup/derive")
+
+# Run fuzz tests
+fuzz:
+	printf "%s\n" \
+		"FuzzL1InfoBedrockRoundTrip" \
+		"FuzzL1InfoEcotoneRoundTrip" \
+		"FuzzL1InfoAgainstContract" \
+		"FuzzUnmarshallLogEvent" \
+		"FuzzParseFrames" \
+		"FuzzFrameUnmarshalBinary" \
+		"FuzzBatchRoundTrip" \
+		"FuzzDeriveDepositsRoundTrip" \
+		"FuzzDeriveDepositsBadVersion" \
+		"FuzzParseL1InfoDepositTxDataValid" \
+		"FuzzParseL1InfoDepositTxDataBadLength" \
+		"FuzzRejectCreateBlockBadTimestamp" \
+		"FuzzDecodeDepositTxDataToL1Info" \
+	| parallel -j {{PARALLEL_JOBS}} {{just_executable()}} node_fuzz_task {}
diff --git a/op-proposer/Makefile b/op-proposer/Makefile
index 561d7d32f301..3a036e6d5d59 100644
--- a/op-proposer/Makefile
+++ b/op-proposer/Makefile
@@ -1,34 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-# Find the github tag that points to this commit. If none are found, set the version string to "untagged"
-# Prioritizes release tag, if one exists, over tags suffixed with "-rc"
-VERSION ?= $(shell tags=$$(git tag --points-at $(GITCOMMIT) | grep '^op-proposer/' | sed 's/op-proposer\///' | sort -V); \
-             preferred_tag=$$(echo "$$tags" | grep -v -- '-rc' | tail -n 1); \
-             if [ -z "$$preferred_tag" ]; then \
-                 if [ -z "$$tags" ]; then \
-                     echo "untagged"; \
-                 else \
-                     echo "$$tags" | tail -n 1; \
-                 fi \
-             else \
-                 echo $$preferred_tag; \
-             fi)
+DEPRECATED_TARGETS := op-proposer clean test
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X main.Version=$(VERSION)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-op-proposer:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-proposer ./cmd
-
-clean:
-	rm bin/op-proposer
-
-test:
-	go test -v ./...
-
-.PHONY: \
-	clean \
-	op-proposer \
-	test
+include ../just/deprecated.mk
diff --git a/op-proposer/justfile b/op-proposer/justfile
new file mode 100644
index 000000000000..08b1b7b73911
--- /dev/null
+++ b/op-proposer/justfile
@@ -0,0 +1,20 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X main.Version=" + VERSION + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-proposer"
+
+# Build op-proposer binary
+op-proposer: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
+
+# Clean build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")

From af169dbad72fd22dca7aba26adfed133817eb635 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Wed, 27 Nov 2024 16:08:59 -0500
Subject: [PATCH 300/451] feat(op-deployer): `asterisc` bootstrap CLI (#13113)

* feat(op-deployer): `asterisc` bootstrap CLI

* rename file

* flags

* mslipper review

* golint

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 .../pkg/deployer/bootstrap/asterisc.go        | 185 ++++++++++++++++++
 op-deployer/pkg/deployer/bootstrap/flags.go   |  13 +-
 op-deployer/pkg/deployer/opcm/asterisc.go     |  64 ++++++
 .../pkg/deployer/opcm/asterisc_test.go        |  34 ++++
 .../scripts/deploy/DeployAsterisc.s.sol       |  89 +++++++++
 .../src/vendor/asterisc/interfaces/IRISCV.sol |  14 ++
 6 files changed, 397 insertions(+), 2 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/asterisc.go
 create mode 100644 op-deployer/pkg/deployer/opcm/asterisc.go
 create mode 100644 op-deployer/pkg/deployer/opcm/asterisc_test.go
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol
 create mode 100644 packages/contracts-bedrock/src/vendor/asterisc/interfaces/IRISCV.sol

diff --git a/op-deployer/pkg/deployer/bootstrap/asterisc.go b/op-deployer/pkg/deployer/bootstrap/asterisc.go
new file mode 100644
index 000000000000..bad2b5ebbb11
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/asterisc.go
@@ -0,0 +1,185 @@
+package bootstrap
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"fmt"
+	"strings"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
+	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/urfave/cli/v2"
+)
+
+type AsteriscConfig struct {
+	L1RPCUrl         string
+	PrivateKey       string
+	Logger           log.Logger
+	ArtifactsLocator *artifacts.Locator
+
+	privateKeyECDSA *ecdsa.PrivateKey
+
+	PreimageOracle common.Address
+}
+
+func (c *AsteriscConfig) Check() error {
+	if c.L1RPCUrl == "" {
+		return fmt.Errorf("l1RPCUrl must be specified")
+	}
+
+	if c.PrivateKey == "" {
+		return fmt.Errorf("private key must be specified")
+	}
+
+	privECDSA, err := crypto.HexToECDSA(strings.TrimPrefix(c.PrivateKey, "0x"))
+	if err != nil {
+		return fmt.Errorf("failed to parse private key: %w", err)
+	}
+	c.privateKeyECDSA = privECDSA
+
+	if c.Logger == nil {
+		return fmt.Errorf("logger must be specified")
+	}
+
+	if c.ArtifactsLocator == nil {
+		return fmt.Errorf("artifacts locator must be specified")
+	}
+
+	if c.PreimageOracle == (common.Address{}) {
+		return fmt.Errorf("preimage oracle must be specified")
+	}
+
+	return nil
+}
+
+func AsteriscCLI(cliCtx *cli.Context) error {
+	logCfg := oplog.ReadCLIConfig(cliCtx)
+	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
+	oplog.SetGlobalLogHandler(l.Handler())
+
+	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
+	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
+	artifactsLocator := new(artifacts.Locator)
+	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
+		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+	}
+
+	preimageOracle := common.HexToAddress(cliCtx.String(PreimageOracleFlagName))
+
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+
+	return Asterisc(ctx, AsteriscConfig{
+		L1RPCUrl:         l1RPCUrl,
+		PrivateKey:       privateKey,
+		Logger:           l,
+		ArtifactsLocator: artifactsLocator,
+		PreimageOracle:   preimageOracle,
+	})
+}
+
+func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
+	if err := cfg.Check(); err != nil {
+		return fmt.Errorf("invalid config for Asterisc: %w", err)
+	}
+
+	lgr := cfg.Logger
+	progressor := func(curr, total int64) {
+		lgr.Info("artifacts download progress", "current", curr, "total", total)
+	}
+
+	artifactsFS, cleanup, err := artifacts.Download(ctx, cfg.ArtifactsLocator, progressor)
+	if err != nil {
+		return fmt.Errorf("failed to download artifacts: %w", err)
+	}
+	defer func() {
+		if err := cleanup(); err != nil {
+			lgr.Warn("failed to clean up artifacts", "err", err)
+		}
+	}()
+
+	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	chainID, err := l1Client.ChainID(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get chain ID: %w", err)
+	}
+
+	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
+	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
+
+	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+		Logger:  lgr,
+		ChainID: chainID,
+		Client:  l1Client,
+		Signer:  signer,
+		From:    chainDeployer,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create broadcaster: %w", err)
+	}
+
+	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	l1Host, err := env.DefaultScriptHost(
+		bcaster,
+		lgr,
+		chainDeployer,
+		artifactsFS,
+		script.WithForkHook(func(cfg *script.ForkConfig) (forking.ForkSource, error) {
+			src, err := forking.RPCSourceByNumber(cfg.URLOrAlias, l1RPC, *cfg.BlockNumber)
+			if err != nil {
+				return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
+			}
+			return forking.Cache(src), nil
+		}),
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create script host: %w", err)
+	}
+
+	dgo, err := opcm.DeployAsterisc(
+		l1Host,
+		opcm.DeployAsteriscInput{
+			PreimageOracle: cfg.PreimageOracle,
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("error deploying asterisc VM: %w", err)
+	}
+
+	if _, err := bcaster.Broadcast(ctx); err != nil {
+		return fmt.Errorf("failed to broadcast: %w", err)
+	}
+
+	lgr.Info("deployed asterisc VM")
+
+	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index b35e96a5f6a1..58fb7fc14368 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -194,14 +194,17 @@ var DisputeGameFlags = []cli.Flag{
 	ChallengerFlag,
 }
 
-var MIPSFlags = []cli.Flag{
+var BaseFPVMFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
 	ArtifactsLocatorFlag,
 	PreimageOracleFlag,
-	MIPSVersionFlag,
 }
 
+var MIPSFlags = append(BaseFPVMFlags, MIPSVersionFlag)
+
+var AsteriscFlags = BaseFPVMFlags
+
 var Commands = []*cli.Command{
 	{
 		Name:   "opcm",
@@ -227,4 +230,10 @@ var Commands = []*cli.Command{
 		Flags:  cliapp.ProtectFlags(MIPSFlags),
 		Action: MIPSCLI,
 	},
+	{
+		Name:   "asterisc",
+		Usage:  "Bootstrap an instance of Asterisc.",
+		Flags:  cliapp.ProtectFlags(AsteriscFlags),
+		Action: AsteriscCLI,
+	},
 }
diff --git a/op-deployer/pkg/deployer/opcm/asterisc.go b/op-deployer/pkg/deployer/opcm/asterisc.go
new file mode 100644
index 000000000000..9ba8959e3543
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/asterisc.go
@@ -0,0 +1,64 @@
+package opcm
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+)
+
+type DeployAsteriscInput struct {
+	PreimageOracle common.Address
+}
+
+func (input *DeployAsteriscInput) InputSet() bool {
+	return true
+}
+
+type DeployAsteriscOutput struct {
+	AsteriscSingleton common.Address
+}
+
+func (output *DeployAsteriscOutput) CheckOutput(input common.Address) error {
+	return nil
+}
+
+type DeployAsteriscScript struct {
+	Run func(input, output common.Address) error
+}
+
+func DeployAsterisc(
+	host *script.Host,
+	input DeployAsteriscInput,
+) (DeployAsteriscOutput, error) {
+	var output DeployAsteriscOutput
+	inputAddr := host.NewScriptAddress()
+	outputAddr := host.NewScriptAddress()
+
+	cleanupInput, err := script.WithPrecompileAtAddress[*DeployAsteriscInput](host, inputAddr, &input)
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployAsteriscInput precompile: %w", err)
+	}
+	defer cleanupInput()
+
+	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployAsteriscOutput](host, outputAddr, &output,
+		script.WithFieldSetter[*DeployAsteriscOutput])
+	if err != nil {
+		return output, fmt.Errorf("failed to insert DeployAsteriscOutput precompile: %w", err)
+	}
+	defer cleanupOutput()
+
+	implContract := "DeployAsterisc"
+	deployScript, cleanupDeploy, err := script.WithScript[DeployAsteriscScript](host, "DeployAsterisc.s.sol", implContract)
+	if err != nil {
+		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
+	}
+	defer cleanupDeploy()
+
+	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
+	}
+
+	return output, nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/asterisc_test.go b/op-deployer/pkg/deployer/opcm/asterisc_test.go
new file mode 100644
index 000000000000..0ed68f7aeaff
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/asterisc_test.go
@@ -0,0 +1,34 @@
+package opcm
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployAsterisc(t *testing.T) {
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+	)
+	require.NoError(t, err)
+
+	input := DeployAsteriscInput{
+		PreimageOracle: common.Address{0xab},
+	}
+
+	output, err := DeployAsterisc(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.AsteriscSingleton)
+}
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol
new file mode 100644
index 000000000000..09601eb0d8e2
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+// Forge
+import { Script } from "forge-std/Script.sol";
+
+// Scripts
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+// Interfaces
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IRISCV } from "src/vendor/asterisc/interfaces/IRISCV.sol";
+
+/// @title DeployAsteriscInput
+contract DeployAsteriscInput is BaseDeployIO {
+    // Specify the PreimageOracle to use
+    address internal _preimageOracle;
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.preimageOracle.selector) {
+            require(_value != address(0), "DeployAsterisc: preimageOracle cannot be empty");
+            _preimageOracle = _value;
+        } else {
+            revert("DeployAsterisc: unknown selector");
+        }
+    }
+
+    function preimageOracle() public view returns (address) {
+        require(_preimageOracle != address(0), "DeployAsterisc: preimageOracle not set");
+        return _preimageOracle;
+    }
+}
+
+/// @title DeployAsteriscOutput
+contract DeployAsteriscOutput is BaseDeployIO {
+    IRISCV internal _asteriscSingleton;
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.asteriscSingleton.selector) {
+            require(_value != address(0), "DeployAsterisc: asteriscSingleton cannot be zero address");
+            _asteriscSingleton = IRISCV(_value);
+        } else {
+            revert("DeployAsterisc: unknown selector");
+        }
+    }
+
+    function checkOutput(DeployAsteriscInput _mi) public view {
+        DeployUtils.assertValidContractAddress(address(_asteriscSingleton));
+        assertValidDeploy(_mi);
+    }
+
+    function asteriscSingleton() public view returns (IRISCV) {
+        DeployUtils.assertValidContractAddress(address(_asteriscSingleton));
+        return _asteriscSingleton;
+    }
+
+    function assertValidDeploy(DeployAsteriscInput _mi) public view {
+        assertValidAsteriscSingleton(_mi);
+    }
+
+    function assertValidAsteriscSingleton(DeployAsteriscInput _mi) internal view {
+        IRISCV asterisc = asteriscSingleton();
+
+        require(address(asterisc.oracle()) == address(_mi.preimageOracle()), "ASTERISC-10");
+    }
+}
+
+/// @title DeployAsterisc
+contract DeployAsterisc is Script {
+    function run(DeployAsteriscInput _mi, DeployAsteriscOutput _mo) public {
+        DeployAsteriscSingleton(_mi, _mo);
+        _mo.checkOutput(_mi);
+    }
+
+    function DeployAsteriscSingleton(DeployAsteriscInput _mi, DeployAsteriscOutput _mo) internal {
+        IPreimageOracle preimageOracle = IPreimageOracle(_mi.preimageOracle());
+        vm.broadcast(msg.sender);
+        IRISCV singleton = IRISCV(
+            DeployUtils.create1({
+                _name: "RISCV",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IRISCV.__constructor__, (preimageOracle)))
+            })
+        );
+
+        vm.label(address(singleton), "AsteriscSingleton");
+        _mo.set(_mo.asteriscSingleton.selector, address(singleton));
+    }
+}
diff --git a/packages/contracts-bedrock/src/vendor/asterisc/interfaces/IRISCV.sol b/packages/contracts-bedrock/src/vendor/asterisc/interfaces/IRISCV.sol
new file mode 100644
index 000000000000..349694fc876d
--- /dev/null
+++ b/packages/contracts-bedrock/src/vendor/asterisc/interfaces/IRISCV.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+
+/// @title IRISCV
+/// @notice Interface for the RISCV contract.
+interface IRISCV is ISemver {
+    function oracle() external view returns (IPreimageOracle);
+    function step(bytes memory _stateData, bytes memory _proof, bytes32 _localContext) external returns (bytes32);
+
+    function __constructor__(IPreimageOracle _oracle) external;
+}

From 451c52b04e924e3dcd8e16436f7cb1032d5bb01a Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Wed, 27 Nov 2024 22:24:38 +0100
Subject: [PATCH 301/451] go.mod: update op-geth to include post-validation
 hook interop test fix (#13132)

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 3e36ecc8325f..7e6f8737d804 100644
--- a/go.mod
+++ b/go.mod
@@ -250,7 +250,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.3-rc.1
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.3-rc.1.0.20241126165630-b84907bf4d95
 
 //replace github.com/ethereum/go-ethereum => ../go-ethereum
 
diff --git a/go.sum b/go.sum
index 4302fb00204c..d18aff8414ae 100644
--- a/go.sum
+++ b/go.sum
@@ -187,8 +187,8 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.3-rc.1 h1:iG5pKldU6e3FZaZJEYzG1H3RsTjARRaLF/MmVkb9JhQ=
-github.com/ethereum-optimism/op-geth v1.101411.3-rc.1/go.mod h1:zBADVb3+aon0Idb3uEg/1TFpep+Jdkz3ge9SLFDBXOo=
+github.com/ethereum-optimism/op-geth v1.101411.3-rc.1.0.20241126165630-b84907bf4d95 h1:4bgr/Y/Vl2lntFvFM6l/W6P8EWLMxAdF5CRnJStHGGI=
+github.com/ethereum-optimism/op-geth v1.101411.3-rc.1.0.20241126165630-b84907bf4d95/go.mod h1:zBADVb3+aon0Idb3uEg/1TFpep+Jdkz3ge9SLFDBXOo=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048 h1:kb220NeqVRRt/XP5JHt3i4zpLsYNCdWMM/0tDnOFk3o=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=

From 8ee03877c1b1287f3a7cc71ee8302d3022c6a57c Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Wed, 27 Nov 2024 21:27:30 +0000
Subject: [PATCH 302/451] batcher: fix state inconsistency (#12981)

* remove lastStoredBlock and lastL1Tip from BatchSubmitter state

We can use the channelManager's state to infer lastStoredBlock. And lastL1Tip is actually unused.

* change log line wording

* fix typo

* remove unecessary method

* clean up driver.calculateL2BlockRangeToStore

* some typos

* tiny tweak
---
 op-batcher/batcher/channel_manager.go |  8 +++++
 op-batcher/batcher/driver.go          | 49 ++++++++++-----------------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 81ee0fb35a51..1da2def78da6 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -480,6 +480,7 @@ func (s *channelManager) pruneSafeBlocks(newSafeHead eth.L2BlockRef) {
 
 	if newSafeHead.Number+1 < oldestBlock.NumberU64() {
 		// This could happen if there was an L1 reorg.
+		// Or if the sequencer restarted.
 		s.log.Warn("safe head reversed, clearing channel manager state",
 			"oldestBlock", eth.ToBlockID(oldestBlock),
 			"newSafeBlock", newSafeHead)
@@ -565,3 +566,10 @@ func (m *channelManager) CheckExpectedProgress(syncStatus eth.SyncStatus) error
 	}
 	return nil
 }
+
+func (m *channelManager) LastStoredBlock() eth.BlockID {
+	if m.blocks.Len() == 0 {
+		return eth.BlockID{}
+	}
+	return eth.ToBlockID(m.blocks[m.blocks.Len()-1])
+}
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 93c1425c58bc..58e533becff0 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -114,10 +114,6 @@ type BatchSubmitter struct {
 	txpoolState       TxPoolState
 	txpoolBlockedBlob bool
 
-	// lastStoredBlock is the last block loaded into `state`. If it is empty it should be set to the l2 safe head.
-	lastStoredBlock eth.BlockID
-	lastL1Tip       eth.L1BlockRef
-
 	state *channelManager
 }
 
@@ -147,7 +143,6 @@ func (l *BatchSubmitter) StartBatchSubmitting() error {
 	l.shutdownCtx, l.cancelShutdownCtx = context.WithCancel(context.Background())
 	l.killCtx, l.cancelKillCtx = context.WithCancel(context.Background())
 	l.clearState(l.shutdownCtx)
-	l.lastStoredBlock = eth.BlockID{}
 
 	if err := l.waitForL2Genesis(); err != nil {
 		return fmt.Errorf("error waiting for L2 genesis: %w", err)
@@ -271,13 +266,11 @@ func (l *BatchSubmitter) loadBlocksIntoState(syncStatus eth.SyncStatus, ctx cont
 		block, err := l.loadBlockIntoState(ctx, i)
 		if errors.Is(err, ErrReorg) {
 			l.Log.Warn("Found L2 reorg", "block_number", i)
-			l.lastStoredBlock = eth.BlockID{}
 			return err
 		} else if err != nil {
 			l.Log.Warn("Failed to load block into state", "err", err)
 			return err
 		}
-		l.lastStoredBlock = eth.ToBlockID(block)
 		latestBlock = block
 	}
 
@@ -366,29 +359,31 @@ func (l *BatchSubmitter) getSyncStatus(ctx context.Context) (*eth.SyncStatus, er
 }
 
 // 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
-// as well as garbage collecting blocks which became safe)
 func (l *BatchSubmitter) calculateL2BlockRangeToStore(syncStatus eth.SyncStatus) (eth.BlockID, eth.BlockID, error) {
 	if syncStatus.HeadL1 == (eth.L1BlockRef{}) {
 		return eth.BlockID{}, eth.BlockID{}, errors.New("empty sync status")
 	}
-
-	// Check last stored to see if it needs to be set on startup OR set if is lagged behind.
-	// It lagging implies that the op-node processed some batches that were submitted prior to the current instance of the batcher being alive.
-	if l.lastStoredBlock == (eth.BlockID{}) {
-		l.Log.Info("Starting batch-submitter work at safe-head", "safe", syncStatus.SafeL2)
-		l.lastStoredBlock = syncStatus.SafeL2.ID()
-	} else if l.lastStoredBlock.Number < syncStatus.SafeL2.Number {
-		l.Log.Warn("Last submitted block lagged behind L2 safe head: batch submission will continue from the safe head now", "last", l.lastStoredBlock, "safe", syncStatus.SafeL2)
-		l.lastStoredBlock = syncStatus.SafeL2.ID()
-	}
-
 	// Check if we should even attempt to load any blocks. TODO: May not need this check
 	if syncStatus.SafeL2.Number >= syncStatus.UnsafeL2.Number {
-		return eth.BlockID{}, eth.BlockID{}, fmt.Errorf("L2 safe head(%d) ahead of L2 unsafe head(%d)", syncStatus.SafeL2.Number, syncStatus.UnsafeL2.Number)
+		return eth.BlockID{}, eth.BlockID{}, fmt.Errorf("L2 safe head(%d) >= L2 unsafe head(%d)", syncStatus.SafeL2.Number, syncStatus.UnsafeL2.Number)
+	}
+
+	lastStoredBlock := l.state.LastStoredBlock()
+	start := lastStoredBlock
+	end := syncStatus.UnsafeL2.ID()
+
+	// Check last stored block to see if it is empty or has lagged behind.
+	// It lagging implies that the op-node processed some batches that
+	// were submitted prior to the current instance of the batcher being alive.
+	if lastStoredBlock == (eth.BlockID{}) {
+		l.Log.Info("Resuming batch-submitter work at safe-head", "safe", syncStatus.SafeL2)
+		start = syncStatus.SafeL2.ID()
+	} else if lastStoredBlock.Number < syncStatus.SafeL2.Number {
+		l.Log.Warn("Last stored block lagged behind L2 safe head: batch submission will continue from the safe head now", "last", lastStoredBlock, "safe", syncStatus.SafeL2)
+		start = syncStatus.SafeL2.ID()
 	}
 
-	return l.lastStoredBlock, syncStatus.UnsafeL2.ID(), nil
+	return start, end, nil
 }
 
 // The following things occur:
@@ -704,7 +699,7 @@ func (l *BatchSubmitter) publishTxToL1(ctx context.Context, queue *txmgr.Queue[t
 		l.Log.Error("Failed to query L1 tip", "err", err)
 		return err
 	}
-	l.recordL1Tip(l1tip)
+	l.Metr.RecordLatestL1Block(l1tip)
 
 	// Collect next transaction data. This pulls data out of the channel, so we need to make sure
 	// to put it back if ever da or txmgr requests fail, by calling l.recordFailedDARequest/recordFailedTx.
@@ -886,14 +881,6 @@ func (l *BatchSubmitter) handleReceipt(r txmgr.TxReceipt[txRef]) {
 	}
 }
 
-func (l *BatchSubmitter) recordL1Tip(l1tip eth.L1BlockRef) {
-	if l.lastL1Tip == l1tip {
-		return
-	}
-	l.lastL1Tip = l1tip
-	l.Metr.RecordLatestL1Block(l1tip)
-}
-
 func (l *BatchSubmitter) recordFailedDARequest(id txID, err error) {
 	if err != nil {
 		l.Log.Warn("DA request failed", logFields(id, err)...)

From 8a32cbaad4715643d3ee791a028b36be174d0cf9 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 28 Nov 2024 00:06:07 +0100
Subject: [PATCH 303/451] improve merkletrie test cov (#13131)

---
 .../test/libraries/trie/MerkleTrie.t.sol      | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)

diff --git a/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol b/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol
index 781ada343335..e6d04d971db5 100644
--- a/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol
+++ b/packages/contracts-bedrock/test/libraries/trie/MerkleTrie.t.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 import { MerkleTrie } from "src/libraries/trie/MerkleTrie.sol";
+import { RLPReader } from "src/libraries/rlp/RLPReader.sol";
 import { FFIInterface } from "test/setup/FFIInterface.sol";
 import "src/libraries/rlp/RLPErrors.sol";
 
@@ -372,4 +373,143 @@ contract MerkleTrie_get_Test is Test {
         vm.expectRevert("MerkleTrie: ran out of proof elements");
         MerkleTrie.get(key, proof, root);
     }
+
+    /// @notice Tests that `get` reverts if a proof node has an unknown prefix
+    function test_get_unknownNodePrefix_reverts(uint8 prefix) external {
+        // bound it to only have prefixes where the first nibble is >= 4
+        prefix = uint8(bound(prefix, 0x40, 0xff));
+        // if the first nibble of the prefix is odd, make it even by adding 16
+        if (((prefix / 16) % 2) == 1) {
+            unchecked {
+                prefix += 16;
+            }
+            // bound it again in case it overflowed
+            prefix = uint8(bound(prefix, 0x40, 0xff));
+        }
+
+        MerkleTrieWrapper wrapper = new MerkleTrieWrapper();
+
+        bytes memory key = abi.encodePacked(
+            keccak256(abi.encodePacked(bytes32(0xa15bc60c955c405d20d9149c709e2460f1c2d9a497496a7f46004d1772c3054c)))
+        );
+        bytes[] memory proof = new bytes[](5);
+        proof[0] =
+            hex"f90211a085ed702d58e6a962ad0e785e5c9036e06d878fd065eb9669122447f6aee7957da05badb8cfd5a7493d928614730af6e14eabe2c93fbac93c853dde3270c446309da01de85a57c524ac56a5bd4bed0b0aa7d963e364ad930ea964d0a42631a77ded4da0fe3143892366faeb9fae1117b888263afe0f74e6c73555fee53a604bf7188431a0af2c79f0dddd15d6f62e3fa60d515c44d58444ad3915c7ca4bddb31c8f148d0ca08f37a2f9093a4aee39519f3a06fe4674cc670fbbbd7a5f4eb096310b7bc1fdc9a086bd12d2031d9714130c687e6822250fa24b3147824780bea96cf8a7406c8966a03e42538ba2da8adaa0eca4550ef62de4dabde8ca06b71ac1b276ff31b67a7655a04a439f7eb6a62c77ec921139925af3359f61d16e083076e0e425583289107d7da0c453a51991b5a4c6174ddff77c0b7d9cc86f05ffda6ff523e2365f19797c7a00a06f43b7b9a118264ab4b6c24d7d3de77f39071a298426bfc27180adfca57d590da0032e0db4dcf122d4bdb1d4ec3c5df5fabd3127bcefe412cb046b7f0d80d11c9fa0560c2b8c9466b8cb5ffd600f24ea0ed9838bfdab7870d505d4387c2468d3c498a0597996e939ff8c29c9e59dc47c111e760450a9c4fe2b065825762da2a1f32495a0e3411c9af104364230c49de5a4d0802c84df18beee9778673364e1747a875622a02a6928825356d8280f361a02285af30e73889f4e55ecb63ed85c8581e07061d680";
+        proof[1] =
+            hex"f90211a0db246208c4cef45e9aeb9f1df1baa8572675bc453f7da538165a2bb9e6a4c416a0d26d82a9ddff901d2a1f9e18506120dec0e5b3c95549c5bff0efc355061ea73fa04f1cedbb5c7df7ee5cc3210980baf5537affb29c661c6a4eeb193bc42e7fbc74a0acea389e0cf577d0e13483d98b15c82618ac18b7cc4a479981e3e672ddd16867a0ef59a06aeea1eb5ba1313bbe1fa74ff264d84d7319ab6178213734b5b5efa9c1a08f85dc6001713d77aa4e12982dfdb28fd1c7dcc290d46f2749e8a7d67ba2a694a0f6698ff794881edc50340b75311de64ce3da5f97debcfdfd4d20de57ef3ba7eba0680071ce05e9c7915f731bac8b9673332d1d77ea1f7dadab36d9b233eea32ba4a035ad3686f436232360c2aa364c9f2aa2081318b9fb33cd1050d69ee46f791d62a03b495b3d65d9ae39680a0f835c1d1378d218f7b1fb88d2b2c6ac6ef916f09172a0a808d1e8c632d9a6cfeb3c2c123a58b5b3e1998d4bd02c5fb0f7c5d4ba1338e6a0369376e9152831135ff3a902c9740cf22951d67edd51bf0541565e379d7efc25a0cc26d7fa1c326bc14950e92d9de78e4ed8372ff9727dec34602f24057b3a9b30a0278081783022e748dc70874a72377038935c00c1f0a24bbb8cd0fc208d8b68f4a06c4e83593571b94d08cb78ece0de4920b02a650a47a16583f94c8fe35f724707a0cd7eb9d730e5138fd943200b577e7bbb827d010a50d19af2f4b19ef19658156d80";
+        proof[2] =
+            hex"f90211a0065f58fbe63e8e3387e91047d5b7a4532e7d9de0abc47f04791aef27a140fdb5a0858beea29778551c01b0d3e542d707675856da9c3f1d065c845e55c24d77be89a0e90a410489eff6f4f8d70b0cce1fb1339117ec0f6f1db195a6cc410509a2ebaea078ba7fe504e8d01d57f6bee52c4938d779108e500b5923272441ed2964b8c45da0f0430ed9fa807e5fb6ace75f8766ea60009d8539e00006e359f5f7bc38a76596a0a98a7938db99a2d80abea6349de42bf2576c9e51cc715c85fbacab365ec16f5ba026fadc7d124a456c62ada928eaede3e80611e3e6f99041f7393f062e9e788c8ca0ca48cad1e00d22d6146173341a6060378e738be727a7265a923cf6bfd1f8b610a0f8a4aae21a78ac28e2a61f50396f9a80f6c8232fe4afa203160361c0962242baa09a1029479959fb29b4da7239393fd6ca20bc376d860324f429a51b0e0565a158a0eefb84d3943d680e176258dffe0104ac48c171a8574a811535256a2d8ba531dea062a3d709a2f70ba1970842c4f20a602291273d1f6022e7a14cde2afdcd51e795a0397e6b9b87012cd79cbd0bb7daa4cc43830a673d80b65fb88c0449140175d89ca0f8a4c73c0078cbd32961227910e3f9315bc587716062e39f66be19747ccf9b67a0ea4bdd1b187fdba273a8625f88f284994d19c38ec58651839852665717d953d9a0319ebf356f45da83c7f106f1fd3decbf15f651fad3389a0d279602cdea8ee11480";
+        proof[3] =
+            hex"f8f1a069a092c7a950214e7e45b99012dc8ad112eab0fc94ae5ca9efbd6949068384f280a0b25c46db67ef7cf0c47bb400c31c85a26c5a204431527c964c8ecaf3d63e52cc80a01911a2a74db0d8d182447176e23f25556d1a1eaa0afad96453f2d64876ad88e480808080a04a0ca9e3bed1bc3e3c819384d19b6d5e523164a6520c4eb42e828a63ef730ae38080a03b598ed1b9269d4b05e2e75cfb54298d25437669870c919a59a147d2d256fdba80a0db2d655057c83107a73d086cfdd8fcc74739bb48c652eb0ce597178ecf96b39aa05c66ac392a761341b9c22b773ea19af311f34ef537640b9bb96842ec6ace913280";
+
+        proof[4] = bytes.concat(
+            hex"f69f",
+            bytes1(prefix),
+            hex"4dcf44e265ba93879b2da89e1b16ab48fc5eb8e31bc16b0612d6da8463f195942536c09e5f5691498805884fa37811be3b2bddb4"
+        );
+
+        bytes32 root;
+        (proof[0], proof[1], proof[2], proof[3], root) = rehashOtherElements(proof[4]);
+
+        vm.expectRevert("MerkleTrie: received a node with an unknown prefix");
+        wrapper.get(key, proof, root);
+    }
+
+    /// @notice Tests that `get` reverts if a proof node is unparsable i.e list length is not 2 or 17
+    function test_get_unparsableNode_reverts(uint8 listLen) external {
+        listLen = uint8(bound(listLen, 1, RLPReader.MAX_LIST_LENGTH));
+        if (listLen == 2 || listLen == 17) {
+            listLen++;
+        }
+
+        MerkleTrieWrapper wrapper = new MerkleTrieWrapper();
+
+        bytes memory key = abi.encodePacked(
+            keccak256(abi.encodePacked(bytes32(0xa15bc60c955c405d20d9149c709e2460f1c2d9a497496a7f46004d1772c3054c)))
+        );
+        bytes[] memory proof = new bytes[](5);
+        proof[0] =
+            hex"f90211a085ed702d58e6a962ad0e785e5c9036e06d878fd065eb9669122447f6aee7957da05badb8cfd5a7493d928614730af6e14eabe2c93fbac93c853dde3270c446309da01de85a57c524ac56a5bd4bed0b0aa7d963e364ad930ea964d0a42631a77ded4da0fe3143892366faeb9fae1117b888263afe0f74e6c73555fee53a604bf7188431a0af2c79f0dddd15d6f62e3fa60d515c44d58444ad3915c7ca4bddb31c8f148d0ca08f37a2f9093a4aee39519f3a06fe4674cc670fbbbd7a5f4eb096310b7bc1fdc9a086bd12d2031d9714130c687e6822250fa24b3147824780bea96cf8a7406c8966a03e42538ba2da8adaa0eca4550ef62de4dabde8ca06b71ac1b276ff31b67a7655a04a439f7eb6a62c77ec921139925af3359f61d16e083076e0e425583289107d7da0c453a51991b5a4c6174ddff77c0b7d9cc86f05ffda6ff523e2365f19797c7a00a06f43b7b9a118264ab4b6c24d7d3de77f39071a298426bfc27180adfca57d590da0032e0db4dcf122d4bdb1d4ec3c5df5fabd3127bcefe412cb046b7f0d80d11c9fa0560c2b8c9466b8cb5ffd600f24ea0ed9838bfdab7870d505d4387c2468d3c498a0597996e939ff8c29c9e59dc47c111e760450a9c4fe2b065825762da2a1f32495a0e3411c9af104364230c49de5a4d0802c84df18beee9778673364e1747a875622a02a6928825356d8280f361a02285af30e73889f4e55ecb63ed85c8581e07061d680";
+        proof[1] =
+            hex"f90211a0db246208c4cef45e9aeb9f1df1baa8572675bc453f7da538165a2bb9e6a4c416a0d26d82a9ddff901d2a1f9e18506120dec0e5b3c95549c5bff0efc355061ea73fa04f1cedbb5c7df7ee5cc3210980baf5537affb29c661c6a4eeb193bc42e7fbc74a0acea389e0cf577d0e13483d98b15c82618ac18b7cc4a479981e3e672ddd16867a0ef59a06aeea1eb5ba1313bbe1fa74ff264d84d7319ab6178213734b5b5efa9c1a08f85dc6001713d77aa4e12982dfdb28fd1c7dcc290d46f2749e8a7d67ba2a694a0f6698ff794881edc50340b75311de64ce3da5f97debcfdfd4d20de57ef3ba7eba0680071ce05e9c7915f731bac8b9673332d1d77ea1f7dadab36d9b233eea32ba4a035ad3686f436232360c2aa364c9f2aa2081318b9fb33cd1050d69ee46f791d62a03b495b3d65d9ae39680a0f835c1d1378d218f7b1fb88d2b2c6ac6ef916f09172a0a808d1e8c632d9a6cfeb3c2c123a58b5b3e1998d4bd02c5fb0f7c5d4ba1338e6a0369376e9152831135ff3a902c9740cf22951d67edd51bf0541565e379d7efc25a0cc26d7fa1c326bc14950e92d9de78e4ed8372ff9727dec34602f24057b3a9b30a0278081783022e748dc70874a72377038935c00c1f0a24bbb8cd0fc208d8b68f4a06c4e83593571b94d08cb78ece0de4920b02a650a47a16583f94c8fe35f724707a0cd7eb9d730e5138fd943200b577e7bbb827d010a50d19af2f4b19ef19658156d80";
+        proof[2] =
+            hex"f90211a0065f58fbe63e8e3387e91047d5b7a4532e7d9de0abc47f04791aef27a140fdb5a0858beea29778551c01b0d3e542d707675856da9c3f1d065c845e55c24d77be89a0e90a410489eff6f4f8d70b0cce1fb1339117ec0f6f1db195a6cc410509a2ebaea078ba7fe504e8d01d57f6bee52c4938d779108e500b5923272441ed2964b8c45da0f0430ed9fa807e5fb6ace75f8766ea60009d8539e00006e359f5f7bc38a76596a0a98a7938db99a2d80abea6349de42bf2576c9e51cc715c85fbacab365ec16f5ba026fadc7d124a456c62ada928eaede3e80611e3e6f99041f7393f062e9e788c8ca0ca48cad1e00d22d6146173341a6060378e738be727a7265a923cf6bfd1f8b610a0f8a4aae21a78ac28e2a61f50396f9a80f6c8232fe4afa203160361c0962242baa09a1029479959fb29b4da7239393fd6ca20bc376d860324f429a51b0e0565a158a0eefb84d3943d680e176258dffe0104ac48c171a8574a811535256a2d8ba531dea062a3d709a2f70ba1970842c4f20a602291273d1f6022e7a14cde2afdcd51e795a0397e6b9b87012cd79cbd0bb7daa4cc43830a673d80b65fb88c0449140175d89ca0f8a4c73c0078cbd32961227910e3f9315bc587716062e39f66be19747ccf9b67a0ea4bdd1b187fdba273a8625f88f284994d19c38ec58651839852665717d953d9a0319ebf356f45da83c7f106f1fd3decbf15f651fad3389a0d279602cdea8ee11480";
+        proof[3] =
+            hex"f8f1a069a092c7a950214e7e45b99012dc8ad112eab0fc94ae5ca9efbd6949068384f280a0b25c46db67ef7cf0c47bb400c31c85a26c5a204431527c964c8ecaf3d63e52cc80a01911a2a74db0d8d182447176e23f25556d1a1eaa0afad96453f2d64876ad88e480808080a04a0ca9e3bed1bc3e3c819384d19b6d5e523164a6520c4eb42e828a63ef730ae38080a03b598ed1b9269d4b05e2e75cfb54298d25437669870c919a59a147d2d256fdba80a0db2d655057c83107a73d086cfdd8fcc74739bb48c652eb0ce597178ecf96b39aa05c66ac392a761341b9c22b773ea19af311f34ef537640b9bb96842ec6ace913280";
+        proof[4] =
+            hex"f69f204dcf44e265ba93879b2da89e1b16ab48fc5eb8e31bc16b0612d6da8463f195942536c09e5f5691498805884fa37811be3b2bddb4"; // Correct
+            // leaf node
+
+        bytes32 root = keccak256(proof[0]);
+
+        // Should not revert
+        wrapper.get(key, proof, root);
+
+        if (listLen > 3) {
+            // Node with list > 3
+            proof[4] =
+                hex"f8379f204dcf44e265ba93879b2da89e1b16ab48fc5eb8e31bc16b0612d6da8463f195942536c09e5f5691498805884fa37811be3b2bddb480";
+            for (uint256 i; i < listLen - 3; i++) {
+                proof[4] = bytes.concat(proof[4], hex"80");
+            }
+            proof[4][1] = bytes1(uint8(proof[4][1]) + (listLen - 3));
+            // rehash all proof elements and insert it into the proof element above it
+            (proof[0], proof[1], proof[2], proof[3], root) = rehashOtherElements(proof[4]);
+
+            vm.expectRevert("MerkleTrie: received an unparseable node");
+            wrapper.get(key, proof, root);
+        } else if (listLen == 1) {
+            // Node with list of 1
+            proof[4] = hex"e09f204dcf44e265ba93879b2da89e1b16ab48fc5eb8e31bc16b0612d6da8463f1";
+            // rehash all proof elements and insert it into the proof element above it
+            (proof[0], proof[1], proof[2], proof[3], root) = rehashOtherElements(proof[4]);
+
+            vm.expectRevert("MerkleTrie: received an unparseable node");
+            wrapper.get(key, proof, root);
+        } else if (listLen == 3) {
+            // Node with list of 3
+            proof[4] =
+                hex"f79f204dcf44e265ba93879b2da89e1b16ab48fc5eb8e31bc16b0612d6da8463f195942536c09e5f5691498805884fa37811be3b2bddb480";
+            // rehash all proof elements and insert it into the proof element above it
+            (proof[0], proof[1], proof[2], proof[3], root) = rehashOtherElements(proof[4]);
+
+            vm.expectRevert("MerkleTrie: received an unparseable node");
+            wrapper.get(key, proof, root);
+        }
+    }
+
+    function rehashOtherElements(bytes memory _proof4)
+        private
+        pure
+        returns (bytes memory proof0_, bytes memory proof1_, bytes memory proof2_, bytes memory proof3_, bytes32 root_)
+    {
+        // rehash all proof elements and insert it into the proof element above it
+        proof3_ = bytes.concat(
+            hex"f8f1a069a092c7a950214e7e45b99012dc8ad112eab0fc94ae5ca9efbd6949068384f280a0b25c46db67ef7cf0c47bb400c31c85a26c5a204431527c964c8ecaf3d63e52cc80a0",
+            keccak256(_proof4),
+            hex"80808080a04a0ca9e3bed1bc3e3c819384d19b6d5e523164a6520c4eb42e828a63ef730ae38080a03b598ed1b9269d4b05e2e75cfb54298d25437669870c919a59a147d2d256fdba80a0db2d655057c83107a73d086cfdd8fcc74739bb48c652eb0ce597178ecf96b39aa05c66ac392a761341b9c22b773ea19af311f34ef537640b9bb96842ec6ace913280"
+        );
+        proof2_ = bytes.concat(
+            hex"f90211a0065f58fbe63e8e3387e91047d5b7a4532e7d9de0abc47f04791aef27a140fdb5a0858beea29778551c01b0d3e542d707675856da9c3f1d065c845e55c24d77be89a0e90a410489eff6f4f8d70b0cce1fb1339117ec0f6f1db195a6cc410509a2ebaea078ba7fe504e8d01d57f6bee52c4938d779108e500b5923272441ed2964b8c45da0f0430ed9fa807e5fb6ace75f8766ea60009d8539e00006e359f5f7bc38a76596a0a98a7938db99a2d80abea6349de42bf2576c9e51cc715c85fbacab365ec16f5ba0",
+            keccak256(proof3_),
+            hex"a0ca48cad1e00d22d6146173341a6060378e738be727a7265a923cf6bfd1f8b610a0f8a4aae21a78ac28e2a61f50396f9a80f6c8232fe4afa203160361c0962242baa09a1029479959fb29b4da7239393fd6ca20bc376d860324f429a51b0e0565a158a0eefb84d3943d680e176258dffe0104ac48c171a8574a811535256a2d8ba531dea062a3d709a2f70ba1970842c4f20a602291273d1f6022e7a14cde2afdcd51e795a0397e6b9b87012cd79cbd0bb7daa4cc43830a673d80b65fb88c0449140175d89ca0f8a4c73c0078cbd32961227910e3f9315bc587716062e39f66be19747ccf9b67a0ea4bdd1b187fdba273a8625f88f284994d19c38ec58651839852665717d953d9a0319ebf356f45da83c7f106f1fd3decbf15f651fad3389a0d279602cdea8ee11480"
+        );
+        proof1_ = bytes.concat(
+            hex"f90211a0db246208c4cef45e9aeb9f1df1baa8572675bc453f7da538165a2bb9e6a4c416a0d26d82a9ddff901d2a1f9e18506120dec0e5b3c95549c5bff0efc355061ea73fa04f1cedbb5c7df7ee5cc3210980baf5537affb29c661c6a4eeb193bc42e7fbc74a0acea389e0cf577d0e13483d98b15c82618ac18b7cc4a479981e3e672ddd16867a0ef59a06aeea1eb5ba1313bbe1fa74ff264d84d7319ab6178213734b5b5efa9c1a08f85dc6001713d77aa4e12982dfdb28fd1c7dcc290d46f2749e8a7d67ba2a694a0f6698ff794881edc50340b75311de64ce3da5f97debcfdfd4d20de57ef3ba7eba0680071ce05e9c7915f731bac8b9673332d1d77ea1f7dadab36d9b233eea32ba4a035ad3686f436232360c2aa364c9f2aa2081318b9fb33cd1050d69ee46f791d62a03b495b3d65d9ae39680a0f835c1d1378d218f7b1fb88d2b2c6ac6ef916f09172a0a808d1e8c632d9a6cfeb3c2c123a58b5b3e1998d4bd02c5fb0f7c5d4ba1338e6a0369376e9152831135ff3a902c9740cf22951d67edd51bf0541565e379d7efc25a0",
+            keccak256(proof2_),
+            hex"a0278081783022e748dc70874a72377038935c00c1f0a24bbb8cd0fc208d8b68f4a06c4e83593571b94d08cb78ece0de4920b02a650a47a16583f94c8fe35f724707a0cd7eb9d730e5138fd943200b577e7bbb827d010a50d19af2f4b19ef19658156d80"
+        );
+        proof0_ = bytes.concat(
+            hex"f90211a085ed702d58e6a962ad0e785e5c9036e06d878fd065eb9669122447f6aee7957da05badb8cfd5a7493d928614730af6e14eabe2c93fbac93c853dde3270c446309da0",
+            keccak256(proof1_),
+            hex"a0fe3143892366faeb9fae1117b888263afe0f74e6c73555fee53a604bf7188431a0af2c79f0dddd15d6f62e3fa60d515c44d58444ad3915c7ca4bddb31c8f148d0ca08f37a2f9093a4aee39519f3a06fe4674cc670fbbbd7a5f4eb096310b7bc1fdc9a086bd12d2031d9714130c687e6822250fa24b3147824780bea96cf8a7406c8966a03e42538ba2da8adaa0eca4550ef62de4dabde8ca06b71ac1b276ff31b67a7655a04a439f7eb6a62c77ec921139925af3359f61d16e083076e0e425583289107d7da0c453a51991b5a4c6174ddff77c0b7d9cc86f05ffda6ff523e2365f19797c7a00a06f43b7b9a118264ab4b6c24d7d3de77f39071a298426bfc27180adfca57d590da0032e0db4dcf122d4bdb1d4ec3c5df5fabd3127bcefe412cb046b7f0d80d11c9fa0560c2b8c9466b8cb5ffd600f24ea0ed9838bfdab7870d505d4387c2468d3c498a0597996e939ff8c29c9e59dc47c111e760450a9c4fe2b065825762da2a1f32495a0e3411c9af104364230c49de5a4d0802c84df18beee9778673364e1747a875622a02a6928825356d8280f361a02285af30e73889f4e55ecb63ed85c8581e07061d680"
+        );
+        root_ = keccak256(proof0_);
+    }
+}
+
+contract MerkleTrieWrapper {
+    function get(bytes memory key, bytes[] memory proof, bytes32 root) external pure returns (bytes memory) {
+        return MerkleTrie.get(key, proof, root);
+    }
 }

From 16a5d617f3ab360e0b58b7ebe97a9956b576fa4b Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 27 Nov 2024 18:38:59 -0500
Subject: [PATCH 304/451] maint: clean up primary justfile (#12997)

Various things in the primary justfile weren't particularly
legible, particularly around installing tooling versions. Cleans
up the primary justfile so that everything has comments and the
process for installing tooling is unified.

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 justfile                       | 81 +++++++++++++++++++++++++---------
 ops/scripts/install-foundry.sh |  6 +++
 ops/scripts/install-kontrol.sh | 17 +++++++
 3 files changed, 83 insertions(+), 21 deletions(-)
 create mode 100755 ops/scripts/install-kontrol.sh

diff --git a/justfile b/justfile
index 6438ba36197a..acf6d8bc6021 100644
--- a/justfile
+++ b/justfile
@@ -1,4 +1,5 @@
-issues:
+# Checks that TODO comments have corresponding issues.
+todo-checker:
   ./ops/scripts/todo-checker.sh
 
 # Runs semgrep on the entire monorepo.
@@ -9,56 +10,94 @@ semgrep:
 semgrep-test:
   semgrep scan --test --config .semgrep/rules/ .semgrep/tests/
 
-lint-shellcheck:
+# Runs shellcheck.
+shellcheck:
   find . -type f -name '*.sh' -not -path '*/node_modules/*' -not -path './packages/contracts-bedrock/lib/*' -not -path './packages/contracts-bedrock/kout*/*' -exec sh -c 'echo "Checking $1"; shellcheck "$1"' _ {} \;
 
+########################################################
+#                 DEPENDENCY MANAGEMENT                #
+########################################################
+
+# Generic task for checking if a tool version is up to date.
+check-tool-version tool:
+  #!/usr/bin/env bash
+  EXPECTED=$(jq -r .{{tool}} < versions.json)
+  ACTUAL=$(just print-{{tool}})
+  if [ "$ACTUAL" = "$EXPECTED" ]; then
+    echo "✓ {{tool}} versions match"
+  else
+    echo "✗ {{tool}} version mismatch (expected $EXPECTED, got $ACTUAL), run 'just install-{{tool}}' to upgrade"
+    exit 1
+  fi
+
+# Installs foundry
 install-foundry:
-  curl -L https://foundry.paradigm.xyz | bash && just update-foundry
-
-update-foundry:
   bash ./ops/scripts/install-foundry.sh
 
+# Prints current foundry version.
+print-foundry:
+  forge --version
+
+# Checks if installed foundry version is correct.
 check-foundry:
   bash ./ops/scripts/check-foundry.sh
 
+# Installs correct kontrol version.
 install-kontrol:
-  curl -L https://kframework.org/install | bash && just update-kontrol
+  bash ./ops/scripts/install-kontrol.sh
+
+# Prints current kontrol version.
+print-kontrol:
+  kontrol version
 
-update-kontrol:
-  kup install kontrol --version v$(jq -r .kontrol < versions.json)
+# Checks if installed kontrol version is correct.
+check-kontrol:
+  just check-tool-version kontrol
 
+# Installs correct abigen version.
 install-abigen:
   go install github.com/ethereum/go-ethereum/cmd/abigen@$(jq -r .abigen < versions.json)
 
+# Prints current abigen version.
 print-abigen:
   abigen --version | sed -e 's/[^0-9]/ /g' -e 's/^ *//g' -e 's/ *$//g' -e 's/ /./g' -e 's/^/v/'
 
+# Checks if installed abigen version is correct.
 check-abigen:
-  [[ $(just print-abigen) = $(cat versions.json | jq -r '.abigen') ]] && echo '✓ abigen versions match' || (echo '✗ abigen version mismatch. Run `just upgrade:abigen` to upgrade.' && exit 1)
-
-upgrade-abigen:
-  jq '.abigen = $v' --arg v $(just print:abigen) <<<$(cat versions.json) > versions.json
+  just check-tool-version abigen
 
+# Installs correct slither version.
 install-slither:
   pip3 install slither-analyzer==$(jq -r .slither < versions.json)
 
+# Prints current slither version.
 print-slither:
   slither --version
 
+# Checks if installed slither version is correct.
 check-slither:
-  [[ $(just print-slither) = $(jq -r .slither < versions.json) ]] && echo '✓ slither versions match' || (echo '✗ slither version mismatch. Run `just upgrade-slither` to upgrade.' && exit 1)
-
-upgrade-slither:
-  jq '.slither = $v' --arg v $(just print-slither) <<<$(cat versions.json) > versions.json
+  just check-tool-version slither
 
+# Installs correct semgrep version.
 install-semgrep:
-  pip3 install semgrep
+  pip3 install semgrep=="$(jq -r .semgrep < versions.json)"
 
+# Prints current semgrep version.
 print-semgrep:
-  semgrep --version
+  semgrep --version | head -n 1
 
+# Checks if installed semgrep version is correct.
 check-semgrep:
-  [ "$(just print-semgrep)" = "$(jq -r .semgrep < versions.json)" ] && echo '✓ semgrep versions match' || (echo '✗ semgrep version mismatch. Run `just upgrade-semgrep` to upgrade.' && exit 1)
+  just check-tool-version semgrep
 
-upgrade-semgrep:
-  pip3 install semgrep=="$(jq -r .semgrep < versions.json)"
+# Installs correct go version.
+install-go:
+  echo "error: go must be installed manually" && exit 1
+
+# Prints current go version.
+print-go:
+  go version | sed -E 's/.*go([0-9]+\.[0-9]+\.[0-9]+).*/\1/'
+
+# Checks if installed go version is correct.
+check-go:
+  just check-tool-version go
diff --git a/ops/scripts/install-foundry.sh b/ops/scripts/install-foundry.sh
index 654ed6b87f76..f8ed7924bf80 100755
--- a/ops/scripts/install-foundry.sh
+++ b/ops/scripts/install-foundry.sh
@@ -2,6 +2,12 @@
 
 set -e
 
+# Check if foundryup exists, if not, install it
+if ! command -v foundryup &> /dev/null; then
+  echo "foundryup not found, installing..."
+  curl -L https://foundry.paradigm.xyz | bash
+fi
+
 SCRIPTS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 MONOREPO_DIR=$(cd "$SCRIPTS_DIR/../../" && pwd)
 
diff --git a/ops/scripts/install-kontrol.sh b/ops/scripts/install-kontrol.sh
new file mode 100755
index 000000000000..5d4044d26b26
--- /dev/null
+++ b/ops/scripts/install-kontrol.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Check if kup exists, if not, install it
+if ! command -v kup &> /dev/null; then
+  echo "kup not found, installing..."
+  yes | bash <(curl -L https://kframework.org/install)
+fi
+
+SCRIPTS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+MONOREPO_DIR=$(cd "$SCRIPTS_DIR/../../" && pwd)
+
+# Grab the correct kontrol version.
+VERSION=$(jq -r .kontrol < "$MONOREPO_DIR"/versions.json)
+
+kup install kontrol --version v"$VERSION"

From e84868c27776fd04dc77e95176d55c8f6b1cc9a3 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Thu, 28 Nov 2024 14:31:15 +0100
Subject: [PATCH 305/451] update lib keccak dependency (#13136)

* update lib keccak dependency

* update semver-lock

* update semver-lock
---
 packages/contracts-bedrock/lib/lib-keccak                | 2 +-
 packages/contracts-bedrock/snapshots/semver-lock.json    | 4 ++--
 packages/contracts-bedrock/src/cannon/PreimageOracle.sol | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/contracts-bedrock/lib/lib-keccak b/packages/contracts-bedrock/lib/lib-keccak
index 0115edbbc60b..3b1e7bbb4cc2 160000
--- a/packages/contracts-bedrock/lib/lib-keccak
+++ b/packages/contracts-bedrock/lib/lib-keccak
@@ -1 +1 @@
-Subproject commit 0115edbbc60b5f702392caafc3a142061e6142fa
+Subproject commit 3b1e7bbb4cc23e9228097cfebe42aedaf3b8f2b9
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 35696bc7bf16..8bd5ea33f772 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -148,8 +148,8 @@
     "sourceCodeHash": "0x7ddcf8584f9bd92abd1eb45bc198f5b0ec54acaf292f60e919d674cc56fb8abc"
   },
   "src/cannon/PreimageOracle.sol": {
-    "initCodeHash": "0x5d7e8ae64f802bd9d760e3d52c0a620bd02405dc2c8795818db9183792ffe81c",
-    "sourceCodeHash": "0x979d8595d925c70a123e72c062fa58c9ef94777c2e93b6bc3231d6679e2e9055"
+    "initCodeHash": "0x2bef439027c37c65dd8e7d9a987ff14e1dba94ee5fe5f316a77ecf46a8db4b3f",
+    "sourceCodeHash": "0x70965927d1cfcafa8975f3fdc98a138efe413c4a1585c0f60e0d21cfd396cc7c"
   },
   "src/dispute/AnchorStateRegistry.sol": {
     "initCodeHash": "0x7bdbf9dc5125c953ea1833ccf0ad0e07d25b6f6c47e23da5374413324a38c5f9",
diff --git a/packages/contracts-bedrock/src/cannon/PreimageOracle.sol b/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
index 7ac7c33d99d2..03c0b3ae5521 100644
--- a/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
+++ b/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
@@ -51,8 +51,8 @@ contract PreimageOracle is ISemver {
     uint256 public constant PRECOMPILE_CALL_RESERVED_GAS = 100_000;
 
     /// @notice The semantic version of the Preimage Oracle contract.
-    /// @custom:semver 1.1.3-beta.6
-    string public constant version = "1.1.3-beta.6";
+    /// @custom:semver 1.1.3-beta.7
+    string public constant version = "1.1.3-beta.7";
 
     ////////////////////////////////////////////////////////////////
     //                 Authorized Preimage Parts                  //

From 26f7a40fc11347bafab5dfb4a2b81bdd36fcb456 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Thu, 28 Nov 2024 18:19:24 +0000
Subject: [PATCH 306/451] txmgr: `Queue.Send()` uses `q.txMgr.SendAsync`
 (#13120)

* txmgr: Queue.Send() uses q.txMgr.SendAsync

This should ensure that transactions are confirmed on chain in the order Queue.Send() is called, without sacrificing parallel tx submission.

* implement SendAsync in op-challenger test stubTxMgr

It doesn't preserve the nonces like the production txMgr does.

* TrySend also ensures synchronous tx nonce ordering (on success)

* factor out HandleResponse fn

* remove unused code

* unexport handler
---
 op-challenger/sender/sender_test.go |  8 ++++-
 op-service/txmgr/queue.go           | 49 +++++++++++++++++++----------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/op-challenger/sender/sender_test.go b/op-challenger/sender/sender_test.go
index 5169ae67192a..1d4e17047b74 100644
--- a/op-challenger/sender/sender_test.go
+++ b/op-challenger/sender/sender_test.go
@@ -129,8 +129,14 @@ func (s *stubTxMgr) Send(ctx context.Context, candidate txmgr.TxCandidate) (*typ
 	return <-ch, nil
 }
 
+// SendAsync simply wraps Send to make it non blocking. It does not guarantee transaction nonce ordering,
+// unlike the production txMgr.
 func (s *stubTxMgr) SendAsync(ctx context.Context, candidate txmgr.TxCandidate, ch chan txmgr.SendResponse) {
-	panic("unimplemented")
+	go func() {
+		receipt, err := s.Send(ctx, candidate)
+		resp := txmgr.SendResponse{Receipt: receipt, Err: err}
+		ch <- resp
+	}()
 }
 
 func (s *stubTxMgr) recordTx(candidate txmgr.TxCandidate) chan *types.Receipt {
diff --git a/op-service/txmgr/queue.go b/op-service/txmgr/queue.go
index ee7a03ffa928..c48687d459ec 100644
--- a/op-service/txmgr/queue.go
+++ b/op-service/txmgr/queue.go
@@ -51,17 +51,36 @@ func (q *Queue[T]) Wait() error {
 	return q.group.Wait()
 }
 
+// handleResponse will wait for the response on the first passed channel,
+// and then forward it on the second passed channel (attaching the id). It returns
+// the response error or the context error if the context is canceled.
+func handleResponse[T any](ctx context.Context, c chan SendResponse, d chan TxReceipt[T], id T) error {
+	select {
+	case response := <-c:
+		d <- TxReceipt[T]{ID: id, Receipt: response.Receipt, Err: response.Err}
+		return response.Err
+	case <-ctx.Done():
+		d <- TxReceipt[T]{ID: id, Err: ctx.Err()}
+		return ctx.Err()
+	}
+}
+
 // Send will wait until the number of pending txs is below the max pending,
-// and then send the next tx.
+// and then send the next tx asynchronously. The nonce of the transaction is
+// determined synchronously, so transactions should be confirmed on chain in
+// the order they are sent using this method.
 //
 // The actual tx sending is non-blocking, with the receipt returned on the
 // provided receipt channel. If the channel is unbuffered, the goroutine is
 // blocked from completing until the channel is read from.
 func (q *Queue[T]) Send(id T, candidate TxCandidate, receiptCh chan TxReceipt[T]) {
 	group, ctx := q.groupContext()
-	group.Go(func() error {
-		return q.sendTx(ctx, id, candidate, receiptCh)
-	})
+	responseChan := make(chan SendResponse, 1)
+	handleResponse := func() error {
+		return handleResponse(ctx, responseChan, receiptCh, id)
+	}
+	group.Go(handleResponse)                        // This blocks until the number of handlers is below the limit
+	q.txMgr.SendAsync(ctx, candidate, responseChan) // Nonce management handled synchronously, i.e. before this returns
 }
 
 // TrySend sends the next tx, but only if the number of pending txs is below the
@@ -75,19 +94,17 @@ func (q *Queue[T]) Send(id T, candidate TxCandidate, receiptCh chan TxReceipt[T]
 // blocked from completing until the channel is read from.
 func (q *Queue[T]) TrySend(id T, candidate TxCandidate, receiptCh chan TxReceipt[T]) bool {
 	group, ctx := q.groupContext()
-	return group.TryGo(func() error {
-		return q.sendTx(ctx, id, candidate, receiptCh)
-	})
-}
-
-func (q *Queue[T]) sendTx(ctx context.Context, id T, candidate TxCandidate, receiptCh chan TxReceipt[T]) error {
-	receipt, err := q.txMgr.Send(ctx, candidate)
-	receiptCh <- TxReceipt[T]{
-		ID:      id,
-		Receipt: receipt,
-		Err:     err,
+	responseChan := make(chan SendResponse, 1)
+	handleResponse := func() error {
+		return handleResponse(ctx, responseChan, receiptCh, id)
+	}
+	ok := group.TryGo(handleResponse)
+	if !ok {
+		return false
+	} else {
+		q.txMgr.SendAsync(ctx, candidate, responseChan)
+		return true
 	}
-	return err
 }
 
 // groupContext returns a Group and a Context to use when sending a tx.

From 8118fff79c2411433ea5e08a1bc94160455d6ec7 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Fri, 29 Nov 2024 09:49:45 +0800
Subject: [PATCH 307/451] use CallContract to detect tx failure early if
 gasLimit is specified (#13117)

---
 op-service/txmgr/txmgr.go | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/op-service/txmgr/txmgr.go b/op-service/txmgr/txmgr.go
index e633a74c2881..a73e84c92730 100644
--- a/op-service/txmgr/txmgr.go
+++ b/op-service/txmgr/txmgr.go
@@ -363,26 +363,32 @@ func (m *SimpleTxManager) craftTx(ctx context.Context, candidate TxCandidate) (*
 		}
 	}
 
+	// Calculate the intrinsic gas for the transaction
+	callMsg := ethereum.CallMsg{
+		From:      m.cfg.From,
+		To:        candidate.To,
+		GasTipCap: gasTipCap,
+		GasFeeCap: gasFeeCap,
+		Data:      candidate.TxData,
+		Value:     candidate.Value,
+	}
+	if len(blobHashes) > 0 {
+		callMsg.BlobGasFeeCap = blobBaseFee
+		callMsg.BlobHashes = blobHashes
+	}
 	// If the gas limit is set, we can use that as the gas
 	if gasLimit == 0 {
-		// Calculate the intrinsic gas for the transaction
-		callMsg := ethereum.CallMsg{
-			From:      m.cfg.From,
-			To:        candidate.To,
-			GasTipCap: gasTipCap,
-			GasFeeCap: gasFeeCap,
-			Data:      candidate.TxData,
-			Value:     candidate.Value,
-		}
-		if len(blobHashes) > 0 {
-			callMsg.BlobGasFeeCap = blobBaseFee
-			callMsg.BlobHashes = blobHashes
-		}
 		gas, err := m.backend.EstimateGas(ctx, callMsg)
 		if err != nil {
 			return nil, fmt.Errorf("failed to estimate gas: %w", errutil.TryAddRevertReason(err))
 		}
 		gasLimit = gas
+	} else {
+		callMsg.Gas = gasLimit
+		_, err := m.backend.CallContract(ctx, callMsg, nil)
+		if err != nil {
+			return nil, fmt.Errorf("failed to call: %w", errutil.TryAddRevertReason(err))
+		}
 	}
 
 	var txMessage types.TxData

From 9f84a4e3ac73fadafed4f61889357115632cdf8f Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 29 Nov 2024 03:36:06 +0100
Subject: [PATCH 308/451] fix mip2 test stack too deep error (#13138)

---
 .../contracts-bedrock/test/cannon/MIPS2.t.sol | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
index 2cc0519ea5bf..d38ab89ff556 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
@@ -789,8 +789,9 @@ contract MIPS2_Test is CommonTest {
             vm.expectRevert(InvalidMemoryProof.selector);
             mips.step(encodeState(state), bytes.concat(threadWitness, invalidInsnAndMemProof, memProof2), 0);
 
-            (, bytes memory invalidMemProof2) =
-                ffi.getCannonMemoryProof2(pc, insn, timespecAddr, secs + 1, timespecAddr + 4);
+            uint32 _secs = secs + 1;
+            uint32 _timespecAddr = timespecAddr + 4;
+            (, bytes memory invalidMemProof2) = ffi.getCannonMemoryProof2(pc, insn, timespecAddr, _secs, _timespecAddr);
             vm.expectRevert(InvalidSecondMemoryProof.selector);
             mips.step(encodeState(state), bytes.concat(threadWitness, insnAndMemProof, invalidMemProof2), 0);
         }
@@ -2766,31 +2767,21 @@ contract MIPS2_Test is CommonTest {
     }
 
     function encodeState(IMIPS2.State memory _state) internal pure returns (bytes memory) {
-        // Split up encoding to get around stack-too-deep error
-        return abi.encodePacked(encodeStateA(_state), encodeStateB(_state));
-    }
-
-    function encodeStateA(IMIPS2.State memory _state) internal pure returns (bytes memory) {
-        return abi.encodePacked(
+        bytes memory a = abi.encodePacked(
             _state.memRoot,
             _state.preimageKey,
             _state.preimageOffset,
             _state.heap,
             _state.llReservationStatus,
-            _state.llAddress,
-            _state.llOwnerThread,
-            _state.exitCode,
-            _state.exited,
-            _state.step,
-            _state.stepsSinceLastContextSwitch,
-            _state.wakeup,
-            _state.traverseRight,
-            _state.leftThreadStack
+            _state.llAddress
         );
-    }
-
-    function encodeStateB(IMIPS2.State memory _state) internal pure returns (bytes memory) {
-        return abi.encodePacked(_state.rightThreadStack, _state.nextThreadID);
+        bytes memory b = abi.encodePacked(
+            _state.llOwnerThread, _state.exitCode, _state.exited, _state.step, _state.stepsSinceLastContextSwitch
+        );
+        bytes memory c = abi.encodePacked(
+            _state.wakeup, _state.traverseRight, _state.leftThreadStack, _state.rightThreadStack, _state.nextThreadID
+        );
+        return abi.encodePacked(a, b, c);
     }
 
     function copyState(IMIPS2.State memory _state) internal pure returns (IMIPS2.State memory out_) {

From b2f662873a97eb6748b62295ce35700f59a3db19 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Sat, 30 Nov 2024 16:51:41 +0100
Subject: [PATCH 309/451] make safecall test support forge coverage (#13147)

---
 .../test/libraries/SafeCall.t.sol             | 53 ++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
index ffdf07b09b83..ef1f8876efba 100644
--- a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
+++ b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Test } from "forge-std/Test.sol";
+import { VmSafe } from "forge-std/Vm.sol";
 import { StdCheatsSafe } from "forge-std/StdCheats.sol";
 
 // Target contract
@@ -122,9 +123,29 @@ contract SafeCall_Test is Test {
         for (uint64 i = 40_000; i < 100_000; i++) {
             uint256 snapshot = vm.snapshot();
 
-            // 65_922 is the exact amount of gas required to make the safe call
-            // successfully.
-            if (i < 65_922) {
+            // The values below are best gotten by setting the value to a high number and running the test with a
+            // verbosity of `-vvv` then setting the value to the value (gas arg) of the failed assertion.
+            // A faster way to do this for forge coverage cases, is to comment out the optimizer and optimizer runs in
+            // the foundry.toml file and then run forge test. This is faster because forge test only compiles modified
+            // contracts unlike forge coverage.
+            uint256 expected;
+
+            // Because forge coverage always runs with the optimizer disabled,
+            // if forge coverage is run before testing this with forge test or forge snapshot, forge clean should be
+            // run first so that it recompiles the contracts using the foundry.toml optimizer settings.
+            if (vm.isContext(VmSafe.ForgeContext.Coverage)) {
+                // 66_290 is the exact amount of gas required to make the safe call
+                // successfully with the optimizer disabled (ran via forge coverage)
+                expected = 66_290;
+            } else if (vm.isContext(VmSafe.ForgeContext.Test) || vm.isContext(VmSafe.ForgeContext.Snapshot)) {
+                // 65_922 is the exact amount of gas required to make the safe call
+                // successfully with the foundry.toml optimizer settings.
+                expected = 65_922;
+            } else {
+                revert("SafeCall_Test: unknown context");
+            }
+
+            if (i < expected) {
                 assertFalse(caller.makeSafeCall(i, 25_000));
             } else {
                 vm.expectCallMinGas(address(caller), 0, 25_000, abi.encodeCall(caller.setA, (1)));
@@ -142,9 +163,29 @@ contract SafeCall_Test is Test {
         for (uint64 i = 15_200_000; i < 15_300_000; i++) {
             uint256 snapshot = vm.snapshot();
 
-            // 15_278_621 is the exact amount of gas required to make the safe call
-            // successfully.
-            if (i < 15_278_621) {
+            // The values below are best gotten by setting the value to a high number and running the test with a
+            // verbosity of `-vvv` then setting the value to the value (gas arg) of the failed assertion.
+            // A faster way to do this for forge coverage cases, is to comment out the optimizer and optimizer runs in
+            // the foundry.toml file and then run forge test. This is faster because forge test only compiles modified
+            // contracts unlike forge coverage.
+            uint256 expected;
+
+            // Because forge coverage always runs with the optimizer disabled,
+            // if forge coverage is run before testing this with forge test or forge snapshot, forge clean should be
+            // run first so that it recompiles the contracts using the foundry.toml optimizer settings.
+            if (vm.isContext(VmSafe.ForgeContext.Coverage)) {
+                // 15_278_989 is the exact amount of gas required to make the safe call
+                // successfully with the optimizer disabled (ran via forge coverage)
+                expected = 15_278_989;
+            } else if (vm.isContext(VmSafe.ForgeContext.Test) || vm.isContext(VmSafe.ForgeContext.Snapshot)) {
+                // 15_278_621 is the exact amount of gas required to make the safe call
+                // successfully with the foundry.toml optimizer settings.
+                expected = 15_278_621;
+            } else {
+                revert("SafeCall_Test: unknown context");
+            }
+
+            if (i < expected) {
                 assertFalse(caller.makeSafeCall(i, 15_000_000));
             } else {
                 vm.expectCallMinGas(address(caller), 0, 15_000_000, abi.encodeCall(caller.setA, (1)));

From 4c0387b5bdc1cecfc4530a2692f1bd8542d3a652 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Sun, 1 Dec 2024 20:00:35 -0500
Subject: [PATCH 310/451] feat: allow arguments to contracts test recipe
 (#13152)

Adds the ability to supply arguments to the "just test" recipe in
the contracts package. Developers frequently need to add arguments
to test specific contracts and running "just test" as the unified
testing command is better than flipping to "forge test".
---
 packages/contracts-bedrock/justfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index fe6f4c0834c9..b82717c4a26f 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -54,8 +54,8 @@ clean:
 ########################################################
 
 # Runs standard contract tests.
-test: build-go-ffi
-  forge test
+test *ARGS: build-go-ffi
+  forge test {{ARGS}}
 
 # Runs standard contract tests with rerun flag.
 test-rerun: build-go-ffi

From b6c28d5dc5b48b1df0e5ba003704c3e700fb8eb7 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Mon, 2 Dec 2024 17:51:18 +0800
Subject: [PATCH 311/451] estimate gas correctly for blob tx in
 increaseGasPrice (#13116)

---
 op-service/txmgr/txmgr.go | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/op-service/txmgr/txmgr.go b/op-service/txmgr/txmgr.go
index a73e84c92730..353951af6332 100644
--- a/op-service/txmgr/txmgr.go
+++ b/op-service/txmgr/txmgr.go
@@ -803,14 +803,30 @@ func (m *SimpleTxManager) increaseGasPrice(ctx context.Context, tx *types.Transa
 	}
 
 	// Re-estimate gaslimit in case things have changed or a previous gaslimit estimate was wrong
-	gas, err := m.backend.EstimateGas(ctx, ethereum.CallMsg{
+	callMsg := ethereum.CallMsg{
 		From:      m.cfg.From,
 		To:        tx.To(),
 		GasTipCap: bumpedTip,
 		GasFeeCap: bumpedFee,
 		Data:      tx.Data(),
 		Value:     tx.Value(),
-	})
+	}
+	var bumpedBlobFee *big.Int
+	if tx.Type() == types.BlobTxType {
+		// Blob transactions have an additional blob gas price we must specify, so we must make sure it is
+		// getting bumped appropriately.
+		bumpedBlobFee = calcThresholdValue(tx.BlobGasFeeCap(), true)
+		if bumpedBlobFee.Cmp(blobBaseFee) < 0 {
+			bumpedBlobFee = blobBaseFee
+		}
+		if err := m.checkBlobFeeLimits(blobBaseFee, bumpedBlobFee); err != nil {
+			return nil, err
+		}
+
+		callMsg.BlobGasFeeCap = bumpedBlobFee
+		callMsg.BlobHashes = tx.BlobHashes()
+	}
+	gas, err := m.backend.EstimateGas(ctx, callMsg)
 	if err != nil {
 		// If this is a transaction resubmission, we sometimes see this outcome because the
 		// original tx can get included in a block just before the above call. In this case the
@@ -836,15 +852,6 @@ func (m *SimpleTxManager) increaseGasPrice(ctx context.Context, tx *types.Transa
 
 	var newTx *types.Transaction
 	if tx.Type() == types.BlobTxType {
-		// Blob transactions have an additional blob gas price we must specify, so we must make sure it is
-		// getting bumped appropriately.
-		bumpedBlobFee := calcThresholdValue(tx.BlobGasFeeCap(), true)
-		if bumpedBlobFee.Cmp(blobBaseFee) < 0 {
-			bumpedBlobFee = blobBaseFee
-		}
-		if err := m.checkBlobFeeLimits(blobBaseFee, bumpedBlobFee); err != nil {
-			return nil, err
-		}
 		message := &types.BlobTx{
 			Nonce:      tx.Nonce(),
 			To:         *tx.To(),

From 4ee839ae8996c2d421a2d85fd5471897840014fa Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 2 Dec 2024 03:37:28 -0700
Subject: [PATCH 312/451] op-batcher: Fix test flake due to log (#13145)

There was one other spot where the batcher would log after tests exit, causing a panic.
---
 op-batcher/batcher/driver.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 58e533becff0..d52a31bba60b 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -779,12 +779,14 @@ func (l *BatchSubmitter) publishToAltDAAndL1(txdata txData, queue *txmgr.Queue[t
 		if err != nil {
 			// Don't log context cancelled events because they are expected,
 			// and can happen after tests complete which causes a panic.
-			if !errors.Is(err, context.Canceled) {
+			if errors.Is(err, context.Canceled) {
+				l.recordFailedDARequest(txdata.ID(), nil)
+			} else {
 				l.Log.Error("Failed to post input to Alt DA", "error", err)
+				// requeue frame if we fail to post to the DA Provider so it can be retried
+				// note: this assumes that the da server caches requests, otherwise it might lead to resubmissions of the blobs
+				l.recordFailedDARequest(txdata.ID(), err)
 			}
-			// requeue frame if we fail to post to the DA Provider so it can be retried
-			// note: this assumes that the da server caches requests, otherwise it might lead to resubmissions of the blobs
-			l.recordFailedDARequest(txdata.ID(), err)
 			return nil
 		}
 		l.Log.Info("Set altda input", "commitment", comm, "tx", txdata.ID())

From d1a2198ba195e3b7b32e228c8ad4ee953294126d Mon Sep 17 00:00:00 2001
From: Skylar Ray <137945430+sky-coderay@users.noreply.github.com>
Date: Mon, 2 Dec 2024 17:37:33 +0200
Subject: [PATCH 313/451] Fix typos in `op-conductor/README.md` documentation  
 (#13128)

* Update README.md

* Update README.md

* Update README.md
---
 op-conductor/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/op-conductor/README.md b/op-conductor/README.md
index 497156b8eee8..c436d0248ace 100644
--- a/op-conductor/README.md
+++ b/op-conductor/README.md
@@ -1,3 +1,4 @@
+
 # op-conductor
 
 op-conductor is an auxiliary service designed to enhance the reliability and availability of a sequencer in
@@ -20,7 +21,7 @@ For configuration and runbook, please refer to [RUNBOOK.md](./RUNBOOK.md)
 ### Architecture
 
 Typically you can setup a 3 nodes sequencer cluster, each one with op-conductor running alongside the sequencer in different regions / AZs.
-Below diagram showcaes how conductor interacts with relevant op-stack components.
+Below diagram showcases how conductor interacts with relevant op-stack components.
 
 ![op-conductor setup](./assets/setup.svg)
 
@@ -93,6 +94,6 @@ There are 2 situations we need to consider.
 
 1. Leadership transfer triggered by raft consensus protocol (network partition, etc)
    1. In this case, a new leader will be elected regardless of its sync status, it could be behind for a few blocks
-   2. The solution is to simple, wait until the elected leader catch up to tip (same as the FSM tip)
+   2. The solution is to simply wait until the elected leader catches up to tip (same as the FSM tip)
 2. Leadership transfer triggered by us (Conductor detected unhealthy sequencer)
    1. In this case, we have the choice to determine which node to transfer leadership to, we can simply query the latest block from candidates within the network and transfer directly to the one with the most up to date blocks.

From cdae7f2b6a47e226bb5ec7506d3f3f3d9c367814 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Mon, 2 Dec 2024 11:11:13 -0500
Subject: [PATCH 314/451] fix: stack too deep in PermissionedDisputeGame
 (#13141)

Fixes the stack-too-deep error in the PermissionedDisputeGame by
updating the game to use a struct as the constructor parameter.
---
 .../scripts/deploy/Deploy.s.sol               |  81 ++++-------
 .../scripts/deploy/DeployDisputeGame.s.sol    |  48 +------
 .../upgrades/holocene/DeployUpgrade.s.sol     |  44 +++---
 .../snapshots/abi/FaultDisputeGame.json       | 103 +++++++-------
 .../abi/PermissionedDisputeGame.json          | 103 +++++++-------
 .../snapshots/semver-lock.json                |   4 +-
 .../src/dispute/FaultDisputeGame.sol          |  80 ++++++-----
 .../src/dispute/PermissionedDisputeGame.sol   |  42 +-----
 .../dispute/interfaces/IFaultDisputeGame.sol  |  27 ++--
 .../interfaces/IPermissionedDisputeGame.sol   |  14 +-
 .../test/dispute/FaultDisputeGame.t.sol       | 132 ++++++++++--------
 .../dispute/PermissionedDisputeGame.t.sol     |  23 +--
 12 files changed, 317 insertions(+), 384 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 9e688f29ae6d..56e6b6feba3d 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -64,20 +64,6 @@ import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
 contract Deploy is Deployer {
     using stdJson for string;
 
-    /// @notice FaultDisputeGameParams is a struct that contains the parameters necessary to call
-    ///         the function _setFaultGameImplementation. This struct exists because the EVM needs
-    ///         to finally adopt PUSHN and get rid of stack too deep once and for all.
-    ///         Someday we will look back and laugh about stack too deep, today is not that day.
-    struct FaultDisputeGameParams {
-        IAnchorStateRegistry anchorStateRegistry;
-        IDelayedWETH weth;
-        GameType gameType;
-        Claim absolutePrestate;
-        IBigStepper faultVm;
-        uint256 maxGameDepth;
-        Duration maxClockDuration;
-    }
-
     ////////////////////////////////////////////////////////////////
     //                        Modifiers                           //
     ////////////////////////////////////////////////////////////////
@@ -871,14 +857,17 @@ contract Deploy is Deployer {
         // Set the Cannon FaultDisputeGame implementation in the factory.
         _setFaultGameImplementation({
             _factory: factory,
-            _params: FaultDisputeGameParams({
-                anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
-                weth: weth,
+            _params: IFaultDisputeGame.GameConstructorParams({
                 gameType: GameTypes.CANNON,
                 absolutePrestate: loadMipsAbsolutePrestate(),
-                faultVm: IBigStepper(mustGetAddress("Mips")),
                 maxGameDepth: cfg.faultGameMaxDepth(),
-                maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
+                splitDepth: cfg.faultGameSplitDepth(),
+                clockExtension: Duration.wrap(uint64(cfg.faultGameClockExtension())),
+                maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
+                vm: IBigStepper(mustGetAddress("Mips")),
+                weth: weth,
+                anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
+                l2ChainId: cfg.l2ChainID()
             })
         });
     }
@@ -892,15 +881,18 @@ contract Deploy is Deployer {
         Claim outputAbsolutePrestate = Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate()));
         _setFaultGameImplementation({
             _factory: factory,
-            _params: FaultDisputeGameParams({
-                anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
-                weth: weth,
+            _params: IFaultDisputeGame.GameConstructorParams({
                 gameType: GameTypes.ALPHABET,
                 absolutePrestate: outputAbsolutePrestate,
-                faultVm: IBigStepper(new AlphabetVM(outputAbsolutePrestate, IPreimageOracle(mustGetAddress("PreimageOracle")))),
                 // The max depth for the alphabet trace is always 3. Add 1 because split depth is fully inclusive.
                 maxGameDepth: cfg.faultGameSplitDepth() + 3 + 1,
-                maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration()))
+                splitDepth: cfg.faultGameSplitDepth(),
+                clockExtension: Duration.wrap(uint64(cfg.faultGameClockExtension())),
+                maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
+                vm: IBigStepper(new AlphabetVM(outputAbsolutePrestate, IPreimageOracle(mustGetAddress("PreimageOracle")))),
+                weth: weth,
+                anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
+                l2ChainId: cfg.l2ChainID()
             })
         });
     }
@@ -925,23 +917,26 @@ contract Deploy is Deployer {
         );
         _setFaultGameImplementation({
             _factory: factory,
-            _params: FaultDisputeGameParams({
-                anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
-                weth: weth,
+            _params: IFaultDisputeGame.GameConstructorParams({
                 gameType: GameTypes.FAST,
                 absolutePrestate: outputAbsolutePrestate,
-                faultVm: IBigStepper(new AlphabetVM(outputAbsolutePrestate, fastOracle)),
                 // The max depth for the alphabet trace is always 3. Add 1 because split depth is fully inclusive.
                 maxGameDepth: cfg.faultGameSplitDepth() + 3 + 1,
-                maxClockDuration: Duration.wrap(0) // Resolvable immediately
-             })
+                splitDepth: cfg.faultGameSplitDepth(),
+                clockExtension: Duration.wrap(uint64(cfg.faultGameClockExtension())),
+                maxClockDuration: Duration.wrap(0), // Resolvable immediately
+                vm: IBigStepper(new AlphabetVM(outputAbsolutePrestate, fastOracle)),
+                weth: weth,
+                anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
+                l2ChainId: cfg.l2ChainID()
+            })
         });
     }
 
     /// @notice Sets the implementation for the given fault game type in the `DisputeGameFactory`.
     function _setFaultGameImplementation(
         IDisputeGameFactory _factory,
-        FaultDisputeGameParams memory _params
+        IFaultDisputeGame.GameConstructorParams memory _params
     )
         internal
     {
@@ -954,37 +949,19 @@ contract Deploy is Deployer {
         }
 
         uint32 rawGameType = GameType.unwrap(_params.gameType);
-
-        // Redefine _param variable to avoid stack too deep error during compilation
-        FaultDisputeGameParams memory _params_ = _params;
         require(
             rawGameType != GameTypes.PERMISSIONED_CANNON.raw(), "Deploy: Permissioned Game should be deployed by OPCM"
         );
+
         _factory.setImplementation(
-            _params_.gameType,
+            _params.gameType,
             IDisputeGame(
                 DeployUtils.create2AndSave({
                     _save: this,
                     _salt: _implSalt(),
                     _name: "FaultDisputeGame",
                     _nick: string.concat("FaultDisputeGame_", vm.toString(rawGameType)),
-                    _args: DeployUtils.encodeConstructor(
-                        abi.encodeCall(
-                            IFaultDisputeGame.__constructor__,
-                            (
-                                _params_.gameType,
-                                _params_.absolutePrestate,
-                                _params_.maxGameDepth,
-                                cfg.faultGameSplitDepth(),
-                                Duration.wrap(uint64(cfg.faultGameClockExtension())),
-                                _params_.maxClockDuration,
-                                _params_.faultVm,
-                                _params_.weth,
-                                IAnchorStateRegistry(mustGetAddress("AnchorStateRegistryProxy")),
-                                cfg.l2ChainID()
-                            )
-                        )
-                    )
+                    _args: DeployUtils.encodeConstructor(abi.encodeCall(IFaultDisputeGame.__constructor__, (_params)))
                 })
             )
         );
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
index 153e4b65fdb4..67893d2cb131 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
@@ -270,19 +270,17 @@ contract DeployDisputeGame is Script {
 
     function deployDisputeGameImpl(DeployDisputeGameInput _dgi, DeployDisputeGameOutput _dgo) internal {
         // Shove the arguments into a struct to avoid stack-too-deep errors.
-        DisputeGameConstructorArgs memory args = DisputeGameConstructorArgs({
+        IFaultDisputeGame.GameConstructorParams memory args = IFaultDisputeGame.GameConstructorParams({
             gameType: GameType.wrap(uint32(_dgi.gameType())),
             absolutePrestate: Claim.wrap(_dgi.absolutePrestate()),
             maxGameDepth: _dgi.maxGameDepth(),
             splitDepth: _dgi.splitDepth(),
             clockExtension: Duration.wrap(uint64(_dgi.clockExtension())),
             maxClockDuration: Duration.wrap(uint64(_dgi.maxClockDuration())),
-            gameVm: IBigStepper(address(_dgi.vmAddress())),
-            delayedWethProxy: _dgi.delayedWethProxy(),
-            anchorStateRegistryProxy: _dgi.anchorStateRegistryProxy(),
-            l2ChainId: _dgi.l2ChainId(),
-            proposer: _dgi.proposer(),
-            challenger: _dgi.challenger()
+            vm: IBigStepper(address(_dgi.vmAddress())),
+            weth: _dgi.delayedWethProxy(),
+            anchorStateRegistry: _dgi.anchorStateRegistryProxy(),
+            l2ChainId: _dgi.l2ChainId()
         });
 
         // PermissionedDisputeGame is used as the type here because it is a superset of
@@ -294,23 +292,7 @@ contract DeployDisputeGame is Script {
             impl = IPermissionedDisputeGame(
                 DeployUtils.create1({
                     _name: "FaultDisputeGame",
-                    _args: DeployUtils.encodeConstructor(
-                        abi.encodeCall(
-                            IFaultDisputeGame.__constructor__,
-                            (
-                                args.gameType,
-                                args.absolutePrestate,
-                                args.maxGameDepth,
-                                args.splitDepth,
-                                args.clockExtension,
-                                args.maxClockDuration,
-                                args.gameVm,
-                                args.delayedWethProxy,
-                                args.anchorStateRegistryProxy,
-                                args.l2ChainId
-                            )
-                        )
-                    )
+                    _args: DeployUtils.encodeConstructor(abi.encodeCall(IFaultDisputeGame.__constructor__, (args)))
                 })
             );
         } else {
@@ -318,23 +300,7 @@ contract DeployDisputeGame is Script {
                 DeployUtils.create1({
                     _name: "PermissionedDisputeGame",
                     _args: DeployUtils.encodeConstructor(
-                        abi.encodeCall(
-                            IPermissionedDisputeGame.__constructor__,
-                            (
-                                args.gameType,
-                                args.absolutePrestate,
-                                args.maxGameDepth,
-                                args.splitDepth,
-                                args.clockExtension,
-                                args.maxClockDuration,
-                                args.gameVm,
-                                args.delayedWethProxy,
-                                args.anchorStateRegistryProxy,
-                                args.l2ChainId,
-                                args.proposer,
-                                args.challenger
-                            )
-                        )
+                        abi.encodeCall(IPermissionedDisputeGame.__constructor__, (args, _dgi.proposer(), _dgi.challenger()))
                     )
                 })
             );
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol b/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
index 8203e42b060c..680c4bea1274 100644
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
+++ b/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
@@ -138,16 +138,18 @@ contract DeployUpgrade is Deployer {
         bytes memory constructorInput = abi.encodeCall(
             IFaultDisputeGame.__constructor__,
             (
-                GameTypes.CANNON,
-                Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
-                cfg.faultGameMaxDepth(),
-                cfg.faultGameSplitDepth(),
-                Duration.wrap(uint64(cfg.faultGameClockExtension())),
-                Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
-                IBigStepper(mustGetAddress("MIPS")),
-                IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyFDG"))),
-                IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
-                cfg.l2ChainID()
+                IFaultDisputeGame.GameConstructorParams({
+                    gameType: GameTypes.CANNON,
+                    absolutePrestate: Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
+                    maxGameDepth: cfg.faultGameMaxDepth(),
+                    splitDepth: cfg.faultGameSplitDepth(),
+                    clockExtension: Duration.wrap(uint64(cfg.faultGameClockExtension())),
+                    maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
+                    vm: IBigStepper(mustGetAddress("MIPS")),
+                    weth: IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyFDG"))),
+                    anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
+                    l2ChainId: cfg.l2ChainID()
+                })
             )
         );
 
@@ -197,16 +199,18 @@ contract DeployUpgrade is Deployer {
         bytes memory constructorInput = abi.encodeCall(
             IPermissionedDisputeGame.__constructor__,
             (
-                GameTypes.PERMISSIONED_CANNON,
-                Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
-                cfg.faultGameMaxDepth(),
-                cfg.faultGameSplitDepth(),
-                Duration.wrap(uint64(cfg.faultGameClockExtension())),
-                Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
-                IBigStepper(mustGetAddress("MIPS")),
-                IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyPDG"))),
-                IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
-                cfg.l2ChainID(),
+                IFaultDisputeGame.GameConstructorParams({
+                    gameType: GameTypes.PERMISSIONED_CANNON,
+                    absolutePrestate: Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
+                    maxGameDepth: cfg.faultGameMaxDepth(),
+                    splitDepth: cfg.faultGameSplitDepth(),
+                    clockExtension: Duration.wrap(uint64(cfg.faultGameClockExtension())),
+                    maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
+                    vm: IBigStepper(mustGetAddress("MIPS")),
+                    weth: IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyPDG"))),
+                    anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
+                    l2ChainId: cfg.l2ChainID()
+                }),
                 cfg.l2OutputOracleProposer(),
                 cfg.l2OutputOracleChallenger()
             )
diff --git a/packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json b/packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json
index e1e59c38701c..a2f02cce13bd 100644
--- a/packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json
+++ b/packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json
@@ -2,54 +2,61 @@
   {
     "inputs": [
       {
-        "internalType": "GameType",
-        "name": "_gameType",
-        "type": "uint32"
-      },
-      {
-        "internalType": "Claim",
-        "name": "_absolutePrestate",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_maxGameDepth",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_splitDepth",
-        "type": "uint256"
-      },
-      {
-        "internalType": "Duration",
-        "name": "_clockExtension",
-        "type": "uint64"
-      },
-      {
-        "internalType": "Duration",
-        "name": "_maxClockDuration",
-        "type": "uint64"
-      },
-      {
-        "internalType": "contract IBigStepper",
-        "name": "_vm",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IDelayedWETH",
-        "name": "_weth",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IAnchorStateRegistry",
-        "name": "_anchorStateRegistry",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_l2ChainId",
-        "type": "uint256"
+        "components": [
+          {
+            "internalType": "GameType",
+            "name": "gameType",
+            "type": "uint32"
+          },
+          {
+            "internalType": "Claim",
+            "name": "absolutePrestate",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "uint256",
+            "name": "maxGameDepth",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "splitDepth",
+            "type": "uint256"
+          },
+          {
+            "internalType": "Duration",
+            "name": "clockExtension",
+            "type": "uint64"
+          },
+          {
+            "internalType": "Duration",
+            "name": "maxClockDuration",
+            "type": "uint64"
+          },
+          {
+            "internalType": "contract IBigStepper",
+            "name": "vm",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IDelayedWETH",
+            "name": "weth",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IAnchorStateRegistry",
+            "name": "anchorStateRegistry",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "l2ChainId",
+            "type": "uint256"
+          }
+        ],
+        "internalType": "struct FaultDisputeGame.GameConstructorParams",
+        "name": "_params",
+        "type": "tuple"
       }
     ],
     "stateMutability": "nonpayable",
diff --git a/packages/contracts-bedrock/snapshots/abi/PermissionedDisputeGame.json b/packages/contracts-bedrock/snapshots/abi/PermissionedDisputeGame.json
index fd9737cc5842..eebc4adf16ea 100644
--- a/packages/contracts-bedrock/snapshots/abi/PermissionedDisputeGame.json
+++ b/packages/contracts-bedrock/snapshots/abi/PermissionedDisputeGame.json
@@ -2,54 +2,61 @@
   {
     "inputs": [
       {
-        "internalType": "GameType",
-        "name": "_gameType",
-        "type": "uint32"
-      },
-      {
-        "internalType": "Claim",
-        "name": "_absolutePrestate",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_maxGameDepth",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_splitDepth",
-        "type": "uint256"
-      },
-      {
-        "internalType": "Duration",
-        "name": "_clockExtension",
-        "type": "uint64"
-      },
-      {
-        "internalType": "Duration",
-        "name": "_maxClockDuration",
-        "type": "uint64"
-      },
-      {
-        "internalType": "contract IBigStepper",
-        "name": "_vm",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IDelayedWETH",
-        "name": "_weth",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IAnchorStateRegistry",
-        "name": "_anchorStateRegistry",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_l2ChainId",
-        "type": "uint256"
+        "components": [
+          {
+            "internalType": "GameType",
+            "name": "gameType",
+            "type": "uint32"
+          },
+          {
+            "internalType": "Claim",
+            "name": "absolutePrestate",
+            "type": "bytes32"
+          },
+          {
+            "internalType": "uint256",
+            "name": "maxGameDepth",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "splitDepth",
+            "type": "uint256"
+          },
+          {
+            "internalType": "Duration",
+            "name": "clockExtension",
+            "type": "uint64"
+          },
+          {
+            "internalType": "Duration",
+            "name": "maxClockDuration",
+            "type": "uint64"
+          },
+          {
+            "internalType": "contract IBigStepper",
+            "name": "vm",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IDelayedWETH",
+            "name": "weth",
+            "type": "address"
+          },
+          {
+            "internalType": "contract IAnchorStateRegistry",
+            "name": "anchorStateRegistry",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "l2ChainId",
+            "type": "uint256"
+          }
+        ],
+        "internalType": "struct FaultDisputeGame.GameConstructorParams",
+        "name": "_params",
+        "type": "tuple"
       },
       {
         "internalType": "address",
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 8bd5ea33f772..32de3eeb7f33 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -164,8 +164,8 @@
     "sourceCodeHash": "0x9cb0851b6e471461f2bb369bd72eef4cffe8a0d1345546608a2aa6795540211d"
   },
   "src/dispute/FaultDisputeGame.sol": {
-    "initCodeHash": "0xa352179f5055232764aac6b66a3ff5a6b3bfae2101d20c077f714b0ed7e40eef",
-    "sourceCodeHash": "0x730eff9147294c115a0a53e7e75771bcc4a517beb48457140ab929a8d1510893"
+    "initCodeHash": "0x7441e418d3b4229f519c8c027f3fd7a5487206b833110b794cca104a1a2c73fe",
+    "sourceCodeHash": "0x8f4bf662fe8d56e9aabaa7742033880f0900cd6221c7711c1dbefe985a841104"
   },
   "src/legacy/DeployerWhitelist.sol": {
     "initCodeHash": "0xf232863fde5cd65368bcb4a79b41b5a4a09c59ede5070f82fd3f13f681bea7d8",
diff --git a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
index 2bd5ec67e96c..6aad60e42839 100644
--- a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
@@ -86,6 +86,21 @@ contract FaultDisputeGame is Clone, ISemver {
         address counteredBy;
     }
 
+    /// @notice Parameters for creating a new FaultDisputeGame. We place this into a struct to
+    ///         avoid stack-too-deep errors when compiling without the optimizer enabled.
+    struct GameConstructorParams {
+        GameType gameType;
+        Claim absolutePrestate;
+        uint256 maxGameDepth;
+        uint256 splitDepth;
+        Duration clockExtension;
+        Duration maxClockDuration;
+        IBigStepper vm;
+        IDelayedWETH weth;
+        IAnchorStateRegistry anchorStateRegistry;
+        uint256 l2ChainId;
+    }
+
     ////////////////////////////////////////////////////////////////
     //                         Events                             //
     ////////////////////////////////////////////////////////////////
@@ -146,8 +161,8 @@ contract FaultDisputeGame is Clone, ISemver {
     uint256 internal constant HEADER_BLOCK_NUMBER_INDEX = 8;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.7
-    string public constant version = "1.3.1-beta.7";
+    /// @custom:semver 1.3.1-beta.8
+    string public constant version = "1.3.1-beta.8";
 
     /// @notice The starting timestamp of the game
     Timestamp public createdAt;
@@ -189,69 +204,52 @@ contract FaultDisputeGame is Clone, ISemver {
     /// @notice The latest finalized output root, serving as the anchor for output bisection.
     OutputRoot public startingOutputRoot;
 
-    /// @param _gameType The type ID of the game.
-    /// @param _absolutePrestate The absolute prestate of the instruction trace.
-    /// @param _maxGameDepth The maximum depth of bisection.
-    /// @param _splitDepth The final depth of the output bisection portion of the game.
-    /// @param _clockExtension The clock extension to perform when the remaining duration is less than the extension.
-    /// @param _maxClockDuration The maximum amount of time that may accumulate on a team's chess clock.
-    /// @param _vm An onchain VM that performs single instruction steps on an FPP trace.
-    /// @param _weth WETH contract for holding ETH.
-    /// @param _anchorStateRegistry The contract that stores the anchor state for each game type.
-    /// @param _l2ChainId Chain ID of the L2 network this contract argues about.
-    constructor(
-        GameType _gameType,
-        Claim _absolutePrestate,
-        uint256 _maxGameDepth,
-        uint256 _splitDepth,
-        Duration _clockExtension,
-        Duration _maxClockDuration,
-        IBigStepper _vm,
-        IDelayedWETH _weth,
-        IAnchorStateRegistry _anchorStateRegistry,
-        uint256 _l2ChainId
-    ) {
+    /// @param _params Parameters for creating a new FaultDisputeGame.
+    constructor(GameConstructorParams memory _params) {
         // The max game depth may not be greater than `LibPosition.MAX_POSITION_BITLEN - 1`.
-        if (_maxGameDepth > LibPosition.MAX_POSITION_BITLEN - 1) revert MaxDepthTooLarge();
+        if (_params.maxGameDepth > LibPosition.MAX_POSITION_BITLEN - 1) revert MaxDepthTooLarge();
 
         // The split depth plus one cannot be greater than or equal to the max game depth. We add
         // an additional depth to the split depth to avoid a bug in trace ancestor lookup. We know
         // that the case where the split depth is the max value for uint256 is equivalent to the
         // second check though we do need to check it explicitly to avoid an overflow.
-        if (_splitDepth == type(uint256).max || _splitDepth + 1 >= _maxGameDepth) revert InvalidSplitDepth();
+        if (_params.splitDepth == type(uint256).max || _params.splitDepth + 1 >= _params.maxGameDepth) {
+            revert InvalidSplitDepth();
+        }
 
         // The split depth cannot be 0 or 1 to stay in bounds of clock extension arithmetic.
-        if (_splitDepth < 2) revert InvalidSplitDepth();
+        if (_params.splitDepth < 2) revert InvalidSplitDepth();
 
         // The PreimageOracle challenge period must fit into uint64 so we can safely use it here.
         // Runtime check was added instead of changing the ABI since the contract is already
         // deployed in production. We perform the same check within the PreimageOracle for the
         // benefit of developers but also perform this check here defensively.
-        if (_vm.oracle().challengePeriod() > type(uint64).max) revert InvalidChallengePeriod();
+        if (_params.vm.oracle().challengePeriod() > type(uint64).max) revert InvalidChallengePeriod();
 
         // Determine the maximum clock extension which is either the split depth extension or the
         // maximum game depth extension depending on the configuration of these contracts.
-        uint256 splitDepthExtension = uint256(_clockExtension.raw()) * 2;
-        uint256 maxGameDepthExtension = uint256(_clockExtension.raw()) + uint256(_vm.oracle().challengePeriod());
+        uint256 splitDepthExtension = uint256(_params.clockExtension.raw()) * 2;
+        uint256 maxGameDepthExtension =
+            uint256(_params.clockExtension.raw()) + uint256(_params.vm.oracle().challengePeriod());
         uint256 maxClockExtension = Math.max(splitDepthExtension, maxGameDepthExtension);
 
         // The maximum clock extension must fit into a uint64.
         if (maxClockExtension > type(uint64).max) revert InvalidClockExtension();
 
         // The maximum clock extension may not be greater than the maximum clock duration.
-        if (uint64(maxClockExtension) > _maxClockDuration.raw()) revert InvalidClockExtension();
+        if (uint64(maxClockExtension) > _params.maxClockDuration.raw()) revert InvalidClockExtension();
 
         // Set up initial game state.
-        GAME_TYPE = _gameType;
-        ABSOLUTE_PRESTATE = _absolutePrestate;
-        MAX_GAME_DEPTH = _maxGameDepth;
-        SPLIT_DEPTH = _splitDepth;
-        CLOCK_EXTENSION = _clockExtension;
-        MAX_CLOCK_DURATION = _maxClockDuration;
-        VM = _vm;
-        WETH = _weth;
-        ANCHOR_STATE_REGISTRY = _anchorStateRegistry;
-        L2_CHAIN_ID = _l2ChainId;
+        GAME_TYPE = _params.gameType;
+        ABSOLUTE_PRESTATE = _params.absolutePrestate;
+        MAX_GAME_DEPTH = _params.maxGameDepth;
+        SPLIT_DEPTH = _params.splitDepth;
+        CLOCK_EXTENSION = _params.clockExtension;
+        MAX_CLOCK_DURATION = _params.maxClockDuration;
+        VM = _params.vm;
+        WETH = _params.weth;
+        ANCHOR_STATE_REGISTRY = _params.anchorStateRegistry;
+        L2_CHAIN_ID = _params.l2ChainId;
     }
 
     /// @notice Initializes the contract.
diff --git a/packages/contracts-bedrock/src/dispute/PermissionedDisputeGame.sol b/packages/contracts-bedrock/src/dispute/PermissionedDisputeGame.sol
index 373498f55bfa..de907695d006 100644
--- a/packages/contracts-bedrock/src/dispute/PermissionedDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/PermissionedDisputeGame.sol
@@ -5,14 +5,9 @@ pragma solidity 0.8.15;
 import { FaultDisputeGame } from "src/dispute/FaultDisputeGame.sol";
 
 // Libraries
-import { GameType, Claim, Duration } from "src/dispute/lib/Types.sol";
+import { Claim } from "src/dispute/lib/Types.sol";
 import { BadAuth } from "src/dispute/lib/Errors.sol";
 
-// Interfaces
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
-
 /// @title PermissionedDisputeGame
 /// @notice PermissionedDisputeGame is a contract that inherits from `FaultDisputeGame`, and contains two roles:
 ///         - The `challenger` role, which is allowed to challenge a dispute.
@@ -36,44 +31,15 @@ contract PermissionedDisputeGame is FaultDisputeGame {
         _;
     }
 
-    /// @param _gameType The type ID of the game.
-    /// @param _absolutePrestate The absolute prestate of the instruction trace.
-    /// @param _maxGameDepth The maximum depth of bisection.
-    /// @param _splitDepth The final depth of the output bisection portion of the game.
-    /// @param _clockExtension The clock extension to perform when the remaining duration is less than the extension.
-    /// @param _maxClockDuration The maximum amount of time that may accumulate on a team's chess clock.
-    /// @param _vm An onchain VM that performs single instruction steps on an FPP trace.
-    /// @param _weth WETH contract for holding ETH.
-    /// @param _anchorStateRegistry The contract that stores the anchor state for each game type.
-    /// @param _l2ChainId Chain ID of the L2 network this contract argues about.
+    /// @param _params Parameters for creating a new FaultDisputeGame.
     /// @param _proposer Address that is allowed to create instances of this contract.
     /// @param _challenger Address that is allowed to challenge instances of this contract.
     constructor(
-        GameType _gameType,
-        Claim _absolutePrestate,
-        uint256 _maxGameDepth,
-        uint256 _splitDepth,
-        Duration _clockExtension,
-        Duration _maxClockDuration,
-        IBigStepper _vm,
-        IDelayedWETH _weth,
-        IAnchorStateRegistry _anchorStateRegistry,
-        uint256 _l2ChainId,
+        GameConstructorParams memory _params,
         address _proposer,
         address _challenger
     )
-        FaultDisputeGame(
-            _gameType,
-            _absolutePrestate,
-            _maxGameDepth,
-            _splitDepth,
-            _clockExtension,
-            _maxClockDuration,
-            _vm,
-            _weth,
-            _anchorStateRegistry,
-            _l2ChainId
-        )
+        FaultDisputeGame(_params)
     {
         PROPOSER = _proposer;
         CHALLENGER = _challenger;
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol b/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
index 8c5bac02e9ba..a188063de54a 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
@@ -26,6 +26,19 @@ interface IFaultDisputeGame is IDisputeGame {
         address counteredBy;
     }
 
+    struct GameConstructorParams {
+        GameType gameType;
+        Claim absolutePrestate;
+        uint256 maxGameDepth;
+        uint256 splitDepth;
+        Duration clockExtension;
+        Duration maxClockDuration;
+        IBigStepper vm;
+        IDelayedWETH weth;
+        IAnchorStateRegistry anchorStateRegistry;
+        uint256 l2ChainId;
+    }
+
     error AlreadyInitialized();
     error AnchorRootNotFound();
     error BlockNumberMatches();
@@ -113,17 +126,5 @@ interface IFaultDisputeGame is IDisputeGame {
     function vm() external view returns (IBigStepper vm_);
     function weth() external view returns (IDelayedWETH weth_);
 
-    function __constructor__(
-        GameType _gameType,
-        Claim _absolutePrestate,
-        uint256 _maxGameDepth,
-        uint256 _splitDepth,
-        Duration _clockExtension,
-        Duration _maxClockDuration,
-        IBigStepper _vm,
-        IDelayedWETH _weth,
-        IAnchorStateRegistry _anchorStateRegistry,
-        uint256 _l2ChainId
-    )
-        external;
+    function __constructor__(GameConstructorParams memory _params) external;
 }
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol b/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
index c5a5a187ec12..08c9cd5aa2b3 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
@@ -2,12 +2,13 @@
 pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
-import { GameType, Claim, Position, Clock, Hash, Duration } from "src/dispute/lib/Types.sol";
+import { Claim, Position, Clock, Hash, Duration } from "src/dispute/lib/Types.sol";
 
 import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
 import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
 
 interface IPermissionedDisputeGame is IDisputeGame {
     struct ClaimData {
@@ -120,16 +121,7 @@ interface IPermissionedDisputeGame is IDisputeGame {
     function challenger() external view returns (address challenger_);
 
     function __constructor__(
-        GameType _gameType,
-        Claim _absolutePrestate,
-        uint256 _maxGameDepth,
-        uint256 _splitDepth,
-        Duration _clockExtension,
-        Duration _maxClockDuration,
-        IBigStepper _vm,
-        IDelayedWETH _weth,
-        IAnchorStateRegistry _anchorStateRegistry,
-        uint256 _l2ChainId,
+        IFaultDisputeGame.GameConstructorParams memory _params,
         address _proposer,
         address _challenger
     )
diff --git a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
index 70aad007e402..df820bcb3cc1 100644
--- a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
@@ -73,16 +73,18 @@ contract FaultDisputeGame_Init is DisputeGameFactory_Init {
                     abi.encodeCall(
                         IFaultDisputeGame.__constructor__,
                         (
-                            GAME_TYPE,
-                            absolutePrestate,
-                            2 ** 3,
-                            2 ** 2,
-                            Duration.wrap(3 hours),
-                            Duration.wrap(3.5 days),
-                            _vm,
-                            delayedWeth,
-                            anchorStateRegistry,
-                            10
+                            IFaultDisputeGame.GameConstructorParams({
+                                gameType: GAME_TYPE,
+                                absolutePrestate: absolutePrestate,
+                                maxGameDepth: 2 ** 3,
+                                splitDepth: 2 ** 2,
+                                clockExtension: Duration.wrap(3 hours),
+                                maxClockDuration: Duration.wrap(3.5 days),
+                                vm: _vm,
+                                weth: delayedWeth,
+                                anchorStateRegistry: anchorStateRegistry,
+                                l2ChainId: 10
+                            })
                         )
                     )
                 )
@@ -154,16 +156,18 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
                 abi.encodeCall(
                     IFaultDisputeGame.__constructor__,
                     (
-                        GAME_TYPE,
-                        absolutePrestate,
-                        _maxGameDepth,
-                        _maxGameDepth + 1,
-                        Duration.wrap(3 hours),
-                        Duration.wrap(3.5 days),
-                        alphabetVM,
-                        IDelayedWETH(payable(address(0))),
-                        IAnchorStateRegistry(address(0)),
-                        10
+                        IFaultDisputeGame.GameConstructorParams({
+                            gameType: GAME_TYPE,
+                            absolutePrestate: absolutePrestate,
+                            maxGameDepth: _maxGameDepth,
+                            splitDepth: _maxGameDepth + 1,
+                            clockExtension: Duration.wrap(3 hours),
+                            maxClockDuration: Duration.wrap(3.5 days),
+                            vm: alphabetVM,
+                            weth: IDelayedWETH(payable(address(0))),
+                            anchorStateRegistry: IAnchorStateRegistry(address(0)),
+                            l2ChainId: 10
+                        })
                     )
                 )
             )
@@ -196,16 +200,18 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
                 abi.encodeCall(
                     IFaultDisputeGame.__constructor__,
                     (
-                        GAME_TYPE,
-                        absolutePrestate,
-                        2 ** 3,
-                        2 ** 2,
-                        Duration.wrap(3 hours),
-                        Duration.wrap(3.5 days),
-                        alphabetVM,
-                        IDelayedWETH(payable(address(0))),
-                        IAnchorStateRegistry(address(0)),
-                        10
+                        IFaultDisputeGame.GameConstructorParams({
+                            gameType: GAME_TYPE,
+                            absolutePrestate: absolutePrestate,
+                            maxGameDepth: 2 ** 3,
+                            splitDepth: 2 ** 2,
+                            clockExtension: Duration.wrap(3 hours),
+                            maxClockDuration: Duration.wrap(3.5 days),
+                            vm: alphabetVM,
+                            weth: IDelayedWETH(payable(address(0))),
+                            anchorStateRegistry: IAnchorStateRegistry(address(0)),
+                            l2ChainId: 10
+                        })
                     )
                 )
             )
@@ -234,16 +240,18 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
                 abi.encodeCall(
                     IFaultDisputeGame.__constructor__,
                     (
-                        GAME_TYPE,
-                        absolutePrestate,
-                        maxGameDepth,
-                        _splitDepth,
-                        Duration.wrap(3 hours),
-                        Duration.wrap(3.5 days),
-                        alphabetVM,
-                        IDelayedWETH(payable(address(0))),
-                        IAnchorStateRegistry(address(0)),
-                        10
+                        IFaultDisputeGame.GameConstructorParams({
+                            gameType: GAME_TYPE,
+                            absolutePrestate: absolutePrestate,
+                            maxGameDepth: maxGameDepth,
+                            splitDepth: _splitDepth,
+                            clockExtension: Duration.wrap(3 hours),
+                            maxClockDuration: Duration.wrap(3.5 days),
+                            vm: alphabetVM,
+                            weth: IDelayedWETH(payable(address(0))),
+                            anchorStateRegistry: IAnchorStateRegistry(address(0)),
+                            l2ChainId: 10
+                        })
                     )
                 )
             )
@@ -272,16 +280,18 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
                 abi.encodeCall(
                     IFaultDisputeGame.__constructor__,
                     (
-                        GAME_TYPE,
-                        absolutePrestate,
-                        2 ** 3,
-                        _splitDepth,
-                        Duration.wrap(3 hours),
-                        Duration.wrap(3.5 days),
-                        alphabetVM,
-                        IDelayedWETH(payable(address(0))),
-                        IAnchorStateRegistry(address(0)),
-                        10
+                        IFaultDisputeGame.GameConstructorParams({
+                            gameType: GAME_TYPE,
+                            absolutePrestate: absolutePrestate,
+                            maxGameDepth: 2 ** 3,
+                            splitDepth: _splitDepth,
+                            clockExtension: Duration.wrap(3 hours),
+                            maxClockDuration: Duration.wrap(3.5 days),
+                            vm: alphabetVM,
+                            weth: IDelayedWETH(payable(address(0))),
+                            anchorStateRegistry: IAnchorStateRegistry(address(0)),
+                            l2ChainId: 10
+                        })
                     )
                 )
             )
@@ -318,16 +328,18 @@ contract FaultDisputeGame_Test is FaultDisputeGame_Init {
                 abi.encodeCall(
                     IFaultDisputeGame.__constructor__,
                     (
-                        GAME_TYPE,
-                        absolutePrestate,
-                        16,
-                        8,
-                        Duration.wrap(_clockExtension),
-                        Duration.wrap(_maxClockDuration),
-                        alphabetVM,
-                        IDelayedWETH(payable(address(0))),
-                        IAnchorStateRegistry(address(0)),
-                        10
+                        IFaultDisputeGame.GameConstructorParams({
+                            gameType: GAME_TYPE,
+                            absolutePrestate: absolutePrestate,
+                            maxGameDepth: 16,
+                            splitDepth: 8,
+                            clockExtension: Duration.wrap(_clockExtension),
+                            maxClockDuration: Duration.wrap(_maxClockDuration),
+                            vm: alphabetVM,
+                            weth: IDelayedWETH(payable(address(0))),
+                            anchorStateRegistry: IAnchorStateRegistry(address(0)),
+                            l2ChainId: 10
+                        })
                     )
                 )
             )
diff --git a/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
index 99b70b9c6dff..20c45bf44de1 100644
--- a/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
@@ -17,6 +17,7 @@ import "src/dispute/lib/Errors.sol";
 import { IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
 import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
 import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
+import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
 
 contract PermissionedDisputeGame_Init is DisputeGameFactory_Init {
     /// @dev The type of the game being tested.
@@ -67,16 +68,18 @@ contract PermissionedDisputeGame_Init is DisputeGameFactory_Init {
                     abi.encodeCall(
                         IPermissionedDisputeGame.__constructor__,
                         (
-                            GAME_TYPE,
-                            absolutePrestate,
-                            2 ** 3,
-                            2 ** 2,
-                            Duration.wrap(3 hours),
-                            Duration.wrap(3.5 days),
-                            _vm,
-                            _weth,
-                            anchorStateRegistry,
-                            10,
+                            IFaultDisputeGame.GameConstructorParams({
+                                gameType: GAME_TYPE,
+                                absolutePrestate: absolutePrestate,
+                                maxGameDepth: 2 ** 3,
+                                splitDepth: 2 ** 2,
+                                clockExtension: Duration.wrap(3 hours),
+                                maxClockDuration: Duration.wrap(3.5 days),
+                                vm: _vm,
+                                weth: _weth,
+                                anchorStateRegistry: anchorStateRegistry,
+                                l2ChainId: 10
+                            }),
                             PROPOSER,
                             CHALLENGER
                         )

From 6e799a6cc621cb8031b42a00eeda7dd5618aed72 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 2 Dec 2024 16:31:02 +0000
Subject: [PATCH 315/451] txmgr/Queue: add additional assertions to test to
 check for tx ordering (#13124)

* add additional assertions to test to check for tx ordering

* enhance test to handle tx confirmation ID ordering

* increase size of 0th tx to expose race condition

* change approach since the backend does not order txs by nonce

* tidy

* clarify

* Update op-service/txmgr/queue_test.go

Co-authored-by: Sebastian Stammler <seb@oplabs.co>

---------

Co-authored-by: Sebastian Stammler <seb@oplabs.co>
---
 op-service/txmgr/queue_test.go | 47 +++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/op-service/txmgr/queue_test.go b/op-service/txmgr/queue_test.go
index 00219b913ad8..27dce154bcc8 100644
--- a/op-service/txmgr/queue_test.go
+++ b/op-service/txmgr/queue_test.go
@@ -63,6 +63,10 @@ func TestQueue_Send(t *testing.T) {
 		calls  []queueCall // calls to the queue
 		txs    []testTx    // txs to generate from the factory (and potentially error in send)
 		nonces []uint64    // expected sent tx nonces after all calls are made
+		// With Holocene, it is important that transactions are included on chain in the same order as they are sent.
+		// The txmgr.Queue.Send() method should ensure nonces are determined _synchronously_ even if transactions
+		// are otherwise launched asynchronously.
+		confirmedIds []uint // expected tx Ids after all calls are made
 	}{
 		{
 			name: "success",
@@ -75,7 +79,8 @@ func TestQueue_Send(t *testing.T) {
 				{},
 				{},
 			},
-			nonces: []uint64{0, 1},
+			nonces:       []uint64{0, 1},
+			confirmedIds: []uint{0, 1},
 		},
 		{
 			name: "no limit",
@@ -88,7 +93,8 @@ func TestQueue_Send(t *testing.T) {
 				{},
 				{},
 			},
-			nonces: []uint64{0, 1},
+			nonces:       []uint64{0, 1},
+			confirmedIds: []uint{0, 1},
 		},
 		{
 			name: "single threaded",
@@ -101,7 +107,8 @@ func TestQueue_Send(t *testing.T) {
 			txs: []testTx{
 				{},
 			},
-			nonces: []uint64{0},
+			nonces:       []uint64{0},
+			confirmedIds: []uint{0},
 		},
 		{
 			name: "single threaded blocking",
@@ -117,7 +124,8 @@ func TestQueue_Send(t *testing.T) {
 				{},
 				{},
 			},
-			nonces: []uint64{0, 1, 2},
+			nonces:       []uint64{0, 1, 2},
+			confirmedIds: []uint{0, 2, 3},
 		},
 		{
 			name: "dual threaded blocking",
@@ -137,7 +145,8 @@ func TestQueue_Send(t *testing.T) {
 				{},
 				{},
 			},
-			nonces: []uint64{0, 1, 2, 3, 4},
+			nonces:       []uint64{0, 1, 2, 3, 4},
+			confirmedIds: []uint{0, 1, 3, 4, 5},
 		},
 		{
 			name: "subsequent txs fail after tx failure",
@@ -152,7 +161,8 @@ func TestQueue_Send(t *testing.T) {
 				{sendErr: true},
 				{},
 			},
-			nonces: []uint64{0, 1},
+			nonces:       []uint64{0, 1},
+			confirmedIds: []uint{0},
 		},
 	}
 	for _, test := range testCases {
@@ -176,9 +186,11 @@ func TestQueue_Send(t *testing.T) {
 
 			// track the nonces, and return any expected errors from tx sending
 			var (
-				nonces  []uint64
-				nonceMu sync.Mutex
+				nonces       []uint64
+				nonceForTxId map[uint]uint64 // maps from txid to nonce
+				nonceMu      sync.Mutex
 			)
+			nonceForTxId = make(map[uint]uint64)
 			sendTx := func(ctx context.Context, tx *types.Transaction) error {
 				index := int(tx.Data()[0])
 				nonceMu.Lock()
@@ -191,8 +203,12 @@ func TestQueue_Send(t *testing.T) {
 				if testTx != nil && testTx.sendErr {
 					return core.ErrNonceTooLow
 				}
+
 				txHash := tx.Hash()
+				nonceMu.Lock()
 				backend.mine(&txHash, tx.GasFeeCap(), nil)
+				nonceForTxId[uint(index)] = tx.Nonce()
+				nonceMu.Unlock()
 				return nil
 			}
 			backend.setTxSender(sendTx)
@@ -209,15 +225,28 @@ func TestQueue_Send(t *testing.T) {
 					TxData: []byte{byte(i)},
 					To:     &common.Address{},
 				}
+				if i == 0 {
+					// Make the first tx much larger to expose
+					// any race conditions in the queue
+					candidate.TxData = make([]byte, 100_000)
+				}
 				receiptChs[i] = make(chan TxReceipt[int], 1)
 				queued := c.call(i, candidate, receiptChs[i], queue)
 				require.Equal(t, c.queued, queued, msg)
 			}
 			// wait for the queue to drain (all txs complete or failed)
 			_ = queue.Wait()
-			// check that the nonces match
+
+			// NOTE the backend in this test does not order transactions based on the nonce
+			// So what we want to check is that the txs match expectations when they are ordered
+			// in the same way as the nonces.
 			slices.Sort(nonces)
 			require.Equal(t, test.nonces, nonces, "expected nonces do not match")
+			for i, id := range test.confirmedIds {
+				require.Equal(t, nonces[i], nonceForTxId[id],
+					"nonce for tx id %d was %d instead of %d", id, nonceForTxId[id], nonces[i])
+			}
+
 			// check receipts
 			for i, c := range test.calls {
 				if !c.queued {

From 8f31e601eafaffa50a8718d23b54846b1d740e77 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Tue, 3 Dec 2024 00:32:40 +0800
Subject: [PATCH 316/451] SendDepositTx: make `applyL2Opts` nil-able (#13158)

* SendDepositTx: make applyL2Opts nil-able

* move maxBlobs closer to used place

* fix typo
---
 op-e2e/actions/batcher/l2_batcher_test.go | 2 +-
 op-e2e/system/da/brotli_batcher_test.go   | 2 +-
 op-e2e/system/da/eip4844_test.go          | 6 +++---
 op-e2e/system/helpers/tx_helper.go        | 4 +++-
 op-e2e/system/verifier/basic_test.go      | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/op-e2e/actions/batcher/l2_batcher_test.go b/op-e2e/actions/batcher/l2_batcher_test.go
index 8906dcbed4ea..3fec73db4f7c 100644
--- a/op-e2e/actions/batcher/l2_batcher_test.go
+++ b/op-e2e/actions/batcher/l2_batcher_test.go
@@ -408,7 +408,7 @@ func ExtendedTimeWithoutL1Batches(gt *testing.T, deltaTimeOffset *hexutil.Uint64
 //   - Fill 40 L2 blocks to near max-capacity, with txs of 120 KB each
 //   - Buffer the L2 blocks into channels together as much as possible, submit data-txs only when necessary
 //     (just before crossing the max RLP channel size)
-//   - Limit the data-tx size to 40 KB, to force data to be split across multiple datat-txs
+//   - Limit the data-tx size to 40 KB, to force data to be split across multiple data-txs
 //   - Defer all data-tx inclusion till the end
 //   - Fill L1 blocks with data-txs until we have processed them all
 //   - Run the verifier, and check if it derives the same L2 chain as was created by the sequencer.
diff --git a/op-e2e/system/da/brotli_batcher_test.go b/op-e2e/system/da/brotli_batcher_test.go
index fe9b4a9fab97..fd44c6365eae 100644
--- a/op-e2e/system/da/brotli_batcher_test.go
+++ b/op-e2e/system/da/brotli_batcher_test.go
@@ -43,7 +43,7 @@ func setupAliceAccount(t *testing.T, cfg e2esys.SystemConfig, sys *e2esys.System
 	require.NoError(t, err)
 	mintAmount := big.NewInt(1_000_000_000_000)
 	opts.Value = mintAmount
-	helpers.SendDepositTx(t, cfg, l1Client, l2Verif, opts, func(l2Opts *helpers.DepositTxOpts) {})
+	helpers.SendDepositTx(t, cfg, l1Client, l2Verif, opts, nil)
 
 	// Confirm balance
 	ctx, cancel = context.WithTimeout(context.Background(), 15*time.Second)
diff --git a/op-e2e/system/da/eip4844_test.go b/op-e2e/system/da/eip4844_test.go
index f3cf8fc7f03f..e1b6468378e9 100644
--- a/op-e2e/system/da/eip4844_test.go
+++ b/op-e2e/system/da/eip4844_test.go
@@ -57,7 +57,6 @@ func testSystem4844E2E(t *testing.T, multiBlob bool, daType batcherFlags.DataAva
 	cfg.BatcherBatchType = derive.SpanBatchType
 	cfg.DeployConfig.L1GenesisBlockBaseFeePerGas = (*hexutil.Big)(big.NewInt(7000))
 
-	const maxBlobs = eth.MaxBlobsPerBlobTx
 	var maxL1TxSize int
 	if multiBlob {
 		cfg.BatcherTargetNumFrames = eth.MaxBlobsPerBlobTx
@@ -120,7 +119,7 @@ func testSystem4844E2E(t *testing.T, multiBlob bool, daType batcherFlags.DataAva
 	require.NoError(t, err)
 	mintAmount := big.NewInt(1_000_000_000_000)
 	opts.Value = mintAmount
-	helpers.SendDepositTx(t, cfg, l1Client, l2Verif, opts, func(l2Opts *helpers.DepositTxOpts) {})
+	helpers.SendDepositTx(t, cfg, l1Client, l2Verif, opts, nil)
 
 	// Confirm balance
 	ctx2, cancel2 := context.WithTimeout(context.Background(), 20*time.Second)
@@ -214,7 +213,8 @@ func testSystem4844E2E(t *testing.T, multiBlob bool, daType batcherFlags.DataAva
 	if !multiBlob {
 		require.NotZero(t, numBlobs, "single-blob: expected to find L1 blob tx")
 	} else {
-		require.Equal(t, maxBlobs, numBlobs, fmt.Sprintf("multi-blob: expected to find L1 blob tx with %d blobs", eth.MaxBlobsPerBlobTx))
+		const maxBlobs = eth.MaxBlobsPerBlobTx
+		require.Equal(t, maxBlobs, numBlobs, fmt.Sprintf("multi-blob: expected to find L1 blob tx with %d blobs", maxBlobs))
 		// blob tx should have filled up all but last blob
 		bcl := sys.L1BeaconHTTPClient()
 		hashes := toIndexedBlobHashes(blobTx.BlobHashes()...)
diff --git a/op-e2e/system/helpers/tx_helper.go b/op-e2e/system/helpers/tx_helper.go
index f5cb11aa8a1d..10c16c0e7465 100644
--- a/op-e2e/system/helpers/tx_helper.go
+++ b/op-e2e/system/helpers/tx_helper.go
@@ -28,7 +28,9 @@ import (
 // Returns the receipt of the L2 transaction
 func SendDepositTx(t *testing.T, cfg e2esys.SystemConfig, l1Client *ethclient.Client, l2Client *ethclient.Client, l1Opts *bind.TransactOpts, applyL2Opts DepositTxOptsFn) *types.Receipt {
 	l2Opts := defaultDepositTxOpts(l1Opts)
-	applyL2Opts(l2Opts)
+	if applyL2Opts != nil {
+		applyL2Opts(l2Opts)
+	}
 
 	// Find deposit contract
 	depositContract, err := bindings.NewOptimismPortal(cfg.L1Deployments.OptimismPortalProxy, l1Client)
diff --git a/op-e2e/system/verifier/basic_test.go b/op-e2e/system/verifier/basic_test.go
index effe1f412146..d0791d5ec483 100644
--- a/op-e2e/system/verifier/basic_test.go
+++ b/op-e2e/system/verifier/basic_test.go
@@ -71,7 +71,7 @@ func runE2ESystemTest(t *testing.T, sys *e2esys.System) {
 	require.Nil(t, err)
 	mintAmount := big.NewInt(1_000_000_000_000)
 	opts.Value = mintAmount
-	helpers.SendDepositTx(t, sys.Cfg, l1Client, l2Verif, opts, func(l2Opts *helpers.DepositTxOpts) {})
+	helpers.SendDepositTx(t, sys.Cfg, l1Client, l2Verif, opts, nil)
 
 	// Confirm balance
 	ctx, cancel = context.WithTimeout(context.Background(), 15*time.Second)

From 1a1ab6ece629521f40c09ab85f6cfb4bdc2f56fa Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 2 Dec 2024 09:48:48 -0700
Subject: [PATCH 317/451] op-e2e: Expose context in supersystem op-e2e (#13135)

When any of the setup transactions in `TestInterop_EmitLogs` fail to be mined, the test hangs until it times out. See [here](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73118/workflows/b48debaa-55bc-4138-a419-a87c236cbc58/jobs/2994655/artifacts) for an example. This PR updates the SuperSystem API to take a context from the test itself to allow for timeouts.
---
 op-e2e/interop/interop_test.go | 12 +++++++++---
 op-e2e/interop/supersystem.go  | 13 +++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/op-e2e/interop/interop_test.go b/op-e2e/interop/interop_test.go
index 302413dd98ed..81f09c125aa4 100644
--- a/op-e2e/interop/interop_test.go
+++ b/op-e2e/interop/interop_test.go
@@ -121,7 +121,9 @@ func TestInterop_EmitLogs(t *testing.T) {
 		var emitParallel sync.WaitGroup
 		emitOn := func(chainID string) {
 			for i := 0; i < numEmits; i++ {
-				s2.EmitData(chainID, "Alice", payload1)
+				ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+				s2.EmitData(ctx, chainID, "Alice", payload1)
+				cancel()
 			}
 			emitParallel.Done()
 		}
@@ -218,7 +220,9 @@ func TestInteropBlockBuilding(t *testing.T) {
 
 		// Add chain A as dependency to chain B,
 		// such that we can execute a message on B that was initiated on A.
-		depRec := s2.AddDependency(chainB, s2.ChainID(chainA))
+		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+		depRec := s2.AddDependency(ctx, chainB, s2.ChainID(chainA))
+		cancel()
 		t.Logf("Dependency set in L1 block %d", depRec.BlockNumber)
 
 		rollupClA, err := dial.DialRollupClientWithTimeout(context.Background(), time.Second*15, logger, s2.OpNode(chainA).UserRPC().RPC())
@@ -233,7 +237,9 @@ func TestInteropBlockBuilding(t *testing.T) {
 		t.Log("Dependency information has been processed in L2 block")
 
 		// emit log on chain A
-		emitRec := s2.EmitData(chainA, "Alice", "hello world")
+		ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
+		emitRec := s2.EmitData(ctx, chainA, "Alice", "hello world")
+		cancel()
 		t.Logf("Emitted a log event in block %d", emitRec.BlockNumber.Uint64())
 
 		// Wait for initiating side to become cross-unsafe
diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index de7e25bb9c7b..8fc663f377a0 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -103,9 +103,9 @@ type SuperSystem interface {
 	// Deploy the Emitter Contract, which emits Event Logs
 	DeployEmitterContract(network string, username string) common.Address
 	// Use the Emitter Contract to emit an Event Log
-	EmitData(network string, username string, data string) *types.Receipt
+	EmitData(ctx context.Context, network string, username string, data string) *types.Receipt
 	// AddDependency adds a dependency (by chain ID) to the given chain
-	AddDependency(network string, dep *big.Int) *types.Receipt
+	AddDependency(ctx context.Context, network string, dep *big.Int) *types.Receipt
 	// ExecuteMessage calls the CrossL2Inbox executeMessage function
 	ExecuteMessage(
 		ctx context.Context,
@@ -767,7 +767,7 @@ func (s *interopE2ESystem) ExecuteMessage(
 	return bind.WaitMined(ctx, s.L2GethClient(id), tx)
 }
 
-func (s *interopE2ESystem) AddDependency(id string, dep *big.Int) *types.Receipt {
+func (s *interopE2ESystem) AddDependency(ctx context.Context, id string, dep *big.Int) *types.Receipt {
 	// There is a note in OPContractsManagerInterop that the proxy-admin is used for now,
 	// even though it should be a separate dependency-set-manager address.
 	secret, err := s.hdWallet.Secret(devkeys.ChainOperatorKey{
@@ -779,7 +779,7 @@ func (s *interopE2ESystem) AddDependency(id string, dep *big.Int) *types.Receipt
 	auth, err := bind.NewKeyedTransactorWithChainID(secret, s.worldOutput.L1.Genesis.Config.ChainID)
 	require.NoError(s.t, err)
 
-	balance, err := s.l1GethClient.BalanceAt(context.Background(), crypto.PubkeyToAddress(secret.PublicKey), nil)
+	balance, err := s.l1GethClient.BalanceAt(ctx, crypto.PubkeyToAddress(secret.PublicKey), nil)
 	require.NoError(s.t, err)
 	require.False(s.t, balance.Sign() == 0, "system config owner needs a balance")
 
@@ -790,7 +790,7 @@ func (s *interopE2ESystem) AddDependency(id string, dep *big.Int) *types.Receipt
 	tx, err := contract.SystemconfigTransactor.AddDependency(auth, dep)
 	require.NoError(s.t, err)
 
-	receipt, err := wait.ForReceiptOK(context.Background(), s.L1GethClient(), tx.Hash())
+	receipt, err := wait.ForReceiptOK(ctx, s.L1GethClient(), tx.Hash())
 	require.NoError(s.t, err)
 	return receipt
 }
@@ -813,6 +813,7 @@ func (s *interopE2ESystem) DeployEmitterContract(
 }
 
 func (s *interopE2ESystem) EmitData(
+	ctx context.Context,
 	id string,
 	sender string,
 	data string,
@@ -828,7 +829,7 @@ func (s *interopE2ESystem) EmitData(
 	contract := s.Contract(id, "emitter").(*emit.Emit)
 	tx, err := contract.EmitTransactor.EmitData(auth, []byte(data))
 	require.NoError(s.t, err)
-	receipt, err := bind.WaitMined(context.Background(), s.L2GethClient(id), tx)
+	receipt, err := bind.WaitMined(ctx, s.L2GethClient(id), tx)
 	require.NoError(s.t, err)
 	return receipt
 }

From a486daec4b1b4449e12d8863df7e70502707c2b5 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Mon, 2 Dec 2024 17:59:05 +0100
Subject: [PATCH 318/451] fix mips contracts stack too deep errors (#13137)

---
 .../snapshots/semver-lock.json                | 12 ++---
 .../contracts-bedrock/src/cannon/MIPS.sol     |  7 +--
 .../contracts-bedrock/src/cannon/MIPS2.sol    |  7 +--
 .../contracts-bedrock/src/cannon/MIPS64.sol   |  7 +--
 .../src/cannon/libraries/MIPS64Syscalls.sol   | 53 ++++++++++---------
 .../src/cannon/libraries/MIPSSyscalls.sol     | 53 ++++++++++---------
 6 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 32de3eeb7f33..7c7cadb614b9 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -136,16 +136,16 @@
     "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0xb4aec227019dacd6194d6aeb9ca68c23c60b95618d18a4ebc09243514aeb1f05",
-    "sourceCodeHash": "0x4d43b3f2918486aa76d2d59ac42e4f6aa2f58538c7e95a5cb99b63c9588b5f1c"
+    "initCodeHash": "0x2ad89ddfd9b6091af7fa4f337f6f0134b946838b53a056995eea5982e4b903c3",
+    "sourceCodeHash": "0xcd5f9762e641e4a1f6b07420ea3b2bfcaac5656da10c66a0f367ee4d4af37e9c"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0xe3879b5772820d837bc1c77c32a1200eb26cf901d9302dff9f0e9759331e380e",
-    "sourceCodeHash": "0x1c45a8f4c8c9ded7043d63965cb114d17f801c6cd4d8233cb16838c5f9a02675"
+    "initCodeHash": "0x013e6005f56eae789a48ec9766d17c0be950d765ada3eb936c9a90337567c940",
+    "sourceCodeHash": "0xdd7684d0b8efd0bbee4abae76195c649b325ecd3e09f41b687cf3a091639c887"
   },
   "src/cannon/MIPS64.sol": {
-    "initCodeHash": "0xa4a761f480a26ec1926c5a8b4831440211c0441bd41d503b0aad189e030d35dc",
-    "sourceCodeHash": "0x7ddcf8584f9bd92abd1eb45bc198f5b0ec54acaf292f60e919d674cc56fb8abc"
+    "initCodeHash": "0xa5c2105b0d6f90d6f5ab1782f6d7acda505674a3c11355e0b401d66250406c0c",
+    "sourceCodeHash": "0x7cb189f5081c4aae84a7b23329309d944cb54f075ec18b03240d1725c03adc3b"
   },
   "src/cannon/PreimageOracle.sol": {
     "initCodeHash": "0x2bef439027c37c65dd8e7d9a987ff14e1dba94ee5fe5f316a77ecf46a8db4b3f",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS.sol b/packages/contracts-bedrock/src/cannon/MIPS.sol
index 62b3084f74a8..93ee98b070eb 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS.sol
@@ -47,8 +47,8 @@ contract MIPS is ISemver {
     }
 
     /// @notice The semantic version of the MIPS contract.
-    /// @custom:semver 1.2.1-beta.8
-    string public constant version = "1.2.1-beta.8";
+    /// @custom:semver 1.2.1-beta.9
+    string public constant version = "1.2.1-beta.9";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -183,7 +183,7 @@ contract MIPS is ISemver {
                 });
                 (v0, v1, state.preimageOffset, state.memRoot,,) = sys.handleSysRead(args);
             } else if (syscall_no == sys.SYS_WRITE) {
-                (v0, v1, state.preimageKey, state.preimageOffset) = sys.handleSysWrite({
+                sys.SysWriteParams memory args = sys.SysWriteParams({
                     _a0: a0,
                     _a1: a1,
                     _a2: a2,
@@ -192,6 +192,7 @@ contract MIPS is ISemver {
                     _proofOffset: MIPSMemory.memoryProofOffset(STEP_PROOF_OFFSET, 1),
                     _memRoot: state.memRoot
                 });
+                (v0, v1, state.preimageKey, state.preimageOffset) = sys.handleSysWrite(args);
             } else if (syscall_no == sys.SYS_FCNTL) {
                 (v0, v1) = sys.handleSysFcntl(a0, a1);
             }
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index d28238980f38..8090c5e3d8b6 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -63,8 +63,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.23
-    string public constant version = "1.0.0-beta.23";
+    /// @custom:semver 1.0.0-beta.24
+    string public constant version = "1.0.0-beta.24";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -462,7 +462,7 @@ contract MIPS2 is ISemver {
                 // Encapsulate execution to avoid stack-too-deep error
                 (v0, v1) = execSysRead(state, args);
             } else if (syscall_no == sys.SYS_WRITE) {
-                (v0, v1, state.preimageKey, state.preimageOffset) = sys.handleSysWrite({
+                sys.SysWriteParams memory args = sys.SysWriteParams({
                     _a0: a0,
                     _a1: a1,
                     _a2: a2,
@@ -471,6 +471,7 @@ contract MIPS2 is ISemver {
                     _proofOffset: MIPSMemory.memoryProofOffset(MEM_PROOF_OFFSET, 1),
                     _memRoot: state.memRoot
                 });
+                (v0, v1, state.preimageKey, state.preimageOffset) = sys.handleSysWrite(args);
             } else if (syscall_no == sys.SYS_FCNTL) {
                 (v0, v1) = sys.handleSysFcntl(a0, a1);
             } else if (syscall_no == sys.SYS_GETTID) {
diff --git a/packages/contracts-bedrock/src/cannon/MIPS64.sol b/packages/contracts-bedrock/src/cannon/MIPS64.sol
index bb2f4369c2a5..91269251c367 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS64.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS64.sol
@@ -67,8 +67,8 @@ contract MIPS64 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS64 contract.
-    /// @custom:semver 1.0.0-beta.5
-    string public constant version = "1.0.0-beta.5";
+    /// @custom:semver 1.0.0-beta.6
+    string public constant version = "1.0.0-beta.6";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -504,7 +504,7 @@ contract MIPS64 is ISemver {
                 // Encapsulate execution to avoid stack-too-deep error
                 (v0, v1) = execSysRead(state, args);
             } else if (syscall_no == sys.SYS_WRITE) {
-                (v0, v1, state.preimageKey, state.preimageOffset) = sys.handleSysWrite({
+                sys.SysWriteParams memory args = sys.SysWriteParams({
                     _a0: a0,
                     _a1: a1,
                     _a2: a2,
@@ -513,6 +513,7 @@ contract MIPS64 is ISemver {
                     _proofOffset: MIPS64Memory.memoryProofOffset(MEM_PROOF_OFFSET, 1),
                     _memRoot: state.memRoot
                 });
+                (v0, v1, state.preimageKey, state.preimageOffset) = sys.handleSysWrite(args);
             } else if (syscall_no == sys.SYS_FCNTL) {
                 (v0, v1) = sys.handleSysFcntl(a0, a1);
             } else if (syscall_no == sys.SYS_GETTID) {
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
index d4b706da4b59..68cca83c4bf7 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
@@ -30,6 +30,23 @@ library MIPS64Syscalls {
         bytes32 memRoot;
     }
 
+    /// @custom:field _a0 The file descriptor.
+    /// @custom:field _a1 The memory address to read from.
+    /// @custom:field _a2 The number of bytes to read.
+    /// @custom:field _preimageKey The current preimaageKey.
+    /// @custom:field _preimageOffset The current preimageOffset.
+    /// @custom:field _proofOffset The offset of the memory proof in calldata.
+    /// @custom:field _memRoot The current memory root.
+    struct SysWriteParams {
+        uint64 _a0;
+        uint64 _a1;
+        uint64 _a2;
+        bytes32 _preimageKey;
+        uint64 _preimageOffset;
+        uint256 _proofOffset;
+        bytes32 _memRoot;
+    }
+
     uint64 internal constant U64_MASK = 0xFFffFFffFFffFFff;
     uint64 internal constant PAGE_ADDR_MASK = 4095;
     uint64 internal constant PAGE_SIZE = 4096;
@@ -309,26 +326,11 @@ library MIPS64Syscalls {
     }
 
     /// @notice Like a Linux write syscall. Splits unaligned writes into aligned writes.
-    /// @param _a0 The file descriptor.
-    /// @param _a1 The memory address to read from.
-    /// @param _a2 The number of bytes to read.
-    /// @param _preimageKey The current preimaageKey.
-    /// @param _preimageOffset The current preimageOffset.
-    /// @param _proofOffset The offset of the memory proof in calldata.
-    /// @param _memRoot The current memory root.
     /// @return v0_ The number of bytes written, or -1 on error.
     /// @return v1_ The error code, or 0 if empty.
     /// @return newPreimageKey_ The new preimageKey.
     /// @return newPreimageOffset_ The new preimageOffset.
-    function handleSysWrite(
-        uint64 _a0,
-        uint64 _a1,
-        uint64 _a2,
-        bytes32 _preimageKey,
-        uint64 _preimageOffset,
-        uint256 _proofOffset,
-        bytes32 _memRoot
-    )
+    function handleSysWrite(SysWriteParams memory _args)
         internal
         pure
         returns (uint64 v0_, uint64 v1_, bytes32 newPreimageKey_, uint64 newPreimageOffset_)
@@ -338,20 +340,22 @@ library MIPS64Syscalls {
             // returns: v0_ = written, v1_ = err code
             v0_ = uint64(0);
             v1_ = uint64(0);
-            newPreimageKey_ = _preimageKey;
-            newPreimageOffset_ = _preimageOffset;
+            newPreimageKey_ = _args._preimageKey;
+            newPreimageOffset_ = _args._preimageOffset;
 
-            if (_a0 == FD_STDOUT || _a0 == FD_STDERR || _a0 == FD_HINT_WRITE) {
-                v0_ = _a2; // tell program we have written everything
+            if (_args._a0 == FD_STDOUT || _args._a0 == FD_STDERR || _args._a0 == FD_HINT_WRITE) {
+                v0_ = _args._a2; // tell program we have written everything
             }
             // pre-image oracle
-            else if (_a0 == FD_PREIMAGE_WRITE) {
+            else if (_args._a0 == FD_PREIMAGE_WRITE) {
                 // mask the addr to align it to 4 bytes
-                uint64 mem = MIPS64Memory.readMem(_memRoot, _a1 & arch.ADDRESS_MASK, _proofOffset);
-                bytes32 key = _preimageKey;
+                uint64 mem = MIPS64Memory.readMem(_args._memRoot, _args._a1 & arch.ADDRESS_MASK, _args._proofOffset);
+                bytes32 key = _args._preimageKey;
 
                 // Construct pre-image key from memory
                 // We use assembly for more precise ops, and no var count limit
+                uint64 _a1 = _args._a1;
+                uint64 _a2 = _args._a2;
                 assembly {
                     let alignment := and(_a1, EXT_MASK) // the read might not start at an aligned address
                     let space := sub(WORD_SIZE_BYTES, alignment) // remaining space in memory word
@@ -361,11 +365,12 @@ library MIPS64Syscalls {
                     mem := and(shr(mul(sub(space, _a2), 8), mem), mask) // align value to right, mask it
                     key := or(key, mem) // insert into key
                 }
+                _args._a2 = _a2;
 
                 // Write pre-image key to oracle
                 newPreimageKey_ = key;
                 newPreimageOffset_ = 0; // reset offset, to read new pre-image data from the start
-                v0_ = _a2;
+                v0_ = _args._a2;
             } else {
                 v0_ = U64_MASK;
                 v1_ = EBADF;
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
index 8e3516c0c1e5..57206ea37010 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -29,6 +29,23 @@ library MIPSSyscalls {
         bytes32 memRoot;
     }
 
+    /// @custom:field _a0 The file descriptor.
+    /// @custom:field _a1 The memory address to read from.
+    /// @custom:field _a2 The number of bytes to read.
+    /// @custom:field _preimageKey The current preimaageKey.
+    /// @custom:field _preimageOffset The current preimageOffset.
+    /// @custom:field _proofOffset The offset of the memory proof in calldata.
+    /// @custom:field _memRoot The current memory root.
+    struct SysWriteParams {
+        uint32 _a0;
+        uint32 _a1;
+        uint32 _a2;
+        bytes32 _preimageKey;
+        uint32 _preimageOffset;
+        uint256 _proofOffset;
+        bytes32 _memRoot;
+    }
+
     uint32 internal constant SYS_MMAP = 4090;
     uint32 internal constant SYS_BRK = 4045;
     uint32 internal constant SYS_CLONE = 4120;
@@ -299,26 +316,11 @@ library MIPSSyscalls {
     }
 
     /// @notice Like a Linux write syscall. Splits unaligned writes into aligned writes.
-    /// @param _a0 The file descriptor.
-    /// @param _a1 The memory address to read from.
-    /// @param _a2 The number of bytes to read.
-    /// @param _preimageKey The current preimaageKey.
-    /// @param _preimageOffset The current preimageOffset.
-    /// @param _proofOffset The offset of the memory proof in calldata.
-    /// @param _memRoot The current memory root.
     /// @return v0_ The number of bytes written, or -1 on error.
     /// @return v1_ The error code, or 0 if empty.
     /// @return newPreimageKey_ The new preimageKey.
     /// @return newPreimageOffset_ The new preimageOffset.
-    function handleSysWrite(
-        uint32 _a0,
-        uint32 _a1,
-        uint32 _a2,
-        bytes32 _preimageKey,
-        uint32 _preimageOffset,
-        uint256 _proofOffset,
-        bytes32 _memRoot
-    )
+    function handleSysWrite(SysWriteParams memory _args)
         internal
         pure
         returns (uint32 v0_, uint32 v1_, bytes32 newPreimageKey_, uint32 newPreimageOffset_)
@@ -328,20 +330,22 @@ library MIPSSyscalls {
             // returns: v0_ = written, v1_ = err code
             v0_ = uint32(0);
             v1_ = uint32(0);
-            newPreimageKey_ = _preimageKey;
-            newPreimageOffset_ = _preimageOffset;
+            newPreimageKey_ = _args._preimageKey;
+            newPreimageOffset_ = _args._preimageOffset;
 
-            if (_a0 == FD_STDOUT || _a0 == FD_STDERR || _a0 == FD_HINT_WRITE) {
-                v0_ = _a2; // tell program we have written everything
+            if (_args._a0 == FD_STDOUT || _args._a0 == FD_STDERR || _args._a0 == FD_HINT_WRITE) {
+                v0_ = _args._a2; // tell program we have written everything
             }
             // pre-image oracle
-            else if (_a0 == FD_PREIMAGE_WRITE) {
+            else if (_args._a0 == FD_PREIMAGE_WRITE) {
                 // mask the addr to align it to 4 bytes
-                uint32 mem = MIPSMemory.readMem(_memRoot, _a1 & 0xFFffFFfc, _proofOffset);
-                bytes32 key = _preimageKey;
+                uint32 mem = MIPSMemory.readMem(_args._memRoot, _args._a1 & 0xFFffFFfc, _args._proofOffset);
+                bytes32 key = _args._preimageKey;
 
                 // Construct pre-image key from memory
                 // We use assembly for more precise ops, and no var count limit
+                uint32 _a1 = _args._a1;
+                uint32 _a2 = _args._a2;
                 assembly {
                     let alignment := and(_a1, 3) // the read might not start at an aligned address
                     let space := sub(4, alignment) // remaining space in memory word
@@ -351,11 +355,12 @@ library MIPSSyscalls {
                     mem := and(shr(mul(sub(space, _a2), 8), mem), mask) // align value to right, mask it
                     key := or(key, mem) // insert into key
                 }
+                _args._a2 = _a2;
 
                 // Write pre-image key to oracle
                 newPreimageKey_ = key;
                 newPreimageOffset_ = 0; // reset offset, to read new pre-image data from the start
-                v0_ = _a2;
+                v0_ = _args._a2;
             } else {
                 v0_ = 0xFFffFFff;
                 v1_ = EBADF;

From 4777cdf506cfd9e1c70dd6f0e00e102034e3c261 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Mon, 2 Dec 2024 12:20:11 -0500
Subject: [PATCH 319/451] chore: Bump `kona` in `proofs-tools` image (#13170)

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 53fd8e865be4..150b7db0b089 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -207,7 +207,7 @@ target "proofs-tools" {
   context = "."
   args = {
     CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="kona-client-v0.1.0-beta.1"
+    KONA_VERSION="kona-client-v0.1.0-beta.3"
   }
   target="proofs-tools"
   platforms = split(",", PLATFORMS)

From 9345537aca29c2783a1791573410588265555751 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Mon, 2 Dec 2024 19:08:00 +0100
Subject: [PATCH 320/451] Sc/disable ci forge coverage (#13174)

* disable forge coverage in ci

* disable forge coverage in ci

* disable forge coverage in ci
---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1467e9e24bf2..a50ad6c2269a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1320,7 +1320,10 @@ workflows:
           test_list: git diff origin/develop...HEAD --name-only --diff-filter=AM -- './test/**/*.t.sol' | sed 's|packages/contracts-bedrock/||'
           test_timeout: 1h
           test_profile: ciheavy
-      - contracts-bedrock-coverage
+      - contracts-bedrock-coverage:
+          filters:
+            branches:
+              ignore: /.*/
       - contracts-bedrock-checks:
           requires:
             - contracts-bedrock-build

From 23a65e8199bb00313774e2d14fed4b429f627bf8 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Mon, 2 Dec 2024 20:03:30 +0100
Subject: [PATCH 321/451] op-chain-ops: add readme (#13166)

---
 op-chain-ops/README.md | 80 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 op-chain-ops/README.md

diff --git a/op-chain-ops/README.md b/op-chain-ops/README.md
new file mode 100644
index 000000000000..98d0d974722d
--- /dev/null
+++ b/op-chain-ops/README.md
@@ -0,0 +1,80 @@
+# `op-chain-ops`
+
+Issues: [monorepo](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aissue%20state%3Aopen%20label%3AA-op-chain-ops)
+
+Pull requests: [monorepo](https://github.com/ethereum-optimism/optimism/pulls?q=is%3Aopen+is%3Apr+label%3AA-op-chain-ops)
+
+This is an OP Stack utils package for chain operations,
+ranging from EVM tooling to chain generation.
+
+Packages:
+- `clients`: utils for chain checker tools.
+- `cmd`: upgrade validation tools, debug tools, attributes formatting tools.
+- `crossdomain`: utils to interact with L1 <> L2 cross-domain messages.
+- `devkeys`: generate OP-Stack development keys from a common source.
+- `foundry`: utils to read foundry artifacts.
+- `genesis`: OP Stack genesis-configs generation, pre OPCM.
+- `interopgen`: interop test-chain genesis config generation.
+- `script`: foundry-like solidity scripting environment in Go.
+- `solc`: utils to read solidity compiler artifacts data.
+- `srcmap`: utils for solidity source-maps loaded from foundry-artifacts.
+
+## Usage
+
+Upgrade checks and chain utilities can be found in `./cmd`:
+these are not officially published in OP-Stack monorepo releases,
+but can be built from source.
+
+Utils:
+```text
+cmd/
+├── check-canyon                  - Checks for Canyon network upgrade
+├── check-delta                   - Checks for Delta network upgrade
+├── check-deploy-config           - Checks of the (legacy) Deploy Config
+├── check-derivation              - Check that transactions can be confirmed and safety can be consolidated
+├── check-ecotone                 - Checks for Ecotone network upgrade
+├── check-fjord                   - Checks for Fjord network upgrade
+├── deposit-hash                  - Determine the L2 deposit tx hash, based on log event(s) emitted by a L1 tx.
+├── ecotone-scalar                - Translate between serialized and human-readable L1 fee scalars (introduced in Ecotone upgrade).
+├── op-simulate                   - Simulate a remote transaction in a local Geth EVM for block-processing debugging.
+├── protocol-version              - Translate between serialized and human-readable protocol versions.
+├── receipt-reference-builder     - Receipt data collector for pre-Canyon deposit-nonce metadata.
+└── unclaimed-credits             - Utilitiy to inspect credits of resolved fault-proof games.
+```
+
+## Product
+
+### Optimization target
+
+Provide tools for chain-setup and inspection tools for deployment, upgrades, and testing.
+This includes `op-deployer`, OP-Contracts-Manager (OPCM), upgrade-check scripts, and `op-e2e` testing.
+
+### Vision
+
+- Upgrade checking scripts should become more extensible, and maybe be bundled in a single check-script CLI tool.
+- Serve chain inspection/processing building-blocks for test setups and tooling like op-deployer.
+- `interopgen` is meant to be temporary, and consolidate with `op-deployer`.
+  This change depends largely on the future of `op-e2e`,
+  where system tests may be replaced in favor of tests set up by `op-e2e`.
+- `script` is a Go version of `forge` script, with hooks and customization options,
+  for better integration into tooling such as `op-deployer`.
+  This package should evolve to serve testing and `op-deployer` as best as possible,
+  it is not a full `forge` replacement.
+- `genesis` will shrink over time, as more of the genesis responsibilities are automated away into
+  the protocol through system-transactions, and tooling such as `op-deployer` and OPCM.
+
+## Design principles
+
+- Provide high-quality bindings to accelerate testing and tooling development.
+- Minimal introspection into fragile solidity details.
+
+There is a trade-off here in how minimal the tooling is:
+generally we aim to provide dedicated functionality in Go for better integration,
+if the target tool is significant Go service of its own.
+If not, then `op-chain-ops` should not be extended, and the design of the target tool should be adjusted instead.
+
+## Testing
+
+- Upgrade checks are tested against live devnet/testnet upgrades, before testing against mainnet.
+  Testing here is aimed to expand to end-to-end testing, for better integrated test feedback of these tools.
+- Utils have unit-test coverage of their own, and are used widely in end-to-end testing itself.

From ebd2cfd6c1fe47dc988a4c6a8f2ce43d5fafa3f4 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Mon, 2 Dec 2024 20:03:47 +0100
Subject: [PATCH 322/451] op-e2e: update readme (#13165)

---
 op-e2e/README.md | 122 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 97 insertions(+), 25 deletions(-)

diff --git a/op-e2e/README.md b/op-e2e/README.md
index a52eaab63259..ba3855474615 100644
--- a/op-e2e/README.md
+++ b/op-e2e/README.md
@@ -1,33 +1,105 @@
-# op-e2e
+# `op-e2e`
 
-The end to end tests in this repo depend on genesis state that is
-created with the `bedrock-devnet` package. To create this state,
-run the following commands from the root of the repository:
+Issues: [monorepo](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aissue%20state%3Aopen%20label%3AA-op-e2e)
 
-```bash
-make cannon-prestate
-make devnet-allocs
-```
+Pull requests: [monorepo](https://github.com/ethereum-optimism/optimism/pulls?q=is%3Aopen+is%3Apr+label%3AA-op-e2e)
+
+Design docs:
+- [test infra draft design-doc]: active discussion of end-to-end testing approach
 
-This will leave artifacts in the `.devnet` directory that will be
-read into `op-e2e` at runtime. The default deploy configuration
-used for starting all `op-e2e` based tests can be found in
-`packages/contracts-bedrock/deploy-config/devnetL1.json`. There
-are some values that are safe to change in memory in `op-e2e` at
-runtime, but others cannot be changed or else it will result in
-broken tests. Any changes to `devnetL1.json` should result in
-rebuilding the `.devnet` artifacts before the new values will
-be present in the `op-e2e` tests.
+[test infra draft design-doc](https://github.com/ethereum-optimism/design-docs/pull/165)
 
-## Running tests
-Consult the [Makefile](./Makefile) in this directory. Run, e.g.:
+`op-e2e` is a collection of Go integration tests.
+It is named `e2e` after end-to-end testing,
+for those tests where we integration-test the full system, rather than only specific services.
+
+
+## Quickstart
 
 ```bash
-make test-http
+make test-actions
+make test-ws
 ```
 
-### Troubleshooting
-If you encounter errors:
-* ensure you have the latest version of foundry installed: `just update-foundry`
-* try deleting the `packages/contracts-bedrock/forge-artifacts` directory
-* try `forge clean && rm -rf lib && forge install` within the `packages/contracts-bedrock` directory
+## Overview
+
+`op-e2e` can be categorized as following:
+- `op-e2e/actions/`: imperative test style, more DSL-like, with a focus on the state-transition parts of services.
+  Parallel processing is actively avoided, and a mock clock is used.
+  - `op-e2e/actions/*`: sub-packages categorize specific domains to test.
+  - `op-e2e/actions/interop`: notable sub-package, where multiple L2s are attached together,
+    for integration-testing across multiple L2 chains.
+  - `op-e2e/actions/proofs`: notable sub-package, where proof-related state-transition testing is implemented,
+    with experimental support to cover alternative proof implementations.
+- `op-e2e/system`: integration tests with a L1 miner and a L2 with sequencer, verifier, batcher and proposer.
+  These tests do run each service almost fully, including parallel background jobs and real system clock.
+  These tests focus less on the onchain state-transition aspects, and more on the offchain integration aspects.
+  - `op-e2e/faultproofs`: system tests with fault-proofs stack attached
+  - `op-e2e/interop`: system tests with a distinct Interop "SuperSystem", to run multiple L2 chains.
+- `op-e2e/opgeth`: integration tests between test-mocks and op-geth execution-engine.
+  - also includes upgrade-tests to ensure testing of op-stack Go components around a network upgrade.
+
+### `action`-tests
+
+Action tests are set up in a compositional way:
+each service is instantiated as actor, and tests can choose to run just the relevant set of actors.
+E.g. a test about data-availability can instantiate the batcher, but omit the proposer.
+
+One action, across all services, runs at a time.
+No live background processing or system clock affects the actors:
+this enables individual actions to be deterministic and reproducible.
+
+With this synchronous processing, action-test can reliably navigate towards
+these otherwise hard-to-reach edge-cases, and ensure the state-transition of service,
+and the interactions between this state, are covered.
+
+Action-tests do not cover background processes or peripherals.
+E.g. P2P, CLI usage, and dynamic block building are not covered.
+
+### `system`-tests
+
+System tests are more complete than `action` tests, but also require a live system.
+This trade-off enables coverage of most of each Go service,
+at the cost of making navigation to cover the known edge-cases less reliable and reproducible.
+This test-type is thus used primarily for testing of the offchain service aspects.
+
+By running a more full system, test-runners also run into resource-limits more quickly.
+This may result in lag or even stalled services.
+Improvements, as described in the [test infra draft design-doc],
+are in active development, to make test execution more reliable.
+
+### `op-e2e/opgeth`
+
+Integration-testing with op-geth, to cover engine behavior, without setting up a full test environment.
+These tests are limited in scope, and may be changed at a later stage, to support alternative EL implementations.
+
+## Product
+
+### Optimization target
+
+Historically `op-e2e` has been optimized for test-coverage of the Go OP-Stack.
+This is changing with the advance of alternative OP-Stack client implementations.
+
+New test framework improvements should optimize for multi-client testing.
+
+### Vision
+
+Generally, design-discussion and feedback from active test users converges on:
+- a need to share test-resources, to host more tests while reducing overhead.
+- a need for a DSL, to better express common test constructs.
+- less involved test pre-requisites: the environment should be light and simple, welcoming new contributors.
+  E.g. no undocumented one-off makefile prerequisites.
+
+## Design principles
+
+- Interfaces first. We should not hardcode test-utilities against any specific client implementation,
+  this makes a test less parameterizable and less cross-client portable.
+- Abstract setup to make it the default to reduce resource usage.
+  E.g. RPC transports can run in-process, and avoid websocket or HTTP costs,
+  and ideally the test-writer does not have to think about the difference.
+- Avoid one-off test chain-configurations. Tests with more realistic parameters are more comparable to production,
+  and easier consolidated onto shared testing resources.
+- Write helpers and DSL utilities, avoid re-implementing common testing steps.
+  The better the test environment, the more inviting it is for someone new to help improve test coverage.
+- Use the right test-type. Do not spawn a full system for something of very limited scope,
+  e.g. when it fits better in a unit-test.

From 4b755207f07c5ae6e0f917df8618dcbf5bde5c35 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Mon, 2 Dec 2024 20:04:08 +0100
Subject: [PATCH 323/451] op-node: update readme (#13164)

---
 op-node/README.md | 297 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 222 insertions(+), 75 deletions(-)

diff --git a/op-node/README.md b/op-node/README.md
index cfc3793052f1..b9b28fa05f15 100644
--- a/op-node/README.md
+++ b/op-node/README.md
@@ -1,105 +1,252 @@
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
+# `op-node`
 
-- [op-node](#op-node)
-  - [Compiling](#compiling)
-  - [Testing](#testing)
-  - [Running](#running)
-  - [L2 Genesis Generation](#l2-genesis-generation)
-  - [L1 Devnet Genesis Generation](#l1-devnet-genesis-generation)
+Issues:
+[monorepo](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aissue%20state%3Aopen%20label%3AA-op-node)
 
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+Pull requests:
+[monorepo](https://github.com/ethereum-optimism/optimism/pulls?q=is%3Aopen+is%3Apr+label%3AA-op-node)
 
-# op-node
+User docs:
+- [How to run a node](https://docs.optimism.io/builders/node-operators/rollup-node)
 
-This is the reference implementation of the [rollup-node spec](https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/rollup-node.md).
-It can be thought of like the consensus layer client of an OP Stack chain where it must run with an OP Stack execution layer client
-like [op-geth](https://github.com/ethereum-optimism/op-geth).
+Specs:
+- [rollup-node spec]
 
-## Compiling
+The op-node implements the [rollup-node spec].
+It functions as a Consensus Layer client of an OP Stack chain.
+This builds, relays and verifies the canonical chain of blocks.
+The blocks are processed by an execution layer client, like [op-geth].
 
-Compile a binary:
+[rollup-node spec]: https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/rollup-node.m
+[op-geth]: https://github.com/ethereum-optimism/op-geth
 
-```shell
+## Quickstart
+
+```bash
 make op-node
+
+# Network selection:
+# - Join any of the pre-configured networks with the `--network` flag.
+# - Alternatively, join a custom network with the `--rollup.config` flag.
+#
+# Essential Connections:
+# - L1 ethereum RPC, to fetch blocks, receipts, finality
+# - L1 beacon API, to fetch blobs
+# - L2 engine API, to apply new blocks to
+# - P2P TCP port, to expose publicly, to retrieve and relay the latest L2 blocks
+# - P2P UDP port, to expose publicly, to discover other nodes to peer with
+# - RPC port, to serve RPC of the op-node
+#
+# Other:
+# - Sync mode: how to interact with the execution-engine,
+#   such that it enters the preferred form of syncing:
+#   - consensus-layer (block by block sync)
+#   - execution-layer (e.g. snap-sync)
+#
+# Tip: every CLI flag has an env-var equivalent (run `op-node --help` for more information)
+./bin/op-node \
+  --network=op-sepolia \
+  --l1=ws://localhost:8546 \
+  --l1.beacon=http://localhost:4000 \
+  --l2=ws://localhost:9001 \
+  --p2p.listen.tcp=9222
+  --p2p.listen.udp=9222
+  --rpc.port=7000 \
+  --syncmode=execution-layer
+
+# If running inside docker, ake sure to mount the below persistent data as (host) volume,
+# it may be lost on restart otherwise:
+# - P2P private key: auto-generated when missing, used to maintain a stable peer identity.
+# - Peerstore DB: remember peer records to connect with, used to not wait for peer discovery.
+# - Discovery DB: maintain DHT data, to avoid repeating some discovery work after restarting.
+  --p2p.priv.path=opnode_p2p_priv.txt \
+  --p2p.peerstore.path=opnode_peerstore_db \
+  --p2p.discovery.path=opnode_discovery_db \
+  --p2p.priv.path=opnode_p2p_priv.txt
 ```
 
-## Testing
+## Usage
 
-Run op-node unit tests:
+### Build from source
 
-```shell
-make test
+```bash
+# from op-node dir:
+make op-node
+./bin/op-node --help
 ```
 
-## Running
+### Run from source
 
-Configuration options can be reviewed with:
-
-```shell
-./bin/op-node --help
+```bash
+# from op-node dir:
+go run ./cmd --help
 ```
 
-[eth-json-rpc-spec]: https://ethereum.github.io/execution-apis/api-documentation
+### Build docker image
 
-To start syncing the rollup:
+See `op-node` docker-bake target.
 
-Connect to one L1 Execution Client that supports the [Ethereum JSON-RPC spec][eth-json-rpc-spec],
-an L1 Consensus Client that supports the [Beacon Node API](https://ethereum.github.io/beacon-APIs) and
-an OP Stack based Execution Client that supports the [Ethereum JSON-RPC spec][eth-json-rpc-spec]:
+## Implementation overview
 
-- L1: use any L1 client, RPC, websocket, or IPC (connection config may differ)
-- L2: use any OP Stack Execution Client like [`op-geth`](https://github.com/ethereum-optimism/op-geth)
+### Interactions
 
-Note that websockets or IPC is preferred for event notifications to improve sync, http RPC works with adaptive polling.
+<!-- how this interacts with other modules -->
+<!-- dependencies on other modules -->
 
-```shell
-./bin/op-node \
-  --l1=ws://localhost:8546 \
-  --l1.beacon=http://localhost:4000 \
-  --l2=ws://localhost:9001 \
-  --rollup.config=./path-to-network-config/rollup.json \
-  --rpc.addr=127.0.0.1 \
-  --rpc.port=7000
-```
+## Product
 
-## L2 Genesis Generation
+The op-node **builds**, **relays** and **verifies** the canonical chain of blocks.
 
-The `op-node` can generate geth compatible `genesis.json` files. These files
-can be used with `geth init` to initialize the `StateDB` with accounts, storage,
-code and balances. The L2 state must be initialized with predeploy contracts
-that exist in the state and act as system level contracts. The `op-node` can
-generate a genesis file with these predeploys configured correctly given
-an L1 RPC URL, a deploy config, L2 genesis allocs and a L1 deployments artifact.
+The op-node does not store critical data:
+the op-node can recover from any existing L2 chain pre-state
+that is sufficiently synced such that available input data can complete the sync.
 
-The deploy config contains all of the config required to deploy the
-system. Examples can be found in `packages/contracts-bedrock/deploy-config`. Each
-deploy config file is a JSON file. The L2 allocs can be generated using a forge script
-in the `contracts-bedrock` package and the L1 deployments are a JSON file that is the
-output of doing a L1 contracts deployment.
+The op-node **builds** blocks:
+either from scratch as a sequencer, or from block-inputs (made available through L1) as verifier.
 
-Example usage:
+The block **relay** is a happy-path: the P2P sync is optional, and does not affect the ability to verify.
+However, the block relay is still important for UX, as it lowers the latency to the latest state.
 
-```bash
-$ ./bin/op-node genesis l2 \
-  --l1-rpc $ETH_RPC_URL \
-  --deploy-config <PATH_TO_MY_DEPLOY_CONFIG> \
-  --l2-allocs <PATH_TO_L2_ALLOCS> \
-  --l1-deployments <PATH_TO_L1_DEPLOY_ARTIFACT> \
-  --outfile.l2 <PATH_TO_WRITE_L2_GENESIS> \
-  --outfile.rollup <PATH_TO_WRITE_OP_NODE_CONFIG>
-```
+The blocks are **verified**: only valid L2 blocks that can be reproduced from L1 data are accepted.
 
-## L1 Devnet Genesis Generation
+### Optimization target
 
-It is also possible to generate a devnet L1 `genesis.json` file. The L1 allocs can
-be generated with the foundry L1 contracts deployment script if the extra parameter
-`--sig 'runWithStateDump()` is added to the deployment command.
+<!-- What do we optimize for in this implementation? -->
+
+**Safely and reliably sync the canonical chain**
+
+The op-node implements the three core product features as following:
+
+- Block **building**: extend the chain at a throughput rate and latency that is safe to relay and verify.
+- Block **relaying**: while keeping throughput high and latency low, prevent single points of failure.
+- Block **verification**: efficiently sync, but always fully verify, follow the canonical chain.
+
+Trade-offs are made here: verification safety is at odds ideal throughput, latency, efficiency.
+Or in other words: safety vs. liveness. Chain parameters determine this.
+The implementation offers this trade-off, siding with safety by default,
+and design-choices should aim to improve the trade-off.
+
+### Vision
+
+The op-node is changing in two ways:
+- [Reliability](#reliability): improve the reliability with improved processing, testing and syncing.
+- [Interoperability](#interoperability): cross-chain messaging support.
+
+#### Reliability
+
+- Parallel derivation processes: [Issue 10864](https://github.com/ethereum-optimism/optimism/issues/10864)
+- Event tests: [Issue 13163](https://github.com/ethereum-optimism/optimism/issues/13163)
+- Improving P2P sync: [Issue 11779](https://github.com/ethereum-optimism/optimism/issues/11779)
+
+#### Interoperability
+
+The OP Stack is make chains natively interoperable:
+messages between chains form safety dependencies, and verified asynchronously.
+Asynchronous verification entails that the op-node reorgs away a block
+if and when the block is determined to be invalid.
+
+The [op-supervisor] specializes in this dependency verification work.
+
+The op-node encapsulates all the single-chain concerns:
+it prepares the local safety data-points (DA confirmation and block contents) for the op-supervisor.
+
+The op-supervisor then verifies the cross-chain safety, and promotes the block safety level accordingly,
+which the op-node then follows.
+
+See [Interop specs] and [Interop design-docs] for more information about interoperability.
+
+[op-supervisor]: ../op-supervisor/README.md
+
+### User stories
+
+<!-- As a **actor** I want **achievement** so that I **benefit** -->
+
+As *a user* I want *reliability* so that I *don't miss blocks or fall out of sync*.
+As *a RaaS dev* I want *easy configuration and monitoring* so that I *can run more chains*.
+As *a customizoor* I want *clear extensible APIs* so that I *can avoid forking and be a contributor*.
+As *a protocol dev* I want *integration with tests* so that I *assert protocol conformance*
+As *a proof dev* I want *reusable state-transition code* so that I *don't reimplement the same thing*.
+
+## Design principles
+
+<!-- design choices / trade-offs -->
+- Encapsulate the state-transition:
+  - Use interfaces to abstract file-IO / concurrency / etc. away from state-transition logic.
+  - Ensure code-sharing with action-tests and op-program.
+- No critical database:
+  - Persisting data is ok, but it should be recoverable from external data without too much work.
+  - The best chain "sync" is no sync.
+- Keep the tech-stack compatible with ethereum L1:
+  - L1 offers well-adopted and battle tested libraries and standards, e.g. LibP2P, DiscV5, JSON-RPC.
+  - L1 supports a tech-stack in different languages, ensuring client-diversity, important to L2 as well.
+  - Downstream devs of OP-Stack should be able to pull in *one* instance of a library, that serves both OP-Stack and L1.
+
+## Failure modes
+
+This is a brief overview of what might fail, and how the op-node responds.
+
+### L1 downtime
+
+When the L1 data-source is temporarily unavailable the op-node `safe`/`finalized` progression halts.
+Blocks may continue to sync through the happy-path if P2P connectivity is undisrupted.
+
+### No batch confirmation
+
+As per the [rollup-node spec] the sequencing-window ensures that after a bounded period of L1 blocks
+the verifier will infer blocks, to ensure liveness of blocks with deposited transactions.
+The op-node will continue to process the happy-path in the mean time,
+which may have to be reorged out if it does not match the blocks that is inferred after sequencing window expiry.
+
+### L1 reorg
+
+L1 reorgs are detected passively during traversal: upon traversal to block `N+1`,
+if the next canonical block has a parent-hash that does not match the
+current block `N` we know the remote L1 chain view has diverged.
+
+When this happens, the op-node assumes the local view is wrong, and resets itself to follow that of the remote node,
+dropping any non-canonical blocks in the process.
+
+### No L1 finality
+
+When L1 does not finalize for an extended period of time,
+the op-node is also unable to finalize the L2 chain for the same time.
+
+Note that the `safe` block in the execution-layer is bootstrapped from the `finalized` block:
+some verification work may repeat after a restart.
+
+Blocks will continue to be derived from L1 batch-submissions, and optimistic processing will also continue to function.
+
+### P2P failure
+
+On P2P failure, e.g. issues with peering or failed propagation of block-data, the `unsafe` part of the chain may stall.
+The `unsafe` part of the chain will no longer progress optimistically ahead of the `safe` part.
+
+The `safe` blocks will continue to be derived from L1 however, providing a higher-latency access to the latest chain.
+
+The op-node may pick back up the latest `unsafe` blocks after recovering its P2P connectivity,
+and buffering `unsafe` blocks until the `safe` blocks progress meets the first known buffered `unsafe` block.
+
+### Restarts and resyncing
+
+After a restart, or detection of missing chain data,
+the op-node dynamically determines what L1 data is required to continue, based on the syncing state of execution-engine.
+If the sync-state is far behind, the op-node may need archived blob data to sync from the original L1 inputs.
+
+A faster alternative may be to bootstrap through the execution-layer sync mode,
+where the execution-engine may perform an optimized long-range sync, such as snap-sync.
+
+## Testing
+
+<!-- describe testing methods and approach to test coverage -->
+
+- Unit tests: encapsulated functionality, fuzz tests, etc. in the op-node Go packages.
+- `op-e2e` action tests: in-progress Go testing, focused on the onchain aspects,
+  e.g. state-transition edge-cases. This applies primarily to the derivation pipeline.
+- `op-e2e` system tests: in-process Go testing, focused on the offchain aspects of the op-node,
+  e.g. background work, P2P integration, general service functionality.
+- Local devnet tests: full end to end testing, but set up on minimal resources.
+- Kurtosis tests: new automated devnet-like testing. Work in progress.
+- Long-running devnet: roll-out for experimental features, to ensure sufficient stability for testnet users.
+- Long-running testnet: battle-testing in public environment.
+- Shadow-forks: design phase, testing experiments against shadow copies of real networks.
 
-```bash
-$ ./bin/op-node genesis l1 \
-   --deploy-config $CONTRACTS_BEDROCK/deploy-config \
-   --l1-deployments <PATH_TO_L1_DEPLOY_ARTIFACT> \
-   --l1-allocs <PATH_TO_L1_ALLOCS>
-```

From 0c13f11c676b8a947e7f6762412a7859acf72457 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Mon, 2 Dec 2024 20:04:24 +0100
Subject: [PATCH 324/451] op-service: add readme (#13162)

---
 op-service/README.md | 75 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 op-service/README.md

diff --git a/op-service/README.md b/op-service/README.md
new file mode 100644
index 000000000000..9f8bf03c54cc
--- /dev/null
+++ b/op-service/README.md
@@ -0,0 +1,75 @@
+# `op-service`
+
+Issues: [monorepo](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aissue%20state%3Aopen%20label%3AA-op-service)
+
+Pull requests: [monorepo](https://github.com/ethereum-optimism/optimism/pulls?q=is%3Aopen+is%3Apr+label%3AA-op-service)
+
+`op-service` is a collection of Go utilities to build OP-Stack services with.
+
+```text
+├── cliapp          - Flag and lifecycle handling for a Urfave v2 CLI app.
+├── client          - RPC and HTTP client utils
+├── clock           - Clock interface, system clock, tickers, mock/test time utils
+├── crypto          - Cryptography utils, complements geth crypto package
+├── ctxinterrupt    - Blocking/Interrupt handling
+├── dial            - Dialing util functions for RPC clients
+├── endpoint        - Abstracts away type of RPC endpoint
+├── enum            - Utils to create enums
+├── errutil         - Utils to work with customized errors
+├── eth             - Common Ethereum data types and OP-Stack extension types
+├── flags           - Utils and flag types for CLI usage
+├── httputil        - Utils to create enhanced HTTP Server
+├── ioutil          - File utils, including atomic files and compression
+├── jsonutil        - JSON encoding/decoding utils
+├── locks           - Lock utils, like read-write wrapped types
+├── log             - Logging CLI and middleware utils
+├── metrics         - Metrics types, metering abstractions, server utils
+├── oppprof         - P-Prof CLI types and server setup
+├── predeploys      - OP-Stack predeploy definitions
+├── queue           - Generic queue implementation
+├── retry           - Function retry utils
+├── rpc             - RPC server utils
+├── safego          - Utils to make Go memory more safe
+├── serialize       - Binary serialization abstractions
+├── signer          - CLI flags and bindings to work with a remote signer
+├── solabi          - Utils to encode/decode Solidity ABI formatted data
+├── sources         - RPC client bindings
+├── tasks           - Err-group with panic handling
+├── testlog         - Test logger and log-capture utils for testing
+├── testutils       - Simplified Ethereum types, mock RPC bindings, utils for testing.
+├── tls             - CLI flags and utils to work with TLS connections
+├── txmgr           - Transaction manager: automated nonce, fee and confirmation handling.
+└── *.go            - Miscellaneous utils (soon to be deprecated / moved)
+```
+
+## Usage
+
+From `op-service` dir:
+```bash
+# Run Go tests
+make test
+# Run Go fuzz tests
+make fuzz
+```
+
+## Product
+
+### Optimization target
+
+Provide solid reusable building blocks for all OP-Stack Go services.
+
+### Vision
+
+- Remove unused utilities: `op-service` itself needs to stay maintainable.
+- Make all Go services consistent: `op-service` modules can be used to simplify and improve more Go services.
+
+## Design principles
+
+- Reduce boilerplate in Go services: provide service building utils ranging from CLI to testing.
+- Protect devs from sharp edges in the Go std-lib: think of providing missing composition,
+  proper resource-closing, well set up network-binding, safe concurrency utils.
+
+## Testing
+
+Each op-service package has its own unit-testing.
+More advanced utils, such as the transaction manager, are covered in `op-e2e` as well.

From e76c04d11b60e14b3888a9fb786ff48f39d6775b Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Mon, 2 Dec 2024 20:04:44 +0100
Subject: [PATCH 325/451] op-wheel: add readme (#13161)

---
 op-wheel/README.md | 92 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 op-wheel/README.md

diff --git a/op-wheel/README.md b/op-wheel/README.md
new file mode 100644
index 000000000000..ce5dfa298f14
--- /dev/null
+++ b/op-wheel/README.md
@@ -0,0 +1,92 @@
+# `op-wheel`
+
+Issues: [monorepo](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aissue%20state%3Aopen%20label%3AA-op-wheel)
+
+Pull requests: [monorepo](https://github.com/ethereum-optimism/optimism/pulls?q=is%3Aopen+is%3Apr+label%3AA-op-wheel)
+
+`op-wheel` is a CLI tool to direct the engine one way or the other with DB cheats and Engine API routines.
+
+It was named the "wheel" because of two reasons:
+- Figuratively, it allows to steer the stack, an interface for a *driver* (like the op-node sub-component) to control the execution *engine* (e.g. op-geth).
+- Idiomatically, like the Unix wheel-bit and its slang origins: empower a user to execute restricted commands, or more generally just someone with great power or influence.
+
+## Quickstart
+
+### Cheat utils
+
+Cheating commands to modify a Geth database without corresponding in-protocol change.
+
+The `cheat` sub-command has sub-commands for interacting with the DB, making patches, and dumping debug data.
+
+Note that the validity of state-changes, as applied through patches,
+does not get checked until the block is re-processed.
+This can be used ot trick the node into things like hypothetical
+test-states or shadow-forks without diverging the block-hashes.
+
+To run:
+```bash
+go run ./op-wheel/cmd cheat --help
+```
+
+### Engine utils
+
+Engine API commands to build/reorg/rewind/finalize/copy blocks.
+
+Each sub-command dials the engine API endpoint (with provided JWT secret) and then runs the action.
+
+To run:
+```bash
+go run ./op-wheel/cmd engine --help
+```
+
+## Usage
+
+### Build from source
+
+```bash
+# from op-wheel dir:
+make op-wheel
+./bin/op-wheel --help
+```
+
+### Run from source
+
+```bash
+# from op-wheel dir:
+go run ./cmd --help
+```
+
+### Build docker image
+
+See `op-wheel` docker-bake target.
+
+## Product
+
+`op-wheel` is a tool for expert-users to perform advanced data recoveries, tests and overrides.
+This tool optimizes for reusability of these expert actions, to make them less error-prone.
+
+This is not part of a standard release / process, as this tool is not used commonly,
+and the end-user is expected to be familiar with building from source.
+
+Actions that are common enough to be used at least once by the average end-user should
+be part of the op-node or other standard op-stack release.
+
+## Design principles
+
+Design for an expert-user: this tool aims to provide full control over critical op-stack data
+such as the engine-API and database itself, without hiding important information.
+
+However, even as expert-user, wrong assumptions can be made.
+Defaults should aim to reduce errors, and leave the stack in a safe state to recover from.
+
+## Failure modes
+
+This tool is not used in the happy-path, but can be critical during expert-recovery of advanced failure modes.
+E.g. database recovery after Geth database corruption, or manual forkchoice overrides.
+Most importantly, each CLI command used for recovery aims to be verbose,
+and avoids leaving an inconsistent state after failed or interrupted recovery.
+
+## Testing
+
+This is a test-utility more than a production tool, and thus does currently not have test-coverage of its own.
+However, when it is used as tool during (dev/test) chain or node issues, usage does inform fixes/improvements.

From 35c1ffdaf562e00ac50d6e568d31d5a08258d705 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Mon, 2 Dec 2024 20:05:06 +0100
Subject: [PATCH 326/451] op-proposer: add readme (#13160)

---
 op-proposer/README.md | 153 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 153 insertions(+)
 create mode 100644 op-proposer/README.md

diff --git a/op-proposer/README.md b/op-proposer/README.md
new file mode 100644
index 000000000000..56f086061e1d
--- /dev/null
+++ b/op-proposer/README.md
@@ -0,0 +1,153 @@
+# `op-proposer`
+
+Issues: [monorepo](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aissue%20state%3Aopen%20label%3AA-op-proposer)
+
+Pull requests: [monorepo](https://github.com/ethereum-optimism/optimism/pulls?q=is%3Aopen+is%3Apr+label%3AA-op-proposer)
+
+User docs:
+- [Proposer Configuration docs]
+
+[Proposer Configuration docs]: https://docs.optimism.io/builders/chain-operators/configuration/proposer
+
+Specs:
+- [`proposals.md`](https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/proposals.md)
+- [`withdrawals`](https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/withdrawals.md)
+- [`fault-proof/stage-one/bridge-integration.md`](https://github.com/ethereum-optimism/specs/blob/main/specs/fault-proof/stage-one/bridge-integration.md)
+
+The `op-proposer` is a light-weight service to automate output-root proposal transactions on regular interval.
+Each proposal transaction submits a claim of the L2 state to L1.
+
+Chains with a pre-Fault-Proof deployment make proposal-transactions towards a pre-fault-proofs `OptimismPortal` deployment.
+
+Chains with permissioned or permissionless Fault Proofs make proposal-transactions to the `DisputeGameFactory`,
+which instantiates claims (each claim being a new fault-proof "game"),
+which can then be resolved for the proposals to persist.
+
+Withdrawals are authenticated against resolved proposals,
+with an inclusion-proof of a withdrawn message (as registered in the L2 withdrawal-contract storage).
+
+## Quickstart
+
+```bash
+go run ./op-proposer/cmd \
+        --l1-eth-rpc http://l1:8545 \
+      --rollup-rpc: http://op-node:8545 \
+      --game-factory-address=changeme \
+      --game-type=changeme
+```
+
+See [Proposer Configuration docs] for customization of the transaction-managent,
+and usage of a remote signer to isolate the proposer secret key.
+
+On test networks, `--allow-non-finalized` may be used to make proposals sooner, to reduce test time.
+
+## Usage
+
+### Build from source
+
+```bash
+make op-proposer
+
+./bin/op-proposer --help
+```
+
+### Run from source
+
+```bash
+# from op-proposer dir:
+go run ./cmd --help
+```
+
+### Build docker image
+
+See `op-proposer` docker-bake target.
+
+## Overview
+
+<!-- description of *how* this module implements the spec -->
+
+The op-proposer relays subjective `finalized` blocks (irreversible, as locally verified)
+to L1 by constructing and submitting proposals.
+The proposed claims can then be resolved, and used for withdrawals on L1.
+
+```mermaid
+sequenceDiagram
+autonumber
+
+participant portal as OptimismPortal (v2)<br/> contract
+participant challenger as op-challenger
+participant claim as Fault Dispute Game<br/> contract
+participant dgf as Dispute Game Factory<br/> contract on L1
+participant proposer as op-proposer
+participant opnode as op-node
+participant el as Execution Engine<br/> (e.g. op-geth)
+
+proposer ->>opnode: query output-root
+opnode ->>el: query block and withdrawals-root
+el -->> opnode: return block and withdrawals-root
+opnode -->> proposer: return output root
+proposer ->> dgf: send claim
+proposer ->> proposer: repeat with next claim
+dgf ->> claim: create game contract
+challenger ->> claim: resolve (or counter) claim
+portal -->> claim: proveWithdrawalTransaction checks game state
+```
+
+The `op-proposer` itself is a light-weight loop to maintain this relay:
+schedule when to propose, inspect what to propose, transact on L1 to proposer, and repeat.
+
+## Product
+
+### Optimization target
+
+The `op-proposer` code optimizes for simplicity.
+
+Proposals are few and far-between, commonly only at a 1 hour interval.
+Proposal execution speed affects tests more than it does production, and thus not a primary optimization target.
+
+Most costs are made in the proposal contract execution,
+not the operation of the op-proposer, and thus not the primary optimization concern.
+
+Proposals are critical to safety however, and simplicity is thus important to this service.
+
+### Vision
+
+The pre-fault-proof proposal functionality is effectively unused code, and may be removed in the near future.
+Solutions for alternative proving systems are a work in progress.
+
+With the proposed withdrawals-root feature (see [Isthmus upgrade feature]),
+the op-node will soon no longer have to query the storage separately
+from the block-header that it constructs an output-root for.
+This lowers the requirements to run a proposer,
+since no archive-node is required anymore to determine the withdrawals-root.
+
+[Isthmus upgrade feature]: https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/isthmus/exec-engine.md#l2tol1messagepasser-storage-root-in-header
+
+Testing of this service may be further improved by decoupling the scheduling and processing.
+Better encapsulated processing would lend itself better to [op-e2e](../op-e2e) action-tests.
+
+
+## Design principles
+
+<!-- design choices / trade-offs -->
+
+- Reuse the transaction-management: this is the most complicated part of the op-proposer, but is common with other services.
+- Keep the proposal flow simple: given that we only expect one transaction per hour,
+  but the transaction is a critical claim, we have a strong preference for safety over liveness.
+
+## Failure modes
+
+<!-- Risks & error handling -->
+
+While disabled by default, the op-proposer is capable of submitting proposals too eagerly.
+A proposal for unfinalized L2 state that does not hold true later may result in an invalid claim on L1,
+and thus in dispute-game penalties.
+
+Assuming finality, the op-proposer is only really subject to liveness failures:
+- to L1 RPC failure (mitigated with redundancy in L1 RPC)
+- local temporary failure, e.g. offline execution engine (mitigated with alerts)
+  or odd tx-inclusion situations (mitigated with fresh state upon restart).
+
+## Testing
+
+The `op-proposer` integration is covered in system `op-e2e` tests.

From 623609aef393cf11281dac4907e4b393ef28de0d Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Mon, 2 Dec 2024 14:53:33 -0500
Subject: [PATCH 327/451] feat: make Cannon libraries verison agnostic (#13175)

Updates the Cannon libraries to be version agnostic instead of
being pinned to 0.8.15. This is OK because we do not deploy
libraries outside of contracts that have pinned contract versions.
---
 .../contracts-bedrock/src/cannon/libraries/CannonErrors.sol     | 2 +-
 packages/contracts-bedrock/src/cannon/libraries/CannonTypes.sol | 2 +-
 packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol  | 2 +-
 .../src/cannon/libraries/MIPS64Instructions.sol                 | 2 +-
 .../contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol     | 2 +-
 packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol | 2 +-
 .../contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol   | 2 +-
 .../contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol | 2 +-
 packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol  | 2 +-
 packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol   | 2 +-
 .../contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/contracts-bedrock/src/cannon/libraries/CannonErrors.sol b/packages/contracts-bedrock/src/cannon/libraries/CannonErrors.sol
index 3649852cec6f..dd0e78a3a33a 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/CannonErrors.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/CannonErrors.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 /// @notice Thrown when a passed part offset is out of bounds.
 error PartOffsetOOB();
diff --git a/packages/contracts-bedrock/src/cannon/libraries/CannonTypes.sol b/packages/contracts-bedrock/src/cannon/libraries/CannonTypes.sol
index 2e7c50ed862d..26d0a17edae4 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/CannonTypes.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/CannonTypes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 using LPPMetadataLib for LPPMetaData global;
 
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol
index 34a8d39f5d42..a1d689e731db 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Arch.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 library MIPS64Arch {
     uint64 internal constant WORD_SIZE = 64;
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
index 7494135ace1a..6191cdfbe0a4 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
index f6e0633466ef..2f77fcd599c4 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Memory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { InvalidMemoryProof } from "src/cannon/libraries/CannonErrors.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
index 09c347841b94..c7102dea0fdd 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { InvalidExitedValue } from "src/cannon/libraries/CannonErrors.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
index 68cca83c4bf7..e8556979bc71 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
index f2af43da0fea..70ed5e20c3bc 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSInstructions.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
index b78cc04a8951..1d3942f70509 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSMemory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { InvalidMemoryProof } from "src/cannon/libraries/CannonErrors.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol
index 22fb608bcf56..b2982b5b16af 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSState.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { InvalidExitedValue } from "src/cannon/libraries/CannonErrors.sol";
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
index 57206ea37010..8ba85bc7e371 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
 // Libraries
 import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";

From a2b1a7e111eb92891ccb94fab5806eb3735d07ef Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Mon, 2 Dec 2024 14:56:27 -0500
Subject: [PATCH 328/451] feat: common core for contracts Go check scripts
 (#13134)

Introduces a new common base framework for writing contracts
check scripts in Go. Many of the check scripts basically do the
exact same logic of somehow parsing either the interfaces or the
artifact files. Goal of this small project is to make the process
of writing new checks easier and more reliable.

We demonstrate this framework in action by porting the test-names
script to use this new framework.
---
 .circleci/config.yml                          |   1 +
 go.mod                                        |   1 +
 go.sum                                        |   2 +
 op-chain-ops/solc/types.go                    | 156 +++++++++-
 .../scripts/checks/common/util.go             | 124 ++++++++
 .../scripts/checks/common/util_test.go        | 180 +++++++++++
 .../scripts/checks/test-names/main.go         | 202 ++++++-------
 .../scripts/checks/test-names/main_test.go    | 280 ++++++++++++++++++
 8 files changed, 830 insertions(+), 116 deletions(-)
 create mode 100644 packages/contracts-bedrock/scripts/checks/common/util.go
 create mode 100644 packages/contracts-bedrock/scripts/checks/common/util_test.go
 create mode 100644 packages/contracts-bedrock/scripts/checks/test-names/main_test.go

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a50ad6c2269a..1f7b8a95e616 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1382,6 +1382,7 @@ workflows:
             op-e2e/interop
             op-e2e/actions
             op-e2e/faultproofs
+            packages/contracts-bedrock/scripts/checks
           requires:
             - contracts-bedrock-build
             - cannon-prestate
diff --git a/go.mod b/go.mod
index 7e6f8737d804..94f571c65b66 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ toolchain go1.22.7
 require (
 	github.com/BurntSushi/toml v1.4.0
 	github.com/andybalholm/brotli v1.1.0
+	github.com/bmatcuk/doublestar/v4 v4.7.1
 	github.com/btcsuite/btcd v0.24.2
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
 	github.com/cockroachdb/pebble v1.1.2
diff --git a/go.sum b/go.sum
index d18aff8414ae..49bc0c62eb11 100644
--- a/go.sum
+++ b/go.sum
@@ -50,6 +50,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
 github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
+github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
diff --git a/op-chain-ops/solc/types.go b/op-chain-ops/solc/types.go
index de6edb90d231..56ea47a9ad57 100644
--- a/op-chain-ops/solc/types.go
+++ b/op-chain-ops/solc/types.go
@@ -1,7 +1,6 @@
 package solc
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/ethereum/go-ethereum/accounts/abi"
@@ -129,5 +128,158 @@ type Ast struct {
 	Id              uint              `json:"id"`
 	License         string            `json:"license"`
 	NodeType        string            `json:"nodeType"`
-	Nodes           json.RawMessage   `json:"nodes"`
+	Nodes           []AstNode         `json:"nodes"`
+	Src             string            `json:"src"`
+}
+
+type AstNode struct {
+	Id                      int               `json:"id"`
+	NodeType                string            `json:"nodeType"`
+	Src                     string            `json:"src"`
+	Nodes                   []AstNode         `json:"nodes,omitempty"`
+	Abstract                bool              `json:"abstract,omitempty"`
+	BaseContracts           []AstBaseContract `json:"baseContracts,omitempty"`
+	CanonicalName           string            `json:"canonicalName,omitempty"`
+	ContractDependencies    []int             `json:"contractDependencies,omitempty"`
+	ContractKind            string            `json:"contractKind,omitempty"`
+	Documentation           interface{}       `json:"documentation,omitempty"`
+	FullyImplemented        bool              `json:"fullyImplemented,omitempty"`
+	LinearizedBaseContracts []int             `json:"linearizedBaseContracts,omitempty"`
+	Name                    string            `json:"name,omitempty"`
+	NameLocation            string            `json:"nameLocation,omitempty"`
+	Scope                   int               `json:"scope,omitempty"`
+	UsedErrors              []int             `json:"usedErrors,omitempty"`
+	UsedEvents              []int             `json:"usedEvents,omitempty"`
+
+	// Function specific
+	Body             *AstBlock         `json:"body,omitempty"`
+	Parameters       *AstParameterList `json:"parameters,omitempty"`
+	ReturnParameters *AstParameterList `json:"returnParameters,omitempty"`
+	StateMutability  string            `json:"stateMutability,omitempty"`
+	Virtual          bool              `json:"virtual,omitempty"`
+	Visibility       string            `json:"visibility,omitempty"`
+
+	// Variable specific
+	Constant         bool                 `json:"constant,omitempty"`
+	Mutability       string               `json:"mutability,omitempty"`
+	StateVariable    bool                 `json:"stateVariable,omitempty"`
+	StorageLocation  string               `json:"storageLocation,omitempty"`
+	TypeDescriptions *AstTypeDescriptions `json:"typeDescriptions,omitempty"`
+	TypeName         *AstTypeName         `json:"typeName,omitempty"`
+
+	// Expression specific
+	Expression      *Expression `json:"expression,omitempty"`
+	IsConstant      bool        `json:"isConstant,omitempty"`
+	IsLValue        bool        `json:"isLValue,omitempty"`
+	IsPure          bool        `json:"isPure,omitempty"`
+	LValueRequested bool        `json:"lValueRequested,omitempty"`
+
+	// Literal specific
+	HexValue string      `json:"hexValue,omitempty"`
+	Kind     string      `json:"kind,omitempty"`
+	Value    interface{} `json:"value,omitempty"`
+
+	// Other fields
+	Arguments []Expression `json:"arguments,omitempty"`
+	Condition *Expression  `json:"condition,omitempty"`
+	TrueBody  *AstBlock    `json:"trueBody,omitempty"`
+	FalseBody *AstBlock    `json:"falseBody,omitempty"`
+	Operator  string       `json:"operator,omitempty"`
+}
+
+type AstBaseContract struct {
+	BaseName *AstTypeName `json:"baseName"`
+	Id       int          `json:"id"`
+	NodeType string       `json:"nodeType"`
+	Src      string       `json:"src"`
+}
+
+type AstDocumentation struct {
+	Id       int    `json:"id"`
+	NodeType string `json:"nodeType"`
+	Src      string `json:"src"`
+	Text     string `json:"text"`
+}
+
+type AstBlock struct {
+	Id         int       `json:"id"`
+	NodeType   string    `json:"nodeType"`
+	Src        string    `json:"src"`
+	Statements []AstNode `json:"statements"`
+}
+
+type AstParameterList struct {
+	Id         int       `json:"id"`
+	NodeType   string    `json:"nodeType"`
+	Parameters []AstNode `json:"parameters"`
+	Src        string    `json:"src"`
+}
+
+type AstTypeDescriptions struct {
+	TypeIdentifier string `json:"typeIdentifier"`
+	TypeString     string `json:"typeString"`
+}
+
+type AstTypeName struct {
+	Id               int                  `json:"id"`
+	Name             string               `json:"name"`
+	NodeType         string               `json:"nodeType"`
+	Src              string               `json:"src"`
+	StateMutability  string               `json:"stateMutability,omitempty"`
+	TypeDescriptions *AstTypeDescriptions `json:"typeDescriptions,omitempty"`
+}
+
+type Expression struct {
+	Id                     int                   `json:"id"`
+	NodeType               string                `json:"nodeType"`
+	Src                    string                `json:"src"`
+	TypeDescriptions       *AstTypeDescriptions  `json:"typeDescriptions,omitempty"`
+	Name                   string                `json:"name,omitempty"`
+	OverloadedDeclarations []int                 `json:"overloadedDeclarations,omitempty"`
+	ReferencedDeclaration  int                   `json:"referencedDeclaration,omitempty"`
+	ArgumentTypes          []AstTypeDescriptions `json:"argumentTypes,omitempty"`
+}
+
+type ForgeArtifact struct {
+	Abi               abi.ABI                `json:"abi"`
+	Bytecode          CompilerOutputBytecode `json:"bytecode"`
+	DeployedBytecode  CompilerOutputBytecode `json:"deployedBytecode"`
+	MethodIdentifiers map[string]string      `json:"methodIdentifiers"`
+	RawMetadata       string                 `json:"rawMetadata"`
+	Metadata          ForgeCompilerMetadata  `json:"metadata"`
+	StorageLayout     *StorageLayout         `json:"storageLayout,omitempty"`
+	Ast               Ast                    `json:"ast"`
+	Id                int                    `json:"id"`
+}
+
+type ForgeCompilerMetadata struct {
+	Compiler ForgeCompilerInfo          `json:"compiler"`
+	Language string                     `json:"language"`
+	Output   ForgeMetadataOutput        `json:"output"`
+	Settings CompilerSettings           `json:"settings"`
+	Sources  map[string]ForgeSourceInfo `json:"sources"`
+	Version  int                        `json:"version"`
+}
+
+type ForgeCompilerInfo struct {
+	Version string `json:"version"`
+}
+
+type ForgeMetadataOutput struct {
+	Abi     abi.ABI        `json:"abi"`
+	DevDoc  ForgeDocObject `json:"devdoc"`
+	UserDoc ForgeDocObject `json:"userdoc"`
+}
+
+type ForgeSourceInfo struct {
+	Keccak256 string   `json:"keccak256"`
+	License   string   `json:"license"`
+	Urls      []string `json:"urls"`
+}
+
+type ForgeDocObject struct {
+	Kind    string                 `json:"kind"`
+	Methods map[string]interface{} `json:"methods"`
+	Notice  string                 `json:"notice,omitempty"`
+	Version int                    `json:"version"`
 }
diff --git a/packages/contracts-bedrock/scripts/checks/common/util.go b/packages/contracts-bedrock/scripts/checks/common/util.go
new file mode 100644
index 000000000000..131dff3b8987
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/checks/common/util.go
@@ -0,0 +1,124 @@
+package common
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+	"sync"
+	"sync/atomic"
+
+	"github.com/bmatcuk/doublestar/v4"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
+	"golang.org/x/sync/errgroup"
+)
+
+type ErrorReporter struct {
+	hasErr atomic.Bool
+	outMtx sync.Mutex
+}
+
+func NewErrorReporter() *ErrorReporter {
+	return &ErrorReporter{}
+}
+
+func (e *ErrorReporter) Fail(msg string, args ...any) {
+	e.outMtx.Lock()
+	// Useful for suppressing error reporting in tests
+	if os.Getenv("SUPPRESS_ERROR_REPORTER") == "" {
+		_, _ = fmt.Fprintf(os.Stderr, "❌  "+msg+"\n", args...)
+	}
+	e.outMtx.Unlock()
+	e.hasErr.Store(true)
+}
+
+func (e *ErrorReporter) HasError() bool {
+	return e.hasErr.Load()
+}
+
+type FileProcessor func(path string) []error
+
+func ProcessFiles(files map[string]string, processor FileProcessor) error {
+	g := errgroup.Group{}
+	g.SetLimit(runtime.NumCPU())
+
+	reporter := NewErrorReporter()
+	for name, path := range files {
+		name, path := name, path // Capture loop variables
+		g.Go(func() error {
+			if errs := processor(path); len(errs) > 0 {
+				for _, err := range errs {
+					reporter.Fail("%s: %v", name, err)
+				}
+			}
+			return nil
+		})
+	}
+
+	err := g.Wait()
+	if err != nil {
+		return fmt.Errorf("processing failed: %w", err)
+	}
+	if reporter.HasError() {
+		return fmt.Errorf("processing failed")
+	}
+	return nil
+}
+
+func ProcessFilesGlob(includes, excludes []string, processor FileProcessor) error {
+	files, err := FindFiles(includes, excludes)
+	if err != nil {
+		return err
+	}
+	return ProcessFiles(files, processor)
+}
+
+func FindFiles(includes, excludes []string) (map[string]string, error) {
+	included := make(map[string]string)
+	excluded := make(map[string]struct{})
+
+	// Get all included files
+	for _, pattern := range includes {
+		matches, err := doublestar.Glob(os.DirFS("."), pattern)
+		if err != nil {
+			return nil, fmt.Errorf("glob pattern error: %w", err)
+		}
+		for _, match := range matches {
+			name := filepath.Base(match)
+			included[name] = match
+		}
+	}
+
+	// Get all excluded files
+	for _, pattern := range excludes {
+		matches, err := doublestar.Glob(os.DirFS("."), pattern)
+		if err != nil {
+			return nil, fmt.Errorf("glob pattern error: %w", err)
+		}
+		for _, match := range matches {
+			excluded[filepath.Base(match)] = struct{}{}
+		}
+	}
+
+	// Remove excluded files from result
+	for name := range excluded {
+		delete(included, name)
+	}
+
+	return included, nil
+}
+
+func ReadForgeArtifact(path string) (*solc.ForgeArtifact, error) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read artifact: %w", err)
+	}
+
+	var artifact solc.ForgeArtifact
+	if err := json.Unmarshal(data, &artifact); err != nil {
+		return nil, fmt.Errorf("failed to parse artifact: %w", err)
+	}
+
+	return &artifact, nil
+}
diff --git a/packages/contracts-bedrock/scripts/checks/common/util_test.go b/packages/contracts-bedrock/scripts/checks/common/util_test.go
new file mode 100644
index 000000000000..4defc1c70454
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/checks/common/util_test.go
@@ -0,0 +1,180 @@
+package common
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestErrorReporter(t *testing.T) {
+	os.Setenv("SUPPRESS_ERROR_REPORTER", "1")
+	defer os.Unsetenv("SUPPRESS_ERROR_REPORTER")
+
+	reporter := NewErrorReporter()
+
+	if reporter.HasError() {
+		t.Error("new reporter should not have errors")
+	}
+
+	reporter.Fail("test error")
+
+	if !reporter.HasError() {
+		t.Error("reporter should have error after Fail")
+	}
+}
+
+func TestProcessFiles(t *testing.T) {
+	os.Setenv("SUPPRESS_ERROR_REPORTER", "1")
+	defer os.Unsetenv("SUPPRESS_ERROR_REPORTER")
+
+	files := map[string]string{
+		"file1": "path1",
+		"file2": "path2",
+	}
+
+	// Test successful processing
+	err := ProcessFiles(files, func(path string) []error {
+		return nil
+	})
+	if err != nil {
+		t.Errorf("expected no error, got %v", err)
+	}
+
+	// Test error handling
+	err = ProcessFiles(files, func(path string) []error {
+		var errors []error
+		errors = append(errors, os.ErrNotExist)
+		return errors
+	})
+	if err == nil {
+		t.Error("expected error, got nil")
+	}
+}
+
+func TestProcessFilesGlob(t *testing.T) {
+	os.Setenv("SUPPRESS_ERROR_REPORTER", "1")
+	defer os.Unsetenv("SUPPRESS_ERROR_REPORTER")
+
+	// Create test directory structure
+	tmpDir := t.TempDir()
+	if err := os.Chdir(tmpDir); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create test files
+	files := map[string]string{
+		"test1.txt": "content1",
+		"test2.txt": "content2",
+		"skip.txt":  "content3",
+	}
+
+	for name, content := range files {
+		if err := os.WriteFile(name, []byte(content), 0644); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	// Test processing with includes and excludes
+	includes := []string{"*.txt"}
+	excludes := []string{"skip.txt"}
+
+	processedFiles := make(map[string]bool)
+	err := ProcessFilesGlob(includes, excludes, func(path string) []error {
+		processedFiles[filepath.Base(path)] = true
+		return nil
+	})
+
+	if err != nil {
+		t.Errorf("ProcessFiles failed: %v", err)
+	}
+
+	// Verify results
+	if len(processedFiles) != 2 {
+		t.Errorf("expected 2 processed files, got %d", len(processedFiles))
+	}
+	if !processedFiles["test1.txt"] {
+		t.Error("expected to process test1.txt")
+	}
+	if !processedFiles["test2.txt"] {
+		t.Error("expected to process test2.txt")
+	}
+	if processedFiles["skip.txt"] {
+		t.Error("skip.txt should have been excluded")
+	}
+}
+
+func TestFindFiles(t *testing.T) {
+	// Create test directory structure
+	tmpDir := t.TempDir()
+	if err := os.Chdir(tmpDir); err != nil {
+		t.Fatal(err)
+	}
+
+	// Create test files
+	files := map[string]string{
+		"test1.txt": "content1",
+		"test2.txt": "content2",
+		"skip.txt":  "content3",
+	}
+
+	for name, content := range files {
+		if err := os.WriteFile(name, []byte(content), 0644); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	// Test finding files
+	includes := []string{"*.txt"}
+	excludes := []string{"skip.txt"}
+
+	found, err := FindFiles(includes, excludes)
+	if err != nil {
+		t.Fatalf("FindFiles failed: %v", err)
+	}
+
+	// Verify results
+	if len(found) != 2 {
+		t.Errorf("expected 2 files, got %d", len(found))
+	}
+	if _, exists := found["test1.txt"]; !exists {
+		t.Error("expected to find test1.txt")
+	}
+	if _, exists := found["test2.txt"]; !exists {
+		t.Error("expected to find test2.txt")
+	}
+	if _, exists := found["skip.txt"]; exists {
+		t.Error("skip.txt should have been excluded")
+	}
+}
+
+func TestReadForgeArtifact(t *testing.T) {
+	// Create a temporary test artifact
+	tmpDir := t.TempDir()
+	artifactContent := `{
+		"abi": [],
+		"bytecode": {
+			"object": "0x123"
+		},
+		"deployedBytecode": {
+			"object": "0x456"
+		}
+	}`
+	tmpFile := filepath.Join(tmpDir, "Test.json")
+	if err := os.WriteFile(tmpFile, []byte(artifactContent), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	// Test processing
+	artifact, err := ReadForgeArtifact(tmpFile)
+	if err != nil {
+		t.Fatalf("ReadForgeArtifact failed: %v", err)
+	}
+
+	// Verify results
+	if artifact.Bytecode.Object != "0x123" {
+		t.Errorf("expected bytecode '0x123', got %q", artifact.Bytecode.Object)
+	}
+	if artifact.DeployedBytecode.Object != "0x456" {
+		t.Errorf("expected deployed bytecode '0x456', got %q", artifact.DeployedBytecode.Object)
+	}
+}
diff --git a/packages/contracts-bedrock/scripts/checks/test-names/main.go b/packages/contracts-bedrock/scripts/checks/test-names/main.go
index 86550f211cba..84ead0d6fa0c 100644
--- a/packages/contracts-bedrock/scripts/checks/test-names/main.go
+++ b/packages/contracts-bedrock/scripts/checks/test-names/main.go
@@ -1,27 +1,87 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
-	"os/exec"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"unicode"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
+	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/scripts/checks/common"
 )
 
-type Check func(parts []string) bool
+func main() {
+	if err := common.ProcessFilesGlob(
+		[]string{"forge-artifacts/**/*.json"},
+		[]string{},
+		processFile,
+	); err != nil {
+		fmt.Printf("error: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func processFile(path string) []error {
+	artifact, err := common.ReadForgeArtifact(path)
+	if err != nil {
+		return []error{err}
+	}
+
+	var errors []error
+	names := extractTestNames(artifact)
+	for _, name := range names {
+		if err = checkTestName(name); err != nil {
+			errors = append(errors, err)
+		}
+	}
+
+	return errors
+}
+
+func extractTestNames(artifact *solc.ForgeArtifact) []string {
+	isTest := false
+	for _, entry := range artifact.Abi.Methods {
+		if entry.Name == "IS_TEST" {
+			isTest = true
+			break
+		}
+	}
+	if !isTest {
+		return nil
+	}
+
+	names := []string{}
+	for _, entry := range artifact.Abi.Methods {
+		if !strings.HasPrefix(entry.Name, "test") {
+			continue
+		}
+		names = append(names, entry.Name)
+	}
+
+	return names
+}
+
+type CheckFunc func(parts []string) bool
 
 type CheckInfo struct {
-	check Check
 	error string
+	check CheckFunc
 }
 
-var excludes = map[string]bool{}
-
-var checks = []CheckInfo{
-	{
+var checks = map[string]CheckInfo{
+	"doubleUnderscores": {
+		error: "test names cannot have double underscores",
+		check: func(parts []string) bool {
+			for _, part := range parts {
+				if len(strings.TrimSpace(part)) == 0 {
+					return false
+				}
+			}
+			return true
+		},
+	},
+	"camelCase": {
 		error: "test name parts should be in camelCase",
 		check: func(parts []string) bool {
 			for _, part := range parts {
@@ -32,21 +92,24 @@ var checks = []CheckInfo{
 			return true
 		},
 	},
-	{
+	"partsCount": {
 		error: "test names should have either 3 or 4 parts, each separated by underscores",
 		check: func(parts []string) bool {
 			return len(parts) == 3 || len(parts) == 4
 		},
 	},
-	{
-		error: "test names should begin with \"test\", \"testFuzz\", or \"testDiff\"",
+	"prefix": {
+		error: "test names should begin with 'test', 'testFuzz', or 'testDiff'",
 		check: func(parts []string) bool {
-			return parts[0] == "test" || parts[0] == "testFuzz" || parts[0] == "testDiff"
+			return len(parts) > 0 && (parts[0] == "test" || parts[0] == "testFuzz" || parts[0] == "testDiff")
 		},
 	},
-	{
-		error: "test names should end with either \"succeeds\", \"reverts\", \"fails\", \"works\" or \"benchmark[_num]\"",
+	"suffix": {
+		error: "test names should end with either 'succeeds', 'reverts', 'fails', 'works', or 'benchmark[_num]'",
 		check: func(parts []string) bool {
+			if len(parts) == 0 {
+				return false
+			}
 			last := parts[len(parts)-1]
 			if last == "succeeds" || last == "reverts" || last == "fails" || last == "works" {
 				return true
@@ -58,113 +121,24 @@ var checks = []CheckInfo{
 			return last == "benchmark"
 		},
 	},
-	{
+	"failureParts": {
 		error: "failure tests should have 4 parts, third part should indicate the reason for failure",
 		check: func(parts []string) bool {
+			if len(parts) == 0 {
+				return false
+			}
 			last := parts[len(parts)-1]
 			return len(parts) == 4 || (last != "reverts" && last != "fails")
 		},
 	},
 }
 
-func main() {
-	cmd := exec.Command("forge", "config", "--json")
-	output, err := cmd.Output()
-	if err != nil {
-		fmt.Printf("Error executing forge config: %v\n", err)
-		os.Exit(1)
-	}
-
-	var config map[string]interface{}
-	err = json.Unmarshal(output, &config)
-	if err != nil {
-		fmt.Printf("Error parsing forge config: %v\n", err)
-		os.Exit(1)
-	}
-
-	outDir, ok := config["out"].(string)
-	if !ok {
-		outDir = "out"
-	}
-
-	fmt.Println("Success:")
-	var errors []string
-
-	err = filepath.Walk(outDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if info.IsDir() {
-			return nil
-		}
-
-		if excludes[strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))] {
-			return nil
-		}
-
-		data, err := os.ReadFile(path)
-		if err != nil {
-			return err
-		}
-
-		var artifact map[string]interface{}
-		err = json.Unmarshal(data, &artifact)
-		if err != nil {
-			return nil // Skip files that are not valid JSON
-		}
-
-		abi, ok := artifact["abi"].([]interface{})
-		if !ok {
-			return nil
+func checkTestName(name string) error {
+	parts := strings.Split(name, "_")
+	for _, check := range checks {
+		if !check.check(parts) {
+			return fmt.Errorf("%s: %s", name, check.error)
 		}
-
-		isTest := false
-		for _, element := range abi {
-			if elem, ok := element.(map[string]interface{}); ok {
-				if elem["name"] == "IS_TEST" {
-					isTest = true
-					break
-				}
-			}
-		}
-
-		if isTest {
-			success := true
-			for _, element := range abi {
-				if elem, ok := element.(map[string]interface{}); ok {
-					if elem["type"] == "function" {
-						name, ok := elem["name"].(string)
-						if !ok || !strings.HasPrefix(name, "test") {
-							continue
-						}
-
-						parts := strings.Split(name, "_")
-						for _, check := range checks {
-							if !check.check(parts) {
-								errors = append(errors, fmt.Sprintf("%s#%s: %s", path, name, check.error))
-								success = false
-							}
-						}
-					}
-				}
-			}
-
-			if success {
-				fmt.Printf(" - %s\n", filepath.Base(path[:len(path)-len(filepath.Ext(path))]))
-			}
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		fmt.Printf("Error walking the path %q: %v\n", outDir, err)
-		os.Exit(1)
-	}
-
-	if len(errors) > 0 {
-		fmt.Println(strings.Join(errors, "\n"))
-		os.Exit(1)
 	}
+	return nil
 }
diff --git a/packages/contracts-bedrock/scripts/checks/test-names/main_test.go b/packages/contracts-bedrock/scripts/checks/test-names/main_test.go
new file mode 100644
index 000000000000..d4c554f12f1b
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/checks/test-names/main_test.go
@@ -0,0 +1,280 @@
+package main
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
+	"github.com/ethereum/go-ethereum/accounts/abi"
+)
+
+func TestCamelCaseCheck(t *testing.T) {
+	tests := []struct {
+		name     string
+		parts    []string
+		expected bool
+	}{
+		{"valid single part", []string{"test"}, true},
+		{"valid multiple parts", []string{"test", "something", "succeeds"}, true},
+		{"invalid uppercase", []string{"Test"}, false},
+		{"invalid middle uppercase", []string{"test", "Something", "succeeds"}, false},
+		{"empty parts", []string{}, true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := checks["camelCase"].check(tt.parts); got != tt.expected {
+				t.Errorf("checkCamelCase error for %v = %v, want %v", tt.parts, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestPartsCountCheck(t *testing.T) {
+	tests := []struct {
+		name     string
+		parts    []string
+		expected bool
+	}{
+		{"three parts", []string{"test", "something", "succeeds"}, true},
+		{"four parts", []string{"test", "something", "reason", "fails"}, true},
+		{"too few parts", []string{"test", "fails"}, false},
+		{"too many parts", []string{"test", "a", "b", "c", "fails"}, false},
+		{"empty parts", []string{}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := checks["partsCount"].check(tt.parts); got != tt.expected {
+				t.Errorf("checkPartsCount error for %v = %v, want %v", tt.parts, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestPrefixCheck(t *testing.T) {
+	tests := []struct {
+		name     string
+		parts    []string
+		expected bool
+	}{
+		{"valid test", []string{"test", "something", "succeeds"}, true},
+		{"valid testFuzz", []string{"testFuzz", "something", "succeeds"}, true},
+		{"valid testDiff", []string{"testDiff", "something", "succeeds"}, true},
+		{"invalid prefix", []string{"testing", "something", "succeeds"}, false},
+		{"empty parts", []string{}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := checks["prefix"].check(tt.parts); got != tt.expected {
+				t.Errorf("checkPrefix error for %v = %v, want %v", tt.parts, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestSuffixCheck(t *testing.T) {
+	tests := []struct {
+		name     string
+		parts    []string
+		expected bool
+	}{
+		{"valid succeeds", []string{"test", "something", "succeeds"}, true},
+		{"valid reverts", []string{"test", "something", "reverts"}, true},
+		{"valid fails", []string{"test", "something", "fails"}, true},
+		{"valid works", []string{"test", "something", "works"}, true},
+		{"valid benchmark", []string{"test", "something", "benchmark"}, true},
+		{"valid benchmark_num", []string{"test", "something", "benchmark", "123"}, true},
+		{"invalid suffix", []string{"test", "something", "invalid"}, false},
+		{"invalid benchmark_text", []string{"test", "something", "benchmark", "abc"}, false},
+		{"empty parts", []string{}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := checks["suffix"].check(tt.parts); got != tt.expected {
+				t.Errorf("checkSuffix error for %v = %v, want %v", tt.parts, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestFailurePartsCheck(t *testing.T) {
+	tests := []struct {
+		name     string
+		parts    []string
+		expected bool
+	}{
+		{"valid failure with reason", []string{"test", "something", "reason", "fails"}, true},
+		{"valid failure with reason", []string{"test", "something", "reason", "reverts"}, true},
+		{"invalid failure without reason", []string{"test", "something", "fails"}, false},
+		{"invalid failure without reason", []string{"test", "something", "reverts"}, false},
+		{"valid non-failure with three parts", []string{"test", "something", "succeeds"}, true},
+		{"empty parts", []string{}, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := checks["failureParts"].check(tt.parts); got != tt.expected {
+				t.Errorf("checkFailureParts error for %v = %v, want %v", tt.parts, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestCheckTestName(t *testing.T) {
+	tests := []struct {
+		name          string
+		testName      string
+		shouldSucceed bool
+	}{
+		// Valid test names - Basic patterns
+		{"valid basic test succeeds", "test_something_succeeds", true},
+		{"valid basic test fails with reason", "test_something_reason_fails", true},
+		{"valid basic test reverts with reason", "test_something_reason_reverts", true},
+		{"valid basic test works", "test_something_works", true},
+
+		// Valid test names - Fuzz variants
+		{"valid fuzz test succeeds", "testFuzz_something_succeeds", true},
+		{"valid fuzz test fails with reason", "testFuzz_something_reason_fails", true},
+		{"valid fuzz test reverts with reason", "testFuzz_something_reason_reverts", true},
+		{"valid fuzz test works", "testFuzz_something_works", true},
+
+		// Valid test names - Diff variants
+		{"valid diff test succeeds", "testDiff_something_succeeds", true},
+		{"valid diff test fails with reason", "testDiff_something_reason_fails", true},
+		{"valid diff test reverts with reason", "testDiff_something_reason_reverts", true},
+		{"valid diff test works", "testDiff_something_works", true},
+
+		// Valid test names - Benchmark variants
+		{"valid benchmark test", "test_something_benchmark", true},
+		{"valid benchmark with number", "test_something_benchmark_123", true},
+		{"valid benchmark with large number", "test_something_benchmark_999999", true},
+		{"valid benchmark with zero", "test_something_benchmark_0", true},
+
+		// Valid test names - Complex middle parts
+		{"valid complex middle part", "test_complexOperation_succeeds", true},
+		{"valid multiple word middle", "test_veryComplexOperation_succeeds", true},
+		{"valid numbers in middle", "test_operation123_succeeds", true},
+		{"valid special case", "test_specialCase_reason_fails", true},
+
+		// Invalid test names - Prefix issues
+		{"invalid empty string", "", false},
+		{"invalid prefix Test", "Test_something_succeeds", false},
+		{"invalid prefix testing", "testing_something_succeeds", false},
+		{"invalid prefix testfuzz", "testfuzz_something_succeeds", false},
+		{"invalid prefix testdiff", "testdiff_something_succeeds", false},
+		{"invalid prefix TEST", "TEST_something_succeeds", false},
+
+		// Invalid test names - Suffix issues
+		{"invalid suffix succeed", "test_something_succeed", false},
+		{"invalid suffix revert", "test_something_revert", false},
+		{"invalid suffix fail", "test_something_fail", false},
+		{"invalid suffix work", "test_something_work", false},
+		{"invalid suffix benchmarks", "test_something_benchmarks", false},
+		{"invalid benchmark suffix text", "test_something_benchmark_abc", false},
+		{"invalid benchmark suffix special", "test_something_benchmark_123abc", false},
+
+		// Invalid test names - Case issues
+		{"invalid uppercase middle", "test_Something_succeeds", false},
+		{"invalid multiple uppercase", "test_SomethingHere_succeeds", false},
+		{"invalid all caps middle", "test_SOMETHING_succeeds", false},
+		{"invalid mixed case suffix", "test_something_Succeeds", false},
+
+		// Invalid test names - Structure issues
+		{"invalid single part", "test", false},
+		{"invalid two parts", "test_succeeds", false},
+		{"invalid five parts", "test_this_that_those_succeeds", false},
+		{"invalid six parts", "test_this_that_those_these_succeeds", false},
+		{"invalid failure without reason", "test_something_fails", false},
+		{"invalid revert without reason", "test_something_reverts", false},
+
+		// Invalid test names - Special cases
+		{"invalid empty parts", "test__succeeds", false},
+		{"invalid multiple underscores", "test___succeeds", false},
+		{"invalid trailing underscore", "test_something_succeeds_", false},
+		{"invalid leading underscore", "_test_something_succeeds", false},
+		{"invalid benchmark no number", "test_something_benchmark_", false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := checkTestName(tt.testName)
+			if (err != nil) == tt.shouldSucceed {
+				t.Errorf("checkTestName(%q) error = %v, shouldSucceed %v", tt.testName, err, tt.shouldSucceed)
+			}
+		})
+	}
+}
+
+func TestExtractTestNames(t *testing.T) {
+	tests := []struct {
+		name     string
+		artifact *solc.ForgeArtifact
+		want     []string
+	}{
+		{
+			name: "valid test contract",
+			artifact: &solc.ForgeArtifact{
+				Abi: abi.ABI{
+					Methods: map[string]abi.Method{
+						"IS_TEST":                  {Name: "IS_TEST"},
+						"test_something_succeeds":  {Name: "test_something_succeeds"},
+						"test_other_fails":         {Name: "test_other_fails"},
+						"not_a_test":               {Name: "not_a_test"},
+						"testFuzz_something_works": {Name: "testFuzz_something_works"},
+					},
+				},
+			},
+			want: []string{
+				"test_something_succeeds",
+				"test_other_fails",
+				"testFuzz_something_works",
+			},
+		},
+		{
+			name: "non-test contract",
+			artifact: &solc.ForgeArtifact{
+				Abi: abi.ABI{
+					Methods: map[string]abi.Method{
+						"test_something_succeeds": {Name: "test_something_succeeds"},
+						"not_a_test":              {Name: "not_a_test"},
+					},
+				},
+			},
+			want: nil,
+		},
+		{
+			name: "empty contract",
+			artifact: &solc.ForgeArtifact{
+				Abi: abi.ABI{
+					Methods: map[string]abi.Method{},
+				},
+			},
+			want: nil,
+		},
+		{
+			name: "test contract with no test methods",
+			artifact: &solc.ForgeArtifact{
+				Abi: abi.ABI{
+					Methods: map[string]abi.Method{
+						"IS_TEST":        {Name: "IS_TEST"},
+						"not_a_test":     {Name: "not_a_test"},
+						"another_method": {Name: "another_method"},
+					},
+				},
+			},
+			want: []string{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := extractTestNames(tt.artifact)
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("extractTestNames() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

From 3f43f039a9e68b777045d7e2446947acbd9b0592 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Mon, 2 Dec 2024 15:24:09 -0500
Subject: [PATCH 329/451] feat: introduce mise (#13156)

Introduces mise for polyglot tool dependency management.
---
 CONTRIBUTING.md                               |  73 ++++-----
 justfile                                      |  88 ----------
 mise.toml                                     |  52 ++++++
 ops/docker/ci-builder/Dockerfile              | 152 ++++++------------
 ops/docker/ci-builder/Dockerfile.dockerignore |   3 +-
 ops/scripts/check-foundry.sh                  |  42 -----
 ops/scripts/geth-version-checker.sh           |  28 ----
 ops/scripts/install-foundry.sh                |  63 --------
 ops/scripts/install-kontrol.sh                |  17 --
 packages/contracts-bedrock/README.md          |   2 +-
 packages/contracts-bedrock/justfile           |  14 +-
 .../contracts-bedrock/meta/CONTRIBUTING.md    | 106 ------------
 .../contracts-bedrock/test/kontrol/README.md  |   7 +-
 13 files changed, 135 insertions(+), 512 deletions(-)
 create mode 100644 mise.toml
 delete mode 100755 ops/scripts/check-foundry.sh
 delete mode 100755 ops/scripts/geth-version-checker.sh
 delete mode 100755 ops/scripts/install-foundry.sh
 delete mode 100755 ops/scripts/install-kontrol.sh
 delete mode 100644 packages/contracts-bedrock/meta/CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c4e5686db99e..2fcb5480c1ae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,63 +20,54 @@ Interactions within this repository are subject to a [Code of Conduct](https://g
 
 ## Development Quick Start
 
-### Software Dependencies
-
-| Dependency                                                    | Version  | Version Check Command    |
-| ------------------------------------------------------------- | -------- | ------------------------ |
-| [git](https://git-scm.com/)                                   | `^2`     | `git --version`          |
-| [go](https://go.dev/)                                         | `^1.21`  | `go version`             |
-| [node](https://nodejs.org/en/)                                | `^20`    | `node --version`         |
-| [nvm](https://github.com/nvm-sh/nvm)                          | `^0.39`  | `nvm --version`          |
-| [just](https://github.com/casey/just)                         | `^1.34.0`| `just --version`         |
-| [foundry](https://github.com/foundry-rs/foundry#installation) | `^0.2.0` | `forge --version`        |
-| [make](https://linux.die.net/man/1/make)                      | `^3`     | `make --version`         |
-| [jq](https://github.com/jqlang/jq)                            | `^1.6`   | `jq --version`           |
-| [direnv](https://direnv.net)                                  | `^2`     | `direnv --version`       |
-| [docker](https://docs.docker.com/get-docker/)                 | `^24`    | `docker --version`       |
-| [docker compose](https://docs.docker.com/compose/install/)    | `^2.23`  | `docker compose version` |
+### Setting Up
 
-### Notes on Specific Dependencies
+Clone the repository and open it:
 
-#### `node`
+```bash
+git clone git@github.com:ethereum-optimism/optimism.git
+cd optimism
+```
 
-Make sure to use the version of `node` specified within [`.nvmrc`](./.nvmrc).
-You can use [`nvm`](https://github.com/nvm-sh/nvm) to manage multiple versions of Node.js on your machine and automatically switch to the correct version when you enter this repository.
+### Software Dependencies
 
-#### `foundry`
+You will need to install a number of software dependencies to effectively contribute to the
+Optimism Monorepo. We use [`mise`](https://mise.jdx.dev/) as a dependency manager for these tools.
+Once properly installed, `mise` will provide the correct versions for each tool. `mise` does not
+replace any other installations of these binaries and will only serve these binaries when you are
+working inside of the `optimism` directory.
 
-`foundry` is updated frequently and occasionally contains breaking changes.
-This repository pins a specific version of `foundry` inside of [`versions.json`](./versions.json).
-Use the command `just update-foundry` at the root of the monorepo to make sure that your version of `foundry` is the same as the one currently being used in CI.
+#### Install `mise`
 
-#### `direnv`
+Install `mise` by following the instructions provided on the
+[Getting Started page](https://mise.jdx.dev/getting-started.html#_1-install-mise-cli).
 
-[`direnv`](https://direnv.net) is a tool used to load environment variables from [`.envrc`](./.envrc) into your shell so you don't have to manually export variables every time you want to use them.
-`direnv` only has access to files that you explicitly allow it to see.
-After [installing `direnv`](https://direnv.net/docs/installation.html), you will need to **make sure that [`direnv` is hooked into your shell](https://direnv.net/docs/hook.html)**.
-Make sure you've followed [the guide on the `direnv` website](https://direnv.net/docs/hook.html), then **close your terminal and reopen it** so that the changes take effect (or `source` your config file if you know how to do that).
+#### Trust the `mise.toml` file
 
-#### `docker compose`
+`mise` requires that you explicitly trust the `mise.toml` file which lists the dependencies that
+this repository uses. After you've installed `mise` you'll be able to trust the file via:
 
-[Docker Desktop](https://docs.docker.com/get-docker/) should come with `docker compose` installed by default.
-You'll have to install the `compose` plugin if you're not using Docker Desktop or you're on linux.
+```bash
+mise trust mise.toml
+```
 
-### Setting Up
+#### Install dependencies
 
-Clone the repository and open it:
+Use `mise` to install the correct versions for all of the required tools:
 
 ```bash
-git clone git@github.com:ethereum-optimism/optimism.git
-cd optimism
+mise install
 ```
 
-### Building the Monorepo
+#### Installing updates
 
-Make sure that you've installed all of the required [Software Dependencies](#software-dependencies) before you continue.
-You will need [foundry](https://github.com/foundry-rs/foundry) to build the smart contracts found within this repository.
-Refer to the note on [foundry as a dependency](#foundry) for instructions.
+`mise` will notify you if any dependencies are outdated. Simply run `mise install` again to install
+the latest versions of the dependencies if you receive these notifications.
+
+### Building the Monorepo
 
-Install dependencies and build all packages within the monorepo by running:
+You must install all of the required [Software Dependencies](#software-dependencies) to build the
+Optimism Monorepo. Once you've done so, run the following command to build:
 
 ```bash
 make build
@@ -88,7 +79,7 @@ Use the above command to rebuild the monorepo.
 
 ### Running tests
 
-Before running tests: **follow the above instructions to get everything built.**
+Before running tests: **follow the above instructions to get everything built**.
 
 #### Running unit tests (solidity)
 
diff --git a/justfile b/justfile
index acf6d8bc6021..35900f2a50bf 100644
--- a/justfile
+++ b/justfile
@@ -13,91 +13,3 @@ semgrep-test:
 # Runs shellcheck.
 shellcheck:
   find . -type f -name '*.sh' -not -path '*/node_modules/*' -not -path './packages/contracts-bedrock/lib/*' -not -path './packages/contracts-bedrock/kout*/*' -exec sh -c 'echo "Checking $1"; shellcheck "$1"' _ {} \;
-
-########################################################
-#                 DEPENDENCY MANAGEMENT                #
-########################################################
-
-# Generic task for checking if a tool version is up to date.
-check-tool-version tool:
-  #!/usr/bin/env bash
-  EXPECTED=$(jq -r .{{tool}} < versions.json)
-  ACTUAL=$(just print-{{tool}})
-  if [ "$ACTUAL" = "$EXPECTED" ]; then
-    echo "✓ {{tool}} versions match"
-  else
-    echo "✗ {{tool}} version mismatch (expected $EXPECTED, got $ACTUAL), run 'just install-{{tool}}' to upgrade"
-    exit 1
-  fi
-
-# Installs foundry
-install-foundry:
-  bash ./ops/scripts/install-foundry.sh
-
-# Prints current foundry version.
-print-foundry:
-  forge --version
-
-# Checks if installed foundry version is correct.
-check-foundry:
-  bash ./ops/scripts/check-foundry.sh
-
-# Installs correct kontrol version.
-install-kontrol:
-  bash ./ops/scripts/install-kontrol.sh
-
-# Prints current kontrol version.
-print-kontrol:
-  kontrol version
-
-# Checks if installed kontrol version is correct.
-check-kontrol:
-  just check-tool-version kontrol
-
-# Installs correct abigen version.
-install-abigen:
-  go install github.com/ethereum/go-ethereum/cmd/abigen@$(jq -r .abigen < versions.json)
-
-# Prints current abigen version.
-print-abigen:
-  abigen --version | sed -e 's/[^0-9]/ /g' -e 's/^ *//g' -e 's/ *$//g' -e 's/ /./g' -e 's/^/v/'
-
-# Checks if installed abigen version is correct.
-check-abigen:
-  just check-tool-version abigen
-
-# Installs correct slither version.
-install-slither:
-  pip3 install slither-analyzer==$(jq -r .slither < versions.json)
-
-# Prints current slither version.
-print-slither:
-  slither --version
-
-# Checks if installed slither version is correct.
-check-slither:
-  just check-tool-version slither
-
-# Installs correct semgrep version.
-install-semgrep:
-  pip3 install semgrep=="$(jq -r .semgrep < versions.json)"
-
-# Prints current semgrep version.
-print-semgrep:
-  semgrep --version | head -n 1
-
-# Checks if installed semgrep version is correct.
-check-semgrep:
-  just check-tool-version semgrep
-
-# Installs correct go version.
-install-go:
-  echo "error: go must be installed manually" && exit 1
-
-# Prints current go version.
-print-go:
-  go version | sed -E 's/.*go([0-9]+\.[0-9]+\.[0-9]+).*/\1/'
-
-# Checks if installed go version is correct.
-check-go:
-  just check-tool-version go
diff --git a/mise.toml b/mise.toml
new file mode 100644
index 000000000000..a2cf15470a57
--- /dev/null
+++ b/mise.toml
@@ -0,0 +1,52 @@
+[tools]
+
+# Core dependencies
+go = "1.22.7"
+rust = "1.83.0"
+python = "3.12.0"
+uv = "0.5.5"
+jq = "1.7.1"
+shellcheck = "0.10.0"
+direnv = "2.35.0"
+
+# Cargo dependencies
+"cargo:just" = "1.37.0"
+"cargo:svm-rs" = "0.5.8"
+
+# Go dependencies
+"go:github.com/ethereum/go-ethereum/cmd/abigen" = "1.10.25"
+"go:github.com/ethereum/go-ethereum/cmd/geth" = "1.14.7"
+"go:github.com/protolambda/eth2-testnet-genesis" = "0.10.0"
+"go:gotest.tools/gotestsum" = "1.12.0"
+"go:github.com/vektra/mockery/v2" = "2.46.0"
+"go:github.com/golangci/golangci-lint/cmd/golangci-lint" = "1.61.0"
+"go:github.com/mikefarah/yq/v4" = "4.44.3"
+
+# Python dependencies
+"pipx:slither-analyzer" = "0.10.2"
+"pipx:semgrep" = "1.90.0"
+
+# Foundry dependencies
+# Foundry is a special case because it supplies multiple binaries at the same
+# GitHub release, so we need to use the aliasing trick to get mise to not error
+forge = "nightly-143abd6a768eeb52a5785240b763d72a56987b4a"
+cast = "nightly-143abd6a768eeb52a5785240b763d72a56987b4a"
+anvil = "nightly-143abd6a768eeb52a5785240b763d72a56987b4a"
+
+# Fake dependencies
+# Put things here if you need to track versions of tools or projects that can't
+# actually be managed by mise (yet). Make sure that anything you put in here is
+# also found inside of disabled_tools or mise will try to install it.
+asterisc = "1.1.1"
+kontrol = "1.0.53"
+binary_signer = "1.0.4"
+
+[alias]
+forge = "ubi:foundry-rs/foundry[exe=forge]"
+cast = "ubi:foundry-rs/foundry[exe=cast]"
+anvil = "ubi:foundry-rs/foundry[exe=anvil]"
+
+[settings]
+experimental = true
+pipx.uvx = true
+disable_tools = ["asterisc", "kontrol", "binary_signer"]
diff --git a/ops/docker/ci-builder/Dockerfile b/ops/docker/ci-builder/Dockerfile
index a1eb71b4795e..cda9a0e71a9a 100644
--- a/ops/docker/ci-builder/Dockerfile
+++ b/ops/docker/ci-builder/Dockerfile
@@ -1,120 +1,64 @@
-# Copy docker buildx in order to generate the absolute prestate
-# in the CI pipeline for reproducible fault proof builds
-FROM --platform=linux/amd64 docker as buildx
+###############################################################################
+#                                   BUILDX                                    #
+###############################################################################
+
+FROM --platform=linux/amd64 docker AS buildx
 COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 RUN docker buildx version
 
-FROM --platform=linux/amd64 debian:bullseye-slim as rust-build
-
-SHELL ["/bin/bash", "-c"]
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && \
-  apt-get install -y build-essential git clang lld curl jq
-
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \
-  chmod +x ./rustup.sh && \
-  sh rustup.sh -y
-
-# Install nightly toolchain
-RUN source $HOME/.profile && rustup update nightly
-
-RUN source $HOME/.profile && cargo install just
-RUN source $HOME/.profile && cargo install svm-rs
 
-# Only diff from upstream docker image is this clone instead
-# of COPY. We select a specific commit to use.
-COPY ./versions.json ./versions.json
-COPY ./ops/scripts/install-foundry.sh ./install-foundry.sh
+###############################################################################
+#                              CI BUILDER (BASE)                              #
+###############################################################################
 
-RUN curl -L https://foundry.paradigm.xyz | bash
-RUN source $HOME/.profile && ./install-foundry.sh
+FROM --platform=linux/amd64 debian:bullseye-slim AS base-builder
 
-RUN strip /root/.foundry/bin/forge && \
-  strip /root/.foundry/bin/cast && \
-  strip /root/.foundry/bin/anvil && \
-  strip /root/.cargo/bin/svm && \
-  strip /root/.cargo/bin/just
-
-FROM --platform=linux/amd64 debian:bullseye-slim as go-build
-
-RUN apt-get update && apt-get install -y curl ca-certificates jq binutils
-
-ENV GO_VERSION=1.22.7
-
-# Fetch go manually, rather than using a Go base image, so we can copy the installation into the final stage
-RUN curl -sL https://go.dev/dl/go$GO_VERSION.linux-amd64.tar.gz -o go$GO_VERSION.linux-amd64.tar.gz && \
-  tar -C /usr/local/ -xzvf go$GO_VERSION.linux-amd64.tar.gz
-
-ENV GOPATH=/go
-ENV PATH=/usr/local/go/bin:$GOPATH/bin:$PATH
-
-# Install the specific version of abigen and geth from version control
-COPY ./versions.json ./versions.json
-RUN go install github.com/ethereum/go-ethereum/cmd/abigen@$(jq -r .abigen < versions.json)
-RUN go install github.com/ethereum/go-ethereum/cmd/geth@$(jq -r .geth < versions.json)
-
-RUN go install gotest.tools/gotestsum@v1.12.0
-RUN go install github.com/vektra/mockery/v2@v2.46.0
-RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
-RUN go install github.com/mikefarah/yq/v4@v4.44.3
+# Use bash as the shell
+SHELL ["/bin/bash", "-c"]
+ENV SHELL=/bin/bash
+ENV BASH=/bin/bash
 
-# Strip binaries to reduce size
-RUN strip /go/bin/gotestsum && \
-  strip /go/bin/mockery && \
-  strip /go/bin/golangci-lint && \
-  strip /go/bin/abigen && \
-  strip /go/bin/geth && \
-  strip /go/bin/yq
+# Copy mise configuration
+COPY ./mise.toml ./mise.toml
 
-FROM --platform=linux/amd64 debian:bullseye-slim as base-builder
+# Set up mise environment
+ENV PATH="/root/.local/share/mise/shims:$PATH"
+ENV PATH="/root/.local/bin:${PATH}"
 
-ENV GOPATH=/go
-ENV PATH=/usr/local/go/bin:$GOPATH/bin:$PATH
-ENV PATH=/root/.cargo/bin:$PATH
+# Install dependencies
+# We do this in one mega RUN command to avoid blowing up the size of the image
 ENV DEBIAN_FRONTEND=noninteractive
-
-# copy the go installation, but not the module cache (cache will get stale, and would add a lot of weight)
-COPY --from=go-build /usr/local/go /usr/local/go
-
-# copy tools
-COPY --from=go-build /go/bin/gotestsum /go/bin/gotestsum
-COPY --from=go-build /go/bin/mockery /go/bin/mockery
-COPY --from=go-build /go/bin/golangci-lint /go/bin/golangci-lint
-COPY --from=go-build /go/bin/abigen /usr/local/bin/abigen
-COPY --from=go-build /go/bin/geth /usr/local/bin/geth
-COPY --from=go-build /go/bin/yq /go/bin/yq
-
-# copy tools
-COPY --from=rust-build /root/.foundry/bin/forge /usr/local/bin/forge
-COPY --from=rust-build /root/.foundry/bin/cast /usr/local/bin/cast
-COPY --from=rust-build /root/.foundry/bin/anvil /usr/local/bin/anvil
-COPY --from=rust-build /root/.cargo/bin/svm /usr/local/bin/svm
-COPY --from=rust-build /root/.cargo/bin/just /usr/local/bin/just
-
-COPY ./versions.json ./versions.json
-
 RUN /bin/sh -c set -eux; \
   apt-get update; \
-  apt-get install -y --no-install-recommends bash curl openssh-client git build-essential ca-certificates jq gnupg binutils-mips-linux-gnu python3 python3-pip python3-setuptools; \
+  apt-get install -y --no-install-recommends bash curl openssh-client git build-essential ca-certificates gnupg binutils-mips-linux-gnu clang libffi-dev; \
   mkdir -p /etc/apt/keyrings; \
   curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg; \
   chmod a+r /etc/apt/keyrings/docker.gpg; \
   echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null; \
   apt-get update; \
   apt-get install -y docker-ce-cli; \
-  ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt; \
-  pip install capstone pyelftools; \
-  pip install semgrep==$(jq -r .semgrep < versions.json); \
+  curl https://mise.run | sh; \
+  mise trust ./mise.toml; \
+  mise install; \
   curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh | bash; \
+  pip install capstone pyelftools; \
+  go env -w GOMODCACHE=/go/pkg/mod; \
+  go env -w GOCACHE=/root/.cache/go-build; \
+  ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt; \
   apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+  go clean -cache -modcache -testcache; \
   rm -rf /var/lib/apt/lists/*; \
-  rm -rf /root/.cache/pip;
+  rm -rf /root/.cache/pip; \
+  rm -rf /root/.cache/uv; \
+  rm -rf /root/.rustup;
 
-RUN svm install 0.8.25 && \
-  svm install 0.8.15 && \
-  svm install 0.8.19
+# Install Solidity versions
+RUN echo "installing Solidity versions" && \
+  svm install 0.8.25 && \
+  svm install 0.8.19 && \
+  svm install 0.8.15
 
+# Install Codecov uploader
 RUN echo "downloading and verifying Codecov uploader" && \
   curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import && \
   curl -Os "https://uploader.codecov.io/latest/linux/codecov" && \
@@ -129,24 +73,18 @@ RUN echo "downloading and verifying Codecov uploader" && \
 # Copy docker buildx
 COPY --from=buildx /usr/libexec/docker/cli-plugins/docker-buildx /usr/libexec/docker/cli-plugins/docker-buildx
 
-# within docker use bash
-SHELL ["/bin/bash", "-c"]
+# Set up entrypoint
+ENTRYPOINT ["/bin/bash", "-c"]
 
-# set env to use bash
-ENV SHELL=/bin/bash
-ENV BASH=/bin/bash
 
-ENTRYPOINT ["/bin/bash", "-c"]
+###############################################################################
+#                              CI BUILDER (RUST)                              #
+###############################################################################
 
 FROM base-builder as rust-builder
 
 # Install clang & lld
 RUN apt-get update && apt-get install -y clang lld
 
-# Copy the rust installation, alongside the installed toolchains
-COPY --from=rust-build /root/.cargo /root/.cargo
-COPY --from=rust-build /root/.rustup /root/.rustup
-
-# copy the rust installation, alongside the installed toolchains
-COPY --from=rust-build /root/.cargo/bin /root/.cargo/bin
-COPY --from=rust-build /root/.rustup /root/.rustup
+# Install nightly toolchain
+RUN rustup update nightly
diff --git a/ops/docker/ci-builder/Dockerfile.dockerignore b/ops/docker/ci-builder/Dockerfile.dockerignore
index 229d6f1165c2..4f44e253194c 100644
--- a/ops/docker/ci-builder/Dockerfile.dockerignore
+++ b/ops/docker/ci-builder/Dockerfile.dockerignore
@@ -1,4 +1,3 @@
 *
 !/.nvmrc
-!/versions.json
-!/ops/scripts/install-foundry.sh
+!/mise.toml
diff --git a/ops/scripts/check-foundry.sh b/ops/scripts/check-foundry.sh
deleted file mode 100755
index 530046bd85ea..000000000000
--- a/ops/scripts/check-foundry.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-VERSIONS_FILE="versions.json"
-
-if ! command -v jq &> /dev/null
-then
-  # shellcheck disable=SC2006
-  echo "Please install jq" >&2
-  exit 1
-fi
-
-if ! command -v forge &> /dev/null
-then
-  # shellcheck disable=SC2006
-  echo "Is Foundry not installed? Consider installing via just install-foundry" >&2
-  exit 1
-fi
-
-# Check VERSIONS_FILE has expected foundry property
-if ! jq -e '.foundry' "$VERSIONS_FILE" &> /dev/null; then
-  echo "'foundry' is missing from $VERSIONS_FILE" >&2
-  exit 1
-fi
-
-# Extract the expected foundry version from versions.json
-EXPECTED_VERSION=$(jq -r '.foundry' "$VERSIONS_FILE" | cut -c 1-7)
-if [ -z "$EXPECTED_VERSION" ]; then
-  echo "Unable to extract Foundry version from $VERSIONS_FILE" >&2
-  exit 1
-fi
-
-# Extract the installed forge version
-INSTALLED_VERSION=$(forge --version | grep -o '[a-f0-9]\{7\}' | head -n 1)
-
-# Compare the installed timestamp with the expected timestamp
-if [ "$INSTALLED_VERSION" = "$EXPECTED_VERSION" ]; then
-  echo "Foundry version matches the expected version."
-else
-  echo "Mismatch between installed Foundry version ($INSTALLED_VERSION) and expected version ($EXPECTED_VERSION)."
-  echo "Your version of Foundry may either not be up to date, or it could be a later version."
-  echo "Running 'just update-foundry' from the repository root will install the expected version."
-fi
diff --git a/ops/scripts/geth-version-checker.sh b/ops/scripts/geth-version-checker.sh
deleted file mode 100755
index 98d94e664136..000000000000
--- a/ops/scripts/geth-version-checker.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-SCRIPTS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-MONOREPO_DIR=$(cd "$SCRIPTS_DIR/../../" && pwd)
-
-# Extract the version from the geth command output
-GETH_VERSION="v$(geth version | grep '^Version:' | awk '{print $2}')"
-
-# Read the version from the versions file
-EXPECTED_GETH_VERSION=$(jq -r .geth < "$MONOREPO_DIR"/versions.json)
-
-# Check if EXPECTED_GETH_VERSION contains a '-'. If not, append '-stable'.
-if [[ $EXPECTED_GETH_VERSION != *-* ]]; then
-    EXPECTED_GETH_VERSION="${EXPECTED_GETH_VERSION}-stable"
-fi
-
-# Compare the versions
-if [[ "$GETH_VERSION" == "$EXPECTED_GETH_VERSION" ]]; then
-    echo "Geth version $GETH_VERSION is correct!"
-    exit 0
-else
-    echo "Geth version does not match!"
-    echo "Local geth version: $GETH_VERSION"
-    echo "Expected geth version: $EXPECTED_GETH_VERSION"
-    exit 1
-fi
-
-
diff --git a/ops/scripts/install-foundry.sh b/ops/scripts/install-foundry.sh
deleted file mode 100755
index f8ed7924bf80..000000000000
--- a/ops/scripts/install-foundry.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Check if foundryup exists, if not, install it
-if ! command -v foundryup &> /dev/null; then
-  echo "foundryup not found, installing..."
-  curl -L https://foundry.paradigm.xyz | bash
-fi
-
-SCRIPTS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-MONOREPO_DIR=$(cd "$SCRIPTS_DIR/../../" && pwd)
-
-# Grab the foundry commit hash.
-SHA=$(jq -r .foundry < "$MONOREPO_DIR"/versions.json)
-
-# Check if there is a nightly tag corresponding to the commit hash
-TAG="nightly-$SHA"
-
-# If the foundry repository exists and a branch is checked out, we need to abort
-# any changes inside ~/.foundry/foundry-rs/foundry. This is because foundryup will
-# attempt to pull the latest changes from the remote repository, which will fail
-# if there are any uncommitted changes.
-if [ -d ~/.foundry/foundry-rs/foundry ]; then
-  echo "Foundry repository exists! Aborting any changes..."
-  cd ~/.foundry/foundry-rs/foundry
-  git reset --hard
-  git clean -fd
-  cd -
-fi
-
-# Create a temporary directory
-TMP_DIR=$(mktemp -d)
-echo "Created tempdir @ $TMP_DIR"
-
-# Clone the foundry repo temporarily. We do this to avoid the need for a personal access
-# token to interact with the GitHub REST API, and clean it up after we're done.
-git clone https://github.com/foundry-rs/foundry.git "$TMP_DIR" && cd "$TMP_DIR"
-
-# If the nightly tag exists, we can download the pre-built binaries rather than building
-# from source. Otherwise, clone the repository, check out the commit SHA, and build `forge`,
-# `cast`, `anvil`, and `chisel` from source.
-if git rev-parse "$TAG" >/dev/null 2>&1; then
-  echo "Nightly tag exists! Downloading prebuilt binaries..."
-  foundryup -v "$TAG"
-else
-  echo "Nightly tag doesn't exist! Building from source..."
-  git checkout "$SHA"
-
-  # Use native `cargo` build to avoid any rustc environment variables `foundryup` sets. We explicitly
-  # ignore chisel, as it is not a part of `ci-builder`.
-  cargo build --bin forge --release
-  cargo build --bin cast --release
-  cargo build --bin anvil --release
-  mkdir -p ~/.foundry/bin
-  mv target/release/forge ~/.foundry/bin
-  mv target/release/cast ~/.foundry/bin
-  mv target/release/anvil ~/.foundry/bin
-fi
-
-# Remove the temporary foundry repo; Used just for checking the nightly tag's existence.
-rm -rf "$TMP_DIR"
-echo "Removed tempdir @ $TMP_DIR"
diff --git a/ops/scripts/install-kontrol.sh b/ops/scripts/install-kontrol.sh
deleted file mode 100755
index 5d4044d26b26..000000000000
--- a/ops/scripts/install-kontrol.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Check if kup exists, if not, install it
-if ! command -v kup &> /dev/null; then
-  echo "kup not found, installing..."
-  yes | bash <(curl -L https://kframework.org/install)
-fi
-
-SCRIPTS_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-MONOREPO_DIR=$(cd "$SCRIPTS_DIR/../../" && pwd)
-
-# Grab the correct kontrol version.
-VERSION=$(jq -r .kontrol < "$MONOREPO_DIR"/versions.json)
-
-kup install kontrol --version v"$VERSION"
diff --git a/packages/contracts-bedrock/README.md b/packages/contracts-bedrock/README.md
index a9f1dbeeaa5f..24212f38ff34 100644
--- a/packages/contracts-bedrock/README.md
+++ b/packages/contracts-bedrock/README.md
@@ -66,7 +66,7 @@ See the [Optimism Developer Docs](https://docs.optimism.io/chain/addresses) for
 ### Contributing Guide
 
 Contributions to the OP Stack are always welcome.
-Please refer to the [CONTRIBUTING.md](./meta/CONTRIBUTING.md) for more information about how to contribute to the OP Stack smart contracts.
+Please refer to the [CONTRIBUTING.md](../../CONTRIBUTING.md) for more information about how to contribute to the OP Stack smart contracts.
 
 ### Style Guide
 
diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index b82717c4a26f..4ea97d4c61d9 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -15,24 +15,12 @@ dep-status:
 #                         BUILD                        #
 ########################################################
 
-# Checks that the correct version of Foundry is installed.
-check-foundry:
-  cd ../../ && ./ops/scripts/check-foundry.sh
-
-# Checks that semgrep is installed.
-check-semgrep:
-  cd ../../ && just check-semgrep
-
-# Checks that the correct versions of Foundry and semgrep are installed.
-check-dependencies:
-  just check-foundry && just check-semgrep
-
 # Core forge build command
 forge-build:
   forge build
 
 # Builds the contracts.
-build: check-dependencies lint-fix-no-fail forge-build interfaces-check-no-build
+build: lint-fix-no-fail forge-build interfaces-check-no-build
 
 # Builds the go-ffi tool for contract tests.
 build-go-ffi-default:
diff --git a/packages/contracts-bedrock/meta/CONTRIBUTING.md b/packages/contracts-bedrock/meta/CONTRIBUTING.md
deleted file mode 100644
index 462aa6660c4f..000000000000
--- a/packages/contracts-bedrock/meta/CONTRIBUTING.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Contributing to CONTRIBUTING.md
-
-First off, thanks for taking the time to contribute!
-
-We welcome and appreciate all kinds of contributions. We ask that before contributing you please review the procedures for each type of contribution available in the [Table of Contents](#table-of-contents). This will streamline the process for both maintainers and contributors. To find ways to contribute, view the [I Want To Contribute](#i-want-to-contribute) section below. Larger contributions should [open an issue](https://github.com/ethereum-optimism/optimism/issues/new) before implementation to ensure changes don't go to waste.
-
-We're excited to work with you and your contributions to scaling Ethereum!
-
-## Table of Contents
-
-- [I Have a Question](#i-have-a-question)
-- [I Want To Contribute](#i-want-to-contribute)
-- [Reporting Bugs](#reporting-bugs)
-- [Suggesting Enhancements](#suggesting-enhancements)
-- [Your First Code Contribution](#your-first-code-contribution)
-- [Improving The Documentation](#improving-the-documentation)
-- [Deploying on Devnet](#deploying-on-devnet)
-- [Tools](#tools)
-
-## I Have a Question
-
-> **Note**
-> Before making an issue, please read the documentation and search the issues to see if your question has already been answered.
-
-If you have any questions about the smart contracts, please feel free to ask them in the Optimism discord developer channels or create a new detailed issue.
-
-## I Want To Contribute
-
-### Reporting Bugs
-
-**Any and all bug reports on production smart contract code should be submitted privately to the Optimism team so that we can mitigate the issue before it is exploited. Please see our security policy document [here](https://github.com/ethereum-optimism/.github/blob/master/SECURITY.md).**
-
-### Suggesting Enhancements
-
-#### Before Submitting an Enhancement
-
-- Read the documentation and the smart contracts themselves to see if the feature already exists.
-- Perform a search in the issues to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
-
-#### How Do I Submit a Good Enhancement Suggestion?
-
-Enhancement suggestions are tracked as [GitHub issues](https://github.com/ethereum-optimism/optimism/issues).
-
-- Use a **clear and descriptive title** for the issue to identify the suggestion.
-- Provide a **step-by-step** description of the suggested enhancement in as many details as possible.
-- Describe the **current** behavior and why the **intended** behavior you expected to see differs. At this point you can also tell which alternatives do not work for you.
-- Explain why this enhancement would be useful in Optimism's smart contracts. You may also want to point out the other projects that solved it better and which could serve as inspiration.
-
-### Your First Code Contribution
-
-The best place to begin contributing is by looking through the issues with the `good first issue` label. These are issues that are relatively easy to implement and are a great way to get familiar with the codebase.
-
-Optimism's smart contracts are written in Solidity and we use [foundry](https://github.com/foundry-rs/foundry) as our development framework. To get started, you'll need to install several dependencies:
-
-1. [just](https://github.com/casey/just)
-   Make sure to `just install`
-1. [foundry](https://getfoundry.sh)
-   Foundry is built with [rust](https://www.rust-lang.org/tools/install), and this project uses a pinned version of foundry. Install the rust toolchain with `rustup`.
-   Make sure to install the version of foundry used by `ci-builder`, defined in the `versions.json` file in the root of this repo under the `foundry` key. Once you have `foundryup` installed, there is a helper to do this: `just install-foundry`
-1. [golang](https://golang.org/doc/install)
-1. [python](https://www.python.org/downloads/)
-
-Our [Style Guide](STYLE_GUIDE.md) contains information about the project structure, syntax preferences, naming conventions, and more. Please take a look at it before submitting a PR, and let us know if you spot inconsistencies!
-
-Once you've read the style guide and are ready to work on your PR, there are a plethora of useful `just` scripts to know about that will help you with development.
-You can run `just -l` to list them all, some of the key ones are:
-
-1. `just build` Builds the smart contracts.
-1. `just test` Runs the full `forge` test suite.
-1. `just gas-snapshot` Generates the gas snapshot for the smart contracts.
-1. `just semver-lock` Generates the semver lockfile.
-1. `just snapshots` Generates the storage and ABI snapshots.
-1. `just clean` Removes all build artifacts for `forge` and `go` compilations.
-1. `just validate-spacers` Validates the positions of the storage slot spacers.
-1. `just validate-deploy-configs` Validates the deployment configurations in `deploy-config`
-1. `just lint` Runs the linter on the smart contracts and scripts.
-1. `just pre-pr` Runs most checks, generators, and linters prior to a PR. For most PRs, this is sufficient to pass CI if everything is in order.
-1. `just pre-pr-full` Runs all checks, generators, and linters prior to a PR.
-
-### Improving The Documentation
-
-Documentation improvements are more than welcome! If you see a typo or feel that a code comment describes something poorly or incorrectly, please submit a PR with a fix.
-
-### Deploying on Devnet
-
-To deploy the smart contracts on a local devnet, run `make devnet-up` in the monorepo root. For more information on the local devnet, see [dev-node](https://docs.optimism.io/chain/testing/dev-node).
-
-### Tools
-
-#### Validate Spacing
-
-In order to make sure that we don't accidentally overwrite storage slots, contract storage layouts are checked to make sure spacing is correct.
-
-This uses the `snapshots/storageLayout` directory to check contract spacing. Run `just validate-spacers` to check the spacing of all contracts.
-
-#### Gas Snapshots
-
-We use forge's `gas-snapshot` subcommand to produce a gas snapshot for tests in `Benchmark.t.sol`. CI will check that the gas snapshot has been updated properly when it runs, so make sure to run `just gas-snapshot`!
-
-#### Semver Locking
-
-Many of our smart contracts are semantically versioned. To make sure that changes are not made to a contract without deliberately bumping its version, we commit to the source code and the creation bytecode of its dependencies in a lockfile. Consult the [Style Guide](./STYLE_GUIDE.md#Versioning) for more information about how our contracts are versioned.
-
-#### Storage Snapshots
-
-Due to the many proxied contracts in Optimism's protocol, we automate tracking the diff to storage layouts of the contracts in the project. This is to ensure that we don't break a proxy by upgrading its implementation to a contract with a different storage layout. To generate the storage lockfile, run `just snapshots`.
diff --git a/packages/contracts-bedrock/test/kontrol/README.md b/packages/contracts-bedrock/test/kontrol/README.md
index 7e4dc5a2809a..1103feed1a08 100644
--- a/packages/contracts-bedrock/test/kontrol/README.md
+++ b/packages/contracts-bedrock/test/kontrol/README.md
@@ -48,10 +48,9 @@ The directory is structured as follows
 
 ### Installation
 
-1. `cd` to the root of this repo.
-2. Install Foundry by running `just install-foundry`. This installs `foundryup`, the foundry toolchain installer, then installs the required foundry version.
-3. Install Kontrol by running `just install-kontrol`. This installs `kup`, the package manager for RV tools, then installs the required kontrol version.
-4. Install Docker.
+1. Make sure that the dependencies for the Optimism Monorepo are installed with `mise`.
+1. Install [`kup`](https://github.com/runtimeverification/k/releases/tag/v7.1.180).
+1. Use `kup` to [install `kontrol`](https://github.com/runtimeverification/kontrol?tab=readme-ov-file#fast-installation)
 
 ## Usage
 

From 176c71ab313c146defb9fc783b0ab8ac08352320 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Tue, 3 Dec 2024 07:09:52 +0800
Subject: [PATCH 330/451] remove dup log (#13149)

---
 op-service/txmgr/txmgr.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-service/txmgr/txmgr.go b/op-service/txmgr/txmgr.go
index 353951af6332..e6593f993759 100644
--- a/op-service/txmgr/txmgr.go
+++ b/op-service/txmgr/txmgr.go
@@ -606,7 +606,7 @@ func (m *SimpleTxManager) sendTx(ctx context.Context, tx *types.Transaction) (*t
 func (m *SimpleTxManager) publishTx(ctx context.Context, tx *types.Transaction, sendState *SendState) (*types.Transaction, bool) {
 	l := m.txLogger(tx, true)
 
-	l.Info("Publishing transaction", "tx", tx.Hash())
+	l.Info("Publishing transaction")
 
 	for {
 		if sendState.bumpFees {

From cbfb97ede9d8ab4da2e3c4ef65ac8e366ad5f422 Mon Sep 17 00:00:00 2001
From: Ashutosh Varma <ashutoshvarma11@live.com>
Date: Tue, 3 Dec 2024 04:51:18 +0530
Subject: [PATCH 331/451] fix: delayed weth addr in superchain inspect (#13159)

---
 op-deployer/pkg/deployer/inspect/superchain_registry.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-deployer/pkg/deployer/inspect/superchain_registry.go b/op-deployer/pkg/deployer/inspect/superchain_registry.go
index e5ee56568b59..c8d57907d9fd 100644
--- a/op-deployer/pkg/deployer/inspect/superchain_registry.go
+++ b/op-deployer/pkg/deployer/inspect/superchain_registry.go
@@ -165,7 +165,7 @@ func createAddressList(l1Contracts *L1Contracts, appliedIntent *state.Intent, ch
 
 		// Fault proof contracts
 		AnchorStateRegistryProxy: superchain.Address(l1Contracts.OpChainDeployment.AnchorStateRegistryProxyAddress),
-		DelayedWETHProxy:         superchain.Address(l1Contracts.OpChainDeployment.L1CrossDomainMessengerProxyAddress),
+		DelayedWETHProxy:         superchain.Address(l1Contracts.OpChainDeployment.DelayedWETHPermissionedGameProxyAddress),
 		DisputeGameFactoryProxy:  superchain.Address(l1Contracts.OpChainDeployment.DisputeGameFactoryProxyAddress),
 		FaultDisputeGame:         superchain.Address(l1Contracts.OpChainDeployment.FaultDisputeGameAddress),
 		MIPS:                     superchain.Address(l1Contracts.ImplementationsDeployment.MipsSingletonAddress),

From 72ec8d3ff15f6863cf055b6c7fd2bc82006d5969 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 2 Dec 2024 18:17:40 -0700
Subject: [PATCH 332/451] ctb: Fix flake in TestExtractTestNames (#13177)

Golang map iteration order is random, so we need to sort first.
---
 .../contracts-bedrock/scripts/checks/test-names/main_test.go   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/contracts-bedrock/scripts/checks/test-names/main_test.go b/packages/contracts-bedrock/scripts/checks/test-names/main_test.go
index d4c554f12f1b..5a9a0fd1846e 100644
--- a/packages/contracts-bedrock/scripts/checks/test-names/main_test.go
+++ b/packages/contracts-bedrock/scripts/checks/test-names/main_test.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"reflect"
+	"slices"
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
@@ -272,6 +273,8 @@ func TestExtractTestNames(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got := extractTestNames(tt.artifact)
+			slices.Sort(got)
+			slices.Sort(tt.want)
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("extractTestNames() = %v, want %v", got, tt.want)
 			}

From 4de5c8c21a8df77456f640b3a886c52fddb71697 Mon Sep 17 00:00:00 2001
From: Minhyuk Kim <kimminhyuk1004@gmail.com>
Date: Tue, 3 Dec 2024 01:57:34 -0600
Subject: [PATCH 333/451] op-signer, op-node: Integrate op-node with op-signer
 for block payload signing (#12325)

* Initial implementation of integrating op-node with op-signer for remote signer configuration for block payload signing

* op-service: remove the requirement for signer.address to be set when using op-service

* op-service: add blockpayload_args to send to rpc opsigner_signBlockPayload

* Implement mock rpc in gossip_test and apply review

* Clean up tests
---
 op-node/flags/p2p_flags.go             |   5 +-
 op-node/p2p/cli/load_signer.go         |  16 ++-
 op-node/p2p/gossip_test.go             | 154 ++++++++++++++++++++++---
 op-node/p2p/signer.go                  |  62 ++++++----
 op-node/p2p/signer_test.go             |  15 +--
 op-node/service.go                     |   2 +-
 op-service/signer/blockpayload_args.go |  62 ++++++++++
 op-service/signer/cli.go               |  23 ++--
 op-service/signer/cli_test.go          |   2 +-
 op-service/signer/client.go            |  16 +++
 op-service/tls/cli.go                  |  31 ++---
 op-service/tls/cli_test.go             |   2 +-
 op-service/txmgr/cli.go                |   2 +-
 13 files changed, 309 insertions(+), 83 deletions(-)
 create mode 100644 op-service/signer/blockpayload_args.go

diff --git a/op-node/flags/p2p_flags.go b/op-node/flags/p2p_flags.go
index 269b973c52da..6a38fbb817f8 100644
--- a/op-node/flags/p2p_flags.go
+++ b/op-node/flags/p2p_flags.go
@@ -7,6 +7,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
+	opsigner "github.com/ethereum-optimism/optimism/op-service/signer"
 )
 
 func p2pEnv(envprefix, v string) []string {
@@ -87,7 +88,7 @@ func deprecatedP2PFlags(envPrefix string) []cli.Flag {
 // None of these flags are strictly required.
 // Some are hidden if they are too technical, or not recommended.
 func P2PFlags(envPrefix string) []cli.Flag {
-	return []cli.Flag{
+	return append([]cli.Flag{
 		&cli.BoolFlag{
 			Name:     DisableP2PName,
 			Usage:    "Completely disable the P2P stack",
@@ -410,5 +411,5 @@ func P2PFlags(envPrefix string) []cli.Flag {
 			Required: false,
 			EnvVars:  p2pEnv(envPrefix, "PING"),
 		},
-	}
+	}, opsigner.CLIFlags(envPrefix, P2PCategory)...)
 }
diff --git a/op-node/p2p/cli/load_signer.go b/op-node/p2p/cli/load_signer.go
index 7416fa76397a..3c0c532edb20 100644
--- a/op-node/p2p/cli/load_signer.go
+++ b/op-node/p2p/cli/load_signer.go
@@ -5,18 +5,18 @@ import (
 	"strings"
 
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
 	"github.com/ethereum-optimism/optimism/op-node/flags"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
+	opsigner "github.com/ethereum-optimism/optimism/op-service/signer"
 )
 
-// TODO: implement remote signer setup (config to authenticated endpoint)
-// and remote signer itself (e.g. a open http client to make signing requests)
-
 // LoadSignerSetup loads a configuration for a Signer to be set up later
-func LoadSignerSetup(ctx *cli.Context) (p2p.SignerSetup, error) {
+func LoadSignerSetup(ctx *cli.Context, logger log.Logger) (p2p.SignerSetup, error) {
 	key := ctx.String(flags.SequencerP2PKeyName)
+	signerCfg := opsigner.ReadCLIConfig(ctx)
 	if key != "" {
 		// Mnemonics are bad because they leak *all* keys when they leak.
 		// Unencrypted keys from file are bad because they are easy to leak (and we are not checking file permissions).
@@ -26,9 +26,13 @@ func LoadSignerSetup(ctx *cli.Context) (p2p.SignerSetup, error) {
 		}
 
 		return &p2p.PreparedSigner{Signer: p2p.NewLocalSigner(priv)}, nil
+	} else if signerCfg.Enabled() {
+		remoteSigner, err := p2p.NewRemoteSigner(logger, signerCfg)
+		if err != nil {
+			return nil, err
+		}
+		return &p2p.PreparedSigner{Signer: remoteSigner}, nil
 	}
 
-	// TODO: create remote signer
-
 	return nil, nil
 }
diff --git a/op-node/p2p/gossip_test.go b/op-node/p2p/gossip_test.go
index 0833f270e40b..9f047f4b5ba8 100644
--- a/op-node/p2p/gossip_test.go
+++ b/op-node/p2p/gossip_test.go
@@ -3,31 +3,33 @@ package p2p
 import (
 	"bytes"
 	"context"
+	"crypto/ecdsa"
 	"fmt"
 	"io"
 	"math/big"
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/golang/snappy"
 
-	// "github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
+	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
+	opsigner "github.com/ethereum-optimism/optimism/op-service/signer"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum-optimism/optimism/op-service/testutils"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
-
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
+
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	pubsub_pb "github.com/libp2p/go-libp2p-pubsub/pb"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/require"
-
-	"github.com/ethereum-optimism/optimism/op-service/testlog"
 )
 
 func TestGuardGossipValidator(t *testing.T) {
@@ -62,30 +64,122 @@ func TestVerifyBlockSignature(t *testing.T) {
 		L2ChainID: big.NewInt(100),
 	}
 	peerId := peer.ID("foo")
-	secrets, err := e2eutils.DefaultMnemonicConfig.Secrets()
+	secrets, err := crypto.GenerateKey()
+	require.NoError(t, err)
+	msg := []byte("any msg")
+
+	t.Run("Valid", func(t *testing.T) {
+		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.PublicKey)}
+		signer := &PreparedSigner{Signer: NewLocalSigner(secrets)}
+		sig, err := signer.Sign(context.Background(), SigningDomainBlocksV1, cfg.L2ChainID, msg)
+		require.NoError(t, err)
+		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:], msg)
+		require.Equal(t, pubsub.ValidationAccept, result)
+	})
+
+	t.Run("WrongSigner", func(t *testing.T) {
+		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: common.HexToAddress("0x1234")}
+		signer := &PreparedSigner{Signer: NewLocalSigner(secrets)}
+		sig, err := signer.Sign(context.Background(), SigningDomainBlocksV1, cfg.L2ChainID, msg)
+		require.NoError(t, err)
+		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:], msg)
+		require.Equal(t, pubsub.ValidationReject, result)
+	})
+
+	t.Run("InvalidSignature", func(t *testing.T) {
+		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.PublicKey)}
+		sig := make([]byte, 65)
+		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig, msg)
+		require.Equal(t, pubsub.ValidationReject, result)
+	})
+
+	t.Run("NoSequencer", func(t *testing.T) {
+		runCfg := &testutils.MockRuntimeConfig{}
+		signer := &PreparedSigner{Signer: NewLocalSigner(secrets)}
+		sig, err := signer.Sign(context.Background(), SigningDomainBlocksV1, cfg.L2ChainID, msg)
+		require.NoError(t, err)
+		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:], msg)
+		require.Equal(t, pubsub.ValidationIgnore, result)
+	})
+}
+
+type mockRemoteSigner struct {
+	priv *ecdsa.PrivateKey
+}
+
+func (t *mockRemoteSigner) SignBlockPayload(args opsigner.BlockPayloadArgs) (hexutil.Bytes, error) {
+	signingHash, err := args.ToSigningHash()
+	if err != nil {
+		return nil, err
+	}
+	signature, err := crypto.Sign(signingHash[:], t.priv)
+	if err != nil {
+		return nil, err
+	}
+	return signature, nil
+}
+
+func TestVerifyBlockSignatureWithRemoteSigner(t *testing.T) {
+	secrets, err := crypto.GenerateKey()
 	require.NoError(t, err)
+
+	remoteSigner := &mockRemoteSigner{secrets}
+	server := oprpc.NewServer(
+		"127.0.0.1",
+		0,
+		"test",
+		oprpc.WithAPIs([]rpc.API{
+			{
+				Namespace: "opsigner",
+				Service:   remoteSigner,
+			},
+		}),
+	)
+
+	require.NoError(t, server.Start())
+	defer func() {
+		_ = server.Stop()
+	}()
+
+	logger := testlog.Logger(t, log.LevelCrit)
+	cfg := &rollup.Config{
+		L2ChainID: big.NewInt(100),
+	}
+
+	peerId := peer.ID("foo")
 	msg := []byte("any msg")
 
+	signerCfg := opsigner.NewCLIConfig()
+	signerCfg.Endpoint = fmt.Sprintf("http://%s", server.Endpoint())
+	signerCfg.TLSConfig.TLSKey = ""
+	signerCfg.TLSConfig.TLSCert = ""
+	signerCfg.TLSConfig.TLSCaCert = ""
+	signerCfg.TLSConfig.Enabled = false
+
 	t.Run("Valid", func(t *testing.T) {
-		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.SequencerP2P.PublicKey)}
-		signer := &PreparedSigner{Signer: NewLocalSigner(secrets.SequencerP2P)}
+		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.PublicKey)}
+		remoteSigner, err := NewRemoteSigner(logger, signerCfg)
+		require.NoError(t, err)
+		signer := &PreparedSigner{Signer: remoteSigner}
 		sig, err := signer.Sign(context.Background(), SigningDomainBlocksV1, cfg.L2ChainID, msg)
 		require.NoError(t, err)
-		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:65], msg)
+		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:], msg)
 		require.Equal(t, pubsub.ValidationAccept, result)
 	})
 
 	t.Run("WrongSigner", func(t *testing.T) {
 		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: common.HexToAddress("0x1234")}
-		signer := &PreparedSigner{Signer: NewLocalSigner(secrets.SequencerP2P)}
+		remoteSigner, err := NewRemoteSigner(logger, signerCfg)
+		require.NoError(t, err)
+		signer := &PreparedSigner{Signer: remoteSigner}
 		sig, err := signer.Sign(context.Background(), SigningDomainBlocksV1, cfg.L2ChainID, msg)
 		require.NoError(t, err)
-		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:65], msg)
+		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:], msg)
 		require.Equal(t, pubsub.ValidationReject, result)
 	})
 
 	t.Run("InvalidSignature", func(t *testing.T) {
-		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.SequencerP2P.PublicKey)}
+		runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.PublicKey)}
 		sig := make([]byte, 65)
 		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig, msg)
 		require.Equal(t, pubsub.ValidationReject, result)
@@ -93,12 +187,36 @@ func TestVerifyBlockSignature(t *testing.T) {
 
 	t.Run("NoSequencer", func(t *testing.T) {
 		runCfg := &testutils.MockRuntimeConfig{}
-		signer := &PreparedSigner{Signer: NewLocalSigner(secrets.SequencerP2P)}
+		remoteSigner, err := NewRemoteSigner(logger, signerCfg)
+		require.NoError(t, err)
+		signer := &PreparedSigner{Signer: remoteSigner}
 		sig, err := signer.Sign(context.Background(), SigningDomainBlocksV1, cfg.L2ChainID, msg)
 		require.NoError(t, err)
-		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:65], msg)
+		result := verifyBlockSignature(logger, cfg, runCfg, peerId, sig[:], msg)
 		require.Equal(t, pubsub.ValidationIgnore, result)
 	})
+
+	t.Run("RemoteSignerNoTLS", func(t *testing.T) {
+		signerCfg := opsigner.NewCLIConfig()
+		signerCfg.Endpoint = fmt.Sprintf("http://%s", server.Endpoint())
+		signerCfg.TLSConfig.TLSKey = "invalid"
+		signerCfg.TLSConfig.TLSCert = "invalid"
+		signerCfg.TLSConfig.TLSCaCert = "invalid"
+		signerCfg.TLSConfig.Enabled = true
+
+		_, err := NewRemoteSigner(logger, signerCfg)
+		require.Error(t, err)
+	})
+
+	t.Run("RemoteSignerInvalidEndpoint", func(t *testing.T) {
+		signerCfg := opsigner.NewCLIConfig()
+		signerCfg.Endpoint = "Invalid"
+		signerCfg.TLSConfig.TLSKey = ""
+		signerCfg.TLSConfig.TLSCert = ""
+		signerCfg.TLSConfig.TLSCaCert = ""
+		_, err := NewRemoteSigner(logger, signerCfg)
+		require.Error(t, err)
+	})
 }
 
 type MarshalSSZ interface {
@@ -146,10 +264,10 @@ func TestBlockValidator(t *testing.T) {
 	cfg := &rollup.Config{
 		L2ChainID: big.NewInt(100),
 	}
-	secrets, err := e2eutils.DefaultMnemonicConfig.Secrets()
+	secrets, err := crypto.GenerateKey()
 	require.NoError(t, err)
-	runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.SequencerP2P.PublicKey)}
-	signer := &PreparedSigner{Signer: NewLocalSigner(secrets.SequencerP2P)}
+	runCfg := &testutils.MockRuntimeConfig{P2PSeqAddress: crypto.PubkeyToAddress(secrets.PublicKey)}
+	signer := &PreparedSigner{Signer: NewLocalSigner(secrets)}
 	// Params Set 2: Call the validation function
 	peerID := peer.ID("foo")
 
diff --git a/op-node/p2p/signer.go b/op-node/p2p/signer.go
index cd5e9f94a01b..20a52d0a2625 100644
--- a/op-node/p2p/signer.go
+++ b/op-node/p2p/signer.go
@@ -9,8 +9,10 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	opsigner "github.com/ethereum-optimism/optimism/op-service/signer"
 )
 
 var SigningDomainBlocksV1 = [32]byte{}
@@ -20,40 +22,27 @@ type Signer interface {
 	io.Closer
 }
 
-func SigningHash(domain [32]byte, chainID *big.Int, payloadBytes []byte) (common.Hash, error) {
-	var msgInput [32 + 32 + 32]byte
-	// domain: first 32 bytes
-	copy(msgInput[:32], domain[:])
-	// chain_id: second 32 bytes
-	if chainID.BitLen() > 256 {
-		return common.Hash{}, errors.New("chain_id is too large")
-	}
-	chainID.FillBytes(msgInput[32:64])
-	// payload_hash: third 32 bytes, hash of encoded payload
-	copy(msgInput[64:], crypto.Keccak256(payloadBytes))
-
-	return crypto.Keccak256Hash(msgInput[:]), nil
-}
-
 func BlockSigningHash(cfg *rollup.Config, payloadBytes []byte) (common.Hash, error) {
-	return SigningHash(SigningDomainBlocksV1, cfg.L2ChainID, payloadBytes)
+	return opsigner.NewBlockPayloadArgs(SigningDomainBlocksV1, cfg.L2ChainID, payloadBytes, nil).ToSigningHash()
 }
 
 // LocalSigner is suitable for testing
 type LocalSigner struct {
-	priv   *ecdsa.PrivateKey
-	hasher func(domain [32]byte, chainID *big.Int, payloadBytes []byte) (common.Hash, error)
+	priv *ecdsa.PrivateKey
 }
 
 func NewLocalSigner(priv *ecdsa.PrivateKey) *LocalSigner {
-	return &LocalSigner{priv: priv, hasher: SigningHash}
+	return &LocalSigner{priv: priv}
 }
 
 func (s *LocalSigner) Sign(ctx context.Context, domain [32]byte, chainID *big.Int, encodedMsg []byte) (sig *[65]byte, err error) {
 	if s.priv == nil {
 		return nil, errors.New("signer is closed")
 	}
-	signingHash, err := s.hasher(domain, chainID, encodedMsg)
+
+	blockPayloadArgs := opsigner.NewBlockPayloadArgs(domain, chainID, encodedMsg, nil)
+	signingHash, err := blockPayloadArgs.ToSigningHash()
+
 	if err != nil {
 		return nil, err
 	}
@@ -69,6 +58,39 @@ func (s *LocalSigner) Close() error {
 	return nil
 }
 
+type RemoteSigner struct {
+	client *opsigner.SignerClient
+	sender *common.Address
+}
+
+func NewRemoteSigner(logger log.Logger, config opsigner.CLIConfig) (*RemoteSigner, error) {
+	signerClient, err := opsigner.NewSignerClientFromConfig(logger, config)
+	if err != nil {
+		return nil, err
+	}
+	senderAddress := common.HexToAddress(config.Address)
+	return &RemoteSigner{signerClient, &senderAddress}, nil
+}
+
+func (s *RemoteSigner) Sign(ctx context.Context, domain [32]byte, chainID *big.Int, encodedMsg []byte) (sig *[65]byte, err error) {
+	if s.client == nil {
+		return nil, errors.New("signer is closed")
+	}
+
+	blockPayloadArgs := opsigner.NewBlockPayloadArgs(domain, chainID, encodedMsg, s.sender)
+	signature, err := s.client.SignBlockPayload(ctx, blockPayloadArgs)
+
+	if err != nil {
+		return nil, err
+	}
+	return &signature, nil
+}
+
+func (s *RemoteSigner) Close() error {
+	s.client = nil
+	return nil
+}
+
 type PreparedSigner struct {
 	Signer
 }
diff --git a/op-node/p2p/signer_test.go b/op-node/p2p/signer_test.go
index abcfe4825b30..53f78504d18f 100644
--- a/op-node/p2p/signer_test.go
+++ b/op-node/p2p/signer_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	opsigner "github.com/ethereum-optimism/optimism/op-service/signer"
 	"github.com/stretchr/testify/require"
 )
 
@@ -14,10 +15,10 @@ func TestSigningHash_DifferentDomain(t *testing.T) {
 	}
 
 	payloadBytes := []byte("arbitraryData")
-	hash, err := SigningHash(SigningDomainBlocksV1, cfg.L2ChainID, payloadBytes)
+	hash, err := opsigner.NewBlockPayloadArgs(SigningDomainBlocksV1, cfg.L2ChainID, payloadBytes, nil).ToSigningHash()
 	require.NoError(t, err, "creating first signing hash")
 
-	hash2, err := SigningHash([32]byte{3}, cfg.L2ChainID, payloadBytes)
+	hash2, err := opsigner.NewBlockPayloadArgs([32]byte{3}, cfg.L2ChainID, payloadBytes, nil).ToSigningHash()
 	require.NoError(t, err, "creating second signing hash")
 
 	require.NotEqual(t, hash, hash2, "signing hash should be different when domain is different")
@@ -32,10 +33,10 @@ func TestSigningHash_DifferentChainID(t *testing.T) {
 	}
 
 	payloadBytes := []byte("arbitraryData")
-	hash, err := SigningHash(SigningDomainBlocksV1, cfg1.L2ChainID, payloadBytes)
+	hash, err := opsigner.NewBlockPayloadArgs(SigningDomainBlocksV1, cfg1.L2ChainID, payloadBytes, nil).ToSigningHash()
 	require.NoError(t, err, "creating first signing hash")
 
-	hash2, err := SigningHash(SigningDomainBlocksV1, cfg2.L2ChainID, payloadBytes)
+	hash2, err := opsigner.NewBlockPayloadArgs(SigningDomainBlocksV1, cfg2.L2ChainID, payloadBytes, nil).ToSigningHash()
 	require.NoError(t, err, "creating second signing hash")
 
 	require.NotEqual(t, hash, hash2, "signing hash should be different when chain ID is different")
@@ -46,10 +47,10 @@ func TestSigningHash_DifferentMessage(t *testing.T) {
 		L2ChainID: big.NewInt(100),
 	}
 
-	hash, err := SigningHash(SigningDomainBlocksV1, cfg.L2ChainID, []byte("msg1"))
+	hash, err := opsigner.NewBlockPayloadArgs(SigningDomainBlocksV1, cfg.L2ChainID, []byte("msg1"), nil).ToSigningHash()
 	require.NoError(t, err, "creating first signing hash")
 
-	hash2, err := SigningHash(SigningDomainBlocksV1, cfg.L2ChainID, []byte("msg2"))
+	hash2, err := opsigner.NewBlockPayloadArgs(SigningDomainBlocksV1, cfg.L2ChainID, []byte("msg2"), nil).ToSigningHash()
 	require.NoError(t, err, "creating second signing hash")
 
 	require.NotEqual(t, hash, hash2, "signing hash should be different when message is different")
@@ -62,6 +63,6 @@ func TestSigningHash_LimitChainID(t *testing.T) {
 	cfg := &rollup.Config{
 		L2ChainID: chainID,
 	}
-	_, err := SigningHash(SigningDomainBlocksV1, cfg.L2ChainID, []byte("arbitraryData"))
+	_, err := opsigner.NewBlockPayloadArgs(SigningDomainBlocksV1, cfg.L2ChainID, []byte("arbitraryData"), nil).ToSigningHash()
 	require.ErrorContains(t, err, "chain_id is too large")
 }
diff --git a/op-node/service.go b/op-node/service.go
index 4d12c7f5446f..55c1c7173b74 100644
--- a/op-node/service.go
+++ b/op-node/service.go
@@ -49,7 +49,7 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 
 	driverConfig := NewDriverConfig(ctx)
 
-	p2pSignerSetup, err := p2pcli.LoadSignerSetup(ctx)
+	p2pSignerSetup, err := p2pcli.LoadSignerSetup(ctx, log)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load p2p signer: %w", err)
 	}
diff --git a/op-service/signer/blockpayload_args.go b/op-service/signer/blockpayload_args.go
new file mode 100644
index 000000000000..8239bc0967d6
--- /dev/null
+++ b/op-service/signer/blockpayload_args.go
@@ -0,0 +1,62 @@
+package signer
+
+import (
+	"errors"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+// BlockPayloadArgs represents the arguments to sign a new block payload from the sequencer.
+type BlockPayloadArgs struct {
+	Domain        [32]byte `json:"domain"`
+	ChainID       *big.Int `json:"chainId"`
+	PayloadHash   []byte   `json:"payloadHash"`
+	PayloadBytes  []byte
+	SenderAddress *common.Address `json:"senderAddress"`
+}
+
+// NewBlockPayloadArgs creates a BlockPayloadArgs struct
+func NewBlockPayloadArgs(domain [32]byte, chainId *big.Int, payloadBytes []byte, senderAddress *common.Address) *BlockPayloadArgs {
+	payloadHash := crypto.Keccak256(payloadBytes)
+	args := &BlockPayloadArgs{
+		Domain:        domain,
+		ChainID:       chainId,
+		PayloadHash:   payloadHash,
+		PayloadBytes:  payloadBytes,
+		SenderAddress: senderAddress,
+	}
+	return args
+}
+
+func (args *BlockPayloadArgs) Check() error {
+	if args.ChainID == nil {
+		return errors.New("chainId not specified")
+	}
+	if len(args.PayloadHash) == 0 {
+		return errors.New("payloadHash not specified")
+	}
+	return nil
+}
+
+// ToSigningHash creates a signingHash from the block payload args.
+// Uses the hashing scheme from https://github.com/ethereum-optimism/specs/blob/main/specs/protocol/rollup-node-p2p.md#block-signatures
+func (args *BlockPayloadArgs) ToSigningHash() (common.Hash, error) {
+	if err := args.Check(); err != nil {
+		return common.Hash{}, err
+	}
+	var msgInput [32 + 32 + 32]byte
+	// domain: first 32 bytes
+	copy(msgInput[:32], args.Domain[:])
+	// chain_id: second 32 bytes
+	if args.ChainID.BitLen() > 256 {
+		return common.Hash{}, errors.New("chain_id is too large")
+	}
+	args.ChainID.FillBytes(msgInput[32:64])
+
+	// payload_hash: third 32 bytes, hash of encoded payload
+	copy(msgInput[64:], args.PayloadHash[:])
+
+	return crypto.Keccak256Hash(msgInput[:]), nil
+}
diff --git a/op-service/signer/cli.go b/op-service/signer/cli.go
index 0c1df648286d..534fd09c97bc 100644
--- a/op-service/signer/cli.go
+++ b/op-service/signer/cli.go
@@ -17,18 +17,20 @@ const (
 	HeadersFlagName  = "signer.header"
 )
 
-func CLIFlags(envPrefix string) []cli.Flag {
+func CLIFlags(envPrefix string, category string) []cli.Flag {
 	envPrefix += "_SIGNER"
 	flags := []cli.Flag{
 		&cli.StringFlag{
-			Name:    EndpointFlagName,
-			Usage:   "Signer endpoint the client will connect to",
-			EnvVars: opservice.PrefixEnvVar(envPrefix, "ENDPOINT"),
+			Name:     EndpointFlagName,
+			Usage:    "Signer endpoint the client will connect to",
+			EnvVars:  opservice.PrefixEnvVar(envPrefix, "ENDPOINT"),
+			Category: category,
 		},
 		&cli.StringFlag{
-			Name:    AddressFlagName,
-			Usage:   "Address the signer is signing transactions for",
-			EnvVars: opservice.PrefixEnvVar(envPrefix, "ADDRESS"),
+			Name:     AddressFlagName,
+			Usage:    "Address the signer is signing requests for",
+			EnvVars:  opservice.PrefixEnvVar(envPrefix, "ADDRESS"),
+			Category: category,
 		},
 		&cli.StringSliceFlag{
 			Name:    HeadersFlagName,
@@ -36,7 +38,7 @@ func CLIFlags(envPrefix string) []cli.Flag {
 			EnvVars: opservice.PrefixEnvVar(envPrefix, "HEADER"),
 		},
 	}
-	flags = append(flags, optls.CLIFlagsWithFlagPrefix(envPrefix, "signer")...)
+	flags = append(flags, optls.CLIFlagsWithFlagPrefix(envPrefix, "signer", category)...)
 	return flags
 }
 
@@ -65,10 +67,7 @@ func (c CLIConfig) Check() error {
 }
 
 func (c CLIConfig) Enabled() bool {
-	if c.Endpoint != "" && c.Address != "" {
-		return true
-	}
-	return false
+	return c.Endpoint != "" && c.Address != ""
 }
 
 func ReadCLIConfig(ctx *cli.Context) CLIConfig {
diff --git a/op-service/signer/cli_test.go b/op-service/signer/cli_test.go
index 056ed4815601..3453258c6ca1 100644
--- a/op-service/signer/cli_test.go
+++ b/op-service/signer/cli_test.go
@@ -93,7 +93,7 @@ func TestInvalidConfig(t *testing.T) {
 
 func configForArgs(args ...string) CLIConfig {
 	app := cli.NewApp()
-	app.Flags = CLIFlags("TEST_")
+	app.Flags = CLIFlags("TEST_", "")
 	app.Name = "test"
 	var config CLIConfig
 	app.Action = func(ctx *cli.Context) error {
diff --git a/op-service/signer/client.go b/op-service/signer/client.go
index cdb9094dfe6b..acd753ecef7a 100644
--- a/op-service/signer/client.go
+++ b/op-service/signer/client.go
@@ -113,3 +113,19 @@ func (s *SignerClient) SignTransaction(ctx context.Context, chainId *big.Int, fr
 
 	return &signed, nil
 }
+
+func (s *SignerClient) SignBlockPayload(ctx context.Context, args *BlockPayloadArgs) ([65]byte, error) {
+	var result hexutil.Bytes
+
+	if err := s.client.CallContext(ctx, &result, "opsigner_signBlockPayload", args); err != nil {
+		return [65]byte{}, fmt.Errorf("opsigner_signBlockPayload failed: %w", err)
+	}
+
+	if len(result) != 65 {
+		return [65]byte{}, fmt.Errorf("invalid signature: %s", result.String())
+	}
+
+	signature := [65]byte(result)
+
+	return signature, nil
+}
diff --git a/op-service/tls/cli.go b/op-service/tls/cli.go
index e2e086e922c3..f85de807a83e 100644
--- a/op-service/tls/cli.go
+++ b/op-service/tls/cli.go
@@ -21,7 +21,7 @@ const (
 // CLIFlags returns flags with env var envPrefix
 // This should be used for server TLS configs, or when client and server tls configs are the same
 func CLIFlags(envPrefix string) []cli.Flag {
-	return CLIFlagsWithFlagPrefix(envPrefix, "")
+	return CLIFlagsWithFlagPrefix(envPrefix, "", "")
 }
 
 var (
@@ -33,7 +33,7 @@ var (
 
 // CLIFlagsWithFlagPrefix returns flags with env var and cli flag prefixes
 // Should be used for client TLS configs when different from server on the same process
-func CLIFlagsWithFlagPrefix(envPrefix string, flagPrefix string) []cli.Flag {
+func CLIFlagsWithFlagPrefix(envPrefix string, flagPrefix string, category string) []cli.Flag {
 	prefixFunc := func(flagName string) string {
 		return strings.Trim(fmt.Sprintf("%s.%s", flagPrefix, flagName), ".")
 	}
@@ -48,22 +48,25 @@ func CLIFlagsWithFlagPrefix(envPrefix string, flagPrefix string) []cli.Flag {
 			EnvVars: prefixEnvVars("TLS_ENABLED"),
 		},
 		&cli.StringFlag{
-			Name:    prefixFunc(TLSCaCertFlagName),
-			Usage:   "tls ca cert path",
-			Value:   defaultTLSCaCert,
-			EnvVars: prefixEnvVars("TLS_CA"),
+			Name:     prefixFunc(TLSCaCertFlagName),
+			Usage:    "tls ca cert path",
+			Value:    defaultTLSCaCert,
+			EnvVars:  prefixEnvVars("TLS_CA"),
+			Category: category,
 		},
 		&cli.StringFlag{
-			Name:    prefixFunc(TLSCertFlagName),
-			Usage:   "tls cert path",
-			Value:   defaultTLSCert,
-			EnvVars: prefixEnvVars("TLS_CERT"),
+			Name:     prefixFunc(TLSCertFlagName),
+			Usage:    "tls cert path",
+			Value:    defaultTLSCert,
+			EnvVars:  prefixEnvVars("TLS_CERT"),
+			Category: category,
 		},
 		&cli.StringFlag{
-			Name:    prefixFunc(TLSKeyFlagName),
-			Usage:   "tls key",
-			Value:   defaultTLSKey,
-			EnvVars: prefixEnvVars("TLS_KEY"),
+			Name:     prefixFunc(TLSKeyFlagName),
+			Usage:    "tls key",
+			Value:    defaultTLSKey,
+			EnvVars:  prefixEnvVars("TLS_KEY"),
+			Category: category,
 		},
 	}
 }
diff --git a/op-service/tls/cli_test.go b/op-service/tls/cli_test.go
index bd4ea4bf17c9..ce5e41d96c2d 100644
--- a/op-service/tls/cli_test.go
+++ b/op-service/tls/cli_test.go
@@ -53,7 +53,7 @@ func TestInvalidConfig(t *testing.T) {
 
 func configForArgs(args ...string) CLIConfig {
 	app := cli.NewApp()
-	app.Flags = CLIFlagsWithFlagPrefix("TEST_", "test")
+	app.Flags = CLIFlagsWithFlagPrefix("TEST_", "test", "")
 	app.Name = "test"
 	var config CLIConfig
 	app.Action = func(ctx *cli.Context) error {
diff --git a/op-service/txmgr/cli.go b/op-service/txmgr/cli.go
index 2390933d79ca..fc1aa2cceb0c 100644
--- a/op-service/txmgr/cli.go
+++ b/op-service/txmgr/cli.go
@@ -191,7 +191,7 @@ func CLIFlagsWithDefaults(envPrefix string, defaults DefaultFlagValues) []cli.Fl
 			Value:   defaults.ReceiptQueryInterval,
 			EnvVars: prefixEnvVars("TXMGR_RECEIPT_QUERY_INTERVAL"),
 		},
-	}, opsigner.CLIFlags(envPrefix)...)
+	}, opsigner.CLIFlags(envPrefix, "")...)
 }
 
 type CLIConfig struct {

From 010c8a93fac81ddced220bc3f8155959403eeac8 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Tue, 3 Dec 2024 10:03:52 -0500
Subject: [PATCH 334/451] feat: remove unused _includeDump arg (#13099)

* feat: remove unused onlyTestnetOrDevnet modifier

* feat: remove unused _includeDump arg
---
 .../contracts-bedrock/scripts/deploy/Deploy.s.sol   | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 56e6b6feba3d..c013430262c4 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -167,14 +167,7 @@ contract Deploy is Deployer {
     /// @notice Deploy a new OP Chain using an existing SuperchainConfig and ProtocolVersions
     /// @param _superchainConfigProxy Address of the existing SuperchainConfig proxy
     /// @param _protocolVersionsProxy Address of the existing ProtocolVersions proxy
-    /// @param _includeDump Whether to include a state dump after deployment
-    function runWithSuperchain(
-        address payable _superchainConfigProxy,
-        address payable _protocolVersionsProxy,
-        bool _includeDump
-    )
-        public
-    {
+    function runWithSuperchain(address payable _superchainConfigProxy, address payable _protocolVersionsProxy) public {
         require(_superchainConfigProxy != address(0), "Deploy: must specify address for superchain config proxy");
         require(_protocolVersionsProxy != address(0), "Deploy: must specify address for protocol versions proxy");
 
@@ -191,10 +184,6 @@ contract Deploy is Deployer {
         save("ProtocolVersionsProxy", _protocolVersionsProxy);
 
         _run(false);
-
-        if (_includeDump) {
-            vm.dumpState(Config.stateDumpPath(""));
-        }
     }
 
     function runWithStateDump() public {

From e1e5d063e42e375b9abc5ecdf3171a153533db9e Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Tue, 3 Dec 2024 17:32:03 +0100
Subject: [PATCH 335/451] Sc/remove todo justfile (#13179)

* remove done todo from just file

* remove done todo from just file
---
 packages/contracts-bedrock/justfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 4ea97d4c61d9..387a1240b1b5 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -204,7 +204,6 @@ semgrep:
 semgrep-test:
   cd ../../ && semgrep scan --test --config .semgrep/rules/ .semgrep/tests/
 
-# TODO: Also run lint-forge-tests-check but we need to fix the test names first.
 # Runs all checks.
 check:
   @just gas-snapshot-check-no-build \

From 3435fcc11e1febd7a0b4ed156830f3d1bf0ac59e Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Tue, 3 Dec 2024 17:32:37 +0100
Subject: [PATCH 336/451] enables and asserts that forge coverage compiles and
 runs successfully in ci (#13171)

---
 packages/contracts-bedrock/justfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 387a1240b1b5..6a34cc6998d3 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -58,11 +58,11 @@ test-kontrol-no-build:
 
 # Runs contract coverage.
 coverage: build-go-ffi
-  forge coverage || (bash -c "forge coverage 2>&1 | grep -q 'Stack too deep' && echo -e '\\033[1;33mWARNING\\033[0m: Coverage failed with stack too deep, so overriding and exiting successfully' && exit 0 || exit 1")
+  forge coverage
 
 # Runs contract coverage with lcov.
 coverage-lcov: build-go-ffi
-  forge coverage --report lcov || (bash -c "forge coverage --report lcov 2>&1 | grep -q 'Stack too deep' && echo -e '\\033[1;33mWARNING\\033[0m: Coverage failed with stack too deep, so overriding and exiting successfully' && exit 0 || exit 1")
+  forge coverage --report lcov
 
 
 ########################################################

From f2eaaa838f52efb2f841797a4014924f7227161b Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Tue, 3 Dec 2024 12:43:11 -0500
Subject: [PATCH 337/451] feat: Remove thin wrapper _run() function overload
 (#13101)

---
 .../scripts/deploy/Deploy.s.sol                 | 17 +++++++----------
 .../scripts/deploy/DeployOwnership.s.sol        |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index c013430262c4..6eec754b2487 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -161,7 +161,7 @@ contract Deploy is Deployer {
     /// @notice Deploy all of the L1 contracts necessary for a full Superchain with a single Op Chain.
     function run() public {
         console.log("Deploying a fresh OP Stack including SuperchainConfig");
-        _run();
+        _run({ _needsSuperchain: true });
     }
 
     /// @notice Deploy a new OP Chain using an existing SuperchainConfig and ProtocolVersions
@@ -183,27 +183,24 @@ contract Deploy is Deployer {
         save("ProtocolVersions", pvProxy.implementation());
         save("ProtocolVersionsProxy", _protocolVersionsProxy);
 
-        _run(false);
+        _run({ _needsSuperchain: false });
     }
 
+    /// @notice Used for L1 alloc generation.
     function runWithStateDump() public {
         vm.chainId(cfg.l1ChainID());
-        _run();
+        _run({ _needsSuperchain: true });
         vm.dumpState(Config.stateDumpPath(""));
     }
 
     /// @notice Deploy all L1 contracts and write the state diff to a file.
+    ///         Used to generate kontrol tests.
     function runWithStateDiff() public stateDiff {
-        _run();
-    }
-
-    /// @notice Compatibility function for tests that override _run().
-    function _run() internal virtual {
-        _run(true);
+        _run({ _needsSuperchain: true });
     }
 
     /// @notice Internal function containing the deploy logic.
-    function _run(bool _needsSuperchain) internal {
+    function _run(bool _needsSuperchain) internal virtual {
         console.log("start of L1 Deploy!");
 
         // Set up the Superchain if needed.
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
index e126c39f18c9..d6c0b32cd579 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
@@ -59,7 +59,7 @@ struct GuardianConfig {
 ///         be used as an example to guide the setup and configuration of the Safe contracts.
 contract DeployOwnership is Deploy {
     /// @notice Internal function containing the deploy logic.
-    function _run() internal override {
+    function _run(bool) internal override {
         console.log("start of Ownership Deployment");
         // The SuperchainConfig is needed as a constructor argument to the Deputy Guardian Module
         deploySuperchainConfig();

From e43ade101b33ca1e31530463d012de155cec1b7f Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Tue, 3 Dec 2024 13:12:49 -0500
Subject: [PATCH 338/451] maint: remove versions.json (#13184)

Removes the legacy versions.json file and replaces it with
references to mise.toml.
---
 .circleci/config.yml                              |  4 ++--
 Makefile                                          |  2 +-
 interop-devnet/create-chains.sh                   |  2 +-
 mise.toml                                         |  2 ++
 ops/docker/Dockerfile.packages                    |  4 ++--
 ops/docker/op-stack-go/Dockerfile                 |  8 ++++++--
 ops/docker/op-stack-go/Dockerfile.dockerignore    |  2 +-
 packages/contracts-bedrock/test/kontrol/README.md |  2 +-
 .../test/kontrol/scripts/common.sh                |  6 +++---
 versions.json                                     | 15 ---------------
 10 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 versions.json

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f7b8a95e616..8cdd813d72a3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -257,7 +257,7 @@ jobs:
           working_directory: packages/contracts-bedrock
           command: |
             # Clone asterisc @ the pinned version to fetch remote `RISCV.sol`
-            ASTERISC_REV="$(cat ../../versions.json | jq -r .asterisc)"
+            ASTERISC_REV="v$(yq '.tools.asterisc' ../../mise.toml)"
             REMOTE_ASTERISC_PATH="./src/vendor/asterisc/RISCV_Remote.sol"
             git clone https://github.com/ethereum-optimism/asterisc \
               -b $ASTERISC_REV && \
@@ -526,7 +526,7 @@ jobs:
             - run:
                 name: Sign
                 command: |
-                  VER=$(jq -r .binary_signer < versions.json)
+                  VER=$(yq '.tools.binary_signer' mise.toml)
                   wget -O - "https://github.com/ethereum-optimism/binary_signer/archive/refs/tags/v${VER}.tar.gz" | tar xz
                   cd "binary_signer-${VER}/signer"
 
diff --git a/Makefile b/Makefile
index 4c901d2158ae..bcbe3e71f9be 100644
--- a/Makefile
+++ b/Makefile
@@ -248,5 +248,5 @@ update-op-geth: ## Updates the Geth version used in the project
 .PHONY: update-op-geth
 
 install-eth2-testnet-genesis:
-	go install -v github.com/protolambda/eth2-testnet-genesis@$(shell jq -r .eth2_testnet_genesis < versions.json)
+	go install -v github.com/protolambda/eth2-testnet-genesis@v$(shell yq '.tools."go:github.com/protolambda/eth2-testnet-genesis"' mise.toml)
 .PHONY: install-eth2-testnet-genesis
diff --git a/interop-devnet/create-chains.sh b/interop-devnet/create-chains.sh
index 506682099154..05e44e67ff21 100755
--- a/interop-devnet/create-chains.sh
+++ b/interop-devnet/create-chains.sh
@@ -3,7 +3,7 @@
 set -eu
 
 # Run this with workdir set as root of the repo
-if [ -f "../versions.json" ]; then
+if [ -f "../mise.toml" ]; then
     echo "Running create-chains script."
 else
     echo "Cannot run create-chains script, must be in interop-devnet dir, but currently in:"
diff --git a/mise.toml b/mise.toml
index a2cf15470a57..c1b55809da0b 100644
--- a/mise.toml
+++ b/mise.toml
@@ -6,8 +6,10 @@ rust = "1.83.0"
 python = "3.12.0"
 uv = "0.5.5"
 jq = "1.7.1"
+yq = "4.44.5"
 shellcheck = "0.10.0"
 direnv = "2.35.0"
+just = "1.37.0"
 
 # Cargo dependencies
 "cargo:just" = "1.37.0"
diff --git a/ops/docker/Dockerfile.packages b/ops/docker/Dockerfile.packages
index fd2939cb45ff..1e5786412cfb 100644
--- a/ops/docker/Dockerfile.packages
+++ b/ops/docker/Dockerfile.packages
@@ -24,7 +24,7 @@ COPY --from=foundry /usr/local/bin/cast /usr/local/bin/cast
 
 WORKDIR /opt/optimism
 
-COPY ./versions.json ./versions.json
+COPY ./mise.toml ./mise.toml
 COPY ./packages ./packages
 COPY .git/ ./.git
 COPY .gitmodules ./.gitmodules
@@ -66,7 +66,7 @@ COPY --from=1password/op:2 /usr/local/bin/op /usr/local/bin/op
 RUN mkdir -p /opt/optimism/packages/contracts-bedrock
 
 COPY --from=base /opt/optimism/packages/contracts-bedrock /opt/optimism/packages/contracts-bedrock
-COPY --from=base /opt/optimism/versions.json /opt/optimism/versions.json
+COPY --from=base /opt/optimism/mise.toml /opt/optimism/mise.toml
 
 WORKDIR /opt/optimism/packages/contracts-bedrock
 
diff --git a/ops/docker/op-stack-go/Dockerfile b/ops/docker/op-stack-go/Dockerfile
index da0fc156f027..ef1da6ce116c 100644
--- a/ops/docker/op-stack-go/Dockerfile
+++ b/ops/docker/op-stack-go/Dockerfile
@@ -14,9 +14,13 @@ FROM --platform=$BUILDPLATFORM golang:1.22.7-alpine3.20 AS builder
 
 RUN apk add --no-cache curl tar gzip make gcc musl-dev linux-headers git jq bash
 
+# install yq
+RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq && \
+    chmod +x /usr/local/bin/yq
+
 # install versioned toolchain
-COPY ./versions.json .
-RUN curl -L https://github.com/casey/just/releases/download/$(jq -r .just < versions.json)/just-$(jq -r .just < versions.json)-x86_64-unknown-linux-musl.tar.gz | \
+COPY ./mise.toml .
+RUN curl -L https://github.com/casey/just/releases/download/$(yq '.tools.just' mise.toml)/just-$(yq '.tools.just' mise.toml)-x86_64-unknown-linux-musl.tar.gz | \
     tar xz -C /usr/local/bin just
 
 # We copy the go.mod/sum first, so the `go mod download` does not have to re-run if dependencies do not change.
diff --git a/ops/docker/op-stack-go/Dockerfile.dockerignore b/ops/docker/op-stack-go/Dockerfile.dockerignore
index edf3bbc1c51d..847bbbb0eb75 100644
--- a/ops/docker/op-stack-go/Dockerfile.dockerignore
+++ b/ops/docker/op-stack-go/Dockerfile.dockerignore
@@ -21,4 +21,4 @@
 !/go.mod
 !/go.sum
 !/just
-!/versions.json
+!/mise.toml
diff --git a/packages/contracts-bedrock/test/kontrol/README.md b/packages/contracts-bedrock/test/kontrol/README.md
index 1103feed1a08..9621160976e6 100644
--- a/packages/contracts-bedrock/test/kontrol/README.md
+++ b/packages/contracts-bedrock/test/kontrol/README.md
@@ -90,7 +90,7 @@ Use the [`run-kontrol.sh`](./scripts/run-kontrol.sh) script to runs the proofs i
 The `run-kontrol.sh` script supports three modes of proof execution:
 
 - `container`: Runs the proofs using the same Docker image used in CI. This is the default execution mode—if no arguments are provided, the proofs will be executed in this mode.
-- `local`: Runs the proofs with your local Kontrol install, and enforces that the Kontrol version matches the one used in CI, which is specified in [`versions.json`](../../../../versions.json).
+- `local`: Runs the proofs with your local Kontrol install, and enforces that the Kontrol version matches the one used in CI, which is specified in [`mise.toml`](../../../../mise.toml).
 - `dev`: Run the proofs with your local Kontrol install, without enforcing any version in particular. The intended use case is proof development and related matters.
 
 It also supports two methods for specifying which tests to execute:
diff --git a/packages/contracts-bedrock/test/kontrol/scripts/common.sh b/packages/contracts-bedrock/test/kontrol/scripts/common.sh
index 3b99c3e50624..c301b28a9bd8 100644
--- a/packages/contracts-bedrock/test/kontrol/scripts/common.sh
+++ b/packages/contracts-bedrock/test/kontrol/scripts/common.sh
@@ -11,7 +11,7 @@ usage_run_kontrol() {
   echo "" 1>&2
   echo "Execution modes:"
   echo "  container          Run in docker container. Reproduce CI execution. (Default)" 1>&2
-  echo "  local              Run locally, enforces registered versions.json version for better reproducibility. (Recommended)" 1>&2
+  echo "  local              Run locally, enforces registered mise.toml version for better reproducibility. (Recommended)" 1>&2
   echo "  dev                Run locally, does NOT enforce registered version. (Useful for developing with new versions and features)" 1>&2
   echo "" 1>&2
   echo "Tests executed:"
@@ -28,7 +28,7 @@ usage_make_summary() {
   echo "" 1>&2
   echo "Execution modes:"
   echo "  container          Run in docker container. Reproduce CI execution. (Default)" 1>&2
-  echo "  local              Run locally, enforces registered versions.json version for better reproducibility. (Recommended)" 1>&2
+  echo "  local              Run locally, enforces registered mise.toml version for better reproducibility. (Recommended)" 1>&2
   echo "  dev                Run locally, does NOT enforce registered version. (Useful for developing with new versions and features)" 1>&2
   exit 0
 }
@@ -43,7 +43,7 @@ export CONTAINER_NAME=kontrol-tests
 if [ "$KONTROL_FP_DEPLOYMENT" = true ]; then
   export CONTAINER_NAME=kontrol-fp-tests
 fi
-KONTROLRC=$(jq -r .kontrol < "$WORKSPACE_DIR/../../versions.json")
+KONTROLRC=$(yq '.tools.kontrol' "$WORKSPACE_DIR/../../mise.toml")
 export KONTROL_RELEASE=$KONTROLRC
 export LOCAL=false
 export SCRIPT_TESTS=false
diff --git a/versions.json b/versions.json
deleted file mode 100644
index e734259955f6..000000000000
--- a/versions.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "go": "1.22.6",
-  "abigen": "v1.10.25",
-  "foundry": "143abd6a768eeb52a5785240b763d72a56987b4a",
-  "geth": "v1.14.7",
-  "geth_release": "1.14.7-aa55f5ea",
-  "eth2_testnet_genesis": "v0.10.0",
-  "nvm": "v20.9.0",
-  "slither": "0.10.2",
-  "kontrol": "1.0.53",
-  "just": "1.34.0",
-  "binary_signer": "1.0.4",
-  "semgrep": "1.90.0",
-  "asterisc": "v1.1.2"
-}

From 622fb352b935a5dfc083af96701a97bd1ebe9cde Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 3 Dec 2024 11:14:24 -0700
Subject: [PATCH 339/451] op-batcher: Wait for queue to drain before shutdown
 (#13172)

Tests are flaking because the batcher's txmgr still polls for receipts after shutdown. Those polls emit logs, which then cause the tests to panic. To fix, I updated the batcher shutdown code to wait for all pending transactions in the tx queue to complete.
---
 op-batcher/batcher/driver.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index d52a31bba60b..729626cd946c 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -482,6 +482,9 @@ func (l *BatchSubmitter) mainLoop(ctx context.Context, receiptsCh chan txmgr.TxR
 
 			l.publishStateToL1(queue, receiptsCh, daGroup, l.Config.PollInterval)
 		case <-ctx.Done():
+			if err := queue.Wait(); err != nil {
+				l.Log.Error("error waiting for transactions to complete", "err", err)
+			}
 			l.Log.Warn("main loop returning")
 			return
 		}

From a46cc6163b0eacb1e86097259bb6b50419975e4d Mon Sep 17 00:00:00 2001
From: Sam Stokes <35908605+bitwiseguy@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:15:11 -0500
Subject: [PATCH 340/451] op-deployer: fix nil dereference of SuperchainRoles
 (#13178)

---
 op-deployer/pkg/deployer/state/intent.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index 067ea5bead6d..5b1e4222b3e0 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -98,6 +98,9 @@ func (c *Intent) validateCustomConfig() error {
 		return ErrL2ContractsLocatorUndefined
 	}
 
+	if c.SuperchainRoles == nil {
+		return errors.New("SuperchainRoles is set to nil")
+	}
 	if err := c.SuperchainRoles.CheckNoZeroAddresses(); err != nil {
 		return err
 	}
@@ -149,7 +152,7 @@ func (c *Intent) validateStandardValues() error {
 	if err != nil {
 		return fmt.Errorf("error getting standard superchain roles: %w", err)
 	}
-	if *c.SuperchainRoles != *standardSuperchainRoles {
+	if c.SuperchainRoles == nil || *c.SuperchainRoles != *standardSuperchainRoles {
 		return fmt.Errorf("SuperchainRoles does not match standard value")
 	}
 

From 508ccbe7918f904a354927477d0cfc20f6558154 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 3 Dec 2024 11:35:03 -0700
Subject: [PATCH 341/451] op-deployer/ctb: Add DeployOPCM script (#13187)

* op-deployer/ctb: Add DeployOPCM script

Adds a dedicated script to deploy OPCM for use with a future op-deployer bootstrap command. We'll use this for the Holocene deployment.

* Update packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol

Co-authored-by: blaine <blainemalone01@gmail.com>

* Update packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol

Co-authored-by: blaine <blainemalone01@gmail.com>

* remove unused import

* forgot an import

---------

Co-authored-by: blaine <blainemalone01@gmail.com>
---
 .../scripts/deploy/DeployOPCM.s.sol           | 280 ++++++++++++++++++
 .../test/opcm/DeployOPCM.t.sol                | 273 +++++++++++++++++
 2 files changed, 553 insertions(+)
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol
 create mode 100644 packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol

diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol
new file mode 100644
index 000000000000..507dd049544b
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol
@@ -0,0 +1,280 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { Script } from "forge-std/Script.sol";
+
+import { LibString } from "@solady/utils/LibString.sol";
+
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+import { OPContractsManager } from "src/L1/OPContractsManager.sol";
+
+contract DeployOPCMInput is BaseDeployIO {
+    ISuperchainConfig internal _superchainConfig;
+    IProtocolVersions internal _protocolVersions;
+    string internal _l1ContractsRelease;
+
+    address internal _addressManagerBlueprint;
+    address internal _proxyBlueprint;
+    address internal _proxyAdminBlueprint;
+    address internal _l1ChugSplashProxyBlueprint;
+    address internal _resolvedDelegateProxyBlueprint;
+    address internal _anchorStateRegistryBlueprint;
+    address internal _permissionedDisputeGame1Blueprint;
+    address internal _permissionedDisputeGame2Blueprint;
+
+    address internal _l1ERC721BridgeImpl;
+    address internal _optimismPortalImpl;
+    address internal _systemConfigImpl;
+    address internal _optimismMintableERC20FactoryImpl;
+    address internal _l1CrossDomainMessengerImpl;
+    address internal _l1StandardBridgeImpl;
+    address internal _disputeGameFactoryImpl;
+    address internal _delayedWETHImpl;
+    address internal _mipsImpl;
+
+    // Setter for address type
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "DeployOPCMInput: cannot set zero address");
+
+        if (_sel == this.superchainConfig.selector) _superchainConfig = ISuperchainConfig(_addr);
+        else if (_sel == this.protocolVersions.selector) _protocolVersions = IProtocolVersions(_addr);
+        else if (_sel == this.addressManagerBlueprint.selector) _addressManagerBlueprint = _addr;
+        else if (_sel == this.proxyBlueprint.selector) _proxyBlueprint = _addr;
+        else if (_sel == this.proxyAdminBlueprint.selector) _proxyAdminBlueprint = _addr;
+        else if (_sel == this.l1ChugSplashProxyBlueprint.selector) _l1ChugSplashProxyBlueprint = _addr;
+        else if (_sel == this.resolvedDelegateProxyBlueprint.selector) _resolvedDelegateProxyBlueprint = _addr;
+        else if (_sel == this.anchorStateRegistryBlueprint.selector) _anchorStateRegistryBlueprint = _addr;
+        else if (_sel == this.permissionedDisputeGame1Blueprint.selector) _permissionedDisputeGame1Blueprint = _addr;
+        else if (_sel == this.permissionedDisputeGame2Blueprint.selector) _permissionedDisputeGame2Blueprint = _addr;
+        else if (_sel == this.l1ERC721BridgeImpl.selector) _l1ERC721BridgeImpl = _addr;
+        else if (_sel == this.optimismPortalImpl.selector) _optimismPortalImpl = _addr;
+        else if (_sel == this.systemConfigImpl.selector) _systemConfigImpl = _addr;
+        else if (_sel == this.optimismMintableERC20FactoryImpl.selector) _optimismMintableERC20FactoryImpl = _addr;
+        else if (_sel == this.l1CrossDomainMessengerImpl.selector) _l1CrossDomainMessengerImpl = _addr;
+        else if (_sel == this.l1StandardBridgeImpl.selector) _l1StandardBridgeImpl = _addr;
+        else if (_sel == this.disputeGameFactoryImpl.selector) _disputeGameFactoryImpl = _addr;
+        else if (_sel == this.delayedWETHImpl.selector) _delayedWETHImpl = _addr;
+        else if (_sel == this.mipsImpl.selector) _mipsImpl = _addr;
+        else revert("DeployOPCMInput: unknown selector");
+    }
+
+    // Setter for string type
+    function set(bytes4 _sel, string memory _value) public {
+        require(!LibString.eq(_value, ""), "DeployOPCMInput: cannot set empty string");
+        if (_sel == this.l1ContractsRelease.selector) _l1ContractsRelease = _value;
+        else revert("DeployOPCMInput: unknown selector");
+    }
+
+    // Getters
+    function superchainConfig() public view returns (ISuperchainConfig) {
+        require(address(_superchainConfig) != address(0), "DeployOPCMInput: not set");
+        return _superchainConfig;
+    }
+
+    function protocolVersions() public view returns (IProtocolVersions) {
+        require(address(_protocolVersions) != address(0), "DeployOPCMInput: not set");
+        return _protocolVersions;
+    }
+
+    function l1ContractsRelease() public view returns (string memory) {
+        require(!LibString.eq(_l1ContractsRelease, ""), "DeployOPCMInput: not set");
+        return _l1ContractsRelease;
+    }
+
+    function addressManagerBlueprint() public view returns (address) {
+        require(_addressManagerBlueprint != address(0), "DeployOPCMInput: not set");
+        return _addressManagerBlueprint;
+    }
+
+    function proxyBlueprint() public view returns (address) {
+        require(_proxyBlueprint != address(0), "DeployOPCMInput: not set");
+        return _proxyBlueprint;
+    }
+
+    function proxyAdminBlueprint() public view returns (address) {
+        require(_proxyAdminBlueprint != address(0), "DeployOPCMInput: not set");
+        return _proxyAdminBlueprint;
+    }
+
+    function l1ChugSplashProxyBlueprint() public view returns (address) {
+        require(_l1ChugSplashProxyBlueprint != address(0), "DeployOPCMInput: not set");
+        return _l1ChugSplashProxyBlueprint;
+    }
+
+    function resolvedDelegateProxyBlueprint() public view returns (address) {
+        require(_resolvedDelegateProxyBlueprint != address(0), "DeployOPCMInput: not set");
+        return _resolvedDelegateProxyBlueprint;
+    }
+
+    function anchorStateRegistryBlueprint() public view returns (address) {
+        require(_anchorStateRegistryBlueprint != address(0), "DeployOPCMInput: not set");
+        return _anchorStateRegistryBlueprint;
+    }
+
+    function permissionedDisputeGame1Blueprint() public view returns (address) {
+        require(_permissionedDisputeGame1Blueprint != address(0), "DeployOPCMInput: not set");
+        return _permissionedDisputeGame1Blueprint;
+    }
+
+    function permissionedDisputeGame2Blueprint() public view returns (address) {
+        require(_permissionedDisputeGame2Blueprint != address(0), "DeployOPCMInput: not set");
+        return _permissionedDisputeGame2Blueprint;
+    }
+
+    function l1ERC721BridgeImpl() public view returns (address) {
+        require(_l1ERC721BridgeImpl != address(0), "DeployOPCMInput: not set");
+        return _l1ERC721BridgeImpl;
+    }
+
+    function optimismPortalImpl() public view returns (address) {
+        require(_optimismPortalImpl != address(0), "DeployOPCMInput: not set");
+        return _optimismPortalImpl;
+    }
+
+    function systemConfigImpl() public view returns (address) {
+        require(_systemConfigImpl != address(0), "DeployOPCMInput: not set");
+        return _systemConfigImpl;
+    }
+
+    function optimismMintableERC20FactoryImpl() public view returns (address) {
+        require(_optimismMintableERC20FactoryImpl != address(0), "DeployOPCMInput: not set");
+        return _optimismMintableERC20FactoryImpl;
+    }
+
+    function l1CrossDomainMessengerImpl() public view returns (address) {
+        require(_l1CrossDomainMessengerImpl != address(0), "DeployOPCMInput: not set");
+        return _l1CrossDomainMessengerImpl;
+    }
+
+    function l1StandardBridgeImpl() public view returns (address) {
+        require(_l1StandardBridgeImpl != address(0), "DeployOPCMInput: not set");
+        return _l1StandardBridgeImpl;
+    }
+
+    function disputeGameFactoryImpl() public view returns (address) {
+        require(_disputeGameFactoryImpl != address(0), "DeployOPCMInput: not set");
+        return _disputeGameFactoryImpl;
+    }
+
+    function delayedWETHImpl() public view returns (address) {
+        require(_delayedWETHImpl != address(0), "DeployOPCMInput: not set");
+        return _delayedWETHImpl;
+    }
+
+    function mipsImpl() public view returns (address) {
+        require(_mipsImpl != address(0), "DeployOPCMInput: not set");
+        return _mipsImpl;
+    }
+}
+
+contract DeployOPCMOutput is BaseDeployIO {
+    OPContractsManager internal _opcm;
+
+    // Setter for address type
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "DeployOPCMOutput: cannot set zero address");
+        if (_sel == this.opcm.selector) _opcm = OPContractsManager(_addr);
+        else revert("DeployOPCMOutput: unknown selector");
+    }
+
+    // Getter
+    function opcm() public view returns (OPContractsManager) {
+        require(address(_opcm) != address(0), "DeployOPCMOutput: not set");
+        return _opcm;
+    }
+}
+
+contract DeployOPCM is Script {
+    function run(DeployOPCMInput _doi, DeployOPCMOutput _doo) public {
+        OPContractsManager.Blueprints memory blueprints = OPContractsManager.Blueprints({
+            addressManager: _doi.addressManagerBlueprint(),
+            proxy: _doi.proxyBlueprint(),
+            proxyAdmin: _doi.proxyAdminBlueprint(),
+            l1ChugSplashProxy: _doi.l1ChugSplashProxyBlueprint(),
+            resolvedDelegateProxy: _doi.resolvedDelegateProxyBlueprint(),
+            anchorStateRegistry: _doi.anchorStateRegistryBlueprint(),
+            permissionedDisputeGame1: _doi.permissionedDisputeGame1Blueprint(),
+            permissionedDisputeGame2: _doi.permissionedDisputeGame2Blueprint()
+        });
+        OPContractsManager.Implementations memory implementations = OPContractsManager.Implementations({
+            l1ERC721BridgeImpl: address(_doi.l1ERC721BridgeImpl()),
+            optimismPortalImpl: address(_doi.optimismPortalImpl()),
+            systemConfigImpl: address(_doi.systemConfigImpl()),
+            optimismMintableERC20FactoryImpl: address(_doi.optimismMintableERC20FactoryImpl()),
+            l1CrossDomainMessengerImpl: address(_doi.l1CrossDomainMessengerImpl()),
+            l1StandardBridgeImpl: address(_doi.l1StandardBridgeImpl()),
+            disputeGameFactoryImpl: address(_doi.disputeGameFactoryImpl()),
+            delayedWETHImpl: address(_doi.delayedWETHImpl()),
+            mipsImpl: address(_doi.mipsImpl())
+        });
+
+        OPContractsManager opcm_ = deployOPCM(
+            _doi.superchainConfig(), _doi.protocolVersions(), blueprints, implementations, _doi.l1ContractsRelease()
+        );
+        _doo.set(_doo.opcm.selector, address(opcm_));
+
+        assertValidOpcm(_doi, _doo);
+    }
+
+    function deployOPCM(
+        ISuperchainConfig _superchainConfig,
+        IProtocolVersions _protocolVersions,
+        OPContractsManager.Blueprints memory _blueprints,
+        OPContractsManager.Implementations memory _implementations,
+        string memory _l1ContractsRelease
+    )
+        public
+        returns (OPContractsManager opcm_)
+    {
+        vm.broadcast(msg.sender);
+        opcm_ = new OPContractsManager(
+            _superchainConfig, _protocolVersions, _l1ContractsRelease, _blueprints, _implementations
+        );
+        vm.label(address(opcm_), "OPContractsManager");
+    }
+
+    function assertValidOpcm(DeployOPCMInput _doi, DeployOPCMOutput _doo) public view {
+        OPContractsManager impl = OPContractsManager(address(_doo.opcm()));
+        require(address(impl.superchainConfig()) == address(_doi.superchainConfig()), "OPCMI-10");
+        require(address(impl.protocolVersions()) == address(_doi.protocolVersions()), "OPCMI-20");
+        require(LibString.eq(impl.l1ContractsRelease(), _doi.l1ContractsRelease()));
+
+        OPContractsManager.Blueprints memory blueprints = impl.blueprints();
+        require(blueprints.addressManager == _doi.addressManagerBlueprint(), "OPCMI-40");
+        require(blueprints.proxy == _doi.proxyBlueprint(), "OPCMI-50");
+        require(blueprints.proxyAdmin == _doi.proxyAdminBlueprint(), "OPCMI-60");
+        require(blueprints.l1ChugSplashProxy == _doi.l1ChugSplashProxyBlueprint(), "OPCMI-70");
+        require(blueprints.resolvedDelegateProxy == _doi.resolvedDelegateProxyBlueprint(), "OPCMI-80");
+        require(blueprints.anchorStateRegistry == _doi.anchorStateRegistryBlueprint(), "OPCMI-90");
+        require(blueprints.permissionedDisputeGame1 == _doi.permissionedDisputeGame1Blueprint(), "OPCMI-100");
+        require(blueprints.permissionedDisputeGame2 == _doi.permissionedDisputeGame2Blueprint(), "OPCMI-110");
+
+        OPContractsManager.Implementations memory implementations = impl.implementations();
+        require(implementations.l1ERC721BridgeImpl == _doi.l1ERC721BridgeImpl(), "OPCMI-120");
+        require(implementations.optimismPortalImpl == _doi.optimismPortalImpl(), "OPCMI-130");
+        require(implementations.systemConfigImpl == _doi.systemConfigImpl(), "OPCMI-140");
+        require(
+            implementations.optimismMintableERC20FactoryImpl == _doi.optimismMintableERC20FactoryImpl(), "OPCMI-150"
+        );
+        require(implementations.l1CrossDomainMessengerImpl == _doi.l1CrossDomainMessengerImpl(), "OPCMI-160");
+        require(implementations.l1StandardBridgeImpl == _doi.l1StandardBridgeImpl(), "OPCMI-170");
+        require(implementations.disputeGameFactoryImpl == _doi.disputeGameFactoryImpl(), "OPCMI-180");
+        require(implementations.delayedWETHImpl == _doi.delayedWETHImpl(), "OPCMI-190");
+        require(implementations.mipsImpl == _doi.mipsImpl(), "OPCMI-200");
+    }
+
+    function etchIOContracts() public returns (DeployOPCMInput doi_, DeployOPCMOutput doo_) {
+        (doi_, doo_) = getIOContracts();
+        vm.etch(address(doi_), type(DeployOPCMInput).runtimeCode);
+        vm.etch(address(doo_), type(DeployOPCMOutput).runtimeCode);
+    }
+
+    function getIOContracts() public view returns (DeployOPCMInput doi_, DeployOPCMOutput doo_) {
+        doi_ = DeployOPCMInput(DeployUtils.toIOAddress(msg.sender, "optimism.DeployOPCMInput"));
+        doo_ = DeployOPCMOutput(DeployUtils.toIOAddress(msg.sender, "optimism.DeployOPCMOutput"));
+    }
+}
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol
new file mode 100644
index 000000000000..81bf44eb0bc7
--- /dev/null
+++ b/packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { Test } from "forge-std/Test.sol";
+import { DeployOPCM, DeployOPCMInput, DeployOPCMOutput } from "scripts/deploy/DeployOPCM.s.sol";
+import { OPContractsManager } from "src/L1/OPContractsManager.sol";
+import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+
+contract DeployOPCMInput_Test is Test {
+    DeployOPCMInput dii;
+    string release = "1.0.0";
+
+    function setUp() public {
+        dii = new DeployOPCMInput();
+    }
+
+    function test_getters_whenNotSet_reverts() public {
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.superchainConfig();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.protocolVersions();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.l1ContractsRelease();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.addressManagerBlueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.proxyBlueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.proxyAdminBlueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.l1ChugSplashProxyBlueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.resolvedDelegateProxyBlueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.anchorStateRegistryBlueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.permissionedDisputeGame1Blueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.permissionedDisputeGame2Blueprint();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.l1ERC721BridgeImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.optimismPortalImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.systemConfigImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.optimismMintableERC20FactoryImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.l1CrossDomainMessengerImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.l1StandardBridgeImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.disputeGameFactoryImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.delayedWETHImpl();
+
+        vm.expectRevert("DeployOPCMInput: not set");
+        dii.mipsImpl();
+    }
+
+    // Below setter tests are split into two parts to avoid stack too deep errors
+
+    function test_set_part1_succeeds() public {
+        ISuperchainConfig superchainConfig = ISuperchainConfig(makeAddr("superchainConfig"));
+        IProtocolVersions protocolVersions = IProtocolVersions(makeAddr("protocolVersions"));
+        address addressManagerBlueprint = makeAddr("addressManagerBlueprint");
+        address proxyBlueprint = makeAddr("proxyBlueprint");
+        address proxyAdminBlueprint = makeAddr("proxyAdminBlueprint");
+        address l1ChugSplashProxyBlueprint = makeAddr("l1ChugSplashProxyBlueprint");
+        address resolvedDelegateProxyBlueprint = makeAddr("resolvedDelegateProxyBlueprint");
+        address anchorStateRegistryBlueprint = makeAddr("anchorStateRegistryBlueprint");
+        address permissionedDisputeGame1Blueprint = makeAddr("permissionedDisputeGame1Blueprint");
+        address permissionedDisputeGame2Blueprint = makeAddr("permissionedDisputeGame2Blueprint");
+
+        dii.set(dii.superchainConfig.selector, address(superchainConfig));
+        dii.set(dii.protocolVersions.selector, address(protocolVersions));
+        dii.set(dii.l1ContractsRelease.selector, release);
+        dii.set(dii.addressManagerBlueprint.selector, addressManagerBlueprint);
+        dii.set(dii.proxyBlueprint.selector, proxyBlueprint);
+        dii.set(dii.proxyAdminBlueprint.selector, proxyAdminBlueprint);
+        dii.set(dii.l1ChugSplashProxyBlueprint.selector, l1ChugSplashProxyBlueprint);
+        dii.set(dii.resolvedDelegateProxyBlueprint.selector, resolvedDelegateProxyBlueprint);
+        dii.set(dii.anchorStateRegistryBlueprint.selector, anchorStateRegistryBlueprint);
+        dii.set(dii.permissionedDisputeGame1Blueprint.selector, permissionedDisputeGame1Blueprint);
+        dii.set(dii.permissionedDisputeGame2Blueprint.selector, permissionedDisputeGame2Blueprint);
+
+        assertEq(address(dii.superchainConfig()), address(superchainConfig), "50");
+        assertEq(address(dii.protocolVersions()), address(protocolVersions), "100");
+        assertEq(dii.l1ContractsRelease(), release, "150");
+        assertEq(dii.addressManagerBlueprint(), addressManagerBlueprint, "200");
+        assertEq(dii.proxyBlueprint(), proxyBlueprint, "250");
+        assertEq(dii.proxyAdminBlueprint(), proxyAdminBlueprint, "300");
+        assertEq(dii.l1ChugSplashProxyBlueprint(), l1ChugSplashProxyBlueprint, "350");
+        assertEq(dii.resolvedDelegateProxyBlueprint(), resolvedDelegateProxyBlueprint, "400");
+        assertEq(dii.anchorStateRegistryBlueprint(), anchorStateRegistryBlueprint, "450");
+        assertEq(dii.permissionedDisputeGame1Blueprint(), permissionedDisputeGame1Blueprint, "500");
+        assertEq(dii.permissionedDisputeGame2Blueprint(), permissionedDisputeGame2Blueprint, "550");
+    }
+
+    function test_set_part2_succeeds() public {
+        address l1ERC721BridgeImpl = makeAddr("l1ERC721BridgeImpl");
+        address optimismPortalImpl = makeAddr("optimismPortalImpl");
+        address systemConfigImpl = makeAddr("systemConfigImpl");
+        address optimismMintableERC20FactoryImpl = makeAddr("optimismMintableERC20FactoryImpl");
+        address l1CrossDomainMessengerImpl = makeAddr("l1CrossDomainMessengerImpl");
+        address l1StandardBridgeImpl = makeAddr("l1StandardBridgeImpl");
+        address disputeGameFactoryImpl = makeAddr("disputeGameFactoryImpl");
+        address delayedWETHImpl = makeAddr("delayedWETHImpl");
+        address mipsImpl = makeAddr("mipsImpl");
+
+        dii.set(dii.l1ERC721BridgeImpl.selector, l1ERC721BridgeImpl);
+        dii.set(dii.optimismPortalImpl.selector, optimismPortalImpl);
+        dii.set(dii.systemConfigImpl.selector, systemConfigImpl);
+        dii.set(dii.optimismMintableERC20FactoryImpl.selector, optimismMintableERC20FactoryImpl);
+        dii.set(dii.l1CrossDomainMessengerImpl.selector, l1CrossDomainMessengerImpl);
+        dii.set(dii.l1StandardBridgeImpl.selector, l1StandardBridgeImpl);
+        dii.set(dii.disputeGameFactoryImpl.selector, disputeGameFactoryImpl);
+        dii.set(dii.delayedWETHImpl.selector, delayedWETHImpl);
+        dii.set(dii.mipsImpl.selector, mipsImpl);
+
+        assertEq(dii.l1ERC721BridgeImpl(), l1ERC721BridgeImpl, "600");
+        assertEq(dii.optimismPortalImpl(), optimismPortalImpl, "650");
+        assertEq(dii.systemConfigImpl(), systemConfigImpl, "700");
+        assertEq(dii.optimismMintableERC20FactoryImpl(), optimismMintableERC20FactoryImpl, "750");
+        assertEq(dii.l1CrossDomainMessengerImpl(), l1CrossDomainMessengerImpl, "800");
+        assertEq(dii.l1StandardBridgeImpl(), l1StandardBridgeImpl, "850");
+        assertEq(dii.disputeGameFactoryImpl(), disputeGameFactoryImpl, "900");
+        assertEq(dii.delayedWETHImpl(), delayedWETHImpl, "950");
+        assertEq(dii.mipsImpl(), mipsImpl, "1000");
+    }
+
+    function test_set_withZeroAddress_reverts() public {
+        vm.expectRevert("DeployOPCMInput: cannot set zero address");
+        dii.set(dii.superchainConfig.selector, address(0));
+    }
+
+    function test_set_withEmptyString_reverts() public {
+        vm.expectRevert("DeployOPCMInput: cannot set empty string");
+        dii.set(dii.l1ContractsRelease.selector, "");
+    }
+
+    function test_set_withInvalidSelector_reverts() public {
+        vm.expectRevert("DeployOPCMInput: unknown selector");
+        dii.set(bytes4(0xdeadbeef), address(1));
+    }
+
+    function test_set_withInvalidStringSelector_reverts() public {
+        vm.expectRevert("DeployOPCMInput: unknown selector");
+        dii.set(bytes4(0xdeadbeef), "test");
+    }
+}
+
+contract DeployOPCMOutput_Test is Test {
+    DeployOPCMOutput doo;
+
+    function setUp() public {
+        doo = new DeployOPCMOutput();
+    }
+
+    function test_getters_whenNotSet_reverts() public {
+        vm.expectRevert("DeployOPCMOutput: not set");
+        doo.opcm();
+    }
+
+    function test_set_succeeds() public {
+        OPContractsManager opcm = OPContractsManager(makeAddr("opcm"));
+        vm.etch(address(opcm), hex"01");
+
+        doo.set(doo.opcm.selector, address(opcm));
+
+        assertEq(address(doo.opcm()), address(opcm), "50");
+    }
+
+    function test_set_withZeroAddress_reverts() public {
+        vm.expectRevert("DeployOPCMOutput: cannot set zero address");
+        doo.set(doo.opcm.selector, address(0));
+    }
+
+    function test_set_withInvalidSelector_reverts() public {
+        vm.expectRevert("DeployOPCMOutput: unknown selector");
+        doo.set(bytes4(0xdeadbeef), makeAddr("test"));
+    }
+}
+
+contract DeployOPCMTest is Test {
+    DeployOPCM deployOPCM;
+    DeployOPCMInput doi;
+    DeployOPCMOutput doo;
+
+    ISuperchainConfig superchainConfigProxy = ISuperchainConfig(makeAddr("superchainConfigProxy"));
+    IProtocolVersions protocolVersionsProxy = IProtocolVersions(makeAddr("protocolVersionsProxy"));
+
+    function setUp() public virtual {
+        deployOPCM = new DeployOPCM();
+        (doi, doo) = deployOPCM.etchIOContracts();
+    }
+
+    function test_run_succeeds() public {
+        doi.set(doi.superchainConfig.selector, address(superchainConfigProxy));
+        doi.set(doi.protocolVersions.selector, address(protocolVersionsProxy));
+        doi.set(doi.l1ContractsRelease.selector, "1.0.0");
+
+        // Set and etch blueprints
+        doi.set(doi.addressManagerBlueprint.selector, makeAddr("addressManagerBlueprint"));
+        doi.set(doi.proxyBlueprint.selector, makeAddr("proxyBlueprint"));
+        doi.set(doi.proxyAdminBlueprint.selector, makeAddr("proxyAdminBlueprint"));
+        doi.set(doi.l1ChugSplashProxyBlueprint.selector, makeAddr("l1ChugSplashProxyBlueprint"));
+        doi.set(doi.resolvedDelegateProxyBlueprint.selector, makeAddr("resolvedDelegateProxyBlueprint"));
+        doi.set(doi.anchorStateRegistryBlueprint.selector, makeAddr("anchorStateRegistryBlueprint"));
+        doi.set(doi.permissionedDisputeGame1Blueprint.selector, makeAddr("permissionedDisputeGame1Blueprint"));
+        doi.set(doi.permissionedDisputeGame2Blueprint.selector, makeAddr("permissionedDisputeGame2Blueprint"));
+
+        // Set and etch implementations
+        doi.set(doi.l1ERC721BridgeImpl.selector, makeAddr("l1ERC721BridgeImpl"));
+        doi.set(doi.optimismPortalImpl.selector, makeAddr("optimismPortalImpl"));
+        doi.set(doi.systemConfigImpl.selector, makeAddr("systemConfigImpl"));
+        doi.set(doi.optimismMintableERC20FactoryImpl.selector, makeAddr("optimismMintableERC20FactoryImpl"));
+        doi.set(doi.l1CrossDomainMessengerImpl.selector, makeAddr("l1CrossDomainMessengerImpl"));
+        doi.set(doi.l1StandardBridgeImpl.selector, makeAddr("l1StandardBridgeImpl"));
+        doi.set(doi.disputeGameFactoryImpl.selector, makeAddr("disputeGameFactoryImpl"));
+        doi.set(doi.delayedWETHImpl.selector, makeAddr("delayedWETHImpl"));
+        doi.set(doi.mipsImpl.selector, makeAddr("mipsImpl"));
+
+        // Etch all addresses with dummy bytecode
+        vm.etch(address(doi.superchainConfig()), hex"01");
+        vm.etch(address(doi.protocolVersions()), hex"01");
+
+        vm.etch(doi.addressManagerBlueprint(), hex"01");
+        vm.etch(doi.proxyBlueprint(), hex"01");
+        vm.etch(doi.proxyAdminBlueprint(), hex"01");
+        vm.etch(doi.l1ChugSplashProxyBlueprint(), hex"01");
+        vm.etch(doi.resolvedDelegateProxyBlueprint(), hex"01");
+        vm.etch(doi.anchorStateRegistryBlueprint(), hex"01");
+        vm.etch(doi.permissionedDisputeGame1Blueprint(), hex"01");
+        vm.etch(doi.permissionedDisputeGame2Blueprint(), hex"01");
+
+        vm.etch(doi.l1ERC721BridgeImpl(), hex"01");
+        vm.etch(doi.optimismPortalImpl(), hex"01");
+        vm.etch(doi.systemConfigImpl(), hex"01");
+        vm.etch(doi.optimismMintableERC20FactoryImpl(), hex"01");
+        vm.etch(doi.l1CrossDomainMessengerImpl(), hex"01");
+        vm.etch(doi.l1StandardBridgeImpl(), hex"01");
+        vm.etch(doi.disputeGameFactoryImpl(), hex"01");
+        vm.etch(doi.delayedWETHImpl(), hex"01");
+        vm.etch(doi.mipsImpl(), hex"01");
+
+        deployOPCM.run(doi, doo);
+
+        assertNotEq(address(doo.opcm()), address(0));
+
+        // sanity check to ensure that the OPCM is validated
+        deployOPCM.assertValidOpcm(doi, doo);
+    }
+}

From e101cd8955069f184e07f9de522b9b8c25e8625f Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 3 Dec 2024 12:11:33 -0700
Subject: [PATCH 342/451] op-e2e: Recover gracefully from log-after-exit panics
 (#13190)

* op-e2e: Recover gracefully from log-after-exit panics

There are a lot of places where we log after tests exit. This PR recovers from those panics so tests can continue.

* add helper
---
 op-service/testlog/testlog.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/op-service/testlog/testlog.go b/op-service/testlog/testlog.go
index fe7ede207cbc..965fbe9d47b2 100644
--- a/op-service/testlog/testlog.go
+++ b/op-service/testlog/testlog.go
@@ -159,11 +159,22 @@ func (l *logger) flush() {
 
 	scanner := bufio.NewScanner(l.buf)
 	for scanner.Scan() {
-		l.t.Logf("%*s%s", padding, "", scanner.Text())
+		l.internalFlush("%*s%s", padding, "", scanner.Text())
 	}
 	l.buf.Reset()
 }
 
+func (l *logger) internalFlush(format string, args ...any) {
+	defer func() {
+		if r := recover(); r != nil {
+			log.Warn("testlog: panic during flush", "recover", r)
+		}
+	}()
+
+	l.t.Helper()
+	l.t.Logf(format, args...)
+}
+
 // The Go testing lib uses the runtime package to get info about the calling site, and then decorates the line.
 // We can't disable this decoration, but we can adjust the contents to align by padding after the info.
 // To pad the right amount, we estimate how long the info is.

From 67dd69338fa417061f9ae531e369d0261f87e669 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Tue, 3 Dec 2024 14:22:52 -0500
Subject: [PATCH 343/451] chore(opc): Bump `asterisc` version (#13189)

* chore(opc): Bump `asterisc` version

* semver lock
---
 mise.toml                                                | 2 +-
 packages/contracts-bedrock/snapshots/semver-lock.json    | 4 ++--
 packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mise.toml b/mise.toml
index c1b55809da0b..29bf5636e127 100644
--- a/mise.toml
+++ b/mise.toml
@@ -39,7 +39,7 @@ anvil = "nightly-143abd6a768eeb52a5785240b763d72a56987b4a"
 # Put things here if you need to track versions of tools or projects that can't
 # actually be managed by mise (yet). Make sure that anything you put in here is
 # also found inside of disabled_tools or mise will try to install it.
-asterisc = "1.1.1"
+asterisc = "1.2.0"
 kontrol = "1.0.53"
 binary_signer = "1.0.4"
 
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 7c7cadb614b9..1904131f2b00 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -212,8 +212,8 @@
     "sourceCodeHash": "0x5dc6b0b4ae4ab29085c52f74a4498d8a3d04928b844491749cd7186623e8b967"
   },
   "src/vendor/asterisc/RISCV.sol": {
-    "initCodeHash": "0x6b4323061187f2c8efe8de43bf1ecdc0798e2d95ad69470ed4151dadc094fedf",
-    "sourceCodeHash": "0x26cae049cf171efcc84c946a400704c30ebec5dba4f1548d1f1529f68f56c1ec"
+    "initCodeHash": "0x7329cca924e189eeaa2d883234f6cb5fd787c8bf3339d8298e721778c2947ce5",
+    "sourceCodeHash": "0xf85f3dac3e0fcc7f52fb62f8e66b74f2bc6798b6c9fb43e1a610c5edc04be412"
   },
   "src/vendor/eas/EAS.sol": {
     "initCodeHash": "0xf96d1ebc530ed95e2dffebcfa2b4a1f18103235e6352d97838b77b7a2c14567b",
diff --git a/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol b/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
index 09fa93a0fcdb..10a29679a251 100644
--- a/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
+++ b/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity 0.8.25;
 
 import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
 import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
@@ -14,8 +14,8 @@ contract RISCV is IBigStepper {
     IPreimageOracle public oracle;
 
     /// @notice The version of the contract.
-    /// @custom:semver 1.1.0-rc.2
-    string public constant version = "1.1.0-rc.2";
+    /// @custom:semver 1.2.0-rc.1
+    string public constant version = "1.2.0-rc.1";
 
     /// @param _oracle The preimage oracle contract.
     constructor(IPreimageOracle _oracle) {

From d0c4e370618c7ed4a3ab7ce6f699f0df62ddd8b9 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann@oplabs.co>
Date: Tue, 3 Dec 2024 21:13:43 +0100
Subject: [PATCH 344/451] op components migration to just (#13185)

* build(op-supervisor): migrate build to just

* build(op-service): migrate build to just

* build(op-conductor): migrate build to just

* build(op-wheel): migrate build to just

* build(op-challenger): cleanup visualize target

The referenced visualize.sh script doesn't exist.
It was moved around and finally deleted in #12286

* build(op-challenger): migrate build to just

* build(op-chain-ops): migrate build to just

* build(op-dispute-mon): migrate build to just

* build(op-alt-da): migrate build to just
---
 op-alt-da/Makefile      | 23 ++---------------
 op-alt-da/justfile      | 20 +++++++++++++++
 op-chain-ops/Makefile   | 55 ++---------------------------------------
 op-chain-ops/justfile   | 41 ++++++++++++++++++++++++++++++
 op-challenger/Makefile  | 36 ++-------------------------
 op-challenger/justfile  | 25 +++++++++++++++++++
 op-conductor/Makefile   | 27 ++------------------
 op-conductor/justfile   | 23 +++++++++++++++++
 op-dispute-mon/Makefile | 22 ++---------------
 op-dispute-mon/justfile | 21 ++++++++++++++++
 op-service/Makefile     | 28 ++-------------------
 op-service/justfile     | 23 +++++++++++++++++
 op-supervisor/Makefile  | 24 ++----------------
 op-supervisor/justfile  | 21 ++++++++++++++++
 op-wheel/Makefile       | 15 ++---------
 op-wheel/justfile       | 13 ++++++++++
 16 files changed, 203 insertions(+), 214 deletions(-)
 create mode 100644 op-alt-da/justfile
 create mode 100644 op-chain-ops/justfile
 create mode 100644 op-challenger/justfile
 create mode 100644 op-conductor/justfile
 create mode 100644 op-dispute-mon/justfile
 create mode 100644 op-service/justfile
 create mode 100644 op-supervisor/justfile
 create mode 100644 op-wheel/justfile

diff --git a/op-alt-da/Makefile b/op-alt-da/Makefile
index c98ea24c2095..eb6fb9b78043 100644
--- a/op-alt-da/Makefile
+++ b/op-alt-da/Makefile
@@ -1,22 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-VERSION ?= v0.0.0
+DEPRECATED_TARGETS := da-server clean test
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X main.Version=$(VERSION)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-da-server:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/da-server ./cmd/daserver
-
-clean:
-	rm bin/da-server
-
-test:
-	go test -v ./...
-
-.PHONY: \
-	op-batcher \
-	clean \
-	test
+include ../just/deprecated.mk
diff --git a/op-alt-da/justfile b/op-alt-da/justfile
new file mode 100644
index 000000000000..f1dbced35b69
--- /dev/null
+++ b/op-alt-da/justfile
@@ -0,0 +1,20 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X main.Version=" + VERSION + " " + \
+    "") + "'"
+
+BINARY := "./bin/da-server"
+
+# Build the da-server binary
+da-server: (go_build BINARY "./cmd/daserver" "-ldflags" _LDFLAGSSTRING)
+
+# Remove build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")
diff --git a/op-chain-ops/Makefile b/op-chain-ops/Makefile
index ad595b65e367..4dac7c1b6bb7 100644
--- a/op-chain-ops/Makefile
+++ b/op-chain-ops/Makefile
@@ -1,54 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
+DEPRECATED_TARGETS := ecotone-scalar receipt-reference-builder test op-deployer fuzz sync-standard-version
 
-# Find the github tag that points to this commit. If none are found, set the version string to "untagged"
-# Prioritizes release tag, if one exists, over tags suffixed with "-rc"
-VERSION ?= $(shell tags=$$(git tag --points-at $(GITCOMMIT) | grep '^op-deployer/' | sed 's/op-deployer\///' | sort -V); \
-             preferred_tag=$$(echo "$$tags" | grep -v -- '-rc' | tail -n 1); \
-             if [ -z "$$preferred_tag" ]; then \
-                 if [ -z "$$tags" ]; then \
-                     echo "untagged"; \
-                 else \
-                     echo "$$tags" | tail -n 1; \
-                 fi \
-             else \
-                 echo $$preferred_tag; \
-             fi)
-
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-chain-ops/deployer/version.Version=$(VERSION)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-chain-ops/deployer/version.Meta=$(VERSION_META)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
-ifeq ($(shell uname),Darwin)
-	FUZZLDFLAGS := -ldflags=-extldflags=-Wl,-ld_classic
-endif
-
-ecotone-scalar:
-	go build -o ./bin/ecotone-scalar ./cmd/ecotone-scalar/main.go
-
-receipt-reference-builder:
-	go build -o ./bin/receipt-reference-builder ./cmd/receipt-reference-builder/*.go
-
-test:
-	go test ./...
-
-op-deployer:
-	GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-deployer ../op-deployer/cmd/op-deployer/main.go
-
-fuzz:
-	printf "%s\n" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzEncodeDecodeWithdrawal ./crossdomain" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzEncodeDecodeLegacyWithdrawal ./crossdomain" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzAliasing ./crossdomain" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz=FuzzVersionedNonce ./crossdomain" \
-	| parallel -j 8 {}
-
-
-sync-standard-version:
-	curl -Lo ./deployer/opcm/standard-versions-mainnet.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions-mainnet.toml
-	curl -Lo ./deployer/opcm/standard-versions-sepolia.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions-sepolia.toml
-
-.PHONY: test fuzz op-deployer sync-standard-version
+include ../just/deprecated.mk
diff --git a/op-chain-ops/justfile b/op-chain-ops/justfile
new file mode 100644
index 000000000000..a9c2bcad62da
--- /dev/null
+++ b/op-chain-ops/justfile
@@ -0,0 +1,41 @@
+import '../just/go.just'
+
+# Build ldflags string
+_VERSION_META_STR := if VERSION_META != "" { "+" + VERSION_META } else { "" }
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-chain-ops/deployer/version.Version=" + VERSION + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-chain-ops/deployer/version.Meta=" + _VERSION_META_STR + " " + \
+    "") + "'"
+
+# Build ecotone-scalar binary
+ecotone-scalar: (go_build "./bin/ecotone-scalar" "./cmd/ecotone-scalar" "-ldflags" _LDFLAGSSTRING)
+
+# Build receipt-reference-builder binary  
+receipt-reference-builder: (go_build "./bin/receipt-reference-builder" "./cmd/receipt-reference-builder" "-ldflags" _LDFLAGSSTRING)
+
+# Run tests
+test: (go_test "./...")
+
+# Build op-deployer binary
+op-deployer:
+    just ../op-deployer/build
+    mkdir -p ./bin && ln -f ../op-deployer/bin/op-deployer ./bin/op-deployer
+
+# Run fuzzing tests
+[private]
+fuzz_task FUZZ TIME='10s': (go_fuzz FUZZ TIME "./crossdomain")
+
+fuzz:
+    printf "%s\n" \
+        "FuzzEncodeDecodeWithdrawal" \
+        "FuzzEncodeDecodeLegacyWithdrawal" \
+        "FuzzAliasing" \
+        "FuzzVersionedNonce" \
+    | parallel -j {{PARALLEL_JOBS}} {{just_executable()}} fuzz_task {}
+
+# Sync standard versions
+sync-standard-version:
+    curl -Lo ./deployer/opcm/standard-versions-mainnet.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions-mainnet.toml
+    curl -Lo ./deployer/opcm/standard-versions-sepolia.toml https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions-sepolia.toml
diff --git a/op-challenger/Makefile b/op-challenger/Makefile
index 1a7422a4c879..35a202b99c4c 100644
--- a/op-challenger/Makefile
+++ b/op-challenger/Makefile
@@ -1,35 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-VERSION ?= v0.0.0
+DEPRECATED_TARGETS := op-challenger clean test fuzz visualize
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-challenger/version.Version=$(VERSION)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-challenger/version.Meta=$(VERSION_META)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
-ifeq ($(shell uname),Darwin)
-	FUZZLDFLAGS := -ldflags=-extldflags=-Wl,-ld_classic
-endif
-
-op-challenger:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-challenger ./cmd
-
-fuzz:
-	go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzKeccak ./game/keccak/matrix
-
-clean:
-	rm bin/op-challenger
-
-test:
-	go test -v ./...
-
-visualize:
-	./scripts/visualize.sh
-
-.PHONY: \
-	op-challenger \
-	clean \
-	test \
-	visualize
+include ../just/deprecated.mk
diff --git a/op-challenger/justfile b/op-challenger/justfile
new file mode 100644
index 000000000000..ccb2b5fa7e91
--- /dev/null
+++ b/op-challenger/justfile
@@ -0,0 +1,25 @@
+import '../just/go.just'
+
+# Build ldflags string
+_VERSION_META_STR := if VERSION_META != "" { "+" + VERSION_META } else { "" }
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-challenger/version.Version=" + VERSION + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-challenger/version.Meta=" + _VERSION_META_STR + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-challenger"
+
+# Build op-challenger binary
+op-challenger: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
+
+# Run fuzzing tests
+fuzz: (go_fuzz "FuzzKeccak" "10s" "./game/keccak/matrix")
+
+# Clean build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")
diff --git a/op-conductor/Makefile b/op-conductor/Makefile
index 6360df3da0c8..c76af2d563c6 100644
--- a/op-conductor/Makefile
+++ b/op-conductor/Makefile
@@ -1,26 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-VERSION ?= v0.0.0
+DEPRECATED_TARGETS := op-conductor clean test generate-mocks
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X main.Version=$(VERSION)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-op-conductor:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-conductor ./cmd
-
-clean:
-	rm bin/op-conductor
-
-test:
-	go test -v ./...
-
-generate-mocks:
-	go generate ./...
-
-.PHONY: \
-	op-conductor \
-	clean \
-	test \
-	generate-mocks
+include ../just/deprecated.mk
diff --git a/op-conductor/justfile b/op-conductor/justfile
new file mode 100644
index 000000000000..7ee6ef39bcfa
--- /dev/null
+++ b/op-conductor/justfile
@@ -0,0 +1,23 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X main.Version=" + VERSION + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-conductor"
+
+# Build op-conductor binary
+op-conductor: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
+
+# Clean build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")
+
+# Generate mocks
+generate-mocks: (go_generate "./...")
\ No newline at end of file
diff --git a/op-dispute-mon/Makefile b/op-dispute-mon/Makefile
index d94a0fa95a96..6bb994650bfc 100644
--- a/op-dispute-mon/Makefile
+++ b/op-dispute-mon/Makefile
@@ -1,21 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-VERSION ?= v0.0.0
+DEPRECATED_TARGETS := op-dispute-mon clean test
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-dispute-mon/version.Version=$(VERSION)
-LDFLAGSSTRING +=-X github.com/ethereum-optimism/optimism/op-dispute-mon/version.Meta=$(VERSION_META)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-op-dispute-mon:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-dispute-mon ./cmd
-.PHONY: op-dispute-mon
-
-clean:
-	rm bin/op-dispute-mon
-.PHONY: clean
-
-test:
-	go test -v ./...
-.PHONY: test
+include ../just/deprecated.mk
diff --git a/op-dispute-mon/justfile b/op-dispute-mon/justfile
new file mode 100644
index 000000000000..3788cbd2b14a
--- /dev/null
+++ b/op-dispute-mon/justfile
@@ -0,0 +1,21 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-dispute-mon/version.Version=" + VERSION + " " + \
+    "-X github.com/ethereum-optimism/optimism/op-dispute-mon/version.Meta=" + VERSION_META + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-dispute-mon"
+
+# Build op-dispute-mon binary
+op-dispute-mon: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
+
+# Clean build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")
diff --git a/op-service/Makefile b/op-service/Makefile
index f57c0b6b53a4..eeb03302985d 100644
--- a/op-service/Makefile
+++ b/op-service/Makefile
@@ -1,27 +1,3 @@
-# Use the old Apple linker to workaround broken xcode - https://github.com/golang/go/issues/65169
-ifeq ($(shell uname),Darwin)
-	FUZZLDFLAGS := -ldflags=-extldflags=-Wl,-ld_classic
-endif
+DEPRECATED_TARGETS := test generate-mocks fuzz
 
-test:
-	go test -v ./...
-
-generate-mocks:
-	go generate ./...
-
-fuzz:
-	printf "%s\n" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadUnmarshal ./eth" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV1 ./eth" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV2 ./eth" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzExecutionPayloadMarshalUnmarshalV3 ./eth" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzOBP01 ./eth" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzEncodeDecodeBlob ./eth" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDetectNonBijectivity ./eth" \
-		"go test $(FUZZLDFLAGS) -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzEncodeScalar ./eth" \
-	| parallel -j 8 {}
-
-.PHONY: \
-	test \
-	generate-mocks \
-	fuzz
+include ../just/deprecated.mk
diff --git a/op-service/justfile b/op-service/justfile
new file mode 100644
index 000000000000..bec1214f3087
--- /dev/null
+++ b/op-service/justfile
@@ -0,0 +1,23 @@
+import '../just/go.just'
+
+# Run tests
+test: (go_test "./...")
+
+# Generate mocks
+generate-mocks: (go_generate "./...")
+
+[private]
+service_fuzz_task FUZZ TIME='10s': (go_fuzz FUZZ TIME "./eth")
+
+# Run fuzzing tests
+fuzz:
+    printf "%s\n" \
+        "FuzzExecutionPayloadUnmarshal" \
+        "FuzzExecutionPayloadMarshalUnmarshalV1" \
+        "FuzzExecutionPayloadMarshalUnmarshalV2" \
+        "FuzzExecutionPayloadMarshalUnmarshalV3" \
+        "FuzzOBP01" \
+        "FuzzEncodeDecodeBlob" \
+        "FuzzDetectNonBijectivity" \
+        "FuzzEncodeScalar" \
+    | parallel -j {{PARALLEL_JOBS}} {{just_executable()}} service_fuzz_task {}
diff --git a/op-supervisor/Makefile b/op-supervisor/Makefile
index de4f2d9d2612..144f7abd606e 100644
--- a/op-supervisor/Makefile
+++ b/op-supervisor/Makefile
@@ -1,23 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-VERSION ?= v0.0.0
+DEPRECATED_TARGETS := op-supervisor clean test
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X main.Version=$(VERSION)
-LDFLAGSSTRING +=-X main.Meta=$(VERSION_META)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-op-supervisor:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ./bin/op-supervisor ./cmd
-
-clean:
-	rm bin/op-supervisor
-
-test:
-	go test -v ./...
-
-.PHONY: \
-	op-supervisor \
-	clean \
-	test
+include ../just/deprecated.mk
diff --git a/op-supervisor/justfile b/op-supervisor/justfile
new file mode 100644
index 000000000000..7063a3ffb05e
--- /dev/null
+++ b/op-supervisor/justfile
@@ -0,0 +1,21 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X main.Version=" + VERSION + " " + \
+    "-X main.Meta=" + VERSION_META + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-supervisor"
+
+# Build op-supervisor binary
+op-supervisor: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
+
+# Clean build artifacts
+clean:
+    rm -f {{BINARY}}
+
+# Run tests
+test: (go_test "./...")
diff --git a/op-wheel/Makefile b/op-wheel/Makefile
index 06d114012022..78363075e995 100644
--- a/op-wheel/Makefile
+++ b/op-wheel/Makefile
@@ -1,14 +1,3 @@
-GITCOMMIT ?= $(shell git rev-parse HEAD)
-GITDATE ?= $(shell git show -s --format='%ct')
-VERSION ?= v0.0.0
+DEPRECATED_TARGETS := op-wheel
 
-LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)
-LDFLAGSSTRING +=-X main.GitDate=$(GITDATE)
-LDFLAGSSTRING +=-X main.Version=$(VERSION)
-LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
-
-op-wheel:
-	env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) go build -v $(LDFLAGS) -o ./bin/op-wheel ./cmd
-
-.PHONY: \
-	op-wheel
+include ../just/deprecated.mk
diff --git a/op-wheel/justfile b/op-wheel/justfile
new file mode 100644
index 000000000000..40696592ed3b
--- /dev/null
+++ b/op-wheel/justfile
@@ -0,0 +1,13 @@
+import '../just/go.just'
+
+# Build ldflags string
+_LDFLAGSSTRING := "'" + trim(
+    "-X main.GitCommit=" + GITCOMMIT + " " + \
+    "-X main.GitDate=" + GITDATE + " " + \
+    "-X main.Version=" + VERSION + " " + \
+    "") + "'"
+
+BINARY := "./bin/op-wheel"
+
+# Build op-wheel binary
+op-wheel: (go_build BINARY "./cmd" "-ldflags" _LDFLAGSSTRING)
\ No newline at end of file

From 6be52fc221b57279d03487eefe3534ccd7d42fb5 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Wed, 4 Dec 2024 08:42:19 +1000
Subject: [PATCH 345/451] op-program: Add v1.4.0-rc.2 to list of op-program
 releases. (#13193)

---
 op-program/prestates/releases.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/op-program/prestates/releases.json b/op-program/prestates/releases.json
index 63c54a0ba589..75106c4b3c99 100644
--- a/op-program/prestates/releases.json
+++ b/op-program/prestates/releases.json
@@ -1,5 +1,8 @@
 [
   {
+    "version": "1.4.0-rc.2",
+    "hash": "0x0364e4e72922e7d649338f558f8a14b50ca31922a1484e73ea03987fb1516095"
+  }, {
     "version": "1.4.0-rc.1",
     "hash": "0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe"
   },

From 5d52959b8343ad6f6dc4e9bc6f023a2aeb974a11 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Tue, 3 Dec 2024 17:45:24 -0500
Subject: [PATCH 346/451] chore(ops): Bump `kona` in `proofs-tools` (#13196)

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 150b7db0b089..57f5dbbfff6e 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -207,7 +207,7 @@ target "proofs-tools" {
   context = "."
   args = {
     CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="kona-client-v0.1.0-beta.3"
+    KONA_VERSION="kona-client-v0.1.0-beta.4"
   }
   target="proofs-tools"
   platforms = split(",", PLATFORMS)

From 4ce84f1bea7493c061ec7450ea74258a185cbce0 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Tue, 3 Dec 2024 18:50:24 -0500
Subject: [PATCH 347/451] maint: bump forge version (#13197)

Bumps the version of forge/cast/anvil being used in the monorepo.
---
 mise.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mise.toml b/mise.toml
index 29bf5636e127..5fb473de8891 100644
--- a/mise.toml
+++ b/mise.toml
@@ -31,9 +31,9 @@ just = "1.37.0"
 # Foundry dependencies
 # Foundry is a special case because it supplies multiple binaries at the same
 # GitHub release, so we need to use the aliasing trick to get mise to not error
-forge = "nightly-143abd6a768eeb52a5785240b763d72a56987b4a"
-cast = "nightly-143abd6a768eeb52a5785240b763d72a56987b4a"
-anvil = "nightly-143abd6a768eeb52a5785240b763d72a56987b4a"
+forge = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
+cast = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
+anvil = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
 
 # Fake dependencies
 # Put things here if you need to track versions of tools or projects that can't

From c36de049fc576239448417f153d16e3b0c0f76b6 Mon Sep 17 00:00:00 2001
From: refcell <abigger87@gmail.com>
Date: Tue, 3 Dec 2024 19:07:13 -0500
Subject: [PATCH 348/451] chore(ops): Support kona + asterisc in the
 op-challenger (#13198)

* chore(ops): add support for the op-challenger to run kona + asterisc

* fix: update docker bake

* fixes
---
 docker-bake.hcl                   |  7 ++++++-
 ops/docker/op-stack-go/Dockerfile | 22 +++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 57f5dbbfff6e..f0b57e565190 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,6 +6,10 @@ variable "REPOSITORY" {
   default = "oplabs-tools-artifacts/images"
 }
 
+variable "KONA_VERSION" {
+  default = "kona-client-v0.1.0-beta.4"
+}
+
 variable "GIT_COMMIT" {
   default = "dev"
 }
@@ -119,6 +123,7 @@ target "op-challenger" {
     GIT_COMMIT = "${GIT_COMMIT}"
     GIT_DATE = "${GIT_DATE}"
     OP_CHALLENGER_VERSION = "${OP_CHALLENGER_VERSION}"
+    KONA_VERSION="${KONA_VERSION}"
   }
   target = "op-challenger-target"
   platforms = split(",", PLATFORMS)
@@ -207,7 +212,7 @@ target "proofs-tools" {
   context = "."
   args = {
     CHALLENGER_VERSION="b46bffed42db3442d7484f089278d59f51503049"
-    KONA_VERSION="kona-client-v0.1.0-beta.4"
+    KONA_VERSION="${KONA_VERSION}"
   }
   target="proofs-tools"
   platforms = split(",", PLATFORMS)
diff --git a/ops/docker/op-stack-go/Dockerfile b/ops/docker/op-stack-go/Dockerfile
index ef1da6ce116c..9384aef5e247 100644
--- a/ops/docker/op-stack-go/Dockerfile
+++ b/ops/docker/op-stack-go/Dockerfile
@@ -9,6 +9,13 @@
 # It will default to the target platform.
 ARG TARGET_BASE_IMAGE=alpine:3.20
 
+# The ubuntu target base image is used for the op-challenger build with kona and asterisc.
+ARG UBUNTU_TARGET_BASE_IMAGE=ubuntu:22.04
+
+# The version of kona to use.
+# The only build that uses this is `op-challenger-target`.
+ARG KONA_VERSION=none
+
 # We may be cross-building for another platform. Specify which platform we need as builder.
 FROM --platform=$BUILDPLATFORM golang:1.22.7-alpine3.20 AS builder
 
@@ -136,14 +143,23 @@ FROM --platform=$TARGETPLATFORM $TARGET_BASE_IMAGE AS op-node-target
 COPY --from=op-node-builder /app/op-node/bin/op-node /usr/local/bin/
 CMD ["op-node"]
 
-FROM --platform=$TARGETPLATFORM $TARGET_BASE_IMAGE AS op-challenger-target
+# Make the kona docker image published by upstream available as a source to copy kona and asterisc from.
+FROM --platform=$BUILDPLATFORM ghcr.io/anton-rs/kona/kona-fpp-asterisc:$KONA_VERSION AS kona
+
+# Also produce an op-challenger loaded with kona and asterisc using ubuntu
+FROM --platform=$TARGETPLATFORM $UBUNTU_TARGET_BASE_IMAGE AS op-challenger-target
+RUN apt-get update && apt-get install -y --no-install-recommends musl openssl ca-certificates
 COPY --from=op-challenger-builder /app/op-challenger/bin/op-challenger /usr/local/bin/
-# Make the bundled op-program the default cannon server
+# Copy in op-program and cannon
 COPY --from=op-program-builder /app/op-program/bin/op-program /usr/local/bin/
 ENV OP_CHALLENGER_CANNON_SERVER /usr/local/bin/op-program
-# Make the bundled cannon the default cannon executable
 COPY --from=cannon-builder /app/cannon/bin/cannon /usr/local/bin/
 ENV OP_CHALLENGER_CANNON_BIN /usr/local/bin/cannon
+# Copy in kona and asterisc
+COPY --from=kona /kona-host /usr/local/bin/
+ENV OP_CHALLENGER_ASTERISC_KONA_SERVER=/usr/local/bin/kona-host
+COPY --from=kona /asterisc /usr/local/bin/
+ENV OP_CHALLENGER_ASTERISC_BIN=/usr/local/bin/asterisc
 CMD ["op-challenger"]
 
 FROM --platform=$TARGETPLATFORM $TARGET_BASE_IMAGE AS op-dispute-mon-target

From 56670a730dea0cc8ff38503729788121dd7fe8c5 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Tue, 3 Dec 2024 21:00:40 -0500
Subject: [PATCH 349/451] fix: workaround for foundry snapshot nuking bug
 (#13209)

Workaround for a bug? feature? in foundry that causes it to nuke
whatever snapshots directory you have configured. Since this now
defaults to "snapshots" it was nuking our snapshots folder.
---
 packages/contracts-bedrock/foundry.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 5812b129f913..6bad8be9d4ce 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -8,6 +8,7 @@ src = 'src'
 out = 'forge-artifacts'
 script = 'scripts'
 build_info_path = 'artifacts/build-info'
+snapshots = 'notarealpath' # workaround for foundry#9477
 
 optimizer = true
 optimizer_runs = 999999
@@ -15,7 +16,7 @@ optimizer_runs = 999999
 extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
 bytecode_hash = 'none'
 ast = true
-evm_version = "cancun"
+evm_version = 'cancun'
 
 remappings = [
   '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts',

From 7457c568919082d032b7d4b4c564bb50bec7aa48 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Tue, 3 Dec 2024 21:14:29 -0500
Subject: [PATCH 350/451] feat(op-challenger): Add `TraceTypeAsteriscKona` to
 default `--trace-type` option (#13208)

---
 op-challenger/cmd/main_test.go | 22 +++++++++++++++++++---
 op-challenger/flags/flags.go   |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/op-challenger/cmd/main_test.go b/op-challenger/cmd/main_test.go
index daa4e44f26ba..52c9c6c4d9f0 100644
--- a/op-challenger/cmd/main_test.go
+++ b/op-challenger/cmd/main_test.go
@@ -90,9 +90,9 @@ func TestL1Beacon(t *testing.T) {
 
 func TestTraceType(t *testing.T) {
 	t.Run("Default", func(t *testing.T) {
-		expectedDefault := types.TraceTypeCannon
-		cfg := configForArgs(t, addRequiredArgsExcept(expectedDefault, "--trace-type"))
-		require.Equal(t, []types.TraceType{expectedDefault}, cfg.TraceTypes)
+		expectedDefault := []types.TraceType{types.TraceTypeCannon, types.TraceTypeAsteriscKona}
+		cfg := configForArgs(t, addRequiredArgsForMultipleTracesExcept(expectedDefault, "--trace-type"))
+		require.Equal(t, expectedDefault, cfg.TraceTypes)
 	})
 
 	for _, traceType := range types.TraceTypes {
@@ -995,6 +995,12 @@ func addRequiredArgsExcept(traceType types.TraceType, name string, optionalArgs
 	return append(toArgList(req), optionalArgs...)
 }
 
+func addRequiredArgsForMultipleTracesExcept(traceType []types.TraceType, name string, optionalArgs ...string) []string {
+	req := requiredArgsMultiple(traceType)
+	delete(req, name)
+	return append(toArgList(req), optionalArgs...)
+}
+
 func addRequiredArgsExceptArr(traceType types.TraceType, names []string, optionalArgs ...string) []string {
 	req := requiredArgs(traceType)
 	for _, name := range names {
@@ -1003,6 +1009,16 @@ func addRequiredArgsExceptArr(traceType types.TraceType, names []string, optiona
 	return append(toArgList(req), optionalArgs...)
 }
 
+func requiredArgsMultiple(traceType []types.TraceType) map[string]string {
+	args := make(map[string]string)
+	for _, t := range traceType {
+		for name, value := range requiredArgs(t) {
+			args[name] = value
+		}
+	}
+	return args
+}
+
 func requiredArgs(traceType types.TraceType) map[string]string {
 	args := map[string]string{
 		"--l1-eth-rpc":           l1EthRpc,
diff --git a/op-challenger/flags/flags.go b/op-challenger/flags/flags.go
index 041ee3601d29..19d6bc79042e 100644
--- a/op-challenger/flags/flags.go
+++ b/op-challenger/flags/flags.go
@@ -65,7 +65,7 @@ var (
 		Name:    "trace-type",
 		Usage:   "The trace types to support. Valid options: " + openum.EnumString(types.TraceTypes),
 		EnvVars: prefixEnvVars("TRACE_TYPE"),
-		Value:   cli.NewStringSlice(types.TraceTypeCannon.String()),
+		Value:   cli.NewStringSlice(types.TraceTypeCannon.String(), types.TraceTypeAsteriscKona.String()),
 	}
 	DatadirFlag = &cli.StringFlag{
 		Name:    "datadir",

From b002feab877bddfb40bceb9734499b3d8d0c7b25 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Tue, 3 Dec 2024 23:02:37 -0500
Subject: [PATCH 351/451] maint: remove holocene upgrade folder (#13214)

Removes the Holocene upgrade folder. We only needed it as part of
a specific release and don't need it in develop.
---
 .../scripts/upgrades/holocene/.env.example    |  89 -----
 .../scripts/upgrades/holocene/.gitignore      |   2 -
 .../upgrades/holocene/DeployUpgrade.s.sol     | 341 ------------------
 .../scripts/upgrades/holocene/README.md       |  56 ---
 .../scripts/upgrades/holocene/justfile        |  29 --
 .../upgrades/holocene/scripts/common.sh       | 131 -------
 .../upgrades/holocene/scripts/deploy.sh       |  46 ---
 .../scripts/upgrades/holocene/scripts/main.sh | 152 --------
 .../holocene/scripts/proofs-bundle.sh         |  54 ---
 .../holocene/scripts/sc-ops-proofs.sh         |  47 ---
 .../holocene/scripts/sc-ops-sys-cfg.sh        |  38 --
 .../holocene/scripts/sys-cfg-bundle.sh        |  35 --
 .../templates/fdg_bundle_extension.json       |  29 --
 .../proof_upgrade_bundle_template.json        |  38 --
 .../templates/proofs-sc-ops-task/.env.example |   6 -
 .../templates/proofs-sc-ops-task/README.md    |  46 ---
 .../proofs-sc-ops-task/VALIDATION.md          |  24 --
 .../sys-cfg-sc-ops-task/.env.example          |   6 -
 .../templates/sys-cfg-sc-ops-task/README.md   |  42 ---
 .../sys-cfg-sc-ops-task/VALIDATION.md         |  19 -
 .../sys_cfg_upgrade_bundle_template.json      |  38 --
 .../upgrades/holocene/upgrade.dockerfile      |  65 ----
 22 files changed, 1333 deletions(-)
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/README.md
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/justfile
 delete mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh
 delete mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh
 delete mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
 delete mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
 delete mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
 delete mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
 delete mode 100755 packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json
 delete mode 100644 packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile

diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example b/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
deleted file mode 100644
index 2d7d84e67aa9..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/.env.example
+++ /dev/null
@@ -1,89 +0,0 @@
-##############################################
-#               ↓  Required  ↓               #
-##############################################
-
-# NOTE: The deploy config must be provided as a first argument to `just run`!
-
-# The network to deploy the contracts to.
-# Must be one of 'mainnet', 'sepolia'
-NETWORK=
-
-# Etherscan API key used to verify contract bytecode
-ETHERSCAN_API_KEY=
-
-# RPC URL for the L1 network that matches $NETWORK
-ETH_RPC_URL=
-
-# Private key used to deploy the new contracts for this upgrade
-PRIVATE_KEY=
-
-# Address of deployed `PreimageOracle` contract.
-PREIMAGE_ORACLE_ADDR=
-
-# Address of deployed `AnchorStateRegistry` proxy contract.
-ANCHOR_STATE_REGISTRY_PROXY_ADDR=
-
-# Address of the `SuperchainConfig` proxy contract.
-SUPERCHAIN_CONFIG_PROXY_ADDR=
-
-# Address of deployed `ProxyAdmin` contract.
-PROXY_ADMIN_ADDR=
-
-# Address of deployed `SystemConfig` proxy contract.
-SYSTEM_CONFIG_PROXY_ADDR=
-
-# Address of deployed `DisputeGameFactory` proxy contract.
-DISPUTE_GAME_FACTORY_PROXY_ADDR=
-
-# Whether or not to deploy and include any fault proof contracts in the upgrade.
-#
-# If 'true', the `PermissionedDisputeGame` contract will be deployed and included in the upgrade.
-# If 'false', the `PermissionedDisputeGame` contract will not be deployed or included in the upgrade.
-#
-# Must be one of 'true', 'false'
-# Cannot be 'false' if `USE_PERMISSIONLESS_FAULT_PROOFS` is 'true'
-USE_FAULT_PROOFS=true
-
-# Whether or not to deploy and include the `FaultDisputeGame` contract in the upgrade.
-#
-# If 'true', the `FaultDisputeGame` contract will be deployed and included in the upgrade.
-# If 'false', the `FaultDisputeGame` contract will not be deployed or included in the upgrade.
-#
-# Must be one of 'true', 'false'
-# Cannot be 'true' if `USE_FAULT_PROOFS` is 'false'
-USE_PERMISSIONLESS_FAULT_PROOFS=true
-
-###################################################
-#                 ↓  Optional  ↓                  #
-# Do not set if you don't know what you're doing. #
-###################################################
-
-# Address of the deployed `SystemConfig` implementation for Holocene.
-#
-# This implementation is reused across L2 deployments based on the L1 @ `ETH_RPC_URL`.
-# If you are not the first to deploy Holocene on this L1, this field should be set to
-# the existing deployment address.
-#
-# If this field is not set, the `superchain-registry` will be consulted for the implementation address.
-# If this field is set to the zero address, a new `SystemConfig` implementation will be deployed.
-SYSTEM_CONFIG_IMPL_ADDR=
-
-# Address of the deployed `MIPS` implementation for Holocene.
-#
-# This implementation is reused across L2 deployments based on the L1 @ `ETH_RPC_URL`.
-# If you are not the first to deploy Holocene on this L1, this field should be set to
-# the existing deployment address.
-#
-# If this field is not set, the `superchain-registry` will be consulted for the implementation address.
-# If this field is set to the zero address, a new `MIPS` implementation will be deployed.
-MIPS_IMPL_ADDR=
-
-# Address of deployed `DelayedWETH` implementation contract.
-#
-# This implementation is reused across L2 deployments based on the L1 @ `ETH_RPC_URL`.
-# If you are not the first to deploy permissionless fault proofs on L1, this field should be
-# set to the existing deployment address.
-#
-# If this field is not set, the `superchain-registry` will be consulted for the implementation address.
-# If this field is set to the zero address, a new `DelayedWETH` implementation will be deployed.
-DELAYED_WETH_IMPL_ADDR=
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore b/packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore
deleted file mode 100644
index 442ed87d9304..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Environment
-.env
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol b/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
deleted file mode 100644
index 680c4bea1274..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/DeployUpgrade.s.sol
+++ /dev/null
@@ -1,341 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
-
-// Forge
-import { console2 as console } from "forge-std/console2.sol";
-
-// Scripts
-import { Deployer } from "scripts/deploy/Deployer.sol";
-import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
-
-// Utils
-import { Claim, GameTypes, Duration } from "src/dispute/lib/Types.sol";
-
-// Interfaces
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import {
-    IFaultDisputeGame,
-    IBigStepper,
-    IAnchorStateRegistry,
-    IDelayedWETH
-} from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
-import { IMIPS, IPreimageOracle } from "src/cannon/interfaces/IMIPS.sol";
-
-/// @title DeployUpgrade
-/// @notice A deployment script for smart contract upgrades surrounding the Holocene hardfork.
-contract DeployUpgrade is Deployer {
-    /// @dev The entrypoint to the deployment script.
-    function deploy(
-        address _proxyAdmin,
-        address _superchainConfig,
-        address _systemConfigImpl,
-        address _mipsImpl,
-        address _delayedWETH,
-        address _preimageOracle,
-        address _anchorStateRegistry,
-        bool _useFaultProofs,
-        bool _usePermissionlessFaultProofs
-    )
-        public
-    {
-        // Shim the existing contracts that this upgrade is dependent on.
-        shim({
-            _proxyAdmin: _proxyAdmin,
-            _superchainConfig: _superchainConfig,
-            _systemConfigImpl: _systemConfigImpl,
-            _mipsImpl: _mipsImpl,
-            _delayedWETH: _delayedWETH,
-            _preimageOracle: _preimageOracle,
-            _anchorStateRegistry: _anchorStateRegistry
-        });
-
-        // Deploy conditional implementations.
-        if (_systemConfigImpl == address(0)) deploySystemConfigImplementation();
-
-        if (_useFaultProofs) {
-            if (_mipsImpl == address(0)) deployMIPSImplementation();
-            if (_delayedWETH == address(0)) deployDelayedWETH();
-
-            // Deploy:
-            // 1. New `DelayedWETH` proxy contracts for the `FaultDisputeGame` and `PermissionedDisputeGame`.
-            // 2. New `FaultDisputeGame` and `PermissionedDisputeGame` implementation contracts.
-            deployDelayedWETHProxy("PDG");
-            deployPermissionedDisputeGameImplementation();
-            if (_usePermissionlessFaultProofs) {
-                deployDelayedWETHProxy("FDG");
-                deployFaultDisputeGameImplementation();
-            }
-
-            // Run deployment checks.
-            checkMIPS();
-            checkPermissionedDisputeGame();
-            checkDelayedWETH("PDG");
-            if (_usePermissionlessFaultProofs) {
-                checkFaultDisputeGame();
-                checkDelayedWETH("FDG");
-            }
-        }
-
-        // Print the deployment summary.
-        printSummary();
-    }
-
-    /// @dev Shims the existing contracts that this upgrade is dependent on.
-    function shim(
-        address _proxyAdmin,
-        address _superchainConfig,
-        address _systemConfigImpl,
-        address _mipsImpl,
-        address _delayedWETH,
-        address _preimageOracle,
-        address _anchorStateRegistry
-    )
-        public
-    {
-        prankDeployment("ProxyAdmin", _proxyAdmin);
-        prankDeployment("SuperchainConfig", _superchainConfig);
-        if (_systemConfigImpl != address(0)) prankDeployment("SystemConfig", _systemConfigImpl);
-        if (_mipsImpl != address(0)) prankDeployment("MIPS", _mipsImpl);
-        if (_delayedWETH != address(0)) prankDeployment("DelayedWETH", _delayedWETH);
-        prankDeployment("PreimageOracle", _preimageOracle);
-        prankDeployment("AnchorStateRegistry", _anchorStateRegistry);
-    }
-
-    /// @dev Deploys the Holocene `SystemConfig` implementation contract.
-    function deploySystemConfigImplementation() public {
-        vm.broadcast(msg.sender);
-        address systemConfig = DeployUtils.create1(
-            "SystemConfig", DeployUtils.encodeConstructor(abi.encodeCall(ISystemConfig.__constructor__, ()))
-        );
-        save("SystemConfig", systemConfig);
-    }
-
-    /// @dev Deploys the new `MIPS` implementation contract.
-    function deployMIPSImplementation() public {
-        vm.broadcast(msg.sender);
-        address mips = DeployUtils.create1({
-            _name: "MIPS",
-            _args: DeployUtils.encodeConstructor(
-                abi.encodeCall(IMIPS.__constructor__, (IPreimageOracle(mustGetAddress("PreimageOracle"))))
-            )
-        });
-        save("MIPS", mips);
-    }
-
-    /// @dev Checks if the `MIPS` contract is correctly configured.
-    function checkMIPS() public view {
-        IMIPS mips = IMIPS(mustGetAddress("MIPS"));
-        require(
-            address(mips.oracle()) == mustGetAddress("PreimageOracle"), "DeployHoloceneUpgrade: invalid MIPS oracle"
-        );
-    }
-
-    /// @dev Deploys the Holocene `FaultDisputeGame` implementation contract.
-    function deployFaultDisputeGameImplementation() public {
-        bytes memory constructorInput = abi.encodeCall(
-            IFaultDisputeGame.__constructor__,
-            (
-                IFaultDisputeGame.GameConstructorParams({
-                    gameType: GameTypes.CANNON,
-                    absolutePrestate: Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
-                    maxGameDepth: cfg.faultGameMaxDepth(),
-                    splitDepth: cfg.faultGameSplitDepth(),
-                    clockExtension: Duration.wrap(uint64(cfg.faultGameClockExtension())),
-                    maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
-                    vm: IBigStepper(mustGetAddress("MIPS")),
-                    weth: IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyFDG"))),
-                    anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
-                    l2ChainId: cfg.l2ChainID()
-                })
-            )
-        );
-
-        vm.broadcast(msg.sender);
-        address fdg = DeployUtils.create1("FaultDisputeGame", DeployUtils.encodeConstructor(constructorInput));
-        save("FaultDisputeGame", fdg);
-    }
-
-    /// @dev Checks if the `FaultDisputeGame` contract is correctly configured.
-    function checkFaultDisputeGame() public view {
-        IFaultDisputeGame fdg = IFaultDisputeGame(mustGetAddress("FaultDisputeGame"));
-        require(
-            fdg.gameType().raw() == GameTypes.CANNON.raw(), "DeployHoloceneUpgrade: invalid FaultDisputeGame gameType"
-        );
-        require(
-            fdg.absolutePrestate().raw() == bytes32(cfg.faultGameAbsolutePrestate()),
-            "DeployHoloceneUpgrade: invalid FaultDisputeGame absolutePrestate"
-        );
-        require(
-            fdg.maxGameDepth() == cfg.faultGameMaxDepth(), "DeployHoloceneUpgrade: invalid FaultDisputeGame maxDepth"
-        );
-        require(
-            fdg.splitDepth() == cfg.faultGameSplitDepth(), "DeployHoloceneUpgrade: invalid FaultDisputeGame splitDepth"
-        );
-        require(
-            fdg.clockExtension().raw() == cfg.faultGameClockExtension(),
-            "DeployHoloceneUpgrade: invalid FaultDisputeGame clockExtension"
-        );
-        require(
-            fdg.maxClockDuration().raw() == cfg.faultGameMaxClockDuration(),
-            "DeployHoloceneUpgrade: invalid FaultDisputeGame maxClockDuration"
-        );
-        require(address(fdg.vm()) == mustGetAddress("MIPS"), "DeployHoloceneUpgrade: invalid FaultDisputeGame MIPS");
-        require(
-            address(fdg.weth()) == mustGetAddress("DelayedWETHProxyFDG"),
-            "DeployHoloceneUpgrade: invalid FaultDisputeGame DelayedWETH"
-        );
-        require(
-            address(fdg.anchorStateRegistry()) == mustGetAddress("AnchorStateRegistry"),
-            "DeployHoloceneUpgrade: invalid FaultDisputeGame AnchorStateRegistry"
-        );
-        require(fdg.l2ChainId() == cfg.l2ChainID(), "DeployHoloceneUpgrade: invalid FaultDisputeGame l2ChainID");
-    }
-
-    /// @dev Deploys the Holocene `PermissionedDisputeGame` implementation contract.
-    function deployPermissionedDisputeGameImplementation() public {
-        bytes memory constructorInput = abi.encodeCall(
-            IPermissionedDisputeGame.__constructor__,
-            (
-                IFaultDisputeGame.GameConstructorParams({
-                    gameType: GameTypes.PERMISSIONED_CANNON,
-                    absolutePrestate: Claim.wrap(bytes32(cfg.faultGameAbsolutePrestate())),
-                    maxGameDepth: cfg.faultGameMaxDepth(),
-                    splitDepth: cfg.faultGameSplitDepth(),
-                    clockExtension: Duration.wrap(uint64(cfg.faultGameClockExtension())),
-                    maxClockDuration: Duration.wrap(uint64(cfg.faultGameMaxClockDuration())),
-                    vm: IBigStepper(mustGetAddress("MIPS")),
-                    weth: IDelayedWETH(payable(mustGetAddress("DelayedWETHProxyPDG"))),
-                    anchorStateRegistry: IAnchorStateRegistry(mustGetAddress("AnchorStateRegistry")),
-                    l2ChainId: cfg.l2ChainID()
-                }),
-                cfg.l2OutputOracleProposer(),
-                cfg.l2OutputOracleChallenger()
-            )
-        );
-
-        vm.broadcast(msg.sender);
-        address fdg = DeployUtils.create1("PermissionedDisputeGame", DeployUtils.encodeConstructor(constructorInput));
-        save("PermissionedDisputeGame", fdg);
-    }
-
-    /// @dev Checks if the `PermissionedDisputeGame` contract is correctly configured.
-    function checkPermissionedDisputeGame() public view {
-        IPermissionedDisputeGame pdg = IPermissionedDisputeGame(mustGetAddress("PermissionedDisputeGame"));
-        require(
-            pdg.gameType().raw() == GameTypes.PERMISSIONED_CANNON.raw(),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame gameType"
-        );
-        require(
-            pdg.absolutePrestate().raw() == bytes32(cfg.faultGameAbsolutePrestate()),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame absolutePrestate"
-        );
-        require(
-            pdg.maxGameDepth() == cfg.faultGameMaxDepth(),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame maxDepth"
-        );
-        require(
-            pdg.splitDepth() == cfg.faultGameSplitDepth(),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame splitDepth"
-        );
-        require(
-            pdg.clockExtension().raw() == cfg.faultGameClockExtension(),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame clockExtension"
-        );
-        require(
-            pdg.maxClockDuration().raw() == cfg.faultGameMaxClockDuration(),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame maxClockDuration"
-        );
-        require(
-            address(pdg.vm()) == mustGetAddress("MIPS"), "DeployHoloceneUpgrade: invalid PermissionedDisputeGame MIPS"
-        );
-        require(
-            address(pdg.weth()) == mustGetAddress("DelayedWETHProxyPDG"),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame DelayedWETH"
-        );
-        require(
-            address(pdg.anchorStateRegistry()) == mustGetAddress("AnchorStateRegistry"),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame AnchorStateRegistry"
-        );
-        require(pdg.l2ChainId() == cfg.l2ChainID(), "DeployHoloceneUpgrade: invalid PermissionedDisputeGame l2ChainID");
-        require(
-            pdg.proposer() == cfg.l2OutputOracleProposer(),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame proposer"
-        );
-        require(
-            pdg.challenger() == cfg.l2OutputOracleChallenger(),
-            "DeployHoloceneUpgrade: invalid PermissionedDisputeGame challenger"
-        );
-    }
-
-    /// @dev Deploys a new implementation of the `DelayedWETH` contract.
-    function deployDelayedWETH() public {
-        uint256 delay = cfg.faultGameWithdrawalDelay();
-
-        vm.broadcast(msg.sender);
-        address impl = DeployUtils.create1({
-            _name: "DelayedWETH",
-            _args: DeployUtils.encodeConstructor(abi.encodeCall(IDelayedWETH.__constructor__, (delay)))
-        });
-
-        // Save the new implementation address.
-        save("DelayedWETH", impl);
-    }
-
-    /// @dev Deploys a new proxy contract with a new `DelayedWETH` implementation.
-    function deployDelayedWETHProxy(string memory _variant) public {
-        address delayedWethOwner = cfg.finalSystemOwner();
-        address proxyAdmin = mustGetAddress("ProxyAdmin");
-        address impl = mustGetAddress("DelayedWETH");
-        ISuperchainConfig superchainConfig = ISuperchainConfig(mustGetAddress("SuperchainConfig"));
-        string memory finalName = string.concat("DelayedWETHProxy", _variant);
-
-        // Deploy the implementation and proxy contracts.
-        vm.broadcast(msg.sender);
-        IProxy proxy = IProxy(
-            DeployUtils.create1({
-                _name: "Proxy",
-                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
-            })
-        );
-
-        // Upgrade the proxy to the implementation and initialize it.
-        vm.broadcast(msg.sender);
-        proxy.upgradeToAndCall(impl, abi.encodeCall(IDelayedWETH.initialize, (delayedWethOwner, superchainConfig)));
-
-        // Transfer the admin role of the proxy to the ProxyAdmin, now that we've upgraded
-        // and initialized the proxy.
-        vm.broadcast(msg.sender);
-        proxy.changeAdmin(proxyAdmin);
-
-        // Save the proxy address.
-        save(finalName, address(proxy));
-    }
-
-    /// @dev Checks if the `DelayedWETH` contract is correctly configured.
-    function checkDelayedWETH(string memory _variant) internal {
-        string memory finalName = string.concat("DelayedWETHProxy", _variant);
-        IDelayedWETH delayedWeth = IDelayedWETH(mustGetAddress(finalName));
-        require(
-            delayedWeth.delay() == cfg.faultGameWithdrawalDelay(), "DeployHoloceneUpgrade: invalid DelayedWETH delay"
-        );
-        require(
-            delayedWeth.config() == ISuperchainConfig(mustGetAddress("SuperchainConfig")),
-            "DeployHoloceneUpgrade: invalid DelayedWETH config"
-        );
-
-        vm.prank(mustGetAddress("ProxyAdmin"));
-        address admin = IProxy(payable(address(delayedWeth))).admin();
-        require(admin == mustGetAddress("ProxyAdmin"), "DeployHoloceneUpgrade: invalid DelayedWETH admin");
-    }
-
-    /// @dev Prints a summary of the deployment.
-    function printSummary() internal view {
-        console.log("1. SystemConfig: %s", mustGetAddress("SystemConfig"));
-        console.log("2. MIPS: %s", getAddress("MIPS"));
-        console.log("3. FaultDisputeGame: %s", getAddress("FaultDisputeGame"));
-        console.log("4. PermissionedDisputeGame: %s", getAddress("PermissionedDisputeGame"));
-    }
-}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/README.md b/packages/contracts-bedrock/scripts/upgrades/holocene/README.md
deleted file mode 100644
index a671362bff85..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Holocene Upgrade
-
-This directory contains a repeatable task for:
-* upgrading an `op-contracts/v1.6.0` deployment to `op-contracts/v1.8.0`.
-* upgrading an `op-contracts/v1.3.0` deployment to `op-contracts/v1.8.0`, while retaining the `L2OutputOracle`.
-
-## Dependencies
-
-- [`docker`](https://docs.docker.com/engine/install/)
-- [`just`](https://github.com/casey/just)
-- [`foundry`](https://getfoundry.sh/)
-
-## Usage
-
-This script has several different modes of operation. Namely:
-1. Deploy and upgrade `op-contracts/1.6.0` -> `op-contracts/v1.8.0`
-  - Always upgrade the `SystemConfig`
-  - FP options:
-    - With permissionless fault proofs enabled (incl. `FaultDisputeGame`)
-    - With permissioned fault proofs enabled (excl. `FaultDisputeGame`)
-1. Deploy and upgrade `op-contracts/v1.3.0` -> `op-contracts/v1.8.0`, with the `L2OutputOracle` still active.
-  - Only upgrade the `SystemConfig`
-
-```sh
-# 1. Clone the monorepo and navigate to this directory.
-git clone git@github.com:ethereum-optimism/monorepo.git && \
-  cd monorepo/packages/contracts-bedrock/scripts/upgrades/holocene
-
-# 2. Set up the `.env` file
-#
-# Read the documentation carefully, and when in doubt, reach out to the OP Labs team.
-cp .env.example .env && vim .env
-
-# 3. Run the upgrade task.
-#
-#    This task will:
-#    - Deploy the new smart contract implementations.
-#    - Optionally, generate a safe upgrade bundle.
-#    - Optionally, generate a `superchain-ops` upgrade task.
-#
-#    The first argument must be the absolute path to your deploy-config.json.
-#    You can optionally specify an output folder path different from the default `output/` as a
-#    second argument to `just run`, also as an absolute path.
-just run $(realpath path/to/deploy-config.json)
-```
-
-Note that in order to build the Docker image, you have to allow Docker to use at least 16GB of
-memory, or the Solidity compilations may fail. Docker's default is only 8GB.
-
-The `deploy-config.json` that you use for your chain must set the latest `faultGameAbsolutePrestate`
-value, not the one at deployment. There's currently one available that includes the Sepolia
-Superchain Holocene activations for Base, OP, Mode and Zora:
-`0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe`
-
-If you want to make local modifications to the scripts in `scripts/`, you need to build the Docker
-image again with `just build-image` before running `just run`.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/justfile b/packages/contracts-bedrock/scripts/upgrades/holocene/justfile
deleted file mode 100644
index ac08df681324..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/justfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Default recipe to list help menu.
-default:
-  @just --list
-
-# Run the deployment / upgrade generation image. If the image is not present locally,
-# it will be built.
-run deploy-config-path output-folder-path="$(pwd)/output/" *args='':
-  #!/bin/bash
-  if [ ! "$(docker images -q op-holocene-upgrade:local 2> /dev/null)" ]; then
-    just build-image
-  fi
-
-  mkdir -p {{output-folder-path}}
-
-  # Run the deployment.
-  docker run -it \
-    --rm \
-    -v {{output-folder-path}}:/output \
-    -v {{deploy-config-path}}:/app/packages/contracts-bedrock/deploy-config/deploy-config.json \
-    --env-file=.env \
-    op-holocene-upgrade:local {{args}}
-
-# Build the image locally.
-build-image:
-  docker build \
-  -t op-holocene-upgrade:local \
-  -f upgrade.dockerfile \
-  --build-arg REV=op-contracts/v1.8.0-rc.2 \
-  .
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh
deleted file mode 100755
index 0f4e80b29c40..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/common.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Associative array to store cached TOML content for different URLs
-# Used by fetch_standard_address and fetch_superchain_config_address
-declare -A CACHED_TOML_CONTENT
-
-# error_handler
-#
-# Basic error handler
-error_handler() {
-  echo "Error occurred in ${BASH_SOURCE[1]} at line: ${BASH_LINENO[0]}"
-  echo "Error message: $BASH_COMMAND"
-  exit 1
-}
-
-# Register the error handler
-trap error_handler ERR
-
-# reqenv
-#
-# Checks if a specified environment variable is set.
-#
-# Arguments:
-#   $1 - The name of the environment variable to check
-#
-# Exits with status 1 if:
-#   - The specified environment variable is not set
-reqenv() {
-    if [ -z "$1" ]; then
-        echo "Error: $1 is not set"
-        exit 1
-    fi
-}
-
-# prompt
-#
-# Prompts the user for a yes/no response.
-#
-# Arguments:
-#   $1 - The prompt message
-#
-# Exits with status 1 if:
-#   - The user does not respond with 'y'
-#   - The process is interrupted
-prompt() {
-    read -p "$1 [Y/n] " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-        [[ "$0" = "${BASH_SOURCE[0]}" ]] && exit 1 || return 1
-        exit 1
-    fi
-}
-
-# fetch_standard_address
-#
-# Fetches the implementation address for a given contract from a TOML file.
-# The TOML file is downloaded from a URL specified in ADDRESSES_TOML_URL
-# environment variable. Results are cached to avoid repeated downloads.
-#
-# Arguments:
-#   $1 - Network name
-#   $2 - The release version
-#   $3 - The name of the contract to look up
-#
-# Returns:
-#   The implementation address of the specified contract
-#
-# Exits with status 1 if:
-#   - Failed to fetch the TOML file
-#   - The release version is not found in the TOML file
-#   - The implementation address for the specified contract is not found
-fetch_standard_address() {
-    local network_name="$1"
-    local release_version="$2"
-    local contract_name="$3"
-
-    # Determine the correct toml url
-    local toml_url="https://raw.githubusercontent.com/ethereum-optimism/superchain-registry/refs/heads/main/validation/standard/standard-versions"
-    if [ "$network_name" = "mainnet" ]; then
-        toml_url="$toml_url-mainnet.toml"
-    elif [ "$network_name" = "sepolia" ]; then
-        toml_url="$toml_url-sepolia.toml"
-    else
-        echo "Error: NETWORK must be set to 'mainnet' or 'sepolia'"
-        exit 1
-    fi
-
-    # Fetch the TOML file content from the URL if not already cached for this URL
-    if [ -z "${CACHED_TOML_CONTENT[$toml_url]:-}" ]; then
-        CACHED_TOML_CONTENT[$toml_url]=$(curl -s "$toml_url")
-        # shellcheck disable=SC2181
-        if [ $? -ne 0 ]; then
-            echo "Error: Failed to fetch TOML file from $toml_url"
-            exit 1
-        fi
-    fi
-
-    # Use the cached content for the current URL
-    local toml_content="${CACHED_TOML_CONTENT[$toml_url]}"
-
-    # Find the section for v1.6.0 release
-    # shellcheck disable=SC2155
-    local section_content=$(echo "$toml_content" | awk -v version="$release_version" '
-        $0 ~ "^\\[releases.\"op-contracts/v" version "\"\\]" {
-            flag=1;
-            next
-        }
-        flag && /^\[/ {
-            exit
-        }
-        flag {
-            print
-        }
-    ')
-    if [ -z "$section_content" ]; then
-        echo "Error: v$release_version release section not found in addresses TOML"
-        exit 1
-    fi
-
-    # Extract the implementation address for the specified contract
-    local regex="(address|implementation_address) = \"(0x[a-fA-F0-9]{40})\""
-    # shellcheck disable=SC2155
-    local data=$(echo "$section_content" | grep "${contract_name}")
-    if [[ $data =~ $regex ]]; then
-        echo "${BASH_REMATCH[2]}"
-    else
-        echo "Error: Implementation address for $contract_name not found in v$release_version release"
-        exit 1
-    fi
-}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh
deleted file mode 100755
index d1e15aa63e7f..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/deploy.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Grab the script directory
-SCRIPT_DIR=$(dirname "$0")
-
-# Load common.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/common.sh"
-
-# Check required environment variables
-reqenv "ETH_RPC_URL"
-reqenv "PRIVATE_KEY"
-reqenv "ETHERSCAN_API_KEY"
-reqenv "DEPLOY_CONFIG_PATH"
-reqenv "IMPL_SALT"
-
-# Check required address environment variables
-reqenv "PROXY_ADMIN_ADDR"
-reqenv "SUPERCHAIN_CONFIG_PROXY_ADDR"
-reqenv "PREIMAGE_ORACLE_ADDR"
-reqenv "ANCHOR_STATE_REGISTRY_PROXY_ADDR"
-reqenv "DELAYED_WETH_IMPL_ADDR"
-reqenv "SYSTEM_CONFIG_IMPL_ADDR"
-reqenv "MIPS_IMPL_ADDR"
-reqenv "USE_FAULT_PROOFS"
-reqenv "USE_PERMISSIONLESS_FAULT_PROOFS"
-
-# Run the upgrade script
-forge script DeployUpgrade.s.sol \
-  --rpc-url "$ETH_RPC_URL" \
-  --private-key "$PRIVATE_KEY" \
-  --etherscan-api-key "$ETHERSCAN_API_KEY" \
-  --sig "deploy(address,address,address,address,address,address,address,bool,bool)" \
-  "$PROXY_ADMIN_ADDR" \
-  "$SUPERCHAIN_CONFIG_PROXY_ADDR" \
-  "$SYSTEM_CONFIG_IMPL_ADDR" \
-  "$MIPS_IMPL_ADDR" \
-  "$DELAYED_WETH_IMPL_ADDR" \
-  "$PREIMAGE_ORACLE_ADDR" \
-  "$ANCHOR_STATE_REGISTRY_PROXY_ADDR" \
-  "$USE_FAULT_PROOFS" \
-  "$USE_PERMISSIONLESS_FAULT_PROOFS" \
-  --broadcast \
-  --verify \
-  --slow
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
deleted file mode 100755
index 7ae6a55ed72a..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/main.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Grab the script directory
-SCRIPT_DIR=$(dirname "$0")
-
-# Load common.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/common.sh"
-
-echo "
-⠄⢀⠀⠀⡐⠠⠀⢂⣠⡤⣤⣖⣤⣤⣄⢢⣤⣤⣤⡀⠄⠰⠀⠆⠀⠀⠠⠀⠆⠠⢀⠢⠐⠆⡀
-⠔⢀⠀⠄⡀⠔⢠⣾⣿⣿⣷⣿⣿⣿⣿⣷⣟⣛⣻⣿⣤⡠⢀⠆⢄⠂⠠⢠⠀⠄⠀⢠⠰⢄⠄
-⣈⠀⠐⡀⠀⠈⣾⣿⣿⣿⣿⡿⡿⣿⣿⣿⣿⡿⢿⣿⣿⣿⣦⠀⠂⠀⢈⠀⠁⠂⡀⢀⠠⠈⡀
-⠆⠈⠀⠄⣃⣼⣿⣿⣿⠿⡿⣿⣿⣷⣾⣷⣾⡾⣿⣿⣿⢿⡟⡇⠠⠁⠨⠐⠀⠃⠱⠊⠀⠀⠄
-⠐⣠⣶⣿⣿⣿⣿⣿⣿⣿⣾⣮⣛⢿⣿⡿⠘⣇⢯⣹⣶⣷⣿⣿⡄⠆⢐⠀⢄⠢⡒⠐⠠⢀⠂
-⢴⣿⣿⣿⣿⣿⣿⡿⠿⢿⣿⣿⣟⢿⣶⣾⣿⣧⢻⣿⢿⣿⣿⣿⠂⠈⢀⠈⡀⡁⢀⠉⢀⠀⠀
-⡜⣿⣿⣿⣿⣿⣿⣦⡻⠀⢨⣽⣿⣿⣿⣿⣿⣿⣦⡛⣾⣭⣃⣀⣦⠀⠨⠐⠀⠄⠃⠈⠀⠀⠁
-⣳⡘⣿⣿⣿⣿⣿⣿⣿⣿⣿⢛⣭⣿⣿⣿⣿⣿⣿⣿⢢⣿⣿⣿⣿⡇⢀⠲⠂⠄⢀⡐⠠⠐⠂
-⢣⠵⢹⣿⣿⣿⣿⣿⣿⣿⣿⣧⣛⣻⣿⣭⣿⣿⠻⢥⣿⣿⣿⣿⣿⣿⡄⠀⠁⡀⢀⢈⠀⢀⠁
-⡼⣹⡘⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⣟⣻⠿⠿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠁⠉⠐⠀⠂⠈
-⡷⣡⠧⢹⣿⣿⣿⣿⣿⣿⣗⣶⣾⣿⣿⣿⣿⣿⠮⢿⣿⣿⡿⠿⣿⣿⢀⣀⠂⡁⠐⢌⠐⡠⠁
-⢷⠡⠏⢧⢌⢻⣿⣿⣿⣟⣿⣿⣻⣿⡿⠿⣛⣵⢟⣭⡭⠥⠮⠕⣒⣒⣚⣮⣰⢤⣤⣄⣀⡠⠄
-⠁⠠⠀⠄⣏⢦⡙⣿⣿⣽⣟⣿⡟⣬⣾⣿⣿⣿⣾⣆⠭⠽⠶⢶⢶⣖⣶⣹⣖⡿⣿⣿⣿⣿⡆
-⠀⡁⠂⡟⡜⣦⢫⣌⠻⣷⣿⢏⣾⣿⣿⣿⢿⣿⢿⣿⣿⣿⣿⣿⠿⣛⣛⣛⠛⣭⣿⣿⢻⣽⡇
-⣏⠖⣮⢱⣋⢖⣣⢎⡳⢤⡅⣾⣿⢯⣷⡏⡖⣰⣝⣚⣙⣫⢍⡶⠷⣽⢭⣛⡇⠀⢰⣶⣾⣿⠀
-⡮⡝⢦⣓⢎⡳⡜⠎⠡⠁⢸⣿⣿⣿⣿⣁⢠⣿⡿⣿⡟⣎⣯⣽⣋⡷⣾⣹⡃⠀⢸⣿⣿⢿⠀
-⣳⠁⠀⡝⢮⣱⢹⠀⠂⠈⣿⣿⣿⣿⡻⣈⣸⣿⣙⢾⢿⣹⡶⣿⣼⣗⣻⡞⣡⠁⣼⣿⣿⣿⡀
-⡔⢦⢥⡛⣜⠦⣏⡄⡈⣸⢿⣿⡿⣽⢃⠇⣿⣧⡝⣟⡳⢾⣹⣟⡻⣾⣹⢣⠞⣄⣯⣿⣷⣿⡆
-   -*~ [ Grug Deployer mk2 ] ~*-
-       ~*- [ Holocene ] -*~
-"
-
-# Set variables from environment or error.
-export RELEASE="1.8.0"
-export NETWORK="${NETWORK:?NETWORK must be set}"
-export ETHERSCAN_API_KEY=${ETHERSCAN_API_KEY:?ETHERSCAN_API_KEY must be set}
-export ETH_RPC_URL=${ETH_RPC_URL:?ETH_RPC_URL must be set}
-export PRIVATE_KEY=${PRIVATE_KEY:?PRIVATE_KEY must be set}
-export OUTPUT_FOLDER_PATH="/output"
-export SYSTEM_CONFIG_IMPL_ADDR=${SYSTEM_CONFIG_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "system_config")}
-export MIPS_IMPL_ADDR=${MIPS_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "mips")}
-export PREIMAGE_ORACLE_ADDR=${PREIMAGE_ORACLE_ADDR:?PREIMAGE_ORACLE_ADDR must be set}
-export ANCHOR_STATE_REGISTRY_PROXY_ADDR=${ANCHOR_STATE_REGISTRY_PROXY_ADDR:?ANCHOR_STATE_REGISTRY_PROXY_ADDR must be set}
-export DELAYED_WETH_IMPL_ADDR=${DELAYED_WETH_IMPL_ADDR:-$(fetch_standard_address "$NETWORK" "$RELEASE" "delayed_weth")}
-export PROXY_ADMIN_ADDR=${PROXY_ADMIN_ADDR:?PROXY_ADMIN_ADDR must be set}
-export SUPERCHAIN_CONFIG_PROXY_ADDR=${SUPERCHAIN_CONFIG_PROXY_ADDR:?SUPERCHAIN_CONFIG_ADDR must be set}
-export SYSTEM_CONFIG_PROXY_ADDR=${SYSTEM_CONFIG_PROXY_ADDR:?SYSTEM_CONFIG_PROXY_ADDR must be set}
-export DISPUTE_GAME_FACTORY_PROXY_ADDR=${DISPUTE_GAME_FACTORY_PROXY_ADDR:?DISPUTE_GAME_FACTORY_PROXY_ADDR must be set}
-export USE_FAULT_PROOFS=${USE_FAULT_PROOFS:?USE_FAULT_PROOFS must be set}
-export USE_PERMISSIONLESS_FAULT_PROOFS=${USE_PERMISSIONLESS_FAULT_PROOFS:?USE_PERMISSIONLESS_FAULT_PROOFS must be set}
-
-# Sanity check FP configuration.
-if [[ $USE_PERMISSIONLESS_FAULT_PROOFS == true && $USE_FAULT_PROOFS == false ]]; then
-  echo "Error: USE_PERMISSIONLESS_FAULT_PROOFS cannot be true if USE_FAULT_PROOFS is false"
-  exit 1
-fi
-
-# Make the output folder, if it doesn't exist
-mkdir -p "$OUTPUT_FOLDER_PATH"
-
-# Find the contracts-bedrock directory
-CONTRACTS_BEDROCK_DIR=$(pwd)
-while [[ "$CONTRACTS_BEDROCK_DIR" != "/" && "${CONTRACTS_BEDROCK_DIR##*/}" != "contracts-bedrock" ]]; do
-  CONTRACTS_BEDROCK_DIR=$(dirname "$CONTRACTS_BEDROCK_DIR")
-done
-
-# Error out if we couldn't find it for some reason
-if [[ "$CONTRACTS_BEDROCK_DIR" == "/" ]]; then
-  echo "Error: 'contracts-bedrock' directory not found"
-  exit 1
-fi
-
-# The deploy config is mounted via Docker to this file
-export DEPLOY_CONFIG_PATH="$CONTRACTS_BEDROCK_DIR/deploy-config/deploy-config.json"
-
-# Run deploy.sh if deployments.json does not exist
-DEPLOY_LOG_PATH="$OUTPUT_FOLDER_PATH/deploy.log"
-DEPLOYMENTS_JSON_PATH="$OUTPUT_FOLDER_PATH/deployments.json"
-if [[ ! -f "$DEPLOYMENTS_JSON_PATH" ]]; then
-  if ! "$SCRIPT_DIR/deploy.sh" | tee "$DEPLOY_LOG_PATH"; then
-    echo "Error: deploy.sh failed"
-    exit 1
-  fi
-else
-  prompt "Skipping deployment as $DEPLOYMENTS_JSON_PATH already exists. Continue?"
-fi
-
-# Extract the addresses from the deployment logs
-# shellcheck disable=2155
-export SYSTEM_CONFIG_IMPL=$(grep "1. SystemConfig:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
-# shellcheck disable=2155
-export MIPS_IMPL=$(grep "2. MIPS:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
-# shellcheck disable=2155
-export FDG_IMPL=$(grep "3. FaultDisputeGame:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
-# shellcheck disable=2155
-export PDG_IMPL=$(grep "4. PermissionedDisputeGame:" "$DEPLOY_LOG_PATH" | awk '{print $3}')
-
-# Ensure that the addresses were extracted properly
-reqenv "SYSTEM_CONFIG_IMPL"
-reqenv "MIPS_IMPL"
-reqenv "FDG_IMPL"
-reqenv "PDG_IMPL"
-
-# Generate deployments.json with extracted addresses
-cat <<EOF >"$DEPLOYMENTS_JSON_PATH"
-{
-  "SystemConfig": "$SYSTEM_CONFIG_IMPL",
-  "MIPS": "$MIPS_IMPL",
-  "FaultDisputeGame": "$FDG_IMPL",
-  "PermissionedDisputeGame": "$PDG_IMPL"
-}
-EOF
-
-echo "✨ Deployed contracts and saved addresses to \"$DEPLOYMENTS_JSON_PATH\""
-
-# Print a message when the script exits
-trap 'echo "✨ Done. Artifacts are available in \"$OUTPUT_FOLDER_PATH\""' EXIT
-
-prompt "Generate safe upgrade bundle for SystemConfig?"
-
-# Generate the system config upgrade bundle
-if ! "$SCRIPT_DIR/sys-cfg-bundle.sh"; then
-  echo "Error: sys-cfg-bundle.sh failed"
-  exit 1
-fi
-
-prompt "Generate superchain-ops upgrade task for SystemConfig upgrade bundle?"
-
-# Generate the superchain-ops upgrade task
-if ! "$SCRIPT_DIR/sc-ops-sys-cfg.sh"; then
-  echo "Error: sc-ops-sys-cfg.sh failed"
-  exit 1
-fi
-
-if [[ $USE_FAULT_PROOFS == true ]]; then
-  prompt "Generate safe upgrade bundle for proofs contracts?"
-
-  # Generate the proofs contracts' upgrade bundle
-  if ! "$SCRIPT_DIR/proofs-bundle.sh"; then
-    echo "Error: proofs-bundle.sh failed"
-    exit 1
-  fi
-
-  prompt "Generate superchain-ops upgrade task for proofs contracts upgrade bundle?"
-
-  # Generate the superchain-ops upgrade task
-  if ! "$SCRIPT_DIR/sc-ops-proofs.sh"; then
-    echo "Error: sc-ops-proofs.sh failed"
-    exit 1
-  fi
-fi
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
deleted file mode 100755
index bc0b0c7ff314..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/proofs-bundle.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Grab the script directory
-SCRIPT_DIR=$(dirname "$0")
-
-# Load common.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/common.sh"
-
-# Check the env
-reqenv "ETH_RPC_URL"
-reqenv "OUTPUT_FOLDER_PATH"
-reqenv "MIPS_IMPL"
-reqenv "FDG_IMPL"
-reqenv "PDG_IMPL"
-reqenv "DISPUTE_GAME_FACTORY_PROXY_ADDR"
-reqenv "USE_PERMISSIONLESS_FAULT_PROOFS"
-
-# Local environment
-BUNDLE_PATH="$OUTPUT_FOLDER_PATH/proofs_bundle.json"
-L1_CHAIN_ID=$(cast chain-id)
-
-# Copy the bundle template
-cp ./templates/proof_upgrade_bundle_template.json "$BUNDLE_PATH"
-
-# Tx 1: Upgrade PermissionedDisputeGame implementation
-TX_1_PAYLOAD=$(cast calldata "setImplementation(uint32,address)" 1 "$PDG_IMPL")
-
-# Tx 2: Upgrade FaultDisputeGame implementation
-TX_2_PAYLOAD=$(cast calldata "setImplementation(uint32,address)" 0 "$FDG_IMPL")
-
-# Replace variables
-sed -i "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
-sed -i "s/\$PDG_IMPL/$PDG_IMPL/g" "$BUNDLE_PATH"
-sed -i "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
-sed -i "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
-
-# Conditionally, if the FDG is being deployed, append the bundle extension
-if [ "$USE_PERMISSIONLESS_FAULT_PROOFS" == true ]; then
-  echo "✨ USE_PERMISSIONLESS_FAULT_PROOFS=true | Adding FDG deployment to upgrade bundle."
-  jq --argjson fdg_extension "$(cat ./templates/fdg_bundle_extension.json)" \
-    '.transactions += [$fdg_extension]' \
-    "$BUNDLE_PATH" >"$BUNDLE_PATH.tmp"
-  mv "$BUNDLE_PATH.tmp" "$BUNDLE_PATH"
-
-  # Replace variables
-  sed -i "s/\$FDG_IMPL/$FDG_IMPL/g" "$BUNDLE_PATH"
-  sed -i "s/\$TX_2_PAYLOAD/$TX_2_PAYLOAD/g" "$BUNDLE_PATH"
-fi
-
-sed -i "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$BUNDLE_PATH"
-
-echo "✨ Generated proof contracts upgrade bundle at \"$BUNDLE_PATH\""
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
deleted file mode 100755
index ec386727d3bd..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-proofs.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Grab the script directory
-SCRIPT_DIR=$(dirname "$0")
-
-# Load common.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/common.sh"
-
-# Check required environment variables
-reqenv "OUTPUT_FOLDER_PATH"
-reqenv "MIPS_IMPL"
-reqenv "FDG_IMPL"
-reqenv "PDG_IMPL"
-reqenv "DISPUTE_GAME_FACTORY_PROXY_ADDR"
-
-# Create directory for the task
-TASK_DIR="$OUTPUT_FOLDER_PATH/proofs-sc-ops-task"
-mkdir -p "$TASK_DIR"
-
-# Copy the bundle and task template
-cp "$OUTPUT_FOLDER_PATH/proofs_bundle.json" "$TASK_DIR/input.json"
-cp -R "$SCRIPT_DIR/../templates/proofs-sc-ops-task/." "$TASK_DIR/"
-
-# Generate the task overview
-msup render -i "$TASK_DIR/input.json" -o "$TASK_DIR/OVERVIEW.md"
-
-# Generate the README
-sed -i "s/\$MIPS_IMPL/$MIPS_IMPL/g" "$TASK_DIR/README.md"
-sed -i "s/\$FDG_IMPL/$FDG_IMPL/g" "$TASK_DIR/README.md"
-sed -i "s/\$PDG_IMPL/$PDG_IMPL/g" "$TASK_DIR/README.md"
-
-# Generate the validation doc
-OLD_FDG=$(cast call "$DISPUTE_GAME_FACTORY_PROXY_ADDR" "gameImpls(uint32)" 0)
-OLD_PDG=$(cast call "$DISPUTE_GAME_FACTORY_PROXY_ADDR" "gameImpls(uint32)" 1)
-
-PADDED_OLD_FDG=$(cast 2u "$OLD_FDG")
-PADDED_OLD_PDG=$(cast 2u "$OLD_PDG")
-PADDED_FDG_IMPL=$(cast 2u "$FDG_IMPL")
-PADDED_PDG_IMPL=$(cast 2u "$PDG_IMPL")
-
-sed -i "s/\$DISPUTE_GAME_FACTORY_PROXY_ADDR/$DISPUTE_GAME_FACTORY_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
-sed -i "s/\$OLD_FDG/$PADDED_OLD_FDG/g" "$TASK_DIR/VALIDATION.md"
-sed -i "s/\$FDG_IMPL/$PADDED_FDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
-sed -i "s/\$PDG_IMPL/$PADDED_PDG_IMPL/g" "$TASK_DIR/VALIDATION.md"
-sed -i "s/\$OLD_PDG/$PADDED_OLD_PDG/g" "$TASK_DIR/VALIDATION.md"
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
deleted file mode 100755
index a87de445d3d5..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sc-ops-sys-cfg.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Grab the script directory
-SCRIPT_DIR=$(dirname "$0")
-
-# Load common.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/common.sh"
-
-# Check required environment variables
-reqenv "OUTPUT_FOLDER_PATH"
-reqenv "SYSTEM_CONFIG_IMPL"
-reqenv "SYSTEM_CONFIG_PROXY_ADDR"
-
-# Create directory for the task
-TASK_DIR="$OUTPUT_FOLDER_PATH/sys-cfg-sc-ops-task"
-mkdir -p "$TASK_DIR"
-
-# Copy the bundle and task template
-cp "$OUTPUT_FOLDER_PATH/sys_cfg_bundle.json" "$TASK_DIR/input.json"
-cp -R "$SCRIPT_DIR/../templates/sys-cfg-sc-ops-task/." "$TASK_DIR/"
-
-# Generate the task overview
-msup render -i "$TASK_DIR/input.json" -o "$TASK_DIR/OVERVIEW.md"
-
-# Generate the README
-sed -i "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$TASK_DIR/README.md"
-
-# Generate the validation doc
-OLD_SYS_CFG=$(cast impl "$SYSTEM_CONFIG_PROXY_ADDR")
-
-PADDED_OLD_SYS_CFG=$(cast 2u "$OLD_SYS_CFG")
-PADDED_SYS_CFG=$(cast 2u "$SYSTEM_CONFIG_IMPL")
-
-sed -i "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$TASK_DIR/VALIDATION.md"
-sed -i "s/\$OLD_SYS_CFG/$PADDED_OLD_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
-sed -i "s/\$SYSTEM_CONFIG_IMPL/$PADDED_SYS_CFG/g" "$TASK_DIR/VALIDATION.md"
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh b/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
deleted file mode 100755
index bde4917e6b82..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/scripts/sys-cfg-bundle.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Grab the script directory
-SCRIPT_DIR=$(dirname "$0")
-
-# Load common.sh
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/common.sh"
-
-# Check the env
-reqenv "ETH_RPC_URL"
-reqenv "OUTPUT_FOLDER_PATH"
-reqenv "PROXY_ADMIN_ADDR"
-reqenv "SYSTEM_CONFIG_PROXY_ADDR"
-reqenv "SYSTEM_CONFIG_IMPL"
-
-# Local environment
-BUNDLE_PATH="$OUTPUT_FOLDER_PATH/sys_cfg_bundle.json"
-L1_CHAIN_ID=$(cast chain-id)
-
-# Copy the bundle template
-cp ./templates/sys_cfg_upgrade_bundle_template.json "$BUNDLE_PATH"
-
-# Tx 1: Upgrade SystemConfigProxy implementation
-TX_1_PAYLOAD=$(cast calldata "upgrade(address,address)" "$SYSTEM_CONFIG_PROXY_ADDR" "$SYSTEM_CONFIG_IMPL")
-
-# Replace variables
-sed -i "s/\$L1_CHAIN_ID/$L1_CHAIN_ID/g" "$BUNDLE_PATH"
-sed -i "s/\$PROXY_ADMIN_ADDR/$PROXY_ADMIN_ADDR/g" "$BUNDLE_PATH"
-sed -i "s/\$SYSTEM_CONFIG_PROXY_ADDR/$SYSTEM_CONFIG_PROXY_ADDR/g" "$BUNDLE_PATH"
-sed -i "s/\$SYSTEM_CONFIG_IMPL/$SYSTEM_CONFIG_IMPL/g" "$BUNDLE_PATH"
-sed -i "s/\$TX_1_PAYLOAD/$TX_1_PAYLOAD/g" "$BUNDLE_PATH"
-
-echo "✨ Generated SystemConfig upgrade bundle at \"$BUNDLE_PATH\""
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json
deleted file mode 100644
index fa6680496bdb..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/fdg_bundle_extension.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "metadata": {
-    "name": "Upgrade `CANNON` game type in `DisputeGameFactory`",
-    "description": "Upgrades the `CANNON` game type to the new Holocene deployment, with an updated version of `op-program` as the absolute prestate hash."
-  },
-  "to": "$DISPUTE_GAME_FACTORY_PROXY_ADDR",
-  "value": "0x0",
-  "data": "$TX_2_PAYLOAD",
-  "contractMethod": {
-    "type": "function",
-    "name": "setImplementation",
-    "inputs": [
-      {
-        "name": "_gameType",
-        "type": "uint32"
-      },
-      {
-        "name": "_impl",
-        "type": "address"
-      }
-    ],
-    "outputs": [],
-    "stateMutability": "nonpayable"
-  },
-  "contractInputsValues": {
-    "_gameType": "0",
-    "_impl": "$FDG_IMPL"
-  }
-}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json
deleted file mode 100644
index e74360f02a97..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proof_upgrade_bundle_template.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "chainId": $L1_CHAIN_ID,
-  "metadata": {
-    "name": "Holocene Hardfork - Proof Contract Upgrades",
-    "description": "Upgrades the `MIPS.sol`, `FaultDisputeGame.sol`, and `PermissionedDisputeGame.sol` contracts for Holocene."
-  },
-  "transactions": [
-    {
-      "metadata": {
-        "name": "Upgrade `PERMISSIONED_CANNON` game type in `DisputeGameFactory`",
-        "description": "Upgrades the `PERMISSIONED_CANNON` game type to the new Holocene deployment, with an updated version of `op-program` as the absolute prestate hash."
-      },
-      "to": "$DISPUTE_GAME_FACTORY_PROXY_ADDR",
-      "value": "0x0",
-      "data": "$TX_1_PAYLOAD",
-      "contractMethod": {
-        "type": "function",
-        "name": "setImplementation",
-        "inputs": [
-          {
-            "name": "_gameType",
-            "type": "uint32"
-          },
-          {
-            "name": "_impl",
-            "type": "address"
-          }
-        ],
-        "outputs": [],
-        "stateMutability": "nonpayable"
-      },
-      "contractInputsValues": {
-        "_gameType": "1",
-        "_impl": "$PDG_IMPL"
-      }
-    }
-  ]
-}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example
deleted file mode 100644
index ba2beff7f429..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/.env.example
+++ /dev/null
@@ -1,6 +0,0 @@
-ETH_RPC_URL=
-SUPERCHAIN_CONFIG_ADDR=
-COUNCIL_SAFE=
-FOUNDATION_SAFE=
-OWNER_SAFE=
-SAFE_NONCE=
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md
deleted file mode 100644
index e2077747dba1..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Holocene Hardfork Upgrade
-
-Status: DRAFT, NOT READY TO SIGN
-
-## Objective
-
-Upgrades the Fault Proof contracts for the Holocene hardfork.
-
-The proposal was:
-
-- [ ] Posted on the governance forum.
-- [ ] Approved by Token House voting.
-- [ ] Not vetoed by the Citizens' house.
-- [ ] Executed on OP Mainnet.
-
-The governance proposal should be treated as the source of truth and used to verify the correctness of the onchain operations.
-
-Governance post of the upgrade can be found at <placeholder>.
-
-This upgrades the Fault Proof contracts in the
-[op-contracts/v1.8.0](https://github.com/ethereum-optimism/optimism/tree/op-contracts/v1.8.0-rc.1) release.
-
-## Pre-deployments
-
-- `MIPS` - `$MIPS_IMPL`
-- `FaultDisputeGame` - `$FDG_IMPL`
-- `PermissionedDisputeGame` - `$PDG_IMPL`
-
-## Simulation
-
-Please see the "Simulating and Verifying the Transaction" instructions in [NESTED.md](../../../NESTED.md).
-When simulating, ensure the logs say `Using script /your/path/to/superchain-ops/tasks/<path>/NestedSignFromJson.s.sol`.
-This ensures all safety checks are run. If the default `NestedSignFromJson.s.sol` script is shown (without the full path), something is wrong and the safety checks will not run.
-
-## State Validation
-
-Please see the instructions for [validation](./VALIDATION.md).
-
-## Execution
-
-This upgrade
-* Changes dispute game implementation of the `CANNON` and `PERMISSIONED_CANNON` game types to contain a `op-program` release for the Holocene hardfork, which contains
-  the Holocene fork implementation as well as a `ChainConfig` and `RollupConfig` for the L2 chain being upgraded.
-* Upgrades `MIPS.sol` to support the `F_GETFD` syscall, required by the golang 1.22+ runtime.
-
-See the [overview](./OVERVIEW.md) and `input.json` bundle for more details.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md
deleted file mode 100644
index 50ba3ca106b4..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/proofs-sc-ops-task/VALIDATION.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Validation
-
-This document can be used to validate the state diff resulting from the execution of the upgrade
-transaction.
-
-For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract:
-
-- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur.
-- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic.
-- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.
-
-## State Changes
-
-### `$DISPUTE_GAME_FACTORY_PROXY_ADDR` (`DisputeGameFactoryProxy`)
-
-- **Key**: `0xffdfc1249c027f9191656349feb0761381bb32c9f557e01f419fd08754bf5a1b` <br/>
-  **Before**: `$OLD_FDG` <br/>
-  **After**: `$FDG_IMPL` <br/>
-  **Meaning**: Updates the CANNON game type implementation. Verify that the new implementation is set using `cast call $DISPUTE_GAME_FACTORY_PROXY_ADDR "gameImpls(uint32)(address)" 0`. Where `0` is the [`CANNON` game type](https://github.com/ethereum-optimism/optimism/blob/op-contracts/v1.4.0/packages/contracts-bedrock/src/dispute/lib/Types.sol#L28).
-
-- **Key**: `0x4d5a9bd2e41301728d41c8e705190becb4e74abe869f75bdb405b63716a35f9e` <br/>
-  **Before**: `$OLD_PDG` <br/>
-  **After**: `$PDG_IMPL` <br/>
-  **Meaning**: Updates the PERMISSIONED_CANNON game type implementation. Verify that the new implementation is set using `cast call $DISPUTE_GAME_FACTORY_PROXY_ADDR "gameImpls(uint32)(address)" 1`. Where `1` is the [`PERMISSIONED_CANNON` game type](https://github.com/ethereum-optimism/optimism/blob/op-contracts/v1.4.0/packages/contracts-bedrock/src/dispute/lib/Types.sol#L31).
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example
deleted file mode 100644
index ba2beff7f429..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/.env.example
+++ /dev/null
@@ -1,6 +0,0 @@
-ETH_RPC_URL=
-SUPERCHAIN_CONFIG_ADDR=
-COUNCIL_SAFE=
-FOUNDATION_SAFE=
-OWNER_SAFE=
-SAFE_NONCE=
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md
deleted file mode 100644
index 740219586b80..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Holocene Hardfork Upgrade - `SystemConfig`
-
-Status: DRAFT, NOT READY TO SIGN
-
-## Objective
-
-Upgrades the `SystemConfig` for the Holocene hardfork.
-
-The proposal was:
-
-- [ ] Posted on the governance forum.
-- [ ] Approved by Token House voting.
-- [ ] Not vetoed by the Citizens' house.
-- [ ] Executed on OP Mainnet.
-
-The governance proposal should be treated as the source of truth and used to verify the correctness of the onchain operations.
-
-Governance post of the upgrade can be found at <placeholder>.
-
-This upgrades the `SystemConfig` in the
-[op-contracts/v1.8.0](https://github.com/ethereum-optimism/optimism/tree/op-contracts/v1.8.0-rc.1) release.
-
-## Pre-deployments
-
-- `SystemConfig` - `$SYSTEM_CONFIG_IMPL`
-
-## Simulation
-
-Please see the "Simulating and Verifying the Transaction" instructions in [NESTED.md](../../../NESTED.md).
-When simulating, ensure the logs say `Using script /your/path/to/superchain-ops/tasks/<path>/NestedSignFromJson.s.sol`.
-This ensures all safety checks are run. If the default `NestedSignFromJson.s.sol` script is shown (without the full path), something is wrong and the safety checks will not run.
-
-## State Validation
-
-Please see the instructions for [validation](./VALIDATION.md).
-
-## Execution
-
-This upgrade
-* Changes the implementation of the `SystemConfig` to hold EIP-1559 parameters for the
-
-See the [overview](./OVERVIEW.md) and `input.json` bundle for more details.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md
deleted file mode 100644
index 3a5e7b67595a..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys-cfg-sc-ops-task/VALIDATION.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Validation
-
-This document can be used to validate the state diff resulting from the execution of the upgrade
-transaction.
-
-For each contract listed in the state diff, please verify that no contracts or state changes shown in the Tenderly diff are missing from this document. Additionally, please verify that for each contract:
-
-- The following state changes (and none others) are made to that contract. This validates that no unexpected state changes occur.
-- All addresses (in section headers and storage values) match the provided name, using the Etherscan and Superchain Registry links provided. This validates the bytecode deployed at the addresses contains the correct logic.
-- All key values match the semantic meaning provided, which can be validated using the storage layout links provided.
-
-## State Changes
-
-### `$SYSTEM_CONFIG_PROXY_ADDR` (`SystemConfigProxy`)
-
-- **Key**: `0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc`
-  **Before**: `$OLD_SYS_CFG`
-  **After**: `$SYSTEM_CONFIG_IMPL`
-  **Meaning**: Updates the `SystemConfig` proxy implementation.
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json b/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json
deleted file mode 100644
index 62746a51982f..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/templates/sys_cfg_upgrade_bundle_template.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "chainId": $L1_CHAIN_ID,
-  "metadata": {
-    "name": "Holocene Hardfork - SystemConfig Upgrade",
-    "description": "Upgrades the `SystemConfig.sol` contract for Holocene."
-  },
-  "transactions": [
-    {
-      "metadata": {
-        "name": "Upgrade `SystemConfig` proxy",
-        "description": "Upgrades the `SystemConfig` proxy to the new implementation, featuring configurable EIP-1559 parameters."
-      },
-      "to": "$PROXY_ADMIN_ADDR",
-      "value": "0x0",
-      "data": "$TX_1_PAYLOAD",
-      "contractMethod": {
-        "type": "function",
-        "name": "upgrade",
-        "inputs": [
-          {
-            "name": "_proxy",
-            "type": "address"
-          },
-          {
-            "name": "_implementation",
-            "type": "address"
-          }
-        ],
-        "outputs": [],
-        "stateMutability": "nonpayable"
-      },
-      "contractInputsValues": {
-        "_proxy": "$SYSTEM_CONFIG_PROXY_ADDR",
-        "_implementation": "$SYSTEM_CONFIG_IMPL"
-      }
-    }
-  ]
-}
diff --git a/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile b/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile
deleted file mode 100644
index 33166fe6e5ad..000000000000
--- a/packages/contracts-bedrock/scripts/upgrades/holocene/upgrade.dockerfile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Use a base image with necessary tools
-FROM ubuntu:20.04
-
-ARG REV
-
-# Install required packages
-RUN apt-get update && apt-get install -y \
-    git \
-    bash \
-    curl \
-    build-essential \
-    jq \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install just
-RUN curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
-
-# Install msup
-RUN git clone https://github.com/clabby/msup.git && \
-  cd msup && \
-  cargo install --path .
-
-# Install foundryup
-RUN curl -L https://foundry.paradigm.xyz | bash
-ENV PATH="/root/.foundry/bin:${PATH}"
-
-# Set the working directory
-WORKDIR /app
-
-# Clone the repository
-RUN git clone https://github.com/ethereum-optimism/optimism.git .
-
-# Check out the target branch
-RUN git checkout $REV
-
-# Set the working directory to the root of the monorepo
-WORKDIR /app
-
-# Install correct foundry version
-RUN just update-foundry
-
-# Set the working directory to the root of the contracts package
-WORKDIR /app/packages/contracts-bedrock
-
-# Install dependencies
-RUN just install
-
-# Build the contracts package
-RUN forge build
-
-# Deliberately run the upgrade script with invalid args to trigger a build
-RUN forge script ./scripts/upgrades/holocene/DeployUpgrade.s.sol || true
-
-# Set the working directory to where upgrade.sh is located
-WORKDIR /app/packages/contracts-bedrock/scripts/upgrades/holocene
-
-# allows to use modified local scripts
-COPY scripts/*.sh ./scripts/
-
-# Set the entrypoint to the main.sh script
-ENTRYPOINT ["./scripts/main.sh"]

From 2d86cab7f9525ad3ddb2199f0e18b9cde85042f1 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 4 Dec 2024 01:46:09 -0500
Subject: [PATCH 352/451] feat: timeout fuzz tests after 10 minutes (#13207)

* feat: timeout fuzz tests after 10 minutes

Uses the new fuzz test timeout feature that we merged into foundry
to limit individual test runs to 10 minutes. Simplifies how we
need to deal with heavy fuzz testing.

* fix: improve bounds for OptimismPortal tests

Improves the fuzz bounds for the OptimismPortal tests so that
they can complete 20000 runs without throwing.
---
 .circleci/config.yml                          |  2 +-
 packages/contracts-bedrock/foundry.toml       |  2 ++
 .../test/L1/OptimismPortal.t.sol              | 24 +++++++++----------
 .../test/L1/OptimismPortal2.t.sol             | 23 +++++++++---------
 .../test/cannon/PreimageOracle.t.sol          |  3 ---
 .../test/safe/LivenessGuard.t.sol             |  1 -
 .../test/setup/DeployVariations.t.sol         |  2 --
 7 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8cdd813d72a3..665bfc5e6c90 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   ci_builder_image:
     type: string
-    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.54.0
+    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.55.0
   ci_builder_rust_image:
     type: string
     default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder-rust:latest
diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 6bad8be9d4ce..782369b04854 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -83,10 +83,12 @@ depth = 32
 
 [profile.ciheavy.fuzz]
 runs = 20000
+timeout = 600
 
 [profile.ciheavy.invariant]
 runs = 128
 depth = 512
+timeout = 600
 
 ################################################################
 #                         PROFILE: LITE                        #
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index 8172fb14b793..a0a49227e710 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -201,7 +201,6 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds when msg.sender == tx.origin and non-custom gas is used.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_senderIsOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -227,7 +226,6 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds when msg.sender != tx.origin and non-custom gas is used.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_senderNotOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -310,7 +308,6 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for an EOA.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_eoa_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -355,7 +352,6 @@ contract OptimismPortal_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for a contract.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_contract_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -1214,7 +1210,6 @@ contract OptimismPortal_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testDiff_finalizeWithdrawalTransaction_succeeds(
         address _sender,
         address _target,
@@ -1337,7 +1332,6 @@ contract OptimismPortalResourceFuzz_Test is CommonTest {
     uint256 constant MAX_GAS_LIMIT = 30_000_000;
 
     /// @dev Test that various values of the resource metering config will not break deposits.
-    /// forge-config: ciheavy.fuzz.runs = 10000
     function testFuzz_systemConfigDeposit_succeeds(
         uint32 _maxResourceLimit,
         uint8 _elasticityMultiplier,
@@ -1356,8 +1350,13 @@ contract OptimismPortalResourceFuzz_Test is CommonTest {
         uint64 gasLimit = systemConfig.gasLimit();
 
         // Bound resource config
+        _systemTxMaxGas = uint32(bound(_systemTxMaxGas, 0, gasLimit - 21000));
         _maxResourceLimit = uint32(bound(_maxResourceLimit, 21000, MAX_GAS_LIMIT / 8));
+        _maxResourceLimit = uint32(bound(_maxResourceLimit, 21000, gasLimit - _systemTxMaxGas));
+        _maximumBaseFee = uint128(bound(_maximumBaseFee, 1, type(uint128).max));
+        _minimumBaseFee = uint32(bound(_minimumBaseFee, 0, _maximumBaseFee - 1));
         _gasLimit = uint64(bound(_gasLimit, 21000, _maxResourceLimit));
+        _gasLimit = uint64(bound(_gasLimit, 0, gasLimit));
         _prevBaseFee = uint128(bound(_prevBaseFee, 0, 3 gwei));
         _prevBoughtGas = uint64(bound(_prevBoughtGas, 0, _maxResourceLimit - _gasLimit));
         _blockDiff = uint8(bound(_blockDiff, 0, 3));
@@ -1365,11 +1364,16 @@ contract OptimismPortalResourceFuzz_Test is CommonTest {
         _elasticityMultiplier = uint8(bound(_elasticityMultiplier, 1, type(uint8).max));
 
         // Prevent values that would cause reverts
-        vm.assume(gasLimit >= _gasLimit);
-        vm.assume(_minimumBaseFee < _maximumBaseFee);
         vm.assume(uint256(_maxResourceLimit) + uint256(_systemTxMaxGas) <= gasLimit);
         vm.assume(((_maxResourceLimit / _elasticityMultiplier) * _elasticityMultiplier) == _maxResourceLimit);
 
+        // Although we typically want to limit the usage of vm.assume, we've constructed the above
+        // bounds to satisfy the assumptions listed in this specific section. These assumptions
+        // serve only to act as an additional sanity check on top of the bounds and should not
+        // result in an unnecessary number of test rejections.
+        vm.assume(gasLimit >= _gasLimit);
+        vm.assume(_minimumBaseFee < _maximumBaseFee);
+
         // Base fee can increase quickly and mean that we can't buy the amount of gas we want.
         // Here we add a VM assumption to bound the potential increase.
         // Compute the maximum possible increase in base fee.
@@ -1472,7 +1476,6 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender == tx.origin.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderIsOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1498,7 +1501,6 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender != tx.origin.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderNotOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1697,7 +1699,6 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderIsOrigin_succeeds(
         address _to,
         uint256 _value,
@@ -1721,7 +1722,6 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderNotOrigin_succeeds(
         address _to,
         uint256 _value,
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index 083644755d3c..44c1c8f9fd1a 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -211,7 +211,6 @@ contract OptimismPortal2_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for an EOA.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_eoa_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -256,7 +255,6 @@ contract OptimismPortal2_Test is CommonTest {
     }
 
     /// @dev Tests that `depositTransaction` succeeds for a contract.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_contract_succeeds(
         address _to,
         uint64 _gasLimit,
@@ -1326,7 +1324,6 @@ contract OptimismPortal2_FinalizeWithdrawal_Test is CommonTest {
     }
 
     /// @dev Tests that `finalizeWithdrawalTransaction` succeeds.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testDiff_finalizeWithdrawalTransaction_succeeds(
         address _sender,
         address _target,
@@ -1610,7 +1607,6 @@ contract OptimismPortal2_ResourceFuzz_Test is CommonTest {
     }
 
     /// @dev Test that various values of the resource metering config will not break deposits.
-    /// forge-config: ciheavy.fuzz.runs = 10000
     function testFuzz_systemConfigDeposit_succeeds(
         uint32 _maxResourceLimit,
         uint8 _elasticityMultiplier,
@@ -1629,8 +1625,13 @@ contract OptimismPortal2_ResourceFuzz_Test is CommonTest {
         uint64 gasLimit = systemConfig.gasLimit();
 
         // Bound resource config
+        _systemTxMaxGas = uint32(bound(_systemTxMaxGas, 0, gasLimit - 21000));
         _maxResourceLimit = uint32(bound(_maxResourceLimit, 21000, MAX_GAS_LIMIT / 8));
+        _maxResourceLimit = uint32(bound(_maxResourceLimit, 21000, gasLimit - _systemTxMaxGas));
+        _maximumBaseFee = uint128(bound(_maximumBaseFee, 1, type(uint128).max));
+        _minimumBaseFee = uint32(bound(_minimumBaseFee, 0, _maximumBaseFee - 1));
         _gasLimit = uint64(bound(_gasLimit, 21000, _maxResourceLimit));
+        _gasLimit = uint64(bound(_gasLimit, 0, gasLimit));
         _prevBaseFee = uint128(bound(_prevBaseFee, 0, 3 gwei));
         _prevBoughtGas = uint64(bound(_prevBoughtGas, 0, _maxResourceLimit - _gasLimit));
         _blockDiff = uint8(bound(_blockDiff, 0, 3));
@@ -1638,12 +1639,16 @@ contract OptimismPortal2_ResourceFuzz_Test is CommonTest {
         _elasticityMultiplier = uint8(bound(_elasticityMultiplier, 1, type(uint8).max));
 
         // Prevent values that would cause reverts
-        vm.assume(gasLimit >= _gasLimit);
-        vm.assume(_minimumBaseFee < _maximumBaseFee);
-        vm.assume(_baseFeeMaxChangeDenominator > 1);
         vm.assume(uint256(_maxResourceLimit) + uint256(_systemTxMaxGas) <= gasLimit);
         vm.assume(((_maxResourceLimit / _elasticityMultiplier) * _elasticityMultiplier) == _maxResourceLimit);
 
+        // Although we typically want to limit the usage of vm.assume, we've constructed the above
+        // bounds to satisfy the assumptions listed in this specific section. These assumptions
+        // serve only to act as an additional sanity check on top of the bounds and should not
+        // result in an unnecessary number of test rejections.
+        vm.assume(gasLimit >= _gasLimit);
+        vm.assume(_minimumBaseFee < _maximumBaseFee);
+
         // Base fee can increase quickly and mean that we can't buy the amount of gas we want.
         // Here we add a VM assumption to bound the potential increase.
         // Compute the maximum possible increase in base fee.
@@ -1746,7 +1751,6 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender == tx.origin.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderIsOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1772,7 +1776,6 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositERC20Transaction` succeeds when msg.sender != tx.origin.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositERC20Transaction_senderNotOrigin_succeeds(
         address _to,
         uint256 _mint,
@@ -1980,7 +1983,6 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderIsOrigin_succeeds(
         address _to,
         uint256 _value,
@@ -2004,7 +2006,6 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
     }
 
     /// @dev Tests that `depositTransaction` succeeds when a custom gas token is used but the msg.value is zero.
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_depositTransaction_customGasTokenWithNoValueAndSenderNotOrigin_succeeds(
         address _to,
         uint256 _value,
diff --git a/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol b/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
index 1c4d41728fcc..6293f652e528 100644
--- a/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
+++ b/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
@@ -889,7 +889,6 @@ contract PreimageOracle_LargePreimageProposals_Test is Test {
 
     /// @notice Tests that squeezing a large preimage proposal after the challenge period has passed always succeeds and
     ///         persists the correct data.
-    /// forge-config: ciheavy.fuzz.runs = 512
     function testFuzz_squeezeLPP_succeeds(uint256 _numBlocks, uint32 _partOffset) public {
         _numBlocks = bound(_numBlocks, 1, 2 ** 8);
         _partOffset = uint32(bound(_partOffset, 0, _numBlocks * LibKeccak.BLOCK_SIZE_BYTES + 8 - 1));
@@ -1087,7 +1086,6 @@ contract PreimageOracle_LargePreimageProposals_Test is Test {
 
     /// @notice Tests that challenging the first divergence in a large preimage proposal at an arbitrary location
     ///         in the leaf values always succeeds.
-    /// forge-config: ciheavy.fuzz.runs = 512
     function testFuzz_challenge_arbitraryLocation_succeeds(uint256 _lastCorrectLeafIdx, uint256 _numBlocks) public {
         _numBlocks = bound(_numBlocks, 1, 2 ** 8);
         _lastCorrectLeafIdx = bound(_lastCorrectLeafIdx, 0, _numBlocks - 1);
@@ -1140,7 +1138,6 @@ contract PreimageOracle_LargePreimageProposals_Test is Test {
     }
 
     /// @notice Tests that challenging the a divergence in a large preimage proposal at the first leaf always succeeds.
-    /// forge-config: ciheavy.fuzz.runs = 1024
     function testFuzz_challengeFirst_succeeds(uint256 _numBlocks) public {
         _numBlocks = bound(_numBlocks, 1, 2 ** 8);
 
diff --git a/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol b/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
index a7b67b415b22..90a0ecd9f1fc 100644
--- a/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
+++ b/packages/contracts-bedrock/test/safe/LivenessGuard.t.sol
@@ -228,7 +228,6 @@ contract LivenessGuard_FuzzOwnerManagement_Test is StdCheats, StdUtils, Liveness
     mapping(address => uint256) privateKeys;
 
     /// @dev Tests that the guard correctly manages the lastLive mapping when owners are added, removed, or swapped
-    /// forge-config: ciheavy.fuzz.runs = 8192
     function testFuzz_ownerManagement_works(
         uint256 initialOwners,
         uint256 threshold,
diff --git a/packages/contracts-bedrock/test/setup/DeployVariations.t.sol b/packages/contracts-bedrock/test/setup/DeployVariations.t.sol
index 31f687f0fdb8..94628067e119 100644
--- a/packages/contracts-bedrock/test/setup/DeployVariations.t.sol
+++ b/packages/contracts-bedrock/test/setup/DeployVariations.t.sol
@@ -22,7 +22,6 @@ contract DeployVariations_Test is CommonTest {
         }
     }
 
-    /// forge-config: ciheavy.fuzz.runs = 512
     /// @dev It should be possible to enable Fault Proofs with any mix of CGT and Alt-DA.
     function testFuzz_enableFaultProofs_succeeds(bool _enableCGT, bool _enableAltDa) public virtual {
         enableAddOns(_enableCGT, _enableAltDa);
@@ -30,7 +29,6 @@ contract DeployVariations_Test is CommonTest {
         super.setUp();
     }
 
-    /// forge-config: ciheavy.fuzz.runs = 512
     /// @dev It should be possible to enable Fault Proofs and Interop with any mix of CGT and Alt-DA.
     function test_enableInteropAndFaultProofs_succeeds(bool _enableCGT, bool _enableAltDa) public virtual {
         enableAddOns(_enableCGT, _enableAltDa);

From cd8bab41543bbfae553bf882569484b07f20b993 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Wed, 4 Dec 2024 08:58:39 +0000
Subject: [PATCH 353/451] e2e/actions: enhance holocene activation action test
 to cover execution layer (#13188)

* enhance holoene activation action test to cover execution layer

* apply suggestions from code review

* undo changes to submodule
---
 .../proofs/holocene_activation_test.go        | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/op-e2e/actions/proofs/holocene_activation_test.go b/op-e2e/actions/proofs/holocene_activation_test.go
index 55b8c1162de3..1cdd3aba4573 100644
--- a/op-e2e/actions/proofs/holocene_activation_test.go
+++ b/op-e2e/actions/proofs/holocene_activation_test.go
@@ -26,12 +26,14 @@ func Test_ProgramAction_HoloceneActivation(gt *testing.T) {
 
 		env := helpers.NewL2FaultProofEnv(t, testCfg, helpers.NewTestParams(), helpers.NewBatcherCfg(), setHoloceneTime)
 
-		t.Log("HoloceneTime:  ", env.Sequencer.RollupCfg.HoloceneTime)
-
-		// Build the L2 chain
-		blocks := []uint{1, 2}
-		targetHeadNumber := 2
-		for env.Engine.L2Chain().CurrentBlock().Number.Uint64() < uint64(targetHeadNumber) {
+		t.Logf("L2 Genesis Time: %d, HoloceneTime: %d ", env.Sequencer.RollupCfg.Genesis.L2Time, *env.Sequencer.RollupCfg.HoloceneTime)
+
+		// Build the L2 chain until the Holocene activation time,
+		// which for the Execution Engine is an L2 block timestamp
+		// https://specs.optimism.io/protocol/holocene/exec-engine.html?highlight=holocene#timestamp-activation
+		for env.Engine.L2Chain().CurrentBlock().Time < *env.Sequencer.RollupCfg.HoloceneTime {
+			b := env.Engine.L2Chain().GetBlockByHash(env.Sequencer.L2Unsafe().Hash)
+			require.Equal(t, "", string(b.Extra()), "extra data should be empty before Holocene activation")
 			env.Sequencer.ActL2StartBlock(t)
 			// Send an L2 tx
 			env.Alice.L2.ActResetTxOpts(t)
@@ -39,15 +41,24 @@ func Test_ProgramAction_HoloceneActivation(gt *testing.T) {
 			env.Alice.L2.ActMakeTx(t)
 			env.Engine.ActL2IncludeTx(env.Alice.Address())(t)
 			env.Sequencer.ActL2EndBlock(t)
+			t.Log("Unsafe block with timestamp %d", b.Time)
 		}
+		b := env.Engine.L2Chain().GetBlockByHash(env.Sequencer.L2Unsafe().Hash)
+		require.Len(t, b.Extra(), 9, "extra data should be 9 bytes after Holocene activation")
 
 		// Build up a local list of frames
-		orderedFrames := make([][]byte, 0, 2)
+		orderedFrames := make([][]byte, 0, 1)
+		// Submit the first two blocks, this will be enough to trigger Holocene _derivation_
+		// which is activated by the L1 inclusion block timestamp
+		// https://specs.optimism.io/protocol/holocene/derivation.html?highlight=holoce#activation
+		// block 1 will be 12 seconda after genesis, and 2 seconds before Holocene activation
+		// block 2 will be 24 seconds after genesis, and 10 seconds after Holocene activation
+		blocksToSubmit := []uint{1, 2}
 		// Buffer the blocks in the batcher and populate orderedFrames list
 		env.Batcher.ActCreateChannel(t, false)
-		for i, blockNum := range blocks {
+		for i, blockNum := range blocksToSubmit {
 			env.Batcher.ActAddBlockByNumber(t, int64(blockNum), actionsHelpers.BlockLogger(t))
-			if i == len(blocks)-1 {
+			if i == len(blocksToSubmit)-1 {
 				env.Batcher.ActL2ChannelClose(t)
 			}
 			frame := env.Batcher.ReadNextOutputFrame(t)
@@ -64,7 +75,7 @@ func Test_ProgramAction_HoloceneActivation(gt *testing.T) {
 
 		// Submit first frame
 		env.Batcher.ActL2BatchSubmitRaw(t, orderedFrames[0])
-		includeBatchTx() // block should have a timestamp of 12s after genesis
+		includeBatchTx() // L1 block should have a timestamp of 12s after genesis
 
 		// Holocene should activate 14s after genesis, so that the previous l1 block
 		// was before HoloceneTime and the next l1 block is after it
@@ -78,8 +89,11 @@ func Test_ProgramAction_HoloceneActivation(gt *testing.T) {
 		env.Sequencer.ActL2PipelineFull(t)
 
 		l2SafeHead := env.Sequencer.L2Safe()
+		t.Log(l2SafeHead.Time)
 		require.EqualValues(t, uint64(0), l2SafeHead.Number) // channel should be dropped, so no safe head progression
-		t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
+		if uint64(0) == l2SafeHead.Number {
+			t.Log("Safe head progressed as expected", "l2SafeHeadNumber", l2SafeHead.Number)
+		}
 
 		// Log assertions
 		filters := []string{
@@ -92,7 +106,6 @@ func Test_ProgramAction_HoloceneActivation(gt *testing.T) {
 			recs := env.Logs.FindLogs(testlog.NewMessageContainsFilter(filter), testlog.NewAttributesFilter("role", "sequencer"))
 			require.Len(t, recs, 1, "searching for %d instances of '%s' in logs from role %s", 1, filter, "sequencer")
 		}
-
 		env.RunFaultProofProgram(t, l2SafeHead.Number, testCfg.CheckResult, testCfg.InputParams...)
 	}
 

From c3e535c9a858b21176033380058dfcee87055526 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 4 Dec 2024 07:27:14 -0700
Subject: [PATCH 354/451] ops: Remove contracts-bedrock Docker image (#13218)

This has since been replaced with op-deployer.
---
 .circleci/config.yml           |  9 --------
 docker-bake.hcl                |  9 --------
 ops/docker/Dockerfile.packages | 38 ----------------------------------
 3 files changed, 56 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 665bfc5e6c90..bfe83b91f046 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1688,15 +1688,6 @@ workflows:
           name: <<matrix.op_component>>-cross-platform
           requires:
             - <<matrix.op_component>>-docker-publish
-      - docker-build:
-          name: contracts-bedrock-docker-publish
-          docker_name: contracts-bedrock
-          docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
-          resource_class: xlarge
-          publish: true
-          context:
-            - oplabs-gcr
-            - slack
 
   scheduled-preimage-reproducibility:
     when:
diff --git a/docker-bake.hcl b/docker-bake.hcl
index f0b57e565190..3f59c4336409 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -246,15 +246,6 @@ target "ci-builder-rust" {
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/ci-builder-rust:${tag}"]
 }
 
-target "contracts-bedrock" {
-  dockerfile = "./ops/docker/Dockerfile.packages"
-  context = "."
-  target = "contracts-bedrock"
-  # See comment in Dockerfile.packages for why we only build for linux/amd64.
-  platforms = ["linux/amd64"]
-  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/contracts-bedrock:${tag}"]
-}
-
 target "op-deployer" {
   dockerfile = "ops/docker/op-stack-go/Dockerfile"
   context = "."
diff --git a/ops/docker/Dockerfile.packages b/ops/docker/Dockerfile.packages
index 1e5786412cfb..d4c8041321b1 100644
--- a/ops/docker/Dockerfile.packages
+++ b/ops/docker/Dockerfile.packages
@@ -33,41 +33,3 @@ RUN git submodule update --init --recursive \
     && cd packages/contracts-bedrock \
     && just forge-build \
     && echo $(git rev-parse HEAD) > .gitcommit
-
-FROM --platform=linux/amd64 debian:bookworm-20240812-slim as contracts-bedrock
-
-RUN apt-get update && apt-get install -y \
-  curl \
-  jq \
-  ca-certificates \
-  git \
-  make \
-  bash \
-  --no-install-recommends
-
-COPY /ops/docker/oplabs.crt /usr/local/share/ca-certificates/oplabs.crt
-
-RUN chmod 644 /usr/local/share/ca-certificates/oplabs.crt \
-  && update-ca-certificates
-
-COPY --from=foundry /usr/local/bin/just /usr/local/bin/just
-COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge
-COPY --from=foundry /usr/local/bin/cast /usr/local/bin/cast
-COPY --from=foundry /usr/local/bin/svm /usr/local/bin/svm
-
-RUN svm install 0.8.25 && \
-  svm install 0.8.15 && \
-  svm install 0.8.19 && \
-  svm install 0.8.26
-
-# Not to be confused with OP, this is a OnePassword CLI tool.
-COPY --from=1password/op:2 /usr/local/bin/op /usr/local/bin/op
-
-RUN mkdir -p /opt/optimism/packages/contracts-bedrock
-
-COPY --from=base /opt/optimism/packages/contracts-bedrock /opt/optimism/packages/contracts-bedrock
-COPY --from=base /opt/optimism/mise.toml /opt/optimism/mise.toml
-
-WORKDIR /opt/optimism/packages/contracts-bedrock
-
-CMD ["echo", "Override this command to use this image."]

From ecdb788a18022d4b78d6288c1f6ec94c152d02f8 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 4 Dec 2024 13:07:04 -0500
Subject: [PATCH 355/451] maint: clean up some usage of vm.assume (#13216)

Cleans up some usage of vm.assume. Will be a series of commits
that do mostly the same thing.
---
 .../test/L1/ResourceMetering.t.sol            |  7 +++--
 .../test/L1/SystemConfig.t.sol                | 23 ++++++++++-----
 .../test/L1/SystemConfigInterop.t.sol         | 21 ++++++++++----
 .../contracts-bedrock/test/L2/L1Block.t.sol   | 29 ++++++++++++-------
 .../test/libraries/SafeCall.t.sol             |  2 +-
 .../test/safe/DeputyGuardianModule.t.sol      |  8 ++++-
 6 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol b/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
index 18f5ba82283f..8b262b55f2a8 100644
--- a/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
+++ b/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
@@ -201,20 +201,21 @@ contract ResourceMetering_Test is Test {
     function testFuzz_meter_largeBlockDiff_succeeds(uint64 _amount, uint256 _blockDiff) external {
         // This test fails if the following line is commented out.
         // At 12 seconds per block, this number is effectively unreachable.
-        vm.assume(_blockDiff < 433576281058164217753225238677900874458691);
+        _blockDiff = uint256(bound(_blockDiff, 0, 433576281058164217753225238677900874458690));
 
         ResourceMetering.ResourceConfig memory rcfg = meter.resourceConfig();
         uint64 target = uint64(rcfg.maxResourceLimit) / uint64(rcfg.elasticityMultiplier);
         uint64 elasticityMultiplier = uint64(rcfg.elasticityMultiplier);
 
-        vm.assume(_amount < target * elasticityMultiplier);
+        _amount = uint64(bound(_amount, 0, target * elasticityMultiplier));
+
         vm.roll(initialBlockNum + _blockDiff);
         meter.use(_amount);
     }
 
     function testFuzz_meter_useGas_succeeds(uint64 _amount) external {
         (, uint64 prevBoughtGas,) = meter.params();
-        vm.assume(prevBoughtGas + _amount <= meter.resourceConfig().maxResourceLimit);
+        _amount = uint64(bound(_amount, 0, meter.resourceConfig().maxResourceLimit - prevBoughtGas));
 
         meter.use(_amount);
 
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index fd5fd296f8fb..ae025c10df9a 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -385,12 +385,21 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
         // don't use multicall3's address
         vm.assume(_token != MULTICALL3_ADDRESS);
 
-        vm.assume(bytes(_name).length <= 32);
-        vm.assume(bytes(_symbol).length <= 32);
+        // Using vm.assume() would cause too many test rejections.
+        string memory name = _name;
+        if (bytes(_name).length > 32) {
+            name = _name[:32];
+        }
+
+        // Using vm.assume() would cause too many test rejections.
+        string memory symbol = _symbol;
+        if (bytes(_symbol).length > 32) {
+            symbol = _symbol[:32];
+        }
 
         vm.mockCall(_token, abi.encodeCall(token.decimals, ()), abi.encode(18));
-        vm.mockCall(_token, abi.encodeCall(token.name, ()), abi.encode(_name));
-        vm.mockCall(_token, abi.encodeCall(token.symbol, ()), abi.encode(_symbol));
+        vm.mockCall(_token, abi.encodeCall(token.name, ()), abi.encode(name));
+        vm.mockCall(_token, abi.encodeCall(token.symbol, ()), abi.encode(symbol));
 
         cleanStorageAndInit(_token);
 
@@ -403,8 +412,8 @@ contract SystemConfig_Init_CustomGasToken is SystemConfig_Init {
             assertEq(systemConfig.gasPayingTokenSymbol(), "ETH");
         } else {
             assertEq(addr, _token);
-            assertEq(systemConfig.gasPayingTokenName(), _name);
-            assertEq(systemConfig.gasPayingTokenSymbol(), _symbol);
+            assertEq(systemConfig.gasPayingTokenName(), name);
+            assertEq(systemConfig.gasPayingTokenSymbol(), symbol);
         }
     }
 
@@ -555,7 +564,7 @@ contract SystemConfig_Setters_TestFail is SystemConfig_Init {
 
     /// @dev Tests that `setEIP1559Params` reverts if the elasticity is zero.
     function test_setEIP1559Params_zeroElasticity_reverts(uint32 _denominator) external {
-        vm.assume(_denominator >= 1);
+        _denominator = uint32(bound(_denominator, 1, type(uint32).max));
         vm.prank(systemConfig.owner());
         vm.expectRevert("SystemConfig: elasticity must be >= 1");
         systemConfig.setEIP1559Params({ _denominator: _denominator, _elasticity: 0 });
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index 5132dc40e04c..e66f2e4d1ec8 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -51,12 +51,21 @@ contract SystemConfigInterop_Test is CommonTest {
         vm.assume(_token != address(0));
         vm.assume(_token != Constants.ETHER);
 
-        vm.assume(bytes(_name).length <= 32);
-        vm.assume(bytes(_symbol).length <= 32);
+        // Using vm.assume() would cause too many test rejections.
+        string memory name = _name;
+        if (bytes(_name).length > 32) {
+            name = _name[:32];
+        }
+
+        // Using vm.assume() would cause too many test rejections.
+        string memory symbol = _symbol;
+        if (bytes(_symbol).length > 32) {
+            symbol = _symbol[:32];
+        }
 
         vm.mockCall(_token, abi.encodeCall(ERC20.decimals, ()), abi.encode(18));
-        vm.mockCall(_token, abi.encodeCall(ERC20.name, ()), abi.encode(_name));
-        vm.mockCall(_token, abi.encodeCall(ERC20.symbol, ()), abi.encode(_symbol));
+        vm.mockCall(_token, abi.encodeCall(ERC20.name, ()), abi.encode(name));
+        vm.mockCall(_token, abi.encodeCall(ERC20.symbol, ()), abi.encode(symbol));
 
         vm.expectCall(
             address(optimismPortal),
@@ -67,8 +76,8 @@ contract SystemConfigInterop_Test is CommonTest {
                     StaticConfig.encodeSetGasPayingToken({
                         _token: _token,
                         _decimals: 18,
-                        _name: GasPayingToken.sanitize(_name),
-                        _symbol: GasPayingToken.sanitize(_symbol)
+                        _name: GasPayingToken.sanitize(name),
+                        _symbol: GasPayingToken.sanitize(symbol)
                     })
                 )
             )
diff --git a/packages/contracts-bedrock/test/L2/L1Block.t.sol b/packages/contracts-bedrock/test/L2/L1Block.t.sol
index 762553a2ff2f..d3e3b7d02e49 100644
--- a/packages/contracts-bedrock/test/L2/L1Block.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1Block.t.sol
@@ -169,31 +169,40 @@ contract L1BlockCustomGasToken_Test is L1BlockTest {
     function testFuzz_setGasPayingToken_succeeds(
         address _token,
         uint8 _decimals,
-        string memory _name,
-        string memory _symbol
+        string calldata _name,
+        string calldata _symbol
     )
         external
     {
         vm.assume(_token != address(0));
         vm.assume(_token != Constants.ETHER);
-        vm.assume(bytes(_name).length <= 32);
-        vm.assume(bytes(_symbol).length <= 32);
 
-        bytes32 name = bytes32(abi.encodePacked(_name));
-        bytes32 symbol = bytes32(abi.encodePacked(_symbol));
+        // Using vm.assume() would cause too many test rejections.
+        string memory name = _name;
+        if (bytes(_name).length > 32) {
+            name = _name[:32];
+        }
+        bytes32 b32name = bytes32(abi.encodePacked(name));
+
+        // Using vm.assume() would cause too many test rejections.
+        string memory symbol = _symbol;
+        if (bytes(_symbol).length > 32) {
+            symbol = _symbol[:32];
+        }
+        bytes32 b32symbol = bytes32(abi.encodePacked(symbol));
 
         vm.expectEmit(address(l1Block));
-        emit GasPayingTokenSet({ token: _token, decimals: _decimals, name: name, symbol: symbol });
+        emit GasPayingTokenSet({ token: _token, decimals: _decimals, name: b32name, symbol: b32symbol });
 
         vm.prank(depositor);
-        l1Block.setGasPayingToken({ _token: _token, _decimals: _decimals, _name: name, _symbol: symbol });
+        l1Block.setGasPayingToken({ _token: _token, _decimals: _decimals, _name: b32name, _symbol: b32symbol });
 
         (address token, uint8 decimals) = l1Block.gasPayingToken();
         assertEq(token, _token);
         assertEq(decimals, _decimals);
 
-        assertEq(_name, l1Block.gasPayingTokenName());
-        assertEq(_symbol, l1Block.gasPayingTokenSymbol());
+        assertEq(name, l1Block.gasPayingTokenName());
+        assertEq(symbol, l1Block.gasPayingTokenSymbol());
         assertTrue(l1Block.isCustomGasToken());
     }
 
diff --git a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
index ef1f8876efba..d05e952e44d9 100644
--- a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
+++ b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
@@ -53,7 +53,7 @@ contract SafeCall_Test is Test {
 
     /// @dev Tests that the `send` function with value succeeds.
     function testFuzz_sendWithGas_succeeds(address _from, address _to, uint64 _gas, uint256 _value) external {
-        vm.assume(_gas != 0);
+        _gas = uint64(bound(_gas, 1, type(uint64).max));
         sendTest({ _from: _from, _to: _to, _gas: _gas, _value: _value });
     }
 
diff --git a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
index 8dd1ba970abd..84abdbc48a82 100644
--- a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
+++ b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
@@ -257,7 +257,13 @@ contract DeputyGuardianModule_setRespectedGameType_Test is DeputyGuardianModule_
 contract DeputyGuardianModule_setRespectedGameType_TestFail is DeputyGuardianModule_TestInit {
     /// @dev Tests that `setRespectedGameType` when called by a non deputy guardian.
     function testFuzz_setRespectedGameType_notDeputyGuardian_reverts(GameType _gameType) external {
-        vm.assume(GameType.unwrap(optimismPortal2.respectedGameType()) != GameType.unwrap(_gameType));
+        // Change the game type if it's the same to avoid test rejections.
+        if (GameType.unwrap(optimismPortal2.respectedGameType()) == GameType.unwrap(_gameType)) {
+            unchecked {
+                _gameType = GameType.wrap(GameType.unwrap(_gameType) + 1);
+            }
+        }
+
         vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector));
         deputyGuardianModule.setRespectedGameType(optimismPortal2, _gameType);
         assertNotEq(GameType.unwrap(optimismPortal2.respectedGameType()), GameType.unwrap(_gameType));

From ec05937c623150d402689fa060e5814190ff7db6 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 4 Dec 2024 13:17:08 -0500
Subject: [PATCH 356/451] feat: move interfaces to a new top-level folder
 (#13114)

Moves all contract interfaces to a new top-level folder. Keeps
things much cleaner and more sane for a future auto-generated
interface system.
---
 .circleci/config.yml                          |   3 +
 .semgrep/rules/sol-rules.yaml                 |  18 +-
 packages/contracts-bedrock/foundry.toml       |   3 +-
 .../L1}/IDataAvailabilityChallenge.sol        |   0
 .../L1}/IL1CrossDomainMessenger.sol           |   8 +-
 .../L1}/IL1CrossDomainMessengerV160.sol       |   6 +-
 .../L1}/IL1ERC721Bridge.sol                   |   6 +-
 .../L1}/IL1StandardBridge.sol                 |   8 +-
 .../L1}/IL1StandardBridgeV160.sol             |   8 +-
 .../L1}/IL2OutputOracle.sol                   |   0
 .../L1}/IOptimismPortal.sol                   |   6 +-
 .../L1}/IOptimismPortal2.sol                  |   8 +-
 .../L1}/IOptimismPortalInterop.sol            |  10 +-
 .../L1}/IProtocolVersions.sol                 |   0
 .../L1}/IResourceMetering.sol                 |   0
 .../L1}/ISuperchainConfig.sol                 |   0
 .../L1}/ISystemConfig.sol                     |   2 +-
 .../L1}/ISystemConfigInterop.sol              |   4 +-
 .../L2}/IBaseFeeVault.sol                     |   0
 .../L2}/ICrossL2Inbox.sol                     |   0
 .../L2}/IDependencySet.sol                    |   0
 .../interfaces => interfaces/L2}/IERC7802.sol |   0
 .../L2}/IETHLiquidity.sol                     |   0
 .../L2}/IFeeVault.sol                         |   0
 .../L2}/IGasPriceOracle.sol                   |   0
 .../interfaces => interfaces/L2}/IL1Block.sol |   0
 .../L2}/IL1BlockInterop.sol                   |   0
 .../L2}/IL1FeeVault.sol                       |   0
 .../L2}/IL2CrossDomainMessenger.sol           |   2 +-
 .../L2}/IL2ERC721Bridge.sol                   |   2 +-
 .../L2}/IL2StandardBridge.sol                 |   2 +-
 .../L2}/IL2StandardBridgeInterop.sol          |   4 +-
 .../L2}/IL2ToL1MessagePasser.sol              |   0
 .../L2}/IL2ToL2CrossDomainMessenger.sol       |   0
 .../L2}/IMintableAndBurnableERC20.sol         |   0
 .../L2}/IOptimismERC20Factory.sol             |   0
 .../L2}/IOptimismSuperchainERC20.sol          |   2 +-
 .../L2}/IOptimismSuperchainERC20Beacon.sol    |   2 +-
 .../L2}/IOptimismSuperchainERC20Factory.sol   |   4 +-
 .../L2}/ISequencerFeeVault.sol                |   0
 .../L2}/ISuperchainERC20.sol                  |   6 +-
 .../L2}/ISuperchainTokenBridge.sol            |   2 +-
 .../L2}/ISuperchainWETH.sol                   |   6 +-
 .../cannon}/IMIPS.sol                         |   4 +-
 .../cannon}/IMIPS2.sol                        |   4 +-
 .../cannon}/IPreimageOracle.sol               |   0
 .../dispute}/IAnchorStateRegistry.sol         |   6 +-
 .../dispute}/IBigStepper.sol                  |   2 +-
 .../dispute}/IDelayedWETH.sol                 |   2 +-
 .../dispute}/IDisputeGame.sol                 |   2 +-
 .../dispute}/IDisputeGameFactory.sol          |   2 +-
 .../dispute}/IFaultDisputeGame.sol            |   8 +-
 .../dispute}/IInitializable.sol               |   0
 .../dispute}/IPermissionedDisputeGame.sol     |  10 +-
 .../governance}/IGovernanceToken.sol          |   0
 .../governance}/IMintManager.sol              |   2 +-
 .../legacy}/IAddressManager.sol               |   2 +-
 .../legacy}/IDeployerWhitelist.sol            |   0
 .../legacy}/IL1BlockNumber.sol                |   2 +-
 .../legacy}/IL1ChugSplashProxy.sol            |   0
 .../legacy}/ILegacyMessagePasser.sol          |   2 +-
 .../legacy}/IResolvedDelegateProxy.sol        |   2 +-
 .../safe}/IDeputyGuardianModule.sol           |  12 +-
 .../safe}/ILivenessGuard.sol                  |   2 +-
 .../safe}/ILivenessModule.sol                 |   2 +-
 .../universal}/ICrossDomainMessenger.sol      |   0
 .../universal}/IEIP712.sol                    |   0
 .../universal}/IERC721Bridge.sol              |   2 +-
 .../universal}/ILegacyMintableERC20.sol       |   0
 .../universal}/IOptimismMintableERC20.sol     |   0
 .../IOptimismMintableERC20Factory.sol         |   0
 .../universal}/IOptimismMintableERC721.sol    |   0
 .../IOptimismMintableERC721Factory.sol        |   0
 .../universal}/IOwnable.sol                   |   0
 .../universal}/IProxy.sol                     |   0
 .../universal}/IProxyAdmin.sol                |   2 +-
 .../universal}/ISemver.sol                    |   0
 .../universal}/IStandardBridge.sol            |   2 +-
 .../universal}/IStaticERC1967Proxy.sol        |   0
 .../universal}/IWETH98.sol                    |   0
 .../vendor}/IERC20Solady.sol                  |   0
 .../vendor}/IGelatoTreasury.sol               |   0
 .../vendor/asterisc}/IRISCV.sol               |   4 +-
 .../contracts-bedrock/scripts/L2Genesis.s.sol |  26 +--
 .../scripts/checks/check-semver-diff.sh       |  21 ++
 .../scripts/deploy/ChainAssertions.sol        |  32 +--
 .../scripts/deploy/Deploy.s.sol               |  34 +--
 .../scripts/deploy/DeployAltDA.s.sol          |   6 +-
 .../scripts/deploy/DeployAsterisc.s.sol       |   4 +-
 .../scripts/deploy/DeployDelayedWETH.s.sol    |   6 +-
 .../scripts/deploy/DeployDisputeGame.s.sol    |  10 +-
 .../deploy/DeployImplementations.s.sol        |  30 +--
 .../scripts/deploy/DeployMIPS.s.sol           |   4 +-
 .../scripts/deploy/DeployOPCM.s.sol           |   4 +-
 .../scripts/deploy/DeployOPChain.s.sol        |  34 +--
 .../scripts/deploy/DeployOwnership.s.sol      |   2 +-
 .../scripts/deploy/DeploySuperchain.s.sol     |   8 +-
 .../deploy/ReadImplementationAddresses.s.sol  |   8 +-
 .../scripts/libraries/Constants.sol           |   2 +-
 .../scripts/libraries/DeployUtils.sol         |   8 +-
 .../snapshots/semver-lock.json                | 220 +++++++++---------
 .../src/L1/DataAvailabilityChallenge.sol      |   6 +-
 .../src/L1/L1CrossDomainMessenger.sol         |  12 +-
 .../src/L1/L1ERC721Bridge.sol                 |  12 +-
 .../src/L1/L1StandardBridge.sol               |  12 +-
 .../src/L1/L2OutputOracle.sol                 |   6 +-
 .../src/L1/OPContractsManager.sol             |  46 ++--
 .../src/L1/OPContractsManagerInterop.sol      |  10 +-
 .../src/L1/OptimismPortal.sol                 |  16 +-
 .../src/L1/OptimismPortal2.sol                |  18 +-
 .../src/L1/OptimismPortalInterop.sol          |   6 +-
 .../src/L1/ProtocolVersions.sol               |   6 +-
 .../src/L1/SuperchainConfig.sol               |   6 +-
 .../contracts-bedrock/src/L1/SystemConfig.sol |  10 +-
 .../src/L1/SystemConfigInterop.sol            |  10 +-
 .../contracts-bedrock/src/L2/BaseFeeVault.sol |   6 +-
 .../src/L2/CrossDomainOwnable2.sol            |   2 +-
 .../src/L2/CrossDomainOwnable3.sol            |   2 +-
 .../contracts-bedrock/src/L2/CrossL2Inbox.sol |  10 +-
 .../contracts-bedrock/src/L2/ETHLiquidity.sol |   8 +-
 .../contracts-bedrock/src/L2/FeeVault.sol     |   2 +-
 .../src/L2/GasPriceOracle.sol                 |   8 +-
 packages/contracts-bedrock/src/L2/L1Block.sol |   6 +-
 .../src/L2/L1BlockInterop.sol                 |   4 +-
 .../contracts-bedrock/src/L2/L1FeeVault.sol   |   6 +-
 .../src/L2/L2CrossDomainMessenger.sol         |  10 +-
 .../src/L2/L2ERC721Bridge.sol                 |  12 +-
 .../src/L2/L2StandardBridge.sol               |  10 +-
 .../src/L2/L2StandardBridgeInterop.sol        |   8 +-
 .../src/L2/L2ToL1MessagePasser.sol            |   6 +-
 .../src/L2/L2ToL2CrossDomainMessenger.sol     |  10 +-
 .../src/L2/OptimismSuperchainERC20.sol        |   6 +-
 .../src/L2/OptimismSuperchainERC20Beacon.sol  |   6 +-
 .../src/L2/OptimismSuperchainERC20Factory.sol |   6 +-
 .../src/L2/SequencerFeeVault.sol              |   6 +-
 .../src/L2/SuperchainERC20.sol                |   8 +-
 .../src/L2/SuperchainTokenBridge.sol          |  10 +-
 .../src/L2/SuperchainWETH.sol                 |  14 +-
 packages/contracts-bedrock/src/L2/WETH.sol    |   8 +-
 .../contracts-bedrock/src/cannon/MIPS.sol     |   8 +-
 .../contracts-bedrock/src/cannon/MIPS2.sol    |   8 +-
 .../contracts-bedrock/src/cannon/MIPS64.sol   |   8 +-
 .../src/cannon/PreimageOracle.sol             |   6 +-
 .../src/cannon/libraries/MIPS64Syscalls.sol   |   2 +-
 .../src/cannon/libraries/MIPSSyscalls.sol     |   2 +-
 .../src/dispute/AnchorStateRegistry.sol       |  14 +-
 .../src/dispute/DelayedWETH.sol               |   8 +-
 .../src/dispute/DisputeGameFactory.sol        |   8 +-
 .../src/dispute/FaultDisputeGame.sol          |  12 +-
 .../src/governance/MintManager.sol            |   2 +-
 .../src/legacy/DeployerWhitelist.sol          |   6 +-
 .../src/legacy/L1BlockNumber.sol              |   8 +-
 .../src/legacy/L1ChugSplashProxy.sol          |   2 +-
 .../src/legacy/LegacyMessagePasser.sol        |   6 +-
 .../src/libraries/Constants.sol               |   2 +-
 .../drippie/dripchecks/CheckGelatoLow.sol     |   2 +-
 .../src/safe/DeputyGuardianModule.sol         |  16 +-
 .../src/safe/LivenessGuard.sol                |   6 +-
 .../src/safe/LivenessModule.sol               |   6 +-
 .../src/universal/ERC721Bridge.sol            |   2 +-
 .../src/universal/OptimismMintableERC20.sol   |  10 +-
 .../OptimismMintableERC20Factory.sol          |   8 +-
 .../src/universal/OptimismMintableERC721.sol  |   8 +-
 .../OptimismMintableERC721Factory.sol         |   6 +-
 .../src/universal/ProxyAdmin.sol              |  10 +-
 .../src/universal/StandardBridge.sol          |   6 +-
 .../src/universal/StorageSetter.sol           |   6 +-
 .../src/vendor/asterisc/RISCV.sol             |   4 +-
 .../contracts-bedrock/src/vendor/eas/EAS.sol  |   6 +-
 .../src/vendor/eas/SchemaRegistry.sol         |   6 +-
 .../test/L1/DataAvailabilityChallenge.t.sol   |   2 +-
 .../test/L1/L1CrossDomainMessenger.t.sol      |   8 +-
 .../test/L1/L1ERC721Bridge.t.sol              |   8 +-
 .../test/L1/L1StandardBridge.t.sol            |   8 +-
 .../test/L1/L2OutputOracle.t.sol              |   2 +-
 .../test/L1/OPContractsManager.t.sol          |   4 +-
 .../test/L1/OptimismPortal.t.sol              |  10 +-
 .../test/L1/OptimismPortal2.t.sol             |  12 +-
 .../test/L1/OptimismPortalInterop.t.sol       |   4 +-
 .../test/L1/ProtocolVersions.t.sol            |   4 +-
 .../test/L1/ResourceMetering.t.sol            |   2 +-
 .../test/L1/SuperchainConfig.t.sol            |   4 +-
 .../test/L1/SystemConfig.t.sol                |   6 +-
 .../test/L1/SystemConfigInterop.t.sol         |   8 +-
 .../test/L2/CrossL2Inbox.t.sol                |   2 +-
 .../test/L2/L1BlockInterop.t.sol              |   2 +-
 .../test/L2/L2CrossDomainMessenger.t.sol      |   4 +-
 .../test/L2/L2ERC721Bridge.t.sol              |   4 +-
 .../test/L2/L2StandardBridge.t.sol            |   8 +-
 .../test/L2/L2StandardBridgeInterop.t.sol     |   8 +-
 .../test/L2/L2ToL2CrossDomainMessenger.t.sol  |   2 +-
 .../test/L2/OptimismSuperchainERC20.t.sol     |   4 +-
 .../L2/OptimismSuperchainERC20Factory.t.sol   |   2 +-
 .../test/L2/Preinstalls.t.sol                 |   2 +-
 .../test/L2/SequencerFeeVault.t.sol           |   2 +-
 .../test/L2/SuperchainERC20.t.sol             |   4 +-
 .../test/L2/SuperchainTokenBridge.t.sol       |  10 +-
 .../test/L2/SuperchainWETH.t.sol              |   8 +-
 .../test/actors/FaultDisputeActors.sol        |   2 +-
 .../contracts-bedrock/test/cannon/MIPS.t.sol  |   4 +-
 .../contracts-bedrock/test/cannon/MIPS2.t.sol |   4 +-
 .../test/cannon/PreimageOracle.t.sol          |   2 +-
 .../test/dispute/DisputeGameFactory.t.sol     |   4 +-
 .../test/dispute/FaultDisputeGame.t.sol       |  10 +-
 .../dispute/PermissionedDisputeGame.t.sol     |   8 +-
 .../test/dispute/WETH98.t.sol                 |   2 +-
 .../test/governance/MintManager.t.sol         |   4 +-
 .../invariants/CrossDomainMessenger.t.sol     |   4 +-
 .../test/invariants/ETHLiquidity.t.sol        |   2 +-
 .../test/invariants/FaultDisputeGame.t.sol    |   2 +-
 .../test/invariants/L2OutputOracle.t.sol      |   2 +-
 .../test/invariants/OptimismPortal.t.sol      |   4 +-
 .../test/invariants/OptimismPortal2.t.sol     |   6 +-
 .../test/invariants/ResourceMetering.t.sol    |   2 +-
 .../test/invariants/SuperchainWETH.t.sol      |   2 +-
 .../test/invariants/SystemConfig.t.sol        |   4 +-
 .../contracts-bedrock/test/kontrol/README.md  |   4 +-
 .../proofs/L1CrossDomainMessenger.k.sol       |   4 +-
 .../test/kontrol/proofs/L1ERC721Bridge.k.sol  |   6 +-
 .../kontrol/proofs/L1StandardBridge.k.sol     |   6 +-
 .../test/kontrol/proofs/OptimismPortal.k.sol  |   4 +-
 .../test/kontrol/proofs/OptimismPortal2.k.sol |   4 +-
 .../test/legacy/DeployerWhitelist.t.sol       |   2 +-
 .../test/legacy/L1BlockNumber.t.sol           |   4 +-
 .../test/legacy/L1ChugSplashProxy.t.sol       |   2 +-
 .../test/legacy/LegacyMintableERC20.t.sol     |   2 +-
 .../test/legacy/ResolvedDelegateProxy.t.sol   |   4 +-
 .../test/mocks/AlphabetVM.sol                 |   2 +-
 .../test/opcm/DeployAltDA.t.sol               |   6 +-
 .../test/opcm/DeployImplementations.t.sol     |  28 +--
 .../test/opcm/DeployOPCM.t.sol                |   4 +-
 .../test/opcm/DeployOPChain.t.sol             |  20 +-
 .../test/opcm/DeploySuperchain.t.sol          |   2 +-
 .../test/safe/DeputyGuardianModule.t.sol      |  12 +-
 .../contracts-bedrock/test/setup/Events.sol   |   2 +-
 .../contracts-bedrock/test/setup/Setup.sol    |  64 ++---
 .../test/universal/BenchmarkTest.t.sol        |   4 +-
 .../test/universal/CrossDomainMessenger.t.sol |   2 +-
 .../universal/OptimismMintableERC20.t.sol     |   4 +-
 .../OptimismMintableERC20Factory.t.sol        |   4 +-
 .../test/universal/Proxy.t.sol                |   2 +-
 .../test/universal/ProxyAdmin.t.sol           |  10 +-
 .../test/universal/Specs.t.sol                |  22 +-
 .../test/vendor/Initializable.t.sol           |  10 +-
 .../test/vendor/InitializableOZv5.t.sol       |   2 +-
 245 files changed, 845 insertions(+), 820 deletions(-)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IDataAvailabilityChallenge.sol (100%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IL1CrossDomainMessenger.sol (68%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IL1CrossDomainMessengerV160.sol (76%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IL1ERC721Bridge.sol (82%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IL1StandardBridge.sol (87%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IL1StandardBridgeV160.sol (88%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IL2OutputOracle.sol (100%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IOptimismPortal.sol (93%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IOptimismPortal2.sol (93%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IOptimismPortalInterop.sol (92%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IProtocolVersions.sol (100%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/IResourceMetering.sol (100%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/ISuperchainConfig.sol (100%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/ISystemConfig.sol (98%)
 rename packages/contracts-bedrock/{src/L1/interfaces => interfaces/L1}/ISystemConfigInterop.sol (96%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IBaseFeeVault.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/ICrossL2Inbox.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IDependencySet.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IERC7802.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IETHLiquidity.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IFeeVault.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IGasPriceOracle.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL1Block.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL1BlockInterop.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL1FeeVault.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL2CrossDomainMessenger.sol (83%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL2ERC721Bridge.sol (86%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL2StandardBridge.sol (93%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL2StandardBridgeInterop.sol (94%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL2ToL1MessagePasser.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IL2ToL2CrossDomainMessenger.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IMintableAndBurnableERC20.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IOptimismERC20Factory.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IOptimismSuperchainERC20.sol (92%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IOptimismSuperchainERC20Beacon.sol (83%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/IOptimismSuperchainERC20Factory.sol (80%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/ISequencerFeeVault.sol (100%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/ISuperchainERC20.sol (70%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/ISuperchainTokenBridge.sol (93%)
 rename packages/contracts-bedrock/{src/L2/interfaces => interfaces/L2}/ISuperchainWETH.sol (81%)
 rename packages/contracts-bedrock/{src/cannon/interfaces => interfaces/cannon}/IMIPS.sol (84%)
 rename packages/contracts-bedrock/{src/cannon/interfaces => interfaces/cannon}/IMIPS2.sol (90%)
 rename packages/contracts-bedrock/{src/cannon/interfaces => interfaces/cannon}/IPreimageOracle.sol (100%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IAnchorStateRegistry.sol (81%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IBigStepper.sol (97%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IDelayedWETH.sol (96%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IDisputeGame.sol (92%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IDisputeGameFactory.sol (97%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IFaultDisputeGame.sol (94%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IInitializable.sol (100%)
 rename packages/contracts-bedrock/{src/dispute/interfaces => interfaces/dispute}/IPermissionedDisputeGame.sol (93%)
 rename packages/contracts-bedrock/{src/governance/interfaces => interfaces/governance}/IGovernanceToken.sol (100%)
 rename packages/contracts-bedrock/{src/governance/interfaces => interfaces/governance}/IMintManager.sol (91%)
 rename packages/contracts-bedrock/{src/legacy/interfaces => interfaces/legacy}/IAddressManager.sol (87%)
 rename packages/contracts-bedrock/{src/legacy/interfaces => interfaces/legacy}/IDeployerWhitelist.sol (100%)
 rename packages/contracts-bedrock/{src/legacy/interfaces => interfaces/legacy}/IL1BlockNumber.sol (84%)
 rename packages/contracts-bedrock/{src/legacy/interfaces => interfaces/legacy}/IL1ChugSplashProxy.sol (100%)
 rename packages/contracts-bedrock/{src/legacy/interfaces => interfaces/legacy}/ILegacyMessagePasser.sol (85%)
 rename packages/contracts-bedrock/{src/legacy/interfaces => interfaces/legacy}/IResolvedDelegateProxy.sol (82%)
 rename packages/contracts-bedrock/{src/safe/interfaces => interfaces/safe}/IDeputyGuardianModule.sol (73%)
 rename packages/contracts-bedrock/{src/safe/interfaces => interfaces/safe}/ILivenessGuard.sol (93%)
 rename packages/contracts-bedrock/{src/safe/interfaces => interfaces/safe}/ILivenessModule.sol (95%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/ICrossDomainMessenger.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IEIP712.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IERC721Bridge.sol (93%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/ILegacyMintableERC20.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IOptimismMintableERC20.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IOptimismMintableERC20Factory.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IOptimismMintableERC721.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IOptimismMintableERC721Factory.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IOwnable.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IProxy.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IProxyAdmin.sol (95%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/ISemver.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IStandardBridge.sol (95%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IStaticERC1967Proxy.sol (100%)
 rename packages/contracts-bedrock/{src/universal/interfaces => interfaces/universal}/IWETH98.sol (100%)
 rename packages/contracts-bedrock/{src/vendor/interfaces => interfaces/vendor}/IERC20Solady.sol (100%)
 rename packages/contracts-bedrock/{src/vendor/interfaces => interfaces/vendor}/IGelatoTreasury.sol (100%)
 rename packages/contracts-bedrock/{src/vendor/asterisc/interfaces => interfaces/vendor/asterisc}/IRISCV.sol (73%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bfe83b91f046..719cad057663 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -265,6 +265,9 @@ jobs:
 
             # Replace import paths
             sed -i -e 's/@optimism\///' $REMOTE_ASTERISC_PATH
+            # Replace legacy interface paths
+            sed -i -e 's/src\/cannon\/interfaces\//interfaces\/cannon\//g' $REMOTE_ASTERISC_PATH
+            sed -i -e 's/src\/dispute\/interfaces\//interfaces\/dispute\//g' $REMOTE_ASTERISC_PATH
             # Replace contract name
             sed -i -e 's/contract RISCV/contract RISCV_Remote/' $REMOTE_ASTERISC_PATH
 
diff --git a/.semgrep/rules/sol-rules.yaml b/.semgrep/rules/sol-rules.yaml
index 57dc88a3e51e..177fabb6fa8d 100644
--- a/.semgrep/rules/sol-rules.yaml
+++ b/.semgrep/rules/sol-rules.yaml
@@ -84,18 +84,18 @@ rules:
     pattern-regex: function\s+\w+\s*\(\s*([^)]*?\b\w+\s+(?!_)(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+\s*(?=,|\)))
     paths:
       exclude:
-        - packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
-        - packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+        - packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721.sol
+        - packages/contracts-bedrock/interfaces/universal/IWETH98.sol
+        - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/src/universal/interfaces/IWETH.sol
+        - packages/contracts-bedrock/interfaces/universal/IWETH.sol
         - packages/contracts-bedrock/src/universal/WETH98.sol
-        - packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
+        - packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol
         - packages/contracts-bedrock/src/L2/SuperchainWETH.sol
-        - packages/contracts-bedrock/src/governance/interfaces/IGovernanceToken.sol
+        - packages/contracts-bedrock/interfaces/governance/IGovernanceToken.sol
         - packages/contracts-bedrock/src/governance/GovernanceToken.sol
 
   - id: sol-style-return-arg-fmt
@@ -105,13 +105,13 @@ rules:
     pattern-regex: returns\s*(\w+\s*)?\(\s*([^)]*?\b\w+\s+(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+(?<!_)\s*(?=,|\)))
     paths:
       exclude:
-        - packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+        - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test/safe-tools
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
-        - packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
+        - packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol
+        - packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol
 
   - id: sol-style-doc-comment
     languages: [solidity]
diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 782369b04854..0e3d3fc3e9a9 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -30,7 +30,8 @@ remappings = [
   'ds-test/=lib/forge-std/lib/ds-test/src',
   'safe-contracts/=lib/safe-contracts/contracts',
   'kontrol-cheatcodes/=lib/kontrol-cheatcodes/src',
-  'gelato/=lib/automate/contracts'
+  'gelato/=lib/automate/contracts',
+  'interfaces/=interfaces'
 ]
 
 fs_permissions = [
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IDataAvailabilityChallenge.sol b/packages/contracts-bedrock/interfaces/L1/IDataAvailabilityChallenge.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L1/interfaces/IDataAvailabilityChallenge.sol
rename to packages/contracts-bedrock/interfaces/L1/IDataAvailabilityChallenge.sol
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol b/packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessenger.sol
similarity index 68%
rename from packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
rename to packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessenger.sol
index 8a6de84e2c9d..ae9aa75ef155 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessenger.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 interface IL1CrossDomainMessenger is ICrossDomainMessenger {
     function PORTAL() external view returns (IOptimismPortal);
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessengerV160.sol b/packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessengerV160.sol
similarity index 76%
rename from packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessengerV160.sol
rename to packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessengerV160.sol
index d81bb5d25565..09d4e604fb8f 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1CrossDomainMessengerV160.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessengerV160.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
 
 /// @notice This interface corresponds to the op-contracts/v1.6.0 release of the L1CrossDomainMessenger
 /// contract, which has a semver of 2.3.0 as specified in
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol b/packages/contracts-bedrock/interfaces/L1/IL1ERC721Bridge.sol
similarity index 82%
rename from packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
rename to packages/contracts-bedrock/interfaces/L1/IL1ERC721Bridge.sol
index 51356bc8d346..33756dbc49f1 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IL1ERC721Bridge.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IERC721Bridge } from "interfaces/universal/IERC721Bridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 interface IL1ERC721Bridge is IERC721Bridge {
     function bridgeERC721(
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol b/packages/contracts-bedrock/interfaces/L1/IL1StandardBridge.sol
similarity index 87%
rename from packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
rename to packages/contracts-bedrock/interfaces/L1/IL1StandardBridge.sol
index 816436cf1084..847ea76b44d2 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridge.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IL1StandardBridge.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 interface IL1StandardBridge is IStandardBridge {
     event ERC20DepositInitiated(
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridgeV160.sol b/packages/contracts-bedrock/interfaces/L1/IL1StandardBridgeV160.sol
similarity index 88%
rename from packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridgeV160.sol
rename to packages/contracts-bedrock/interfaces/L1/IL1StandardBridgeV160.sol
index b382c4f1ad6d..8d212de24486 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IL1StandardBridgeV160.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IL1StandardBridgeV160.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 /// @notice This interface corresponds to the op-contracts/v1.6.0 release of the L1StandardBridge
 /// contract, which has a semver of 2.1.0 as specified in
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IL2OutputOracle.sol b/packages/contracts-bedrock/interfaces/L1/IL2OutputOracle.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L1/interfaces/IL2OutputOracle.sol
rename to packages/contracts-bedrock/interfaces/L1/IL2OutputOracle.sol
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol b/packages/contracts-bedrock/interfaces/L1/IOptimismPortal.sol
similarity index 93%
rename from packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
rename to packages/contracts-bedrock/interfaces/L1/IOptimismPortal.sol
index b9035a6e5143..086a9ebc7bd8 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IOptimismPortal.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
 
 interface IOptimismPortal {
     error BadTarget();
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol b/packages/contracts-bedrock/interfaces/L1/IOptimismPortal2.sol
similarity index 93%
rename from packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
rename to packages/contracts-bedrock/interfaces/L1/IOptimismPortal2.sol
index 91f09d714314..74ba7b4790e9 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortal2.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IOptimismPortal2.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
 import { GameType, Timestamp } from "src/dispute/lib/LibUDT.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 interface IOptimismPortal2 {
     error AlreadyFinalized();
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol b/packages/contracts-bedrock/interfaces/L1/IOptimismPortalInterop.sol
similarity index 92%
rename from packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
rename to packages/contracts-bedrock/interfaces/L1/IOptimismPortalInterop.sol
index 5e8acc45c8c8..58fe5eff5dca 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/IOptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/interfaces/L1/IOptimismPortalInterop.sol
@@ -3,11 +3,11 @@ pragma solidity ^0.8.0;
 
 import { Types } from "src/libraries/Types.sol";
 import { GameType, Timestamp } from "src/dispute/lib/LibUDT.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
 interface IOptimismPortalInterop {
     error AlreadyFinalized();
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IProtocolVersions.sol b/packages/contracts-bedrock/interfaces/L1/IProtocolVersions.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L1/interfaces/IProtocolVersions.sol
rename to packages/contracts-bedrock/interfaces/L1/IProtocolVersions.sol
diff --git a/packages/contracts-bedrock/src/L1/interfaces/IResourceMetering.sol b/packages/contracts-bedrock/interfaces/L1/IResourceMetering.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L1/interfaces/IResourceMetering.sol
rename to packages/contracts-bedrock/interfaces/L1/IResourceMetering.sol
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol b/packages/contracts-bedrock/interfaces/L1/ISuperchainConfig.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L1/interfaces/ISuperchainConfig.sol
rename to packages/contracts-bedrock/interfaces/L1/ISuperchainConfig.sol
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol b/packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol
similarity index 98%
rename from packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
rename to packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol
index 8959c00b744a..904375167f48 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfig.sol
+++ b/packages/contracts-bedrock/interfaces/L1/ISystemConfig.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 /// @notice This interface corresponds to the Custom Gas Token version of the SystemConfig contract.
 interface ISystemConfig {
diff --git a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol b/packages/contracts-bedrock/interfaces/L1/ISystemConfigInterop.sol
similarity index 96%
rename from packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
rename to packages/contracts-bedrock/interfaces/L1/ISystemConfigInterop.sol
index e11d17c9f7bd..4cf4a06f943f 100644
--- a/packages/contracts-bedrock/src/L1/interfaces/ISystemConfigInterop.sol
+++ b/packages/contracts-bedrock/interfaces/L1/ISystemConfigInterop.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 interface ISystemConfigInterop {
     event ConfigUpdate(uint256 indexed version, ISystemConfig.UpdateType indexed updateType, bytes data);
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol b/packages/contracts-bedrock/interfaces/L2/IBaseFeeVault.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IBaseFeeVault.sol
rename to packages/contracts-bedrock/interfaces/L2/IBaseFeeVault.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ICrossL2Inbox.sol b/packages/contracts-bedrock/interfaces/L2/ICrossL2Inbox.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/ICrossL2Inbox.sol
rename to packages/contracts-bedrock/interfaces/L2/ICrossL2Inbox.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IDependencySet.sol b/packages/contracts-bedrock/interfaces/L2/IDependencySet.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IDependencySet.sol
rename to packages/contracts-bedrock/interfaces/L2/IDependencySet.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol b/packages/contracts-bedrock/interfaces/L2/IERC7802.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IERC7802.sol
rename to packages/contracts-bedrock/interfaces/L2/IERC7802.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IETHLiquidity.sol b/packages/contracts-bedrock/interfaces/L2/IETHLiquidity.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IETHLiquidity.sol
rename to packages/contracts-bedrock/interfaces/L2/IETHLiquidity.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol b/packages/contracts-bedrock/interfaces/L2/IFeeVault.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IFeeVault.sol
rename to packages/contracts-bedrock/interfaces/L2/IFeeVault.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IGasPriceOracle.sol b/packages/contracts-bedrock/interfaces/L2/IGasPriceOracle.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IGasPriceOracle.sol
rename to packages/contracts-bedrock/interfaces/L2/IGasPriceOracle.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol b/packages/contracts-bedrock/interfaces/L2/IL1Block.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IL1Block.sol
rename to packages/contracts-bedrock/interfaces/L2/IL1Block.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol b/packages/contracts-bedrock/interfaces/L2/IL1BlockInterop.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IL1BlockInterop.sol
rename to packages/contracts-bedrock/interfaces/L2/IL1BlockInterop.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol b/packages/contracts-bedrock/interfaces/L2/IL1FeeVault.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IL1FeeVault.sol
rename to packages/contracts-bedrock/interfaces/L2/IL1FeeVault.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol b/packages/contracts-bedrock/interfaces/L2/IL2CrossDomainMessenger.sol
similarity index 83%
rename from packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
rename to packages/contracts-bedrock/interfaces/L2/IL2CrossDomainMessenger.sol
index 1cb49f674ec0..c35b664b9470 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/interfaces/L2/IL2CrossDomainMessenger.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 interface IL2CrossDomainMessenger is ICrossDomainMessenger {
     function MESSAGE_VERSION() external view returns (uint16);
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol b/packages/contracts-bedrock/interfaces/L2/IL2ERC721Bridge.sol
similarity index 86%
rename from packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
rename to packages/contracts-bedrock/interfaces/L2/IL2ERC721Bridge.sol
index a760ce1d803c..1ca3d778e7a2 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/interfaces/L2/IL2ERC721Bridge.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IERC721Bridge } from "src/universal/interfaces/IERC721Bridge.sol";
+import { IERC721Bridge } from "interfaces/universal/IERC721Bridge.sol";
 
 interface IL2ERC721Bridge is IERC721Bridge {
     function finalizeBridgeERC721(
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol b/packages/contracts-bedrock/interfaces/L2/IL2StandardBridge.sol
similarity index 93%
rename from packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
rename to packages/contracts-bedrock/interfaces/L2/IL2StandardBridge.sol
index 9f9ce1a85621..2ad5f1bb5cc2 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridge.sol
+++ b/packages/contracts-bedrock/interfaces/L2/IL2StandardBridge.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
 
 interface IL2StandardBridge is IStandardBridge {
     event DepositFinalized(
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol b/packages/contracts-bedrock/interfaces/L2/IL2StandardBridgeInterop.sol
similarity index 94%
rename from packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
rename to packages/contracts-bedrock/interfaces/L2/IL2StandardBridgeInterop.sol
index 6b60f5e4f9b2..97b24a2b258c 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IL2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/interfaces/L2/IL2StandardBridgeInterop.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 interface IL2StandardBridgeInterop is IStandardBridge {
     error InvalidDecimals();
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2ToL1MessagePasser.sol b/packages/contracts-bedrock/interfaces/L2/IL2ToL1MessagePasser.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IL2ToL1MessagePasser.sol
rename to packages/contracts-bedrock/interfaces/L2/IL2ToL1MessagePasser.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/interfaces/L2/IL2ToL2CrossDomainMessenger.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol
rename to packages/contracts-bedrock/interfaces/L2/IL2ToL2CrossDomainMessenger.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IMintableAndBurnableERC20.sol b/packages/contracts-bedrock/interfaces/L2/IMintableAndBurnableERC20.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IMintableAndBurnableERC20.sol
rename to packages/contracts-bedrock/interfaces/L2/IMintableAndBurnableERC20.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IOptimismERC20Factory.sol b/packages/contracts-bedrock/interfaces/L2/IOptimismERC20Factory.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/IOptimismERC20Factory.sol
rename to packages/contracts-bedrock/interfaces/L2/IOptimismERC20Factory.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol b/packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20.sol
similarity index 92%
rename from packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol
rename to packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20.sol
index 0284e29841cb..58dea0df33a1 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 // Interfaces
-import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
+import { ISuperchainERC20 } from "interfaces/L2/ISuperchainERC20.sol";
 
 /// @title IOptimismSuperchainERC20
 /// @notice This interface is available on the OptimismSuperchainERC20 contract.
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Beacon.sol b/packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Beacon.sol
similarity index 83%
rename from packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Beacon.sol
rename to packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Beacon.sol
index fccb56b715f8..850cbb6f1e20 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Beacon.sol
+++ b/packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Beacon.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title IOptimismSuperchainERC20Beacon
 /// @notice Interface for the OptimismSuperchainERC20Beacon contract
diff --git a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Factory.sol b/packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Factory.sol
similarity index 80%
rename from packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Factory.sol
rename to packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Factory.sol
index aa8e4f1f1605..2c23d575326b 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20Factory.sol
+++ b/packages/contracts-bedrock/interfaces/L2/IOptimismSuperchainERC20Factory.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IOptimismERC20Factory } from "interfaces/L2/IOptimismERC20Factory.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title IOptimismSuperchainERC20Factory
 /// @notice Interface for the OptimismSuperchainERC20Factory contract
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol b/packages/contracts-bedrock/interfaces/L2/ISequencerFeeVault.sol
similarity index 100%
rename from packages/contracts-bedrock/src/L2/interfaces/ISequencerFeeVault.sol
rename to packages/contracts-bedrock/interfaces/L2/ISequencerFeeVault.sol
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol b/packages/contracts-bedrock/interfaces/L2/ISuperchainERC20.sol
similarity index 70%
rename from packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol
rename to packages/contracts-bedrock/interfaces/L2/ISuperchainERC20.sol
index 029b13d5520a..243f6f7ba49b 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol
+++ b/packages/contracts-bedrock/interfaces/L2/ISuperchainERC20.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.8.0;
 
 // Interfaces
-import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
-import { IERC20Solady as IERC20 } from "src/vendor/interfaces/IERC20Solady.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IERC7802 } from "interfaces/L2/IERC7802.sol";
+import { IERC20Solady as IERC20 } from "interfaces/vendor/IERC20Solady.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title ISuperchainERC20
 /// @notice This interface is available on the SuperchainERC20 contract.
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol b/packages/contracts-bedrock/interfaces/L2/ISuperchainTokenBridge.sol
similarity index 93%
rename from packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol
rename to packages/contracts-bedrock/interfaces/L2/ISuperchainTokenBridge.sol
index af9d7d8d8411..0794fa83c996 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainTokenBridge.sol
+++ b/packages/contracts-bedrock/interfaces/L2/ISuperchainTokenBridge.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title ISuperchainTokenBridge
 /// @notice Interface for the SuperchainTokenBridge contract.
diff --git a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol b/packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol
similarity index 81%
rename from packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
rename to packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol
index 4a4bbe35372f..a6b6ef3ce7bf 100644
--- a/packages/contracts-bedrock/src/L2/interfaces/ISuperchainWETH.sol
+++ b/packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
-import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IWETH98 } from "interfaces/universal/IWETH98.sol";
+import { IERC7802 } from "interfaces/L2/IERC7802.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 interface ISuperchainWETH is IWETH98, IERC7802, ISemver {
     error Unauthorized();
diff --git a/packages/contracts-bedrock/src/cannon/interfaces/IMIPS.sol b/packages/contracts-bedrock/interfaces/cannon/IMIPS.sol
similarity index 84%
rename from packages/contracts-bedrock/src/cannon/interfaces/IMIPS.sol
rename to packages/contracts-bedrock/interfaces/cannon/IMIPS.sol
index 665cf223d083..8ad7ccdc21a3 100644
--- a/packages/contracts-bedrock/src/cannon/interfaces/IMIPS.sol
+++ b/packages/contracts-bedrock/interfaces/cannon/IMIPS.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title IMIPS
 /// @notice Interface for the MIPS contract.
diff --git a/packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol b/packages/contracts-bedrock/interfaces/cannon/IMIPS2.sol
similarity index 90%
rename from packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol
rename to packages/contracts-bedrock/interfaces/cannon/IMIPS2.sol
index be37d5b49ff7..bdaf97d77e5b 100644
--- a/packages/contracts-bedrock/src/cannon/interfaces/IMIPS2.sol
+++ b/packages/contracts-bedrock/interfaces/cannon/IMIPS2.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title IMIPS2
 /// @notice Interface for the MIPS2 contract.
diff --git a/packages/contracts-bedrock/src/cannon/interfaces/IPreimageOracle.sol b/packages/contracts-bedrock/interfaces/cannon/IPreimageOracle.sol
similarity index 100%
rename from packages/contracts-bedrock/src/cannon/interfaces/IPreimageOracle.sol
rename to packages/contracts-bedrock/interfaces/cannon/IPreimageOracle.sol
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol b/packages/contracts-bedrock/interfaces/dispute/IAnchorStateRegistry.sol
similarity index 81%
rename from packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol
rename to packages/contracts-bedrock/interfaces/dispute/IAnchorStateRegistry.sol
index 4c79c4c092a9..dfb46ad8378f 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IAnchorStateRegistry.sol
+++ b/packages/contracts-bedrock/interfaces/dispute/IAnchorStateRegistry.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import { GameType, Hash, OutputRoot } from "src/dispute/lib/Types.sol";
 
 interface IAnchorStateRegistry {
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IBigStepper.sol b/packages/contracts-bedrock/interfaces/dispute/IBigStepper.sol
similarity index 97%
rename from packages/contracts-bedrock/src/dispute/interfaces/IBigStepper.sol
rename to packages/contracts-bedrock/interfaces/dispute/IBigStepper.sol
index f38e58f9d9d6..e5a8bd3ec342 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IBigStepper.sol
+++ b/packages/contracts-bedrock/interfaces/dispute/IBigStepper.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title IBigStepper
 /// @notice Describes a state machine that can perform a single instruction step, provided a prestate and an optional
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol b/packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
similarity index 96%
rename from packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
rename to packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
index 98b221285b56..63ffa49919b6 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IDelayedWETH.sol
+++ b/packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 interface IDelayedWETH {
     struct WithdrawalRequest {
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol b/packages/contracts-bedrock/interfaces/dispute/IDisputeGame.sol
similarity index 92%
rename from packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol
rename to packages/contracts-bedrock/interfaces/dispute/IDisputeGame.sol
index 0f860e68b5a1..2f79cc79d327 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGame.sol
+++ b/packages/contracts-bedrock/interfaces/dispute/IDisputeGame.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IInitializable } from "src/dispute/interfaces/IInitializable.sol";
+import { IInitializable } from "interfaces/dispute/IInitializable.sol";
 import { Timestamp, GameStatus, GameType, Claim, Hash } from "src/dispute/lib/Types.sol";
 
 interface IDisputeGame is IInitializable {
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol b/packages/contracts-bedrock/interfaces/dispute/IDisputeGameFactory.sol
similarity index 97%
rename from packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol
rename to packages/contracts-bedrock/interfaces/dispute/IDisputeGameFactory.sol
index 3e7233f440d6..789d47072291 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IDisputeGameFactory.sol
+++ b/packages/contracts-bedrock/interfaces/dispute/IDisputeGameFactory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
 import { GameId, Timestamp, Claim, Hash, GameType } from "src/dispute/lib/Types.sol";
 
 interface IDisputeGameFactory {
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol b/packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol
similarity index 94%
rename from packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
rename to packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol
index a188063de54a..038bb55998f8 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
+++ b/packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
 import { Types } from "src/libraries/Types.sol";
 import { GameType, Claim, Position, Clock, Hash, Duration } from "src/dispute/lib/Types.sol";
 
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IInitializable.sol b/packages/contracts-bedrock/interfaces/dispute/IInitializable.sol
similarity index 100%
rename from packages/contracts-bedrock/src/dispute/interfaces/IInitializable.sol
rename to packages/contracts-bedrock/interfaces/dispute/IInitializable.sol
diff --git a/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol b/packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol
similarity index 93%
rename from packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
rename to packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol
index 08c9cd5aa2b3..c9d26d70a6ca 100644
--- a/packages/contracts-bedrock/src/dispute/interfaces/IPermissionedDisputeGame.sol
+++ b/packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol
@@ -4,11 +4,11 @@ pragma solidity ^0.8.0;
 import { Types } from "src/libraries/Types.sol";
 import { Claim, Position, Clock, Hash, Duration } from "src/dispute/lib/Types.sol";
 
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 
 interface IPermissionedDisputeGame is IDisputeGame {
     struct ClaimData {
diff --git a/packages/contracts-bedrock/src/governance/interfaces/IGovernanceToken.sol b/packages/contracts-bedrock/interfaces/governance/IGovernanceToken.sol
similarity index 100%
rename from packages/contracts-bedrock/src/governance/interfaces/IGovernanceToken.sol
rename to packages/contracts-bedrock/interfaces/governance/IGovernanceToken.sol
diff --git a/packages/contracts-bedrock/src/governance/interfaces/IMintManager.sol b/packages/contracts-bedrock/interfaces/governance/IMintManager.sol
similarity index 91%
rename from packages/contracts-bedrock/src/governance/interfaces/IMintManager.sol
rename to packages/contracts-bedrock/interfaces/governance/IMintManager.sol
index 68399f3336c9..7ed7f1afc403 100644
--- a/packages/contracts-bedrock/src/governance/interfaces/IMintManager.sol
+++ b/packages/contracts-bedrock/interfaces/governance/IMintManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
+import { IGovernanceToken } from "interfaces/governance/IGovernanceToken.sol";
 
 interface IMintManager {
     event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
diff --git a/packages/contracts-bedrock/src/legacy/interfaces/IAddressManager.sol b/packages/contracts-bedrock/interfaces/legacy/IAddressManager.sol
similarity index 87%
rename from packages/contracts-bedrock/src/legacy/interfaces/IAddressManager.sol
rename to packages/contracts-bedrock/interfaces/legacy/IAddressManager.sol
index 0c0004a53675..e925fac5847f 100644
--- a/packages/contracts-bedrock/src/legacy/interfaces/IAddressManager.sol
+++ b/packages/contracts-bedrock/interfaces/legacy/IAddressManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IOwnable } from "src/universal/interfaces/IOwnable.sol";
+import { IOwnable } from "interfaces/universal/IOwnable.sol";
 
 /// @title IAddressManager
 /// @notice Interface for the AddressManager contract.
diff --git a/packages/contracts-bedrock/src/legacy/interfaces/IDeployerWhitelist.sol b/packages/contracts-bedrock/interfaces/legacy/IDeployerWhitelist.sol
similarity index 100%
rename from packages/contracts-bedrock/src/legacy/interfaces/IDeployerWhitelist.sol
rename to packages/contracts-bedrock/interfaces/legacy/IDeployerWhitelist.sol
diff --git a/packages/contracts-bedrock/src/legacy/interfaces/IL1BlockNumber.sol b/packages/contracts-bedrock/interfaces/legacy/IL1BlockNumber.sol
similarity index 84%
rename from packages/contracts-bedrock/src/legacy/interfaces/IL1BlockNumber.sol
rename to packages/contracts-bedrock/interfaces/legacy/IL1BlockNumber.sol
index 551514632696..f20770a55d41 100644
--- a/packages/contracts-bedrock/src/legacy/interfaces/IL1BlockNumber.sol
+++ b/packages/contracts-bedrock/interfaces/legacy/IL1BlockNumber.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title IL1BlockNumber
 /// @notice Interface for the L1BlockNumber contract.
diff --git a/packages/contracts-bedrock/src/legacy/interfaces/IL1ChugSplashProxy.sol b/packages/contracts-bedrock/interfaces/legacy/IL1ChugSplashProxy.sol
similarity index 100%
rename from packages/contracts-bedrock/src/legacy/interfaces/IL1ChugSplashProxy.sol
rename to packages/contracts-bedrock/interfaces/legacy/IL1ChugSplashProxy.sol
diff --git a/packages/contracts-bedrock/src/legacy/interfaces/ILegacyMessagePasser.sol b/packages/contracts-bedrock/interfaces/legacy/ILegacyMessagePasser.sol
similarity index 85%
rename from packages/contracts-bedrock/src/legacy/interfaces/ILegacyMessagePasser.sol
rename to packages/contracts-bedrock/interfaces/legacy/ILegacyMessagePasser.sol
index 0eebc30d5878..d73d57dfa701 100644
--- a/packages/contracts-bedrock/src/legacy/interfaces/ILegacyMessagePasser.sol
+++ b/packages/contracts-bedrock/interfaces/legacy/ILegacyMessagePasser.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title ILegacyMessagePasser
 /// @notice Interface for the LegacyMessagePasser contract.
diff --git a/packages/contracts-bedrock/src/legacy/interfaces/IResolvedDelegateProxy.sol b/packages/contracts-bedrock/interfaces/legacy/IResolvedDelegateProxy.sol
similarity index 82%
rename from packages/contracts-bedrock/src/legacy/interfaces/IResolvedDelegateProxy.sol
rename to packages/contracts-bedrock/interfaces/legacy/IResolvedDelegateProxy.sol
index b3201ff0b1c7..a677d5b0a478 100644
--- a/packages/contracts-bedrock/src/legacy/interfaces/IResolvedDelegateProxy.sol
+++ b/packages/contracts-bedrock/interfaces/legacy/IResolvedDelegateProxy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
 
 /// @title IResolvedDelegateProxy
 /// @notice Interface for the ResolvedDelegateProxy contract.
diff --git a/packages/contracts-bedrock/src/safe/interfaces/IDeputyGuardianModule.sol b/packages/contracts-bedrock/interfaces/safe/IDeputyGuardianModule.sol
similarity index 73%
rename from packages/contracts-bedrock/src/safe/interfaces/IDeputyGuardianModule.sol
rename to packages/contracts-bedrock/interfaces/safe/IDeputyGuardianModule.sol
index da74cf4dd983..a5c0e3313027 100644
--- a/packages/contracts-bedrock/src/safe/interfaces/IDeputyGuardianModule.sol
+++ b/packages/contracts-bedrock/interfaces/safe/IDeputyGuardianModule.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 import { GameType, Timestamp } from "src/dispute/lib/Types.sol";
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 
diff --git a/packages/contracts-bedrock/src/safe/interfaces/ILivenessGuard.sol b/packages/contracts-bedrock/interfaces/safe/ILivenessGuard.sol
similarity index 93%
rename from packages/contracts-bedrock/src/safe/interfaces/ILivenessGuard.sol
rename to packages/contracts-bedrock/interfaces/safe/ILivenessGuard.sol
index a69921211955..db6761096d12 100644
--- a/packages/contracts-bedrock/src/safe/interfaces/ILivenessGuard.sol
+++ b/packages/contracts-bedrock/interfaces/safe/ILivenessGuard.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { Enum } from "safe-contracts/common/Enum.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 interface ILivenessGuard is ISemver {
     event OwnerRecorded(address owner);
diff --git a/packages/contracts-bedrock/src/safe/interfaces/ILivenessModule.sol b/packages/contracts-bedrock/interfaces/safe/ILivenessModule.sol
similarity index 95%
rename from packages/contracts-bedrock/src/safe/interfaces/ILivenessModule.sol
rename to packages/contracts-bedrock/interfaces/safe/ILivenessModule.sol
index 43711d508597..ad5088fcf2bb 100644
--- a/packages/contracts-bedrock/src/safe/interfaces/ILivenessModule.sol
+++ b/packages/contracts-bedrock/interfaces/safe/ILivenessModule.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import { LivenessGuard } from "src/safe/LivenessGuard.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 interface ILivenessModule is ISemver {
     error OwnerRemovalFailed(string);
diff --git a/packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol b/packages/contracts-bedrock/interfaces/universal/ICrossDomainMessenger.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/ICrossDomainMessenger.sol
rename to packages/contracts-bedrock/interfaces/universal/ICrossDomainMessenger.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IEIP712.sol b/packages/contracts-bedrock/interfaces/universal/IEIP712.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IEIP712.sol
rename to packages/contracts-bedrock/interfaces/universal/IEIP712.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol b/packages/contracts-bedrock/interfaces/universal/IERC721Bridge.sol
similarity index 93%
rename from packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
rename to packages/contracts-bedrock/interfaces/universal/IERC721Bridge.sol
index 3c97958c1033..79497fa6383c 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IERC721Bridge.sol
+++ b/packages/contracts-bedrock/interfaces/universal/IERC721Bridge.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 interface IERC721Bridge {
     event ERC721BridgeFinalized(
diff --git a/packages/contracts-bedrock/src/universal/interfaces/ILegacyMintableERC20.sol b/packages/contracts-bedrock/interfaces/universal/ILegacyMintableERC20.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/ILegacyMintableERC20.sol
rename to packages/contracts-bedrock/interfaces/universal/ILegacyMintableERC20.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20.sol b/packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20.sol
rename to packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol b/packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20Factory.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC20Factory.sol
rename to packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20Factory.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol b/packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721.sol
rename to packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol b/packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721Factory.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IOptimismMintableERC721Factory.sol
rename to packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721Factory.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IOwnable.sol b/packages/contracts-bedrock/interfaces/universal/IOwnable.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IOwnable.sol
rename to packages/contracts-bedrock/interfaces/universal/IOwnable.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IProxy.sol b/packages/contracts-bedrock/interfaces/universal/IProxy.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IProxy.sol
rename to packages/contracts-bedrock/interfaces/universal/IProxy.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IProxyAdmin.sol b/packages/contracts-bedrock/interfaces/universal/IProxyAdmin.sol
similarity index 95%
rename from packages/contracts-bedrock/src/universal/interfaces/IProxyAdmin.sol
rename to packages/contracts-bedrock/interfaces/universal/IProxyAdmin.sol
index b35947e6cd78..09688257b925 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IProxyAdmin.sol
+++ b/packages/contracts-bedrock/interfaces/universal/IProxyAdmin.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
 
 interface IProxyAdmin {
     enum ProxyType {
diff --git a/packages/contracts-bedrock/src/universal/interfaces/ISemver.sol b/packages/contracts-bedrock/interfaces/universal/ISemver.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/ISemver.sol
rename to packages/contracts-bedrock/interfaces/universal/ISemver.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol b/packages/contracts-bedrock/interfaces/universal/IStandardBridge.sol
similarity index 95%
rename from packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
rename to packages/contracts-bedrock/interfaces/universal/IStandardBridge.sol
index 406a172c0737..a9c45017204d 100644
--- a/packages/contracts-bedrock/src/universal/interfaces/IStandardBridge.sol
+++ b/packages/contracts-bedrock/interfaces/universal/IStandardBridge.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 interface IStandardBridge {
     event ERC20BridgeFinalized(
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IStaticERC1967Proxy.sol b/packages/contracts-bedrock/interfaces/universal/IStaticERC1967Proxy.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IStaticERC1967Proxy.sol
rename to packages/contracts-bedrock/interfaces/universal/IStaticERC1967Proxy.sol
diff --git a/packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol b/packages/contracts-bedrock/interfaces/universal/IWETH98.sol
similarity index 100%
rename from packages/contracts-bedrock/src/universal/interfaces/IWETH98.sol
rename to packages/contracts-bedrock/interfaces/universal/IWETH98.sol
diff --git a/packages/contracts-bedrock/src/vendor/interfaces/IERC20Solady.sol b/packages/contracts-bedrock/interfaces/vendor/IERC20Solady.sol
similarity index 100%
rename from packages/contracts-bedrock/src/vendor/interfaces/IERC20Solady.sol
rename to packages/contracts-bedrock/interfaces/vendor/IERC20Solady.sol
diff --git a/packages/contracts-bedrock/src/vendor/interfaces/IGelatoTreasury.sol b/packages/contracts-bedrock/interfaces/vendor/IGelatoTreasury.sol
similarity index 100%
rename from packages/contracts-bedrock/src/vendor/interfaces/IGelatoTreasury.sol
rename to packages/contracts-bedrock/interfaces/vendor/IGelatoTreasury.sol
diff --git a/packages/contracts-bedrock/src/vendor/asterisc/interfaces/IRISCV.sol b/packages/contracts-bedrock/interfaces/vendor/asterisc/IRISCV.sol
similarity index 73%
rename from packages/contracts-bedrock/src/vendor/asterisc/interfaces/IRISCV.sol
rename to packages/contracts-bedrock/interfaces/vendor/asterisc/IRISCV.sol
index 349694fc876d..d69a22dfb0c4 100644
--- a/packages/contracts-bedrock/src/vendor/asterisc/interfaces/IRISCV.sol
+++ b/packages/contracts-bedrock/interfaces/vendor/asterisc/IRISCV.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title IRISCV
 /// @notice Interface for the RISCV contract.
diff --git a/packages/contracts-bedrock/scripts/L2Genesis.s.sol b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
index 0f681185a551..299a817ebe0b 100644
--- a/packages/contracts-bedrock/scripts/L2Genesis.s.sol
+++ b/packages/contracts-bedrock/scripts/L2Genesis.s.sol
@@ -18,19 +18,19 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
-import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
-import { IBaseFeeVault } from "src/L2/interfaces/IBaseFeeVault.sol";
-import { IL1FeeVault } from "src/L2/interfaces/IL1FeeVault.sol";
-import { IOptimismMintableERC721Factory } from "src/universal/interfaces/IOptimismMintableERC721Factory.sol";
-import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
-import { IL2StandardBridge } from "src/L2/interfaces/IL2StandardBridge.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
-import { IGasPriceOracle } from "src/L2/interfaces/IGasPriceOracle.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISequencerFeeVault } from "interfaces/L2/ISequencerFeeVault.sol";
+import { IBaseFeeVault } from "interfaces/L2/IBaseFeeVault.sol";
+import { IL1FeeVault } from "interfaces/L2/IL1FeeVault.sol";
+import { IOptimismMintableERC721Factory } from "interfaces/universal/IOptimismMintableERC721Factory.sol";
+import { IGovernanceToken } from "interfaces/governance/IGovernanceToken.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
+import { IL2StandardBridge } from "interfaces/L2/IL2StandardBridge.sol";
+import { IL2ERC721Bridge } from "interfaces/L2/IL2ERC721Bridge.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { IL2CrossDomainMessenger } from "interfaces/L2/IL2CrossDomainMessenger.sol";
+import { IGasPriceOracle } from "interfaces/L2/IGasPriceOracle.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 struct L1Dependencies {
     address payable l1CrossDomainMessengerProxy;
diff --git a/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh b/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
index 70304f641690..08540879a96d 100755
--- a/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
+++ b/packages/contracts-bedrock/scripts/checks/check-semver-diff.sh
@@ -11,6 +11,22 @@ source "$SCRIPT_DIR/utils/semver-utils.sh"
 # Path to semver-lock.json.
 SEMVER_LOCK="snapshots/semver-lock.json"
 
+# Define excluded contracts.
+EXCLUDED_CONTRACTS=(
+    "src/vendor/asterisc/RISCV.sol"
+)
+
+# Helper function to check if a contract is excluded.
+is_excluded() {
+    local contract="$1"
+    for excluded in "${EXCLUDED_CONTRACTS[@]}"; do
+        if [[ "$contract" == "$excluded" ]]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
 # Create a temporary directory.
 temp_dir=$(mktemp -d)
 trap 'rm -rf "$temp_dir"' EXIT
@@ -49,6 +65,11 @@ has_errors=false
 
 # Check each changed contract for a semver version change.
 for contract in $changed_contracts; do
+    # Skip excluded contracts.
+    if is_excluded "$contract"; then
+        continue
+    fi
+
     # Check if the contract file exists.
     if [ ! -f "$contract" ]; then
         echo "❌ Error: Contract file $contract not found"
diff --git a/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol b/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
index 25d67be3828c..cecf2b942731 100644
--- a/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
+++ b/packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
@@ -7,7 +7,7 @@ import { console2 as console } from "forge-std/console2.sol";
 
 // Scripts
 import { DeployConfig } from "scripts/deploy/DeployConfig.s.sol";
-import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
+import { ISystemConfigInterop } from "interfaces/L1/ISystemConfigInterop.sol";
 
 // Libraries
 import { Constants } from "src/libraries/Constants.sol";
@@ -15,21 +15,21 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Types } from "scripts/libraries/Types.sol";
 
 // Interfaces
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { ProtocolVersion, IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
+import { ProtocolVersion, IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IMIPS } from "interfaces/cannon/IMIPS.sol";
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 
 library ChainAssertions {
diff --git a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
index 6eec754b2487..425e5e5f39e4 100644
--- a/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
@@ -35,23 +35,23 @@ import { StorageSlot, ForgeArtifacts } from "scripts/libraries/ForgeArtifacts.so
 import { GameType, Claim, GameTypes, OutputRoot, Hash } from "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
-import { ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IDataAvailabilityChallenge } from "interfaces/L1/IDataAvailabilityChallenge.sol";
+import { ProtocolVersion } from "interfaces/L1/IProtocolVersions.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IMIPS } from "interfaces/cannon/IMIPS.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title Deploy
 /// @notice Script used to deploy a bedrock system. The entire system is deployed within the `run` function.
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol
index a5071474926b..1943b40a35bb 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployAltDA.s.sol
@@ -2,11 +2,11 @@
 pragma solidity 0.8.15;
 
 import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
-import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IDataAvailabilityChallenge } from "interfaces/L1/IDataAvailabilityChallenge.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 import { Script } from "forge-std/Script.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
 
 contract DeployAltDAInput is BaseDeployIO {
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol
index 09601eb0d8e2..66f6ba33f362 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployAsterisc.s.sol
@@ -9,8 +9,8 @@ import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Interfaces
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IRISCV } from "src/vendor/asterisc/interfaces/IRISCV.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IRISCV } from "interfaces/vendor/asterisc/IRISCV.sol";
 
 /// @title DeployAsteriscInput
 contract DeployAsteriscInput is BaseDeployIO {
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
index 979869cb3ad0..c450b1f155ea 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
@@ -12,9 +12,9 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { LibString } from "@solady/utils/LibString.sol";
 
 // Interfaces
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 /// @title DeployDelayedWETH
 contract DeployDelayedWETHInput is BaseDeployIO {
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
index 67893d2cb131..6399115fad74 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDisputeGame.s.sol
@@ -13,11 +13,11 @@ import { GameType, Claim, Duration } from "src/dispute/lib/Types.sol";
 import { LibString } from "@solady/utils/LibString.sol";
 
 // Interfaces
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IPermissionedDisputeGame } from "interfaces/dispute/IPermissionedDisputeGame.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
 
 /// @title DeployDisputeGameInput
 contract DeployDisputeGameInput is BaseDeployIO {
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
index 71ba435df4c3..716a95b071cf 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
@@ -5,30 +5,30 @@ import { Script } from "forge-std/Script.sol";
 
 import { LibString } from "@solady/utils/LibString.sol";
 
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 
 import { Constants } from "src/libraries/Constants.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Bytes } from "src/libraries/Bytes.sol";
 
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IMIPS } from "interfaces/cannon/IMIPS.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
 
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
 
 import { OPContractsManagerInterop } from "src/L1/OPContractsManagerInterop.sol";
-import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
-import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
+import { IOptimismPortalInterop } from "interfaces/L1/IOptimismPortalInterop.sol";
+import { ISystemConfigInterop } from "interfaces/L1/ISystemConfigInterop.sol";
 
 import { Blueprint } from "src/libraries/Blueprint.sol";
 
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
index 09ef6d059cd0..4c32be812869 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
@@ -9,8 +9,8 @@ import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Interfaces
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IMIPS } from "interfaces/cannon/IMIPS.sol";
 
 /// @title DeployMIPSInput
 contract DeployMIPSInput is BaseDeployIO {
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol
index 507dd049544b..015cb78c7594 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPCM.s.sol
@@ -8,8 +8,8 @@ import { LibString } from "@solady/utils/LibString.sol";
 import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 
 contract DeployOPCMInput is BaseDeployIO {
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
index a83dfb110625..cd0aa6d29f68 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOPChain.s.sol
@@ -9,31 +9,31 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
 import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
 
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { Constants as ScriptConstants } from "scripts/libraries/Constants.sol";
 
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IPermissionedDisputeGame } from "interfaces/dispute/IPermissionedDisputeGame.sol";
 import { Claim, Duration, GameType, GameTypes, Hash } from "src/dispute/lib/Types.sol";
 
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
 
 contract DeployOPChainInput is BaseDeployIO {
     address internal _opChainProxyAdminOwner;
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
index d6c0b32cd579..29709f2b125f 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
@@ -16,7 +16,7 @@ import { Deployer } from "scripts/deploy/Deployer.sol";
 import { LivenessGuard } from "src/safe/LivenessGuard.sol";
 import { LivenessModule } from "src/safe/LivenessModule.sol";
 import { DeputyGuardianModule } from "src/safe/DeputyGuardianModule.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 import { Deploy } from "./Deploy.s.sol";
 
diff --git a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
index 5e35e8848c8a..f039fa47ef99 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeploySuperchain.s.sol
@@ -4,10 +4,10 @@ pragma solidity 0.8.15;
 import { Script } from "forge-std/Script.sol";
 import { stdToml } from "forge-std/StdToml.sol";
 
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions, ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions, ProtocolVersion } from "interfaces/L1/IProtocolVersions.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { Solarray } from "scripts/libraries/Solarray.sol";
diff --git a/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol b/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
index 35aefbed16d5..8917479543e5 100644
--- a/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
@@ -2,14 +2,14 @@
 pragma solidity 0.8.15;
 
 import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 import { Script } from "forge-std/Script.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { DeployOPChainOutput } from "scripts/deploy/DeployOPChain.s.sol";
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
+import { IMIPS } from "interfaces/cannon/IMIPS.sol";
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IStaticL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IStaticL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
 
 contract ReadImplementationAddressesInput is DeployOPChainOutput {
     OPContractsManager internal _opcm;
diff --git a/packages/contracts-bedrock/scripts/libraries/Constants.sol b/packages/contracts-bedrock/scripts/libraries/Constants.sol
index 603084ac6eef..d388fb37778e 100644
--- a/packages/contracts-bedrock/scripts/libraries/Constants.sol
+++ b/packages/contracts-bedrock/scripts/libraries/Constants.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
 import { GameTypes, OutputRoot, Hash } from "src/dispute/lib/Types.sol";
 
 /// @title Constants
diff --git a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
index da9aea12a0ac..44d71addb255 100644
--- a/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
+++ b/packages/contracts-bedrock/scripts/libraries/DeployUtils.sol
@@ -12,10 +12,10 @@ import { Bytes } from "src/libraries/Bytes.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IL1ChugSplashProxy, IStaticL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
-import { IResolvedDelegateProxy } from "src/legacy/interfaces/IResolvedDelegateProxy.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IL1ChugSplashProxy, IStaticL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
+import { IResolvedDelegateProxy } from "interfaces/legacy/IResolvedDelegateProxy.sol";
 
 library DeployUtils {
     Vm internal constant vm = Vm(address(uint160(uint256(keccak256("hevm cheat code")))));
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 1904131f2b00..b31b3f287e7c 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -1,226 +1,226 @@
 {
   "src/L1/DataAvailabilityChallenge.sol": {
-    "initCodeHash": "0x240a9b695e1ab73692672b907c2ae147ee9224e95a03c02d99333afe186c3d2f",
-    "sourceCodeHash": "0xc6ab0e64cfbdcfa6de0a480426263712b3ddbabe56a88ec7c02556cb432e6b02"
+    "initCodeHash": "0x2d2efa7ac3e2f96a5712344c8df0ef4657c6fe430c4aa33e68dd8327d708b6b6",
+    "sourceCodeHash": "0x262e3e3f144fc93fd431296251961a70e939703bf62d1c79f23239644ac8e978"
   },
   "src/L1/L1CrossDomainMessenger.sol": {
-    "initCodeHash": "0x2e9cb3ceb5e55341b311f0666ef7655df4fafae75afdfbcd701cd9c9b2b017d5",
-    "sourceCodeHash": "0x848ec3774be17bcc8ba65a23d08e35e979b3f39f9d2ac8a810188f945c69c9ea"
+    "initCodeHash": "0x9e8763b2fca99b577e8374a1f8d0421eeeb3e922535728a22d24a1b658c85665",
+    "sourceCodeHash": "0x370dd42d9888fd53a85811190208bc0f68e4071a2e3e4b2d15f2a4b92f4707ff"
   },
   "src/L1/L1ERC721Bridge.sol": {
-    "initCodeHash": "0xb3bf093ea83a24574a6093bebf5b2aea707355ed8d6702b2b5eb292e75b6ae42",
-    "sourceCodeHash": "0x289de9f40898b6305deecc6b60cdf566aa6c6a1444f713c3a0af23ea7878207e"
+    "initCodeHash": "0x7d8dbcc9b146d21ce4aabfc41a724d4c8d945956318a120127234afd53a4315c",
+    "sourceCodeHash": "0x48f4e1db42f82490e91fd33b05117b05c072444ed53bbd4e06e742d330a422bb"
   },
   "src/L1/L1StandardBridge.sol": {
-    "initCodeHash": "0x802f72745bb9a82dc049377bb9cf6b58f35aec388aeb957b28a5e14f28d91bc1",
-    "sourceCodeHash": "0x24b784645b065a5393a2115a078d67f91eb09afd5e70baf81daf975381f16155"
+    "initCodeHash": "0x9037e1930606d8cd092738bf28dda74e8f993aade26ae5a79a9e1fe2cb1d8513",
+    "sourceCodeHash": "0x5b3dc434f58afd7667f82b8fdfdbea488441be0bae8bdff15cfc5a42ce670cc1"
   },
   "src/L1/L2OutputOracle.sol": {
-    "initCodeHash": "0x1182bfb87c4ab399b912ca7fe18cdbf4b24c414e078fb0a55bd3c44d442d3ed1",
-    "sourceCodeHash": "0x4132ff37d267cb12224b75ea806c0aa7d25407b0d66ce526d7fcda8f7d223882"
+    "initCodeHash": "0x0e0573841e43e4c5f0df5839db2bdf387f29fed7c830f05960542e7d7109ed4a",
+    "sourceCodeHash": "0x8aafeffb41332fddf2fb1ef4fc033bd1f323cdc5b199c6951da73e3cb86276e6"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0xdc41db13327e1f51ce996c088538c227a82c37d62906eca1aa456d71fa605ff3",
-    "sourceCodeHash": "0x08aca8a70f42a0556f0fc7b1cd4d4aaf152215ab246c132e23074558497fe03b"
+    "initCodeHash": "0x320a6d4417eb0d2597b4c6f4caa37bbf9e35f38d3ad27ddb57f149c680e6afff",
+    "sourceCodeHash": "0x3a6ac40939df1d9f4c88caa4e6139454de5e0ad4a241b27d1bab65a3ae44610d"
   },
   "src/L1/OptimismPortal.sol": {
-    "initCodeHash": "0x152167cfa18635ae4918a6eb3371a599cfa084418c0a652799cdb48bfc0ee0cc",
-    "sourceCodeHash": "0xbe34b82900d02f71bb0949818eabe49531f7e0d8d8bae01f6dac4a296530d1aa"
+    "initCodeHash": "0xa8b2f8a6d1092c5e64529736462ebb35daa9ea9e67585f7de8e3e5394682ee64",
+    "sourceCodeHash": "0xb71e8bc24ea9ebb5692762005f2936ba2a00bf169e1e32f504a0f6e23a349a22"
   },
   "src/L1/OptimismPortal2.sol": {
-    "initCodeHash": "0x218358b48f640b3fcb2d239f00dc1cd3b11517ad46c8e1efa44953d38da63540",
-    "sourceCodeHash": "0x66ac1212760db53a2bb1839e4cd17dc071d9273b8e6fb80646b79e91b3371c1a"
+    "initCodeHash": "0xa943efcc061bc59d129649de04ef8ba6318e2ff6eb10383b09ea71e3cbac5e5e",
+    "sourceCodeHash": "0x73df6c482332264954659ef4bcc18b7fb02a64a727018b4ae1aed8d2ec11c959"
   },
   "src/L1/OptimismPortalInterop.sol": {
-    "initCodeHash": "0x902ce448a29a72805cd74b7fc62519fa3d12338851b518b7d01e8a40ba232c72",
-    "sourceCodeHash": "0x8de1b2d4675624a2a3aee135ad8780a07ca91002a5952f2b6501fdf20c92b753"
+    "initCodeHash": "0x7f8118c0abdcae94ebd08b15709b27bf7abe8fec96c74be109f2126d99f943a1",
+    "sourceCodeHash": "0x813fcf02c02798ebba8ed93f95eca82bdf9080c0edc5f2492c72c19b6c5f36b4"
   },
   "src/L1/ProtocolVersions.sol": {
-    "initCodeHash": "0x98dc9a7ecd1919a8cf4bcca4fb28b112641b2aa5132fb5467a349fb80974957a",
-    "sourceCodeHash": "0x9b953cdbc049492d20a15d48a9081977a91f8e7c72eee3792d86871e70b1a40a"
+    "initCodeHash": "0xb0ff1661226417342001fe9f0b64c340b7c074ff71579abf05399f4e742aaca1",
+    "sourceCodeHash": "0xc82754087747c067d4c3ae7deed08a574acbeaec0fbacc1f80ce63313ae817ed"
   },
   "src/L1/SuperchainConfig.sol": {
-    "initCodeHash": "0xebe9a9dbf6df5288fae3634a9d71ce12bd8acb461086de28a2fb4239097dcf80",
-    "sourceCodeHash": "0xd931c19a85a070119f5b670d1f4dc90512847b408aa4ee29c98231257cf0c77c"
+    "initCodeHash": "0xddfc0ea9a7d5b0a3a3c1080d022295af57cd9bcd6171ad0fe09287c493c9e95d",
+    "sourceCodeHash": "0xb9f372ce43c42179efd7d7ee7f7df29f89c484efb7cd6e83430b615d1c2592d8"
   },
   "src/L1/SystemConfig.sol": {
-    "initCodeHash": "0x0eda38e2fb2687a324289f04ec8ad0d2afe51f45219d074740fb4a0e24ea6569",
-    "sourceCodeHash": "0x6dbbe8716ca8cd2fba3da8dcae0ca0c4b1f3e9dd04220fb24a15666b23300927"
+    "initCodeHash": "0x3ba55b46516de34186ff0cc92af9ca3ff916989ecb7d2fa9e82000f648607985",
+    "sourceCodeHash": "0x4085b02ea01cd16172a1809ddd9be69c567f7b204cefc93f7c4d9071da812daa"
   },
   "src/L1/SystemConfigInterop.sol": {
-    "initCodeHash": "0x845af4e83836221a014f46544fe2a29c66706513b7eed39c59f0505d2662731a",
-    "sourceCodeHash": "0x8df468eb79cf68ee38bada32e7d7c87449c129f1955d464fa774977c770715c7"
+    "initCodeHash": "0xed198351099bd243a7a69e64944f43a3f203b5778ac55dbec428cc4df337cd8e",
+    "sourceCodeHash": "0x733fd71047569d974ac39477c6b6d55ec4100f32ac40b0597a0f7bdbde2867c3"
   },
   "src/L2/BaseFeeVault.sol": {
-    "initCodeHash": "0xc23d0437deb5c2e9f8831b9325c77e9d07467c9286f81c0ef47cfef4e242f96b",
-    "sourceCodeHash": "0x2f3f64d4307a081311222b34afa76e587aca3789367f6ea77bc1bfb6d9b39563"
+    "initCodeHash": "0x6745b7be3895a5e8d373df0066d931bae29c47672ac46c2f5829bd0052cc6d9e",
+    "sourceCodeHash": "0x45ea3acdbc8d1e583d4395239c9e9956e8cddda501f2e8eea50113333390f708"
   },
   "src/L2/CrossL2Inbox.sol": {
-    "initCodeHash": "0x753a7685c4ab405b71a19a7f8aa20a2517b4943bee5d5e616a6fccd8f0531993",
-    "sourceCodeHash": "0xc74277f9502338def330444413ff77157e200110cd7f57cd9a18f9ffe4a18a6c"
+    "initCodeHash": "0x7a189f6dff6c19ec6f1e94d84a0d9d98a320a68812f957e50bf8b63224bb0dce",
+    "sourceCodeHash": "0x9bbfabb19b7f572dadae797786c2f87d892693650151bd8de6eadee3e03fc559"
   },
   "src/L2/ETHLiquidity.sol": {
-    "initCodeHash": "0x713c18f95a6a746d0703f475f3ae10c106c9b9ecb64d881a2e61b8969b581371",
-    "sourceCodeHash": "0x0b6afdc52d1ae88d9e4bbb5dc00920e7a6bd1e9d6595bfdbae64874190f39df0"
+    "initCodeHash": "0xbb16de6a3f678db7301694a000f315154f25f9660c8dcec4b0bef20bc7cfdebd",
+    "sourceCodeHash": "0x0576b189811bd343c2cdafcb512ece2c2ea20077bef8754a3dc3e3c80210b225"
   },
   "src/L2/GasPriceOracle.sol": {
-    "initCodeHash": "0x7e8c2b42e10187ad649c0bf70c5688c2a4af3c412bacaec87d63c3f93ae4cfef",
-    "sourceCodeHash": "0xa12ce15ded3cca681b2fc9facaebbb45d740dd6f9c9496333c1c46689c9a2d99"
+    "initCodeHash": "0x83d50e3b34cd1b4de32f1cced28796b07aefc526cc17ceb1903ad55f4abc90b7",
+    "sourceCodeHash": "0x305c72d7be9149fce7095bd4641a1a19acada3126fbc43599f674cadbf6e7d6c"
   },
   "src/L2/L1Block.sol": {
-    "initCodeHash": "0xb25ff86c5b199f0e4db9f814f3d107cd929278a39e838c541af79d49d472b646",
-    "sourceCodeHash": "0xa44964dc0178949b83fc4100c03933c6d6f66e9654ce6b4aff5847a889a189d4"
+    "initCodeHash": "0x22f9b9277e33dc27df8366c2dd6e8340d294947b57116db35c6d14c41225633f",
+    "sourceCodeHash": "0xffb6cf768097b2d6cb6ecb2d6463c176af9acd70415aa0d2e4f017758f737eee"
   },
   "src/L2/L1BlockInterop.sol": {
-    "initCodeHash": "0xb59a6a62926084b9979e337183ee54b4c4e9ceeda7e39bd70bd7b4228464d2e0",
-    "sourceCodeHash": "0x5681bb385bf1685cb204a612ef8a891e91763e699c7738a3a97b171852d585b5"
+    "initCodeHash": "0x67e99306d9a09cac587f65cfa2c0de55da9eca184fd1fc3f4b885d2c47114483",
+    "sourceCodeHash": "0x9493f90136917fc95d2ac942f061c1b9cffeff6d327afb46fe4e69784e7f2100"
   },
   "src/L2/L1FeeVault.sol": {
-    "initCodeHash": "0xc23d0437deb5c2e9f8831b9325c77e9d07467c9286f81c0ef47cfef4e242f96b",
-    "sourceCodeHash": "0x3f0acc4427d6f72debe4393c746b759c7c736f28b8c4f42391de622c9be3bcb3"
+    "initCodeHash": "0x6745b7be3895a5e8d373df0066d931bae29c47672ac46c2f5829bd0052cc6d9e",
+    "sourceCodeHash": "0xd0471c328c1d17c5863261322bf8d5aff2e7e9e3a1135631a993aa75667621df"
   },
   "src/L2/L2CrossDomainMessenger.sol": {
-    "initCodeHash": "0xc496495496b96ea0eaf417c5e56b295836c12db3e6aafe2e607563e7a50b5b65",
-    "sourceCodeHash": "0x56edf0f36366326a92722ae3c7502bce3d80b2ee5e354181dc09ba801437a488"
+    "initCodeHash": "0xcef22d29fed2e160e4c4350dee5c7671d2fd280895f9d2e4655b7060c56d5ba7",
+    "sourceCodeHash": "0x754c71bffa5525159bc1d60c0085a5edc23fba0384a44e8c2c1215eaa7fd17b7"
   },
   "src/L2/L2ERC721Bridge.sol": {
-    "initCodeHash": "0xaed0528e8b81817a0c3b41513c02e7fd678f58e34b98f02ea33d5a770a064c2f",
-    "sourceCodeHash": "0xf8569c75b801f38f8a5a41e94e90f159ddc5f5412804b26e3e564755a50631b8"
+    "initCodeHash": "0xf30040071bb7def116eab4c26c921d6c7b24e4f02d001601f52a1ee5bd6629fc",
+    "sourceCodeHash": "0xc7258cb394333527bfc58d0a8ba6bd9d90b46b60ace20a500d94192fea60aef4"
   },
   "src/L2/L2StandardBridge.sol": {
-    "initCodeHash": "0x959ce0daeb14884127cff4d701b294fb29b5d7c2d890ec4fdf704c451164811e",
-    "sourceCodeHash": "0xd5f91687a178254714203c702afe0c2343c45c4684b914aa873dcb641e73e725"
+    "initCodeHash": "0x7d2089948a373c62cdae80f329d6882eea450f2048f5ad45dbcceaaf37685d80",
+    "sourceCodeHash": "0xd64cf85ff5ecc1bf368d16532a9e29ba2dfc0f5456bbd3f9f05212c9120a2ed1"
   },
   "src/L2/L2StandardBridgeInterop.sol": {
-    "initCodeHash": "0x745f5e3a0deb6cd8fa5a339c83cc91f9ce63de570a7ed23e2da645bebaa79494",
-    "sourceCodeHash": "0x0ca6d8900a02c213acca44c8cb56df816fa1bebd6903a9ea6d4c21525c936c12"
+    "initCodeHash": "0x024711e1689bedcdb1e9de8b1c4a440a911634a0ce0a384246b4f9cd683a23f3",
+    "sourceCodeHash": "0xb92682bb93a87c22e6a2506b64ff609b76376a7d09f514125173c6792c354fc4"
   },
   "src/L2/L2ToL1MessagePasser.sol": {
-    "initCodeHash": "0xe65929ad618380e7f005f042a0a9c8e662ad10d6e1c53bfb7f518a54b848fd79",
-    "sourceCodeHash": "0xd61a1face234756e99b7ab8383eef40e62833a91f727a77997d6f0e384526637"
+    "initCodeHash": "0xf9d82084dcef31a3737a76d8ee4e5842ea190d0f77ed4678adb3bbb95217050f",
+    "sourceCodeHash": "0xaef8ea36c5b78cd12e0e62811d51db627ccf0dfd2cc5479fb707a10ef0d42048"
   },
   "src/L2/L2ToL2CrossDomainMessenger.sol": {
-    "initCodeHash": "0x085c83fd07ce54b9d007e548008dd9d4c31d19cae9b9ca3aa1496191f84499fa",
-    "sourceCodeHash": "0x20d6a4f42b3169c17f938cfe479de7bd558c6ded816e1fcfddcdc5d86583b42b"
+    "initCodeHash": "0x45564b97c63419cc12eadc60425c6d001857a3eea688ecaf1439ae7ede6aa9aa",
+    "sourceCodeHash": "0xed64736338b43a42f6bc6a88cca734403e1bb9ceafa55e4738605dfdedd1a99f"
   },
   "src/L2/OptimismSuperchainERC20.sol": {
-    "initCodeHash": "0x0e76b7ffa8af16f1bc5f74a55eb3ed64016228032b67c5f45afa7fd6fe4acf7e",
-    "sourceCodeHash": "0x92f370d0e167b7cec0deaded71d9c4a5a8303a2b921320123d3c32eeca1cc100"
+    "initCodeHash": "0xdac32a1057a6bc8a8d2ffdce1db8f34950cd0ffd1454d2133865736d21869192",
+    "sourceCodeHash": "0x4a7924f2195074145ac8e6221d77b24cd22d97423db2053937897e9d788990e2"
   },
   "src/L2/OptimismSuperchainERC20Beacon.sol": {
-    "initCodeHash": "0xb032e99f5c205c8b474da89887e350277cdd05b99ee28374b97bfae18ef7a72c",
-    "sourceCodeHash": "0xc9ec1a022f82a3b463fad11d2cd6ade74bb0801ae797fdc0494840587fc595dd"
+    "initCodeHash": "0x8a4d7cac6dd8ce583c996837893b93560297be1269f97f785a502748b25ba310",
+    "sourceCodeHash": "0xb57024e16b528bade5fee7c236e03ffbb3f22e6376e6852e2109298af850b43c"
   },
   "src/L2/OptimismSuperchainERC20Factory.sol": {
-    "initCodeHash": "0xe6a098346699c3df248050fc3301197661d391f8e4849a93f00afeac17cae317",
-    "sourceCodeHash": "0x51980d07914ae48fd632aa54df24f3d6e2d335d0223a1d2ddd4ca5ced1797c16"
+    "initCodeHash": "0x44659ea207ed173db4f1b519944c09c671d49f118e9d9ab85a010b8ebaf899e7",
+    "sourceCodeHash": "0xa1c0346cfe6932dde05dc6c1d9505cac38434d8a8f9e1e437253b1f4115f2506"
   },
   "src/L2/SequencerFeeVault.sol": {
-    "initCodeHash": "0xf05acc7dcb80474e48ea36a3511bd4cbb35da065ed6280918b87a47c13a22cfc",
-    "sourceCodeHash": "0x3c0d09bd700b9db218445ecce76006574cabfe8c40c2156a6787c8a1360d7835"
+    "initCodeHash": "0x02ca6cb6eebd2d6b91cf1eab483ee00b3233a7e8ad31f0e9cafc1f645ab3c24a",
+    "sourceCodeHash": "0x85c740c0888368ee95607635818ee698c27582e8917f40bc590d240447376da9"
   },
   "src/L2/SuperchainERC20.sol": {
     "initCodeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-    "sourceCodeHash": "0x4c40f0249c1c9871efd2e957dd9c769cc52b88d896385dd4d547f82eb06284be"
+    "sourceCodeHash": "0x981dca5b09da9038a9dff071b40a880e1b52b20268c6780ef54be3bc98a4f629"
   },
   "src/L2/SuperchainTokenBridge.sol": {
-    "initCodeHash": "0x1cd2afdae6dd1b6ebc17f1d529e7d74c9b8b21b02db8589b8e389e2d5523d775",
-    "sourceCodeHash": "0x617aa994f659c5d8ebd54128d994f86f5b175ceca095b024b8524a7898e8ae62"
+    "initCodeHash": "0x6b568ed564aede82a3a4cbcdb51282cad0e588a3fe6d91cf76616d3113df3901",
+    "sourceCodeHash": "0xcd2b49cb7cf6d18616ee8bec9183fe5b5b460941875bc0b4158c4d5390ec3b0c"
   },
   "src/L2/SuperchainWETH.sol": {
-    "initCodeHash": "0xac4cab1ee7f0a5de8362ddc37e1de92e816aee3fdd4e31c0ba0fd9b03568f0f0",
-    "sourceCodeHash": "0x1fc6439f7a5fac2e264d5e057593844d252cdaa12c2b1eaa2fb08cbb911a9f35"
+    "initCodeHash": "0x6ded8aeea6edf7e0ead7b0d2a12ef236f1fb7d21980a1dd564cbe86affca7927",
+    "sourceCodeHash": "0x11d711704a5afcae6076d017ee001b25bc705728973b1ad2e6a32274a8475f50"
   },
   "src/L2/WETH.sol": {
-    "initCodeHash": "0x17ea1b1c5d5a622d51c2961fde886a5498de63584e654ed1d69ee80dddbe0b17",
-    "sourceCodeHash": "0x0fa0633a769e73f5937514c0003ba7947a1c275bbe5b85d78879c42f0ed8895b"
+    "initCodeHash": "0x480d4f8dbec1b0d3211bccbbdfb69796f3e90c784f724b1bbfd4703b0aafdeba",
+    "sourceCodeHash": "0xe9964aa66db1dfc86772958b4c9276697e67f7055529a43e6a49a055009bc995"
   },
   "src/cannon/MIPS.sol": {
-    "initCodeHash": "0x2ad89ddfd9b6091af7fa4f337f6f0134b946838b53a056995eea5982e4b903c3",
-    "sourceCodeHash": "0xcd5f9762e641e4a1f6b07420ea3b2bfcaac5656da10c66a0f367ee4d4af37e9c"
+    "initCodeHash": "0xc10654f0e6498f424f7a5095bac36005dc7062d3813cc8f805a15005fc37406b",
+    "sourceCodeHash": "0x6c45dd23cb0d6f9bf4f84855ad0caf70e53dee3fe6c41454f7bf8df52ec3a9af"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0x013e6005f56eae789a48ec9766d17c0be950d765ada3eb936c9a90337567c940",
-    "sourceCodeHash": "0xdd7684d0b8efd0bbee4abae76195c649b325ecd3e09f41b687cf3a091639c887"
+    "initCodeHash": "0x7476695bb101cb45213793291124e3ec41e13a02d291837b76d8a35bfc8ec2c1",
+    "sourceCodeHash": "0xeaceb5d28bd58fca6a234d9291ca01424bf83576d191ee3046272bc4987d0b29"
   },
   "src/cannon/MIPS64.sol": {
-    "initCodeHash": "0xa5c2105b0d6f90d6f5ab1782f6d7acda505674a3c11355e0b401d66250406c0c",
-    "sourceCodeHash": "0x7cb189f5081c4aae84a7b23329309d944cb54f075ec18b03240d1725c03adc3b"
+    "initCodeHash": "0x6516160f35a85abb65d8102fa71f03cb57518787f9af85bc951f27ee60e6bb8f",
+    "sourceCodeHash": "0xd0802842e5656639f33324ed6498c60013e6d9cd63c9f097090da9a0a61700a4"
   },
   "src/cannon/PreimageOracle.sol": {
-    "initCodeHash": "0x2bef439027c37c65dd8e7d9a987ff14e1dba94ee5fe5f316a77ecf46a8db4b3f",
-    "sourceCodeHash": "0x70965927d1cfcafa8975f3fdc98a138efe413c4a1585c0f60e0d21cfd396cc7c"
+    "initCodeHash": "0xf08736a5af9277a4f3498dfee84a40c9b05f1a2ba3177459bebe2b0b54f99343",
+    "sourceCodeHash": "0x14b952b2a00bc4ec5e149bb5fb2a973bb255f0fd3f4a42b6bd05bc3bbe51f2b1"
   },
   "src/dispute/AnchorStateRegistry.sol": {
-    "initCodeHash": "0x7bdbf9dc5125c953ea1833ccf0ad0e07d25b6f6c47e23da5374413324a38c5f9",
-    "sourceCodeHash": "0x1d918a536d9f6c900efdf069e96c2a27bb49340d6d1ebaa92dd6b481835a9a82"
+    "initCodeHash": "0x4e34a0d8de12cad21f37dc66755289ee38d1568a781f8ecc7ac38a0023d167ae",
+    "sourceCodeHash": "0xc9a8758bdd790ea3eff1a2d7416934d34a48b4a4e5340a66bd41044b27d36952"
   },
   "src/dispute/DelayedWETH.sol": {
-    "initCodeHash": "0xb31e0ff80fd69bc3f3b7d53f3fa42da4cdae393e41b8816719ce5ebe3d248688",
-    "sourceCodeHash": "0x1dfc68560c0805faa78360e3d4ef2d768e2f3d6c0c7183d2077a2c4277c778db"
+    "initCodeHash": "0xee29b653713e6c33d263cc0c24b922b7defc08a4cab8e0ee77ca25a8139ed8dd",
+    "sourceCodeHash": "0xe6951dbc1d15c0e7dc0e88e25fe3a3d4511ac5b96a80091d5ec08e12004477af"
   },
   "src/dispute/DisputeGameFactory.sol": {
-    "initCodeHash": "0xd72eced7cb5400d93188038a707fe6c1b04077f059cd8e2f5253e871de2cee3b",
-    "sourceCodeHash": "0x9cb0851b6e471461f2bb369bd72eef4cffe8a0d1345546608a2aa6795540211d"
+    "initCodeHash": "0x35d72c68d7e408ad3f8cd7fb94e695292ab64cc7b2563609c31b315bffb713f2",
+    "sourceCodeHash": "0x0b480d83f7eb65e9a9de6feff1474382504e4a32076c769f535081ed99f52acf"
   },
   "src/dispute/FaultDisputeGame.sol": {
-    "initCodeHash": "0x7441e418d3b4229f519c8c027f3fd7a5487206b833110b794cca104a1a2c73fe",
-    "sourceCodeHash": "0x8f4bf662fe8d56e9aabaa7742033880f0900cd6221c7711c1dbefe985a841104"
+    "initCodeHash": "0x423e8488731c0b0f87b435174f412c09fbf0b17eb0b8c9a03efa37d779ec0cae",
+    "sourceCodeHash": "0xe53b970922b309ada1c59f94d5935ffca669e909c797f17ba8a3d309c487e7e8"
   },
   "src/legacy/DeployerWhitelist.sol": {
-    "initCodeHash": "0xf232863fde5cd65368bcb4a79b41b5a4a09c59ede5070f82fd3f13f681bea7d8",
-    "sourceCodeHash": "0xd8d65492470907907d75574c1260fb349903af22c89098ea091439fc809310a9"
+    "initCodeHash": "0x53099379ed48b87f027d55712dbdd1da7d7099925426eb0531da9c0012e02c29",
+    "sourceCodeHash": "0xf22c94ed20c32a8ed2705a22d12c6969c3c3bad409c4efe2f95b0db74f210e10"
   },
   "src/legacy/L1BlockNumber.sol": {
-    "initCodeHash": "0x542955f1a84b304eaf291f76633b03e4c87c2654f7eff46c3bea94d27346ea1f",
-    "sourceCodeHash": "0x898c239e6367a0971a075df18030a033cdada26983fa8a5cd6e7b88ec90d4958"
+    "initCodeHash": "0x60dded11d35e42fe15ef5dd94d28aae6b8ff3e67c6fbbc667a6729fcb3ca7a9a",
+    "sourceCodeHash": "0x53ef11021a52e9c87024a870566ec5dba1d1a12752396e654904384efdd8203e"
   },
   "src/legacy/LegacyMessagePasser.sol": {
-    "initCodeHash": "0x11802672c929c4e92faeb7bee66617574b249b60a210f11ce29a5caa0e3d6bac",
-    "sourceCodeHash": "0x851ab8a2cd40798fce25698d4cfdb9dbf9c4c1e53f3cc8d1a325a6dd368807b0"
+    "initCodeHash": "0x3ca911b0578be7f8c91e7d01442a5609f04e5866768f99c8e31627c9ba79c9f0",
+    "sourceCodeHash": "0x62c9a6182d82692fb9c173ddb0d7978bcff2d1d4dc8cd2f10625e1e65bda6888"
   },
   "src/safe/DeputyGuardianModule.sol": {
-    "initCodeHash": "0xd95e562f395d4eb6e332f4474dffab660ada9e9da7c79f58fb6052278e0904df",
-    "sourceCodeHash": "0x45daabe094de0287e244e6fea4f1887b9adc09b07c47dc77361b1678645a1470"
+    "initCodeHash": "0x5eaf823d81995ce1f703f26e31049c54c1d4902dd9873a0b4645d470f2f459a2",
+    "sourceCodeHash": "0x17236a91c4171ae9525eae0e59fa65bb2dc320d62677cfc7d7eb942f182619fb"
   },
   "src/safe/LivenessGuard.sol": {
-    "initCodeHash": "0xd449cef5d62dea387f5c4fd18382f5427532c443d29b3dcf0f645dbb6756ccb4",
-    "sourceCodeHash": "0x745f72d907d9a8e95b5fdfe9fd9a910456f2417c42b81b0a3a764c20c13d7ed7"
+    "initCodeHash": "0xc8e29e8b12f423c8cd229a38bc731240dd815d96f1b0ab96c71494dde63f6a81",
+    "sourceCodeHash": "0x72b8d8d855e7af8beee29330f6cb9b9069acb32e23ce940002ec9a41aa012a16"
   },
   "src/safe/LivenessModule.sol": {
-    "initCodeHash": "0xb16fd6cdfe5125dbb065ab1b6fcd7a58665e9fc4907b1089c8a496576be5d4f7",
-    "sourceCodeHash": "0x17e70b1d4ffc876fde920eaeb5874ff8a39dfa03b1e24044dc73aff2820db1ef"
+    "initCodeHash": "0xde3b3273aa37604048b5fa228b90f3b05997db613dfcda45061545a669b2476a",
+    "sourceCodeHash": "0x918965e52bbd358ac827ebe35998f5d8fa5ca77d8eb9ab8986b44181b9aaa48a"
   },
   "src/universal/OptimismMintableERC20.sol": {
-    "initCodeHash": "0xc97c9502af8e83f1d9bd81f711c3d73db298dfdba465f463b3faa43a8208ed47",
-    "sourceCodeHash": "0x7e7ada21d7e5fb92521dad343ff71da9bdabd6e04882c81b8c8f74854f755ba6"
+    "initCodeHash": "0x51346d105fb0ebeb8733add0d53048b5d3d6f2d762c6bb446616c7f5da5eb026",
+    "sourceCodeHash": "0x876c716f9159909890eef3ffd3348a7f329af07e2899ae5ddc4a7809a3b753ce"
   },
   "src/universal/OptimismMintableERC20Factory.sol": {
-    "initCodeHash": "0x4ba75c8864565ac14aa213d2aacda58ce0f82b197fa72393328ac6968edb54fb",
-    "sourceCodeHash": "0xcd09be31be4e0fda6d329bd6ac6dccded3f029514be4908860db4d757ebb7bc7"
+    "initCodeHash": "0x080b30bbf556e8782dd2b355d5c9889324cf2ed1f9e6aca22a2e4dc42fab8ce7",
+    "sourceCodeHash": "0x47158ca0a9278bf367c4eebdb184aa31332f3b5a504f5147cf1c14777d9106ec"
   },
   "src/universal/OptimismMintableERC721.sol": {
-    "initCodeHash": "0xc7c5dbc9d19314f8ad00bd867a9186d04e7471502671c3daa23d90c1e3e16320",
-    "sourceCodeHash": "0x089ee309a0d9061646ab7a2781f80e5d94a74cc38fe808a3696e3984683d0a89"
+    "initCodeHash": "0xa43e7ffce142c0f2ae6ebe22decdf146dd39246830bec5cbd7903b32c2599048",
+    "sourceCodeHash": "0x5222efbb8e5b650e0778687ea3b3ca8df16d1683c7180862c77fe146dd21ea79"
   },
   "src/universal/OptimismMintableERC721Factory.sol": {
-    "initCodeHash": "0xf62b7daa5e5005d989d9afb177c314868bef48641a7069ddf1d6c6656e064929",
-    "sourceCodeHash": "0x2ea30e241a348bfdd3dae41375b8a5db8c6eb609650f49a0945e6d453b5b6a41"
+    "initCodeHash": "0x8ff88eb88c3b756b51e2f011bdf4387992a4f48abb2ab0a38fe6bb50ffea3301",
+    "sourceCodeHash": "0x483e20d002a402034a0a5b2ff60c9e69afa4f0f9917d287dfe820b7bae08a7bb"
   },
   "src/universal/StorageSetter.sol": {
-    "initCodeHash": "0x049f3c86965e575a370b14f7f49f3f15436ffb5ee1059615bb708659d7aae7de",
-    "sourceCodeHash": "0x5dc6b0b4ae4ab29085c52f74a4498d8a3d04928b844491749cd7186623e8b967"
+    "initCodeHash": "0x8831c079f7b7a52679e8a15e0ea14e30ea7bb4f93feed0fcd369942fe8c1f1ec",
+    "sourceCodeHash": "0x42151e2547ec5270353977fd66e78fa1fde18f362d7021cf7ddce16d5201b3ec"
   },
   "src/vendor/asterisc/RISCV.sol": {
     "initCodeHash": "0x7329cca924e189eeaa2d883234f6cb5fd787c8bf3339d8298e721778c2947ce5",
-    "sourceCodeHash": "0xf85f3dac3e0fcc7f52fb62f8e66b74f2bc6798b6c9fb43e1a610c5edc04be412"
+    "sourceCodeHash": "0x02025b303a8f37b4e541f8c7936a8651402a60ea0147a53176e06b51b15a1f84"
   },
   "src/vendor/eas/EAS.sol": {
-    "initCodeHash": "0xf96d1ebc530ed95e2dffebcfa2b4a1f18103235e6352d97838b77b7a2c14567b",
-    "sourceCodeHash": "0xbeca762929db37f1c7a2067e136c616f563ca18e85871ad7ae2d3ff55a16e6cb"
+    "initCodeHash": "0xce1700cfc0a8e346b0a8e8c64b6570ba731d874b434b4798fe3176f3903c404b",
+    "sourceCodeHash": "0xde4c41139672fc0581ba77425ab1d822a8123ceaa3ad0655be869fcc722b8add"
   },
   "src/vendor/eas/SchemaRegistry.sol": {
-    "initCodeHash": "0x06ae2c0b39c215b7fa450d382916ce6f5c6f9f2d630e572db6b72d688255b3fd",
-    "sourceCodeHash": "0xa014d9c992f439dee8221e065828c3326ca2c4f5db0e83431c64c20f7e51ec14"
+    "initCodeHash": "0x2bfce526f82622288333d53ca3f43a0a94306ba1bab99241daa845f8f4b18bd4",
+    "sourceCodeHash": "0xf49d7b0187912a6bb67926a3222ae51121e9239495213c975b3b4b217ee57a1b"
   }
 }
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol b/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol
index 666e4306b482..634d6da91dd7 100644
--- a/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol
+++ b/packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol
@@ -8,7 +8,7 @@ import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/O
 import { SafeCall } from "src/libraries/SafeCall.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @dev An enum representing the status of a DA challenge.
 enum ChallengeStatus {
@@ -95,8 +95,8 @@ contract DataAvailabilityChallenge is OwnableUpgradeable, ISemver {
     event BalanceChanged(address account, uint256 balance);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.3
-    string public constant version = "1.0.1-beta.3";
+    /// @custom:semver 1.0.1-beta.4
+    string public constant version = "1.0.1-beta.4";
 
     /// @notice The fixed cost of resolving a challenge.
     /// @dev The value is estimated by measuring the cost of resolving with `bytes(0)`
diff --git a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
index 27be4a7332fa..071d35aea6a4 100644
--- a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
@@ -8,10 +8,10 @@ import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
 
 /// @custom:proxied true
 /// @title L1CrossDomainMessenger
@@ -30,8 +30,8 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
     ISystemConfig public systemConfig;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.4.1-beta.2
-    string public constant version = "2.4.1-beta.2";
+    /// @custom:semver 2.4.1-beta.3
+    string public constant version = "2.4.1-beta.3";
 
     /// @notice Constructs the L1CrossDomainMessenger contract.
     constructor() CrossDomainMessenger() {
diff --git a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
index bd9b31c1e589..b1bdc1e61cbe 100644
--- a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
@@ -9,10 +9,10 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IL2ERC721Bridge } from "interfaces/L2/IL2ERC721Bridge.sol";
 
 /// @custom:proxied true
 /// @title L1ERC721Bridge
@@ -28,8 +28,8 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
     ISuperchainConfig public superchainConfig;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.2.0-beta.1
-    string public constant version = "2.2.0-beta.1";
+    /// @custom:semver 2.2.0-beta.2
+    string public constant version = "2.2.0-beta.2";
 
     /// @notice Constructs the L1ERC721Bridge contract.
     constructor() ERC721Bridge() {
diff --git a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
index 54cc833fe673..a2747096717e 100644
--- a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
@@ -8,10 +8,10 @@ import { StandardBridge } from "src/universal/StandardBridge.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 /// @custom:proxied true
 /// @title L1StandardBridge
@@ -75,8 +75,8 @@ contract L1StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 2.2.1-beta.2
-    string public constant version = "2.2.1-beta.2";
+    /// @custom:semver 2.2.1-beta.3
+    string public constant version = "2.2.1-beta.3";
 
     /// @notice Address of the SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
diff --git a/packages/contracts-bedrock/src/L1/L2OutputOracle.sol b/packages/contracts-bedrock/src/L1/L2OutputOracle.sol
index 99d5645dceca..1af5bd8b7aa9 100644
--- a/packages/contracts-bedrock/src/L1/L2OutputOracle.sol
+++ b/packages/contracts-bedrock/src/L1/L2OutputOracle.sol
@@ -8,7 +8,7 @@ import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @title L2OutputOracle
@@ -60,8 +60,8 @@ contract L2OutputOracle is Initializable, ISemver {
     event OutputsDeleted(uint256 indexed prevNextOutputIndex, uint256 indexed newNextOutputIndex);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.8.1-beta.2
-    string public constant version = "1.8.1-beta.2";
+    /// @custom:semver 1.8.1-beta.3
+    string public constant version = "1.8.1-beta.3";
 
     /// @notice Constructs the L2OutputOracle contract. Initializes variables to the same values as
     ///         in the getting-started config.
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
index c0978e66cad6..aad48374704b 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -7,27 +7,27 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Claim, Duration, GameType, GameTypes } from "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IPermissionedDisputeGame } from "interfaces/dispute/IPermissionedDisputeGame.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
 
 contract OPContractsManager is ISemver {
     // -------- Structs --------
@@ -114,8 +114,8 @@ contract OPContractsManager is ISemver {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.0.0-beta.22
-    string public constant version = "1.0.0-beta.22";
+    /// @custom:semver 1.0.0-beta.23
+    string public constant version = "1.0.0-beta.23";
 
     /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
     /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
index 3366087bd872..b40ea48b2019 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManagerInterop.sol
@@ -5,11 +5,11 @@ pragma solidity 0.8.15;
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 
 // Interfaces
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISystemConfigInterop } from "interfaces/L1/ISystemConfigInterop.sol";
 
 contract OPContractsManagerInterop is OPContractsManager {
     constructor(
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal.sol b/packages/contracts-bedrock/src/L1/OptimismPortal.sol
index 2f9f53787581..6137558991ea 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortal.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortal.sol
@@ -30,12 +30,12 @@ import {
 
 // Interfaces
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @custom:proxied true
 /// @title OptimismPortal
@@ -146,9 +146,9 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 2.8.1-beta.4
+    /// @custom:semver 2.8.1-beta.5
     function version() public pure virtual returns (string memory) {
-        return "2.8.1-beta.4";
+        return "2.8.1-beta.5";
     }
 
     /// @notice Constructs the OptimismPortal contract.
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
index 985711ed18e5..494ad7a67c54 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortal2.sol
@@ -38,13 +38,13 @@ import { GameStatus, GameType, Claim, Timestamp, Hash } from "src/dispute/lib/Ty
 
 // Interfaces
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @custom:proxied true
 /// @title OptimismPortal2
@@ -183,9 +183,9 @@ contract OptimismPortal2 is Initializable, ResourceMetering, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 3.11.0-beta.6
+    /// @custom:semver 3.11.0-beta.7
     function version() public pure virtual returns (string memory) {
-        return "3.11.0-beta.6";
+        return "3.11.0-beta.7";
     }
 
     /// @notice Constructs the OptimismPortal contract.
diff --git a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
index abad969dffa3..7c21244bf5a1 100644
--- a/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortalInterop.sol
@@ -10,7 +10,7 @@ import { Constants } from "src/libraries/Constants.sol";
 import { Unauthorized } from "src/libraries/PortalErrors.sol";
 
 // Interfaces
-import { IL1BlockInterop, ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { IL1BlockInterop, ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
 /// @custom:proxied true
 /// @title OptimismPortalInterop
@@ -25,9 +25,9 @@ contract OptimismPortalInterop is OptimismPortal2 {
         OptimismPortal2(_proofMaturityDelaySeconds, _disputeGameFinalityDelaySeconds)
     { }
 
-    /// @custom:semver +interop-beta.3
+    /// @custom:semver +interop-beta.4
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.3");
+        return string.concat(super.version(), "+interop-beta.4");
     }
 
     /// @notice Sets static configuration options for the L2 system.
diff --git a/packages/contracts-bedrock/src/L1/ProtocolVersions.sol b/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
index 83fe4a90b632..2253e38e35fe 100644
--- a/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
+++ b/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
@@ -8,7 +8,7 @@ import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/O
 import { Storage } from "src/libraries/Storage.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @notice ProtocolVersion is a numeric identifier of the protocol version.
 type ProtocolVersion is uint256;
@@ -41,8 +41,8 @@ contract ProtocolVersions is OwnableUpgradeable, ISemver {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.4
-    string public constant version = "1.0.1-beta.4";
+    /// @custom:semver 1.0.1-beta.5
+    string public constant version = "1.0.1-beta.5";
 
     /// @notice Constructs the ProtocolVersion contract. Cannot set
     ///         the owner to `address(0)` due to the Ownable contract's
diff --git a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
index 5cac41ece63a..cceedbfd9320 100644
--- a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
@@ -8,7 +8,7 @@ import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable
 import { Storage } from "src/libraries/Storage.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:audit none This contracts is not yet audited.
@@ -41,8 +41,8 @@ contract SuperchainConfig is Initializable, ISemver {
     event ConfigUpdate(UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.2
-    string public constant version = "1.1.1-beta.2";
+    /// @custom:semver 1.1.1-beta.3
+    string public constant version = "1.1.1-beta.3";
 
     /// @notice Constructs the SuperchainConfig contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L1/SystemConfig.sol b/packages/contracts-bedrock/src/L1/SystemConfig.sol
index 517391164438..e268c4be4f51 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfig.sol
@@ -11,9 +11,9 @@ import { Constants } from "src/libraries/Constants.sol";
 import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 /// @custom:proxied true
 /// @title SystemConfig
@@ -137,9 +137,9 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken {
     event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);
 
     /// @notice Semantic version.
-    /// @custom:semver 2.3.0-beta.6
+    /// @custom:semver 2.3.0-beta.7
     function version() public pure virtual returns (string memory) {
-        return "2.3.0-beta.6";
+        return "2.3.0-beta.7";
     }
 
     /// @notice Constructs the SystemConfig contract. Cannot set
diff --git a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
index 1bdc8ddc5863..ba8aaa518222 100644
--- a/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfigInterop.sol
@@ -12,9 +12,9 @@ import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { Storage } from "src/libraries/Storage.sol";
 
 // Interfaces
-import { IOptimismPortalInterop as IOptimismPortal } from "src/L1/interfaces/IOptimismPortalInterop.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { IOptimismPortalInterop as IOptimismPortal } from "interfaces/L1/IOptimismPortalInterop.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
 /// @custom:proxied true
 /// @title SystemConfigInterop
@@ -68,9 +68,9 @@ contract SystemConfigInterop is SystemConfig {
         Storage.setAddress(DEPENDENCY_MANAGER_SLOT, _dependencyManager);
     }
 
-    /// @custom:semver +interop-beta.5
+    /// @custom:semver +interop-beta.6
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.5");
+        return string.concat(super.version(), "+interop-beta.6");
     }
 
     /// @notice Internal setter for the gas paying token address, includes validation.
diff --git a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
index 4dd6a87023be..6f4e67b9d538 100644
--- a/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/BaseFeeVault.sol
@@ -8,7 +8,7 @@ import { FeeVault } from "src/L2/FeeVault.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000019
@@ -16,8 +16,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 /// @notice The BaseFeeVault accumulates the base fee that is paid by transactions.
 contract BaseFeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.4
-    string public constant version = "1.5.0-beta.4";
+    /// @custom:semver 1.5.0-beta.5
+    string public constant version = "1.5.0-beta.5";
 
     /// @notice Constructs the BaseFeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
diff --git a/packages/contracts-bedrock/src/L2/CrossDomainOwnable2.sol b/packages/contracts-bedrock/src/L2/CrossDomainOwnable2.sol
index 0711daffce3e..491921066b65 100644
--- a/packages/contracts-bedrock/src/L2/CrossDomainOwnable2.sol
+++ b/packages/contracts-bedrock/src/L2/CrossDomainOwnable2.sol
@@ -8,7 +8,7 @@ import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
+import { IL2CrossDomainMessenger } from "interfaces/L2/IL2CrossDomainMessenger.sol";
 
 /// @title CrossDomainOwnable2
 /// @notice This contract extends the OpenZeppelin `Ownable` contract for L2 contracts to be owned
diff --git a/packages/contracts-bedrock/src/L2/CrossDomainOwnable3.sol b/packages/contracts-bedrock/src/L2/CrossDomainOwnable3.sol
index e940a026df05..e5661a94ed88 100644
--- a/packages/contracts-bedrock/src/L2/CrossDomainOwnable3.sol
+++ b/packages/contracts-bedrock/src/L2/CrossDomainOwnable3.sol
@@ -8,7 +8,7 @@ import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
+import { IL2CrossDomainMessenger } from "interfaces/L2/IL2CrossDomainMessenger.sol";
 
 /// @title CrossDomainOwnable3
 /// @notice This contract extends the OpenZeppelin `Ownable` contract for L2 contracts to be owned
diff --git a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
index ca9129f710aa..4762940bd1c7 100644
--- a/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
+++ b/packages/contracts-bedrock/src/L2/CrossL2Inbox.sol
@@ -7,9 +7,9 @@ import { TransientContext, TransientReentrancyAware } from "src/libraries/Transi
 import { SafeCall } from "src/libraries/SafeCall.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IDependencySet } from "src/L2/interfaces/IDependencySet.sol";
-import { IL1BlockInterop } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IDependencySet } from "interfaces/L2/IDependencySet.sol";
+import { IL1BlockInterop } from "interfaces/L2/IL1BlockInterop.sol";
 
 /// @notice Thrown when the caller is not DEPOSITOR_ACCOUNT when calling `setInteropStart()`
 error NotDepositor();
@@ -76,8 +76,8 @@ contract CrossL2Inbox is ISemver, TransientReentrancyAware {
     address internal constant DEPOSITOR_ACCOUNT = 0xDeaDDEaDDeAdDeAdDEAdDEaddeAddEAdDEAd0001;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.10
-    string public constant version = "1.0.0-beta.10";
+    /// @custom:semver 1.0.0-beta.11
+    string public constant version = "1.0.0-beta.11";
 
     /// @notice Emitted when a cross chain message is being executed.
     /// @param msgHash Hash of message payload being executed.
diff --git a/packages/contracts-bedrock/src/L2/ETHLiquidity.sol b/packages/contracts-bedrock/src/L2/ETHLiquidity.sol
index 6118288df77d..8962f791c26c 100644
--- a/packages/contracts-bedrock/src/L2/ETHLiquidity.sol
+++ b/packages/contracts-bedrock/src/L2/ETHLiquidity.sol
@@ -9,8 +9,8 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @title ETHLiquidity
 /// @notice The ETHLiquidity contract allows other contracts to access ETH liquidity without
@@ -23,8 +23,8 @@ contract ETHLiquidity is ISemver {
     event LiquidityMinted(address indexed caller, uint256 value);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.3
-    string public constant version = "1.0.0-beta.3";
+    /// @custom:semver 1.0.0-beta.4
+    string public constant version = "1.0.0-beta.4";
 
     /// @notice Allows an address to lock ETH liquidity into this contract.
     function burn() external payable {
diff --git a/packages/contracts-bedrock/src/L2/FeeVault.sol b/packages/contracts-bedrock/src/L2/FeeVault.sol
index 856985d7827b..86c94fc3f6dc 100644
--- a/packages/contracts-bedrock/src/L2/FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/FeeVault.sol
@@ -6,7 +6,7 @@ import { SafeCall } from "src/libraries/SafeCall.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
+import { IL2ToL1MessagePasser } from "interfaces/L2/IL2ToL1MessagePasser.sol";
 
 // Libraries
 import { Types } from "src/libraries/Types.sol";
diff --git a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
index 45f14fe173d0..11b6c897db85 100644
--- a/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
+++ b/packages/contracts-bedrock/src/L2/GasPriceOracle.sol
@@ -7,8 +7,8 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x420000000000000000000000000000000000000F
@@ -29,8 +29,8 @@ contract GasPriceOracle is ISemver {
     uint256 public constant DECIMALS = 6;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.3
-    string public constant version = "1.3.1-beta.3";
+    /// @custom:semver 1.3.1-beta.4
+    string public constant version = "1.3.1-beta.4";
 
     /// @notice This is the intercept value for the linear regression used to estimate the final size of the
     ///         compressed transaction.
diff --git a/packages/contracts-bedrock/src/L2/L1Block.sol b/packages/contracts-bedrock/src/L2/L1Block.sol
index 1f7a935339a2..3767b80988da 100644
--- a/packages/contracts-bedrock/src/L2/L1Block.sol
+++ b/packages/contracts-bedrock/src/L2/L1Block.sol
@@ -7,7 +7,7 @@ import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
 import { NotDepositor } from "src/libraries/L1BlockErrors.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000015
@@ -60,9 +60,9 @@ contract L1Block is ISemver, IGasToken {
     /// @notice The latest L1 blob base fee.
     uint256 public blobBaseFee;
 
-    /// @custom:semver 1.5.1-beta.4
+    /// @custom:semver 1.5.1-beta.5
     function version() public pure virtual returns (string memory) {
-        return "1.5.1-beta.4";
+        return "1.5.1-beta.5";
     }
 
     /// @notice Returns the gas paying token, its decimals, name and symbol.
diff --git a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
index b3a5cf51be1d..7b92b202a052 100644
--- a/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L1BlockInterop.sol
@@ -49,9 +49,9 @@ contract L1BlockInterop is L1Block {
     /// keccak256(abi.encode(uint256(keccak256("l1Block.identifier.isDeposit")) - 1)) & ~bytes32(uint256(0xff))
     uint256 internal constant IS_DEPOSIT_SLOT = 0x921bd3a089295c6e5540e8fba8195448d253efd6f2e3e495b499b627dc36a300;
 
-    /// @custom:semver +interop-beta.2
+    /// @custom:semver +interop-beta.3
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.2");
+        return string.concat(super.version(), "+interop-beta.3");
     }
 
     /// @notice Returns whether the call was triggered from a a deposit or not.
diff --git a/packages/contracts-bedrock/src/L2/L1FeeVault.sol b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
index 3e69806ce53c..1d8a2520c184 100644
--- a/packages/contracts-bedrock/src/L2/L1FeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/L1FeeVault.sol
@@ -8,7 +8,7 @@ import { FeeVault } from "src/L2/FeeVault.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x420000000000000000000000000000000000001A
@@ -16,8 +16,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 /// @notice The L1FeeVault accumulates the L1 portion of the transaction fees.
 contract L1FeeVault is FeeVault, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.5.0-beta.4
-    string public constant version = "1.5.0-beta.4";
+    /// @custom:semver 1.5.0-beta.5
+    string public constant version = "1.5.0-beta.5";
 
     /// @notice Constructs the L1FeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
diff --git a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
index 2461e46d2cf5..668b1756f5a2 100644
--- a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
@@ -9,9 +9,9 @@ import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IL2ToL1MessagePasser } from "interfaces/L2/IL2ToL1MessagePasser.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000007
@@ -20,8 +20,8 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 ///         L2 on the L2 side. Users are generally encouraged to use this contract instead of lower
 ///         level message passing contracts.
 contract L2CrossDomainMessenger is CrossDomainMessenger, ISemver {
-    /// @custom:semver 2.1.1-beta.4
-    string public constant version = "2.1.1-beta.4";
+    /// @custom:semver 2.1.1-beta.5
+    string public constant version = "2.1.1-beta.5";
 
     /// @notice Constructs the L2CrossDomainMessenger contract.
     constructor() CrossDomainMessenger() {
diff --git a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
index 85c6856e629d..c774c3ad4389 100644
--- a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
@@ -9,10 +9,10 @@ import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC16
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IOptimismMintableERC721 } from "interfaces/universal/IOptimismMintableERC721.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000014
@@ -26,8 +26,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 ///         wait for the one-week challenge period to elapse before their Optimism-native NFT
 ///         can be refunded on L2.
 contract L2ERC721Bridge is ERC721Bridge, ISemver {
-    /// @custom:semver 1.8.0-beta.2
-    string public constant version = "1.8.0-beta.2";
+    /// @custom:semver 1.8.0-beta.3
+    string public constant version = "1.8.0-beta.3";
 
     /// @notice Constructs the L2ERC721Bridge contract.
     constructor() ERC721Bridge() {
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
index d2cb6f815564..02fac4ee1dda 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
@@ -8,10 +8,10 @@ import { StandardBridge } from "src/universal/StandardBridge.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000010
@@ -58,9 +58,9 @@ contract L2StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.11.1-beta.4
+    /// @custom:semver 1.11.1-beta.5
     function version() public pure virtual returns (string memory) {
-        return "1.11.1-beta.4";
+        return "1.11.1-beta.5";
     }
 
     /// @notice Constructs the L2StandardBridge contract.
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
index 622d92187238..be7323e0953d 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
@@ -10,8 +10,8 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 // Interfaces
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
-import { IMintableAndBurnableERC20 } from "src/L2/interfaces/IMintableAndBurnableERC20.sol";
+import { IOptimismERC20Factory } from "interfaces/L2/IOptimismERC20Factory.sol";
+import { IMintableAndBurnableERC20 } from "interfaces/L2/IMintableAndBurnableERC20.sol";
 
 /// @notice Thrown when the decimals of the tokens are not the same.
 error InvalidDecimals();
@@ -40,9 +40,9 @@ contract L2StandardBridgeInterop is L2StandardBridge {
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
     /// @notice Semantic version.
-    /// @custom:semver +interop-beta.3
+    /// @custom:semver +interop-beta.4
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.3");
+        return string.concat(super.version(), "+interop-beta.4");
     }
 
     /// @notice Converts `amount` of `from` token to `to` token.
diff --git a/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol b/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol
index 9492b3fada15..b17bda73c583 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol
@@ -8,7 +8,7 @@ import { Encoding } from "src/libraries/Encoding.sol";
 import { Burn } from "src/libraries/Burn.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000016
@@ -51,8 +51,8 @@ contract L2ToL1MessagePasser is ISemver {
     /// @param amount Amount of ETh that was burned.
     event WithdrawerBalanceBurnt(uint256 indexed amount);
 
-    /// @custom:semver 1.1.1-beta.2
-    string public constant version = "1.1.1-beta.2";
+    /// @custom:semver 1.1.1-beta.3
+    string public constant version = "1.1.1-beta.3";
 
     /// @notice Allows users to withdraw ETH by sending directly to this contract.
     receive() external payable {
diff --git a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
index 731d36c97879..2162638ddc43 100644
--- a/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol
@@ -9,9 +9,9 @@ import { SafeCall } from "src/libraries/SafeCall.sol";
 import { TransientReentrancyAware } from "src/libraries/TransientContext.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IDependencySet } from "src/L2/interfaces/IDependencySet.sol";
-import { ICrossL2Inbox, Identifier } from "src/L2/interfaces/ICrossL2Inbox.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IDependencySet } from "interfaces/L2/IDependencySet.sol";
+import { ICrossL2Inbox, Identifier } from "interfaces/L2/ICrossL2Inbox.sol";
 
 /// @notice Thrown when a non-written slot in transient storage is attempted to be read from.
 error NotEntered();
@@ -72,8 +72,8 @@ contract L2ToL2CrossDomainMessenger is ISemver, TransientReentrancyAware {
     uint16 public constant messageVersion = uint16(0);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.12
-    string public constant version = "1.0.0-beta.12";
+    /// @custom:semver 1.0.0-beta.13
+    string public constant version = "1.0.0-beta.13";
 
     /// @notice Mapping of message hashes to boolean receipt values. Note that a message will only be present in this
     ///         mapping if it has successfully been relayed on this chain, and can therefore not be relayed again.
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
index b39f544f47e5..53ba32dc051b 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol
@@ -10,7 +10,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { ZeroAddress, Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 
 // Interfaces
-import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
+import { IOptimismSuperchainERC20 } from "interfaces/L2/IOptimismSuperchainERC20.sol";
 
 /// @custom:proxied true
 /// @title OptimismSuperchainERC20
@@ -63,8 +63,8 @@ contract OptimismSuperchainERC20 is SuperchainERC20, Initializable {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.11
-    string public constant override version = "1.0.0-beta.11";
+    /// @custom:semver 1.0.0-beta.12
+    string public constant override version = "1.0.0-beta.12";
 
     /// @notice Constructs the OptimismSuperchainERC20 contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
index 3ac981f07426..58cc15c7b9e0 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Beacon.sol
@@ -6,7 +6,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
 import { IBeacon } from "@openzeppelin/contracts/proxy/beacon/IBeacon.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:predeployed 0x4200000000000000000000000000000000000027
@@ -14,8 +14,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 /// @notice OptimismSuperchainERC20Beacon is the beacon proxy for the OptimismSuperchainERC20 implementation.
 contract OptimismSuperchainERC20Beacon is IBeacon, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.3
-    string public constant version = "1.0.0-beta.3";
+    /// @custom:semver 1.0.0-beta.4
+    string public constant version = "1.0.0-beta.4";
 
     /// @inheritdoc IBeacon
     function implementation() external pure override returns (address) {
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
index 4639c72c68a8..8430cdcd2b04 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
@@ -10,7 +10,7 @@ import { CREATE3 } from "@rari-capital/solmate/src/utils/CREATE3.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied
 /// @custom:predeployed 0x4200000000000000000000000000000000000026
@@ -27,8 +27,8 @@ contract OptimismSuperchainERC20Factory is ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.5
-    string public constant version = "1.0.0-beta.5";
+    /// @custom:semver 1.0.0-beta.6
+    string public constant version = "1.0.0-beta.6";
 
     /// @notice Mapping of the deployed OptimismSuperchainERC20 to the remote token address.
     ///         This is used to keep track of the token deployments.
diff --git a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
index 71861c828f4d..e5089ff33ac8 100644
--- a/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
+++ b/packages/contracts-bedrock/src/L2/SequencerFeeVault.sol
@@ -8,7 +8,7 @@ import { FeeVault } from "src/L2/FeeVault.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000011
@@ -16,8 +16,8 @@ import { ISemver } from "src/universal/interfaces/ISemver.sol";
 /// @notice The SequencerFeeVault is the contract that holds any fees paid to the Sequencer during
 ///         transaction processing and block production.
 contract SequencerFeeVault is FeeVault, ISemver {
-    /// @custom:semver 1.5.0-beta.4
-    string public constant version = "1.5.0-beta.4";
+    /// @custom:semver 1.5.0-beta.5
+    string public constant version = "1.5.0-beta.5";
 
     /// @notice Constructs the SequencerFeeVault contract.
     /// @param _recipient           Wallet that will receive the fees.
diff --git a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
index 10273d9bd369..061c2d867b68 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainERC20.sol
@@ -10,17 +10,17 @@ import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 
 // Interfaces
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IERC7802, IERC165 } from "interfaces/L2/IERC7802.sol";
 
 /// @title SuperchainERC20
 /// @notice A standard ERC20 extension implementing IERC7802 for unified cross-chain fungibility across
 ///         the Superchain. Allows the SuperchainTokenBridge to mint and burn tokens as needed.
 abstract contract SuperchainERC20 is ERC20, IERC7802, ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.7
+    /// @custom:semver 1.0.0-beta.8
     function version() external view virtual returns (string memory) {
-        return "1.0.0-beta.7";
+        return "1.0.0-beta.8";
     }
 
     /// @notice Allows the SuperchainTokenBridge to mint tokens.
diff --git a/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol b/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol
index 104f8ef95043..fc8c3d961088 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainTokenBridge.sol
@@ -6,9 +6,9 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { ZeroAddress, Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 
 // Interfaces
-import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
-import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
-import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
+import { ISuperchainERC20 } from "interfaces/L2/ISuperchainERC20.sol";
+import { IERC7802, IERC165 } from "interfaces/L2/IERC7802.sol";
+import { IL2ToL2CrossDomainMessenger } from "interfaces/L2/IL2ToL2CrossDomainMessenger.sol";
 
 /// @custom:proxied true
 /// @custom:predeploy 0x4200000000000000000000000000000000000028
@@ -46,8 +46,8 @@ contract SuperchainTokenBridge {
     address internal constant MESSENGER = Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.3
-    string public constant version = "1.0.0-beta.3";
+    /// @custom:semver 1.0.0-beta.4
+    string public constant version = "1.0.0-beta.4";
 
     /// @notice Sends tokens to a target address on another chain.
     /// @dev Tokens are burned on the source chain.
diff --git a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
index 912f1aa3d865..ab6ff44a33ab 100644
--- a/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
+++ b/packages/contracts-bedrock/src/L2/SuperchainWETH.sol
@@ -11,11 +11,11 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { SafeSend } from "src/universal/SafeSend.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
-import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
-import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IL2ToL2CrossDomainMessenger } from "interfaces/L2/IL2ToL2CrossDomainMessenger.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
+import { IETHLiquidity } from "interfaces/L2/IETHLiquidity.sol";
+import { IERC7802, IERC165 } from "interfaces/L2/IERC7802.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 /// @custom:proxied true
@@ -43,8 +43,8 @@ contract SuperchainWETH is WETH98, IERC7802, ISemver {
     event RelayETH(address indexed from, address indexed to, uint256 amount, uint256 source);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.0-beta.12
-    string public constant version = "1.0.0-beta.12";
+    /// @custom:semver 1.0.0-beta.13
+    string public constant version = "1.0.0-beta.13";
 
     /// @inheritdoc WETH98
     function deposit() public payable override {
diff --git a/packages/contracts-bedrock/src/L2/WETH.sol b/packages/contracts-bedrock/src/L2/WETH.sol
index dacd62c36de9..5dc716fca569 100644
--- a/packages/contracts-bedrock/src/L2/WETH.sol
+++ b/packages/contracts-bedrock/src/L2/WETH.sol
@@ -8,14 +8,14 @@ import { WETH98 } from "src/universal/WETH98.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @title WETH contract that reads the name and symbol from the L1Block contract.
 ///        Allows for nice rendering of token names for chains using custom gas token.
 contract WETH is WETH98, ISemver {
-    /// @custom:semver 1.1.0-beta.3
-    string public constant version = "1.1.0-beta.3";
+    /// @custom:semver 1.1.0-beta.4
+    string public constant version = "1.1.0-beta.4";
 
     /// @notice Returns the name of the wrapped native asset. Will be "Wrapped Ether"
     ///         if the native asset is Ether.
diff --git a/packages/contracts-bedrock/src/cannon/MIPS.sol b/packages/contracts-bedrock/src/cannon/MIPS.sol
index 93ee98b070eb..b1fad0b788c8 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS.sol
@@ -9,8 +9,8 @@ import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";
 import { InvalidRMWInstruction } from "src/cannon/libraries/CannonErrors.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title MIPS
 /// @notice The MIPS contract emulates a single MIPS instruction.
@@ -47,8 +47,8 @@ contract MIPS is ISemver {
     }
 
     /// @notice The semantic version of the MIPS contract.
-    /// @custom:semver 1.2.1-beta.9
-    string public constant version = "1.2.1-beta.9";
+    /// @custom:semver 1.2.1-beta.10
+    string public constant version = "1.2.1-beta.10";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index 8090c5e3d8b6..e2af829be6e9 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -12,8 +12,8 @@ import {
 } from "src/cannon/libraries/CannonErrors.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title MIPS2
 /// @notice The MIPS2 contract emulates a single MIPS instruction.
@@ -63,8 +63,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.24
-    string public constant version = "1.0.0-beta.24";
+    /// @custom:semver 1.0.0-beta.25
+    string public constant version = "1.0.0-beta.25";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/MIPS64.sol b/packages/contracts-bedrock/src/cannon/MIPS64.sol
index 91269251c367..51e60ba37cea 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS64.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS64.sol
@@ -13,8 +13,8 @@ import {
 } from "src/cannon/libraries/CannonErrors.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 /// @title MIPS64
 /// @notice The MIPS64 contract emulates a single MIPS instruction.
@@ -67,8 +67,8 @@ contract MIPS64 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS64 contract.
-    /// @custom:semver 1.0.0-beta.6
-    string public constant version = "1.0.0-beta.6";
+    /// @custom:semver 1.0.0-beta.7
+    string public constant version = "1.0.0-beta.7";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
diff --git a/packages/contracts-bedrock/src/cannon/PreimageOracle.sol b/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
index 03c0b3ae5521..b45a4ac4edd2 100644
--- a/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
+++ b/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
@@ -26,7 +26,7 @@ import {
 import { LPPMetaData } from "src/cannon/libraries/CannonTypes.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title PreimageOracle
 /// @notice A contract for storing permissioned pre-images.
@@ -51,8 +51,8 @@ contract PreimageOracle is ISemver {
     uint256 public constant PRECOMPILE_CALL_RESERVED_GAS = 100_000;
 
     /// @notice The semantic version of the Preimage Oracle contract.
-    /// @custom:semver 1.1.3-beta.7
-    string public constant version = "1.1.3-beta.7";
+    /// @custom:semver 1.1.3-beta.8
+    string public constant version = "1.1.3-beta.8";
 
     ////////////////////////////////////////////////////////////////
     //                 Authorized Preimage Parts                  //
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
index e8556979bc71..a5b8201ca655 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 // Libraries
 import { MIPS64Memory } from "src/cannon/libraries/MIPS64Memory.sol";
 import { MIPS64State as st } from "src/cannon/libraries/MIPS64State.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 import { PreimageKeyLib } from "src/cannon/PreimageKeyLib.sol";
 import { MIPS64Arch as arch } from "src/cannon/libraries/MIPS64Arch.sol";
 
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
index 8ba85bc7e371..8fa62dbbad78 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 // Libraries
 import { MIPSMemory } from "src/cannon/libraries/MIPSMemory.sol";
 import { MIPSState as st } from "src/cannon/libraries/MIPSState.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 import { PreimageKeyLib } from "src/cannon/PreimageKeyLib.sol";
 
 library MIPSSyscalls {
diff --git a/packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol b/packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol
index a1b1531523f4..0f48b9f2a4e9 100644
--- a/packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol
+++ b/packages/contracts-bedrock/src/dispute/AnchorStateRegistry.sol
@@ -10,11 +10,11 @@ import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 import { UnregisteredGame, InvalidGameStatus } from "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 /// @custom:proxied true
 /// @title AnchorStateRegistry
@@ -30,8 +30,8 @@ contract AnchorStateRegistry is Initializable, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 2.0.1-beta.4
-    string public constant version = "2.0.1-beta.4";
+    /// @custom:semver 2.0.1-beta.5
+    string public constant version = "2.0.1-beta.5";
 
     /// @notice DisputeGameFactory address.
     IDisputeGameFactory internal immutable DISPUTE_GAME_FACTORY;
diff --git a/packages/contracts-bedrock/src/dispute/DelayedWETH.sol b/packages/contracts-bedrock/src/dispute/DelayedWETH.sol
index 3438c22e3679..f3966d8ac89f 100644
--- a/packages/contracts-bedrock/src/dispute/DelayedWETH.sol
+++ b/packages/contracts-bedrock/src/dispute/DelayedWETH.sol
@@ -6,8 +6,8 @@ import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/O
 import { WETH98 } from "src/universal/WETH98.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 /// @custom:proxied true
 /// @title DelayedWETH
@@ -32,8 +32,8 @@ contract DelayedWETH is OwnableUpgradeable, WETH98, ISemver {
     event Unwrap(address indexed src, uint256 wad);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.2.0-beta.3
-    string public constant version = "1.2.0-beta.3";
+    /// @custom:semver 1.2.0-beta.4
+    string public constant version = "1.2.0-beta.4";
 
     /// @notice Returns a withdrawal request for the given address.
     mapping(address => mapping(address => WithdrawalRequest)) public withdrawals;
diff --git a/packages/contracts-bedrock/src/dispute/DisputeGameFactory.sol b/packages/contracts-bedrock/src/dispute/DisputeGameFactory.sol
index 4a512f0ca2aa..583f432f3e0c 100644
--- a/packages/contracts-bedrock/src/dispute/DisputeGameFactory.sol
+++ b/packages/contracts-bedrock/src/dispute/DisputeGameFactory.sol
@@ -10,8 +10,8 @@ import { GameType, Claim, GameId, Timestamp, Hash, LibGameId } from "src/dispute
 import { NoImplementation, IncorrectBondAmount, GameAlreadyExists } from "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
 
 /// @custom:proxied true
 /// @title DisputeGameFactory
@@ -49,8 +49,8 @@ contract DisputeGameFactory is OwnableUpgradeable, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.3
-    string public constant version = "1.0.1-beta.3";
+    /// @custom:semver 1.0.1-beta.4
+    string public constant version = "1.0.1-beta.4";
 
     /// @notice `gameImpls` is a mapping that maps `GameType`s to their respective
     ///         `IDisputeGame` implementations.
diff --git a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
index 6aad60e42839..02a2cee3ca83 100644
--- a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
@@ -55,10 +55,10 @@ import {
 } from "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IBigStepper, IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IBigStepper, IPreimageOracle } from "interfaces/dispute/IBigStepper.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
 
 /// @title FaultDisputeGame
 /// @notice An implementation of the `IFaultDisputeGame` interface.
@@ -161,8 +161,8 @@ contract FaultDisputeGame is Clone, ISemver {
     uint256 internal constant HEADER_BLOCK_NUMBER_INDEX = 8;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.8
-    string public constant version = "1.3.1-beta.8";
+    /// @custom:semver 1.3.1-beta.9
+    string public constant version = "1.3.1-beta.9";
 
     /// @notice The starting timestamp of the game
     Timestamp public createdAt;
diff --git a/packages/contracts-bedrock/src/governance/MintManager.sol b/packages/contracts-bedrock/src/governance/MintManager.sol
index 43ef618ba051..0f58e391c512 100644
--- a/packages/contracts-bedrock/src/governance/MintManager.sol
+++ b/packages/contracts-bedrock/src/governance/MintManager.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 
 // Interfaces
-import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
+import { IGovernanceToken } from "interfaces/governance/IGovernanceToken.sol";
 
 /// @title MintManager
 /// @notice Set as `owner` of the governance token and responsible for the token inflation
diff --git a/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol b/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol
index e247f65ffb99..05a7798aeca3 100644
--- a/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol
+++ b/packages/contracts-bedrock/src/legacy/DeployerWhitelist.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:legacy true
 /// @custom:proxied true
@@ -42,8 +42,8 @@ contract DeployerWhitelist is ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.2
-    string public constant version = "1.1.1-beta.2";
+    /// @custom:semver 1.1.1-beta.3
+    string public constant version = "1.1.1-beta.3";
 
     /// @notice Adds or removes an address from the deployment whitelist.
     /// @param _deployer      Address to update permissions for.
diff --git a/packages/contracts-bedrock/src/legacy/L1BlockNumber.sol b/packages/contracts-bedrock/src/legacy/L1BlockNumber.sol
index 19a595a3fad3..6e0e33fa9487 100644
--- a/packages/contracts-bedrock/src/legacy/L1BlockNumber.sol
+++ b/packages/contracts-bedrock/src/legacy/L1BlockNumber.sol
@@ -5,8 +5,8 @@ pragma solidity 0.8.15;
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 /// @custom:legacy true
 /// @custom:proxied true
@@ -18,8 +18,8 @@ import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
 ///        contract instead.
 contract L1BlockNumber is ISemver {
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.2
-    string public constant version = "1.1.1-beta.2";
+    /// @custom:semver 1.1.1-beta.3
+    string public constant version = "1.1.1-beta.3";
 
     /// @notice Returns the L1 block number.
     receive() external payable {
diff --git a/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol b/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol
index b6a5363e2fbf..a2a62707c6ee 100644
--- a/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol
+++ b/packages/contracts-bedrock/src/legacy/L1ChugSplashProxy.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
-import { IL1ChugSplashDeployer } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
+import { IL1ChugSplashDeployer } from "interfaces/legacy/IL1ChugSplashProxy.sol";
 
 /// @custom:legacy true
 /// @title L1ChugSplashProxy
diff --git a/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol b/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol
index d215f29bdc7e..bdc81ad2839e 100644
--- a/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol
+++ b/packages/contracts-bedrock/src/legacy/LegacyMessagePasser.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @custom:legacy true
 /// @custom:proxied true
@@ -15,8 +15,8 @@ contract LegacyMessagePasser is ISemver {
     mapping(bytes32 => bool) public sentMessages;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.1.1-beta.2
-    string public constant version = "1.1.1-beta.2";
+    /// @custom:semver 1.1.1-beta.3
+    string public constant version = "1.1.1-beta.3";
 
     /// @notice Passes a message to L1.
     /// @param _message Message to pass to L1.
diff --git a/packages/contracts-bedrock/src/libraries/Constants.sol b/packages/contracts-bedrock/src/libraries/Constants.sol
index 6a99410b5bcf..6dcf3611956a 100644
--- a/packages/contracts-bedrock/src/libraries/Constants.sol
+++ b/packages/contracts-bedrock/src/libraries/Constants.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 // Interfaces
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 /// @title Constants
 /// @notice Constants is a library for storing constants. Simple! Don't put everything in here, just
diff --git a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol
index 7324e451c7dd..a3c79b3fc367 100644
--- a/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol
+++ b/packages/contracts-bedrock/src/periphery/drippie/dripchecks/CheckGelatoLow.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 // Interfaces
-import { IGelatoTreasury } from "src/vendor/interfaces/IGelatoTreasury.sol";
+import { IGelatoTreasury } from "interfaces/vendor/IGelatoTreasury.sol";
 import { IDripCheck } from "src/periphery/drippie/IDripCheck.sol";
 
 /// @title CheckGelatoLow
diff --git a/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol b/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol
index 673cf2a1efb6..a742c452ef0b 100644
--- a/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol
+++ b/packages/contracts-bedrock/src/safe/DeputyGuardianModule.sol
@@ -10,12 +10,12 @@ import { Unauthorized } from "src/libraries/PortalErrors.sol";
 import { GameType, Timestamp } from "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title DeputyGuardianModule
 /// @notice This module is intended to be enabled on the Security Council Safe, which will own the Guardian role in the
@@ -48,8 +48,8 @@ contract DeputyGuardianModule is ISemver {
     address internal immutable DEPUTY_GUARDIAN;
 
     /// @notice Semantic version.
-    /// @custom:semver 2.0.1-beta.4
-    string public constant version = "2.0.1-beta.4";
+    /// @custom:semver 2.0.1-beta.5
+    string public constant version = "2.0.1-beta.5";
 
     // Constructor to initialize the Safe and baseModule instances
     constructor(Safe _safe, ISuperchainConfig _superchainConfig, address _deputyGuardian) {
diff --git a/packages/contracts-bedrock/src/safe/LivenessGuard.sol b/packages/contracts-bedrock/src/safe/LivenessGuard.sol
index f5966a9e1469..46c0072f7ba4 100644
--- a/packages/contracts-bedrock/src/safe/LivenessGuard.sol
+++ b/packages/contracts-bedrock/src/safe/LivenessGuard.sol
@@ -11,7 +11,7 @@ import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableS
 import { SafeSigners } from "src/safe/SafeSigners.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title LivenessGuard
 /// @notice This Guard contract is used to track the liveness of Safe owners.
@@ -30,8 +30,8 @@ contract LivenessGuard is ISemver, BaseGuard {
     event OwnerRecorded(address owner);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.0.1-beta.3
-    string public constant version = "1.0.1-beta.3";
+    /// @custom:semver 1.0.1-beta.4
+    string public constant version = "1.0.1-beta.4";
 
     /// @notice The safe account for which this contract will be the guard.
     Safe internal immutable SAFE;
diff --git a/packages/contracts-bedrock/src/safe/LivenessModule.sol b/packages/contracts-bedrock/src/safe/LivenessModule.sol
index 50ab03d450c9..a033507176cc 100644
--- a/packages/contracts-bedrock/src/safe/LivenessModule.sol
+++ b/packages/contracts-bedrock/src/safe/LivenessModule.sol
@@ -10,7 +10,7 @@ import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
 import { LivenessGuard } from "src/safe/LivenessGuard.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title LivenessModule
 /// @notice This module is intended to be used in conjunction with the LivenessGuard. In the event
@@ -58,8 +58,8 @@ contract LivenessModule is ISemver {
     uint256 internal constant GUARD_STORAGE_SLOT = 0x4a204f620c8c5ccdca3fd54d003badd85ba500436a431f0cbda4f558c93c34c8;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.2.1-beta.2
-    string public constant version = "1.2.1-beta.2";
+    /// @custom:semver 1.2.1-beta.3
+    string public constant version = "1.2.1-beta.3";
 
     // Constructor to initialize the Safe and baseModule instances
     constructor(
diff --git a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
index 3c6d7fe816f6..c989da56c7b5 100644
--- a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
@@ -8,7 +8,7 @@ import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 
 // Interfaces
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 /// @title ERC721Bridge
 /// @notice ERC721Bridge is a base contract for the L1 and L2 ERC721 bridges.
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
index 0e25cd339384..62aaf45b2fc3 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
@@ -10,9 +10,9 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 // Interfaces
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
-import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IOptimismMintableERC20 } from "interfaces/universal/IOptimismMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
 
 /// @title OptimismMintableERC20
 /// @notice OptimismMintableERC20 is a standard extension of the base ERC20 token contract designed
@@ -47,8 +47,8 @@ contract OptimismMintableERC20 is ERC20Permit, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.0-beta.3
-    string public constant version = "1.4.0-beta.3";
+    /// @custom:semver 1.4.0-beta.4
+    string public constant version = "1.4.0-beta.4";
 
     /// @notice Getter function for the permit2 address. It deterministically deployed
     ///         so it will always be at the same address. It is also included as a preinstall,
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
index 4f4b01602cc6..62d2de8e7f3c 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
@@ -6,8 +6,8 @@ import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable
 import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IOptimismERC20Factory } from "interfaces/L2/IOptimismERC20Factory.sol";
 
 /// @custom:proxied true
 /// @custom:predeployed 0x4200000000000000000000000000000000000012
@@ -51,8 +51,8 @@ contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20F
     ///         the OptimismMintableERC20 token contract since this contract
     ///         is responsible for deploying OptimismMintableERC20 contracts.
     /// @notice Semantic version.
-    /// @custom:semver 1.10.1-beta.5
-    string public constant version = "1.10.1-beta.5";
+    /// @custom:semver 1.10.1-beta.6
+    string public constant version = "1.10.1-beta.6";
 
     /// @notice Constructs the OptimismMintableERC20Factory contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
index 140c6ce5e6d6..63d4eb29a140 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721.sol
@@ -9,8 +9,8 @@ import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
-import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
+import { IOptimismMintableERC721 } from "interfaces/universal/IOptimismMintableERC721.sol";
 
 /// @title OptimismMintableERC721
 /// @notice This contract is the remote representation for some token that lives on another network,
@@ -46,8 +46,8 @@ contract OptimismMintableERC721 is ERC721Enumerable, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.4
-    string public constant version = "1.3.1-beta.4";
+    /// @custom:semver 1.3.1-beta.5
+    string public constant version = "1.3.1-beta.5";
 
     /// @param _bridge        Address of the bridge on this network.
     /// @param _remoteChainId Chain ID where the remote token is deployed.
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
index da05e8f4f340..aa137378fccd 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC721Factory.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title OptimismMintableERC721Factory
 /// @notice Factory contract for creating OptimismMintableERC721 contracts.
@@ -28,8 +28,8 @@ contract OptimismMintableERC721Factory is ISemver {
     event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.1-beta.5
-    string public constant version = "1.4.1-beta.5";
+    /// @custom:semver 1.4.1-beta.6
+    string public constant version = "1.4.1-beta.6";
 
     /// @notice The semver MUST be bumped any time that there is a change in
     ///         the OptimismMintableERC721 token contract since this contract
diff --git a/packages/contracts-bedrock/src/universal/ProxyAdmin.sol b/packages/contracts-bedrock/src/universal/ProxyAdmin.sol
index dec119398c0f..9e7cd9082428 100644
--- a/packages/contracts-bedrock/src/universal/ProxyAdmin.sol
+++ b/packages/contracts-bedrock/src/universal/ProxyAdmin.sol
@@ -8,11 +8,11 @@ import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
-import { IStaticL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
-import { IStaticERC1967Proxy } from "src/universal/interfaces/IStaticERC1967Proxy.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
+import { IStaticL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
+import { IStaticERC1967Proxy } from "interfaces/universal/IStaticERC1967Proxy.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
 /// @title ProxyAdmin
 /// @notice This is an auxiliary contract meant to be assigned as the admin of an ERC1967 Proxy,
diff --git a/packages/contracts-bedrock/src/universal/StandardBridge.sol b/packages/contracts-bedrock/src/universal/StandardBridge.sol
index dceb2fd41471..ff01560ad1a8 100644
--- a/packages/contracts-bedrock/src/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/StandardBridge.sol
@@ -13,9 +13,9 @@ import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
-import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IOptimismMintableERC20 } from "interfaces/universal/IOptimismMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 /// @custom:upgradeable
 /// @title StandardBridge
diff --git a/packages/contracts-bedrock/src/universal/StorageSetter.sol b/packages/contracts-bedrock/src/universal/StorageSetter.sol
index e6e4b5df545c..9656ca21c5d2 100644
--- a/packages/contracts-bedrock/src/universal/StorageSetter.sol
+++ b/packages/contracts-bedrock/src/universal/StorageSetter.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Storage } from "src/libraries/Storage.sol";
 
 // Interfaces
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 
 /// @title StorageSetter
 /// @notice A simple contract that allows setting arbitrary storage slots.
@@ -19,8 +19,8 @@ contract StorageSetter is ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.2.1-beta.3
-    string public constant version = "1.2.1-beta.3";
+    /// @custom:semver 1.2.1-beta.4
+    string public constant version = "1.2.1-beta.4";
 
     /// @notice Stores a bytes32 `_value` at `_slot`. Any storage slots that
     ///         are packed should be set through this interface.
diff --git a/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol b/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
index 10a29679a251..4a9304935f5c 100644
--- a/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
+++ b/packages/contracts-bedrock/src/vendor/asterisc/RISCV.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IBigStepper } from "interfaces/dispute/IBigStepper.sol";
 
 /// @title RISCV
 /// @notice The RISCV contract emulates a single RISCV hart cycle statelessly, using memory proofs to verify the
diff --git a/packages/contracts-bedrock/src/vendor/eas/EAS.sol b/packages/contracts-bedrock/src/vendor/eas/EAS.sol
index 1cebdc819343..dd8840789d50 100644
--- a/packages/contracts-bedrock/src/vendor/eas/EAS.sol
+++ b/packages/contracts-bedrock/src/vendor/eas/EAS.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.19;
 
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { EIP1271Verifier } from "src/vendor/eas/eip1271/EIP1271Verifier.sol";
 import { ISchemaResolver } from "src/vendor/eas/resolver/ISchemaResolver.sol";
@@ -80,8 +80,8 @@ contract EAS is IEAS, ISemver, EIP1271Verifier {
     uint256[MAX_GAP - 3] private __gap;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.1-beta.1
-    string public constant version = "1.4.1-beta.1";
+    /// @custom:semver 1.4.1-beta.2
+    string public constant version = "1.4.1-beta.2";
 
     /// @dev Creates a new EAS instance.
     constructor() EIP1271Verifier("EAS", "1.3.0") { }
diff --git a/packages/contracts-bedrock/src/vendor/eas/SchemaRegistry.sol b/packages/contracts-bedrock/src/vendor/eas/SchemaRegistry.sol
index 1adca3d6c3e9..98f87c35b53c 100644
--- a/packages/contracts-bedrock/src/vendor/eas/SchemaRegistry.sol
+++ b/packages/contracts-bedrock/src/vendor/eas/SchemaRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import { ISemver } from "src/universal/interfaces/ISemver.sol";
+import { ISemver } from "interfaces/universal/ISemver.sol";
 import { ISchemaResolver } from "src/vendor/eas/resolver/ISchemaResolver.sol";
 import { EMPTY_UID, MAX_GAP } from "src/vendor/eas/Common.sol";
 import { ISchemaRegistry, SchemaRecord } from "src/vendor/eas/ISchemaRegistry.sol";
@@ -20,8 +20,8 @@ contract SchemaRegistry is ISchemaRegistry, ISemver {
     uint256[MAX_GAP - 1] private __gap;
 
     /// @notice Semantic version.
-    /// @custom:semver 1.3.1-beta.1
-    string public constant version = "1.3.1-beta.1";
+    /// @custom:semver 1.3.1-beta.2
+    string public constant version = "1.3.1-beta.2";
 
     /// @inheritdoc ISchemaRegistry
     function register(string calldata schema, ISchemaResolver resolver, bool revocable) external returns (bytes32) {
diff --git a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
index 921330060b3f..ab0ca82c61fd 100644
--- a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
+++ b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
@@ -6,7 +6,7 @@ import {
     ChallengeStatus,
     Challenge,
     CommitmentType
-} from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
+} from "interfaces/L1/IDataAvailabilityChallenge.sol";
 import { computeCommitmentKeccak256 } from "src/L1/DataAvailabilityChallenge.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
diff --git a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
index 22345d860e42..d7c5dc29b348 100644
--- a/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
@@ -13,10 +13,10 @@ import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 
 // Target contract dependencies
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
 
 contract L1CrossDomainMessenger_Test is CommonTest {
     /// @dev The receiver address
diff --git a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
index fd9d0d89b0f1..88913a76ba37 100644
--- a/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1ERC721Bridge.t.sol
@@ -11,10 +11,10 @@ import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IL2ERC721Bridge } from "interfaces/L2/IL2ERC721Bridge.sol";
 
 /// @dev Test ERC721 contract.
 contract TestERC721 is ERC721 {
diff --git a/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol b/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
index 97ef01262ab6..4cc1b8f35994 100644
--- a/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
@@ -14,10 +14,10 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 
 // Interfaces
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
 
 contract L1StandardBridge_Getter_Test is CommonTest {
     /// @dev Test that the accessors return the correct initialized values.
diff --git a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
index 5719d3fa558e..e4d53ddd9e78 100644
--- a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
+++ b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
@@ -15,7 +15,7 @@ import { Proxy } from "src/universal/Proxy.sol";
 
 // Target contract
 import { L2OutputOracle } from "src/L1/L2OutputOracle.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
 
 contract L2OutputOracle_TestBase is CommonTest {
     function setUp() public override {
diff --git a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
index e828b415621e..418eebd9e64b 100644
--- a/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
+++ b/packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
@@ -7,8 +7,8 @@ import { DeployOPChainInput } from "scripts/deploy/DeployOPChain.s.sol";
 import { DeployOPChain_TestBase } from "test/opcm/DeployOPChain.t.sol";
 
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 
 // Exposes internal functions for testing.
 contract OPContractsManager_Harness is OPContractsManager {
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index a0a49227e710..b575fdacff41 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -22,11 +22,11 @@ import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Interfaces
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
 contract OptimismPortal_Test is CommonTest {
     address depositor;
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index 44c1c8f9fd1a..830323936a60 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -23,12 +23,12 @@ import "src/dispute/lib/Types.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Interfaces
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
 contract OptimismPortal2_Test is CommonTest {
     address depositor;
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
index c39bf0ee0f7c..0c08cab3e2d1 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortalInterop.t.sol
@@ -10,8 +10,8 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Interfaces
-import { IL1BlockInterop, ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
-import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
+import { IL1BlockInterop, ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
+import { IOptimismPortalInterop } from "interfaces/L1/IOptimismPortalInterop.sol";
 
 contract OptimismPortalInterop_Test is CommonTest {
     /// @notice Marked virtual to be overridden in
diff --git a/packages/contracts-bedrock/test/L1/ProtocolVersions.t.sol b/packages/contracts-bedrock/test/L1/ProtocolVersions.t.sol
index fc6ea447d231..28d9ef2b0b83 100644
--- a/packages/contracts-bedrock/test/L1/ProtocolVersions.t.sol
+++ b/packages/contracts-bedrock/test/L1/ProtocolVersions.t.sol
@@ -6,8 +6,8 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Interfaces
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import { IProtocolVersions, ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
+import { IProtocolVersions, ProtocolVersion } from "interfaces/L1/IProtocolVersions.sol";
 
 contract ProtocolVersions_Init is CommonTest {
     event ConfigUpdate(uint256 indexed version, IProtocolVersions.UpdateType indexed updateType, bytes data);
diff --git a/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol b/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
index 8b262b55f2a8..d49aa2337bbf 100644
--- a/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
+++ b/packages/contracts-bedrock/test/L1/ResourceMetering.t.sol
@@ -11,7 +11,7 @@ import { ResourceMetering } from "src/L1/ResourceMetering.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 // Interfaces
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 
 contract MeterUser is ResourceMetering {
     ResourceMetering.ResourceConfig public innerConfig;
diff --git a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
index 2772ec0c2a3c..ed51e019acaf 100644
--- a/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SuperchainConfig.t.sol
@@ -4,10 +4,10 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Target contract dependencies
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
 // Target contract
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index ae025c10df9a..f7cea088bcf4 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -13,9 +13,9 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 
 // Interfaces
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 contract SystemConfig_Init is CommonTest {
     event ConfigUpdate(uint256 indexed version, ISystemConfig.UpdateType indexed updateType, bytes data);
diff --git a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
index e66f2e4d1ec8..8fd6daeed846 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfigInterop.t.sol
@@ -13,10 +13,10 @@ import { StaticConfig } from "src/libraries/StaticConfig.sol";
 import { GasPayingToken } from "src/libraries/GasPayingToken.sol";
 
 // Interfaces
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
-import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
-import { ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISystemConfigInterop } from "interfaces/L1/ISystemConfigInterop.sol";
+import { IOptimismPortalInterop } from "interfaces/L1/IOptimismPortalInterop.sol";
+import { ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
 contract SystemConfigInterop_Test is CommonTest {
     /// @notice Marked virtual to be overridden in
diff --git a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
index 25b6e711c1ec..100019034df6 100644
--- a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
@@ -20,7 +20,7 @@ import {
     NotDepositor,
     InteropStartAlreadySet
 } from "src/L2/CrossL2Inbox.sol";
-import { IL1BlockInterop } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { IL1BlockInterop } from "interfaces/L2/IL1BlockInterop.sol";
 
 /// @title CrossL2InboxWithModifiableTransientStorage
 /// @dev CrossL2Inbox contract with methods to modify the transient storage.
diff --git a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
index 01d3e6108f91..a5e086c86d58 100644
--- a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
@@ -10,7 +10,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import "src/libraries/L1BlockErrors.sol";
 
 // Interfaces
-import { IL1BlockInterop, ConfigType } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { IL1BlockInterop, ConfigType } from "interfaces/L2/IL1BlockInterop.sol";
 
 contract L1BlockInteropTest is CommonTest {
     event GasPayingTokenSet(address indexed token, uint8 indexed decimals, bytes32 name, bytes32 symbol);
diff --git a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
index f5ef2d635595..33b8e0bfb881 100644
--- a/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
@@ -14,8 +14,8 @@ import { Types } from "src/libraries/Types.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 
 // Interfaces
-import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
-import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
+import { IL2CrossDomainMessenger } from "interfaces/L2/IL2CrossDomainMessenger.sol";
+import { IL2ToL1MessagePasser } from "interfaces/L2/IL2ToL1MessagePasser.sol";
 
 contract L2CrossDomainMessenger_Test is CommonTest {
     /// @dev Receiver address for testing
diff --git a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
index b614711d101a..1fbb2cae0b88 100644
--- a/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ERC721Bridge.t.sol
@@ -9,8 +9,8 @@ import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { OptimismMintableERC721 } from "src/universal/OptimismMintableERC721.sol";
 
 // Interfaces
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IL2ERC721Bridge } from "interfaces/L2/IL2ERC721Bridge.sol";
 
 contract TestERC721 is ERC721 {
     constructor() ERC721("Test", "TST") { }
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
index fb68ce093187..f7b61083e249 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
@@ -16,10 +16,10 @@ import { Hashing } from "src/libraries/Hashing.sol";
 import { Types } from "src/libraries/Types.sol";
 
 // Interfaces
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
-import { IStandardBridge } from "src/universal/interfaces/IStandardBridge.sol";
-import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
-import { IL2StandardBridge } from "src/L2/interfaces/IL2StandardBridge.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
+import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
+import { IL2ToL1MessagePasser } from "interfaces/L2/IL2ToL1MessagePasser.sol";
+import { IL2StandardBridge } from "interfaces/L2/IL2StandardBridge.sol";
 
 contract L2StandardBridge_Test is CommonTest {
     using stdStorage for StdStorage;
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
index 30212d7ad622..a57c38a644d7 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
@@ -5,13 +5,13 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Interfaces
-import { IMintableAndBurnableERC20 } from "src/L2/interfaces/IMintableAndBurnableERC20.sol";
-import { IL2StandardBridgeInterop } from "src/L2/interfaces/IL2StandardBridgeInterop.sol";
+import { IMintableAndBurnableERC20 } from "interfaces/L2/IMintableAndBurnableERC20.sol";
+import { IL2StandardBridgeInterop } from "interfaces/L2/IL2StandardBridgeInterop.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
+import { IOptimismMintableERC20 } from "interfaces/universal/IOptimismMintableERC20.sol";
 import { ILegacyMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
-import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
+import { IOptimismERC20Factory } from "interfaces/L2/IOptimismERC20Factory.sol";
 
 contract L2StandardBridgeInterop_Test is CommonTest {
     /// @notice Emitted when a conversion is made.
diff --git a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
index fcfa375c1b53..3b4314853690 100644
--- a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
@@ -27,7 +27,7 @@ import {
 } from "src/L2/L2ToL2CrossDomainMessenger.sol";
 
 // Interfaces
-import { ICrossL2Inbox, Identifier } from "src/L2/interfaces/ICrossL2Inbox.sol";
+import { ICrossL2Inbox, Identifier } from "interfaces/L2/ICrossL2Inbox.sol";
 
 /// @title L2ToL2CrossDomainMessengerWithModifiableTransientStorage
 /// @dev L2ToL2CrossDomainMessenger contract with methods to modify the transient storage.
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
index d5b999a922e5..80ee2e620228 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20.t.sol
@@ -11,14 +11,14 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
 import { IERC165 } from "@openzeppelin/contracts-v5/utils/introspection/IERC165.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
+import { IERC7802 } from "interfaces/L2/IERC7802.sol";
 import { IBeacon } from "@openzeppelin/contracts-v5/proxy/beacon/IBeacon.sol";
 import { BeaconProxy } from "@openzeppelin/contracts-v5/proxy/beacon/BeaconProxy.sol";
 import { Unauthorized } from "src/libraries/errors/CommonErrors.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 // Target contract
-import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
+import { IOptimismSuperchainERC20 } from "interfaces/L2/IOptimismSuperchainERC20.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 /// @title OptimismSuperchainERC20Test
diff --git a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol
index d8d7f86f26a2..a2f7125fc218 100644
--- a/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol
+++ b/packages/contracts-bedrock/test/L2/OptimismSuperchainERC20Factory.t.sol
@@ -8,7 +8,7 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 import { CREATE3, Bytes32AddressLib } from "@rari-capital/solmate/src/utils/CREATE3.sol";
 
 // Target contract
-import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
+import { IOptimismSuperchainERC20 } from "interfaces/L2/IOptimismSuperchainERC20.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol";
 
 /// @title OptimismSuperchainERC20FactoryTest
diff --git a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
index 5eec3f811dec..d0ead497834a 100644
--- a/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
+++ b/packages/contracts-bedrock/test/L2/Preinstalls.t.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { Bytes } from "src/libraries/Bytes.sol";
-import { IEIP712 } from "src/universal/interfaces/IEIP712.sol";
+import { IEIP712 } from "interfaces/universal/IEIP712.sol";
 
 /// @title PreinstallsTest
 contract PreinstallsTest is CommonTest {
diff --git a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
index ca8c3806b38b..dc27fbbad9c9 100644
--- a/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/L2/SequencerFeeVault.t.sol
@@ -7,7 +7,7 @@ import { Reverter } from "test/mocks/Callers.sol";
 import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
 
 // Contracts
-import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
+import { ISequencerFeeVault } from "interfaces/L2/ISequencerFeeVault.sol";
 
 // Libraries
 import { Hashing } from "src/libraries/Hashing.sol";
diff --git a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
index 2afb4ba03d15..788792a4defd 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainERC20.t.sol
@@ -9,9 +9,9 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Target contract
 import { SuperchainERC20 } from "src/L2/SuperchainERC20.sol";
-import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+import { IERC7802, IERC165 } from "interfaces/L2/IERC7802.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
+import { ISuperchainERC20 } from "interfaces/L2/ISuperchainERC20.sol";
 import { MockSuperchainERC20Implementation } from "test/mocks/SuperchainERC20Implementation.sol";
 
 /// @title SuperchainERC20Test
diff --git a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
index 3c39e8b1792c..2a63961ce414 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainTokenBridge.t.sol
@@ -6,14 +6,14 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Libraries
 import { Predeploys } from "src/libraries/Predeploys.sol";
-import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
+import { IL2ToL2CrossDomainMessenger } from "interfaces/L2/IL2ToL2CrossDomainMessenger.sol";
 
 // Target contract
-import { ISuperchainTokenBridge } from "src/L2/interfaces/ISuperchainTokenBridge.sol";
-import { ISuperchainERC20 } from "src/L2/interfaces/ISuperchainERC20.sol";
-import { IOptimismSuperchainERC20Factory } from "src/L2/interfaces/IOptimismSuperchainERC20Factory.sol";
+import { ISuperchainTokenBridge } from "interfaces/L2/ISuperchainTokenBridge.sol";
+import { ISuperchainERC20 } from "interfaces/L2/ISuperchainERC20.sol";
+import { IOptimismSuperchainERC20Factory } from "interfaces/L2/IOptimismSuperchainERC20Factory.sol";
 import { IERC20 } from "@openzeppelin/contracts/interfaces/IERC20.sol";
-import { IERC7802 } from "src/L2/interfaces/IERC7802.sol";
+import { IERC7802 } from "interfaces/L2/IERC7802.sol";
 
 /// @title SuperchainTokenBridgeTest
 /// @notice Contract for testing the SuperchainTokenBridge contract.
diff --git a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
index 621acaa3aefd..bc59c76c116f 100644
--- a/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/L2/SuperchainWETH.t.sol
@@ -10,11 +10,11 @@ import { NotCustomGasToken, Unauthorized, ZeroAddress } from "src/libraries/erro
 import { Preinstalls } from "src/libraries/Preinstalls.sol";
 
 // Interfaces
-import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
-import { ISuperchainWETH } from "src/L2/interfaces/ISuperchainWETH.sol";
-import { IERC7802, IERC165 } from "src/L2/interfaces/IERC7802.sol";
+import { IETHLiquidity } from "interfaces/L2/IETHLiquidity.sol";
+import { ISuperchainWETH } from "interfaces/L2/ISuperchainWETH.sol";
+import { IERC7802, IERC165 } from "interfaces/L2/IERC7802.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
+import { IL2ToL2CrossDomainMessenger } from "interfaces/L2/IL2ToL2CrossDomainMessenger.sol";
 
 /// @title SuperchainWETH_Test
 /// @notice Contract for testing the SuperchainWETH contract.
diff --git a/packages/contracts-bedrock/test/actors/FaultDisputeActors.sol b/packages/contracts-bedrock/test/actors/FaultDisputeActors.sol
index 20f18eddc3c0..b2e7a1d64d18 100644
--- a/packages/contracts-bedrock/test/actors/FaultDisputeActors.sol
+++ b/packages/contracts-bedrock/test/actors/FaultDisputeActors.sol
@@ -8,7 +8,7 @@ import { CommonBase } from "forge-std/Base.sol";
 import "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 
 /// @title GameSolver
 /// @notice The `GameSolver` contract is a contract that can produce an array of available
diff --git a/packages/contracts-bedrock/test/cannon/MIPS.t.sol b/packages/contracts-bedrock/test/cannon/MIPS.t.sol
index 62100f31cfbe..aa9830981216 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS.t.sol
@@ -14,8 +14,8 @@ import { InvalidExitedValue, InvalidMemoryProof } from "src/cannon/libraries/Can
 import "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IMIPS } from "interfaces/cannon/IMIPS.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 contract MIPS_Test is CommonTest {
     IMIPS internal mips;
diff --git a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
index d38ab89ff556..07c5883c17bc 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
@@ -14,8 +14,8 @@ import { InvalidExitedValue, InvalidMemoryProof, InvalidSecondMemoryProof } from
 import "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { IMIPS2 } from "src/cannon/interfaces/IMIPS2.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IMIPS2 } from "interfaces/cannon/IMIPS2.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 contract ThreadStack {
     bytes32 internal constant EMPTY_THREAD_ROOT = hex"ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5";
diff --git a/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol b/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
index 6293f652e528..d6c7c520a5f1 100644
--- a/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
+++ b/packages/contracts-bedrock/test/cannon/PreimageOracle.t.sol
@@ -16,7 +16,7 @@ import "src/cannon/libraries/CannonErrors.sol";
 import "src/cannon/libraries/CannonTypes.sol";
 
 // Interfaces
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
 
 contract PreimageOracle_Test is Test {
     IPreimageOracle oracle;
diff --git a/packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol b/packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol
index b75809f1d798..f40a641994b0 100644
--- a/packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol
+++ b/packages/contracts-bedrock/test/dispute/DisputeGameFactory.t.sol
@@ -13,8 +13,8 @@ import "src/dispute/lib/Types.sol";
 import "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
 
 contract DisputeGameFactory_Init is CommonTest {
     FakeClone fakeClone;
diff --git a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
index df820bcb3cc1..50fde1fad4cd 100644
--- a/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/FaultDisputeGame.t.sol
@@ -24,11 +24,11 @@ import "src/dispute/lib/Types.sol";
 import "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IPreimageOracle } from "interfaces/dispute/IBigStepper.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
 
 contract FaultDisputeGame_Init is DisputeGameFactory_Init {
     /// @dev The type of the game being tested.
diff --git a/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol b/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
index 20c45bf44de1..8c74bee750a6 100644
--- a/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/dispute/PermissionedDisputeGame.t.sol
@@ -14,10 +14,10 @@ import "src/dispute/lib/Types.sol";
 import "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IPreimageOracle } from "interfaces/dispute/IBigStepper.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IPermissionedDisputeGame } from "interfaces/dispute/IPermissionedDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 
 contract PermissionedDisputeGame_Init is DisputeGameFactory_Init {
     /// @dev The type of the game being tested.
diff --git a/packages/contracts-bedrock/test/dispute/WETH98.t.sol b/packages/contracts-bedrock/test/dispute/WETH98.t.sol
index b26cd927f12c..f207248be19c 100644
--- a/packages/contracts-bedrock/test/dispute/WETH98.t.sol
+++ b/packages/contracts-bedrock/test/dispute/WETH98.t.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Contracts
-import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
+import { IWETH98 } from "interfaces/universal/IWETH98.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract WETH98_Test is Test {
diff --git a/packages/contracts-bedrock/test/governance/MintManager.t.sol b/packages/contracts-bedrock/test/governance/MintManager.t.sol
index c29e25602834..04255474d7a7 100644
--- a/packages/contracts-bedrock/test/governance/MintManager.t.sol
+++ b/packages/contracts-bedrock/test/governance/MintManager.t.sol
@@ -5,8 +5,8 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Interfaces
-import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
-import { IMintManager } from "src/governance/interfaces/IMintManager.sol";
+import { IGovernanceToken } from "interfaces/governance/IGovernanceToken.sol";
+import { IMintManager } from "interfaces/governance/IMintManager.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract MintManager_Initializer is CommonTest {
diff --git a/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol
index 3bf4ad3f7b3a..06df8d1ea076 100644
--- a/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { Vm } from "forge-std/Vm.sol";
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Constants } from "src/libraries/Constants.sol";
diff --git a/packages/contracts-bedrock/test/invariants/ETHLiquidity.t.sol b/packages/contracts-bedrock/test/invariants/ETHLiquidity.t.sol
index 8d1221a792c1..4d6746810731 100644
--- a/packages/contracts-bedrock/test/invariants/ETHLiquidity.t.sol
+++ b/packages/contracts-bedrock/test/invariants/ETHLiquidity.t.sol
@@ -10,7 +10,7 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
 
 // Interfaces
-import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
+import { IETHLiquidity } from "interfaces/L2/IETHLiquidity.sol";
 
 /// @title ETHLiquidity_User
 /// @notice Actor contract that interacts with the ETHLiquidity contract. Always pretends to be the
diff --git a/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol b/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol
index 94b46930ad49..705e21bd4cfc 100644
--- a/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/invariants/FaultDisputeGame.t.sol
@@ -11,7 +11,7 @@ import "src/dispute/lib/Types.sol";
 import "src/dispute/lib/Errors.sol";
 
 // Interfaces
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 
 contract FaultDisputeGame_Solvency_Invariant is FaultDisputeGame_Init {
     Claim internal constant ROOT_CLAIM = Claim.wrap(bytes32(uint256(10)));
diff --git a/packages/contracts-bedrock/test/invariants/L2OutputOracle.t.sol b/packages/contracts-bedrock/test/invariants/L2OutputOracle.t.sol
index d7d6914841cd..fce298d2ceba 100644
--- a/packages/contracts-bedrock/test/invariants/L2OutputOracle.t.sol
+++ b/packages/contracts-bedrock/test/invariants/L2OutputOracle.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { CommonTest } from "test/setup/CommonTest.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
 import { Vm } from "forge-std/Vm.sol";
 
 contract L2OutputOracle_Proposer {
diff --git a/packages/contracts-bedrock/test/invariants/OptimismPortal.t.sol b/packages/contracts-bedrock/test/invariants/OptimismPortal.t.sol
index ae754cd0e96b..42bf52e1de83 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/invariants/OptimismPortal.t.sol
@@ -4,9 +4,9 @@ pragma solidity 0.8.15;
 import { StdUtils } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
 import { ResourceMetering } from "src/L1/ResourceMetering.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 import { Constants } from "src/libraries/Constants.sol";
 
 import { CommonTest } from "test/setup/CommonTest.sol";
diff --git a/packages/contracts-bedrock/test/invariants/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/invariants/OptimismPortal2.t.sol
index 5e0e866dcfb1..0a870bc651f3 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/invariants/OptimismPortal2.t.sol
@@ -17,9 +17,9 @@ import "src/dispute/lib/Types.sol";
 import "src/libraries/PortalErrors.sol";
 
 // Interfaces
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
 
 contract OptimismPortal2_Depositor is StdUtils, ResourceMetering {
     Vm internal vm;
diff --git a/packages/contracts-bedrock/test/invariants/ResourceMetering.t.sol b/packages/contracts-bedrock/test/invariants/ResourceMetering.t.sol
index 4652f9b9e36e..49793f2adf14 100644
--- a/packages/contracts-bedrock/test/invariants/ResourceMetering.t.sol
+++ b/packages/contracts-bedrock/test/invariants/ResourceMetering.t.sol
@@ -8,7 +8,7 @@ import { StdInvariant } from "forge-std/StdInvariant.sol";
 
 import { Arithmetic } from "src/libraries/Arithmetic.sol";
 import { ResourceMetering } from "src/L1/ResourceMetering.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { InvariantTest } from "test/invariants/InvariantTest.sol";
 
diff --git a/packages/contracts-bedrock/test/invariants/SuperchainWETH.t.sol b/packages/contracts-bedrock/test/invariants/SuperchainWETH.t.sol
index 24ffc0a57963..bb6ee569da14 100644
--- a/packages/contracts-bedrock/test/invariants/SuperchainWETH.t.sol
+++ b/packages/contracts-bedrock/test/invariants/SuperchainWETH.t.sol
@@ -7,7 +7,7 @@ import { Vm } from "forge-std/Vm.sol";
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 // Interfaces
-import { ISuperchainWETH } from "src/L2/interfaces/ISuperchainWETH.sol";
+import { ISuperchainWETH } from "interfaces/L2/ISuperchainWETH.sol";
 
 /// @title SuperchainWETH_User
 /// @notice Actor contract that interacts with the SuperchainWETH contract.
diff --git a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
index 5b0b300abda0..68add058f60d 100644
--- a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 import { Constants } from "src/libraries/Constants.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
diff --git a/packages/contracts-bedrock/test/kontrol/README.md b/packages/contracts-bedrock/test/kontrol/README.md
index 9621160976e6..cf809eb65b48 100644
--- a/packages/contracts-bedrock/test/kontrol/README.md
+++ b/packages/contracts-bedrock/test/kontrol/README.md
@@ -121,8 +121,8 @@ Write your proof in a `.k.sol` file in the [`proofs`](./proofs/) folder, which i
 To reference the correct addresses for writing the tests, first import the signatures as in this example:
 
 ```solidity
-import { IOptimismPortal as OptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IOptimismPortal as OptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 ```
 
 Declare the correspondent variables and cast the correct signatures to the correct addresses:
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/L1CrossDomainMessenger.k.sol b/packages/contracts-bedrock/test/kontrol/proofs/L1CrossDomainMessenger.k.sol
index a04defe5d9ec..80adc430211f 100644
--- a/packages/contracts-bedrock/test/kontrol/proofs/L1CrossDomainMessenger.k.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/L1CrossDomainMessenger.k.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.13;
 
 import { DeploymentSummaryFaultProofs } from "./utils/DeploymentSummaryFaultProofs.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
-import { IL1CrossDomainMessenger as L1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IL1CrossDomainMessenger as L1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 
 contract L1CrossDomainMessengerKontrol is DeploymentSummaryFaultProofs, KontrolUtils {
     L1CrossDomainMessenger l1CrossDomainMessenger;
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol b/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol
index 5e45e3e3a9fd..6a86fbd637bf 100644
--- a/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/L1ERC721Bridge.k.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.13;
 
 import { DeploymentSummaryFaultProofs } from "./utils/DeploymentSummaryFaultProofs.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
-import { IL1ERC721Bridge as L1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ICrossDomainMessenger as CrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IL1ERC721Bridge as L1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ICrossDomainMessenger as CrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 contract L1ERC721BridgeKontrol is DeploymentSummaryFaultProofs, KontrolUtils {
     L1ERC721Bridge l1ERC721Bridge;
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol b/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol
index b5f8793426e6..d25e57ae288c 100644
--- a/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/L1StandardBridge.k.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.13;
 
 import { DeploymentSummaryFaultProofs } from "./utils/DeploymentSummaryFaultProofs.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
-import { IL1StandardBridge as L1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ICrossDomainMessenger as CrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { IL1StandardBridge as L1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
+import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ICrossDomainMessenger as CrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 contract L1StandardBridgeKontrol is DeploymentSummaryFaultProofs, KontrolUtils {
     L1StandardBridge l1standardBridge;
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal.k.sol b/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal.k.sol
index f0cf6cac7734..15bdc2b33dad 100644
--- a/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal.k.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal.k.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.13;
 import { DeploymentSummary } from "./utils/DeploymentSummary.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
 import { Types } from "src/libraries/Types.sol";
-import { IOptimismPortal as OptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IOptimismPortal as OptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import "src/libraries/PortalErrors.sol";
 
 contract OptimismPortalKontrol is DeploymentSummary, KontrolUtils {
diff --git a/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal2.k.sol b/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal2.k.sol
index d561b8b85092..1d16f1f99cb4 100644
--- a/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal2.k.sol
+++ b/packages/contracts-bedrock/test/kontrol/proofs/OptimismPortal2.k.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.13;
 import { DeploymentSummaryFaultProofs } from "./utils/DeploymentSummaryFaultProofs.sol";
 import { KontrolUtils } from "./utils/KontrolUtils.sol";
 import { Types } from "src/libraries/Types.sol";
-import { IOptimismPortal as OptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { ISuperchainConfig as SuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
+import { IOptimismPortal as OptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { ISuperchainConfig as SuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 import "src/libraries/PortalErrors.sol";
 
 contract OptimismPortal2Kontrol is DeploymentSummaryFaultProofs, KontrolUtils {
diff --git a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
index 6d0abaea8d2e..2a0f47920532 100644
--- a/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
+++ b/packages/contracts-bedrock/test/legacy/DeployerWhitelist.t.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Target contract
-import { IDeployerWhitelist } from "src/legacy/interfaces/IDeployerWhitelist.sol";
+import { IDeployerWhitelist } from "interfaces/legacy/IDeployerWhitelist.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeployerWhitelist_Test is Test {
diff --git a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
index 203605f3b1bb..2c9760270442 100644
--- a/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1BlockNumber.t.sol
@@ -9,8 +9,8 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Interfaces
-import { IL1BlockNumber } from "src/legacy/interfaces/IL1BlockNumber.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
+import { IL1BlockNumber } from "interfaces/legacy/IL1BlockNumber.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
 
 contract L1BlockNumberTest is Test {
     IL1Block lb;
diff --git a/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
index dcfab12cb600..28d9e58ed8a7 100644
--- a/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
@@ -6,7 +6,7 @@ import { Test } from "forge-std/Test.sol";
 import { VmSafe } from "forge-std/Vm.sol";
 
 // Target contract
-import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
+import { IL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract Owner {
diff --git a/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol b/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
index 061b6eee6c5f..07f43cf5a610 100644
--- a/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
+++ b/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 import { LegacyMintableERC20 } from "src/legacy/LegacyMintableERC20.sol";
-import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
 
 contract LegacyMintableERC20_Test is CommonTest {
     LegacyMintableERC20 legacyMintableERC20;
diff --git a/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol b/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
index 5b1f40d55bd8..19fbdec8f7c1 100644
--- a/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
+++ b/packages/contracts-bedrock/test/legacy/ResolvedDelegateProxy.t.sol
@@ -5,10 +5,10 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Target contract dependencies
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
 
 // Target contract
-import { IResolvedDelegateProxy } from "src/legacy/interfaces/IResolvedDelegateProxy.sol";
+import { IResolvedDelegateProxy } from "interfaces/legacy/IResolvedDelegateProxy.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract ResolvedDelegateProxy_Test is Test {
diff --git a/packages/contracts-bedrock/test/mocks/AlphabetVM.sol b/packages/contracts-bedrock/test/mocks/AlphabetVM.sol
index 6ecf74e22868..ae024e5b2a12 100644
--- a/packages/contracts-bedrock/test/mocks/AlphabetVM.sol
+++ b/packages/contracts-bedrock/test/mocks/AlphabetVM.sol
@@ -6,7 +6,7 @@ import { PreimageKeyLib } from "src/cannon/PreimageKeyLib.sol";
 import "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { IBigStepper, IPreimageOracle } from "src/dispute/interfaces/IBigStepper.sol";
+import { IBigStepper, IPreimageOracle } from "interfaces/dispute/IBigStepper.sol";
 
 /// @title AlphabetVM
 /// @dev A mock VM for the purpose of testing the dispute game infrastructure. Note that this only works
diff --git a/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol b/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
index d7cdc69f37e7..a23708e427ac 100644
--- a/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployAltDA.t.sol
@@ -4,9 +4,9 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 import { DeployAltDAInput, DeployAltDAOutput, DeployAltDA } from "scripts/deploy/DeployAltDA.s.sol";
-import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IDataAvailabilityChallenge } from "interfaces/L1/IDataAvailabilityChallenge.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeployAltDAInput_Test is Test {
diff --git a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
index 8d3feac2de0d..584aa59a9c2b 100644
--- a/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployImplementations.t.sol
@@ -4,22 +4,22 @@ pragma solidity 0.8.15;
 import { Test, stdStorage, StdStorage } from "forge-std/Test.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
-import { IMIPS } from "src/cannon/interfaces/IMIPS.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { IMIPS } from "interfaces/cannon/IMIPS.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
 
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
 import {
     DeployImplementationsInput,
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol
index 81bf44eb0bc7..959b9c7031f9 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPCM.t.sol
@@ -4,8 +4,8 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { DeployOPCM, DeployOPCMInput, DeployOPCMOutput } from "scripts/deploy/DeployOPCM.s.sol";
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 
 contract DeployOPCMInput_Test is Test {
     DeployOPCMInput dii;
diff --git a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
index 5280328168b9..5ac899579d65 100644
--- a/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeployOPChain.t.sol
@@ -13,19 +13,19 @@ import {
 import { DeployOPChainInput, DeployOPChain, DeployOPChainOutput } from "scripts/deploy/DeployOPChain.s.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
 
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IPermissionedDisputeGame } from "src/dispute/interfaces/IPermissionedDisputeGame.sol";
-import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
-import { IResolvedDelegateProxy } from "src/legacy/interfaces/IResolvedDelegateProxy.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IPermissionedDisputeGame } from "interfaces/dispute/IPermissionedDisputeGame.sol";
+import { IL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
+import { IResolvedDelegateProxy } from "interfaces/legacy/IResolvedDelegateProxy.sol";
 
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IProtocolVersions, ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IProtocolVersions, ProtocolVersion } from "interfaces/L1/IProtocolVersions.sol";
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 
 import { Claim, Duration, GameType, GameTypes, Hash, OutputRoot } from "src/dispute/lib/Types.sol";
 
diff --git a/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol b/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
index 924957cc1800..93c3c0c9344a 100644
--- a/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
+++ b/packages/contracts-bedrock/test/opcm/DeploySuperchain.t.sol
@@ -7,7 +7,7 @@ import { stdToml } from "forge-std/StdToml.sol";
 import { ProxyAdmin } from "src/universal/ProxyAdmin.sol";
 import { Proxy } from "src/universal/Proxy.sol";
 import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
-import { IProtocolVersions, ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
+import { IProtocolVersions, ProtocolVersion } from "interfaces/L1/IProtocolVersions.sol";
 import { DeploySuperchainInput, DeploySuperchain, DeploySuperchainOutput } from "scripts/deploy/DeploySuperchain.s.sol";
 
 contract DeploySuperchainInput_Test is Test {
diff --git a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
index 84abdbc48a82..21fad7bb547f 100644
--- a/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
+++ b/packages/contracts-bedrock/test/safe/DeputyGuardianModule.t.sol
@@ -8,15 +8,15 @@ import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
 import "test/safe-tools/SafeTestTools.sol";
 
 // Contracts
-import { IDeputyGuardianModule } from "src/safe/interfaces/IDeputyGuardianModule.sol";
+import { IDeputyGuardianModule } from "interfaces/safe/IDeputyGuardianModule.sol";
 
 // Libraries
 import "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
-import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IFaultDisputeGame } from "interfaces/dispute/IFaultDisputeGame.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract DeputyGuardianModule_TestInit is CommonTest, SafeTestTools {
@@ -294,8 +294,8 @@ contract DeputyGuardianModule_NoPortalCollisions_Test is DeputyGuardianModule_Te
         excludes[0] = "src/dispute/lib/*";
         excludes[1] = "src/L1/OptimismPortal2.sol";
         excludes[2] = "src/L1/OptimismPortalInterop.sol";
-        excludes[3] = "src/L1/interfaces/IOptimismPortal2.sol";
-        excludes[4] = "src/L1/interfaces/IOptimismPortalInterop.sol";
+        excludes[3] = "interfaces/L1/IOptimismPortal2.sol";
+        excludes[4] = "interfaces/L1/IOptimismPortalInterop.sol";
         Abi[] memory abis = ForgeArtifacts.getContractFunctionAbis("src/{L1,dispute,universal}", excludes);
         for (uint256 i; i < abis.length; i++) {
             for (uint256 j; j < abis[i].entries.length; j++) {
diff --git a/packages/contracts-bedrock/test/setup/Events.sol b/packages/contracts-bedrock/test/setup/Events.sol
index 966b236c30c8..7056f0cbdd6b 100644
--- a/packages/contracts-bedrock/test/setup/Events.sol
+++ b/packages/contracts-bedrock/test/setup/Events.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
 import "src/dispute/lib/Types.sol";
 
 import { Types } from "src/libraries/Types.sol";
diff --git a/packages/contracts-bedrock/test/setup/Setup.sol b/packages/contracts-bedrock/test/setup/Setup.sol
index ef2b654b2410..613dd067647c 100644
--- a/packages/contracts-bedrock/test/setup/Setup.sol
+++ b/packages/contracts-bedrock/test/setup/Setup.sol
@@ -17,38 +17,38 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
 
 // Interfaces
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
-import { IL2OutputOracle } from "src/L1/interfaces/IL2OutputOracle.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
-import { IL1StandardBridge } from "src/L1/interfaces/IL1StandardBridge.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
-import { IL1ERC721Bridge } from "src/L1/interfaces/IL1ERC721Bridge.sol";
-import { IOptimismMintableERC721Factory } from "src/universal/interfaces/IOptimismMintableERC721Factory.sol";
-import { IDisputeGameFactory } from "src/dispute/interfaces/IDisputeGameFactory.sol";
-import { IDelayedWETH } from "src/dispute/interfaces/IDelayedWETH.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
-import { IL2CrossDomainMessenger } from "src/L2/interfaces/IL2CrossDomainMessenger.sol";
-import { IL2StandardBridgeInterop } from "src/L2/interfaces/IL2StandardBridgeInterop.sol";
-import { IL2ToL1MessagePasser } from "src/L2/interfaces/IL2ToL1MessagePasser.sol";
-import { IL2ERC721Bridge } from "src/L2/interfaces/IL2ERC721Bridge.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IOptimismSuperchainERC20Factory } from "src/L2/interfaces/IOptimismSuperchainERC20Factory.sol";
-import { IBaseFeeVault } from "src/L2/interfaces/IBaseFeeVault.sol";
-import { ISequencerFeeVault } from "src/L2/interfaces/ISequencerFeeVault.sol";
-import { IL1FeeVault } from "src/L2/interfaces/IL1FeeVault.sol";
-import { IGasPriceOracle } from "src/L2/interfaces/IGasPriceOracle.sol";
-import { IL1Block } from "src/L2/interfaces/IL1Block.sol";
-import { ISuperchainWETH } from "src/L2/interfaces/ISuperchainWETH.sol";
-import { IETHLiquidity } from "src/L2/interfaces/IETHLiquidity.sol";
-import { IWETH98 } from "src/universal/interfaces/IWETH98.sol";
-import { IGovernanceToken } from "src/governance/interfaces/IGovernanceToken.sol";
-import { ILegacyMessagePasser } from "src/legacy/interfaces/ILegacyMessagePasser.sol";
-import { ISuperchainTokenBridge } from "src/L2/interfaces/ISuperchainTokenBridge.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
+import { IL2OutputOracle } from "interfaces/L1/IL2OutputOracle.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { IDataAvailabilityChallenge } from "interfaces/L1/IDataAvailabilityChallenge.sol";
+import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
+import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
+import { IOptimismMintableERC721Factory } from "interfaces/universal/IOptimismMintableERC721Factory.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
+import { IL2CrossDomainMessenger } from "interfaces/L2/IL2CrossDomainMessenger.sol";
+import { IL2StandardBridgeInterop } from "interfaces/L2/IL2StandardBridgeInterop.sol";
+import { IL2ToL1MessagePasser } from "interfaces/L2/IL2ToL1MessagePasser.sol";
+import { IL2ERC721Bridge } from "interfaces/L2/IL2ERC721Bridge.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IOptimismSuperchainERC20Factory } from "interfaces/L2/IOptimismSuperchainERC20Factory.sol";
+import { IBaseFeeVault } from "interfaces/L2/IBaseFeeVault.sol";
+import { ISequencerFeeVault } from "interfaces/L2/ISequencerFeeVault.sol";
+import { IL1FeeVault } from "interfaces/L2/IL1FeeVault.sol";
+import { IGasPriceOracle } from "interfaces/L2/IGasPriceOracle.sol";
+import { IL1Block } from "interfaces/L2/IL1Block.sol";
+import { ISuperchainWETH } from "interfaces/L2/ISuperchainWETH.sol";
+import { IETHLiquidity } from "interfaces/L2/IETHLiquidity.sol";
+import { IWETH98 } from "interfaces/universal/IWETH98.sol";
+import { IGovernanceToken } from "interfaces/governance/IGovernanceToken.sol";
+import { ILegacyMessagePasser } from "interfaces/legacy/ILegacyMessagePasser.sol";
+import { ISuperchainTokenBridge } from "interfaces/L2/ISuperchainTokenBridge.sol";
 
 /// @title Setup
 /// @dev This contact is responsible for setting up the contracts in state. It currently
diff --git a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
index fd0a9bfc7847..c27b493344b3 100644
--- a/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
+++ b/packages/contracts-bedrock/test/universal/BenchmarkTest.t.sol
@@ -9,11 +9,11 @@ import { CommonTest } from "test/setup/CommonTest.sol";
 // Libraries
 import { Types } from "src/libraries/Types.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
-import { IL1BlockInterop } from "src/L2/interfaces/IL1BlockInterop.sol";
+import { IL1BlockInterop } from "interfaces/L2/IL1BlockInterop.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 
 // Interfaces
-import { ICrossDomainMessenger } from "src/universal/interfaces/ICrossDomainMessenger.sol";
+import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 // Free function for setting the prevBaseFee param in the OptimismPortal.
diff --git a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
index 50398e4a8920..12cc2a8c53b2 100644
--- a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
@@ -10,7 +10,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
 import { Hashing } from "src/libraries/Hashing.sol";
 import { Encoding } from "src/libraries/Encoding.sol";
 
-import { IL1CrossDomainMessenger } from "src/L1/interfaces/IL1CrossDomainMessenger.sol";
+import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
 
 // CrossDomainMessenger_Test is for testing functionality which is common to both the L1 and L2
 // CrossDomainMessenger contracts. For simplicity, we use the L1 Messenger as the test contract.
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
index d56a97b19db3..4925c801885d 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.15;
 
 import { CommonTest } from "test/setup/CommonTest.sol";
-import { IOptimismMintableERC20 } from "src/universal/interfaces/IOptimismMintableERC20.sol";
-import { ILegacyMintableERC20 } from "src/universal/interfaces/ILegacyMintableERC20.sol";
+import { IOptimismMintableERC20 } from "interfaces/universal/IOptimismMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 contract OptimismMintableERC20_Test is CommonTest {
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
index 74df9e729e83..867c11b3884e 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20Factory.t.sol
@@ -11,8 +11,8 @@ import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
 import { OptimismMintableERC20Factory } from "src/universal/OptimismMintableERC20Factory.sol";
 
 // Interfaces
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import { IOptimismMintableERC20Factory } from "src/universal/interfaces/IOptimismMintableERC20Factory.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
+import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
 
 contract OptimismMintableTokenFactory_Test is CommonTest {
     event StandardL2TokenCreated(address indexed remoteToken, address indexed localToken);
diff --git a/packages/contracts-bedrock/test/universal/Proxy.t.sol b/packages/contracts-bedrock/test/universal/Proxy.t.sol
index 8c6aa7ae5137..437fabfe6714 100644
--- a/packages/contracts-bedrock/test/universal/Proxy.t.sol
+++ b/packages/contracts-bedrock/test/universal/Proxy.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
 contract SimpleStorage {
diff --git a/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol b/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
index 04e416cbd3a9..b1b6fa92a209 100644
--- a/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
+++ b/packages/contracts-bedrock/test/universal/ProxyAdmin.t.sol
@@ -6,11 +6,11 @@ import { Test } from "forge-std/Test.sol";
 import { SimpleStorage } from "test/universal/Proxy.t.sol";
 
 // Interfaces
-import { IAddressManager } from "src/legacy/interfaces/IAddressManager.sol";
-import { IL1ChugSplashProxy } from "src/legacy/interfaces/IL1ChugSplashProxy.sol";
-import { IResolvedDelegateProxy } from "src/legacy/interfaces/IResolvedDelegateProxy.sol";
-import { IProxy } from "src/universal/interfaces/IProxy.sol";
-import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol";
+import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
+import { IL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
+import { IResolvedDelegateProxy } from "interfaces/legacy/IResolvedDelegateProxy.sol";
+import { IProxy } from "interfaces/universal/IProxy.sol";
+import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
 
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index 49e35e835f36..d8c48849875d 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -12,13 +12,13 @@ import { ForgeArtifacts, Abi, AbiEntry } from "scripts/libraries/ForgeArtifacts.
 import { OPContractsManager } from "src/L1/OPContractsManager.sol";
 
 // Interfaces
-import { IOptimismPortal } from "src/L1/interfaces/IOptimismPortal.sol";
-import { IOptimismPortal2 } from "src/L1/interfaces/IOptimismPortal2.sol";
-import { IOptimismPortalInterop } from "src/L1/interfaces/IOptimismPortalInterop.sol";
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { ISystemConfigInterop } from "src/L1/interfaces/ISystemConfigInterop.sol";
-import { IDataAvailabilityChallenge } from "src/L1/interfaces/IDataAvailabilityChallenge.sol";
-import { IProtocolVersions } from "src/L1/interfaces/IProtocolVersions.sol";
+import { IOptimismPortal } from "interfaces/L1/IOptimismPortal.sol";
+import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
+import { IOptimismPortalInterop } from "interfaces/L1/IOptimismPortalInterop.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { ISystemConfigInterop } from "interfaces/L1/ISystemConfigInterop.sol";
+import { IDataAvailabilityChallenge } from "interfaces/L1/IDataAvailabilityChallenge.sol";
+import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
 
 /// @title Specification_Test
 /// @dev Specifies common security properties of entrypoints to L1 contracts, including authorization and
@@ -940,12 +940,12 @@ contract Specification_Test is CommonTest {
     /// @notice Ensures that there's an auth spec for every L1 contract function.
     function test_contractAuth_works() public {
         string[] memory pathExcludes = new string[](6);
-        pathExcludes[0] = "src/dispute/interfaces/*";
+        pathExcludes[0] = "interfaces/dispute/*";
         pathExcludes[1] = "src/dispute/lib/*";
         pathExcludes[2] = "src/safe/SafeSigners.sol";
-        pathExcludes[3] = "src/L1/interfaces/*";
-        pathExcludes[4] = "src/governance/interfaces/*";
-        pathExcludes[5] = "src/safe/interfaces/*";
+        pathExcludes[3] = "interfaces/L1/*";
+        pathExcludes[4] = "interfaces/governance/*";
+        pathExcludes[5] = "interfaces/safe/*";
         Abi[] memory abis = ForgeArtifacts.getContractFunctionAbis(
             "src/{L1,dispute,governance,safe,universal/ProxyAdmin.sol,universal/WETH98.sol}", pathExcludes
         );
diff --git a/packages/contracts-bedrock/test/vendor/Initializable.t.sol b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
index eb43ae187599..1f9fd946c51d 100644
--- a/packages/contracts-bedrock/test/vendor/Initializable.t.sol
+++ b/packages/contracts-bedrock/test/vendor/Initializable.t.sol
@@ -14,11 +14,11 @@ import { Constants } from "src/libraries/Constants.sol";
 import { GameType } from "src/dispute/lib/Types.sol";
 
 // Interfaces
-import { ISystemConfig } from "src/L1/interfaces/ISystemConfig.sol";
-import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol";
-import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol";
-import { ProtocolVersion } from "src/L1/interfaces/IProtocolVersions.sol";
-import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol";
+import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
+import { IResourceMetering } from "interfaces/L1/IResourceMetering.sol";
+import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
+import { ProtocolVersion } from "interfaces/L1/IProtocolVersions.sol";
+import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
 
 /// @title Initializer_Test
 /// @dev Ensures that the `initialize()` function on contracts cannot be called more than
diff --git a/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol b/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol
index 4b663d697ba6..51c2fce26678 100644
--- a/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol
+++ b/packages/contracts-bedrock/test/vendor/InitializableOZv5.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.25;
 
 import { Test } from "forge-std/Test.sol";
-import { IOptimismSuperchainERC20 } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
+import { IOptimismSuperchainERC20 } from "interfaces/L2/IOptimismSuperchainERC20.sol";
 import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 /// @title InitializerOZv5_Test

From 21827a2f3564d3cfb7a36f6005bd39e168fa6e44 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 4 Dec 2024 14:32:53 -0500
Subject: [PATCH 357/451] maint: update unused imports check to use new pattern
 (#13227)

Updates the unused imports contract check to use the new
framework that we recently merged.
---
 .../scripts/checks/unused-imports/main.go     | 118 ++++------------
 .../checks/unused-imports/main_test.go        | 131 ++++++++++++++++++
 2 files changed, 159 insertions(+), 90 deletions(-)
 create mode 100644 packages/contracts-bedrock/scripts/checks/unused-imports/main_test.go

diff --git a/packages/contracts-bedrock/scripts/checks/unused-imports/main.go b/packages/contracts-bedrock/scripts/checks/unused-imports/main.go
index ae4acb528b4d..df3ab4f4494d 100644
--- a/packages/contracts-bedrock/scripts/checks/unused-imports/main.go
+++ b/packages/contracts-bedrock/scripts/checks/unused-imports/main.go
@@ -2,101 +2,51 @@ package main
 
 import (
 	"bufio"
-	"errors"
 	"fmt"
 	"os"
-	"path/filepath"
 	"regexp"
-	"runtime"
 	"strings"
-	"sync"
-	"sync/atomic"
+
+	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/scripts/checks/common"
 )
 
 var importPattern = regexp.MustCompile(`import\s*{([^}]+)}`)
 var asPattern = regexp.MustCompile(`(\S+)\s+as\s+(\S+)`)
 
 func main() {
-	if err := run(); err != nil {
-		writeStderr("an error occurred: %v", err)
+	if err := common.ProcessFilesGlob(
+		[]string{"src/**/*.sol", "scripts/**/*.sol", "test/**/*.sol"},
+		[]string{},
+		processFile,
+	); err != nil {
+		fmt.Printf("error: %v\n", err)
 		os.Exit(1)
 	}
 }
 
-func writeStderr(msg string, args ...any) {
-	_, _ = fmt.Fprintf(os.Stderr, msg+"\n", args...)
-}
-
-func run() error {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return fmt.Errorf("failed to get current working directory: %w", err)
-	}
-
-	var hasErr atomic.Bool
-	var outMtx sync.Mutex
-	fail := func(msg string, args ...any) {
-		outMtx.Lock()
-		writeStderr("❌  "+msg, args...)
-		outMtx.Unlock()
-		hasErr.Store(true)
-	}
-
-	dirs := []string{"src", "scripts", "test"}
-	sem := make(chan struct{}, runtime.NumCPU())
-
-	for _, dir := range dirs {
-		dirPath := filepath.Join(cwd, dir)
-		if _, err := os.Stat(dirPath); errors.Is(err, os.ErrNotExist) {
-			continue
-		}
-
-		err := filepath.Walk(dirPath, func(path string, info os.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-			if !info.IsDir() && strings.HasSuffix(info.Name(), ".sol") {
-				sem <- struct{}{}
-				go func() {
-					defer func() { <-sem }()
-					processFile(path, fail)
-				}()
-			}
-			return nil
-		})
-
-		if err != nil {
-			return fmt.Errorf("failed to walk directory %s: %w", dir, err)
-		}
-	}
-
-	for i := 0; i < cap(sem); i++ {
-		sem <- struct{}{}
-	}
-
-	if hasErr.Load() {
-		return errors.New("unused imports check failed, see logs above")
-	}
-
-	return nil
-}
-
-func processFile(filePath string, fail func(string, ...any)) {
+func processFile(filePath string) []error {
 	content, err := os.ReadFile(filePath)
 	if err != nil {
-		fail("%s: failed to read file: %v", filePath, err)
-		return
+		return []error{fmt.Errorf("%s: failed to read file: %w", filePath, err)}
 	}
 
 	imports := findImports(string(content))
-	unusedImports := checkUnusedImports(imports, string(content))
+	var unusedImports []string
+	for _, imp := range imports {
+		if !isImportUsed(imp, string(content)) {
+			unusedImports = append(unusedImports, imp)
+		}
+	}
 
 	if len(unusedImports) > 0 {
-		fail("File: %s\nUnused imports:", filePath)
+		var errors []error
 		for _, unused := range unusedImports {
-			fail("  - %s", unused)
+			errors = append(errors, fmt.Errorf("%s", unused))
 		}
+		return errors
 	}
+
+	return nil
 }
 
 func findImports(content string) []string {
@@ -106,31 +56,19 @@ func findImports(content string) []string {
 		if len(match) > 1 {
 			importList := strings.Split(match[1], ",")
 			for _, imp := range importList {
-				imports = append(imports, strings.TrimSpace(imp))
+				imp = strings.TrimSpace(imp)
+				if asMatch := asPattern.FindStringSubmatch(imp); len(asMatch) > 2 {
+					// Use the renamed identifier (after 'as')
+					imports = append(imports, strings.TrimSpace(asMatch[2]))
+				} else {
+					imports = append(imports, imp)
+				}
 			}
 		}
 	}
 	return imports
 }
 
-func checkUnusedImports(imports []string, content string) []string {
-	var unusedImports []string
-	for _, imp := range imports {
-		searchTerm := imp
-		displayName := imp
-
-		if match := asPattern.FindStringSubmatch(imp); len(match) > 2 {
-			searchTerm = match[2]
-			displayName = fmt.Sprintf("%s as %s", match[1], match[2])
-		}
-
-		if !isImportUsed(searchTerm, content) {
-			unusedImports = append(unusedImports, displayName)
-		}
-	}
-	return unusedImports
-}
-
 func isImportUsed(imp, content string) bool {
 	scanner := bufio.NewScanner(strings.NewReader(content))
 	for scanner.Scan() {
diff --git a/packages/contracts-bedrock/scripts/checks/unused-imports/main_test.go b/packages/contracts-bedrock/scripts/checks/unused-imports/main_test.go
new file mode 100644
index 000000000000..7d03867a8a40
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/checks/unused-imports/main_test.go
@@ -0,0 +1,131 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_findImports(t *testing.T) {
+	tests := []struct {
+		name     string
+		content  string
+		expected []string
+	}{
+		{
+			name: "finds single named import",
+			content: `
+				pragma solidity ^0.8.0;
+				import { Contract } from "./Contract.sol";
+				contract Test {}
+			`,
+			expected: []string{"Contract"},
+		},
+		{
+			name: "finds multiple named imports",
+			content: `
+				pragma solidity ^0.8.0;
+				import { Contract1, Contract2 } from "./Contracts.sol";
+				contract Test {}
+			`,
+			expected: []string{"Contract1", "Contract2"},
+		},
+		{
+			name: "handles import with as keyword",
+			content: `
+				pragma solidity ^0.8.0;
+				import { Contract as Renamed } from "./Contract.sol";
+				contract Test {}
+			`,
+			expected: []string{"Renamed"},
+		},
+		{
+			name: "handles multiple imports with as keyword",
+			content: `
+				pragma solidity ^0.8.0;
+				import { Contract1 as C1, Contract2 as C2 } from "./Contracts.sol";
+				contract Test {}
+			`,
+			expected: []string{"C1", "C2"},
+		},
+		{
+			name: "ignores regular imports",
+			content: `
+				pragma solidity ^0.8.0;
+				import "./Contract.sol";
+				contract Test {}
+			`,
+			expected: nil,
+		},
+		{
+			name:     "empty content",
+			content:  "",
+			expected: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := findImports(tt.content)
+			require.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func Test_isImportUsed(t *testing.T) {
+	tests := []struct {
+		name         string
+		importedName string
+		content      string
+		expected     bool
+	}{
+		{
+			name:         "import used in contract",
+			importedName: "UsedContract",
+			content: `
+				contract Test {
+					UsedContract used;
+				}
+			`,
+			expected: true,
+		},
+		{
+			name:         "import used in inheritance",
+			importedName: "BaseContract",
+			content: `
+				contract Test is BaseContract {
+				}
+			`,
+			expected: true,
+		},
+		{
+			name:         "import used in function",
+			importedName: "Utility",
+			content: `
+				contract Test {
+					function test() {
+						Utility.doSomething();
+					}
+				}
+			`,
+			expected: true,
+		},
+		{
+			name:         "import not used",
+			importedName: "UnusedContract",
+			content: `
+				contract Test {
+					OtherContract other;
+				}
+			`,
+			expected: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := isImportUsed(tt.importedName, tt.content)
+			require.Equal(t, tt.expected, result)
+		})
+	}
+}

From da85e698c4d6999c673e6e80233b08b217d62e2d Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 4 Dec 2024 20:35:11 +0100
Subject: [PATCH 358/451] run forge coverage periodically (#13222)

* run forge coverage periodically

* run forge coverage periodically

* run forge coverage periodically

* fixes

* fixes

* run it every 4 hours

* run it every 4 hours
---
 .circleci/config.yml                    | 44 +++++++++++++++++--------
 packages/contracts-bedrock/foundry.toml | 14 ++++++++
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 719cad057663..561ad1f3fb51 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,6 +47,9 @@ parameters:
   stale_check_dispatch:
     type: boolean
     default: false
+  contracts_coverage_dispatch:
+    type: boolean
+    default: false
 
 orbs:
   go: circleci/go@1.8.0
@@ -290,10 +293,14 @@ jobs:
     machine: true
     resource_class: ethereum-optimism/latitude-1
     parameters:
-      skip_pattern:
-        description: Glob pattern of tests to skip
+      build_args:
+        description: Forge build arguments
         type: string
         default: ""
+      profile:
+        description: Profile to use for building
+        type: string
+        default: ci
     steps:
       - checkout
       - install-contracts-dependencies
@@ -306,9 +313,9 @@ jobs:
           working_directory: packages/contracts-bedrock
       - run:
           name: Build contracts
-          command: forge build --deny-warnings --skip <<parameters.skip_pattern>>
+          command: forge build <<parameters.build_args>>
           environment:
-            FOUNDRY_PROFILE: ci
+            FOUNDRY_PROFILE: <<parameters.profile>>
           working_directory: packages/contracts-bedrock
       - run:
           name: Generate allocs
@@ -608,11 +615,11 @@ jobs:
           command: just coverage-lcov
           no_output_timeout: 18m
           environment:
-            FOUNDRY_PROFILE: ci
+            FOUNDRY_PROFILE: cicoverage
           working_directory: packages/contracts-bedrock
       - codecov/upload:
           disable_search: true
-          files: ./packages/contracts-bedrock/coverage/lcov.info
+          files: ./packages/contracts-bedrock/lcov.info
           flags: contracts-bedrock-tests
 
   contracts-bedrock-tests:
@@ -1301,8 +1308,12 @@ workflows:
     jobs:
       - go-mod-download
       - contracts-bedrock-build:
+          name: contracts-bedrock-build
           # Build with just core + script contracts.
-          skip_pattern: test
+          build_args: --deny-warnings --skip test
+      - contracts-bedrock-build:
+          name: contracts-bedrock-build-coverage
+          profile: cicoverage
       - check-kontrol-build:
           requires:
             - contracts-bedrock-build
@@ -1323,10 +1334,6 @@ workflows:
           test_list: git diff origin/develop...HEAD --name-only --diff-filter=AM -- './test/**/*.t.sol' | sed 's|packages/contracts-bedrock/||'
           test_timeout: 1h
           test_profile: ciheavy
-      - contracts-bedrock-coverage:
-          filters:
-            branches:
-              ignore: /.*/
       - contracts-bedrock-checks:
           requires:
             - contracts-bedrock-build
@@ -1599,7 +1606,7 @@ workflows:
           context:
             - slack
       - contracts-bedrock-build:
-          skip_pattern: test
+          build_args: --deny-warnings --skip test
           context:
             - slack
       - go-tests:
@@ -1637,7 +1644,7 @@ workflows:
         - equal: [true, << pipeline.parameters.cannon_full_test_dispatch >>]
     jobs:
       - contracts-bedrock-build:
-          skip_pattern: test
+          build_args: --deny-warnings --skip test
       - cannon-go-lint-and-test:
           name: cannon-go-lint-and-test-<<matrix.mips_word_size>>-bit
           requires:
@@ -1648,6 +1655,17 @@ workflows:
             parameters:
               mips_word_size: [32, 64]
 
+  scheduled-forge-coverage:
+    when:
+      or:
+        - equal: [build_four_hours, <<pipeline.schedule.name>>]
+        - equal: [true, << pipeline.parameters.contracts_coverage_dispatch >>]
+    jobs:
+      - contracts-bedrock-build:
+          name: contracts-bedrock-build-coverage
+          profile: cicoverage
+      - contracts-bedrock-coverage
+
   scheduled-docker-publish:
     when:
       or:
diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 0e3d3fc3e9a9..b77e7bca4312 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -78,6 +78,20 @@ runs = 512
 runs = 256
 depth = 32
 
+################################################################
+#                     PROFILE: CICOVERAGE                      #
+################################################################
+
+[profile.cicoverage]
+optimizer = false
+
+[profile.cicoverage.fuzz]
+runs = 512
+
+[profile.cicoverage.invariant]
+runs = 256
+depth = 32
+
 ################################################################
 #                       PROFILE: CIHEAVY                       #
 ################################################################

From 531e3d9ffd47cb9810eb218633c5a2a9504c20aa Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 4 Dec 2024 12:56:50 -0700
Subject: [PATCH 359/451] op-deployer: Block deploying tags to chains without
 OPCM (#13231)

* op-deployer: Block deploying tags to chains without OPCM

* fix test
---
 .../deployer/integration_test/apply_test.go   |  9 ++---
 op-deployer/pkg/deployer/pipeline/init.go     | 35 ++++++-------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 98a5c89b8511..a6ae4dab3ad8 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -152,12 +152,10 @@ func TestEndToEndApply(t *testing.T) {
 
 	t.Run("chain with tagged artifacts", func(t *testing.T) {
 		intent, st := newIntent(t, l1ChainID, dk, l2ChainID1, loc, loc)
-		cg := ethClientCodeGetter(ctx, l1Client)
-
 		intent.L1ContractsLocator = artifacts.DefaultL1ContractsLocator
 		intent.L2ContractsLocator = artifacts.DefaultL2ContractsLocator
 
-		require.NoError(t, deployer.ApplyPipeline(
+		require.ErrorIs(t, deployer.ApplyPipeline(
 			ctx,
 			deployer.ApplyPipelineOpts{
 				L1RPCUrl:           rpcURL,
@@ -167,10 +165,7 @@ func TestEndToEndApply(t *testing.T) {
 				Logger:             lgr,
 				StateWriter:        pipeline.NoopStateWriter(),
 			},
-		))
-
-		validateSuperchainDeployment(t, st, cg)
-		validateOPChainDeployment(t, cg, st, intent)
+		), pipeline.ErrRefusingToDeployTaggedReleaseWithoutOPCM)
 	})
 }
 
diff --git a/op-deployer/pkg/deployer/pipeline/init.go b/op-deployer/pkg/deployer/pipeline/init.go
index f7be4eae03de..2b9f1cbd45fc 100644
--- a/op-deployer/pkg/deployer/pipeline/init.go
+++ b/op-deployer/pkg/deployer/pipeline/init.go
@@ -1,16 +1,14 @@
 package pipeline
 
 import (
-	"bufio"
 	"context"
 	"crypto/rand"
+	"errors"
 	"fmt"
 	"os"
 	"strings"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
-	"github.com/mattn/go-isatty"
-
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -18,6 +16,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+var ErrRefusingToDeployTaggedReleaseWithoutOPCM = errors.New("refusing to deploy tagged release without OPCM")
+
 func IsSupportedStateVersion(version int) bool {
 	return version == 1
 }
@@ -141,32 +141,17 @@ func displayWarning() error {
 ####################### WARNING! WARNING WARNING! #######################
 
 You are deploying a tagged release to a chain with no pre-deployed OPCM.
-The contracts you are deploying may not be audited, or match a governance
-approved release.
+Due to a quirk of our contract version system, this can lead to deploying
+contracts containing unaudited or untested code. As a result, this 
+functionality is currently disabled.
+
+We will fix this in an upcoming release.
 
-USE OF THIS DEPLOYMENT IS NOT RECOMMENDED FOR PRODUCTION. USE AT YOUR OWN
-RISK. BUGS OR LOSS OF FUNDS MAY OCCUR. WE HOPE YOU KNOW WHAT YOU ARE
-DOING.
+This process will now exit.
 
 ####################### WARNING! WARNING WARNING! #######################
 `, "\n")
 
 	_, _ = fmt.Fprint(os.Stderr, warning)
-
-	if isatty.IsTerminal(os.Stdout.Fd()) {
-		_, _ = fmt.Fprintf(os.Stderr, "Please confirm that you have read and understood the warning above [y/n]: ")
-
-		reader := bufio.NewReader(os.Stdin)
-		input, err := reader.ReadString('\n')
-		if err != nil {
-			return fmt.Errorf("failed to read input: %w", err)
-		}
-
-		input = strings.ToLower(strings.TrimSpace(input))
-		if input != "y" && input != "yes" {
-			return fmt.Errorf("aborted")
-		}
-	}
-
-	return nil
+	return ErrRefusingToDeployTaggedReleaseWithoutOPCM
 }

From 33889f547c6da12fc8a20ef3a9a51e1cc84be4ae Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 4 Dec 2024 13:07:26 -0700
Subject: [PATCH 360/451] ci: Run contract checks and tests on self-hosted
 infra (#13219)

* ci: Run contract checks and tests on self-hosted infra

* whoops

* submodule update with multiple jobs

* increase jobs

* comment
---
 .circleci/config.yml | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 561ad1f3fb51..8c9efc2c4815 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -123,7 +123,11 @@ commands:
     description: "Install the dependencies for the smart contracts"
     steps:
       - run:
-          command: just install
+          name: Install dependencies
+          command: |
+            # Manually craft the submodule update command in order to take advantage
+            # of the -j parameter, which speeds it up a lot.
+            git submodule update --init --recursive --force -j 8
           working_directory: packages/contracts-bedrock
 
   notify-failures-on-develop:
@@ -623,14 +627,9 @@ jobs:
           flags: contracts-bedrock-tests
 
   contracts-bedrock-tests:
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
-    resource_class: xlarge
+    machine: true
+    resource_class: ethereum-optimism/latitude-1
     parameters:
-      test_parallelism:
-        description: Number of test jobs to run in parallel
-        type: integer
-        default: 4
       test_list:
         description: List of test files to run
         type: string
@@ -654,7 +653,6 @@ jobs:
         description: Profile to use for testing
         type: string
         default: ci
-    parallelism: <<parameters.test_parallelism>>
     steps:
       - checkout
       - attach_workspace: { at: "." }
@@ -670,14 +668,6 @@ jobs:
           working_directory: packages/contracts-bedrock
       - check-changed:
           patterns: contracts-bedrock,op-node
-      - restore_cache:
-          name: Restore Go modules cache
-          key: gomod-{{ checksum "go.sum" }}
-      - restore_cache:
-          name: Restore Go build cache
-          keys:
-            - golang-build-cache-contracts-bedrock-tests-{{ checksum "go.sum" }}
-            - golang-build-cache-contracts-bedrock-tests-
       - run:
           name: Print dependencies
           command: just dep-status
@@ -725,17 +715,14 @@ jobs:
       - notify-failures-on-develop
 
   contracts-bedrock-checks:
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
-    resource_class: xlarge
+    machine: true
+    resource_class: ethereum-optimism/latitude-1
     steps:
       - checkout
       - attach_workspace: { at: "." }
       - install-contracts-dependencies
       - check-changed:
           patterns: contracts-bedrock,op-node
-      - setup_remote_docker:
-          docker_layer_caching: true
       - run:
           name: print forge version
           command: forge --version
@@ -1320,17 +1307,14 @@ workflows:
       - contracts-bedrock-tests:
           # Test everything except PreimageOracle.t.sol since it's slow.
           name: contracts-bedrock-tests
-          test_parallelism: 4
           test_list: find test -name "*.t.sol" -not -name "PreimageOracle.t.sol"
       - contracts-bedrock-tests:
           # PreimageOracle test is slow, run it separately to unblock CI.
           name: contracts-bedrock-tests-preimage-oracle
-          test_parallelism: 1
           test_list: find test -name "PreimageOracle.t.sol"
       - contracts-bedrock-tests:
           # Heavily fuzz any fuzz tests within added or modified test files.
           name: contracts-bedrock-tests-heavy-fuzz-modified
-          test_parallelism: 1
           test_list: git diff origin/develop...HEAD --name-only --diff-filter=AM -- './test/**/*.t.sol' | sed 's|packages/contracts-bedrock/||'
           test_timeout: 1h
           test_profile: ciheavy

From d68380f0c9e136e1531cd31848e541c4821c2ec6 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Wed, 4 Dec 2024 21:25:25 +0100
Subject: [PATCH 361/451] fix (#13237)

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c9efc2c4815..a646df4c88e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1641,13 +1641,13 @@ workflows:
 
   scheduled-forge-coverage:
     when:
-      or:
-        - equal: [build_four_hours, <<pipeline.schedule.name>>]
-        - equal: [true, << pipeline.parameters.contracts_coverage_dispatch >>]
+      and:
+        - or:
+            - equal: ["develop", <<pipeline.git.branch>>]
+            - equal: [true, <<pipeline.parameters.contracts_coverage_dispatch>>]
+        - not:
+            equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
-      - contracts-bedrock-build:
-          name: contracts-bedrock-build-coverage
-          profile: cicoverage
       - contracts-bedrock-coverage
 
   scheduled-docker-publish:

From d45a046d8538170f200bdf61cd33d60c918d93eb Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 4 Dec 2024 13:28:06 -0700
Subject: [PATCH 362/451] op-e2e: Add timeouts to sequencer failover tests
 (#13224)

* op-e2e: Add timeouts to sequencer failover tests

These can sometimes never return, which leads to tests timing out in CI. This PR adds timeouts so we can get feedback faster.

* avoid capturing parent t in subtest
---
 op-e2e/system/conductor/sequencer_failover_test.go | 10 +++++++---
 op-e2e/system/gastoken/gastoken_test.go            | 10 +++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/op-e2e/system/conductor/sequencer_failover_test.go b/op-e2e/system/conductor/sequencer_failover_test.go
index 5722dc3b82e9..9004b528fc58 100644
--- a/op-e2e/system/conductor/sequencer_failover_test.go
+++ b/op-e2e/system/conductor/sequencer_failover_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"sort"
 	"testing"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -28,7 +29,8 @@ func TestSequencerFailover_SetupCluster(t *testing.T) {
 // [Category: conductor rpc]
 // In this test, we test all rpcs exposed by conductor.
 func TestSequencerFailover_ConductorRPC(t *testing.T) {
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+	defer cancel()
 	sys, conductors, cleanup := setupSequencerFailoverTest(t)
 	defer cleanup()
 
@@ -176,7 +178,8 @@ func TestSequencerFailover_ActiveSequencerDown(t *testing.T) {
 	sys, conductors, cleanup := setupSequencerFailoverTest(t)
 	defer cleanup()
 
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+	defer cancel()
 	leaderId, leader := findLeader(t, conductors)
 	err := sys.RollupNodes[leaderId].Stop(ctx) // Stop the current leader sequencer
 	require.NoError(t, err)
@@ -205,7 +208,8 @@ func TestSequencerFailover_DisasterRecovery_OverrideLeader(t *testing.T) {
 	defer cleanup()
 
 	// randomly stop 2 nodes in the cluster to simulate a disaster.
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+	defer cancel()
 	err := conductors[Sequencer1Name].service.Stop(ctx)
 	require.NoError(t, err)
 	err = conductors[Sequencer2Name].service.Stop(ctx)
diff --git a/op-e2e/system/gastoken/gastoken_test.go b/op-e2e/system/gastoken/gastoken_test.go
index 7e03b19d3930..b5f3f56e2f6c 100644
--- a/op-e2e/system/gastoken/gastoken_test.go
+++ b/op-e2e/system/gastoken/gastoken_test.go
@@ -57,7 +57,7 @@ func testCustomGasToken(t *testing.T, allocType config.AllocType) {
 		uint8(18),
 	}
 
-	setup := func() gasTokenTestOpts {
+	setup := func(t *testing.T) gasTokenTestOpts {
 		cfg := e2esys.DefaultSystemConfig(t, e2esys.WithAllocType(allocType))
 		offset := hexutil.Uint64(0)
 		cfg.DeployConfig.L2GenesisRegolithTimeOffset = &offset
@@ -111,7 +111,7 @@ func testCustomGasToken(t *testing.T, allocType config.AllocType) {
 
 	t.Run("deposit", func(t *testing.T) {
 		op_e2e.InitParallel(t)
-		gto := setup()
+		gto := setup(t)
 		checkDeposit(t, gto, false)
 		setCustomGasToken(t, gto.cfg, gto.sys, gto.weth9Address)
 		checkDeposit(t, gto, true)
@@ -119,7 +119,7 @@ func testCustomGasToken(t *testing.T, allocType config.AllocType) {
 
 	t.Run("withdrawal", func(t *testing.T) {
 		op_e2e.InitParallel(t)
-		gto := setup()
+		gto := setup(t)
 		setCustomGasToken(t, gto.cfg, gto.sys, gto.weth9Address)
 		checkDeposit(t, gto, true)
 		checkWithdrawal(t, gto)
@@ -127,7 +127,7 @@ func testCustomGasToken(t *testing.T, allocType config.AllocType) {
 
 	t.Run("fee withdrawal", func(t *testing.T) {
 		op_e2e.InitParallel(t)
-		gto := setup()
+		gto := setup(t)
 		setCustomGasToken(t, gto.cfg, gto.sys, gto.weth9Address)
 		checkDeposit(t, gto, true)
 		checkFeeWithdrawal(t, gto, true)
@@ -135,7 +135,7 @@ func testCustomGasToken(t *testing.T, allocType config.AllocType) {
 
 	t.Run("token name and symbol", func(t *testing.T) {
 		op_e2e.InitParallel(t)
-		gto := setup()
+		gto := setup(t)
 		checkL1TokenNameAndSymbol(t, gto, gto.disabledExpectations)
 		checkL2TokenNameAndSymbol(t, gto, gto.disabledExpectations)
 		checkWETHTokenNameAndSymbol(t, gto, gto.disabledExpectations)

From d164b6d06d259655a36bb4560ac8d6bfe7ae389d Mon Sep 17 00:00:00 2001
From: refcell <abigger87@gmail.com>
Date: Wed, 4 Dec 2024 16:47:26 -0500
Subject: [PATCH 363/451] fix: bump kona-client version (#13242)

---
 docker-bake.hcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 3f59c4336409..64e22327629c 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -7,7 +7,7 @@ variable "REPOSITORY" {
 }
 
 variable "KONA_VERSION" {
-  default = "kona-client-v0.1.0-beta.4"
+  default = "kona-client-v0.1.0-beta.5"
 }
 
 variable "GIT_COMMIT" {

From 260f36e2b645c7e9120e6ce95a0ce10e0db12cba Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Wed, 4 Dec 2024 17:47:17 -0500
Subject: [PATCH 364/451] chore(op-deployer): Fork in asterisc + dispute game
 deployment jobs (#13229)

---
 .../pkg/deployer/bootstrap/asterisc.go        | 12 ++++
 .../pkg/deployer/bootstrap/delayed_weth.go    | 27 +++++++-
 .../pkg/deployer/bootstrap/dispute_game.go    | 69 ++++++++-----------
 3 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/op-deployer/pkg/deployer/bootstrap/asterisc.go b/op-deployer/pkg/deployer/bootstrap/asterisc.go
index bad2b5ebbb11..b091f8c4d6f3 100644
--- a/op-deployer/pkg/deployer/bootstrap/asterisc.go
+++ b/op-deployer/pkg/deployer/bootstrap/asterisc.go
@@ -162,6 +162,18 @@ func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
 
+	latest, err := l1Client.HeaderByNumber(ctx, nil)
+	if err != nil {
+		return fmt.Errorf("failed to get latest block: %w", err)
+	}
+
+	if _, err := l1Host.CreateSelectFork(
+		script.ForkWithURLOrAlias("main"),
+		script.ForkWithBlockNumberU256(latest.Number),
+	); err != nil {
+		return fmt.Errorf("failed to select fork: %w", err)
+	}
+
 	dgo, err := opcm.DeployAsterisc(
 		l1Host,
 		opcm.DeployAsteriscInput{
diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index 67b1b66760a8..1209043d31d7 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -7,6 +7,8 @@ import (
 	"math/big"
 	"strings"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
 	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
@@ -26,6 +28,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/urfave/cli/v2"
 )
 
@@ -158,9 +161,9 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		return fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
-	nonce, err := l1Client.NonceAt(ctx, chainDeployer, nil)
+	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to get starting nonce: %w", err)
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	host, err := env.DefaultScriptHost(
@@ -168,11 +171,29 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		lgr,
 		chainDeployer,
 		artifactsFS,
+		script.WithForkHook(func(cfg *script.ForkConfig) (forking.ForkSource, error) {
+			src, err := forking.RPCSourceByNumber(cfg.URLOrAlias, l1RPC, *cfg.BlockNumber)
+			if err != nil {
+				return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
+			}
+			return forking.Cache(src), nil
+		}),
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
-	host.SetNonce(chainDeployer, nonce)
+
+	latest, err := l1Client.HeaderByNumber(ctx, nil)
+	if err != nil {
+		return fmt.Errorf("failed to get latest block: %w", err)
+	}
+
+	if _, err := host.CreateSelectFork(
+		script.ForkWithURLOrAlias("main"),
+		script.ForkWithBlockNumberU256(latest.Number),
+	); err != nil {
+		return fmt.Errorf("failed to select fork: %w", err)
+	}
 
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
index f33f51060534..441fd73d9ea2 100644
--- a/op-deployer/pkg/deployer/bootstrap/dispute_game.go
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
 	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
-	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/snapshots"
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 
@@ -149,6 +149,10 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 	if err != nil {
 		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
+	l1Rpc, err := rpc.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
 
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
@@ -175,21 +179,34 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		return fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
-	nonce, err := l1Client.NonceAt(ctx, chainDeployer, nil)
-	if err != nil {
-		return fmt.Errorf("failed to get starting nonce: %w", err)
-	}
-
 	host, err := env.DefaultScriptHost(
 		bcaster,
 		lgr,
 		chainDeployer,
 		artifactsFS,
+		script.WithForkHook(func(forkCfg *script.ForkConfig) (forking.ForkSource, error) {
+			src, err := forking.RPCSourceByNumber(forkCfg.URLOrAlias, l1Rpc, *forkCfg.BlockNumber)
+			if err != nil {
+				return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
+			}
+			return forking.Cache(src), nil
+		}),
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create script host: %w", err)
+		return fmt.Errorf("failed to create L1 script host: %w", err)
+	}
+
+	latest, err := l1Client.HeaderByNumber(ctx, nil)
+	if err != nil {
+		return fmt.Errorf("failed to get latest block: %w", err)
+	}
+
+	if _, err := host.CreateSelectFork(
+		script.ForkWithURLOrAlias("main"),
+		script.ForkWithBlockNumberU256(latest.Number),
+	); err != nil {
+		return fmt.Errorf("failed to select fork: %w", err)
 	}
-	host.SetNonce(chainDeployer, nonce)
 
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
@@ -198,27 +215,7 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		release = "dev"
 	}
 
-	// We need to etch the VM and PreimageOracle addresses so that they have nonzero code
-	// and the checks in the FaultDisputeGame constructor pass.
-	oracleAddr, err := loadOracleAddr(ctx, l1Client, cfg.Vm)
-	if err != nil {
-		return err
-	}
-	addresses := []common.Address{
-		cfg.Vm,
-		oracleAddr,
-	}
-	for _, addr := range addresses {
-		code, err := l1Client.CodeAt(ctx, addr, nil)
-		if err != nil {
-			return fmt.Errorf("failed to get code for %v: %w", addr, err)
-		}
-		host.ImportAccount(addr, types.Account{
-			Code: code,
-		})
-	}
 	lgr.Info("deploying dispute game", "release", release)
-
 	dgo, err := opcm.DeployDisputeGame(
 		host,
 		opcm.DeployDisputeGameInput{
@@ -254,15 +251,3 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 	}
 	return nil
 }
-
-func loadOracleAddr(ctx context.Context, l1Client *ethclient.Client, vmAddr common.Address) (common.Address, error) {
-	callData, err := snapshots.LoadMIPSABI().Pack("oracle")
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to create vm.oracle() calldata: %w", err)
-	}
-	result, err := l1Client.CallContract(ctx, ethereum.CallMsg{Data: callData, To: &vmAddr}, nil)
-	if err != nil {
-		return common.Address{}, fmt.Errorf("failed to call vm.oracle(): %w", err)
-	}
-	return common.BytesToAddress(result), nil
-}

From b5bc9892fcf0e622bba184becd08cc226fd0d840 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:15:49 -0700
Subject: [PATCH 365/451] dependabot(gomod): bump golang.org/x/sync from 0.9.0
 to 0.10.0 (#13233)

Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.9.0 to 0.10.0.
- [Commits](https://github.com/golang/sync/compare/v0.9.0...v0.10.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 94f571c65b66..20f71beb5364 100644
--- a/go.mod
+++ b/go.mod
@@ -49,7 +49,7 @@ require (
 	github.com/urfave/cli/v2 v2.27.5
 	golang.org/x/crypto v0.28.0
 	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
-	golang.org/x/sync v0.9.0
+	golang.org/x/sync v0.10.0
 	golang.org/x/term v0.25.0
 	golang.org/x/time v0.7.0
 )
diff --git a/go.sum b/go.sum
index 49bc0c62eb11..839780fc6f35 100644
--- a/go.sum
+++ b/go.sum
@@ -930,8 +930,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

From e4713361124a8f7955cd48ff313ca44eabc0a451 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:16:14 -0700
Subject: [PATCH 366/451] dependabot(gomod): bump
 github.com/kurtosis-tech/kurtosis/api/golang (#13234)

Bumps [github.com/kurtosis-tech/kurtosis/api/golang](https://github.com/kurtosis-tech/kurtosis) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/kurtosis-tech/kurtosis/releases)
- [Changelog](https://github.com/kurtosis-tech/kurtosis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kurtosis-tech/kurtosis/compare/1.4.2...1.4.3)

---
updated-dependencies:
- dependency-name: github.com/kurtosis-tech/kurtosis/api/golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 20f71beb5364..e3b57ace633c 100644
--- a/go.mod
+++ b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/klauspost/compress v1.17.11
-	github.com/kurtosis-tech/kurtosis/api/golang v1.4.2
+	github.com/kurtosis-tech/kurtosis/api/golang v1.4.3
 	github.com/libp2p/go-libp2p v0.36.2
 	github.com/libp2p/go-libp2p-mplex v0.9.0
 	github.com/libp2p/go-libp2p-pubsub v0.12.0
diff --git a/go.sum b/go.sum
index 839780fc6f35..bcae4d056f09 100644
--- a/go.sum
+++ b/go.sum
@@ -442,8 +442,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2 h1:izciXrFyFR+ihJ7nLTOkoIX5GzBPIp8gVKlw94gIc98=
 github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2/go.mod h1:bWSMQK3WHVTGHX9CjxPAb/LtzcmfOxID2wdzakSWQxo=
-github.com/kurtosis-tech/kurtosis/api/golang v1.4.2 h1:x9jpXBGuLTWuILVUZWZtgDYY9amhyhzRVHxDFlYEJB4=
-github.com/kurtosis-tech/kurtosis/api/golang v1.4.2/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.3 h1:CkrfwpBAOQ9TOCUrVWSv5C7d3hLBNjU4kAYSbL6EHf0=
+github.com/kurtosis-tech/kurtosis/api/golang v1.4.3/go.mod h1:9T22P7Vv3j5g6sbm78DxHQ4s9C4Cj3s9JjFQ7DFyYpM=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b h1:hMoIM99QKcYQqsnK4AF7Lovi9ZD9ac6lZLZ5D/jx2x8=
 github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b/go.mod h1:4pFdrRwDz5R+Fov2ZuTaPhAVgjA2jhGh1Izf832sX7A=
 github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc h1:7IlEpSehmWcNXOFpNP24Cu5HQI3af7GCBQw//m+LnvQ=

From e253b19db381db203865fb2f76aa454ab014d50c Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 4 Dec 2024 18:18:31 -0500
Subject: [PATCH 367/451] maint: rewrite spacers check to use new framework
 (#13232)

Updates the spacers check to use the new framework for contracts
checks written in Go. Adds tests for the functions that this
check uses.
---
 .../scripts/checks/spacers/main.go            | 184 +++++++-----------
 .../scripts/checks/spacers/main_test.go       | 167 ++++++++++++++++
 2 files changed, 233 insertions(+), 118 deletions(-)
 create mode 100644 packages/contracts-bedrock/scripts/checks/spacers/main_test.go

diff --git a/packages/contracts-bedrock/scripts/checks/spacers/main.go b/packages/contracts-bedrock/scripts/checks/spacers/main.go
index 3360bda74d39..daf617defb93 100644
--- a/packages/contracts-bedrock/scripts/checks/spacers/main.go
+++ b/packages/contracts-bedrock/scripts/checks/spacers/main.go
@@ -1,175 +1,123 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
-	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
-)
-
-// directoryPath is the path to the artifacts directory.
-// It can be configured as the first argument to the script or
-// defaults to the forge-artifacts directory.
-var directoryPath string
-
-func init() {
-	if len(os.Args) > 1 {
-		directoryPath = os.Args[1]
-	} else {
-		currentDir, _ := os.Getwd()
-		directoryPath = filepath.Join(currentDir, "forge-artifacts")
-	}
-}
-
-// skipped returns true if the contract should be skipped when inspecting its storage layout.
-func skipped(contractName string) bool {
-	return strings.Contains(contractName, "CrossDomainMessengerLegacySpacer")
-}
-
-// variableInfo represents the parsed variable information.
-type variableInfo struct {
-	name   string
-	slot   int
-	offset int
-	length int
-}
 
-// parseVariableInfo parses out variable info from the variable structure in standard compiler json output.
-func parseVariableInfo(variable map[string]interface{}) (variableInfo, error) {
-	var info variableInfo
-	var err error
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
+	"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/scripts/checks/common"
+)
 
-	info.name = variable["label"].(string)
-	info.slot, err = strconv.Atoi(variable["slot"].(string))
-	if err != nil {
-		return info, err
+func parseVariableLength(variableType string, types map[string]solc.StorageLayoutType) (int, error) {
+	if t, exists := types[variableType]; exists {
+		return int(t.NumberOfBytes), nil
 	}
-	info.offset = int(variable["offset"].(float64))
 
-	variableType := variable["type"].(string)
 	if strings.HasPrefix(variableType, "t_mapping") {
-		info.length = 32
+		return 32, nil
 	} else if strings.HasPrefix(variableType, "t_uint") {
 		re := regexp.MustCompile(`uint(\d+)`)
 		matches := re.FindStringSubmatch(variableType)
 		if len(matches) > 1 {
 			bitSize, _ := strconv.Atoi(matches[1])
-			info.length = bitSize / 8
+			return bitSize / 8, nil
 		}
 	} else if strings.HasPrefix(variableType, "t_bytes_") {
-		info.length = 32
+		return 32, nil
 	} else if strings.HasPrefix(variableType, "t_bytes") {
 		re := regexp.MustCompile(`bytes(\d+)`)
 		matches := re.FindStringSubmatch(variableType)
 		if len(matches) > 1 {
-			info.length, _ = strconv.Atoi(matches[1])
+			return strconv.Atoi(matches[1])
 		}
 	} else if strings.HasPrefix(variableType, "t_address") {
-		info.length = 20
+		return 20, nil
 	} else if strings.HasPrefix(variableType, "t_bool") {
-		info.length = 1
+		return 1, nil
 	} else if strings.HasPrefix(variableType, "t_array") {
 		re := regexp.MustCompile(`^t_array\((\w+)\)(\d+)`)
 		matches := re.FindStringSubmatch(variableType)
 		if len(matches) > 2 {
 			innerType := matches[1]
 			size, _ := strconv.Atoi(matches[2])
-			innerInfo, err := parseVariableInfo(map[string]interface{}{
-				"label":  variable["label"],
-				"offset": variable["offset"],
-				"slot":   variable["slot"],
-				"type":   innerType,
-			})
+			length, err := parseVariableLength(innerType, types)
 			if err != nil {
-				return info, err
+				return 0, err
 			}
-			info.length = innerInfo.length * size
+			return length * size, nil
 		}
-	} else {
-		return info, fmt.Errorf("%s: unsupported type %s, add it to the script", info.name, variableType)
 	}
 
-	return info, nil
+	return 0, fmt.Errorf("unsupported type %s, add it to the script", variableType)
 }
 
-func main() {
-	err := filepath.Walk(directoryPath, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if info.IsDir() || strings.Contains(path, "t.sol") {
-			return nil
-		}
-
-		raw, err := os.ReadFile(path)
-		if err != nil {
-			return err
-		}
-
-		var artifact map[string]interface{}
-		err = json.Unmarshal(raw, &artifact)
-		if err != nil {
-			return err
-		}
-
-		storageLayout, ok := artifact["storageLayout"].(map[string]interface{})
-		if !ok {
-			return nil
-		}
+func validateSpacer(variable solc.StorageLayoutEntry, types map[string]solc.StorageLayoutType) []error {
+	var errors []error
 
-		storage, ok := storageLayout["storage"].([]interface{})
-		if !ok {
-			return nil
-		}
+	parts := strings.Split(variable.Label, "_")
+	if len(parts) != 4 {
+		return []error{fmt.Errorf("invalid spacer name format: %s", variable.Label)}
+	}
 
-		for _, v := range storage {
-			variable := v.(map[string]interface{})
-			fqn := variable["contract"].(string)
+	expectedSlot, _ := strconv.Atoi(parts[1])
+	expectedOffset, _ := strconv.Atoi(parts[2])
+	expectedLength, _ := strconv.Atoi(parts[3])
 
-			if skipped(fqn) {
-				continue
-			}
+	actualLength, err := parseVariableLength(variable.Type, types)
+	if err != nil {
+		return []error{err}
+	}
 
-			label := variable["label"].(string)
-			if strings.HasPrefix(label, "spacer_") {
-				parts := strings.Split(label, "_")
-				if len(parts) != 4 {
-					return fmt.Errorf("invalid spacer name format: %s", label)
-				}
+	if int(variable.Slot) != expectedSlot {
+		errors = append(errors, fmt.Errorf("%s %s is in slot %d but should be in %d",
+			variable.Contract, variable.Label, variable.Slot, expectedSlot))
+	}
 
-				slot, _ := strconv.Atoi(parts[1])
-				offset, _ := strconv.Atoi(parts[2])
-				length, _ := strconv.Atoi(parts[3])
+	if int(variable.Offset) != expectedOffset {
+		errors = append(errors, fmt.Errorf("%s %s is at offset %d but should be at %d",
+			variable.Contract, variable.Label, variable.Offset, expectedOffset))
+	}
 
-				variableInfo, err := parseVariableInfo(variable)
-				if err != nil {
-					return err
-				}
+	if actualLength != expectedLength {
+		errors = append(errors, fmt.Errorf("%s %s is %d bytes long but should be %d",
+			variable.Contract, variable.Label, actualLength, expectedLength))
+	}
 
-				if slot != variableInfo.slot {
-					return fmt.Errorf("%s %s is in slot %d but should be in %d", fqn, label, variableInfo.slot, slot)
-				}
+	return errors
+}
 
-				if offset != variableInfo.offset {
-					return fmt.Errorf("%s %s is at offset %d but should be at %d", fqn, label, variableInfo.offset, offset)
-				}
+func processFile(path string) []error {
+	artifact, err := common.ReadForgeArtifact(path)
+	if err != nil {
+		return []error{err}
+	}
 
-				if length != variableInfo.length {
-					return fmt.Errorf("%s %s is %d bytes long but should be %d", fqn, label, variableInfo.length, length)
-				}
+	if artifact.StorageLayout == nil {
+		return nil
+	}
 
-				fmt.Printf("%s.%s is valid\n", fqn, label)
+	var errors []error
+	for _, variable := range artifact.StorageLayout.Storage {
+		if strings.HasPrefix(variable.Label, "spacer_") {
+			if errs := validateSpacer(variable, artifact.StorageLayout.Types); len(errs) > 0 {
+				errors = append(errors, errs...)
+				continue
 			}
 		}
+	}
 
-		return nil
-	})
+	return errors
+}
 
-	if err != nil {
+func main() {
+	if err := common.ProcessFilesGlob(
+		[]string{"forge-artifacts/**/*.json"},
+		[]string{"forge-artifacts/**/CrossDomainMessengerLegacySpacer{0,1}.json"},
+		processFile,
+	); err != nil {
 		fmt.Printf("Error: %v\n", err)
 		os.Exit(1)
 	}
diff --git a/packages/contracts-bedrock/scripts/checks/spacers/main_test.go b/packages/contracts-bedrock/scripts/checks/spacers/main_test.go
new file mode 100644
index 000000000000..7548fa80d031
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/checks/spacers/main_test.go
@@ -0,0 +1,167 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/solc"
+	"github.com/stretchr/testify/require"
+)
+
+func Test_parseVariableLength(t *testing.T) {
+	tests := []struct {
+		name         string
+		variableType string
+		types        map[string]solc.StorageLayoutType
+		expected     int
+		expectError  bool
+	}{
+		{
+			name:         "uses type from map",
+			variableType: "t_custom",
+			types: map[string]solc.StorageLayoutType{
+				"t_custom": {NumberOfBytes: 16},
+			},
+			expected: 16,
+		},
+		{
+			name:         "mapping type",
+			variableType: "t_mapping(address,uint256)",
+			expected:     32,
+		},
+		{
+			name:         "uint type",
+			variableType: "t_uint256",
+			expected:     32,
+		},
+		{
+			name:         "bytes_ type",
+			variableType: "t_bytes_storage",
+			expected:     32,
+		},
+		{
+			name:         "bytes type",
+			variableType: "t_bytes32",
+			expected:     32,
+		},
+		{
+			name:         "address type",
+			variableType: "t_address",
+			expected:     20,
+		},
+		{
+			name:         "bool type",
+			variableType: "t_bool",
+			expected:     1,
+		},
+		{
+			name:         "array type",
+			variableType: "t_array(t_uint256)2",
+			expected:     64, // 2 * 32
+		},
+		{
+			name:         "unsupported type",
+			variableType: "t_unknown",
+			expectError:  true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			length, err := parseVariableLength(tt.variableType, tt.types)
+			if tt.expectError {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+				require.Equal(t, tt.expected, length)
+			}
+		})
+	}
+}
+
+func Test_validateSpacer(t *testing.T) {
+	tests := []struct {
+		name          string
+		variable      solc.StorageLayoutEntry
+		types         map[string]solc.StorageLayoutType
+		expectedErrs  int
+		errorContains string
+	}{
+		{
+			name: "valid spacer",
+			variable: solc.StorageLayoutEntry{
+				Contract: "TestContract",
+				Label:    "spacer_1_2_32",
+				Slot:     1,
+				Offset:   2,
+				Type:     "t_uint256",
+			},
+			types: map[string]solc.StorageLayoutType{
+				"t_uint256": {NumberOfBytes: 32},
+			},
+			expectedErrs: 0,
+		},
+		{
+			name: "invalid name format",
+			variable: solc.StorageLayoutEntry{
+				Label: "spacer_invalid",
+			},
+			expectedErrs:  1,
+			errorContains: "invalid spacer name format",
+		},
+		{
+			name: "wrong slot",
+			variable: solc.StorageLayoutEntry{
+				Contract: "TestContract",
+				Label:    "spacer_1_2_32",
+				Slot:     2,
+				Offset:   2,
+				Type:     "t_uint256",
+			},
+			types: map[string]solc.StorageLayoutType{
+				"t_uint256": {NumberOfBytes: 32},
+			},
+			expectedErrs:  1,
+			errorContains: "is in slot",
+		},
+		{
+			name: "wrong offset",
+			variable: solc.StorageLayoutEntry{
+				Contract: "TestContract",
+				Label:    "spacer_1_2_32",
+				Slot:     1,
+				Offset:   3,
+				Type:     "t_uint256",
+			},
+			types: map[string]solc.StorageLayoutType{
+				"t_uint256": {NumberOfBytes: 32},
+			},
+			expectedErrs:  1,
+			errorContains: "is at offset",
+		},
+		{
+			name: "wrong length",
+			variable: solc.StorageLayoutEntry{
+				Contract: "TestContract",
+				Label:    "spacer_1_2_32",
+				Slot:     1,
+				Offset:   2,
+				Type:     "t_uint128",
+			},
+			types: map[string]solc.StorageLayoutType{
+				"t_uint128": {NumberOfBytes: 16},
+			},
+			expectedErrs:  1,
+			errorContains: "bytes long",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			errors := validateSpacer(tt.variable, tt.types)
+			require.Len(t, errors, tt.expectedErrs)
+			if tt.errorContains != "" {
+				require.Contains(t, errors[0].Error(), tt.errorContains)
+			}
+		})
+	}
+}

From a5556262b87b6dbee3d59e70b4d172bfc775f395 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 4 Dec 2024 18:19:53 -0500
Subject: [PATCH 368/451] fix: develop-forge-coverage ci job name (#13241)

Fixes the name for scheduled-forge-coverage to
develop-forge-coverage in line with the existing pattern.
---
 .circleci/config.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a646df4c88e3..01b508b8ecf4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1573,6 +1573,17 @@ workflows:
     jobs:
       - publish-contract-artifacts
 
+  develop-forge-coverage:
+    when:
+      and:
+        - or:
+            - equal: ["develop", <<pipeline.git.branch>>]
+            - equal: [true, <<pipeline.parameters.contracts_coverage_dispatch>>]
+        - not:
+            equal: [scheduled_pipeline, << pipeline.trigger_source >>]
+    jobs:
+      - contracts-bedrock-coverage
+
   develop-fault-proofs:
     when:
       and:
@@ -1639,17 +1650,6 @@ workflows:
             parameters:
               mips_word_size: [32, 64]
 
-  scheduled-forge-coverage:
-    when:
-      and:
-        - or:
-            - equal: ["develop", <<pipeline.git.branch>>]
-            - equal: [true, <<pipeline.parameters.contracts_coverage_dispatch>>]
-        - not:
-            equal: [scheduled_pipeline, << pipeline.trigger_source >>]
-    jobs:
-      - contracts-bedrock-coverage
-
   scheduled-docker-publish:
     when:
       or:

From d3fbc5761f86157dace84c3f6af48181b12fe36c Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 4 Dec 2024 16:21:28 -0700
Subject: [PATCH 369/451] op-deployer: Update OPCM bootstrap command (#13238)

* op-deployer: Update OPCM bootstrap command

Updates the OPCM bootstrap command to allow bootstrapping Holocene.

* fix merge artifact
---
 op-deployer/justfile                          |  10 +-
 .../pkg/deployer/bootstrap/asterisc.go        |  25 +-
 op-deployer/pkg/deployer/bootstrap/flags.go   |  24 +-
 op-deployer/pkg/deployer/bootstrap/opcm.go    | 231 ++++++++----------
 .../pkg/deployer/bootstrap/opcm_test.go       |  82 +++++++
 op-deployer/pkg/deployer/opcm/opcm.go         |  56 +++++
 op-deployer/pkg/deployer/opcm/script.go       |  48 ++++
 .../standard/standard-versions-sepolia.toml   |  21 +-
 op-deployer/pkg/deployer/standard/standard.go |  48 ++++
 op-deployer/pkg/env/host.go                   |  50 ++++
 op-e2e/e2eutils/retryproxy/proxy.go           |  16 ++
 op-service/testutils/anvil/anvil.go           |   6 +-
 12 files changed, 460 insertions(+), 157 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/opcm_test.go
 create mode 100644 op-deployer/pkg/deployer/opcm/opcm.go
 create mode 100644 op-deployer/pkg/deployer/opcm/script.go

diff --git a/op-deployer/justfile b/op-deployer/justfile
index df5d28700661..740aa7c2ceb4 100644
--- a/op-deployer/justfile
+++ b/op-deployer/justfile
@@ -1,2 +1,10 @@
 build:
-    go build -o bin/op-deployer cmd/op-deployer/main.go
\ No newline at end of file
+    go build -o bin/op-deployer cmd/op-deployer/main.go
+
+download-artifacts checksum outfile:
+    curl -o {{outfile}} -L https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-{{checksum}}.tar.gz
+
+calculate-artifacts-hash checksum:
+    just download-artifacts {{checksum}} /tmp/artifact.tgz
+    sha256sum /tmp/artifact.tgz
+    rm /tmp/artifact.tgz
\ No newline at end of file
diff --git a/op-deployer/pkg/deployer/bootstrap/asterisc.go b/op-deployer/pkg/deployer/bootstrap/asterisc.go
index b091f8c4d6f3..e7cd4e6036c9 100644
--- a/op-deployer/pkg/deployer/bootstrap/asterisc.go
+++ b/op-deployer/pkg/deployer/bootstrap/asterisc.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
-	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 	"github.com/ethereum/go-ethereum/common"
 
@@ -145,35 +143,18 @@ func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
 		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
-	l1Host, err := env.DefaultScriptHost(
+	l1Host, err := env.DefaultForkedScriptHost(
+		ctx,
 		bcaster,
 		lgr,
 		chainDeployer,
 		artifactsFS,
-		script.WithForkHook(func(cfg *script.ForkConfig) (forking.ForkSource, error) {
-			src, err := forking.RPCSourceByNumber(cfg.URLOrAlias, l1RPC, *cfg.BlockNumber)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
-			}
-			return forking.Cache(src), nil
-		}),
+		l1RPC,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
 
-	latest, err := l1Client.HeaderByNumber(ctx, nil)
-	if err != nil {
-		return fmt.Errorf("failed to get latest block: %w", err)
-	}
-
-	if _, err := l1Host.CreateSelectFork(
-		script.ForkWithURLOrAlias("main"),
-		script.ForkWithBlockNumberU256(latest.Number),
-	); err != nil {
-		return fmt.Errorf("failed to select fork: %w", err)
-	}
-
 	dgo, err := opcm.DeployAsterisc(
 		l1Host,
 		opcm.DeployAsteriscInput{
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index 58fb7fc14368..1832a3122edc 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -1,6 +1,8 @@
 package bootstrap
 
 import (
+	"errors"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
@@ -30,6 +32,7 @@ const (
 	ProposerFlagName                        = "proposer"
 	ChallengerFlagName                      = "challenger"
 	PreimageOracleFlagName                  = "preimage-oracle"
+	ReleaseFlagName                         = "release"
 )
 
 var (
@@ -153,18 +156,26 @@ var (
 		EnvVars: deployer.PrefixEnvVar("PREIMAGE_ORACLE"),
 		Value:   common.Address{}.Hex(),
 	}
+	ReleaseFlag = &cli.StringFlag{
+		Name:    ReleaseFlagName,
+		Usage:   "Release to deploy.",
+		EnvVars: deployer.PrefixEnvVar("RELEASE"),
+	}
 )
 
 var OPCMFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
-	ArtifactsLocatorFlag,
+	ReleaseFlag,
+}
+
+var ImplementationsFlags = []cli.Flag{
+	MIPSVersionFlag,
 	WithdrawalDelaySecondsFlag,
 	MinProposalSizeBytesFlag,
 	ChallengePeriodSecondsFlag,
 	ProofMaturityDelaySecondsFlag,
 	DisputeGameFinalityDelaySecondsFlag,
-	MIPSVersionFlag,
 }
 
 var DelayedWETHFlags = []cli.Flag{
@@ -212,6 +223,15 @@ var Commands = []*cli.Command{
 		Flags:  cliapp.ProtectFlags(OPCMFlags),
 		Action: OPCMCLI,
 	},
+	{
+		Name:  "implementations",
+		Usage: "Bootstraps implementations.",
+		Flags: cliapp.ProtectFlags(ImplementationsFlags),
+		Action: func(context *cli.Context) error {
+			return errors.New("not implemented yet")
+		},
+		Hidden: true,
+	},
 	{
 		Name:   "delayedweth",
 		Usage:  "Bootstrap an instance of DelayedWETH.",
diff --git a/op-deployer/pkg/deployer/bootstrap/opcm.go b/op-deployer/pkg/deployer/bootstrap/opcm.go
index 89a8c3df5123..5d42d1bfa955 100644
--- a/op-deployer/pkg/deployer/bootstrap/opcm.go
+++ b/op-deployer/pkg/deployer/bootstrap/opcm.go
@@ -3,12 +3,12 @@ package bootstrap
 import (
 	"context"
 	"crypto/ecdsa"
-	"crypto/rand"
 	"fmt"
-	"math/big"
 	"strings"
 
-	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum/go-ethereum/rpc"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 
@@ -18,7 +18,6 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
 
 	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
 	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
@@ -26,7 +25,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
@@ -34,12 +32,10 @@ import (
 )
 
 type OPCMConfig struct {
-	pipeline.SuperchainProofParams
-
-	L1RPCUrl         string
-	PrivateKey       string
-	Logger           log.Logger
-	ArtifactsLocator *artifacts2.Locator
+	L1RPCUrl   string
+	PrivateKey string
+	Release    string
+	Logger     log.Logger
 
 	privateKeyECDSA *ecdsa.PrivateKey
 }
@@ -53,6 +49,10 @@ func (c *OPCMConfig) Check() error {
 		return fmt.Errorf("private key must be specified")
 	}
 
+	if c.Release == "" {
+		return fmt.Errorf("release must be specified")
+	}
+
 	privECDSA, err := crypto.HexToECDSA(strings.TrimPrefix(c.PrivateKey, "0x"))
 	if err != nil {
 		return fmt.Errorf("failed to parse private key: %w", err)
@@ -63,34 +63,6 @@ func (c *OPCMConfig) Check() error {
 		return fmt.Errorf("logger must be specified")
 	}
 
-	if c.ArtifactsLocator == nil {
-		return fmt.Errorf("artifacts locator must be specified")
-	}
-
-	if c.WithdrawalDelaySeconds == 0 {
-		c.WithdrawalDelaySeconds = standard.WithdrawalDelaySeconds
-	}
-
-	if c.MinProposalSizeBytes == 0 {
-		c.MinProposalSizeBytes = standard.MinProposalSizeBytes
-	}
-
-	if c.ChallengePeriodSeconds == 0 {
-		c.ChallengePeriodSeconds = standard.ChallengePeriodSeconds
-	}
-
-	if c.ProofMaturityDelaySeconds == 0 {
-		c.ProofMaturityDelaySeconds = standard.ProofMaturityDelaySeconds
-	}
-
-	if c.DisputeGameFinalityDelaySeconds == 0 {
-		c.DisputeGameFinalityDelaySeconds = standard.DisputeGameFinalityDelaySeconds
-	}
-
-	if c.MIPSVersion == 0 {
-		c.MIPSVersion = standard.MIPSVersion
-	}
-
 	return nil
 }
 
@@ -101,33 +73,30 @@ func OPCMCLI(cliCtx *cli.Context) error {
 
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
-	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
-	artifactsLocator := new(artifacts2.Locator)
-	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
-		return fmt.Errorf("failed to parse artifacts URL: %w", err)
-	}
+	release := cliCtx.String(ReleaseFlagName)
 
 	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
 
-	return OPCM(ctx, OPCMConfig{
-		L1RPCUrl:         l1RPCUrl,
-		PrivateKey:       privateKey,
-		Logger:           l,
-		ArtifactsLocator: artifactsLocator,
-		SuperchainProofParams: pipeline.SuperchainProofParams{
-			WithdrawalDelaySeconds:          cliCtx.Uint64(WithdrawalDelaySecondsFlagName),
-			MinProposalSizeBytes:            cliCtx.Uint64(MinProposalSizeBytesFlagName),
-			ChallengePeriodSeconds:          cliCtx.Uint64(ChallengePeriodSecondsFlagName),
-			ProofMaturityDelaySeconds:       cliCtx.Uint64(ProofMaturityDelaySecondsFlagName),
-			DisputeGameFinalityDelaySeconds: cliCtx.Uint64(DisputeGameFinalityDelaySecondsFlagName),
-			MIPSVersion:                     cliCtx.Uint64(MIPSVersionFlagName),
-		},
+	out, err := OPCM(ctx, OPCMConfig{
+		L1RPCUrl:   l1RPCUrl,
+		PrivateKey: privateKey,
+		Release:    release,
+		Logger:     l,
 	})
+	if err != nil {
+		return fmt.Errorf("failed to deploy OPCM: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(out, ioutil.ToStdOut()); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
 }
 
-func OPCM(ctx context.Context, cfg OPCMConfig) error {
+func OPCM(ctx context.Context, cfg OPCMConfig) (opcm.DeployOPCMOutput, error) {
+	var out opcm.DeployOPCMOutput
 	if err := cfg.Check(); err != nil {
-		return fmt.Errorf("invalid config for OPCM: %w", err)
+		return out, fmt.Errorf("invalid config for OPCM: %w", err)
 	}
 
 	lgr := cfg.Logger
@@ -135,35 +104,33 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 		lgr.Info("artifacts download progress", "current", curr, "total", total)
 	}
 
-	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
+	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to download artifacts: %w", err)
+		return out, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
-	defer func() {
-		if err := cleanup(); err != nil {
-			lgr.Warn("failed to clean up artifacts", "err", err)
-		}
-	}()
 
-	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
-	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
-	}
+	l1Client := ethclient.NewClient(l1RPC)
 
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to get chain ID: %w", err)
+		return out, fmt.Errorf("failed to get chain ID: %w", err)
 	}
 	chainIDU64 := chainID.Uint64()
 
-	superCfg, err := standard.SuperchainFor(chainIDU64)
+	loc, err := artifacts.NewLocatorFromTag(cfg.Release)
 	if err != nil {
-		return fmt.Errorf("error getting superchain config: %w", err)
+		return out, fmt.Errorf("failed to create artifacts locator: %w", err)
 	}
-	standardVersionsTOML, err := standard.L1VersionsDataFor(chainIDU64)
+
+	artifactsFS, cleanup, err := artifacts.Download(ctx, loc, progressor)
 	if err != nil {
-		return fmt.Errorf("error getting standard versions TOML: %w", err)
+		return out, fmt.Errorf("failed to download artifacts: %w", err)
 	}
+	defer func() {
+		if err := cleanup(); err != nil {
+			lgr.Warn("failed to clean up artifacts", "err", err)
+		}
+	}()
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
 	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
@@ -176,83 +143,87 @@ func OPCM(ctx context.Context, cfg OPCMConfig) error {
 		From:    chainDeployer,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to create broadcaster: %w", err)
+		return out, fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
-	nonce, err := l1Client.NonceAt(ctx, chainDeployer, nil)
-	if err != nil {
-		return fmt.Errorf("failed to get starting nonce: %w", err)
-	}
-
-	host, err := env.DefaultScriptHost(
+	host, err := env.DefaultForkedScriptHost(
+		ctx,
 		bcaster,
 		lgr,
 		chainDeployer,
 		artifactsFS,
+		l1RPC,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create script host: %w", err)
-	}
-	host.SetNonce(chainDeployer, nonce)
-
-	var l1ContractsRelease string
-	if cfg.ArtifactsLocator.IsTag() {
-		l1ContractsRelease = cfg.ArtifactsLocator.Tag
-	} else {
-		l1ContractsRelease = "dev"
+		return out, fmt.Errorf("failed to create script host: %w", err)
 	}
 
-	lgr.Info("deploying OPCM", "l1ContractsRelease", l1ContractsRelease)
+	lgr.Info("deploying OPCM", "l1ContractsRelease", cfg.Release)
 
-	// We need to etch the Superchain addresses so that they have nonzero code
-	// and the checks in the OPCM constructor pass.
-	superchainConfigAddr := common.Address(*superCfg.Config.SuperchainConfigAddr)
-	protocolVersionsAddr := common.Address(*superCfg.Config.ProtocolVersionsAddr)
-	addresses := []common.Address{
-		superchainConfigAddr,
-		protocolVersionsAddr,
-	}
-	for _, addr := range addresses {
-		host.ImportAccount(addr, types.Account{
-			Code: []byte{0x00},
-		})
-	}
-
-	var salt common.Hash
-	_, err = rand.Read(salt[:])
+	input, err := DeployOPCMInputForChain(cfg.Release, chainIDU64)
 	if err != nil {
-		return fmt.Errorf("failed to generate CREATE2 salt: %w", err)
+		return out, fmt.Errorf("error creating OPCM input: %w", err)
 	}
 
-	dio, err := opcm.DeployImplementations(
+	out, err = opcm.DeployOPCM(
 		host,
-		opcm.DeployImplementationsInput{
-			Salt:                            salt,
-			WithdrawalDelaySeconds:          new(big.Int).SetUint64(cfg.WithdrawalDelaySeconds),
-			MinProposalSizeBytes:            new(big.Int).SetUint64(cfg.MinProposalSizeBytes),
-			ChallengePeriodSeconds:          new(big.Int).SetUint64(cfg.ChallengePeriodSeconds),
-			ProofMaturityDelaySeconds:       new(big.Int).SetUint64(cfg.ProofMaturityDelaySeconds),
-			DisputeGameFinalityDelaySeconds: new(big.Int).SetUint64(cfg.DisputeGameFinalityDelaySeconds),
-			MipsVersion:                     new(big.Int).SetUint64(cfg.MIPSVersion),
-			L1ContractsRelease:              l1ContractsRelease,
-			SuperchainConfigProxy:           superchainConfigAddr,
-			ProtocolVersionsProxy:           protocolVersionsAddr,
-			StandardVersionsToml:            standardVersionsTOML,
-			UseInterop:                      false,
-		},
+		input,
 	)
 	if err != nil {
-		return fmt.Errorf("error deploying implementations: %w", err)
+		return out, fmt.Errorf("error deploying implementations: %w", err)
 	}
 
 	if _, err := bcaster.Broadcast(ctx); err != nil {
-		return fmt.Errorf("failed to broadcast: %w", err)
+		return out, fmt.Errorf("failed to broadcast: %w", err)
 	}
 
-	lgr.Info("deployed implementations")
+	lgr.Info("deployed OPCM")
 
-	if err := jsonutil.WriteJSON(dio, ioutil.ToStdOut()); err != nil {
-		return fmt.Errorf("failed to write output: %w", err)
+	return out, nil
+}
+
+func DeployOPCMInputForChain(release string, chainID uint64) (opcm.DeployOPCMInput, error) {
+	superchain, err := standard.SuperchainFor(chainID)
+	if err != nil {
+		return opcm.DeployOPCMInput{}, fmt.Errorf("error getting superchain config: %w", err)
 	}
-	return nil
+
+	l1VersionsData, err := standard.L1VersionsFor(chainID)
+	if err != nil {
+		return opcm.DeployOPCMInput{}, fmt.Errorf("error getting L1 versions: %w", err)
+	}
+	releases, ok := l1VersionsData.Releases[release]
+	if !ok {
+		return opcm.DeployOPCMInput{}, fmt.Errorf("release not found: %s", release)
+	}
+
+	blueprints, err := standard.OPCMBlueprintsFor(chainID)
+	if err != nil {
+		return opcm.DeployOPCMInput{}, fmt.Errorf("error getting OPCM blueprints: %w", err)
+	}
+
+	return opcm.DeployOPCMInput{
+		SuperchainConfig:   common.Address(*superchain.Config.SuperchainConfigAddr),
+		ProtocolVersions:   common.Address(*superchain.Config.ProtocolVersionsAddr),
+		L1ContractsRelease: strings.TrimPrefix(release, "op-contracts/"),
+
+		AddressManagerBlueprint:           blueprints.AddressManager,
+		ProxyBlueprint:                    blueprints.Proxy,
+		ProxyAdminBlueprint:               blueprints.ProxyAdmin,
+		L1ChugSplashProxyBlueprint:        blueprints.L1ChugSplashProxy,
+		ResolvedDelegateProxyBlueprint:    blueprints.ResolvedDelegateProxy,
+		AnchorStateRegistryBlueprint:      blueprints.AnchorStateRegistry,
+		PermissionedDisputeGame1Blueprint: blueprints.PermissionedDisputeGame1,
+		PermissionedDisputeGame2Blueprint: blueprints.PermissionedDisputeGame2,
+
+		L1ERC721BridgeImpl:               releases.L1ERC721Bridge.ImplementationAddress,
+		OptimismPortalImpl:               releases.OptimismPortal.ImplementationAddress,
+		SystemConfigImpl:                 releases.SystemConfig.ImplementationAddress,
+		OptimismMintableERC20FactoryImpl: releases.OptimismMintableERC20Factory.ImplementationAddress,
+		L1CrossDomainMessengerImpl:       releases.L1CrossDomainMessenger.ImplementationAddress,
+		L1StandardBridgeImpl:             releases.L1StandardBridge.ImplementationAddress,
+		DisputeGameFactoryImpl:           releases.DisputeGameFactory.ImplementationAddress,
+		DelayedWETHImpl:                  releases.DelayedWETH.ImplementationAddress,
+		MipsImpl:                         releases.MIPS.Address,
+	}, nil
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/opcm_test.go b/op-deployer/pkg/deployer/bootstrap/opcm_test.go
new file mode 100644
index 000000000000..5a4d1e8de3d5
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/opcm_test.go
@@ -0,0 +1,82 @@
+package bootstrap
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/retryproxy"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/stretchr/testify/require"
+)
+
+var networks = []string{"mainnet", "sepolia"}
+
+var versions = []string{"v1.8.0-rc.3"}
+
+func TestOPCMLiveChain(t *testing.T) {
+	for _, network := range networks {
+		for _, version := range versions {
+			t.Run(network+"-"+version, func(t *testing.T) {
+				if version == "v1.8.0-rc.3" && network == "mainnet" {
+					t.Skip("v1.8.0-rc.3 not supported on mainnet yet")
+				}
+
+				envVar := strings.ToUpper(network) + "_RPC_URL"
+				rpcURL := os.Getenv(envVar)
+				require.NotEmpty(t, rpcURL, "must specify RPC url via %s env var", envVar)
+				testOPCMLiveChain(t, "op-contracts/"+version, rpcURL)
+			})
+		}
+	}
+}
+
+func testOPCMLiveChain(t *testing.T, version string, forkRPCURL string) {
+	t.Parallel()
+
+	if forkRPCURL == "" {
+		t.Skip("forkRPCURL not set")
+	}
+
+	lgr := testlog.Logger(t, slog.LevelDebug)
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
+	retryProxy := retryproxy.New(lgr, forkRPCURL)
+	require.NoError(t, retryProxy.Start())
+	t.Cleanup(func() {
+		require.NoError(t, retryProxy.Stop())
+	})
+
+	runner, err := anvil.New(
+		retryProxy.Endpoint(),
+		lgr,
+	)
+	require.NoError(t, err)
+
+	require.NoError(t, runner.Start(ctx))
+	t.Cleanup(func() {
+		require.NoError(t, runner.Stop())
+	})
+
+	out, err := OPCM(ctx, OPCMConfig{
+		L1RPCUrl:   runner.RPCUrl(),
+		PrivateKey: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+		Release:    version,
+		Logger:     lgr,
+	})
+	require.NoError(t, err)
+	require.NotEmpty(t, out.Opcm)
+
+	client, err := ethclient.Dial(runner.RPCUrl())
+	require.NoError(t, err)
+	code, err := client.CodeAt(ctx, out.Opcm, nil)
+	require.NoError(t, err)
+	require.NotEmpty(t, code)
+}
diff --git a/op-deployer/pkg/deployer/opcm/opcm.go b/op-deployer/pkg/deployer/opcm/opcm.go
new file mode 100644
index 000000000000..9de3348be285
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/opcm.go
@@ -0,0 +1,56 @@
+package opcm
+
+import (
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type DeployOPCMInput struct {
+	SuperchainConfig   common.Address
+	ProtocolVersions   common.Address
+	L1ContractsRelease string
+
+	AddressManagerBlueprint           common.Address
+	ProxyBlueprint                    common.Address
+	ProxyAdminBlueprint               common.Address
+	L1ChugSplashProxyBlueprint        common.Address
+	ResolvedDelegateProxyBlueprint    common.Address
+	AnchorStateRegistryBlueprint      common.Address
+	PermissionedDisputeGame1Blueprint common.Address
+	PermissionedDisputeGame2Blueprint common.Address
+
+	L1ERC721BridgeImpl               common.Address
+	OptimismPortalImpl               common.Address
+	SystemConfigImpl                 common.Address
+	OptimismMintableERC20FactoryImpl common.Address
+	L1CrossDomainMessengerImpl       common.Address
+	L1StandardBridgeImpl             common.Address
+	DisputeGameFactoryImpl           common.Address
+	DelayedWETHImpl                  common.Address
+	MipsImpl                         common.Address
+}
+
+type DeployOPCMOutput struct {
+	Opcm common.Address
+}
+
+func DeployOPCM(
+	host *script.Host,
+	input DeployOPCMInput,
+) (DeployOPCMOutput, error) {
+	scriptFile := "DeployOPCM.s.sol"
+	contractName := "DeployOPCM"
+
+	out, err := RunBasicScript[DeployOPCMInput, DeployOPCMOutput](host, input, scriptFile, contractName)
+	if err != nil {
+		return DeployOPCMOutput{}, fmt.Errorf("failed to deploy OPCM: %w", err)
+	}
+
+	if err := host.RememberOnLabel("OPContractsManager", "OPContractsManager.sol", "OPContractsManager"); err != nil {
+		return DeployOPCMOutput{}, fmt.Errorf("failed to link OPContractsManager label: %w", err)
+	}
+
+	return out, nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/script.go b/op-deployer/pkg/deployer/opcm/script.go
new file mode 100644
index 000000000000..6a138f67cb8f
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/script.go
@@ -0,0 +1,48 @@
+package opcm
+
+import (
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type BasicScriptIO struct {
+	Run func(input, output common.Address) error
+}
+
+func RunBasicScript[I any, O any](
+	host *script.Host,
+	input I,
+	scriptFile string,
+	contractName string,
+) (O, error) {
+	var output O
+	inputAddr := host.NewScriptAddress()
+	outputAddr := host.NewScriptAddress()
+
+	cleanupInput, err := script.WithPrecompileAtAddress[*I](host, inputAddr, &input)
+	if err != nil {
+		return output, fmt.Errorf("failed to insert input precompile: %w", err)
+	}
+	defer cleanupInput()
+
+	cleanupOutput, err := script.WithPrecompileAtAddress[*O](host, outputAddr, &output,
+		script.WithFieldSetter[*O])
+	if err != nil {
+		return output, fmt.Errorf("failed to insert output precompile: %w", err)
+	}
+	defer cleanupOutput()
+
+	deployScript, cleanupDeploy, err := script.WithScript[BasicScriptIO](host, scriptFile, contractName)
+	if err != nil {
+		return output, fmt.Errorf("failed to load %s script: %w", scriptFile, err)
+	}
+	defer cleanupDeploy()
+
+	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
+		return output, fmt.Errorf("failed to run %s script: %w", scriptFile, err)
+	}
+
+	return output, nil
+}
diff --git a/op-deployer/pkg/deployer/standard/standard-versions-sepolia.toml b/op-deployer/pkg/deployer/standard/standard-versions-sepolia.toml
index 277f9d096306..25b63b4ac65d 100644
--- a/op-deployer/pkg/deployer/standard/standard-versions-sepolia.toml
+++ b/op-deployer/pkg/deployer/standard/standard-versions-sepolia.toml
@@ -5,6 +5,25 @@
 #   * proxied             : specify a standard "implementation_address"
 #   * neither             : specify neither a standard "address" nor "implementation_address"
 
+# Holocene https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts%2Fv1.8.0-rc.3
+[releases."op-contracts/v1.8.0-rc.3"]
+# Updated in this release
+system_config = { version = "2.3.0", implementation_address = "0x33b83E4C305c908B2Fc181dDa36e230213058d7d" } # UPDATED IN THIS RELEASE
+fault_dispute_game = { version = "1.3.1" }                                                                   # UPDATED IN THIS RELEASE
+permissioned_dispute_game = { version = "1.3.1" }                                                            # UPDATED IN THIS RELEASE
+mips = { version = "1.2.1", address = "0x69470D6970Cd2A006b84B1d4d70179c892cFCE01" }                         # UPDATED IN THIS RELEASE
+# Unchanged in this release
+optimism_portal = { version = "3.10.0", implementation_address = "0x35028bae87d71cbc192d545d38f960ba30b4b233" }
+anchor_state_registry = { version = "2.0.0" }
+delayed_weth = { version = "1.1.0", implementation_address = "0x07f69b19532476c6cd03056d6bc3f1b110ab7538" }
+dispute_game_factory = { version = "1.0.0", implementation_address = "0xa51bea7e4d34206c0bcb04a776292f2f19f0beec" }
+preimage_oracle = { version = "1.1.2", address = "0x92240135b46fc1142dA181f550aE8f595B858854" }
+l1_cross_domain_messenger = { version = "2.3.0", implementation_address = "0xD3494713A5cfaD3F5359379DfA074E2Ac8C6Fd65" }
+l1_erc721_bridge = { version = "2.1.0", implementation_address = "0xae2af01232a6c4a4d3012c5ec5b1b35059caf10d" }
+l1_standard_bridge = { version = "2.1.0", implementation_address = "0x64b5a5ed26dcb17370ff4d33a8d503f0fbd06cff" }
+# l2_output_oracle -- This contract not used in fault proofs
+optimism_mintable_erc20_factory = { version = "1.9.0", implementation_address = "0xe01efbeb1089d1d1db9c6c8b135c934c0734c846" }
+
 # Fault Proofs https://github.com/ethereum-optimism/optimism/releases/tag/op-contracts%2Fv1.6.0
 [releases."op-contracts/v1.6.0"]
 optimism_portal = { version = "3.10.0", implementation_address = "0x35028bae87d71cbc192d545d38f960ba30b4b233" }
@@ -20,4 +39,4 @@ l1_cross_domain_messenger = { version = "2.3.0", implementation_address = "0xD34
 l1_erc721_bridge = { version = "2.1.0", implementation_address = "0xae2af01232a6c4a4d3012c5ec5b1b35059caf10d" }
 l1_standard_bridge = { version = "2.1.0", implementation_address = "0x64b5a5ed26dcb17370ff4d33a8d503f0fbd06cff" }
 # l2_output_oracle -- This contract not used in fault proofs
-optimism_mintable_erc20_factory = { version = "1.9.0", implementation_address = "0xe01efbeb1089d1d1db9c6c8b135c934c0734c846" }
+optimism_mintable_erc20_factory = { version = "1.9.0", implementation_address = "0xe01efbeb1089d1d1db9c6c8b135c934c0734c846" }
\ No newline at end of file
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index d2fe5e5d942b..72cff3cb9269 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -78,6 +78,50 @@ type VersionRelease struct {
 
 var _ embed.FS
 
+type OPCMBlueprints struct {
+	AddressManager           common.Address
+	Proxy                    common.Address
+	ProxyAdmin               common.Address
+	L1ChugSplashProxy        common.Address
+	ResolvedDelegateProxy    common.Address
+	AnchorStateRegistry      common.Address
+	PermissionedDisputeGame1 common.Address
+	PermissionedDisputeGame2 common.Address
+}
+
+var sepoliaBlueprints = OPCMBlueprints{
+	AddressManager:           common.HexToAddress("0x3125a4cB2179E04203D3Eb2b5784aaef9FD64216"),
+	Proxy:                    common.HexToAddress("0xe650ADb86a0de96e2c434D0a52E7D5B70980D6f1"),
+	ProxyAdmin:               common.HexToAddress("0x3AC6b88F6bC4A5038DB7718dE47a5ab1a9609319"),
+	L1ChugSplashProxy:        common.HexToAddress("0x58770FC7ed304c43D2B70248914eb34A741cF411"),
+	ResolvedDelegateProxy:    common.HexToAddress("0x0449adB72D489a137d476aB49c6b812161754fD3"),
+	AnchorStateRegistry:      common.HexToAddress("0xB98095199437883b7661E0D58256060f3bc730a4"),
+	PermissionedDisputeGame1: common.HexToAddress("0xf72Ac5f164cC024DE09a2c249441715b69a16eAb"),
+	PermissionedDisputeGame2: common.HexToAddress("0x713dAC5A23728477547b484f9e0D751077E300a2"),
+}
+
+var mainnetBlueprints = OPCMBlueprints{
+	AddressManager:           common.HexToAddress("0x29aA24714c06914d9689e933cae2293C569AfeEa"),
+	Proxy:                    common.HexToAddress("0x3626ebD458c7f34FD98789A373593fF2fc227bA0"),
+	ProxyAdmin:               common.HexToAddress("0x7170678A5CFFb6872606d251B3CcdB27De962631"),
+	L1ChugSplashProxy:        common.HexToAddress("0x538906C8B000D621fd11B7e8642f504dD8730837"),
+	ResolvedDelegateProxy:    common.HexToAddress("0xF12bD34d6a1d26d230240ECEA761f77e2013926E"),
+	AnchorStateRegistry:      common.HexToAddress("0xbA7Be2bEE016568274a4D1E6c852Bb9a99FaAB8B"),
+	PermissionedDisputeGame1: common.HexToAddress("0xb94bF6130Df8BD9a9eA45D8dD8C18957002d1986"),
+	PermissionedDisputeGame2: common.HexToAddress("0xe0a642B249CF6cbF0fF7b4dDf41443Ea7a5C8Cc8"),
+}
+
+func OPCMBlueprintsFor(chainID uint64) (OPCMBlueprints, error) {
+	switch chainID {
+	case 1:
+		return mainnetBlueprints, nil
+	case 11155111:
+		return sepoliaBlueprints, nil
+	default:
+		return OPCMBlueprints{}, fmt.Errorf("unsupported chain ID: %d", chainID)
+	}
+}
+
 func L1VersionsDataFor(chainID uint64) (string, error) {
 	switch chainID {
 	case 1:
@@ -215,6 +259,8 @@ func ArtifactsURLForTag(tag string) (*url.URL, error) {
 		return url.Parse(standardArtifactsURL("e1f0c4020618c4a98972e7124c39686cab2e31d5d7846f9ce5e0d5eed0f5ff32"))
 	case "op-contracts/v1.7.0-beta.1+l2-contracts":
 		return url.Parse(standardArtifactsURL("b0fb1f6f674519d637cff39a22187a5993d7f81a6d7b7be6507a0b50a5e38597"))
+	case "op-contracts/v1.8.0-rc.3":
+		return url.Parse(standardArtifactsURL("3bcff2944953862596d5fd0125d166a04af2ba6426dc693983291d3cb86b2e2e"))
 	default:
 		return nil, fmt.Errorf("unsupported tag: %s", tag)
 	}
@@ -226,6 +272,8 @@ func ArtifactsHashForTag(tag string) (common.Hash, error) {
 		return common.HexToHash("d20a930cc0ff204c2d93b7aa60755ec7859ba4f328b881f5090c6a6a2a86dcba"), nil
 	case "op-contracts/v1.7.0-beta.1+l2-contracts":
 		return common.HexToHash("9e3ad322ec9b2775d59143ce6874892f9b04781742c603ad59165159e90b00b9"), nil
+	case "op-contracts/v1.8.0-rc.3":
+		return common.HexToHash("7c133142165fbbdba28ced5d9a04af8bea68baf58b19a07cdd8ae531b01fbe9d"), nil
 	default:
 		return common.Hash{}, fmt.Errorf("unsupported tag: %s", tag)
 	}
diff --git a/op-deployer/pkg/env/host.go b/op-deployer/pkg/env/host.go
index 61d30b4ce253..47389f492329 100644
--- a/op-deployer/pkg/env/host.go
+++ b/op-deployer/pkg/env/host.go
@@ -1,8 +1,13 @@
 package env
 
 import (
+	"context"
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/rpc"
+
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
@@ -39,3 +44,48 @@ func DefaultScriptHost(
 
 	return h, nil
 }
+
+func DefaultForkedScriptHost(
+	ctx context.Context,
+	bcaster broadcaster.Broadcaster,
+	lgr log.Logger,
+	deployer common.Address,
+	artifacts foundry.StatDirFs,
+	forkRPC *rpc.Client,
+	additionalOpts ...script.HostOption,
+) (*script.Host, error) {
+	h, err := DefaultScriptHost(
+		bcaster,
+		lgr,
+		deployer,
+		artifacts,
+		append([]script.HostOption{
+			script.WithForkHook(func(cfg *script.ForkConfig) (forking.ForkSource, error) {
+				src, err := forking.RPCSourceByNumber(cfg.URLOrAlias, forkRPC, *cfg.BlockNumber)
+				if err != nil {
+					return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
+				}
+				return forking.Cache(src), nil
+			}),
+		}, additionalOpts...)...,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create default script host: %w", err)
+	}
+
+	client := ethclient.NewClient(forkRPC)
+
+	latest, err := client.HeaderByNumber(ctx, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get latest block: %w", err)
+	}
+
+	if _, err := h.CreateSelectFork(
+		script.ForkWithURLOrAlias("main"),
+		script.ForkWithBlockNumberU256(latest.Number),
+	); err != nil {
+		return nil, fmt.Errorf("failed to select fork: %w", err)
+	}
+
+	return h, nil
+}
diff --git a/op-e2e/e2eutils/retryproxy/proxy.go b/op-e2e/e2eutils/retryproxy/proxy.go
index a74d5d8c8699..d36b9e29d9d4 100644
--- a/op-e2e/e2eutils/retryproxy/proxy.go
+++ b/op-e2e/e2eutils/retryproxy/proxy.go
@@ -3,6 +3,7 @@ package retryproxy
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net"
@@ -13,6 +14,10 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
+type jsonRPCReq struct {
+	Method string `json:"method"`
+}
+
 var copyHeaders = []string{
 	"Content-Type",
 }
@@ -92,6 +97,8 @@ func (p *RetryProxy) Endpoint() string {
 }
 
 func (p *RetryProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	start := time.Now()
+
 	if r.Method != http.MethodPost {
 		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
 		return
@@ -138,7 +145,16 @@ func (p *RetryProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if _, err := io.Copy(w, bytes.NewReader(resBody)); err != nil {
 		p.lgr.Error("failed to copy response", "err", err)
 		http.Error(w, "failed to copy response", http.StatusInternalServerError)
+		return
 	}
+
+	var jReq jsonRPCReq
+	if err := json.Unmarshal(reqBody, &jReq); err != nil {
+		p.lgr.Warn("failed to unmarshal request", "err", err)
+		return
+	}
+
+	p.lgr.Debug("proxied request", "method", jReq.Method, "dur", time.Since(start))
 }
 
 func (p *RetryProxy) doProxyReq(ctx context.Context, body []byte) (*http.Response, error) {
diff --git a/op-service/testutils/anvil/anvil.go b/op-service/testutils/anvil/anvil.go
index 50590a096a7f..406d7d07c77e 100644
--- a/op-service/testutils/anvil/anvil.go
+++ b/op-service/testutils/anvil/anvil.go
@@ -33,6 +33,10 @@ type Runner struct {
 }
 
 func New(l1RPCURL string, logger log.Logger) (*Runner, error) {
+	if _, err := exec.LookPath("anvil"); err != nil {
+		return nil, fmt.Errorf("anvil not found in PATH: %w", err)
+	}
+
 	proc := exec.Command(
 		"anvil",
 		"--fork-url", l1RPCURL,
@@ -106,7 +110,7 @@ func (r *Runner) outputStream(stream io.ReadCloser) {
 			}
 		}
 
-		r.logger.Debug("[ANVIL] " + scanner.Text())
+		r.logger.Debug("[ANVIL] " + line)
 	}
 }
 

From 139dabe54ad7c9455085df67093ddc03202c9550 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 4 Dec 2024 17:01:35 -0700
Subject: [PATCH 370/451] ci: Remove Kurtosis-specific go job (#13249)

* ci: Remove Kurtosis-specific go job

Kurtosis landed [my fix](https://github.com/kurtosis-tech/kurtosis/pull/2567) for the race condition that prevented us from running a shared Kurtosis instance between jobs. This PR brings that back.

* remove dep
---
 .circleci/config.yml | 65 +-------------------------------------------
 1 file changed, 1 insertion(+), 64 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 01b508b8ecf4..54f19de4e9b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -807,63 +807,6 @@ jobs:
             make lint-go
           working_directory: .
 
-  go-test-kurtosis:
-    parameters:
-      module:
-        description: Go Module Name
-        type: string
-      uses_artifacts:
-        description: Uses contract artifacts
-        type: boolean
-        default: false
-      test_directory:
-        description: Test directory
-        type: string
-        default: "./..."
-    machine:
-      image: <<pipeline.parameters.base_image>>
-    resource_class: xlarge
-    steps:
-      - run:
-          name: Install components
-          command: |
-            go version
-            go install gotest.tools/gotestsum@v1.11.0
-      - run:
-          name: Install Kurtosis
-          command: |
-            echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
-            sudo apt update
-            sudo apt install kurtosis-cli=1.4.0
-            kurtosis engine start
-      - checkout
-      - when:
-          condition: <<parameters.uses_artifacts>>
-          steps:
-            - attach_workspace: { at: "." }
-      - run:
-          name: prep results dir
-          command: |
-            # Make sure the workspace is properly owned
-            mkdir -p ./tmp/test-results
-            mkdir -p ./tmp/testlogs
-      - run:
-          name: run tests
-          command: |
-            ENABLE_KURTOSIS=true gotestsum \
-              --format=testname \
-              --junitfile=../tmp/test-results/<<parameters.module>>.xml \
-              --jsonfile=../tmp/testlogs/log.json \
-              -- -parallel=$(nproc) \
-              -coverpkg=github.com/ethereum-optimism/optimism/... \
-              -coverprofile=coverage.out <<parameters.test_directory>>
-          working_directory: <<parameters.module>>
-      - store_test_results:
-          path: tmp/test-results
-      - store_artifacts:
-          path: tmp/testlogs
-          when: always
-
   go-tests:
     parameters:
       notify:
@@ -919,6 +862,7 @@ jobs:
               formatted_packages="$formatted_packages ./$package/..."
             done
 
+            export ENABLE_KURTOSIS=true
             export OP_E2E_CANNON_ENABLED="false"
             export OP_E2E_SKIP_SLOW_TEST=true
             export OP_E2E_USE_HTTP=true
@@ -1351,12 +1295,6 @@ workflows:
           on_changes: op-e2e,packages/contracts-bedrock/src
           uses_artifacts: true
           requires: ["contracts-bedrock-build"]
-      - go-test-kurtosis:
-          name: op-deployer-integration
-          module: op-deployer
-          test_directory: ./pkg/deployer/integration_test
-          uses_artifacts: true
-          requires: ["contracts-bedrock-build"]
       - go-tests:
           packages: |
             op-batcher
@@ -1391,7 +1329,6 @@ workflows:
             - check-generated-mocks-op-node
             - check-generated-mocks-op-service
             - go-mod-download
-            - op-deployer-integration
             - op-program-compat
             # Not needed for the devnet but we want to make sure they build successfully
             - cannon-docker-build

From 37d7bda6a89aa7d7822debd8c104ae1680c24054 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Thu, 5 Dec 2024 10:19:28 +1000
Subject: [PATCH 371/451] op-challenger: Use target platform for kona docker
 image. (#13251)

---
 ops/docker/op-stack-go/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ops/docker/op-stack-go/Dockerfile b/ops/docker/op-stack-go/Dockerfile
index 9384aef5e247..b6fb3f45c90b 100644
--- a/ops/docker/op-stack-go/Dockerfile
+++ b/ops/docker/op-stack-go/Dockerfile
@@ -144,7 +144,7 @@ COPY --from=op-node-builder /app/op-node/bin/op-node /usr/local/bin/
 CMD ["op-node"]
 
 # Make the kona docker image published by upstream available as a source to copy kona and asterisc from.
-FROM --platform=$BUILDPLATFORM ghcr.io/anton-rs/kona/kona-fpp-asterisc:$KONA_VERSION AS kona
+FROM --platform=$TARGETPLATFORM ghcr.io/anton-rs/kona/kona-fpp-asterisc:$KONA_VERSION AS kona
 
 # Also produce an op-challenger loaded with kona and asterisc using ubuntu
 FROM --platform=$TARGETPLATFORM $UBUNTU_TARGET_BASE_IMAGE AS op-challenger-target

From a88f63981a97972efe3a24bb72d38b8709410f15 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Wed, 4 Dec 2024 19:53:14 -0500
Subject: [PATCH 372/451] chore(op-deployer): Accept existing impl in
 `DelayedWETH` bootstrap task (#13250)

* chore(op-deployer): Accept existing impl in `DelayedWETH` bootstrap task

* remove check
---
 .../pkg/deployer/bootstrap/delayed_weth.go    |  9 ++-
 op-deployer/pkg/deployer/bootstrap/flags.go   | 10 ++-
 op-deployer/pkg/deployer/opcm/delayed_weth.go |  2 +-
 .../pkg/deployer/opcm/delayed_weth_test.go    | 62 ++++++++++++-------
 .../scripts/deploy/DeployDelayedWETH.s.sol    | 45 +++-----------
 5 files changed, 61 insertions(+), 67 deletions(-)

diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index 1209043d31d7..aa9eea361ac2 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -37,6 +37,7 @@ type DelayedWETHConfig struct {
 	PrivateKey       string
 	Logger           log.Logger
 	ArtifactsLocator *artifacts2.Locator
+	DelayedWethImpl  common.Address
 
 	privateKeyECDSA *ecdsa.PrivateKey
 }
@@ -90,11 +91,13 @@ func NewDelayedWETHConfigFromClI(cliCtx *cli.Context, l log.Logger) (DelayedWETH
 	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
 		return DelayedWETHConfig{}, fmt.Errorf("failed to parse artifacts URL: %w", err)
 	}
+	delayedWethImpl := common.HexToAddress(cliCtx.String(DelayedWethImplFlagName))
 	config := DelayedWETHConfig{
 		L1RPCUrl:         l1RPCUrl,
 		PrivateKey:       privateKey,
 		Logger:           l,
 		ArtifactsLocator: artifactsLocator,
+		DelayedWethImpl:  delayedWethImpl,
 	}
 	return config, nil
 }
@@ -134,10 +137,6 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 	if err != nil {
 		return fmt.Errorf("error getting superchain config: %w", err)
 	}
-	standardVersionsTOML, err := standard.L1VersionsDataFor(chainIDU64)
-	if err != nil {
-		return fmt.Errorf("error getting standard versions TOML: %w", err)
-	}
 	proxyAdmin, err := standard.ManagerOwnerAddrFor(chainIDU64)
 	if err != nil {
 		return fmt.Errorf("error getting superchain proxy admin: %w", err)
@@ -210,9 +209,9 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		host,
 		opcm.DeployDelayedWETHInput{
 			Release:               release,
-			StandardVersionsToml:  standardVersionsTOML,
 			ProxyAdmin:            proxyAdmin,
 			SuperchainConfigProxy: superchainConfigAddr,
+			DelayedWethImpl:       cfg.DelayedWethImpl,
 			DelayedWethOwner:      delayedWethOwner,
 			DelayedWethDelay:      big.NewInt(604800),
 		},
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index 1832a3122edc..f6a130f075a0 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -26,13 +26,14 @@ const (
 	SplitDepthFlagName                      = "split-depth"
 	ClockExtensionFlagName                  = "clock-extension"
 	MaxClockDurationFlagName                = "max-clock-duration"
-	DelayedWethProxyFlagName                = "delayed-weth-proxy"
 	AnchorStateRegistryProxyFlagName        = "anchor-state-registry-proxy"
 	L2ChainIdFlagName                       = "l2-chain-id"
 	ProposerFlagName                        = "proposer"
 	ChallengerFlagName                      = "challenger"
 	PreimageOracleFlagName                  = "preimage-oracle"
 	ReleaseFlagName                         = "release"
+	DelayedWethProxyFlagName                = "delayed-weth-proxy"
+	DelayedWethImplFlagName                 = "delayed-weth-impl"
 )
 
 var (
@@ -128,6 +129,12 @@ var (
 		Usage:   "Delayed WETH proxy.",
 		EnvVars: deployer.PrefixEnvVar("DELAYED_WETH_PROXY"),
 	}
+	DelayedWethImplFlag = &cli.StringFlag{
+		Name:    DelayedWethImplFlagName,
+		Usage:   "Delayed WETH implementation.",
+		EnvVars: deployer.PrefixEnvVar("DELAYED_WETH_IMPL"),
+		Value:   common.Address{}.Hex(),
+	}
 	AnchorStateRegistryProxyFlag = &cli.StringFlag{
 		Name:    AnchorStateRegistryProxyFlagName,
 		Usage:   "Anchor state registry proxy.",
@@ -182,6 +189,7 @@ var DelayedWETHFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
 	ArtifactsLocatorFlag,
+	DelayedWethImplFlag,
 }
 
 var DisputeGameFlags = []cli.Flag{
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth.go b/op-deployer/pkg/deployer/opcm/delayed_weth.go
index d94e25cb9092..8a0623dd468e 100644
--- a/op-deployer/pkg/deployer/opcm/delayed_weth.go
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth.go
@@ -11,9 +11,9 @@ import (
 
 type DeployDelayedWETHInput struct {
 	Release               string
-	StandardVersionsToml  string
 	ProxyAdmin            common.Address
 	SuperchainConfigProxy common.Address
+	DelayedWethImpl       common.Address
 	DelayedWethOwner      common.Address
 	DelayedWethDelay      *big.Int
 }
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth_test.go b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
index 071afe89fdbe..3a8be1b3e0d6 100644
--- a/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
@@ -17,29 +16,44 @@ import (
 func TestDeployDelayedWETH(t *testing.T) {
 	_, artifacts := testutil.LocalArtifacts(t)
 
-	host, err := env.DefaultScriptHost(
-		broadcaster.NoopBroadcaster(),
-		testlog.Logger(t, log.LevelInfo),
-		common.Address{'D'},
-		artifacts,
-	)
-	require.NoError(t, err)
-
-	standardVersionsTOML, err := standard.L1VersionsDataFor(11155111)
-	require.NoError(t, err)
-
-	input := DeployDelayedWETHInput{
-		Release:               "dev",
-		StandardVersionsToml:  standardVersionsTOML,
-		ProxyAdmin:            common.Address{'P'},
-		SuperchainConfigProxy: common.Address{'S'},
-		DelayedWethOwner:      common.Address{'O'},
-		DelayedWethDelay:      big.NewInt(100),
+	testCases := []struct {
+		TestName string
+		Impl     common.Address
+	}{
+		{
+			TestName: "ExistingImpl",
+			Impl:     common.Address{'I'},
+		},
+		{
+			TestName: "NoExistingImpl",
+			Impl:     common.Address{},
+		},
 	}
 
-	output, err := DeployDelayedWETH(host, input)
-	require.NoError(t, err)
-
-	require.NotEmpty(t, output.DelayedWethImpl)
-	require.NotEmpty(t, output.DelayedWethProxy)
+	for _, testCase := range testCases {
+		t.Run(testCase.TestName, func(t *testing.T) {
+			host, err := env.DefaultScriptHost(
+				broadcaster.NoopBroadcaster(),
+				testlog.Logger(t, log.LevelInfo),
+				common.Address{'D'},
+				artifacts,
+			)
+			require.NoError(t, err)
+
+			input := DeployDelayedWETHInput{
+				Release:               "dev",
+				ProxyAdmin:            common.Address{'P'},
+				SuperchainConfigProxy: common.Address{'S'},
+				DelayedWethImpl:       testCase.Impl,
+				DelayedWethOwner:      common.Address{'O'},
+				DelayedWethDelay:      big.NewInt(100),
+			}
+
+			output, err := DeployDelayedWETH(host, input)
+			require.NoError(t, err)
+
+			require.NotEmpty(t, output.DelayedWethImpl)
+			require.NotEmpty(t, output.DelayedWethProxy)
+		})
+	}
 }
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
index c450b1f155ea..eb386f2ff406 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployDelayedWETH.s.sol
@@ -20,9 +20,9 @@ import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
 contract DeployDelayedWETHInput is BaseDeployIO {
     /// Required inputs.
     string internal _release;
-    string internal _standardVersionsToml;
     address public _proxyAdmin;
     ISuperchainConfig public _superchainConfigProxy;
+    address public _delayedWethImpl;
     address public _delayedWethOwner;
     uint256 public _delayedWethDelay;
 
@@ -45,6 +45,8 @@ contract DeployDelayedWETHInput is BaseDeployIO {
         } else if (_sel == this.delayedWethOwner.selector) {
             require(_value != address(0), "DeployDelayedWETH: delayedWethOwner cannot be zero address");
             _delayedWethOwner = _value;
+        } else if (_sel == this.delayedWethImpl.selector) {
+            _delayedWethImpl = _value;
         } else {
             revert("DeployDelayedWETH: unknown selector");
         }
@@ -54,9 +56,6 @@ contract DeployDelayedWETHInput is BaseDeployIO {
         if (_sel == this.release.selector) {
             require(!LibString.eq(_value, ""), "DeployDelayedWETH: release cannot be empty");
             _release = _value;
-        } else if (_sel == this.standardVersionsToml.selector) {
-            require(!LibString.eq(_value, ""), "DeployDelayedWETH: standardVersionsToml cannot be empty");
-            _standardVersionsToml = _value;
         } else {
             revert("DeployDelayedWETH: unknown selector");
         }
@@ -67,11 +66,6 @@ contract DeployDelayedWETHInput is BaseDeployIO {
         return _release;
     }
 
-    function standardVersionsToml() public view returns (string memory) {
-        require(!LibString.eq(_standardVersionsToml, ""), "DeployDelayedWETH: standardVersionsToml not set");
-        return _standardVersionsToml;
-    }
-
     function proxyAdmin() public view returns (address) {
         require(_proxyAdmin != address(0), "DeployDelayedWETH: proxyAdmin not set");
         return _proxyAdmin;
@@ -82,6 +76,11 @@ contract DeployDelayedWETHInput is BaseDeployIO {
         return _superchainConfigProxy;
     }
 
+    function delayedWethImpl() public view returns (address) {
+        require(_delayedWethImpl != address(0), "DeployDelayedWETH: delayedWethImpl not set");
+        return _delayedWethImpl;
+    }
+
     function delayedWethOwner() public view returns (address) {
         require(_delayedWethOwner != address(0), "DeployDelayedWETH: delayedWethOwner not set");
         return _delayedWethOwner;
@@ -166,11 +165,9 @@ contract DeployDelayedWETH is Script {
 
     function deployDelayedWethImpl(DeployDelayedWETHInput _dwi, DeployDelayedWETHOutput _dwo) internal {
         string memory release = _dwi.release();
-        string memory stdVerToml = _dwi.standardVersionsToml();
-        string memory contractName = "delayed_weth";
         IDelayedWETH impl;
 
-        address existingImplementation = getReleaseAddress(release, contractName, stdVerToml);
+        address existingImplementation = _dwi.delayedWethImpl();
         if (existingImplementation != address(0)) {
             impl = IDelayedWETH(payable(existingImplementation));
         } else if (isDevelopRelease(release)) {
@@ -214,30 +211,6 @@ contract DeployDelayedWETH is Script {
         _dwo.set(_dwo.delayedWethProxy.selector, address(proxy));
     }
 
-    // Zero address is returned if the address is not found in '_standardVersionsToml'.
-    function getReleaseAddress(
-        string memory _version,
-        string memory _contractName,
-        string memory _standardVersionsToml
-    )
-        internal
-        pure
-        returns (address addr_)
-    {
-        string memory baseKey = string.concat('.releases["', _version, '"].', _contractName);
-        string memory implAddressKey = string.concat(baseKey, ".implementation_address");
-        string memory addressKey = string.concat(baseKey, ".address");
-        try vm.parseTomlAddress(_standardVersionsToml, implAddressKey) returns (address parsedAddr_) {
-            addr_ = parsedAddr_;
-        } catch {
-            try vm.parseTomlAddress(_standardVersionsToml, addressKey) returns (address parsedAddr_) {
-                addr_ = parsedAddr_;
-            } catch {
-                addr_ = address(0);
-            }
-        }
-    }
-
     // A release is considered a 'develop' release if it does not start with 'op-contracts'.
     function isDevelopRelease(string memory _release) internal pure returns (bool) {
         return !LibString.startsWith(_release, "op-contracts");

From 94056b990146b90f70035f74a35ce5526090afaf Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Thu, 5 Dec 2024 14:01:04 +1000
Subject: [PATCH 373/451] op-challenger, op-program: Require specific opt-in to
 use the custom config chain ID indicator (#13217)

* op-challenger: Support --cannon-l2-chain-id to pass chain ID through to op-program.

* op-program: Default to assuming configs are available in client.

Provide a --l2.custom flag to set the chain ID to the custom chain indicator so the client will load configs via the preimage oracle.
Since loading configs via the preimage oracle doesn't work on-chain, this is a safer and simpler default now that op-program can be built
with custom configs embedded.

* op-challenger: Switch to custom L2 flag instead of specifying chain ID

* op-challenger: Fix boolean option in op-program execution.

* op-e2e: Set custom L2 flag in precompiles test
---
 op-challenger/cmd/main_test.go                | 13 ++-
 op-challenger/flags/flags.go                  | 25 ++++--
 op-challenger/game/fault/trace/vm/executor.go |  1 +
 .../trace/vm/op_program_server_executor.go    |  3 +
 .../vm/op_program_server_executor_test.go     | 13 +++
 op-e2e/e2eutils/challenger/helper.go          |  1 +
 op-e2e/faultproofs/precompile_test.go         |  1 +
 op-program/host/cmd/main_test.go              | 25 ++++++
 op-program/host/config/config.go              | 80 ++++++++++---------
 op-program/host/config/config_test.go         |  7 +-
 op-program/host/flags/flags.go                | 12 +++
 op-program/host/kvstore/local.go              | 14 +---
 op-program/host/kvstore/local_test.go         | 18 +++--
 13 files changed, 147 insertions(+), 66 deletions(-)

diff --git a/op-challenger/cmd/main_test.go b/op-challenger/cmd/main_test.go
index 52c9c6c4d9f0..018b8b423c33 100644
--- a/op-challenger/cmd/main_test.go
+++ b/op-challenger/cmd/main_test.go
@@ -765,7 +765,7 @@ func TestCannonRequiredArgs(t *testing.T) {
 		t.Run(fmt.Sprintf("TestMustNotSpecifyCannonNetworkAndRollup-%v", traceType), func(t *testing.T) {
 			verifyArgsInvalid(
 				t,
-				"flag cannon-network can not be used with cannon-rollup-config and cannon-l2-genesis",
+				"flag cannon-network can not be used with cannon-rollup-config, cannon-l2-genesis or cannon-l2-custom",
 				addRequiredArgsExcept(traceType, "--cannon-network",
 					"--cannon-network", cannonNetwork, "--cannon-rollup-config=rollup.json"))
 		})
@@ -777,9 +777,10 @@ func TestCannonRequiredArgs(t *testing.T) {
 			args["--network"] = cannonNetwork
 			args["--cannon-rollup-config"] = "rollup.json"
 			args["--cannon-l2-genesis"] = "gensis.json"
+			args["--cannon-l2-custom"] = "true"
 			verifyArgsInvalid(
 				t,
-				"flag network can not be used with cannon-rollup-config and cannon-l2-genesis",
+				"flag network can not be used with cannon-rollup-config, cannon-l2-genesis or cannon-l2-custom",
 				toArgList(args))
 		})
 
@@ -813,6 +814,14 @@ func TestCannonRequiredArgs(t *testing.T) {
 			})
 		})
 
+		t.Run(fmt.Sprintf("TestSetCannonL2ChainId-%v", traceType), func(t *testing.T) {
+			cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--cannon-network",
+				"--cannon-rollup-config=rollup.json",
+				"--cannon-l2-genesis=genesis.json",
+				"--cannon-l2-custom"))
+			require.True(t, cfg.Cannon.L2Custom)
+		})
+
 		t.Run(fmt.Sprintf("TestCannonRollupConfig-%v", traceType), func(t *testing.T) {
 			t.Run("NotRequiredForAlphabetTrace", func(t *testing.T) {
 				configForArgs(t, addRequiredArgsExcept(types.TraceTypeAlphabet, "--cannon-rollup-config"))
diff --git a/op-challenger/flags/flags.go b/op-challenger/flags/flags.go
index 19d6bc79042e..3face06bdc80 100644
--- a/op-challenger/flags/flags.go
+++ b/op-challenger/flags/flags.go
@@ -115,6 +115,14 @@ var (
 		Usage:   fmt.Sprintf("Deprecated: Use %v instead", flags.NetworkFlagName),
 		EnvVars: prefixEnvVars("CANNON_NETWORK"),
 	}
+	CannonL2CustomFlag = &cli.BoolFlag{
+		Name: "cannon-l2-custom",
+		Usage: "Notify the op-program host that the L2 chain uses custom config to be loaded via the preimage oracle. " +
+			"WARNING: This is incompatible with on-chain testing and must only be used for testing purposes.",
+		EnvVars: prefixEnvVars("CANNON_L2_CUSTOM"),
+		Value:   false,
+		Hidden:  true,
+	}
 	CannonRollupConfigFlag = &cli.StringFlag{
 		Name:    "cannon-rollup-config",
 		Usage:   "Rollup chain parameters (cannon trace type only)",
@@ -249,6 +257,7 @@ var optionalFlags = []cli.Flag{
 	AdditionalBondClaimants,
 	GameAllowlistFlag,
 	CannonNetworkFlag,
+	CannonL2CustomFlag,
 	CannonRollupConfigFlag,
 	CannonL2GenesisFlag,
 	CannonBinFlag,
@@ -296,14 +305,17 @@ func CheckCannonFlags(ctx *cli.Context) error {
 			CannonNetworkFlag.Name, flags.NetworkFlagName, CannonRollupConfigFlag.Name, CannonL2GenesisFlag.Name)
 	}
 	if ctx.IsSet(flags.NetworkFlagName) &&
-		(ctx.IsSet(CannonRollupConfigFlag.Name) || ctx.IsSet(CannonL2GenesisFlag.Name)) {
-		return fmt.Errorf("flag %v can not be used with %v and %v",
-			flags.NetworkFlagName, CannonRollupConfigFlag.Name, CannonL2GenesisFlag.Name)
+		(ctx.IsSet(CannonRollupConfigFlag.Name) || ctx.IsSet(CannonL2GenesisFlag.Name) || ctx.Bool(CannonL2CustomFlag.Name)) {
+		return fmt.Errorf("flag %v can not be used with %v, %v or %v",
+			flags.NetworkFlagName, CannonRollupConfigFlag.Name, CannonL2GenesisFlag.Name, CannonL2CustomFlag.Name)
 	}
 	if ctx.IsSet(CannonNetworkFlag.Name) &&
-		(ctx.IsSet(CannonRollupConfigFlag.Name) || ctx.IsSet(CannonL2GenesisFlag.Name)) {
-		return fmt.Errorf("flag %v can not be used with %v and %v",
-			CannonNetworkFlag.Name, CannonRollupConfigFlag.Name, CannonL2GenesisFlag.Name)
+		(ctx.IsSet(CannonRollupConfigFlag.Name) || ctx.IsSet(CannonL2GenesisFlag.Name) || ctx.Bool(CannonL2CustomFlag.Name)) {
+		return fmt.Errorf("flag %v can not be used with %v, %v or %v",
+			CannonNetworkFlag.Name, CannonRollupConfigFlag.Name, CannonL2GenesisFlag.Name, CannonL2CustomFlag.Name)
+	}
+	if ctx.Bool(CannonL2CustomFlag.Name) && !(ctx.IsSet(CannonRollupConfigFlag.Name) && ctx.IsSet(CannonL2GenesisFlag.Name)) {
+		return fmt.Errorf("flag %v and %v must be set when %v is true", CannonRollupConfigFlag.Name, CannonL2GenesisFlag.Name, CannonL2CustomFlag.Name)
 	}
 	if !ctx.IsSet(CannonBinFlag.Name) {
 		return fmt.Errorf("flag %s is required", CannonBinFlag.Name)
@@ -563,6 +575,7 @@ func NewConfigFromCLI(ctx *cli.Context, logger log.Logger) (*config.Config, erro
 			VmBin:            ctx.String(CannonBinFlag.Name),
 			Server:           ctx.String(CannonServerFlag.Name),
 			Network:          cannonNetwork,
+			L2Custom:         ctx.Bool(CannonL2CustomFlag.Name),
 			RollupConfigPath: ctx.String(CannonRollupConfigFlag.Name),
 			L2GenesisPath:    ctx.String(CannonL2GenesisFlag.Name),
 			SnapshotFreq:     ctx.Uint(CannonSnapshotFreqFlag.Name),
diff --git a/op-challenger/game/fault/trace/vm/executor.go b/op-challenger/game/fault/trace/vm/executor.go
index 9e2cd0d29e93..524124a6eab5 100644
--- a/op-challenger/game/fault/trace/vm/executor.go
+++ b/op-challenger/game/fault/trace/vm/executor.go
@@ -41,6 +41,7 @@ type Config struct {
 	L2               string
 	Server           string // Path to the executable that provides the pre-image oracle server
 	Network          string
+	L2Custom         bool
 	RollupConfigPath string
 	L2GenesisPath    string
 }
diff --git a/op-challenger/game/fault/trace/vm/op_program_server_executor.go b/op-challenger/game/fault/trace/vm/op_program_server_executor.go
index 1b62e42938e7..c353b1a4a162 100644
--- a/op-challenger/game/fault/trace/vm/op_program_server_executor.go
+++ b/op-challenger/game/fault/trace/vm/op_program_server_executor.go
@@ -54,5 +54,8 @@ func (s *OpProgramServerExecutor) OracleCommand(cfg Config, dataDir string, inpu
 		logLevel = "CRIT"
 	}
 	args = append(args, "--log.level", logLevel)
+	if cfg.L2Custom {
+		args = append(args, "--l2.custom")
+	}
 	return args, nil
 }
diff --git a/op-challenger/game/fault/trace/vm/op_program_server_executor_test.go b/op-challenger/game/fault/trace/vm/op_program_server_executor_test.go
index 90fad9507b90..8cf69534c7b0 100644
--- a/op-challenger/game/fault/trace/vm/op_program_server_executor_test.go
+++ b/op-challenger/game/fault/trace/vm/op_program_server_executor_test.go
@@ -19,6 +19,12 @@ func TestOpProgramFillHostCommand(t *testing.T) {
 	toPairs := func(args []string) map[string]string {
 		pairs := make(map[string]string, len(args)/2)
 		for i := 0; i < len(args); i += 2 {
+			// l2.custom is a boolean flag so can't accept a value after a space
+			if args[i] == "--l2.custom" {
+				pairs[args[i]] = "true"
+				i--
+				continue
+			}
 			pairs[args[i]] = args[i+1]
 		}
 		return pairs
@@ -72,6 +78,13 @@ func TestOpProgramFillHostCommand(t *testing.T) {
 		require.Equal(t, "op-test", pairs["--network"])
 	})
 
+	t.Run("WithL2ChainID", func(t *testing.T) {
+		pairs := oracleCommand(t, log.LvlInfo, func(c *Config) {
+			c.L2Custom = true
+		})
+		require.Equal(t, "true", pairs["--l2.custom"])
+	})
+
 	t.Run("WithRollupConfigPath", func(t *testing.T) {
 		pairs := oracleCommand(t, log.LvlInfo, func(c *Config) {
 			c.RollupConfigPath = "rollup.config.json"
diff --git a/op-e2e/e2eutils/challenger/helper.go b/op-e2e/e2eutils/challenger/helper.go
index 8e31f1311e87..925e38856ed9 100644
--- a/op-e2e/e2eutils/challenger/helper.go
+++ b/op-e2e/e2eutils/challenger/helper.go
@@ -190,6 +190,7 @@ func NewChallengerConfig(t *testing.T, sys EndpointProvider, l2NodeName string,
 	l1Endpoint := sys.NodeEndpoint("l1").RPC()
 	l1Beacon := sys.L1BeaconEndpoint().RestHTTP()
 	cfg := config.NewConfig(common.Address{}, l1Endpoint, l1Beacon, sys.RollupEndpoint(l2NodeName).RPC(), sys.NodeEndpoint(l2NodeName).RPC(), t.TempDir())
+	cfg.Cannon.L2Custom = true
 	// The devnet can't set the absolute prestate output root because the contracts are deployed in L1 genesis
 	// before the L2 genesis is known.
 	cfg.AllowInvalidPrestate = true
diff --git a/op-e2e/faultproofs/precompile_test.go b/op-e2e/faultproofs/precompile_test.go
index 2beabfba54d6..89b2ff92d328 100644
--- a/op-e2e/faultproofs/precompile_test.go
+++ b/op-e2e/faultproofs/precompile_test.go
@@ -269,6 +269,7 @@ func runCannon(t *testing.T, ctx context.Context, sys *e2esys.System, inputs uti
 	dir := t.TempDir()
 	proofsDir := filepath.Join(dir, "cannon-proofs")
 	cfg := config.NewConfig(common.Address{}, l1Endpoint, l1Beacon, rollupEndpoint, l2Endpoint, dir)
+	cfg.Cannon.L2Custom = true
 	cannonOpts(&cfg)
 
 	logger := testlog.Logger(t, log.LevelInfo).New("role", "cannon")
diff --git a/op-program/host/cmd/main_test.go b/op-program/host/cmd/main_test.go
index 35ca46d2472d..9994e87100bd 100644
--- a/op-program/host/cmd/main_test.go
+++ b/op-program/host/cmd/main_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-program/chainconfig"
+	"github.com/ethereum-optimism/optimism/op-program/client"
 	"github.com/ethereum-optimism/optimism/op-program/host/config"
 	"github.com/ethereum-optimism/optimism/op-program/host/types"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
@@ -160,6 +161,30 @@ func TestL2Genesis(t *testing.T) {
 	})
 }
 
+func TestL2ChainID(t *testing.T) {
+	t.Run("DefaultToNetworkChainID", func(t *testing.T) {
+		cfg := configForArgs(t, replaceRequiredArg("--network", "op-mainnet"))
+		require.Equal(t, uint64(10), cfg.L2ChainID)
+	})
+
+	t.Run("DefaultToGenesisChainID", func(t *testing.T) {
+		rollupCfgFile := writeValidRollupConfig(t)
+		genesisFile := writeValidGenesis(t)
+		cfg := configForArgs(t, addRequiredArgsExcept("--network", "--rollup.config", rollupCfgFile, "--l2.genesis", genesisFile))
+		require.Equal(t, l2GenesisConfig.ChainID.Uint64(), cfg.L2ChainID)
+	})
+
+	t.Run("OverrideToCustomIndicator", func(t *testing.T) {
+		rollupCfgFile := writeValidRollupConfig(t)
+		genesisFile := writeValidGenesis(t)
+		cfg := configForArgs(t, addRequiredArgsExcept("--network",
+			"--rollup.config", rollupCfgFile,
+			"--l2.genesis", genesisFile,
+			"--l2.custom"))
+		require.Equal(t, client.CustomChainIDIndicator, cfg.L2ChainID)
+	})
+}
+
 func TestL2Head(t *testing.T) {
 	t.Run("Required", func(t *testing.T) {
 		verifyArgsInvalid(t, "flag l2.head is required", addRequiredArgsExcept("--l2.head"))
diff --git a/op-program/host/config/config.go b/op-program/host/config/config.go
index 46442e07f43d..7daf2d17918a 100644
--- a/op-program/host/config/config.go
+++ b/op-program/host/config/config.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-program/chainconfig"
+	"github.com/ethereum-optimism/optimism/op-program/client"
 	"github.com/ethereum-optimism/optimism/op-program/host/types"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -37,7 +38,8 @@ var (
 )
 
 type Config struct {
-	Rollup *rollup.Config
+	L2ChainID uint64
+	Rollup    *rollup.Config
 	// DataDir is the directory to read/write pre-image data from/to.
 	// If not set, an in-memory key-value store is used and fetching data must be enabled
 	DataDir string
@@ -75,9 +77,6 @@ type Config struct {
 	// ServerMode indicates that the program should run in pre-image server mode and wait for requests.
 	// No client program is run.
 	ServerMode bool
-
-	// IsCustomChainConfig indicates that the program uses a custom chain configuration
-	IsCustomChainConfig bool
 }
 
 func (c *Config) Check() error {
@@ -131,19 +130,23 @@ func NewConfig(
 	l2Claim common.Hash,
 	l2ClaimBlockNum uint64,
 ) *Config {
-	_, err := params.LoadOPStackChainConfig(l2Genesis.ChainID.Uint64())
-	isCustomConfig := err != nil
+	l2ChainID := l2Genesis.ChainID.Uint64()
+	_, err := params.LoadOPStackChainConfig(l2ChainID)
+	if err != nil {
+		// Unknown chain ID so assume it is custom
+		l2ChainID = client.CustomChainIDIndicator
+	}
 	return &Config{
-		Rollup:              rollupCfg,
-		L2ChainConfig:       l2Genesis,
-		L1Head:              l1Head,
-		L2Head:              l2Head,
-		L2OutputRoot:        l2OutputRoot,
-		L2Claim:             l2Claim,
-		L2ClaimBlockNumber:  l2ClaimBlockNum,
-		L1RPCKind:           sources.RPCKindStandard,
-		IsCustomChainConfig: isCustomConfig,
-		DataFormat:          types.DataFormatDirectory,
+		L2ChainID:          l2ChainID,
+		Rollup:             rollupCfg,
+		L2ChainConfig:      l2Genesis,
+		L1Head:             l1Head,
+		L2Head:             l2Head,
+		L2OutputRoot:       l2OutputRoot,
+		L2Claim:            l2Claim,
+		L2ClaimBlockNumber: l2ClaimBlockNum,
+		L1RPCKind:          sources.RPCKindStandard,
+		DataFormat:         types.DataFormatDirectory,
 	}
 }
 
@@ -177,7 +180,7 @@ func NewConfigFromCLI(log log.Logger, ctx *cli.Context) (*Config, error) {
 	var err error
 	var rollupCfg *rollup.Config
 	var l2ChainConfig *params.ChainConfig
-	var isCustomConfig bool
+	var l2ChainID uint64
 	networkName := ctx.String(flags.Network.Name)
 	if networkName != "" {
 		var chainID uint64
@@ -197,6 +200,7 @@ func NewConfigFromCLI(log log.Logger, ctx *cli.Context) (*Config, error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to load rollup config for chain %d: %w", chainID, err)
 		}
+		l2ChainID = chainID
 	} else {
 		l2GenesisPath := ctx.String(flags.L2GenesisPath.Name)
 		l2ChainConfig, err = loadChainConfigFromGenesis(l2GenesisPath)
@@ -210,7 +214,11 @@ func NewConfigFromCLI(log log.Logger, ctx *cli.Context) (*Config, error) {
 			return nil, fmt.Errorf("invalid rollup config: %w", err)
 		}
 
-		isCustomConfig = true
+		l2ChainID = l2ChainConfig.ChainID.Uint64()
+		if ctx.Bool(flags.L2Custom.Name) {
+			log.Warn("Using custom chain configuration via preimage oracle. This is not compatible with on-chain execution.")
+			l2ChainID = client.CustomChainIDIndicator
+		}
 	}
 
 	dbFormat := types.DataFormat(ctx.String(flags.DataFormat.Name))
@@ -218,24 +226,24 @@ func NewConfigFromCLI(log log.Logger, ctx *cli.Context) (*Config, error) {
 		return nil, fmt.Errorf("invalid %w: %v", ErrInvalidDataFormat, dbFormat)
 	}
 	return &Config{
-		Rollup:              rollupCfg,
-		DataDir:             ctx.String(flags.DataDir.Name),
-		DataFormat:          dbFormat,
-		L2URL:               ctx.String(flags.L2NodeAddr.Name),
-		L2ExperimentalURL:   ctx.String(flags.L2NodeExperimentalAddr.Name),
-		L2ChainConfig:       l2ChainConfig,
-		L2Head:              l2Head,
-		L2OutputRoot:        l2OutputRoot,
-		L2Claim:             l2Claim,
-		L2ClaimBlockNumber:  l2ClaimBlockNum,
-		L1Head:              l1Head,
-		L1URL:               ctx.String(flags.L1NodeAddr.Name),
-		L1BeaconURL:         ctx.String(flags.L1BeaconAddr.Name),
-		L1TrustRPC:          ctx.Bool(flags.L1TrustRPC.Name),
-		L1RPCKind:           sources.RPCProviderKind(ctx.String(flags.L1RPCProviderKind.Name)),
-		ExecCmd:             ctx.String(flags.Exec.Name),
-		ServerMode:          ctx.Bool(flags.Server.Name),
-		IsCustomChainConfig: isCustomConfig,
+		L2ChainID:          l2ChainID,
+		Rollup:             rollupCfg,
+		DataDir:            ctx.String(flags.DataDir.Name),
+		DataFormat:         dbFormat,
+		L2URL:              ctx.String(flags.L2NodeAddr.Name),
+		L2ExperimentalURL:  ctx.String(flags.L2NodeExperimentalAddr.Name),
+		L2ChainConfig:      l2ChainConfig,
+		L2Head:             l2Head,
+		L2OutputRoot:       l2OutputRoot,
+		L2Claim:            l2Claim,
+		L2ClaimBlockNumber: l2ClaimBlockNum,
+		L1Head:             l1Head,
+		L1URL:              ctx.String(flags.L1NodeAddr.Name),
+		L1BeaconURL:        ctx.String(flags.L1BeaconAddr.Name),
+		L1TrustRPC:         ctx.Bool(flags.L1TrustRPC.Name),
+		L1RPCKind:          sources.RPCProviderKind(ctx.String(flags.L1RPCProviderKind.Name)),
+		ExecCmd:            ctx.String(flags.Exec.Name),
+		ServerMode:         ctx.Bool(flags.Server.Name),
 	}, nil
 }
 
diff --git a/op-program/host/config/config_test.go b/op-program/host/config/config_test.go
index 971807d8d6b9..5c812f88fdae 100644
--- a/op-program/host/config/config_test.go
+++ b/op-program/host/config/config_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-program/chainconfig"
+	"github.com/ethereum-optimism/optimism/op-program/client"
 	"github.com/ethereum-optimism/optimism/op-program/host/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/params"
@@ -163,15 +164,15 @@ func TestRejectExecAndServerMode(t *testing.T) {
 	require.ErrorIs(t, err, ErrNoExecInServerMode)
 }
 
-func TestIsCustomChainConfig(t *testing.T) {
+func TestCustomL2ChainID(t *testing.T) {
 	t.Run("nonCustom", func(t *testing.T) {
 		cfg := validConfig()
-		require.Equal(t, cfg.IsCustomChainConfig, false)
+		require.Equal(t, cfg.L2ChainID, validL2Genesis.ChainID.Uint64())
 	})
 	t.Run("custom", func(t *testing.T) {
 		customChainConfig := &params.ChainConfig{ChainID: big.NewInt(0x1212121212)}
 		cfg := NewConfig(validRollupConfig, customChainConfig, validL1Head, validL2Head, validL2OutputRoot, validL2Claim, validL2ClaimBlockNum)
-		require.Equal(t, cfg.IsCustomChainConfig, true)
+		require.Equal(t, cfg.L2ChainID, client.CustomChainIDIndicator)
 	})
 
 }
diff --git a/op-program/host/flags/flags.go b/op-program/host/flags/flags.go
index b7c598451530..a8d5798c06c6 100644
--- a/op-program/host/flags/flags.go
+++ b/op-program/host/flags/flags.go
@@ -21,6 +21,14 @@ func prefixEnvVars(name string) []string {
 }
 
 var (
+	L2Custom = &cli.BoolFlag{
+		Name: "l2.custom",
+		Usage: "Override the L2 chain ID to the custom chain indicator for custom chain configuration not present in the client program. " +
+			"WARNING: This is not compatible with on-chain execution and must only be used for testing.",
+		EnvVars: prefixEnvVars("L2_CHAINID"),
+		Value:   false,
+		Hidden:  true,
+	}
 	RollupConfig = &cli.StringFlag{
 		Name:    "rollup.config",
 		Usage:   "Rollup chain parameters",
@@ -131,6 +139,7 @@ var requiredFlags = []cli.Flag{
 }
 
 var programFlags = []cli.Flag{
+	L2Custom,
 	RollupConfig,
 	Network,
 	DataDir,
@@ -167,6 +176,9 @@ func CheckRequired(ctx *cli.Context) error {
 	if ctx.String(L2GenesisPath.Name) != "" && network != "" {
 		return fmt.Errorf("cannot specify both %s and %s", L2GenesisPath.Name, Network.Name)
 	}
+	if ctx.Bool(L2Custom.Name) && rollupConfig == "" {
+		return fmt.Errorf("flag %s cannot be used with named networks", L2Custom.Name)
+	}
 	for _, flag := range requiredFlags {
 		if !ctx.IsSet(flag.Names()[0]) {
 			return fmt.Errorf("flag %s is required", flag.Names()[0])
diff --git a/op-program/host/kvstore/local.go b/op-program/host/kvstore/local.go
index b81b427e4150..1c1bfa803270 100644
--- a/op-program/host/kvstore/local.go
+++ b/op-program/host/kvstore/local.go
@@ -38,22 +38,14 @@ func (s *LocalPreimageSource) Get(key common.Hash) ([]byte, error) {
 	case l2ClaimBlockNumberKey:
 		return binary.BigEndian.AppendUint64(nil, s.config.L2ClaimBlockNumber), nil
 	case l2ChainIDKey:
-		// The CustomChainIDIndicator informs the client to rely on the L2ChainConfigKey to
-		// read the chain config. Otherwise, it'll attempt to read a non-existent hardcoded chain config
-		var chainID uint64
-		if s.config.IsCustomChainConfig {
-			chainID = client.CustomChainIDIndicator
-		} else {
-			chainID = s.config.L2ChainConfig.ChainID.Uint64()
-		}
-		return binary.BigEndian.AppendUint64(nil, chainID), nil
+		return binary.BigEndian.AppendUint64(nil, s.config.L2ChainID), nil
 	case l2ChainConfigKey:
-		if !s.config.IsCustomChainConfig {
+		if s.config.L2ChainID != client.CustomChainIDIndicator {
 			return nil, ErrNotFound
 		}
 		return json.Marshal(s.config.L2ChainConfig)
 	case rollupKey:
-		if !s.config.IsCustomChainConfig {
+		if s.config.L2ChainID != client.CustomChainIDIndicator {
 			return nil, ErrNotFound
 		}
 		return json.Marshal(s.config.Rollup)
diff --git a/op-program/host/kvstore/local_test.go b/op-program/host/kvstore/local_test.go
index 7d379024aa2e..6402f731cac7 100644
--- a/op-program/host/kvstore/local_test.go
+++ b/op-program/host/kvstore/local_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	preimage "github.com/ethereum-optimism/optimism/op-preimage"
+	"github.com/ethereum-optimism/optimism/op-program/client"
 	"github.com/ethereum-optimism/optimism/op-program/host/config"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/params"
@@ -15,6 +16,7 @@ import (
 
 func TestLocalPreimageSource(t *testing.T) {
 	cfg := &config.Config{
+		L2ChainID:          86,
 		Rollup:             chaincfg.OPSepolia(),
 		L1Head:             common.HexToHash("0x1111"),
 		L2OutputRoot:       common.HexToHash("0x2222"),
@@ -32,7 +34,7 @@ func TestLocalPreimageSource(t *testing.T) {
 		{"L2OutputRoot", l2OutputRootKey, cfg.L2OutputRoot.Bytes()},
 		{"L2Claim", l2ClaimKey, cfg.L2Claim.Bytes()},
 		{"L2ClaimBlockNumber", l2ClaimBlockNumberKey, binary.BigEndian.AppendUint64(nil, cfg.L2ClaimBlockNumber)},
-		{"L2ChainID", l2ChainIDKey, binary.BigEndian.AppendUint64(nil, cfg.L2ChainConfig.ChainID.Uint64())},
+		{"L2ChainID", l2ChainIDKey, binary.BigEndian.AppendUint64(nil, 86)},
 		{"Rollup", rollupKey, nil},             // Only available for custom chain configs
 		{"ChainConfig", l2ChainConfigKey, nil}, // Only available for custom chain configs
 		{"Unknown", preimage.LocalIndexKey(1000).PreimageKey(), nil},
@@ -52,13 +54,13 @@ func TestLocalPreimageSource(t *testing.T) {
 
 func TestGetCustomChainConfigPreimages(t *testing.T) {
 	cfg := &config.Config{
-		Rollup:              chaincfg.OPSepolia(),
-		IsCustomChainConfig: true,
-		L1Head:              common.HexToHash("0x1111"),
-		L2OutputRoot:        common.HexToHash("0x2222"),
-		L2Claim:             common.HexToHash("0x3333"),
-		L2ClaimBlockNumber:  1234,
-		L2ChainConfig:       params.SepoliaChainConfig,
+		Rollup:             chaincfg.OPSepolia(),
+		L2ChainID:          client.CustomChainIDIndicator,
+		L1Head:             common.HexToHash("0x1111"),
+		L2OutputRoot:       common.HexToHash("0x2222"),
+		L2Claim:            common.HexToHash("0x3333"),
+		L2ClaimBlockNumber: 1234,
+		L2ChainConfig:      params.SepoliaChainConfig,
 	}
 	source := NewLocalPreimageSource(cfg)
 	actualRollup, err := source.Get(rollupKey)

From 25972bd87766339f865991b05711c05f7e61bcaf Mon Sep 17 00:00:00 2001
From: mountcount <166301065+mountcount@users.noreply.github.com>
Date: Thu, 5 Dec 2024 23:15:57 +0800
Subject: [PATCH 374/451] chore: fix some problematic function names in comment
 (#13142)

Signed-off-by: mountcount <cuimoman@outlook.com>
---
 op-service/txmgr/send_state_test.go           | 2 +-
 op-supervisor/supervisor/frontend/frontend.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-service/txmgr/send_state_test.go b/op-service/txmgr/send_state_test.go
index d48db5fd1514..0da3d8ba19fa 100644
--- a/op-service/txmgr/send_state_test.go
+++ b/op-service/txmgr/send_state_test.go
@@ -58,7 +58,7 @@ func TestSendStateNoAbortAfterProcessOtherError(t *testing.T) {
 	require.Nil(t, sendState.CriticalError())
 }
 
-// TestSendStateAbortSafelyAfterNonceTooLowButNoTxMined asserts that we will abort after the very
+// TestSendStateAbortSafelyAfterNonceTooLowNoTxPublished asserts that we will abort after the very
 // first none-too-low error if a tx hasn't yet been published.
 func TestSendStateAbortSafelyAfterNonceTooLowNoTxPublished(t *testing.T) {
 	sendState := newSendState()
diff --git a/op-supervisor/supervisor/frontend/frontend.go b/op-supervisor/supervisor/frontend/frontend.go
index 0a5b70a4799a..6a43e1fedb0f 100644
--- a/op-supervisor/supervisor/frontend/frontend.go
+++ b/op-supervisor/supervisor/frontend/frontend.go
@@ -47,7 +47,7 @@ func (q *QueryFrontend) CheckMessage(identifier types.Identifier, payloadHash co
 	return q.Supervisor.CheckMessage(identifier, payloadHash)
 }
 
-// CheckMessage checks the safety-level of a collection of messages,
+// CheckMessages checks the safety-level of a collection of messages,
 // and returns if the minimum safety-level is met for all messages.
 func (q *QueryFrontend) CheckMessages(
 	messages []types.Message,

From 564b0c17198bff7c3eebc7c328e1bf57b9a46188 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Thu, 5 Dec 2024 23:19:29 +0800
Subject: [PATCH 375/451] NewChannelBuilder => newChannelBuilder, and move it
 into channel_builder_test.go (#13148)

---
 op-batcher/batcher/channel_builder.go      | 12 ----
 op-batcher/batcher/channel_builder_test.go | 67 +++++++++++++---------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/op-batcher/batcher/channel_builder.go b/op-batcher/batcher/channel_builder.go
index 597b5ed3e144..56069e5bf160 100644
--- a/op-batcher/batcher/channel_builder.go
+++ b/op-batcher/batcher/channel_builder.go
@@ -88,18 +88,6 @@ type ChannelBuilder struct {
 	outputBytes int
 }
 
-// NewChannelBuilder creates a new channel builder or returns an error if the
-// channel out could not be created.
-// it acts as a factory for either a span or singular channel out
-func NewChannelBuilder(cfg ChannelConfig, rollupCfg *rollup.Config, latestL1OriginBlockNum uint64) (*ChannelBuilder, error) {
-	co, err := NewChannelOut(cfg, rollupCfg)
-	if err != nil {
-		return nil, fmt.Errorf("creating channel out: %w", err)
-	}
-
-	return NewChannelBuilderWithChannelOut(cfg, rollupCfg, latestL1OriginBlockNum, co), nil
-}
-
 func NewChannelBuilderWithChannelOut(cfg ChannelConfig, rollupCfg *rollup.Config, latestL1OriginBlockNum uint64, channelOut derive.ChannelOut) *ChannelBuilder {
 	cb := &ChannelBuilder{
 		cfg:       cfg,
diff --git a/op-batcher/batcher/channel_builder_test.go b/op-batcher/batcher/channel_builder_test.go
index 6994186b7f07..a6cb9371f9c0 100644
--- a/op-batcher/batcher/channel_builder_test.go
+++ b/op-batcher/batcher/channel_builder_test.go
@@ -3,6 +3,7 @@ package batcher
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"math"
 	"math/big"
 	"math/rand"
@@ -27,6 +28,18 @@ var defaultTestRollupConfig = &rollup.Config{
 	L2ChainID: big.NewInt(1234),
 }
 
+// newChannelBuilder creates a new channel builder or returns an error if the
+// channel out could not be created.
+// it acts as a factory for either a span or singular channel out
+func newChannelBuilder(cfg ChannelConfig, rollupCfg *rollup.Config, latestL1OriginBlockNum uint64) (*ChannelBuilder, error) {
+	co, err := NewChannelOut(cfg, rollupCfg)
+	if err != nil {
+		return nil, fmt.Errorf("creating channel out: %w", err)
+	}
+
+	return NewChannelBuilderWithChannelOut(cfg, rollupCfg, latestL1OriginBlockNum, co), nil
+}
+
 // addMiniBlock adds a minimal valid L2 block to the channel builder using the
 // ChannelBuilder.AddBlock method.
 func addMiniBlock(cb *ChannelBuilder) error {
@@ -106,7 +119,7 @@ func FuzzDurationTimeoutZeroMaxChannelDuration(f *testing.F) {
 	f.Fuzz(func(t *testing.T, l1BlockNum uint64) {
 		channelConfig := defaultTestChannelConfig()
 		channelConfig.MaxChannelDuration = 0
-		cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+		cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 		require.NoError(t, err)
 		cb.timeout = 0
 		cb.updateDurationTimeout(l1BlockNum)
@@ -129,7 +142,7 @@ func FuzzChannelBuilder_DurationZero(f *testing.F) {
 		// Create the channel builder
 		channelConfig := defaultTestChannelConfig()
 		channelConfig.MaxChannelDuration = maxChannelDuration
-		cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+		cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 		require.NoError(t, err)
 
 		// Whenever the timeout is set to 0, the channel builder should have a duration timeout
@@ -156,7 +169,7 @@ func FuzzDurationTimeoutMaxChannelDuration(f *testing.F) {
 		// Create the channel builder
 		channelConfig := defaultTestChannelConfig()
 		channelConfig.MaxChannelDuration = maxChannelDuration
-		cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+		cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 		require.NoError(t, err)
 
 		// Whenever the timeout is greater than the l1BlockNum,
@@ -190,7 +203,7 @@ func FuzzChannelCloseTimeout(f *testing.F) {
 		channelConfig := defaultTestChannelConfig()
 		channelConfig.ChannelTimeout = channelTimeout
 		channelConfig.SubSafetyMargin = subSafetyMargin
-		cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+		cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 		require.NoError(t, err)
 
 		// Check the timeout
@@ -218,7 +231,7 @@ func FuzzChannelZeroCloseTimeout(f *testing.F) {
 		channelConfig := defaultTestChannelConfig()
 		channelConfig.ChannelTimeout = channelTimeout
 		channelConfig.SubSafetyMargin = subSafetyMargin
-		cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+		cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 		require.NoError(t, err)
 
 		// Check the timeout
@@ -245,7 +258,7 @@ func FuzzSeqWindowClose(f *testing.F) {
 		channelConfig := defaultTestChannelConfig()
 		channelConfig.SeqWindowSize = seqWindowSize
 		channelConfig.SubSafetyMargin = subSafetyMargin
-		cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+		cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 		require.NoError(t, err)
 
 		// Check the timeout
@@ -273,7 +286,7 @@ func FuzzSeqWindowZeroTimeoutClose(f *testing.F) {
 		channelConfig := defaultTestChannelConfig()
 		channelConfig.SeqWindowSize = seqWindowSize
 		channelConfig.SubSafetyMargin = subSafetyMargin
-		cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+		cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 		require.NoError(t, err)
 
 		// Check the timeout
@@ -321,7 +334,7 @@ func TestChannelBuilder_NextFrame(t *testing.T) {
 	channelConfig := defaultTestChannelConfig()
 
 	// Create a new channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// Mock the internals of `ChannelBuilder.outputFrame`
@@ -362,7 +375,7 @@ func ChannelBuilder_OutputWrongFramePanic(t *testing.T, batchType uint) {
 	channelConfig.BatchType = batchType
 
 	// Construct a channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// Mock the internals of `ChannelBuilder.outputFrame`
@@ -398,7 +411,7 @@ func TestChannelBuilder_OutputFrames(t *testing.T) {
 	channelConfig.InitNoneCompressor()
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.False(t, cb.IsFull())
 	require.Equal(t, 0, cb.PendingFrames())
@@ -452,7 +465,7 @@ func ChannelBuilder_OutputFrames_SpanBatch(t *testing.T, algo derive.Compression
 	channelConfig.InitRatioCompressor(1, algo)
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.False(t, cb.IsFull())
 	require.Equal(t, 0, cb.PendingFrames())
@@ -510,7 +523,7 @@ func ChannelBuilder_MaxRLPBytesPerChannel(t *testing.T, batchType uint) {
 	channelConfig.BatchType = batchType
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// Add a block that overflows the [ChannelOut]
@@ -532,7 +545,7 @@ func ChannelBuilder_MaxRLPBytesPerChannelFjord(t *testing.T, batchType uint) {
 	channelConfig.BatchType = batchType
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// Count how many a block that overflows the [ChannelOut]
@@ -553,7 +566,7 @@ func ChannelBuilder_MaxRLPBytesPerChannelFjord(t *testing.T, batchType uint) {
 	channelConfig.InitNoneCompressor()
 	channelConfig.BatchType = batchType
 
-	cb, err = NewChannelBuilder(channelConfig, rollupConfig, latestL1BlockOrigin)
+	cb, err = newChannelBuilder(channelConfig, rollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// try add double the amount of block, it should not error
@@ -576,7 +589,7 @@ func ChannelBuilder_OutputFramesMaxFrameIndex(t *testing.T, batchType uint) {
 	// Continuously add blocks until the max frame index is reached
 	// This should cause the [ChannelBuilder.OutputFrames] function
 	// to error
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.False(t, cb.IsFull())
 	require.Equal(t, 0, cb.PendingFrames())
@@ -612,7 +625,7 @@ func TestChannelBuilder_FullShadowCompressor(t *testing.T) {
 	}
 
 	cfg.InitShadowCompressor(derive.Zlib)
-	cb, err := NewChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(err)
 
 	rng := rand.New(rand.NewSource(420))
@@ -644,7 +657,7 @@ func ChannelBuilder_AddBlock(t *testing.T, batchType uint) {
 	channelConfig.InitRatioCompressor(1, derive.Zlib)
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// Add a nonsense block to the channel builder
@@ -670,7 +683,7 @@ func TestChannelBuilder_CheckTimeout(t *testing.T) {
 	channelConfig := defaultTestChannelConfig()
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// Assert timeout is setup correctly
@@ -695,7 +708,7 @@ func TestChannelBuilder_CheckTimeoutZeroMaxChannelDuration(t *testing.T) {
 	channelConfig.MaxChannelDuration = 0
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(channelConfig, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 
 	// Without a max channel duration, timeout should not be set
@@ -718,7 +731,7 @@ func TestChannelBuilder_FramePublished(t *testing.T) {
 	cfg.SubSafetyMargin = 100
 
 	// Construct the channel builder
-	cb, err := NewChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.Equal(t, latestL1BlockOrigin+cfg.MaxChannelDuration, cb.timeout)
 
@@ -735,7 +748,7 @@ func TestChannelBuilder_FramePublished(t *testing.T) {
 }
 
 func TestChannelBuilder_LatestL1Origin(t *testing.T) {
-	cb, err := NewChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.Equal(t, eth.BlockID{}, cb.LatestL1Origin())
 
@@ -757,7 +770,7 @@ func TestChannelBuilder_LatestL1Origin(t *testing.T) {
 }
 
 func TestChannelBuilder_OldestL1Origin(t *testing.T) {
-	cb, err := NewChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.Equal(t, eth.BlockID{}, cb.OldestL1Origin())
 
@@ -779,7 +792,7 @@ func TestChannelBuilder_OldestL1Origin(t *testing.T) {
 }
 
 func TestChannelBuilder_LatestL2(t *testing.T) {
-	cb, err := NewChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.Equal(t, eth.BlockID{}, cb.LatestL2())
 
@@ -801,7 +814,7 @@ func TestChannelBuilder_LatestL2(t *testing.T) {
 }
 
 func TestChannelBuilder_OldestL2(t *testing.T) {
-	cb, err := NewChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(defaultTestChannelConfig(), defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(t, err)
 	require.Equal(t, eth.BlockID{}, cb.OldestL2())
 
@@ -831,7 +844,7 @@ func ChannelBuilder_PendingFrames_TotalFrames(t *testing.T, batchType uint) {
 	cfg.TargetNumFrames = tnf
 	cfg.BatchType = batchType
 	cfg.InitShadowCompressor(derive.Zlib)
-	cb, err := NewChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(err)
 
 	// initial builder should be empty
@@ -876,7 +889,7 @@ func ChannelBuilder_InputBytes(t *testing.T, batchType uint) {
 		chainId := big.NewInt(1234)
 		spanBatch = derive.NewSpanBatch(uint64(0), chainId)
 	}
-	cb, err := NewChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(err)
 
 	require.Zero(cb.InputBytes())
@@ -913,7 +926,7 @@ func ChannelBuilder_OutputBytes(t *testing.T, batchType uint) {
 	cfg.TargetNumFrames = 16
 	cfg.BatchType = batchType
 	cfg.InitRatioCompressor(1.0, derive.Zlib)
-	cb, err := NewChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
+	cb, err := newChannelBuilder(cfg, defaultTestRollupConfig, latestL1BlockOrigin)
 	require.NoError(err, "NewChannelBuilder")
 
 	require.Zero(cb.OutputBytes())

From 0648499c5b166b8ae51d4a23d42981be0c44c583 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 5 Dec 2024 12:09:48 -0500
Subject: [PATCH 376/451] fix: codecov config (#13244)

---
 codecov.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/codecov.yml b/codecov.yml
index 96b195edabf9..8fd1bc517731 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,5 +1,6 @@
 codecov:
   require_ci_to_pass: false
+
 comment:
   layout: "diff, flags, files"
   behavior: default
@@ -12,8 +13,14 @@ ignore:
   - "**/*.t.sol"
   - "packages/contracts-bedrock/test/**/*.sol"
   - "packages/contracts-bedrock/scripts/**/*.sol"
-  - "packages/contracts-bedrock/contracts/vendor/WETH9.sol"
-  - 'packages/contracts-bedrock/contracts/EAS/**/*.sol'
+  - "packages/contracts-bedrock/src/vendor/**/*.sol"
+  - "packages/contracts-bedrock/src/interfaces/**/*.sol"
+  # TODO: add coverage for MIPS64 back once tests are merged in
+  - "packages/contracts-bedrock/src/cannon/MIPS64.sol"
+  - "packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol"
+  - "packages/contracts-bedrock/src/cannon/libraries/MIPS64State.sol"
+  - "packages/contracts-bedrock/src/cannon/libraries/MIPS64Syscalls.sol"
+
 coverage:
   status:
     patch:
@@ -26,16 +33,14 @@ coverage:
     project:
       default:
         informational: true
+
 flag_management:
   # Note: flags should have the same name as the circleci job in which they
   # are uploaded.
   individual_flags:
-    - name: contracts-bedrock-tests
+    - name: contracts-bedrock-coverage
       paths:
         - packages/contracts-bedrock/src
       statuses:
         - type: patch
           target: 100%
-    - name: bedrock-go-tests
-    - name: contracts-tests
-    - name: sdk-tests

From ee5c794dda5500ba452a45d88e3665fa5257efd0 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 5 Dec 2024 10:13:18 -0700
Subject: [PATCH 377/451] op-deployer: Clean up to use latest libs (#13257)

---
 .../pkg/deployer/bootstrap/delayed_weth.go    | 25 ++-----------
 .../pkg/deployer/bootstrap/dispute_game.go    | 25 ++-----------
 op-deployer/pkg/deployer/bootstrap/mips.go    | 16 ++++-----
 op-deployer/pkg/deployer/opcm/asterisc.go     | 36 +------------------
 op-deployer/pkg/deployer/opcm/delayed_weth.go | 35 +-----------------
 op-deployer/pkg/deployer/opcm/dispute_game.go | 32 +----------------
 op-deployer/pkg/deployer/opcm/mips.go         | 32 +----------------
 op-deployer/pkg/deployer/opcm/opchain.go      | 31 +---------------
 op-deployer/pkg/deployer/opcm/opcm.go         |  5 +--
 op-deployer/pkg/deployer/opcm/superchain.go   | 35 +-----------------
 10 files changed, 21 insertions(+), 251 deletions(-)

diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index aa9eea361ac2..9c3e0bc07fab 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -7,8 +7,6 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
-	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
 	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
@@ -165,35 +163,18 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
-	host, err := env.DefaultScriptHost(
+	host, err := env.DefaultForkedScriptHost(
+		ctx,
 		bcaster,
 		lgr,
 		chainDeployer,
 		artifactsFS,
-		script.WithForkHook(func(cfg *script.ForkConfig) (forking.ForkSource, error) {
-			src, err := forking.RPCSourceByNumber(cfg.URLOrAlias, l1RPC, *cfg.BlockNumber)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
-			}
-			return forking.Cache(src), nil
-		}),
+		l1RPC,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
 
-	latest, err := l1Client.HeaderByNumber(ctx, nil)
-	if err != nil {
-		return fmt.Errorf("failed to get latest block: %w", err)
-	}
-
-	if _, err := host.CreateSelectFork(
-		script.ForkWithURLOrAlias("main"),
-		script.ForkWithBlockNumberU256(latest.Number),
-	); err != nil {
-		return fmt.Errorf("failed to select fork: %w", err)
-	}
-
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
 		release = cfg.ArtifactsLocator.Tag
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
index 441fd73d9ea2..3f1d354f28fc 100644
--- a/op-deployer/pkg/deployer/bootstrap/dispute_game.go
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
-	"github.com/ethereum-optimism/optimism/op-chain-ops/script/forking"
 	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 	"github.com/ethereum/go-ethereum/rpc"
 
@@ -179,35 +177,18 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		return fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
-	host, err := env.DefaultScriptHost(
+	host, err := env.DefaultForkedScriptHost(
+		ctx,
 		bcaster,
 		lgr,
 		chainDeployer,
 		artifactsFS,
-		script.WithForkHook(func(forkCfg *script.ForkConfig) (forking.ForkSource, error) {
-			src, err := forking.RPCSourceByNumber(forkCfg.URLOrAlias, l1Rpc, *forkCfg.BlockNumber)
-			if err != nil {
-				return nil, fmt.Errorf("failed to create RPC fork source: %w", err)
-			}
-			return forking.Cache(src), nil
-		}),
+		l1Rpc,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create L1 script host: %w", err)
 	}
 
-	latest, err := l1Client.HeaderByNumber(ctx, nil)
-	if err != nil {
-		return fmt.Errorf("failed to get latest block: %w", err)
-	}
-
-	if _, err := host.CreateSelectFork(
-		script.ForkWithURLOrAlias("main"),
-		script.ForkWithBlockNumberU256(latest.Number),
-	); err != nil {
-		return fmt.Errorf("failed to select fork: %w", err)
-	}
-
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
 		release = cfg.ArtifactsLocator.Tag
diff --git a/op-deployer/pkg/deployer/bootstrap/mips.go b/op-deployer/pkg/deployer/bootstrap/mips.go
index efc1fd1c6e04..9c8fd555fb42 100644
--- a/op-deployer/pkg/deployer/bootstrap/mips.go
+++ b/op-deployer/pkg/deployer/bootstrap/mips.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/ethereum/go-ethereum/rpc"
+
 	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
 	"github.com/ethereum/go-ethereum/common"
 
@@ -123,11 +125,13 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 		}
 	}()
 
-	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
+	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
 		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
+	l1Client := ethclient.NewClient(l1RPC)
+
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to get chain ID: %w", err)
@@ -147,21 +151,17 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 		return fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
-	nonce, err := l1Client.NonceAt(ctx, chainDeployer, nil)
-	if err != nil {
-		return fmt.Errorf("failed to get starting nonce: %w", err)
-	}
-
-	host, err := env.DefaultScriptHost(
+	host, err := env.DefaultForkedScriptHost(
+		ctx,
 		bcaster,
 		lgr,
 		chainDeployer,
 		artifactsFS,
+		l1RPC,
 	)
 	if err != nil {
 		return fmt.Errorf("failed to create script host: %w", err)
 	}
-	host.SetNonce(chainDeployer, nonce)
 
 	var release string
 	if cfg.ArtifactsLocator.IsTag() {
diff --git a/op-deployer/pkg/deployer/opcm/asterisc.go b/op-deployer/pkg/deployer/opcm/asterisc.go
index 9ba8959e3543..053da43b4258 100644
--- a/op-deployer/pkg/deployer/opcm/asterisc.go
+++ b/op-deployer/pkg/deployer/opcm/asterisc.go
@@ -1,8 +1,6 @@
 package opcm
 
 import (
-	"fmt"
-
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -24,41 +22,9 @@ func (output *DeployAsteriscOutput) CheckOutput(input common.Address) error {
 	return nil
 }
 
-type DeployAsteriscScript struct {
-	Run func(input, output common.Address) error
-}
-
 func DeployAsterisc(
 	host *script.Host,
 	input DeployAsteriscInput,
 ) (DeployAsteriscOutput, error) {
-	var output DeployAsteriscOutput
-	inputAddr := host.NewScriptAddress()
-	outputAddr := host.NewScriptAddress()
-
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeployAsteriscInput](host, inputAddr, &input)
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployAsteriscInput precompile: %w", err)
-	}
-	defer cleanupInput()
-
-	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployAsteriscOutput](host, outputAddr, &output,
-		script.WithFieldSetter[*DeployAsteriscOutput])
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployAsteriscOutput precompile: %w", err)
-	}
-	defer cleanupOutput()
-
-	implContract := "DeployAsterisc"
-	deployScript, cleanupDeploy, err := script.WithScript[DeployAsteriscScript](host, "DeployAsterisc.s.sol", implContract)
-	if err != nil {
-		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
-	}
-	defer cleanupDeploy()
-
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
-		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
-	}
-
-	return output, nil
+	return RunBasicScript[DeployAsteriscInput, DeployAsteriscOutput](host, input, "DeployAsterisc.s.sol", "DeployAsterisc")
 }
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth.go b/op-deployer/pkg/deployer/opcm/delayed_weth.go
index 8a0623dd468e..06f533956f89 100644
--- a/op-deployer/pkg/deployer/opcm/delayed_weth.go
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth.go
@@ -1,7 +1,6 @@
 package opcm
 
 import (
-	"fmt"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -31,41 +30,9 @@ func (output *DeployDelayedWETHOutput) CheckOutput(input common.Address) error {
 	return nil
 }
 
-type DeployDelayedWETHScript struct {
-	Run func(input, output common.Address) error
-}
-
 func DeployDelayedWETH(
 	host *script.Host,
 	input DeployDelayedWETHInput,
 ) (DeployDelayedWETHOutput, error) {
-	var output DeployDelayedWETHOutput
-	inputAddr := host.NewScriptAddress()
-	outputAddr := host.NewScriptAddress()
-
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeployDelayedWETHInput](host, inputAddr, &input)
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployDelayedWETHInput precompile: %w", err)
-	}
-	defer cleanupInput()
-
-	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployDelayedWETHOutput](host, outputAddr, &output,
-		script.WithFieldSetter[*DeployDelayedWETHOutput])
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployDelayedWETHOutput precompile: %w", err)
-	}
-	defer cleanupOutput()
-
-	implContract := "DeployDelayedWETH"
-	deployScript, cleanupDeploy, err := script.WithScript[DeployDelayedWETHScript](host, "DeployDelayedWETH.s.sol", implContract)
-	if err != nil {
-		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
-	}
-	defer cleanupDeploy()
-
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
-		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
-	}
-
-	return output, nil
+	return RunBasicScript[DeployDelayedWETHInput, DeployDelayedWETHOutput](host, input, "DeployDelayedWETH.s.sol", "DeployDelayedWETH")
 }
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game.go b/op-deployer/pkg/deployer/opcm/dispute_game.go
index 481a401d07db..7128a08e8b02 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game.go
@@ -1,8 +1,6 @@
 package opcm
 
 import (
-	"fmt"
-
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -46,33 +44,5 @@ func DeployDisputeGame(
 	host *script.Host,
 	input DeployDisputeGameInput,
 ) (DeployDisputeGameOutput, error) {
-	var output DeployDisputeGameOutput
-	inputAddr := host.NewScriptAddress()
-	outputAddr := host.NewScriptAddress()
-
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeployDisputeGameInput](host, inputAddr, &input)
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployDisputeGameInput precompile: %w", err)
-	}
-	defer cleanupInput()
-
-	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployDisputeGameOutput](host, outputAddr, &output,
-		script.WithFieldSetter[*DeployDisputeGameOutput])
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployDisputeGameOutput precompile: %w", err)
-	}
-	defer cleanupOutput()
-
-	implContract := "DeployDisputeGame"
-	deployScript, cleanupDeploy, err := script.WithScript[DeployDisputeGameScript](host, "DeployDisputeGame.s.sol", implContract)
-	if err != nil {
-		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
-	}
-	defer cleanupDeploy()
-
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
-		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
-	}
-
-	return output, nil
+	return RunBasicScript[DeployDisputeGameInput, DeployDisputeGameOutput](host, input, "DeployDisputeGame.s.sol", "DeployDisputeGame")
 }
diff --git a/op-deployer/pkg/deployer/opcm/mips.go b/op-deployer/pkg/deployer/opcm/mips.go
index 5d1a7798cedb..6150b3088351 100644
--- a/op-deployer/pkg/deployer/opcm/mips.go
+++ b/op-deployer/pkg/deployer/opcm/mips.go
@@ -1,8 +1,6 @@
 package opcm
 
 import (
-	"fmt"
-
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -33,33 +31,5 @@ func DeployMIPS(
 	host *script.Host,
 	input DeployMIPSInput,
 ) (DeployMIPSOutput, error) {
-	var output DeployMIPSOutput
-	inputAddr := host.NewScriptAddress()
-	outputAddr := host.NewScriptAddress()
-
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeployMIPSInput](host, inputAddr, &input)
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployMIPSInput precompile: %w", err)
-	}
-	defer cleanupInput()
-
-	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployMIPSOutput](host, outputAddr, &output,
-		script.WithFieldSetter[*DeployMIPSOutput])
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployMIPSOutput precompile: %w", err)
-	}
-	defer cleanupOutput()
-
-	implContract := "DeployMIPS"
-	deployScript, cleanupDeploy, err := script.WithScript[DeployMIPSScript](host, "DeployMIPS.s.sol", implContract)
-	if err != nil {
-		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
-	}
-	defer cleanupDeploy()
-
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
-		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
-	}
-
-	return output, nil
+	return RunBasicScript[DeployMIPSInput, DeployMIPSOutput](host, input, "DeployMIPS.s.sol", "DeployMIPS")
 }
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index 8c7e60fec4d2..2a8664501337 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -88,36 +88,7 @@ func DeployOPChainIsthmus(host *script.Host, input DeployOPChainInputIsthmus) (D
 }
 
 func deployOPChain[T any](host *script.Host, input T) (DeployOPChainOutput, error) {
-	var dco DeployOPChainOutput
-	inputAddr := host.NewScriptAddress()
-	outputAddr := host.NewScriptAddress()
-
-	cleanupInput, err := script.WithPrecompileAtAddress[*T](host, inputAddr, &input)
-	if err != nil {
-		return dco, fmt.Errorf("failed to insert DeployOPChainInput precompile: %w", err)
-	}
-	defer cleanupInput()
-	host.Label(inputAddr, "DeployOPChainInput")
-
-	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployOPChainOutput](host, outputAddr, &dco,
-		script.WithFieldSetter[*DeployOPChainOutput])
-	if err != nil {
-		return dco, fmt.Errorf("failed to insert DeployOPChainOutput precompile: %w", err)
-	}
-	defer cleanupOutput()
-	host.Label(outputAddr, "DeployOPChainOutput")
-
-	deployScript, cleanupDeploy, err := script.WithScript[DeployOPChainScript](host, "DeployOPChain.s.sol", "DeployOPChain")
-	if err != nil {
-		return dco, fmt.Errorf("failed to load DeployOPChain script: %w", err)
-	}
-	defer cleanupDeploy()
-
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
-		return dco, fmt.Errorf("failed to run DeployOPChain script: %w", err)
-	}
-
-	return dco, nil
+	return RunBasicScript[T, DeployOPChainOutput](host, input, "DeployOPChain.s.sol", "DeployOPChain")
 }
 
 type ReadImplementationAddressesInput struct {
diff --git a/op-deployer/pkg/deployer/opcm/opcm.go b/op-deployer/pkg/deployer/opcm/opcm.go
index 9de3348be285..26179271b692 100644
--- a/op-deployer/pkg/deployer/opcm/opcm.go
+++ b/op-deployer/pkg/deployer/opcm/opcm.go
@@ -40,10 +40,7 @@ func DeployOPCM(
 	host *script.Host,
 	input DeployOPCMInput,
 ) (DeployOPCMOutput, error) {
-	scriptFile := "DeployOPCM.s.sol"
-	contractName := "DeployOPCM"
-
-	out, err := RunBasicScript[DeployOPCMInput, DeployOPCMOutput](host, input, scriptFile, contractName)
+	out, err := RunBasicScript[DeployOPCMInput, DeployOPCMOutput](host, input, "DeployOPCM.s.sol", "DeployOPCM")
 	if err != nil {
 		return DeployOPCMOutput{}, fmt.Errorf("failed to deploy OPCM: %w", err)
 	}
diff --git a/op-deployer/pkg/deployer/opcm/superchain.go b/op-deployer/pkg/deployer/opcm/superchain.go
index 4f648bbfa8a3..fcbccc3cea4a 100644
--- a/op-deployer/pkg/deployer/opcm/superchain.go
+++ b/op-deployer/pkg/deployer/opcm/superchain.go
@@ -1,7 +1,6 @@
 package opcm
 
 import (
-	"fmt"
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
@@ -53,37 +52,5 @@ type DeploySuperchainOpts struct {
 }
 
 func DeploySuperchain(h *script.Host, input DeploySuperchainInput) (DeploySuperchainOutput, error) {
-	var dso DeploySuperchainOutput
-
-	inputAddr := h.NewScriptAddress()
-	outputAddr := h.NewScriptAddress()
-
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeploySuperchainInput](h, inputAddr, &input)
-	if err != nil {
-		return dso, fmt.Errorf("failed to insert DeploySuperchainInput precompile: %w", err)
-	}
-	defer cleanupInput()
-
-	cleanupOutput, err := script.WithPrecompileAtAddress[*DeploySuperchainOutput](
-		h,
-		outputAddr,
-		&dso,
-		script.WithFieldSetter[*DeploySuperchainOutput],
-	)
-	if err != nil {
-		return dso, fmt.Errorf("failed to insert DeploySuperchainOutput precompile: %w", err)
-	}
-	defer cleanupOutput()
-
-	deployScript, cleanupDeploy, err := script.WithScript[DeploySuperchainScript](h, "DeploySuperchain.s.sol", "DeploySuperchain")
-	if err != nil {
-		return dso, fmt.Errorf("failed to load DeploySuperchain script: %w", err)
-	}
-	defer cleanupDeploy()
-
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
-		return dso, fmt.Errorf("failed to run DeploySuperchain script: %w", err)
-	}
-
-	return dso, nil
+	return RunBasicScript[DeploySuperchainInput, DeploySuperchainOutput](h, input, "DeploySuperchain.s.sol", "DeploySuperchain")
 }

From 1eb223d8d878237969c95bf3616b3e074b861d61 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Thu, 5 Dec 2024 14:11:05 -0600
Subject: [PATCH 378/451] interop: parallelized receipt fetching (#13044)

* interop: parallelized receipt fetching

* fix test

* remove elastic thread count

* Add Debug Message for Range Fetching

* rename end to last

* Remove Println

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 .../backend/processors/chain_processor.go     | 148 ++++++++++++++----
 1 file changed, 117 insertions(+), 31 deletions(-)

diff --git a/op-supervisor/supervisor/backend/processors/chain_processor.go b/op-supervisor/supervisor/backend/processors/chain_processor.go
index 688f68ac6119..1b4ffcc822e6 100644
--- a/op-supervisor/supervisor/backend/processors/chain_processor.go
+++ b/op-supervisor/supervisor/backend/processors/chain_processor.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -62,20 +63,23 @@ type ChainProcessor struct {
 	ctx    context.Context
 	cancel context.CancelFunc
 	wg     sync.WaitGroup
+
+	maxFetcherThreads int
 }
 
 func NewChainProcessor(log log.Logger, chain types.ChainID, processor LogProcessor, rewinder DatabaseRewinder, onIndexed func()) *ChainProcessor {
 	ctx, cancel := context.WithCancel(context.Background())
 	out := &ChainProcessor{
-		log:       log.New("chain", chain),
-		client:    nil,
-		chain:     chain,
-		processor: processor,
-		rewinder:  rewinder,
-		newHead:   make(chan struct{}, 1),
-		onIndexed: onIndexed,
-		ctx:       ctx,
-		cancel:    cancel,
+		log:               log.New("chain", chain),
+		client:            nil,
+		chain:             chain,
+		processor:         processor,
+		rewinder:          rewinder,
+		newHead:           make(chan struct{}, 1),
+		onIndexed:         onIndexed,
+		ctx:               ctx,
+		cancel:            cancel,
+		maxFetcherThreads: 10,
 	}
 	return out
 }
@@ -131,15 +135,15 @@ func (s *ChainProcessor) work() {
 		if s.ctx.Err() != nil { // check if we are closing down
 			return
 		}
+		_, err := s.rangeUpdate()
 		target := s.nextNum()
-		if err := s.update(target); err != nil {
+		if err != nil {
 			if errors.Is(err, ethereum.NotFound) {
 				s.log.Debug("Event-indexer cannot find next block yet", "target", target, "err", err)
 			} else if errors.Is(err, types.ErrNoRPCSource) {
 				s.log.Warn("No RPC source configured, cannot process new blocks")
 			} else {
 				s.log.Error("Failed to process new block", "err", err)
-				// idle until next update trigger
 			}
 		} else if x := s.lastHead.Load(); target+1 <= x {
 			s.log.Debug("Continuing with next block", "newTarget", target+1, "lastHead", x)
@@ -151,34 +155,115 @@ func (s *ChainProcessor) work() {
 	}
 }
 
-func (s *ChainProcessor) update(nextNum uint64) error {
+func (s *ChainProcessor) rangeUpdate() (int, error) {
 	s.clientLock.Lock()
 	defer s.clientLock.Unlock()
-
 	if s.client == nil {
-		return types.ErrNoRPCSource
+		return 0, types.ErrNoRPCSource
+	}
+
+	// define the range of blocks to fetch
+	// [next, last] inclusive with a max of s.fetcherThreads blocks
+	next := s.nextNum()
+	last := s.lastHead.Load()
+	// next is already beyond the end, nothing to do
+	if next > last {
+		return 0, nil
+	}
+	nums := make([]uint64, 0)
+	for i := next; i <= last; i++ {
+		nums = append(nums, i)
+		// only collect as many blocks as we can fetch in parallel
+		if len(nums) >= s.maxFetcherThreads {
+			break
+		}
+	}
+
+	s.log.Debug("Fetching blocks", "chain", s.chain.String(), "next", next, "last", last, "count", len(nums))
+
+	// make a structure to receive parallel results
+	type keyedResult struct {
+		num      uint64
+		blockRef *eth.BlockRef
+		receipts gethtypes.Receipts
+		err      error
+	}
+	parallelResults := make(chan keyedResult, len(nums))
+
+	// each thread will fetch a block and its receipts and send the result to the channel
+	fetch := func(wg *sync.WaitGroup, num uint64) {
+		defer wg.Done()
+		// ensure we emit the result at the end
+		result := keyedResult{num, nil, nil, nil}
+		defer func() { parallelResults <- result }()
+
+		// fetch the block ref
+		ctx, cancel := context.WithTimeout(s.ctx, time.Second*10)
+		nextL1, err := s.client.L1BlockRefByNumber(ctx, num)
+		cancel()
+		if err != nil {
+			result.err = err
+			return
+		}
+		next := eth.BlockRef{
+			Hash:       nextL1.Hash,
+			ParentHash: nextL1.ParentHash,
+			Number:     nextL1.Number,
+			Time:       nextL1.Time,
+		}
+		result.blockRef = &next
+
+		// fetch receipts
+		ctx, cancel = context.WithTimeout(s.ctx, time.Second*10)
+		_, receipts, err := s.client.FetchReceipts(ctx, next.Hash)
+		cancel()
+		if err != nil {
+			result.err = err
+			return
+		}
+		result.receipts = receipts
 	}
 
-	ctx, cancel := context.WithTimeout(s.ctx, time.Second*10)
-	nextL1, err := s.client.L1BlockRefByNumber(ctx, nextNum)
-	next := eth.BlockRef{
-		Hash:       nextL1.Hash,
-		ParentHash: nextL1.ParentHash,
-		Number:     nextL1.Number,
-		Time:       nextL1.Time,
+	// kick off the fetches and wait for them to complete
+	var wg sync.WaitGroup
+	for _, num := range nums {
+		wg.Add(1)
+		go fetch(&wg, num)
 	}
-	cancel()
-	if err != nil {
-		return fmt.Errorf("failed to fetch next block: %w", err)
+	wg.Wait()
+
+	// collect and sort the results
+	results := make([]keyedResult, len(nums))
+	for i := range nums {
+		result := <-parallelResults
+		results[i] = result
 	}
+	slices.SortFunc(results, func(a, b keyedResult) int {
+		if a.num < b.num {
+			return -1
+		}
+		if a.num > b.num {
+			return 1
+		}
+		return 0
+	})
 
-	// Try and fetch the receipts
-	ctx, cancel = context.WithTimeout(s.ctx, time.Second*10)
-	_, receipts, err := s.client.FetchReceipts(ctx, next.Hash)
-	cancel()
-	if err != nil {
-		return fmt.Errorf("failed to fetch receipts of block: %w", err)
+	// process the results in order and return the first error encountered,
+	// and the number of blocks processed successfully by this call
+	for i := range results {
+		if results[i].err != nil {
+			return i, fmt.Errorf("failed to fetch block %d: %w", results[i].num, results[i].err)
+		}
+		// process the receipts
+		err := s.process(s.ctx, *results[i].blockRef, results[i].receipts)
+		if err != nil {
+			return i, fmt.Errorf("failed to process block %d: %w", results[i].num, err)
+		}
 	}
+	return len(results), nil
+}
+
+func (s *ChainProcessor) process(ctx context.Context, next eth.BlockRef, receipts gethtypes.Receipts) error {
 	if err := s.processor.ProcessLogs(ctx, next, receipts); err != nil {
 		s.log.Error("Failed to process block", "block", next, "err", err)
 
@@ -187,7 +272,7 @@ func (s *ChainProcessor) update(nextNum uint64) error {
 		}
 
 		// Try to rewind the database to the previous block to remove any logs from this block that were written
-		if err := s.rewinder.Rewind(s.chain, nextNum-1); err != nil {
+		if err := s.rewinder.Rewind(s.chain, next.Number-1); err != nil {
 			// If any logs were written, our next attempt to write will fail and we'll retry this rewind.
 			// If no logs were written successfully then the rewind wouldn't have done anything anyway.
 			s.log.Error("Failed to rewind after error processing block", "block", next, "err", err)
@@ -197,6 +282,7 @@ func (s *ChainProcessor) update(nextNum uint64) error {
 	s.log.Info("Indexed block events", "block", next, "txs", len(receipts))
 	s.onIndexed()
 	return nil
+
 }
 
 func (s *ChainProcessor) OnNewHead(head eth.BlockRef) error {

From 9548d53a64f7ef738c2173620c90b28dc821950a Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 5 Dec 2024 14:02:25 -0700
Subject: [PATCH 379/451] op-conductor: Fix hang in testing (#13266)

I've found a [deadlock](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73846/workflows/19369ca9-9eaa-4021-9eb8-589a06e7bd34/jobs/3018041) in the op-conductor tests. The inner conductor loop is stuck waiting on a queue signal that never arrives, which in turn causes the test to hang since the coordinating waitgroup is never decremented. I believe this happens because the conductor's `queueAction` method is non-blocking, so nothing ever triggers conductor's inner loop when conductor start up. I've updated the code to use a blocking channel write when conductor starts to avoid this issue.

The traces of the deadlock look like this, for reference:

```
goroutine 227 [semacquire, 9 minutes]:

sync.runtime_Semacquire(0xc0004df577?)

	/usr/local/go/src/runtime/sema.go:62 +0x25

sync.(*WaitGroup).Wait(0x0?)

	/usr/local/go/src/sync/waitgroup.go:116 +0x48

github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).execute(0xc0003e4008, 0x0)

	/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:177 +0x65

github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).executeAction(...)

	/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:197

github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization(0xc0003e4008)

	/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:163 +0x93

github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).TestScenario4(0xc0003e4008)

	/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:420 +0x27

reflect.Value.call({0xc000131900?, 0xc0001b3740?, 0x1fed5b8?}, {0x191d63c, 0x4}, {0xc0004dff28, 0x1, 0x16f12e0?})

	/usr/local/go/src/reflect/value.go:596 +0xca6

reflect.Value.Call({0xc000131900?, 0xc0001b3740?, 0x28307b8?}, {0xc0004dff28?, 0xf?, 0x0?})

	/usr/local/go/src/reflect/value.go:380 +0xb9

github.com/stretchr/testify/suite.Run.func1(0xc0001f9ba0)

	/home/circleci/go/pkg/mod/github.com/stretchr/testify@v1.10.0/suite/suite.go:202 +0x4a5

testing.tRunner(0xc0001f9ba0, 0xc0001f4e10)

	/usr/local/go/src/testing/testing.go:1689 +0xfb

created by testing.(*T).Run in goroutine 166

	/usr/local/go/src/testing/testing.go:1742 +0x390

goroutine 229 [select, 9 minutes]:

github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loopAction(0xc00056ab40)

	/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:577 +0x14f

github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductorTestSuite).enableSynchronization.func1()

	/var/opt/circleci/data/workdir/op-conductor/conductor/service_test.go:159 +0x33

github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).loop(0xc00056ab40)

	/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:570 +0x99

created by github.com/ethereum-optimism/optimism/op-conductor/conductor.(*OpConductor).Start in goroutine 227

	/var/opt/circleci/data/workdir/op-conductor/conductor/service.go:376 +0x1f6

FAIL	github.com/ethereum-optimism/optimism/op-conductor/conductor	600.103s
```
---
 op-conductor/conductor/service.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/op-conductor/conductor/service.go b/op-conductor/conductor/service.go
index cccba2c76ac9..89948b614f06 100644
--- a/op-conductor/conductor/service.go
+++ b/op-conductor/conductor/service.go
@@ -381,7 +381,9 @@ func (oc *OpConductor) Start(ctx context.Context) error {
 	oc.log.Info("OpConductor started")
 	// queue an action in case sequencer is not in the desired state.
 	oc.prevState = NewState(oc.leader.Load(), oc.healthy.Load(), oc.seqActive.Load())
-	oc.queueAction()
+	// Immediately queue an action. This is made blocking to ensure that start is not
+	// considered complete until the first action is executed.
+	oc.actionCh <- struct{}{}
 
 	return nil
 }

From 750ed2025f4ef00c6c5a9f1ffee90c98fdeb39bf Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Fri, 6 Dec 2024 07:05:23 +1000
Subject: [PATCH 380/451] op-dispute-mon: Support asterisc kona game types.
 (#13270)

---
 op-dispute-mon/mon/extract/caller.go      | 3 ++-
 op-dispute-mon/mon/extract/caller_test.go | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/op-dispute-mon/mon/extract/caller.go b/op-dispute-mon/mon/extract/caller.go
index 03c130cd3dc8..0b88360b69ae 100644
--- a/op-dispute-mon/mon/extract/caller.go
+++ b/op-dispute-mon/mon/extract/caller.go
@@ -55,7 +55,8 @@ func (g *GameCallerCreator) CreateContract(ctx context.Context, game gameTypes.G
 		faultTypes.PermissionedGameType,
 		faultTypes.AsteriscGameType,
 		faultTypes.AlphabetGameType,
-		faultTypes.FastGameType:
+		faultTypes.FastGameType,
+		faultTypes.AsteriscKonaGameType:
 		fdg, err := contracts.NewFaultDisputeGameContract(ctx, g.m, game.Proxy, g.caller)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create fault dispute game contract: %w", err)
diff --git a/op-dispute-mon/mon/extract/caller_test.go b/op-dispute-mon/mon/extract/caller_test.go
index 065f06c051ac..61c7f349c82b 100644
--- a/op-dispute-mon/mon/extract/caller_test.go
+++ b/op-dispute-mon/mon/extract/caller_test.go
@@ -47,10 +47,14 @@ func TestMetadataCreator_CreateContract(t *testing.T) {
 			name: "validFastGameType",
 			game: types.GameMetadata{GameType: uint32(faultTypes.FastGameType), Proxy: fdgAddr},
 		},
+		{
+			name: "validAsteriscKonaGameType",
+			game: types.GameMetadata{GameType: uint32(faultTypes.AsteriscKonaGameType), Proxy: fdgAddr},
+		},
 		{
 			name:        "InvalidGameType",
-			game:        types.GameMetadata{GameType: 3, Proxy: fdgAddr},
-			expectedErr: fmt.Errorf("unsupported game type: 3"),
+			game:        types.GameMetadata{GameType: 4, Proxy: fdgAddr},
+			expectedErr: fmt.Errorf("unsupported game type: 4"),
 		},
 	}
 

From a8c8851e62cc1f2a053fa1d6500f5686aa54709c Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 5 Dec 2024 17:18:36 -0500
Subject: [PATCH 381/451] maint: remove unnecessary snapshots check script
 (#13248)

We can do this with a justfile recipe.

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 packages/contracts-bedrock/justfile             |  5 ++---
 .../scripts/checks/check-snapshots.sh           | 17 -----------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100755 packages/contracts-bedrock/scripts/checks/check-snapshots.sh

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 6a34cc6998d3..423ee453d6b6 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -130,11 +130,10 @@ gas-snapshot-check: build-go-ffi gas-snapshot-check-no-build
 
 # Checks if the snapshots are up to date without building.
 snapshots-check-no-build:
-  ./scripts/checks/check-snapshots.sh --no-build
+  just snapshots-no-build && git diff --exit-code snapshots
 
 # Checks if the snapshots are up to date.
-snapshots-check:
-  ./scripts/checks/check-snapshots.sh
+snapshots-check: build snapshots-check-no-build
 
 # Checks interface correctness without building.
 interfaces-check-no-build:
diff --git a/packages/contracts-bedrock/scripts/checks/check-snapshots.sh b/packages/contracts-bedrock/scripts/checks/check-snapshots.sh
deleted file mode 100755
index 18557eba52a5..000000000000
--- a/packages/contracts-bedrock/scripts/checks/check-snapshots.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Check for the --no-build flag
-# Generate snapshots
-if [ "${1:-}" == "--no-build" ]; then
-    just snapshots-no-build
-else
-    just snapshots
-fi
-
-# Check if the generated `snapshots` files are different from the committed versions
-if git diff --exit-code snapshots > /dev/null; then
-    [ -z "$(git ls-files --others --exclude-standard snapshots)" ] || exit 1
-else
-    exit 1
-fi

From ce72380799a777a15fd8fda75c36ce39aa8114f5 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 5 Dec 2024 15:42:55 -0700
Subject: [PATCH 382/451] op-conductor: Temporarily skip flaky test (#13276)

---
 op-conductor/conductor/service_test.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op-conductor/conductor/service_test.go b/op-conductor/conductor/service_test.go
index 87df417a4683..196c7e3456c2 100644
--- a/op-conductor/conductor/service_test.go
+++ b/op-conductor/conductor/service_test.go
@@ -876,5 +876,6 @@ func (s *OpConductorTestSuite) TestHandleInitError() {
 }
 
 func TestControlLoop(t *testing.T) {
+	t.Skipf("Skipping test, it's flaky and needs to be fixed")
 	suite.Run(t, new(OpConductorTestSuite))
 }

From 53b3af705c1100b3ee61d2c3eabf49847cf33c4a Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Thu, 5 Dec 2024 18:00:14 -0500
Subject: [PATCH 383/451] fix(op-challenger): Clarify `op-challenger
 create-game` flags (#13269)

---
 op-challenger/cmd/create_game.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/op-challenger/cmd/create_game.go b/op-challenger/cmd/create_game.go
index fdf3e9a4176e..1103df58c20c 100644
--- a/op-challenger/cmd/create_game.go
+++ b/op-challenger/cmd/create_game.go
@@ -18,11 +18,11 @@ import (
 )
 
 var (
-	TraceTypeFlag = &cli.StringFlag{
-		Name:    "trace-type",
-		Usage:   "Trace types to support.",
+	GameTypeFlag = &cli.StringFlag{
+		Name:    "game-type",
+		Usage:   "Game type to create (numeric values).",
 		EnvVars: opservice.PrefixEnvVar(flags.EnvVarPrefix, "TRACE_TYPE"),
-		Value:   types.TraceTypeCannon.String(),
+		Value:   types.CannonGameType.String(),
 	}
 	OutputRootFlag = &cli.StringFlag{
 		Name:    "output-root",
@@ -38,7 +38,7 @@ var (
 
 func CreateGame(ctx *cli.Context) error {
 	outputRoot := common.HexToHash(ctx.String(OutputRootFlag.Name))
-	traceType := ctx.Uint64(TraceTypeFlag.Name)
+	gameType := ctx.Uint64(GameTypeFlag.Name)
 	l2BlockNum := ctx.Uint64(L2BlockNumFlag.Name)
 
 	contract, txMgr, err := NewContractWithTxMgr[*contracts.DisputeGameFactoryContract](ctx, flags.FactoryAddress,
@@ -50,7 +50,7 @@ func CreateGame(ctx *cli.Context) error {
 	}
 
 	creator := tools.NewGameCreator(contract, txMgr)
-	gameAddr, err := creator.CreateGame(ctx.Context, outputRoot, traceType, l2BlockNum)
+	gameAddr, err := creator.CreateGame(ctx.Context, outputRoot, gameType, l2BlockNum)
 	if err != nil {
 		return fmt.Errorf("failed to create game: %w", err)
 	}
@@ -63,7 +63,7 @@ func createGameFlags() []cli.Flag {
 		flags.L1EthRpcFlag,
 		flags.NetworkFlag,
 		flags.FactoryAddressFlag,
-		TraceTypeFlag,
+		GameTypeFlag,
 		OutputRootFlag,
 		L2BlockNumFlag,
 	}

From 9dda729047bbe06160fbadf9f79a11f744e485ba Mon Sep 17 00:00:00 2001
From: Dmitry <98899785+mdqst@users.noreply.github.com>
Date: Fri, 6 Dec 2024 05:54:57 +0300
Subject: [PATCH 384/451] Typo fix Update flags.mk (#13226)

---
 just/flags.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/just/flags.mk b/just/flags.mk
index 121a3eb70e98..684562546a7c 100644
--- a/just/flags.mk
+++ b/just/flags.mk
@@ -7,7 +7,7 @@
 #
 # MAKEFLAGS is a string of the form:
 # "abc --foo --bar=baz -- VAR1=val1 VAR2=val2", namely:
-# - abc is the concatnation of all short flags
+# - abc is the concatenation of all short flags
 # - --foo and --bar=baz are long options,
 # - -- is the separator between flags and variable assignments,
 # - VAR1=val1 and VAR2=val2 are variable assignments
@@ -21,4 +21,4 @@
 tmp-flags := $(wordlist 2,$(words $(MAKEFLAGS)),$(MAKEFLAGS))
 # Then remove all long options, including the -- separator, if needed. That
 # leaves only variable assignments.
-JUSTFLAGS := $(patsubst --%,,$(tmp-flags))
\ No newline at end of file
+JUSTFLAGS := $(patsubst --%,,$(tmp-flags))

From d6fa448a2dffe67e571021b3c584a458c5ca2e9f Mon Sep 17 00:00:00 2001
From: Roberto Bayardo <roberto.bayardo@coinbase.com>
Date: Thu, 5 Dec 2024 18:57:40 -0800
Subject: [PATCH 385/451] increase the transaction throttling limit to allow
 >99% of transactions (#13047)

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-batcher/flags/flags.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-batcher/flags/flags.go b/op-batcher/flags/flags.go
index d5681ea87234..df8eca4a612f 100644
--- a/op-batcher/flags/flags.go
+++ b/op-batcher/flags/flags.go
@@ -171,7 +171,7 @@ var (
 	ThrottleTxSizeFlag = &cli.IntFlag{
 		Name:    "throttle-tx-size",
 		Usage:   "The DA size of transactions to start throttling when we are over the throttle threshold",
-		Value:   300, // most transactions compress to under 300 bytes. TODO: compute exact distribution
+		Value:   5000, // less than 1% of all transactions should be affected by this limit
 		EnvVars: prefixEnvVars("THROTTLE_TX_SIZE"),
 	}
 	ThrottleBlockSizeFlag = &cli.IntFlag{

From f17da354edf105c86652784d016a3e11b3c8585f Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Thu, 5 Dec 2024 22:38:09 -0500
Subject: [PATCH 386/451] feat(op-deployer): `Proxy` bootstrap command (#13213)

* feat(op-deployer): `Proxy` bootstrap command

* code review updates

* linter

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-deployer/pkg/deployer/bootstrap/flags.go   |  21 +++
 op-deployer/pkg/deployer/bootstrap/proxy.go   | 178 ++++++++++++++++++
 op-deployer/pkg/deployer/opcm/proxy.go        |  30 +++
 op-deployer/pkg/deployer/opcm/proxy_test.go   |  34 ++++
 .../scripts/deploy/DeployProxy.s.sol          |  84 +++++++++
 5 files changed, 347 insertions(+)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/proxy.go
 create mode 100644 op-deployer/pkg/deployer/opcm/proxy.go
 create mode 100644 op-deployer/pkg/deployer/opcm/proxy_test.go
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployProxy.s.sol

diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index f6a130f075a0..20cf02b93376 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -34,6 +34,7 @@ const (
 	ReleaseFlagName                         = "release"
 	DelayedWethProxyFlagName                = "delayed-weth-proxy"
 	DelayedWethImplFlagName                 = "delayed-weth-impl"
+	ProxyOwnerFlagName                      = "proxy-owner"
 )
 
 var (
@@ -167,6 +168,13 @@ var (
 		Name:    ReleaseFlagName,
 		Usage:   "Release to deploy.",
 		EnvVars: deployer.PrefixEnvVar("RELEASE"),
+		Value:   common.Address{}.Hex(),
+	}
+	ProxyOwnerFlag = &cli.StringFlag{
+		Name:    ProxyOwnerFlagName,
+		Usage:   "Proxy owner address.",
+		EnvVars: deployer.PrefixEnvVar("PROXY_OWNER"),
+		Value:   common.Address{}.Hex(),
 	}
 )
 
@@ -224,6 +232,13 @@ var MIPSFlags = append(BaseFPVMFlags, MIPSVersionFlag)
 
 var AsteriscFlags = BaseFPVMFlags
 
+var ProxyFlags = []cli.Flag{
+	deployer.L1RPCURLFlag,
+	deployer.PrivateKeyFlag,
+	ArtifactsLocatorFlag,
+	ProxyOwnerFlag,
+}
+
 var Commands = []*cli.Command{
 	{
 		Name:   "opcm",
@@ -264,4 +279,10 @@ var Commands = []*cli.Command{
 		Flags:  cliapp.ProtectFlags(AsteriscFlags),
 		Action: AsteriscCLI,
 	},
+	{
+		Name:   "proxy",
+		Usage:  "Bootstrap a ERC-1967 Proxy without an implementation set.",
+		Flags:  cliapp.ProtectFlags(ProxyFlags),
+		Action: ProxyCLI,
+	},
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/proxy.go b/op-deployer/pkg/deployer/bootstrap/proxy.go
new file mode 100644
index 000000000000..c96e497c8c73
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/proxy.go
@@ -0,0 +1,178 @@
+package bootstrap
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"fmt"
+	"strings"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
+	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/urfave/cli/v2"
+)
+
+type ProxyConfig struct {
+	L1RPCUrl         string
+	PrivateKey       string
+	Logger           log.Logger
+	ArtifactsLocator *artifacts.Locator
+
+	privateKeyECDSA *ecdsa.PrivateKey
+
+	Owner common.Address
+}
+
+func (c *ProxyConfig) Check() error {
+	if c.L1RPCUrl == "" {
+		return fmt.Errorf("l1RPCUrl must be specified")
+	}
+
+	if c.PrivateKey == "" {
+		return fmt.Errorf("private key must be specified")
+	}
+
+	privECDSA, err := crypto.HexToECDSA(strings.TrimPrefix(c.PrivateKey, "0x"))
+	if err != nil {
+		return fmt.Errorf("failed to parse private key: %w", err)
+	}
+	c.privateKeyECDSA = privECDSA
+
+	if c.Logger == nil {
+		return fmt.Errorf("logger must be specified")
+	}
+
+	if c.ArtifactsLocator == nil {
+		return fmt.Errorf("artifacts locator must be specified")
+	}
+
+	if c.Owner == (common.Address{}) {
+		return fmt.Errorf("proxy owner must be specified")
+	}
+
+	return nil
+}
+
+func ProxyCLI(cliCtx *cli.Context) error {
+	logCfg := oplog.ReadCLIConfig(cliCtx)
+	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
+	oplog.SetGlobalLogHandler(l.Handler())
+
+	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
+	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
+	artifactsLocator := new(artifacts.Locator)
+	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
+		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+	}
+
+	owner := common.HexToAddress(cliCtx.String(ProxyOwnerFlagName))
+
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+
+	return Proxy(ctx, ProxyConfig{
+		L1RPCUrl:         l1RPCUrl,
+		PrivateKey:       privateKey,
+		Logger:           l,
+		ArtifactsLocator: artifactsLocator,
+		Owner:            owner,
+	})
+}
+
+func Proxy(ctx context.Context, cfg ProxyConfig) error {
+	if err := cfg.Check(); err != nil {
+		return fmt.Errorf("invalid config for Proxy: %w", err)
+	}
+
+	lgr := cfg.Logger
+	progressor := func(curr, total int64) {
+		lgr.Info("artifacts download progress", "current", curr, "total", total)
+	}
+
+	artifactsFS, cleanup, err := artifacts.Download(ctx, cfg.ArtifactsLocator, progressor)
+	if err != nil {
+		return fmt.Errorf("failed to download artifacts: %w", err)
+	}
+	defer func() {
+		if err := cleanup(); err != nil {
+			lgr.Warn("failed to clean up artifacts", "err", err)
+		}
+	}()
+
+	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	chainID, err := l1Client.ChainID(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get chain ID: %w", err)
+	}
+
+	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
+	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
+
+	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+		Logger:  lgr,
+		ChainID: chainID,
+		Client:  l1Client,
+		Signer:  signer,
+		From:    chainDeployer,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create broadcaster: %w", err)
+	}
+
+	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	l1Host, err := env.DefaultForkedScriptHost(
+		ctx,
+		bcaster,
+		lgr,
+		chainDeployer,
+		artifactsFS,
+		l1RPC,
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create script host: %w", err)
+	}
+
+	dgo, err := opcm.DeployProxy(
+		l1Host,
+		opcm.DeployProxyInput{
+			Owner: cfg.Owner,
+		},
+	)
+	if err != nil {
+		return fmt.Errorf("error deploying proxy: %w", err)
+	}
+
+	if _, err := bcaster.Broadcast(ctx); err != nil {
+		return fmt.Errorf("failed to broadcast: %w", err)
+	}
+
+	lgr.Info("deployed new ERC-1967 proxy")
+
+	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/proxy.go b/op-deployer/pkg/deployer/opcm/proxy.go
new file mode 100644
index 000000000000..850c337f83f4
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/proxy.go
@@ -0,0 +1,30 @@
+package opcm
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+)
+
+type DeployProxyInput struct {
+	Owner common.Address
+}
+
+func (input *DeployProxyInput) InputSet() bool {
+	return true
+}
+
+type DeployProxyOutput struct {
+	Proxy common.Address
+}
+
+type DeployProxyScript struct {
+	Run func(input, output common.Address) error
+}
+
+func DeployProxy(
+	host *script.Host,
+	input DeployProxyInput,
+) (DeployProxyOutput, error) {
+	return RunBasicScript[DeployProxyInput, DeployProxyOutput](host, input, "DeployProxy.s.sol", "DeployProxy")
+}
diff --git a/op-deployer/pkg/deployer/opcm/proxy_test.go b/op-deployer/pkg/deployer/opcm/proxy_test.go
new file mode 100644
index 000000000000..bb9cb350a369
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/proxy_test.go
@@ -0,0 +1,34 @@
+package opcm
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployProxy(t *testing.T) {
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+	)
+	require.NoError(t, err)
+
+	input := DeployProxyInput{
+		Owner: common.Address{0xab},
+	}
+
+	output, err := DeployProxy(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.Proxy)
+}
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployProxy.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployProxy.s.sol
new file mode 100644
index 000000000000..08eadc671bc3
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployProxy.s.sol
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+// Forge
+import { Script } from "forge-std/Script.sol";
+
+// Scripts
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+// Interfaces
+import { IProxy } from "interfaces/universal/IProxy.sol";
+
+/// @title DeployProxyInput
+contract DeployProxyInput is BaseDeployIO {
+    // Specify the owner of the proxy that is being deployed
+    address internal _owner;
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.owner.selector) {
+            require(_value != address(0), "DeployProxy: owner cannot be empty");
+            _owner = _value;
+        } else {
+            revert("DeployProxy: unknown selector");
+        }
+    }
+
+    function owner() public view returns (address) {
+        require(_owner != address(0), "DeployProxy: owner not set");
+        return _owner;
+    }
+}
+
+/// @title DeployProxyOutput
+contract DeployProxyOutput is BaseDeployIO {
+    IProxy internal _proxy;
+
+    function set(bytes4 _sel, address _value) public {
+        if (_sel == this.proxy.selector) {
+            require(_value != address(0), "DeployProxy: proxy cannot be zero address");
+            _proxy = IProxy(payable(_value));
+        } else {
+            revert("DeployProxy: unknown selector");
+        }
+    }
+
+    function proxy() public view returns (IProxy) {
+        DeployUtils.assertValidContractAddress(address(_proxy));
+        return _proxy;
+    }
+}
+
+/// @title DeployProxy
+contract DeployProxy is Script {
+    function run(DeployProxyInput _mi, DeployProxyOutput _mo) public {
+        deployProxySingleton(_mi, _mo);
+        checkOutput(_mi, _mo);
+    }
+
+    function deployProxySingleton(DeployProxyInput _mi, DeployProxyOutput _mo) internal {
+        address owner = _mi.owner();
+        vm.broadcast(msg.sender);
+        IProxy proxy = IProxy(
+            DeployUtils.create1({
+                _name: "Proxy",
+                _args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (owner)))
+            })
+        );
+
+        vm.label(address(proxy), "Proxy");
+        _mo.set(_mo.proxy.selector, address(proxy));
+    }
+
+    function checkOutput(DeployProxyInput _mi, DeployProxyOutput _mo) public {
+        DeployUtils.assertValidContractAddress(address(_mo.proxy()));
+        IProxy prox = _mo.proxy();
+        vm.prank(_mi.owner());
+        address proxyOwner = prox.admin();
+
+        require(
+            proxyOwner == _mi.owner(), "DeployProxy: owner of proxy does not match the owner specified in the input"
+        );
+    }
+}

From ad868c53f74a21a70a412971d472c14e9a0012a7 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Thu, 5 Dec 2024 22:51:48 -0700
Subject: [PATCH 387/451] ctb: Fix concurrent map writes error (#13278)

`ProcessFilesGlob` calls the callback concurrently, so this test needs to lock the `processedFiles` map to prevent panics. See [here](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73932/workflows/951eb7de-0611-4bea-b4de-5d3a56c9bf37/jobs/3021176) for an example of this happening.
---
 packages/contracts-bedrock/scripts/checks/common/util_test.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/contracts-bedrock/scripts/checks/common/util_test.go b/packages/contracts-bedrock/scripts/checks/common/util_test.go
index 4defc1c70454..d523ad9aa5d1 100644
--- a/packages/contracts-bedrock/scripts/checks/common/util_test.go
+++ b/packages/contracts-bedrock/scripts/checks/common/util_test.go
@@ -3,6 +3,7 @@ package common
 import (
 	"os"
 	"path/filepath"
+	"sync"
 	"testing"
 )
 
@@ -79,8 +80,11 @@ func TestProcessFilesGlob(t *testing.T) {
 	excludes := []string{"skip.txt"}
 
 	processedFiles := make(map[string]bool)
+	var mtx sync.Mutex
 	err := ProcessFilesGlob(includes, excludes, func(path string) []error {
+		mtx.Lock()
 		processedFiles[filepath.Base(path)] = true
+		mtx.Unlock()
 		return nil
 	})
 

From f9eaf1fc2a633f12b817ff2d9782612ff8175eb6 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Fri, 6 Dec 2024 10:51:04 +0000
Subject: [PATCH 388/451] op-batcher: extract state pruning, block fetching and
 progress checking into a single pure function (#13060)

* remove lastStoredBlock and lastL1Tip from BatchSubmitter state

We can use the channelManager's state to infer lastStoredBlock. And lastL1Tip is actually unused.

* change log line wording

* fix typo

* remove unecessary method

* WIP first pass at computeSyncActions

* computeSyncAction takes a ChannelStatuser interface

also report fully inclusive range of blocks to load

* add happy path test case

* clearState is a pointer

we can use nil value to signal no state clearing should be performed

* add more test cases

* add another test case

* computeSyncActions only takes prevCurrentL1, not prevSyncStatus

* add batcher restart case

* safe chain reorg case

* failed to make progress case

* simplify log messages, print entire struct

* add godoc

* wire up computeSyncActions

* cache prevCurrentL1 on BatchSubmitter

* document stages

* fix loadBlocksIntoState range interpretation

* pass syncStatus, not pointer to syncStatus and add test case for no progress

* check unsafe status before trying to get more blocks

* do not panic on invalid block ranges

return an error instead. This error is ultimated swallowed, matching existing behaviour.

* test: add assetions and mock data about blockID passed to clearState

* add readme section on max channel duration

* add back unit tests for pruning methods

* fix pruneBlocks behaviour when blockCursor pointed at block which is now pruned

* rename waitForNodeSync to sequencerOutOfSync

* Introduce SeqOutOfSyncError

* move SyncActions code to a separate file

* ChannelStatuser -> channelStatuser

* SeqOutOfSyncError -> ErrSeqOutOfSync

* move ctx to first position in fn signature

* do not update cached prevCurrentL1 value if there is an ErrSeqOutOfSync

* Always warn log when computeSyncActions returns an error

* move sync actions test to separate file

* computeSyncActions returns a bool, not an error

There is only ever one kind of error returned

* SyncActions -> syncActions

* define local variables to aid readability

* organise computeSyncActions and introduce startAfresh syncAction

Add comments explaining logical flow: the checks get increasingly deep and we return early where possible.

* undo changes to submodule

* move test utils to sync_actions_test.go file

* ensure pruneChannels clears currentChannel when appropriate

* fix submodule"

* don't try to get number of block if none exists

* improve log

* Update op-batcher/batcher/driver.go

Co-authored-by: Sebastian Stammler <seb@oplabs.co>

* use struct for block range, not array

* use startAfresh in one more place

* add test case for multiple channels

also set HeadL1 to more realistic values (generally ahead of currentL1 due to nonzero confirmation depth)

* print value of *struct  in Stringer

* add test case when there are no blocks in state

* Update op-batcher/batcher/sync_actions.go

Co-authored-by: Sebastian Stammler <seb@oplabs.co>

* tighten up log messages and test descriptions

---------

Co-authored-by: Sebastian Stammler <seb@oplabs.co>
---
 op-batcher/batcher/channel.go              |   4 +
 op-batcher/batcher/channel_manager.go      |  80 ++-----
 op-batcher/batcher/channel_manager_test.go | 259 +++++++++++----------
 op-batcher/batcher/driver.go               |  90 +++----
 op-batcher/batcher/sync_actions.go         | 143 ++++++++++++
 op-batcher/batcher/sync_actions_test.go    | 248 ++++++++++++++++++++
 op-batcher/readme.md                       |   9 +-
 7 files changed, 591 insertions(+), 242 deletions(-)
 create mode 100644 op-batcher/batcher/sync_actions.go
 create mode 100644 op-batcher/batcher/sync_actions_test.go

diff --git a/op-batcher/batcher/channel.go b/op-batcher/batcher/channel.go
index 95abcb46a7fa..6b936c112d34 100644
--- a/op-batcher/batcher/channel.go
+++ b/op-batcher/batcher/channel.go
@@ -217,3 +217,7 @@ func (c *channel) OldestL2() eth.BlockID {
 func (c *channel) Close() {
 	c.channelBuilder.Close()
 }
+
+func (c *channel) MaxInclusionBlock() uint64 {
+	return c.maxInclusionBlock
+}
diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index 1da2def78da6..b5cfc6ebc1bc 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -464,78 +464,30 @@ func l2BlockRefFromBlockAndL1Info(block *types.Block, l1info *derive.L1BlockInfo
 
 var ErrPendingAfterClose = errors.New("pending channels remain after closing channel-manager")
 
-// pruneSafeBlocks dequeues blocks from the internal blocks queue
-// if they have now become safe.
-func (s *channelManager) pruneSafeBlocks(newSafeHead eth.L2BlockRef) {
-	oldestBlock, ok := s.blocks.Peek()
+// pruneSafeBlocks dequeues the provided number of blocks from the internal blocks queue
+func (s *channelManager) pruneSafeBlocks(num int) {
+	_, ok := s.blocks.DequeueN(int(num))
 	if !ok {
-		// no blocks to prune
-		return
+		panic("tried to prune more blocks than available")
 	}
-
-	if newSafeHead.Number+1 == oldestBlock.NumberU64() {
-		// no blocks to prune
-		return
-	}
-
-	if newSafeHead.Number+1 < oldestBlock.NumberU64() {
-		// This could happen if there was an L1 reorg.
-		// Or if the sequencer restarted.
-		s.log.Warn("safe head reversed, clearing channel manager state",
-			"oldestBlock", eth.ToBlockID(oldestBlock),
-			"newSafeBlock", newSafeHead)
-		// We should restart work from the new safe head,
-		// and therefore prune all the blocks.
-		s.Clear(newSafeHead.L1Origin)
-		return
-	}
-
-	numBlocksToDequeue := newSafeHead.Number + 1 - oldestBlock.NumberU64()
-
-	if numBlocksToDequeue > uint64(s.blocks.Len()) {
-		// This could happen if the batcher restarted.
-		// The sequencer may have derived the safe chain
-		// from channels sent by a previous batcher instance.
-		s.log.Warn("safe head above unsafe head, clearing channel manager state",
-			"unsafeBlock", eth.ToBlockID(s.blocks[s.blocks.Len()-1]),
-			"newSafeBlock", newSafeHead)
-		// We should restart work from the new safe head,
-		// and therefore prune all the blocks.
-		s.Clear(newSafeHead.L1Origin)
-		return
-	}
-
-	if s.blocks[numBlocksToDequeue-1].Hash() != newSafeHead.Hash {
-		s.log.Warn("safe chain reorg, clearing channel manager state",
-			"existingBlock", eth.ToBlockID(s.blocks[numBlocksToDequeue-1]),
-			"newSafeBlock", newSafeHead)
-		// We should restart work from the new safe head,
-		// and therefore prune all the blocks.
-		s.Clear(newSafeHead.L1Origin)
-		return
-	}
-
-	// This shouldn't return an error because
-	// We already checked numBlocksToDequeue <= s.blocks.Len()
-	_, _ = s.blocks.DequeueN(int(numBlocksToDequeue))
-	s.blockCursor -= int(numBlocksToDequeue)
-
+	s.blockCursor -= int(num)
 	if s.blockCursor < 0 {
-		panic("negative blockCursor")
+		s.blockCursor = 0
 	}
 }
 
-// pruneChannels dequeues channels from the internal channels queue
-// if they were built using blocks which are now safe
-func (s *channelManager) pruneChannels(newSafeHead eth.L2BlockRef) {
-	i := 0
-	for _, ch := range s.channelQueue {
-		if ch.LatestL2().Number > newSafeHead.Number {
-			break
+// pruneChannels dequeues the provided number of channels from the internal channels queue
+func (s *channelManager) pruneChannels(num int) {
+	clearCurrentChannel := false
+	for i := 0; i < num; i++ {
+		if s.channelQueue[i] == s.currentChannel {
+			clearCurrentChannel = true
 		}
-		i++
 	}
-	s.channelQueue = s.channelQueue[i:]
+	s.channelQueue = s.channelQueue[num:]
+	if clearCurrentChannel {
+		s.currentChannel = nil
+	}
 }
 
 // PendingDABytes returns the current number of bytes pending to be written to the DA layer (from blocks fetched from L2
diff --git a/op-batcher/batcher/channel_manager_test.go b/op-batcher/batcher/channel_manager_test.go
index 32aae1b06dd1..d1a0037a5d0d 100644
--- a/op-batcher/batcher/channel_manager_test.go
+++ b/op-batcher/batcher/channel_manager_test.go
@@ -463,14 +463,12 @@ func TestChannelManager_handleChannelInvalidated(t *testing.T) {
 }
 
 func TestChannelManager_PruneBlocks(t *testing.T) {
-	l := testlog.Logger(t, log.LevelDebug)
 	cfg := channelManagerTestConfig(100, derive.SingularBatchType)
-	m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
-
+	cfg.InitNoneCompressor()
 	a := types.NewBlock(&types.Header{
 		Number: big.NewInt(0),
 	}, nil, nil, nil)
-	b := types.NewBlock(&types.Header{ // This will shortly become the safe head
+	b := types.NewBlock(&types.Header{
 		Number:     big.NewInt(1),
 		ParentHash: a.Hash(),
 	}, nil, nil, nil)
@@ -479,132 +477,157 @@ func TestChannelManager_PruneBlocks(t *testing.T) {
 		ParentHash: b.Hash(),
 	}, nil, nil, nil)
 
-	require.NoError(t, m.AddL2Block(a))
-	m.blockCursor += 1
-	require.NoError(t, m.AddL2Block(b))
-	m.blockCursor += 1
-	require.NoError(t, m.AddL2Block(c))
-	m.blockCursor += 1
-
-	// Normal path
-	m.pruneSafeBlocks(eth.L2BlockRef{
-		Hash:   b.Hash(),
-		Number: b.NumberU64(),
-	})
-	require.Equal(t, queue.Queue[*types.Block]{c}, m.blocks)
-
-	// Safe chain didn't move, nothing to prune
-	m.pruneSafeBlocks(eth.L2BlockRef{
-		Hash:   b.Hash(),
-		Number: b.NumberU64(),
-	})
-	require.Equal(t, queue.Queue[*types.Block]{c}, m.blocks)
-
-	// Safe chain moved beyond the blocks we had
-	// state should be cleared
-	m.pruneSafeBlocks(eth.L2BlockRef{
-		Hash:   c.Hash(),
-		Number: uint64(99),
-	})
-	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
-
-	// No blocks to prune, NOOP
-	m.pruneSafeBlocks(eth.L2BlockRef{
-		Hash:   c.Hash(),
-		Number: c.NumberU64(),
-	})
-	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
-
-	// Put another block in
-	d := types.NewBlock(&types.Header{
-		Number:     big.NewInt(3),
-		ParentHash: c.Hash(),
-	}, nil, nil, nil)
-	require.NoError(t, m.AddL2Block(d))
-	m.blockCursor += 1
-
-	// Safe chain reorg
-	// state should be cleared
-	m.pruneSafeBlocks(eth.L2BlockRef{
-		Hash:   a.Hash(),
-		Number: uint64(3),
-	})
-	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
-
-	// Put another block in
-	require.NoError(t, m.AddL2Block(d))
-	m.blockCursor += 1
+	type testCase struct {
+		name                string
+		initialQ            queue.Queue[*types.Block]
+		initialBlockCursor  int
+		numChannelsToPrune  int
+		expectedQ           queue.Queue[*types.Block]
+		expectedBlockCursor int
+	}
 
-	// Safe chain reversed
-	// state should be cleared
-	m.pruneSafeBlocks(eth.L2BlockRef{
-		Hash:   a.Hash(), // unused
-		Number: uint64(1),
-	})
-	require.Equal(t, queue.Queue[*types.Block]{}, m.blocks)
+	for _, tc := range []testCase{
+		{
+			name:                "[A,B,C]*+1->[B,C]*", // * denotes the cursor
+			initialQ:            queue.Queue[*types.Block]{a, b, c},
+			initialBlockCursor:  3,
+			numChannelsToPrune:  1,
+			expectedQ:           queue.Queue[*types.Block]{b, c},
+			expectedBlockCursor: 2,
+		},
+		{
+			name:                "[A,B,C*]+1->[B,C*]",
+			initialQ:            queue.Queue[*types.Block]{a, b, c},
+			initialBlockCursor:  2,
+			numChannelsToPrune:  1,
+			expectedQ:           queue.Queue[*types.Block]{b, c},
+			expectedBlockCursor: 1,
+		},
+		{
+			name:                "[A,B,C]*+2->[C]*",
+			initialQ:            queue.Queue[*types.Block]{a, b, c},
+			initialBlockCursor:  3,
+			numChannelsToPrune:  2,
+			expectedQ:           queue.Queue[*types.Block]{c},
+			expectedBlockCursor: 1,
+		},
+		{
+			name:                "[A,B,C*]+2->[C*]",
+			initialQ:            queue.Queue[*types.Block]{a, b, c},
+			initialBlockCursor:  2,
+			numChannelsToPrune:  2,
+			expectedQ:           queue.Queue[*types.Block]{c},
+			expectedBlockCursor: 0,
+		},
+		{
+			name:                "[A*,B,C]+1->[B*,C]",
+			initialQ:            queue.Queue[*types.Block]{a, b, c},
+			initialBlockCursor:  0,
+			numChannelsToPrune:  1,
+			expectedQ:           queue.Queue[*types.Block]{b, c},
+			expectedBlockCursor: 0,
+		},
+		{
+			name:                "[A,B,C]+3->[]",
+			initialQ:            queue.Queue[*types.Block]{a, b, c},
+			initialBlockCursor:  3,
+			numChannelsToPrune:  3,
+			expectedQ:           queue.Queue[*types.Block]{},
+			expectedBlockCursor: 0,
+		},
+		{
+			name:                "[A,B,C]*+4->panic",
+			initialQ:            queue.Queue[*types.Block]{a, b, c},
+			initialBlockCursor:  3,
+			numChannelsToPrune:  4,
+			expectedQ:           nil, // declare that the prune method should panic
+			expectedBlockCursor: 0,
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			l := testlog.Logger(t, log.LevelCrit)
+			m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
+			m.blocks = tc.initialQ
+			m.blockCursor = tc.initialBlockCursor
+			if tc.expectedQ != nil {
+				m.pruneSafeBlocks(tc.numChannelsToPrune)
+				require.Equal(t, tc.expectedQ, m.blocks)
+			} else {
+				require.Panics(t, func() { m.pruneSafeBlocks(tc.numChannelsToPrune) })
+			}
+		})
+	}
 
 }
 
 func TestChannelManager_PruneChannels(t *testing.T) {
-	l := testlog.Logger(t, log.LevelCrit)
 	cfg := channelManagerTestConfig(100, derive.SingularBatchType)
-	cfg.InitNoneCompressor()
-	m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
-
-	A, err := newChannelWithChannelOut(l, metrics.NoopMetrics, cfg, m.rollupCfg, 0)
-	require.NoError(t, err)
-	B, err := newChannelWithChannelOut(l, metrics.NoopMetrics, cfg, m.rollupCfg, 0)
-	require.NoError(t, err)
-	C, err := newChannelWithChannelOut(l, metrics.NoopMetrics, cfg, m.rollupCfg, 0)
-	require.NoError(t, err)
-
-	m.channelQueue = []*channel{A, B, C}
-
-	numTx := 1
-	rng := rand.New(rand.NewSource(123))
-	a0 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-	a0 = a0.WithSeal(&types.Header{Number: big.NewInt(0)})
-	a1 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-	a1 = a1.WithSeal(&types.Header{Number: big.NewInt(1)})
-	b2 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-	b2 = b2.WithSeal(&types.Header{Number: big.NewInt(2)})
-	b3 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-	b3 = b3.WithSeal(&types.Header{Number: big.NewInt(3)})
-	c4 := derivetest.RandomL2BlockWithChainId(rng, numTx, defaultTestRollupConfig.L2ChainID)
-	c4 = c4.WithSeal(&types.Header{Number: big.NewInt(4)})
-
-	_, err = A.AddBlock(a0)
-	require.NoError(t, err)
-	_, err = A.AddBlock(a1)
-	require.NoError(t, err)
-
-	_, err = B.AddBlock(b2)
+	A, err := newChannelWithChannelOut(nil, metrics.NoopMetrics, cfg, defaultTestRollupConfig, 0)
 	require.NoError(t, err)
-	_, err = B.AddBlock(b3)
+	B, err := newChannelWithChannelOut(nil, metrics.NoopMetrics, cfg, defaultTestRollupConfig, 0)
 	require.NoError(t, err)
-
-	_, err = C.AddBlock(c4)
+	C, err := newChannelWithChannelOut(nil, metrics.NoopMetrics, cfg, defaultTestRollupConfig, 0)
 	require.NoError(t, err)
 
-	m.pruneChannels(eth.L2BlockRef{
-		Number: uint64(3),
-	})
-
-	require.Equal(t, []*channel{C}, m.channelQueue)
-
-	m.pruneChannels(eth.L2BlockRef{
-		Number: uint64(4),
-	})
-
-	require.Equal(t, []*channel{}, m.channelQueue)
-
-	m.pruneChannels(eth.L2BlockRef{
-		Number: uint64(4),
-	})
-
-	require.Equal(t, []*channel{}, m.channelQueue)
+	type testCase struct {
+		name                   string
+		initialQ               []*channel
+		initialCurrentChannel  *channel
+		numChannelsToPrune     int
+		expectedQ              []*channel
+		expectedCurrentChannel *channel
+	}
 
+	for _, tc := range []testCase{
+		{
+			name:               "[A,B,C]+1->[B,C]",
+			initialQ:           []*channel{A, B, C},
+			numChannelsToPrune: 1,
+			expectedQ:          []*channel{B, C},
+		},
+		{
+			name:                   "[A,B,C]+3->[] + currentChannel=C",
+			initialQ:               []*channel{A, B, C},
+			initialCurrentChannel:  C,
+			numChannelsToPrune:     3,
+			expectedQ:              []*channel{},
+			expectedCurrentChannel: nil,
+		},
+		{
+			name:               "[A,B,C]+2->[C]",
+			initialQ:           []*channel{A, B, C},
+			numChannelsToPrune: 2,
+			expectedQ:          []*channel{C},
+		},
+		{
+			name:               "[A,B,C]+3->[]",
+			initialQ:           []*channel{A, B, C},
+			numChannelsToPrune: 3,
+			expectedQ:          []*channel{},
+		},
+		{
+			name:               "[A,B,C]+4->panic",
+			initialQ:           []*channel{A, B, C},
+			numChannelsToPrune: 4,
+			expectedQ:          nil, // declare that the prune method should panic
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			l := testlog.Logger(t, log.LevelCrit)
+			m := NewChannelManager(l, metrics.NoopMetrics, cfg, defaultTestRollupConfig)
+			m.channelQueue = tc.initialQ
+			m.currentChannel = tc.initialCurrentChannel
+			if tc.expectedQ != nil {
+				m.pruneChannels(tc.numChannelsToPrune)
+				require.Equal(t, tc.expectedQ, m.channelQueue)
+				require.Equal(t, tc.expectedCurrentChannel, m.currentChannel)
+			} else {
+				require.Panics(t, func() { m.pruneChannels(tc.numChannelsToPrune) })
+			}
+		})
+	}
 }
+
 func TestChannelManager_ChannelOutFactory(t *testing.T) {
 	type ChannelOutWrapper struct {
 		derive.ChannelOut
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 729626cd946c..1483c4dc7cce 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -114,7 +114,8 @@ type BatchSubmitter struct {
 	txpoolState       TxPoolState
 	txpoolBlockedBlob bool
 
-	state *channelManager
+	state         *channelManager
+	prevCurrentL1 eth.L1BlockRef // cached CurrentL1 from the last syncStatus
 }
 
 // NewBatchSubmitter initializes the BatchSubmitter driver from a preconfigured DriverSetup
@@ -241,28 +242,15 @@ func (l *BatchSubmitter) StopBatchSubmitting(ctx context.Context) error {
 	return nil
 }
 
-// loadBlocksIntoState loads all blocks since the previous stored block
-// It does the following:
-//  1. Fetch the sync status of the sequencer
-//  2. Check if the sync status is valid or if we are all the way up to date
-//  3. Check if it needs to initialize state OR it is lagging (todo: lagging just means race condition?)
-//  4. Load all new blocks into the local state.
-//  5. Dequeue blocks from local state which are now safe.
-//
-// If there is a reorg, it will reset the last stored block but not clear the internal state so
-// the state can be flushed to L1.
-func (l *BatchSubmitter) loadBlocksIntoState(syncStatus eth.SyncStatus, ctx context.Context) error {
-	start, end, err := l.calculateL2BlockRangeToStore(syncStatus)
-	if err != nil {
-		l.Log.Warn("Error calculating L2 block range", "err", err)
-		return err
-	} else if start.Number >= end.Number {
-		return errors.New("start number is >= end number")
+// loadBlocksIntoState loads the blocks between start and end (inclusive).
+// If there is a reorg, it will return an error.
+func (l *BatchSubmitter) loadBlocksIntoState(ctx context.Context, start, end uint64) error {
+	if end <= start {
+		return fmt.Errorf("start number is >= end number %d,%d", start, end)
 	}
-
 	var latestBlock *types.Block
 	// Add all blocks to "state"
-	for i := start.Number + 1; i < end.Number+1; i++ {
+	for i := start; i <= end; i++ {
 		block, err := l.loadBlockIntoState(ctx, i)
 		if errors.Is(err, ErrReorg) {
 			l.Log.Warn("Found L2 reorg", "block_number", i)
@@ -358,34 +346,6 @@ func (l *BatchSubmitter) getSyncStatus(ctx context.Context) (*eth.SyncStatus, er
 	return syncStatus, nil
 }
 
-// calculateL2BlockRangeToStore determines the range (start,end] that should be loaded into the local state.
-func (l *BatchSubmitter) calculateL2BlockRangeToStore(syncStatus eth.SyncStatus) (eth.BlockID, eth.BlockID, error) {
-	if syncStatus.HeadL1 == (eth.L1BlockRef{}) {
-		return eth.BlockID{}, eth.BlockID{}, errors.New("empty sync status")
-	}
-	// Check if we should even attempt to load any blocks. TODO: May not need this check
-	if syncStatus.SafeL2.Number >= syncStatus.UnsafeL2.Number {
-		return eth.BlockID{}, eth.BlockID{}, fmt.Errorf("L2 safe head(%d) >= L2 unsafe head(%d)", syncStatus.SafeL2.Number, syncStatus.UnsafeL2.Number)
-	}
-
-	lastStoredBlock := l.state.LastStoredBlock()
-	start := lastStoredBlock
-	end := syncStatus.UnsafeL2.ID()
-
-	// Check last stored block to see if it is empty or has lagged behind.
-	// It lagging implies that the op-node processed some batches that
-	// were submitted prior to the current instance of the batcher being alive.
-	if lastStoredBlock == (eth.BlockID{}) {
-		l.Log.Info("Resuming batch-submitter work at safe-head", "safe", syncStatus.SafeL2)
-		start = syncStatus.SafeL2.ID()
-	} else if lastStoredBlock.Number < syncStatus.SafeL2.Number {
-		l.Log.Warn("Last stored block lagged behind L2 safe head: batch submission will continue from the safe head now", "last", lastStoredBlock, "safe", syncStatus.SafeL2)
-		start = syncStatus.SafeL2.ID()
-	}
-
-	return start, end, nil
-}
-
 // The following things occur:
 // New L2 block (reorg or not)
 // L1 transaction is confirmed
@@ -464,20 +424,34 @@ func (l *BatchSubmitter) mainLoop(ctx context.Context, receiptsCh chan txmgr.TxR
 				continue
 			}
 
-			l.state.pruneSafeBlocks(syncStatus.SafeL2)
-			l.state.pruneChannels(syncStatus.SafeL2)
+			// Decide appropriate actions
+			syncActions, outOfSync := computeSyncActions(*syncStatus, l.prevCurrentL1, l.state.blocks, l.state.channelQueue, l.Log)
 
-			err = l.state.CheckExpectedProgress(*syncStatus)
-			if err != nil {
-				l.Log.Warn("error checking expected progress, clearing state and waiting for node sync", "err", err)
-				l.waitNodeSyncAndClearState()
+			if outOfSync {
+				// If the sequencer is out of sync
+				// do nothing and wait to see if it has
+				// got in sync on the next tick.
+				l.Log.Warn("Sequencer is out of sync, retrying next tick.")
 				continue
 			}
 
-			if err := l.loadBlocksIntoState(*syncStatus, l.shutdownCtx); errors.Is(err, ErrReorg) {
-				l.Log.Warn("error loading blocks, clearing state and waiting for node sync", "err", err)
-				l.waitNodeSyncAndClearState()
-				continue
+			l.prevCurrentL1 = syncStatus.CurrentL1
+
+			// Manage existing state / garbage collection
+			if syncActions.clearState != nil {
+				l.state.Clear(*syncActions.clearState)
+			} else {
+				l.state.pruneSafeBlocks(syncActions.blocksToPrune)
+				l.state.pruneChannels(syncActions.channelsToPrune)
+			}
+
+			if syncActions.blocksToLoad != nil {
+				// Get fresh unsafe blocks
+				if err := l.loadBlocksIntoState(l.shutdownCtx, syncActions.blocksToLoad.start, syncActions.blocksToLoad.end); errors.Is(err, ErrReorg) {
+					l.Log.Warn("error loading blocks, clearing state and waiting for node sync", "err", err)
+					l.waitNodeSyncAndClearState()
+					continue
+				}
 			}
 
 			l.publishStateToL1(queue, receiptsCh, daGroup, l.Config.PollInterval)
diff --git a/op-batcher/batcher/sync_actions.go b/op-batcher/batcher/sync_actions.go
new file mode 100644
index 000000000000..8f4121d7d5f4
--- /dev/null
+++ b/op-batcher/batcher/sync_actions.go
@@ -0,0 +1,143 @@
+package batcher
+
+import (
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/queue"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+type channelStatuser interface {
+	isFullySubmitted() bool
+	isTimedOut() bool
+	LatestL2() eth.BlockID
+	MaxInclusionBlock() uint64
+}
+
+type inclusiveBlockRange struct{ start, end uint64 }
+type syncActions struct {
+	clearState      *eth.BlockID
+	blocksToPrune   int
+	channelsToPrune int
+	blocksToLoad    *inclusiveBlockRange // the blocks that should be loaded into the local state.
+	// NOTE this range is inclusive on both ends, which is a change to previous behaviour.
+}
+
+func (s syncActions) String() string {
+	return fmt.Sprintf(
+		"SyncActions{blocksToPrune: %d, channelsToPrune: %d, clearState: %v, blocksToLoad: %v}", s.blocksToPrune, s.channelsToPrune, s.clearState, s.blocksToLoad)
+}
+
+// computeSyncActions determines the actions that should be taken based on the inputs provided. The inputs are the current
+// state of the batcher (blocks and channels), the new sync status, and the previous current L1 block. The actions are returned
+// in a struct specifying the number of blocks to prune, the number of channels to prune, whether to wait for node sync, the block
+// range to load into the local state, and whether to clear the state entirely. Returns an boolean indicating if the sequencer is out of sync.
+func computeSyncActions[T channelStatuser](newSyncStatus eth.SyncStatus, prevCurrentL1 eth.L1BlockRef, blocks queue.Queue[*types.Block], channels []T, l log.Logger) (syncActions, bool) {
+
+	// PART 1: Initial checks on the sync status
+	if newSyncStatus.HeadL1 == (eth.L1BlockRef{}) {
+		l.Warn("empty sync status")
+		return syncActions{}, true
+	}
+
+	if newSyncStatus.CurrentL1.Number < prevCurrentL1.Number {
+		// This can happen when the sequencer restarts
+		l.Warn("sequencer currentL1 reversed")
+		return syncActions{}, true
+	}
+
+	// PART 2: checks involving only the oldest block in the state
+	oldestBlockInState, hasBlocks := blocks.Peek()
+	oldestUnsafeBlockNum := newSyncStatus.SafeL2.Number + 1
+	youngestUnsafeBlockNum := newSyncStatus.UnsafeL2.Number
+
+	if !hasBlocks {
+		s := syncActions{
+			blocksToLoad: &inclusiveBlockRange{oldestUnsafeBlockNum, youngestUnsafeBlockNum},
+		}
+		l.Info("no blocks in state", "syncActions", s)
+		return s, false
+	}
+
+	// These actions apply in multiple unhappy scenarios below, where
+	// we detect that the existing state is invalidated
+	// and we need to start over from the sequencer's oldest
+	// unsafe (and not safe) block.
+	startAfresh := syncActions{
+		clearState:   &newSyncStatus.SafeL2.L1Origin,
+		blocksToLoad: &inclusiveBlockRange{oldestUnsafeBlockNum, youngestUnsafeBlockNum},
+	}
+
+	oldestBlockInStateNum := oldestBlockInState.NumberU64()
+
+	if oldestUnsafeBlockNum < oldestBlockInStateNum {
+		l.Warn("oldest unsafe block is below oldest block in state", "syncActions", startAfresh, "oldestBlockInState", oldestBlockInState, "newSafeBlock", newSyncStatus.SafeL2)
+		return startAfresh, false
+	}
+
+	// PART 3: checks involving all blocks in state
+	newestBlockInState := blocks[blocks.Len()-1]
+	newestBlockInStateNum := newestBlockInState.NumberU64()
+
+	numBlocksToDequeue := oldestUnsafeBlockNum - oldestBlockInStateNum
+
+	if numBlocksToDequeue > uint64(blocks.Len()) {
+		// This could happen if the batcher restarted.
+		// The sequencer may have derived the safe chain
+		// from channels sent by a previous batcher instance.
+		l.Warn("oldest unsafe block above newest block in state, clearing channel manager state",
+			"oldestUnsafeBlockNum", oldestUnsafeBlockNum,
+			"newestBlockInState", eth.ToBlockID(newestBlockInState),
+			"syncActions",
+			startAfresh)
+		return startAfresh, false
+	}
+
+	if numBlocksToDequeue > 0 && blocks[numBlocksToDequeue-1].Hash() != newSyncStatus.SafeL2.Hash {
+		l.Warn("safe chain reorg, clearing channel manager state",
+			"existingBlock", eth.ToBlockID(blocks[numBlocksToDequeue-1]),
+			"newSafeBlock", newSyncStatus.SafeL2,
+			"syncActions", startAfresh)
+		return startAfresh, false
+	}
+
+	// PART 4: checks involving channels
+	for _, ch := range channels {
+		if ch.isFullySubmitted() &&
+			!ch.isTimedOut() &&
+			newSyncStatus.CurrentL1.Number > ch.MaxInclusionBlock() &&
+			newSyncStatus.SafeL2.Number < ch.LatestL2().Number {
+			// Safe head did not make the expected progress
+			// for a fully submitted channel. This indicates
+			// that the derivation pipeline may have stalled
+			// e.g. because of Holocene strict ordering rules.
+			l.Warn("sequencer did not make expected progress",
+				"existingBlock", eth.ToBlockID(blocks[numBlocksToDequeue-1]),
+				"newSafeBlock", newSyncStatus.SafeL2,
+				"syncActions", startAfresh)
+			return startAfresh, false
+		}
+	}
+
+	// PART 5: happy path
+	numChannelsToPrune := 0
+	for _, ch := range channels {
+		if ch.LatestL2().Number > newSyncStatus.SafeL2.Number {
+			// If the channel has blocks which are not yet safe
+			// we do not want to prune it.
+			break
+		}
+		numChannelsToPrune++
+	}
+
+	start := newestBlockInStateNum + 1
+	end := youngestUnsafeBlockNum
+
+	return syncActions{
+		blocksToPrune:   int(numBlocksToDequeue),
+		channelsToPrune: numChannelsToPrune,
+		blocksToLoad:    &inclusiveBlockRange{start, end},
+	}, false
+}
diff --git a/op-batcher/batcher/sync_actions_test.go b/op-batcher/batcher/sync_actions_test.go
new file mode 100644
index 000000000000..f48ed9dabfbe
--- /dev/null
+++ b/op-batcher/batcher/sync_actions_test.go
@@ -0,0 +1,248 @@
+package batcher
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/queue"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+type testChannelStatuser struct {
+	latestL2                 eth.BlockID
+	inclusionBlock           uint64
+	fullySubmitted, timedOut bool
+}
+
+func (tcs testChannelStatuser) LatestL2() eth.BlockID {
+	return tcs.latestL2
+}
+
+func (tcs testChannelStatuser) MaxInclusionBlock() uint64 {
+	return tcs.inclusionBlock
+}
+func (tcs testChannelStatuser) isFullySubmitted() bool {
+	return tcs.fullySubmitted
+}
+
+func (tcs testChannelStatuser) isTimedOut() bool {
+	return tcs.timedOut
+}
+
+func TestBatchSubmitter_computeSyncActions(t *testing.T) {
+
+	block101 := types.NewBlockWithHeader(&types.Header{Number: big.NewInt(101)})
+	block102 := types.NewBlockWithHeader(&types.Header{Number: big.NewInt(102)})
+	block103 := types.NewBlockWithHeader(&types.Header{Number: big.NewInt(103)})
+
+	channel103 := testChannelStatuser{
+		latestL2:       eth.ToBlockID(block103),
+		inclusionBlock: 1,
+		fullySubmitted: true,
+		timedOut:       false,
+	}
+
+	block104 := types.NewBlockWithHeader(&types.Header{Number: big.NewInt(104)})
+
+	channel104 := testChannelStatuser{
+		latestL2:       eth.ToBlockID(block104),
+		inclusionBlock: 1,
+		fullySubmitted: false,
+		timedOut:       false,
+	}
+
+	type TestCase struct {
+		name string
+		// inputs
+		newSyncStatus eth.SyncStatus
+		prevCurrentL1 eth.L1BlockRef
+		blocks        queue.Queue[*types.Block]
+		channels      []channelStatuser
+		// expectations
+		expected             syncActions
+		expectedSeqOutOfSync bool
+		expectedLogs         []string
+	}
+
+	testCases := []TestCase{
+		{name: "empty sync status",
+			// This can happen when the sequencer recovers from a reorg
+			newSyncStatus:        eth.SyncStatus{},
+			expected:             syncActions{},
+			expectedSeqOutOfSync: true,
+			expectedLogs:         []string{"empty sync status"},
+		},
+		{name: "current l1 reversed",
+			// This can happen when the sequencer restarts or is switched
+			// to a backup sequencer:
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 2},
+				CurrentL1: eth.BlockRef{Number: 1},
+			},
+			prevCurrentL1:        eth.BlockRef{Number: 2},
+			expected:             syncActions{},
+			expectedSeqOutOfSync: true,
+			expectedLogs:         []string{"sequencer currentL1 reversed"},
+		},
+		{name: "gap between safe chain and state",
+			// This can happen if there is an L1 reorg:
+			// although the sequencer has derived up the same
+			// L1 block height, it derived fewer safe L2 blocks.
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 6},
+				CurrentL1: eth.BlockRef{Number: 1},
+				SafeL2:    eth.L2BlockRef{Number: 100, L1Origin: eth.BlockID{Number: 1}},
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block102, block103}, // note absence of block101
+			channels:      []channelStatuser{channel103},
+			expected: syncActions{
+				clearState:   &eth.BlockID{Number: 1},
+				blocksToLoad: &inclusiveBlockRange{101, 109},
+			},
+			expectedLogs: []string{"oldest unsafe block is below oldest block in state"},
+		},
+		{name: "unexpectedly good progress",
+			// This can happen if another batcher instance got some blocks
+			// included in the safe chain:
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 6},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 104, L1Origin: eth.BlockID{Number: 1}},
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block101, block102, block103},
+			channels:      []channelStatuser{channel103},
+			expected: syncActions{
+				clearState:   &eth.BlockID{Number: 1},
+				blocksToLoad: &inclusiveBlockRange{105, 109},
+			},
+			expectedLogs: []string{"oldest unsafe block above newest block in state"},
+		},
+		{name: "safe chain reorg",
+			// This can happen if there is an L1 reorg, the safe chain is at an acceptable
+			// height but it does not descend from the blocks in state:
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 5},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 103, Hash: block101.Hash(), L1Origin: eth.BlockID{Number: 1}}, // note hash mismatch
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block101, block102, block103},
+			channels:      []channelStatuser{channel103},
+			expected: syncActions{
+				clearState:   &eth.BlockID{Number: 1},
+				blocksToLoad: &inclusiveBlockRange{104, 109},
+			},
+			expectedLogs: []string{"safe chain reorg"},
+		},
+		{name: "failed to make expected progress",
+			// This could happen if the batcher unexpectedly violates the
+			// Holocene derivation rules:
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 3},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 101, Hash: block101.Hash(), L1Origin: eth.BlockID{Number: 1}},
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block101, block102, block103},
+			channels:      []channelStatuser{channel103},
+			expected: syncActions{
+				clearState:   &eth.BlockID{Number: 1},
+				blocksToLoad: &inclusiveBlockRange{102, 109},
+			},
+			expectedLogs: []string{"sequencer did not make expected progress"},
+		},
+		{name: "no progress",
+			// This can happen if we have a long channel duration
+			// and we didn't submit or have any txs confirmed since
+			// the last sync.
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 4},
+				CurrentL1: eth.BlockRef{Number: 1},
+				SafeL2:    eth.L2BlockRef{Number: 100},
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block101, block102, block103},
+			channels:      []channelStatuser{channel103},
+			expected: syncActions{
+				blocksToLoad: &inclusiveBlockRange{104, 109},
+			},
+		},
+		{name: "no blocks",
+			// This happens when the batcher is starting up for the first time
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 5},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 103, Hash: block103.Hash()},
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{},
+			channels:      []channelStatuser{},
+			expected: syncActions{
+				blocksToLoad: &inclusiveBlockRange{104, 109},
+			},
+		},
+		{name: "happy path",
+			// This happens when the safe chain is being progressed as expected:
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 5},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 103, Hash: block103.Hash()},
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block101, block102, block103},
+			channels:      []channelStatuser{channel103},
+			expected: syncActions{
+				blocksToPrune:   3,
+				channelsToPrune: 1,
+				blocksToLoad:    &inclusiveBlockRange{104, 109},
+			},
+		},
+		{name: "happy path + multiple channels",
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 5},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 103, Hash: block103.Hash()},
+				UnsafeL2:  eth.L2BlockRef{Number: 109},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block101, block102, block103, block104},
+			channels:      []channelStatuser{channel103, channel104},
+			expected: syncActions{
+				blocksToPrune:   3,
+				channelsToPrune: 1,
+				blocksToLoad:    &inclusiveBlockRange{105, 109},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+
+		t.Run(tc.name, func(t *testing.T) {
+			l, h := testlog.CaptureLogger(t, log.LevelDebug)
+
+			result, outOfSync := computeSyncActions(
+				tc.newSyncStatus, tc.prevCurrentL1, tc.blocks, tc.channels, l,
+			)
+
+			require.Equal(t, tc.expected, result)
+			require.Equal(t, tc.expectedSeqOutOfSync, outOfSync)
+			for _, e := range tc.expectedLogs {
+				r := h.FindLog(testlog.NewMessageContainsFilter(e))
+				require.NotNil(t, r, "could not find log message containing '%s'", e)
+			}
+		})
+	}
+}
diff --git a/op-batcher/readme.md b/op-batcher/readme.md
index ba547845f099..9e81ff978fec 100644
--- a/op-batcher/readme.md
+++ b/op-batcher/readme.md
@@ -32,11 +32,14 @@ The philosophy behind the current architecture is:
 ### Happy path
 
 In the happy path, the batcher periodically:
+0. Queries the sequencer's syncStatus and
+  a. (optionally) waits for it to ingest more L1 data before taking action
+  b. prunes blocks and channels from its internal state which are no longer required
 1. Enqueues unsafe blocks and dequeues safe blocks from the sequencer to its internal state.
 2. Enqueues a new channel, if necessary.
 3. Processes some unprocessed blocks into the current channel, triggers the compression of the block data and the creation of frames.
 4. Sends frames from the channel queue to the DA layer as (e.g. to Ethereum L1 as calldata or blob transactions).
-5. If there is more transaction data to send, go to 2. Else wait for a tick and go to 1.
+5. If there is more transaction data to send, go to 2. Else wait for a tick and go to 0.
 
 
 The `blockCursor` state variable tracks the next unprocessed block.
@@ -57,7 +60,6 @@ At the current time, the batcher should be optimized for correctness, simplicity
 
 The batcher can almost always recover from unforeseen situations by being restarted.
 
-
 Some complexity is permitted, however, for handling data availability switching, so that the batcher is not wasting money for longer periods of time.
 
 ### Data Availability Backlog
@@ -79,6 +81,9 @@ transaction. But in the case of a DA backlog (as defined by OP_BATCHER_THROTTLE_
 block builder to instead impose a (tighter) block level limit of OP_BATCHER_THROTTLE_BLOCK_SIZE, and a single
 transaction limit of OP_BATCHER_THROTTLE_TRANSACTION_SIZE.
 
+### Max Channel Duration
+The batcher tries to ensure that batches are posted at a minimum frequency specified by `MAX_CHANNEL_DURATION`. To achiveve this, it caches the l1 origin of the last submitted channel, and will force close a channel if the timestamp of the l1 head moves beyond the timestamp of that l1 origin plus `MAX_CHANNEL_DURATION`. When clearing its state, e.g. following the detection of a reorg, the batcher will not clear the cached l1 origin: this way, the regular posting of batches will not be disturbed by events like reorgs.
+
 ## Known issues and future work
 
 Link to [open issues with the `op-batcher` tag](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aopen+is%3Aissue+label%3AA-op-batcher).

From e5498be3bc3fcd1d5af6f54352266f310cc277bc Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Fri, 6 Dec 2024 21:08:37 +0800
Subject: [PATCH 389/451] fix loadBlocksIntoState (#13282)

---
 op-batcher/batcher/driver.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 1483c4dc7cce..a2b2bd881229 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -245,8 +245,8 @@ func (l *BatchSubmitter) StopBatchSubmitting(ctx context.Context) error {
 // loadBlocksIntoState loads the blocks between start and end (inclusive).
 // If there is a reorg, it will return an error.
 func (l *BatchSubmitter) loadBlocksIntoState(ctx context.Context, start, end uint64) error {
-	if end <= start {
-		return fmt.Errorf("start number is >= end number %d,%d", start, end)
+	if end < start {
+		return fmt.Errorf("start number is > end number %d,%d", start, end)
 	}
 	var latestBlock *types.Block
 	// Add all blocks to "state"

From cde5fd7a9771f24e5d3b73b829c1770d94f27abe Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 09:05:33 -0700
Subject: [PATCH 390/451] ci: Pin ethereum package version (#13286)

---
 op-deployer/pkg/deployer/integration_test/apply_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index a6ae4dab3ad8..1605219a8d96 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -91,7 +91,7 @@ func TestEndToEndApply(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	enclaveCtx := kurtosisutil.StartEnclave(t, ctx, lgr, "github.com/ethpandaops/ethereum-package", TestParams)
+	enclaveCtx := kurtosisutil.StartEnclave(t, ctx, lgr, "github.com/ethpandaops/ethereum-package@4.4.0", TestParams)
 
 	service, err := enclaveCtx.GetServiceContext("el-1-geth-lighthouse")
 	require.NoError(t, err)

From 7c8d28dd3d42b24d8be55c98fe4372bde4d93e0f Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 09:05:45 -0700
Subject: [PATCH 391/451] ci: Remove go-mod-download (#13277)

---
 .circleci/config.yml | 56 ++------------------------------------------
 1 file changed, 2 insertions(+), 54 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 54f19de4e9b1..6fd1da6335c6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -947,30 +947,16 @@ jobs:
           mentions: "@proofs-team"
 
   cannon-stf-verify:
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
+    machine: true
+    resource_class: ethereum-optimism/latitude-1
     steps:
       - checkout
-      - setup_remote_docker
-      - restore_cache:
-          name: Restore Go modules cache
-          key: gomod-{{ checksum "go.sum" }}
-      - restore_cache:
-          name: Restore Go build cache
-          keys:
-            - golang-build-cache-cannon-stf-verify-{{ checksum "go.sum" }}
-            - golang-build-cache-cannon-stf-verify-
       - run:
           name: Build cannon
           command: make cannon
       - run:
           name: Verify the Cannon STF
           command: make -C ./cannon cannon-stf-verify
-      - save_cache:
-          name: Save Go build cache
-          key: golang-build-cache-cannon-stf-verify-{{ checksum "go.sum" }}
-          paths:
-            - "/root/.cache/go-build"
       - notify-failures-on-develop:
           mentions: "@proofs-team"
 
@@ -1018,38 +1004,6 @@ jobs:
           no_output_timeout: 20m
       - notify-failures-on-develop
 
-  go-mod-download:
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
-    parameters:
-      file:
-        default: go.sum
-        description: The file name of checksum for restore_cache and save_cache.
-        type: string
-      key:
-        default: gomod
-        description: The key of restore_cache and save_cache.
-        type: string
-    steps:
-      - checkout
-      - restore_cache:
-          key: << parameters.key >>-{{ checksum "<< parameters.file >>" }}
-          name: Restore Go modules cache
-      - run:
-          name: Sanity check go mod cache path
-          command: test "$(go env GOMODCACHE)" == "/go/pkg/mod" # yes, it's an odd path
-      - run:
-          command: go mod download
-          name: Download Go module dependencies
-      - run:
-          name: "Go mod tidy"
-          command: make mod-tidy && git diff --exit-code
-      - save_cache:
-          key: << parameters.key >>-{{ checksum "<< parameters.file >>" }}
-          name: Save Go modules cache
-          paths:
-            - "/go/pkg/mod"
-
   bedrock-go-tests: # just a helper, that depends on all the actual test jobs
     docker:
       # Use a smaller base image to avoid pulling the huge ci-builder
@@ -1237,7 +1191,6 @@ workflows:
         - not:
             equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
-      - go-mod-download
       - contracts-bedrock-build:
           name: contracts-bedrock-build
           # Build with just core + script contracts.
@@ -1321,14 +1274,12 @@ workflows:
       - op-program-compat
       - bedrock-go-tests:
           requires:
-            - go-mod-download
             - go-lint
             - cannon-build-test-vectors
             - cannon-go-lint-and-test-32-bit
             - cannon-go-lint-and-test-64-bit
             - check-generated-mocks-op-node
             - check-generated-mocks-op-service
-            - go-mod-download
             - op-program-compat
             # Not needed for the devnet but we want to make sure they build successfully
             - cannon-docker-build
@@ -1530,11 +1481,8 @@ workflows:
         - not:
             equal: [scheduled_pipeline, << pipeline.trigger_source >>]
     jobs:
-      - go-mod-download
       - cannon-prestate
       - cannon-stf-verify:
-          requires:
-            - go-mod-download
           context:
             - slack
       - contracts-bedrock-build:

From 0c9b1d5268827044c5be409645ed52dad56d47f6 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Fri, 6 Dec 2024 16:36:44 +0000
Subject: [PATCH 392/451] fix possible panic in computeSyncActions (#13287)

---
 op-batcher/batcher/sync_actions.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-batcher/batcher/sync_actions.go b/op-batcher/batcher/sync_actions.go
index 8f4121d7d5f4..6031d2ce2585 100644
--- a/op-batcher/batcher/sync_actions.go
+++ b/op-batcher/batcher/sync_actions.go
@@ -114,7 +114,7 @@ func computeSyncActions[T channelStatuser](newSyncStatus eth.SyncStatus, prevCur
 			// that the derivation pipeline may have stalled
 			// e.g. because of Holocene strict ordering rules.
 			l.Warn("sequencer did not make expected progress",
-				"existingBlock", eth.ToBlockID(blocks[numBlocksToDequeue-1]),
+				"existingBlock", ch.LatestL2(),
 				"newSafeBlock", newSyncStatus.SafeL2,
 				"syncActions", startAfresh)
 			return startAfresh, false

From 1ac5a35f66dba762e26275d1bfe0a64121f4da97 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 09:38:05 -0700
Subject: [PATCH 393/451] ci: revert cannon-stf-verify (#13289)

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6fd1da6335c6..1cdb7c4fe9da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -947,10 +947,11 @@ jobs:
           mentions: "@proofs-team"
 
   cannon-stf-verify:
-    machine: true
-    resource_class: ethereum-optimism/latitude-1
+    docker:
+      - image: <<pipeline.parameters.ci_builder_image>>
     steps:
       - checkout
+      - setup_remote_docker
       - run:
           name: Build cannon
           command: make cannon

From bb6f5001e9a668c51c54c3e07645373dd06b6300 Mon Sep 17 00:00:00 2001
From: Dmitry <98899785+mdqst@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:52:29 +0300
Subject: [PATCH 394/451] docs: Fix formatting issue in "Production Releases"
 Update README.md (#13281)

Fix formatting issue in "Production Releases" section
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bda740f63c2c..498b1a29b718 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ For contract releases, refer to the GitHub release notes for a given release whi
 
 Tags of the form `v<semver>`, such as `v1.1.4`, indicate releases of all Go code only, and **DO NOT** include smart contracts.
 This naming scheme is required by Golang.
-In the above list, this means these `v<semver` releases contain all `op-*` components and exclude all `contracts-*` components.
+In the above list, this means these `v<semver>` releases contain all `op-*` components and exclude all `contracts-*` components.
 
 `op-geth` embeds upstream geth’s version inside its own version as follows: `vMAJOR.GETH_MAJOR GETH_MINOR GETH_PATCH.PATCH`.
 Basically, geth’s version is our minor version.

From d949564d754451b694484ff563007a130472e97d Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Sat, 7 Dec 2024 01:09:58 +0800
Subject: [PATCH 395/451] add `CheckAndDial` to avoid duplicate code (#13146)

* Don't repeat yourself

* add a log for loadBlocksIntoState

* op-batcher: fix log in batcher/driver.go

* modify log

---------

Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-batcher/batcher/driver.go |  6 ++++++
 op-service/client/rpc.go     | 22 +++++++++++++---------
 op-service/dial/dial.go      | 11 +----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index a2b2bd881229..5021f1ff37c9 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -248,6 +248,12 @@ func (l *BatchSubmitter) loadBlocksIntoState(ctx context.Context, start, end uin
 	if end < start {
 		return fmt.Errorf("start number is > end number %d,%d", start, end)
 	}
+
+	// we don't want to print it in the 1-block case as `loadBlockIntoState` already does
+	if end > start {
+		l.Log.Info("Loading range of multiple blocks into state", "start", start, "end", end)
+	}
+
 	var latestBlock *types.Block
 	// Add all blocks to "state"
 	for i := start; i <= end; i++ {
diff --git a/op-service/client/rpc.go b/op-service/client/rpc.go
index c37a4a53dd0e..a1413d0d9d90 100644
--- a/op-service/client/rpc.go
+++ b/op-service/client/rpc.go
@@ -152,18 +152,22 @@ func dialRPCClientWithBackoff(ctx context.Context, log log.Logger, addr string,
 		bOff = retry.Fixed(cfg.fixedDialBackoff)
 	}
 	return retry.Do(ctx, cfg.backoffAttempts, bOff, func() (*rpc.Client, error) {
-		if !IsURLAvailable(ctx, addr) {
-			log.Warn("failed to dial address, but may connect later", "addr", addr)
-			return nil, fmt.Errorf("address unavailable (%s)", addr)
-		}
-		client, err := rpc.DialOptions(ctx, addr, cfg.gethRPCOptions...)
-		if err != nil {
-			return nil, fmt.Errorf("failed to dial address (%s): %w", addr, err)
-		}
-		return client, nil
+		return CheckAndDial(ctx, log, addr, cfg.gethRPCOptions...)
 	})
 }
 
+func CheckAndDial(ctx context.Context, log log.Logger, addr string, options ...rpc.ClientOption) (*rpc.Client, error) {
+	if !IsURLAvailable(ctx, addr) {
+		log.Warn("failed to dial address, but may connect later", "addr", addr)
+		return nil, fmt.Errorf("address unavailable (%s)", addr)
+	}
+	client, err := rpc.DialOptions(ctx, addr, options...)
+	if err != nil {
+		return nil, fmt.Errorf("failed to dial address (%s): %w", addr, err)
+	}
+	return client, nil
+}
+
 func IsURLAvailable(ctx context.Context, address string) bool {
 	u, err := url.Parse(address)
 	if err != nil {
diff --git a/op-service/dial/dial.go b/op-service/dial/dial.go
index ee7ca35e5882..4bd38333189d 100644
--- a/op-service/dial/dial.go
+++ b/op-service/dial/dial.go
@@ -2,7 +2,6 @@ package dial
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-service/client"
@@ -72,13 +71,5 @@ func dialRPCClientWithBackoff(ctx context.Context, log log.Logger, addr string)
 
 // Dials a JSON-RPC endpoint once.
 func dialRPCClient(ctx context.Context, log log.Logger, addr string) (*rpc.Client, error) {
-	if !client.IsURLAvailable(ctx, addr) {
-		log.Warn("failed to dial address, but may connect later", "addr", addr)
-		return nil, fmt.Errorf("address unavailable (%s)", addr)
-	}
-	client, err := rpc.DialOptions(ctx, addr)
-	if err != nil {
-		return nil, fmt.Errorf("failed to dial address (%s): %w", addr, err)
-	}
-	return client, nil
+	return client.CheckAndDial(ctx, log, addr)
 }

From 354337cfd8f97f2d009c0a6667ecc4b67217bee5 Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Fri, 6 Dec 2024 18:14:12 +0100
Subject: [PATCH 396/451] txmgr: Disable default batcher tx send timeout
 (#13284)

With Holocene, batcher transaction ordering has to be strictly preserved, so
trying to send a transaction candidate should just never timeout.
Note that the txmgr will still bump fees to get a transaction for the
same nonce submitted.
---
 op-service/txmgr/cli.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-service/txmgr/cli.go b/op-service/txmgr/cli.go
index fc1aa2cceb0c..b345f43bd2dd 100644
--- a/op-service/txmgr/cli.go
+++ b/op-service/txmgr/cli.go
@@ -79,7 +79,7 @@ var (
 		MinBaseFeeGwei:            1.0,
 		ResubmissionTimeout:       48 * time.Second,
 		NetworkTimeout:            10 * time.Second,
-		TxSendTimeout:             10 * time.Minute,
+		TxSendTimeout:             0, // Try sending txs indefinitely, to preserve tx ordering for Holocene
 		TxNotInMempoolTimeout:     2 * time.Minute,
 		ReceiptQueryInterval:      12 * time.Second,
 	}

From f21f95e231327838e713791635d3e44d2551c461 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 6 Dec 2024 12:37:57 -0500
Subject: [PATCH 397/451] fix: have semver-lock build contracts by default
 (#13223)

semver-lock justfile task didn't build by default which was
confusing. Now it does.
---
 packages/contracts-bedrock/justfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index 423ee453d6b6..c4669f63130c 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -104,10 +104,13 @@ kontrol-summary-full: kontrol-summary kontrol-summary-fp
 snapshots-abi-storage:
   go run ./scripts/autogen/generate-snapshots .
 
-# Updates the snapshots/semver-lock.json file.
-semver-lock:
+# Updates the snapshots/semver-lock.json file without building contracts.
+semver-lock-no-build:
   go run scripts/autogen/generate-semver-lock/main.go
 
+# Updates the snapshots/semver-lock.json file.
+semver-lock: build semver-lock-no-build
+
 # Generates core snapshots without building contracts. Currently just an alias for
 # snapshots-abi-storage because we no longer run Kontrol snapshots here. Run
 # kontrol-summary-full to build the Kontrol summaries if necessary.

From f0461a141ae456c00df8ecb9e099e1310e501d92 Mon Sep 17 00:00:00 2001
From: Michael Amadi <amadimichaeld@gmail.com>
Date: Fri, 6 Dec 2024 19:47:46 +0100
Subject: [PATCH 398/451] ctb: remove unnecessary vm.assumes (#13264)

* test utils

* test utils

* rm unncesessary vm.assume

* rm unncesessary vm.assume

* rm unncesessary vm.assume

* fixes...

* rm testutils
---
 .../test/L1/DataAvailabilityChallenge.t.sol   | 47 ++++++++++---------
 .../test/L1/OptimismPortal.t.sol              | 42 ++++++++++-------
 .../test/L1/OptimismPortal2.t.sol             | 33 ++++++++-----
 .../test/L1/SystemConfig.t.sol                |  4 +-
 .../test/L2/CrossL2Inbox.t.sol                |  8 ++--
 .../test/L2/L1BlockInterop.t.sol              |  2 -
 .../test/L2/L2ToL2CrossDomainMessenger.t.sol  |  2 +-
 .../contracts-bedrock/test/cannon/MIPS2.t.sol |  7 +--
 .../test/libraries/Bytes.t.sol                | 17 +++++--
 .../test/libraries/GasPayingToken.t.sol       | 12 +++--
 .../test/libraries/SafeCall.t.sol             |  2 +-
 .../test/libraries/TransientContext.t.sol     |  8 ++--
 .../drippie/dripchecks/CheckBalanceLow.t.sol  |  9 ++--
 .../test/universal/CrossDomainMessenger.t.sol |  7 ++-
 14 files changed, 120 insertions(+), 80 deletions(-)

diff --git a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
index ab0ca82c61fd..05daec205ad9 100644
--- a/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
+++ b/packages/contracts-bedrock/test/L1/DataAvailabilityChallenge.t.sol
@@ -36,7 +36,6 @@ contract DataAvailabilityChallengeTest is CommonTest {
         // EntryPoint will revert if using amount > type(uint112).max.
         vm.assume(sender != Preinstalls.EntryPoint_v060);
         vm.assume(sender != address(dataAvailabilityChallenge));
-        vm.assume(sender.balance == 0);
         vm.deal(sender, amount);
 
         vm.prank(sender);
@@ -59,7 +58,6 @@ contract DataAvailabilityChallengeTest is CommonTest {
         vm.assume(sender != Preinstalls.EntryPoint_v060);
         vm.assume(sender != address(dataAvailabilityChallenge));
         vm.assume(sender != deploy.mustGetAddress("DataAvailabilityChallenge"));
-        vm.assume(sender.balance == 0);
         vm.deal(sender, amount);
 
         vm.prank(sender);
@@ -86,10 +84,11 @@ contract DataAvailabilityChallengeTest is CommonTest {
         vm.assume(challenger != address(0));
 
         // Assume the block number is not close to the max uint256 value
-        vm.assume(
-            challengedBlockNumber
-                < type(uint256).max - dataAvailabilityChallenge.challengeWindow()
-                    - dataAvailabilityChallenge.resolveWindow()
+        challengedBlockNumber = bound(
+            challengedBlockNumber,
+            0,
+            type(uint256).max - dataAvailabilityChallenge.challengeWindow() - dataAvailabilityChallenge.resolveWindow()
+                - 1
         );
         uint256 requiredBond = dataAvailabilityChallenge.bondSize();
 
@@ -139,10 +138,11 @@ contract DataAvailabilityChallengeTest is CommonTest {
         vm.assume(challenger != address(0));
 
         // Assume the block number is not close to the max uint256 value
-        vm.assume(
-            challengedBlockNumber
-                < type(uint256).max - dataAvailabilityChallenge.challengeWindow()
-                    - dataAvailabilityChallenge.resolveWindow()
+        challengedBlockNumber = bound(
+            challengedBlockNumber,
+            0,
+            type(uint256).max - dataAvailabilityChallenge.challengeWindow() - dataAvailabilityChallenge.resolveWindow()
+                - 1
         );
         uint256 requiredBond = dataAvailabilityChallenge.bondSize();
 
@@ -265,10 +265,11 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.setResolverRefundPercentage(resolverRefundPercentage);
 
         // Assume the block number is not close to the max uint256 value
-        vm.assume(
-            challengedBlockNumber
-                < type(uint256).max - dataAvailabilityChallenge.challengeWindow()
-                    - dataAvailabilityChallenge.resolveWindow()
+        challengedBlockNumber = bound(
+            challengedBlockNumber,
+            0,
+            type(uint256).max - dataAvailabilityChallenge.challengeWindow() - dataAvailabilityChallenge.resolveWindow()
+                - 1
         );
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
 
@@ -356,10 +357,11 @@ contract DataAvailabilityChallengeTest is CommonTest {
         dataAvailabilityChallenge.setResolverRefundPercentage(resolverRefundPercentage);
 
         // Assume the block number is not close to the max uint256 value
-        vm.assume(
-            challengedBlockNumber
-                < type(uint256).max - dataAvailabilityChallenge.challengeWindow()
-                    - dataAvailabilityChallenge.resolveWindow()
+        challengedBlockNumber = bound(
+            challengedBlockNumber,
+            0,
+            type(uint256).max - dataAvailabilityChallenge.challengeWindow() - dataAvailabilityChallenge.resolveWindow()
+                - 1
         );
         bytes memory challengedCommitment = computeCommitmentKeccak256(wrongPreImage);
 
@@ -458,10 +460,11 @@ contract DataAvailabilityChallengeTest is CommonTest {
 
     function test_unlockBond_succeeds(bytes memory preImage, uint256 challengedBlockNumber) public {
         // Assume the block number is not close to the max uint256 value
-        vm.assume(
-            challengedBlockNumber
-                < type(uint256).max - dataAvailabilityChallenge.challengeWindow()
-                    - dataAvailabilityChallenge.resolveWindow()
+        challengedBlockNumber = bound(
+            challengedBlockNumber,
+            0,
+            type(uint256).max - dataAvailabilityChallenge.challengeWindow() - dataAvailabilityChallenge.resolveWindow()
+                - 1
         );
         bytes memory challengedCommitment = computeCommitmentKeccak256(preImage);
 
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
index b575fdacff41..77b0d9833eaa 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal.t.sol
@@ -162,14 +162,16 @@ contract OptimismPortal_Test is CommonTest {
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         internal
     {
         if (_isCreation) {
             _to = address(0);
         }
-        vm.assume(_data.length <= 120_000);
+        if (_data.length > 120_000) {
+            _data = _data[0:120_000];
+        }
         IResourceMetering.ResourceConfig memory rcfg = systemConfig.resourceConfig();
         _gasLimit =
             uint64(bound(_gasLimit, optimismPortal.minimumGasLimit(uint64(_data.length)), rcfg.maxResourceLimit));
@@ -207,7 +209,7 @@ contract OptimismPortal_Test is CommonTest {
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -232,7 +234,7 @@ contract OptimismPortal_Test is CommonTest {
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -476,13 +478,17 @@ contract OptimismPortal_Test is CommonTest {
     ///         `depositTransaction` function. This is a simple differential test.
     function test_setGasPayingToken_correctEvent_succeeds(
         address _token,
-        string memory _name,
-        string memory _symbol
+        string calldata _name,
+        string calldata _symbol
     )
         external
     {
-        vm.assume(bytes(_name).length <= 32);
-        vm.assume(bytes(_symbol).length <= 32);
+        if (bytes(_name).length > 32) {
+            _name = _name[0:32];
+        }
+        if (bytes(_symbol).length > 32) {
+            _symbol = _symbol[0:32];
+        }
 
         bytes32 name = GasPayingToken.sanitize(_name);
         bytes32 symbol = GasPayingToken.sanitize(_symbol);
@@ -1436,14 +1442,16 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         internal
     {
         if (_isCreation) {
             _to = address(0);
         }
-        vm.assume(_data.length <= 120_000);
+        if (_data.length > 120_000) {
+            _data = _data[0:120_000];
+        }
         IResourceMetering.ResourceConfig memory rcfg = systemConfig.resourceConfig();
         _gasLimit =
             uint64(bound(_gasLimit, optimismPortal.minimumGasLimit(uint64(_data.length)), rcfg.maxResourceLimit));
@@ -1482,7 +1490,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -1507,7 +1515,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -1663,14 +1671,16 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         internal
     {
         if (_isCreation) {
             _to = address(0);
         }
-        vm.assume(_data.length <= 120_000);
+        if (_data.length > 120_000) {
+            _data = _data[0:120_000];
+        }
         IResourceMetering.ResourceConfig memory rcfg = systemConfig.resourceConfig();
         _gasLimit =
             uint64(bound(_gasLimit, optimismPortal.minimumGasLimit(uint64(_data.length)), rcfg.maxResourceLimit));
@@ -1704,7 +1714,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -1727,7 +1737,7 @@ contract OptimismPortalWithMockERC20_Test is OptimismPortal_FinalizeWithdrawal_T
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
diff --git a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
index 830323936a60..309abd390894 100644
--- a/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
+++ b/packages/contracts-bedrock/test/L1/OptimismPortal2.t.sol
@@ -329,13 +329,17 @@ contract OptimismPortal2_Test is CommonTest {
     ///         `depositTransaction` function. This is a simple differential test.
     function test_setGasPayingToken_correctEvent_succeeds(
         address _token,
-        string memory _name,
-        string memory _symbol
+        string calldata _name,
+        string calldata _symbol
     )
         external
     {
-        vm.assume(bytes(_name).length <= 32);
-        vm.assume(bytes(_symbol).length <= 32);
+        if (bytes(_name).length > 32) {
+            _name = _name[0:32];
+        }
+        if (bytes(_symbol).length > 32) {
+            _symbol = _symbol[0:32];
+        }
 
         bytes32 name = GasPayingToken.sanitize(_name);
         bytes32 symbol = GasPayingToken.sanitize(_symbol);
@@ -1711,14 +1715,16 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         internal
     {
         if (_isCreation) {
             _to = address(0);
         }
-        vm.assume(_data.length <= 120_000);
+        if (_data.length > 120_000) {
+            _data = _data[0:120_000];
+        }
         IResourceMetering.ResourceConfig memory rcfg = systemConfig.resourceConfig();
         _gasLimit =
             uint64(bound(_gasLimit, optimismPortal2.minimumGasLimit(uint64(_data.length)), rcfg.maxResourceLimit));
@@ -1757,7 +1763,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -1782,7 +1788,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -1947,14 +1953,17 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         internal
     {
         if (_isCreation) {
             _to = address(0);
         }
-        vm.assume(_data.length <= 120_000);
+        if (_data.length > 120_000) {
+            _data = _data[0:120_000];
+        }
+
         IResourceMetering.ResourceConfig memory rcfg = systemConfig.resourceConfig();
         _gasLimit =
             uint64(bound(_gasLimit, optimismPortal2.minimumGasLimit(uint64(_data.length)), rcfg.maxResourceLimit));
@@ -1988,7 +1997,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
@@ -2011,7 +2020,7 @@ contract OptimismPortal2WithMockERC20_Test is OptimismPortal2_FinalizeWithdrawal
         uint256 _value,
         uint64 _gasLimit,
         bool _isCreation,
-        bytes memory _data
+        bytes calldata _data
     )
         external
     {
diff --git a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
index f7cea088bcf4..1e9e565fb329 100644
--- a/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/L1/SystemConfig.t.sol
@@ -639,8 +639,8 @@ contract SystemConfig_Setters_Test is SystemConfig_Init {
 
     /// @dev Tests that `setEIP1559Params` updates the EIP1559 parameters successfully.
     function testFuzz_setEIP1559Params_succeeds(uint32 _denominator, uint32 _elasticity) external {
-        vm.assume(_denominator > 1);
-        vm.assume(_elasticity > 1);
+        _denominator = uint32(bound(_denominator, 2, type(uint32).max));
+        _elasticity = uint32(bound(_elasticity, 2, type(uint32).max));
 
         vm.expectEmit(address(systemConfig));
         emit ConfigUpdate(
diff --git a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
index 100019034df6..918b0f4b8da2 100644
--- a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
@@ -298,7 +298,7 @@ contract CrossL2InboxTest is Test {
 
     /// @dev Tests that the `executeMessage` function reverts when called with an identifier with an invalid timestamp.
     function testFuzz_executeMessage_invalidTimestamp_reverts(
-        Identifier calldata _id,
+        Identifier memory _id,
         address _target,
         bytes calldata _message,
         uint256 _value
@@ -307,7 +307,7 @@ contract CrossL2InboxTest is Test {
         setInteropStart
     {
         // Ensure that the id's timestamp is invalid (greater than the current block timestamp)
-        vm.assume(_id.timestamp > block.timestamp);
+        _id.timestamp = bound(_id.timestamp, block.timestamp + 1, type(uint256).max);
 
         // Ensure is not a deposit transaction
         vm.mockCall({
@@ -488,7 +488,7 @@ contract CrossL2InboxTest is Test {
     /// @dev Tests that the `validateMessage` function reverts when called with an identifier with a timestamp later
     /// than current block.timestamp.
     function testFuzz_validateMessage_invalidTimestamp_reverts(
-        Identifier calldata _id,
+        Identifier memory _id,
         bytes32 _messageHash
     )
         external
@@ -502,7 +502,7 @@ contract CrossL2InboxTest is Test {
         });
 
         // Ensure that the id's timestamp is invalid (greater than the current block timestamp)
-        vm.assume(_id.timestamp > block.timestamp);
+        _id.timestamp = bound(_id.timestamp, block.timestamp + 1, type(uint256).max);
 
         // Expect a revert with the InvalidTimestamp selector
         vm.expectRevert(InvalidTimestamp.selector);
diff --git a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
index a5e086c86d58..40dfa459e16d 100644
--- a/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L1BlockInterop.t.sol
@@ -64,8 +64,6 @@ contract L1BlockInteropTest is CommonTest {
 
     /// @dev Tests that the dependency set size is correct when adding an arbitrary number of chain IDs.
     function testFuzz_dependencySetSize_succeeds(uint8 _dependencySetSize) public prankDepositor {
-        vm.assume(_dependencySetSize <= type(uint8).max);
-
         uint256 uniqueCount = 0;
 
         for (uint256 i = 0; i < _dependencySetSize; i++) {
diff --git a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
index 3b4314853690..0c064f686055 100644
--- a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
@@ -144,7 +144,7 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         vm.assume(_target != Predeploys.CROSS_L2_INBOX && _target != Predeploys.L2_TO_L2_CROSS_DOMAIN_MESSENGER);
 
         // Ensure that _value is greater than 0
-        vm.assume(_value > 0);
+        _value = bound(_value, 1, type(uint256).max);
 
         // Add sufficient value to the contract to send the message with
         vm.deal(address(this), _value);
diff --git a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
index 07c5883c17bc..bd2522f83fa3 100644
--- a/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
+++ b/packages/contracts-bedrock/test/cannon/MIPS2.t.sol
@@ -1130,7 +1130,7 @@ contract MIPS2_Test is CommonTest {
     )
         public
     {
-        vm.assume(_wakeup != sys.FUTEX_EMPTY_ADDR);
+        _wakeup = uint32(_bound(_wakeup, 0, sys.FUTEX_EMPTY_ADDR - 1));
 
         threading.createThread();
         threading.createThread();
@@ -1178,8 +1178,9 @@ contract MIPS2_Test is CommonTest {
     )
         public
     {
-        vm.assume(_wakeup != sys.FUTEX_EMPTY_ADDR);
-        vm.assume(_wakeup != _futexAddr);
+        // -2 incase _wakeup == _futexAddr and _wakeup needs to be incremented
+        _wakeup = uint32(_bound(_wakeup, 0, sys.FUTEX_EMPTY_ADDR - 2));
+        if (_wakeup == _futexAddr) _wakeup++;
 
         threading.createThread();
         threading.createThread();
diff --git a/packages/contracts-bedrock/test/libraries/Bytes.t.sol b/packages/contracts-bedrock/test/libraries/Bytes.t.sol
index e38d369ab55d..57c5950058dd 100644
--- a/packages/contracts-bedrock/test/libraries/Bytes.t.sol
+++ b/packages/contracts-bedrock/test/libraries/Bytes.t.sol
@@ -127,10 +127,19 @@ contract Bytes_slice_TestFail is Test {
     /// @notice Tests that, when given an input bytes array of length `n`, the `slice` function will
     ///         always revert if `_start + _length > n`.
     function testFuzz_slice_outOfBounds_reverts(bytes memory _input, uint256 _start, uint256 _length) public {
-        // We want a valid start index and a length that will not overflow.
-        vm.assume(_start < _input.length && _length < type(uint256).max - 31);
+        // We want a valid start index that will not overflow.
+        if (_input.length == 0) {
+            _start = 0;
+        } else {
+            _start = bound(_start, 0, _input.length - 1);
+        }
+        // And a length that will not overflow.
         // But, we want an invalid slice length.
-        vm.assume(_start + _length > _input.length);
+        if (_start > 31) {
+            _length = bound(_length, (_input.length - _start) + 1, type(uint256).max - _start);
+        } else {
+            _length = bound(_length, (_input.length - _start) + 1, type(uint256).max - 31);
+        }
 
         vm.expectRevert("slice_outOfBounds");
         Bytes.slice(_input, _start, _length);
@@ -140,7 +149,7 @@ contract Bytes_slice_TestFail is Test {
     ///         the `slice` function reverts.
     function testFuzz_slice_lengthOverflows_reverts(bytes memory _input, uint256 _start, uint256 _length) public {
         // Ensure that the `_length` will overflow if a number >= 31 is added to it.
-        vm.assume(_length > type(uint256).max - 31);
+        _length = uint256(bound(_length, type(uint256).max - 30, type(uint256).max));
 
         vm.expectRevert("slice_overflow");
         Bytes.slice(_input, _start, _length);
diff --git a/packages/contracts-bedrock/test/libraries/GasPayingToken.t.sol b/packages/contracts-bedrock/test/libraries/GasPayingToken.t.sol
index f6ad014db3a4..b2b87eeee41a 100644
--- a/packages/contracts-bedrock/test/libraries/GasPayingToken.t.sol
+++ b/packages/contracts-bedrock/test/libraries/GasPayingToken.t.sol
@@ -57,15 +57,19 @@ contract GasPayingToken_Roundtrip_Test is Test {
     function testFuzz_setGetWithSanitize_succeeds(
         address _token,
         uint8 _decimals,
-        string memory _name,
-        string memory _symbol
+        string calldata _name,
+        string calldata _symbol
     )
         external
     {
         vm.assume(_token != address(0));
-        vm.assume(bytes(_name).length <= 32);
-        vm.assume(bytes(_symbol).length <= 32);
         vm.assume(_token != Constants.ETHER);
+        if (bytes(_name).length > 32) {
+            _name = string(bytes(_name)[0:32]);
+        }
+        if (bytes(_symbol).length > 32) {
+            _symbol = string(bytes(_symbol)[0:32]);
+        }
 
         GasPayingToken.set(_token, _decimals, GasPayingToken.sanitize(_name), GasPayingToken.sanitize(_symbol));
 
diff --git a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
index d05e952e44d9..b87970dbb232 100644
--- a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
+++ b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
@@ -12,7 +12,7 @@ import { SafeCall } from "src/libraries/SafeCall.sol";
 contract SafeCall_Test is Test {
     /// @notice Helper function to deduplicate code. Makes all assumptions required for these tests.
     function assumeNot(address _addr) internal {
-        vm.assume(_addr.balance == 0);
+        vm.deal(_addr, 0);
         vm.assume(_addr != address(this));
         assumeAddressIsNot(_addr, StdCheatsSafe.AddressType.ForgeAddress, StdCheatsSafe.AddressType.Precompile);
     }
diff --git a/packages/contracts-bedrock/test/libraries/TransientContext.t.sol b/packages/contracts-bedrock/test/libraries/TransientContext.t.sol
index 20e8434b9c16..e075a61b9f17 100644
--- a/packages/contracts-bedrock/test/libraries/TransientContext.t.sol
+++ b/packages/contracts-bedrock/test/libraries/TransientContext.t.sol
@@ -26,7 +26,7 @@ contract TransientContextTest is Test {
     /// @notice Tests that `increment()` increments the call depth.
     /// @param _startingCallDepth Starting call depth.
     function testFuzz_increment_succeeds(uint256 _startingCallDepth) public {
-        vm.assume(_startingCallDepth < type(uint256).max);
+        _startingCallDepth = bound(_startingCallDepth, 0, type(uint256).max - 1);
         assembly ("memory-safe") {
             tstore(sload(callDepthSlot.slot), _startingCallDepth)
         }
@@ -39,7 +39,7 @@ contract TransientContextTest is Test {
     /// @notice Tests that `decrement()` decrements the call depth.
     /// @param _startingCallDepth Starting call depth.
     function testFuzz_decrement_succeeds(uint256 _startingCallDepth) public {
-        vm.assume(_startingCallDepth > 0);
+        _startingCallDepth = bound(_startingCallDepth, 1, type(uint256).max);
         assembly ("memory-safe") {
             tstore(sload(callDepthSlot.slot), _startingCallDepth)
         }
@@ -144,7 +144,7 @@ contract TransientReentrancyAwareTest is TransientContextTest, TransientReentran
     /// @param _slot      Slot to test.
     /// @param _value     Value to test.
     function testFuzz_reentrantAware_succeeds(uint256 _callDepth, bytes32 _slot, uint256 _value) public {
-        vm.assume(_callDepth < type(uint256).max);
+        _callDepth = bound(_callDepth, 0, type(uint256).max - 1);
         assembly ("memory-safe") {
             tstore(sload(callDepthSlot.slot), _callDepth)
         }
@@ -172,7 +172,7 @@ contract TransientReentrancyAwareTest is TransientContextTest, TransientReentran
     )
         public
     {
-        vm.assume(_callDepth < type(uint256).max - 1);
+        _callDepth = bound(_callDepth, 0, type(uint256).max - 2);
         assembly ("memory-safe") {
             tstore(sload(callDepthSlot.slot), _callDepth)
         }
diff --git a/packages/contracts-bedrock/test/periphery/drippie/dripchecks/CheckBalanceLow.t.sol b/packages/contracts-bedrock/test/periphery/drippie/dripchecks/CheckBalanceLow.t.sol
index bd4d22de8285..b06f11dfb62e 100644
--- a/packages/contracts-bedrock/test/periphery/drippie/dripchecks/CheckBalanceLow.t.sol
+++ b/packages/contracts-bedrock/test/periphery/drippie/dripchecks/CheckBalanceLow.t.sol
@@ -23,10 +23,13 @@ contract CheckBalanceLowTest is Test {
 
     /// @notice Fuzz the `check` function and assert that it always returns true
     ///         when the target's balance is smaller than the threshold.
-    function testFuzz_check_succeeds(address _target, uint256 _threshold) external view {
+    function testFuzz_check_succeeds(address _target, uint256 _threshold) external {
         CheckBalanceLow.Params memory p = CheckBalanceLow.Params({ target: _target, threshold: _threshold });
 
-        vm.assume(_target.balance < _threshold);
+        if (_target.balance >= p.threshold) {
+            if (_threshold == 0) p.threshold = 1;
+            vm.deal(_target, p.threshold - 1);
+        }
 
         assertEq(c.check(abi.encode(p)), true);
     }
@@ -37,7 +40,7 @@ contract CheckBalanceLowTest is Test {
         CheckBalanceLow.Params memory p = CheckBalanceLow.Params({ target: _target, threshold: _threshold });
 
         // prevent overflows
-        vm.assume(_threshold != type(uint256).max);
+        _threshold = bound(_threshold, 0, type(uint256).max - 1);
         vm.deal(_target, _threshold + 1);
 
         assertEq(c.check(abi.encode(p)), false);
diff --git a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
index 12cc2a8c53b2..d4b1bc3c54dc 100644
--- a/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/universal/CrossDomainMessenger.t.sol
@@ -30,8 +30,11 @@ contract CrossDomainMessenger_BaseGas_Test is CommonTest {
     ///         or equal to the minimum gas limit value on the OptimismPortal.
     ///         This guarantees that the messengers will always pass sufficient
     ///         gas to the OptimismPortal.
-    function testFuzz_baseGas_portalMinGasLimit_succeeds(bytes memory _data, uint32 _minGasLimit) external view {
-        vm.assume(_data.length <= type(uint64).max);
+    function testFuzz_baseGas_portalMinGasLimit_succeeds(bytes calldata _data, uint32 _minGasLimit) external view {
+        if (_data.length > type(uint64).max) {
+            _data = _data[0:type(uint64).max];
+        }
+
         uint64 baseGas = l1CrossDomainMessenger.baseGas(_data, _minGasLimit);
         uint64 minGasLimit = optimismPortal.minimumGasLimit(uint64(_data.length));
         assertTrue(baseGas >= minGasLimit);

From 17511a21dc9714049350f4e7a57228ba8b751273 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Fri, 6 Dec 2024 20:25:03 +0100
Subject: [PATCH 399/451] op-supervisor: readme (#12819)

* op-supervisor: readme draft

* op-supervisor: fix review suggestions

* op-supervisor: readme extension

* op-supervisor: fix mermaid diagram syntax
---
 op-supervisor/README.md | 299 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 299 insertions(+)
 create mode 100644 op-supervisor/README.md

diff --git a/op-supervisor/README.md b/op-supervisor/README.md
new file mode 100644
index 000000000000..20159aa4db1a
--- /dev/null
+++ b/op-supervisor/README.md
@@ -0,0 +1,299 @@
+# `op-supervisor`
+
+Issues: [monorepo](https://github.com/ethereum-optimism/optimism/issues?q=is%3Aissue%20state%3Aopen%20label%3AA-op-supervisor)
+
+Pull requests: [monorepo](https://github.com/ethereum-optimism/optimism/pulls?q=is%3Aopen+is%3Apr+label%3AA-op-supervisor)
+
+User docs:
+- [op-supervisor](https://docs.optimism.io/stack/interop/op-supervisor)
+
+Specs:
+- [interop specs]
+
+`op-supervisor` is a service to monitor chains, and quickly determine
+cross-chain message safety, for native interoperability.
+The `op-supervisor` functions as a [superchain backend], implementing the [interop specs].
+
+[superchain backend]: https://github.com/ethereum-optimism/design-docs/blob/main/protocol/superchain-backend.md
+[interop specs]: https://github.com/ethereum-optimism/specs/tree/main/specs/interop
+
+*Warning: this implementation is a work in progress, in active development.*
+
+
+## Quickstart
+
+```bash
+make op-supervisor
+
+# Key configurables:
+# datadir: where to store indexed interop data
+# dependency-set: where to find chain dependencies (this format is changing, and may be fully onchain in a later iteration)
+# l2-rpcs: L2 RPC endpoints to fetch data from (optional, can also be added using the `admin_addL2RPC in the admin-RPC)
+./bin/op-supervisor \
+  --datadir="./op-supervisor-data" \
+  --dependency-set="./my-network-configs/dependency-set.json" \
+  --l2-rpcs="ws://example1:8545,ws://example2:8545" \
+  --rpc.enable-admin \
+  --rpc.port=8545
+```
+
+## Usage
+
+### Build from source
+
+```bash
+# from op-supervisor dir:
+make op-supervisor
+./bin/op-supervisor --help
+```
+
+### Run from source
+
+```bash
+# from op-supervisor dir:
+go run ./cmd --help
+```
+
+### Build docker image
+
+See `op-supervisor` docker-bake target.
+
+## Overview
+
+### About safety
+
+There are 3 stages of block safety:
+
+- `unsafe`: optimistically processed blocks
+- `safe`: blocks reproducible from valid dependencies
+- `finalized`: blocks reproducible from irreversibly valid dependencies
+
+**Pre-interop**, the only dependency is DA (data availability), i.e. the batch data to derive the chain from.
+**Post-interop**, other L2s may be a dependency also.
+The op-supervisor tracks these dependencies, to maintain a global view of cross-chain message safety.
+
+New blocks are considered `local unsafe`: sufficient to process the block locally, without guarantees.
+Once the L2 dependencies are met we consider it `cross unsafe`: still missing DA, but forming a valid messaging graph.
+
+Once the DA dependency is met, we consider it `local safe`:
+enough to reproduce the local L2 chain content, but not to reason about cross-L2 interactions.
+
+Once both L2 and DA dependencies are met, we consider it `cross safe`.
+A `cross-safe` block may be "derived from" a L1 block that confirms all L2 data to reproduce
+the local chain as well as the cross-L2 dependencies.
+Hence this may take additional L1 data, beyond what a `local safe` block is derived from.
+
+And once the dependencies become irreversibly valid, we consider it `finalized`.
+We can thus look at what `cross-safe` has been derived from, and verify against the
+
+```mermaid
+flowchart TD
+    LocalUnsafe[Local Unsafe]--Pass cross-L2 checks-->CrossUnsafe[Cross Unsafe]
+    LocalUnsafe--Individually reproducible from L1-->LocalSafe
+    LocalSafe[Local Safe]--All cross-L2 dependencies checked<br/> and reproducible from L1-->CrossSafe[Cross Safe]
+    CrossSafe--Dependencies are irreversible-->Finalized
+```
+
+### Verification flow
+
+Warning: the data flow design is actively changing, see [design-doc 171].
+
+[design-doc 171]: https://github.com/ethereum-optimism/design-docs/pull/171
+
+Op-nodes, or any compatible consensus-layer L2 node, interact with the op-supervisor, to:
+
+- share the "local" data with the supervisor
+- view the "cross" safety once the supervisor has sufficient information
+
+```mermaid
+sequenceDiagram
+autonumber
+
+participant opgethA as op-geth A
+participant opnodeA as op-node A
+participant opsup as op-supervisor
+participant opnodeB as op-node B
+
+Note over opnodeA: on new block
+
+opnodeA ->> opgethA: engine process unsafe block
+opgethA -->> opnodeA: engine proccessed unsafe block
+opnodeA ->> opsup: update Local unsafe
+opnodeB ->> opsup: update Local unsafe (maybe)
+opsup ->> opgethA: Fetch receipts
+opgethA -->> opsup: receipts
+
+opsup ->> opsup: cross-unsafe worker
+
+Note left of opnodeA: (changing - delay unsafeView call)
+
+opnodeA ->> opsup: unsafeView
+opsup -->> opnodeA: cross unsafe
+opnodeA ->> opnodeA: reorg if we need to
+opnodeA ->> opnodeA: backtrack unsafe if we need to
+
+Note over opnodeA: on derived block
+
+opnodeA ->> opsup: update Local safe
+opnodeB ->> opsup: update Local safe (maybe)
+opsup ->> opsup: cross-safe worker
+
+Note left of opnodeA: (changing - delay safeView call)
+
+opnodeA ->> opsup: safeView
+opsup -->> opnodeA: cross safe
+
+opnodeA ->> opnodeA: reorg if we need to
+opnodeA ->> opnodeA: backtrack safe if we need to
+
+opnodeA->>opgethA: engine forkchoice-update of safe block
+
+Note over opnodeA: on finalized L1
+
+opnodeA->>opsup: finalized L1
+opsup-->>opnodeA: finalized L2
+
+opnodeA->>opgethA: engine forkchoice-update of finalized block
+```
+
+Implementers note: the op-supervisor needs "local" data
+from the chains before being able to provide "cross" verified updated views.
+The op-node is not currently notified when the "cross" verified view changes,
+and thus relies on a revisit of the op-supervisor to determine change.
+
+### Databases
+
+The op-supervisor maintains a few databases:
+- Log database (`events` kind): per chain, we maintain a running list of log-events,
+  separated by block-seals.
+  I.e. this persists the cross-L2 dependency information.
+- `local safe` (`fromda` kind): per chain, we store which L2 block
+  was locally derived from which L1 block.
+  I.e. this persists the DA dependency information.
+- `cross safe` (`fromda` kind): per chain, we store which L2 block
+  became cross-safe, given all the L2 data available, at which L1 block.
+  I.e. this persists the merged results of verifying both DA and cross-L2 dependencies.
+
+Additionally, the op-supervisor tracks `cross unsafe` in memory, not persisting it to a database:
+it can quickly reproduce this after data-loss by verifying if cross-L2 dependencies
+are met by `unsafe` data, starting from the latest known `cross safe` block.
+
+The latest `L1 finalized` block is tracked ephemerally as well:
+the `L2 finalized` block is determined dynamically,
+given what was `cross safe` at this finalized point in L1.
+
+For both the `events` and `fromda` DB kinds an append-only format was chosen
+to make the database efficient and robust:
+data can be read in parallel, does not require compaction (a known problem with execution-layer databases),
+and data can always be rewound to a previous consistent state by truncating to a checkpoint.
+The database can be searched with binary lookups, and written with O(1) appends.
+
+### Internal Architecture
+
+```mermaid
+flowchart TD
+    user-->opnode
+    user-->opgeth
+    opnode[op-node]==block checks==>frontend[frontend RPC]
+    opgeth[op-geth]==tx-pool checks==>frontend
+
+    frontend<==>backend
+
+    backend--local unsafe updates-->chainprocessor
+    backend--local safe updates-->localFromDA
+    chainsDB--query results-->backend
+
+    crossunsafeworker[Cross unsafe worker<br/><i>per chain]
+    crosssafeworker[Cross safe worker<br/><i>per chain]
+
+    subgraph chainsDB[Chains DB]
+        logDB[Event Log DB<br/><i>per chain]
+        localFromDA[Local-safe DB<br/><i>per chain]
+        crossFromDA[Cross-safe DB<br/><i>per chain]
+
+        crossunsafe[Cross-unsafe<br/><i>per chain]
+
+        finalizedL1[Finalized L1]
+    end
+
+    chainprocessor[Chain processor<br/><i>per chain]
+
+    opgeth--blocks/receipts-->chainprocessor
+    chainprocessor--block-seal and log entries-->logDB
+
+    logDB--candidate<br/>unsafe blocks-->crossunsafeworker
+    logDB--msg reads-->crossunsafeworker
+    crossunsafeworker -- cross-unsafe<br/>updates --> crossunsafe
+
+    localFromDA--candidate<br/>safe blocks-->crosssafeworker
+
+    logDB--msg reads-->crosssafeworker
+    crosssafeworker--cross-safe<br/>updates-->crossFromDA
+    crossFromDA--known<br/>cross-safe-->crosssafeworker
+```
+
+Main components:
+- `frontend`: public API surface
+- `backend`: implements the API (updates, queries, reorgs)
+- `ChainsDB`: hosts the databases, one of each kind, per chain
+- `Chain processor`: indexes blocks/events, including unsafe blocks
+- `Cross-unsafe worker`: updates cross-unsafe, by cross-verifying unsafe data
+- `Cross-safe worker`: updates cross-safe, by cross-verifying safe data within a L1 view
+
+Note that the `cross-unsafe` worker operates on any available L2 dependency data,
+whereas the `cross-safe` worker incrementally expands the L1 scope,
+to capture the `cross-safe` state relative to each L1 block.
+
+Most supervisor branching logic deals with the edge-cases that come with
+syncing dependency data, and updating the safety views as the dependencies change.
+This is where the service differs most from interop development simulations:
+*dependency verification is critical to safety*,
+and requires dependencies on DA to be consolidated with the dependencies on cross-chain messaging.
+
+
+## Product
+
+### Optimization target
+
+The `op-supervisor` implementation optimizes safe determination of cross-chain message safety,
+with fast feedback to readers.
+
+Data is indexed fast and optimistically to have a minimum level of feedback about a message or block.
+Indexing changes are then propagated, allowing the safety-checks to quickly
+follow up with asynchronous full verification of the safety.
+
+### Vision
+
+The `op-supervisor` is actively changing.
+The most immediate changes are that to the architecture and data flow, as outlined in [design-doc 171].
+
+Full support for chain reorgs (detecting them, and resolving them) is the
+next priority after the above architecture and data changes.
+
+Further background on the design-choices of op-supervisor can be found in the
+[superchain backend desgin-doc](https://github.com/ethereum-optimism/design-docs/blob/main/protocol/superchain-backend.md).
+
+## Design principles
+
+- Each indexing or safety kind of change is encapsulated in its own asynchronous job.
+- Increments in indexing and safety are propagated, such that other follow-up work can be triggered without delay.
+- A read-only subset of the API is served, sufficient for nodes to stay in sync, assuming a healthy op-supervisor.
+- Databases are rewound trivially by dropping trailing information.
+- Databases can be copied at any time, for convenient snapshots.
+
+## Failure modes
+
+See [design-doc 171] for discussion of missing data and syncing related failure modes.
+
+Generally the supervisor aims to provide existing static data in the case of disruption of cross-chain verification,
+such that a chain which does not take on new interop dependencies, can continue to be extended with safe blocks.
+
+I.e. safety must be guaranteed at all times,
+but a minimal level of liveness can be maintained by holding off on cross-chain message acceptance
+while allowing regular single-chain functionaltiy to proceed.
+
+## Testing
+
+- `op-e2e/interop`: Go interop system-tests, focused on offchain aspects of services to run end to end.
+- `op-e2e/actions/interop`: Go interop action-tests, focused on onchain aspects such as safety and state-transition.
+- `interop-devnet`: docker-compose to run interoperable chains locally.

From 403ae8103cf08010651889e45e5afe17ad2a0d25 Mon Sep 17 00:00:00 2001
From: blaine <blainemalone01@gmail.com>
Date: Fri, 6 Dec 2024 14:30:23 -0500
Subject: [PATCH 400/451] fix: Adding more global overrides to apply test.
 (#13297)

---
 .../deployer/integration_test/apply_test.go   | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 1605219a8d96..1512da447132 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -13,6 +13,7 @@ import (
 	"maps"
 	"math/big"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -415,7 +416,7 @@ func testApplyExistingOPCM(t *testing.T, l1ChainID uint64, forkRPCUrl string, ve
 	}
 }
 
-func TestL2BlockTimeOverride(t *testing.T) {
+func TestGlobalOverrides(t *testing.T) {
 	op_e2e.InitParallel(t)
 	kurtosisutil.Test(t)
 
@@ -423,8 +424,28 @@ func TestL2BlockTimeOverride(t *testing.T) {
 	defer cancel()
 
 	opts, intent, st := setupGenesisChain(t, defaultL1ChainID)
+	expectedGasLimit := strings.ToLower("0x1C9C380")
+	expectedBaseFeeVaultRecipient := common.HexToAddress("0x0000000000000000000000000000000000000001")
+	expectedL1FeeVaultRecipient := common.HexToAddress("0x0000000000000000000000000000000000000002")
+	expectedSequencerFeeVaultRecipient := common.HexToAddress("0x0000000000000000000000000000000000000003")
+	expectedBaseFeeVaultMinimumWithdrawalAmount := strings.ToLower("0x1BC16D674EC80000")
+	expectedBaseFeeVaultWithdrawalNetwork := genesis.FromUint8(0)
+	expectedEnableGovernance := false
+	expectedGasPriceOracleBaseFeeScalar := uint32(1300)
+	expectedEIP1559Denominator := uint64(500)
+	expectedUseFaultProofs := false
 	intent.GlobalDeployOverrides = map[string]interface{}{
-		"l2BlockTime": float64(3),
+		"l2BlockTime":                         float64(3),
+		"l2GenesisBlockGasLimit":              expectedGasLimit,
+		"baseFeeVaultRecipient":               expectedBaseFeeVaultRecipient,
+		"l1FeeVaultRecipient":                 expectedL1FeeVaultRecipient,
+		"sequencerFeeVaultRecipient":          expectedSequencerFeeVaultRecipient,
+		"baseFeeVaultMinimumWithdrawalAmount": expectedBaseFeeVaultMinimumWithdrawalAmount,
+		"baseFeeVaultWithdrawalNetwork":       expectedBaseFeeVaultWithdrawalNetwork,
+		"enableGovernance":                    expectedEnableGovernance,
+		"gasPriceOracleBaseFeeScalar":         expectedGasPriceOracleBaseFeeScalar,
+		"eip1559Denominator":                  expectedEIP1559Denominator,
+		"useFaultProofs":                      expectedUseFaultProofs,
 	}
 
 	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
@@ -432,6 +453,16 @@ func TestL2BlockTimeOverride(t *testing.T) {
 	cfg, err := state.CombineDeployConfig(intent, intent.Chains[0], st, st.Chains[0])
 	require.NoError(t, err)
 	require.Equal(t, uint64(3), cfg.L2InitializationConfig.L2CoreDeployConfig.L2BlockTime, "L2 block time should be 3 seconds")
+	require.Equal(t, expectedGasLimit, strings.ToLower(cfg.L2InitializationConfig.L2GenesisBlockDeployConfig.L2GenesisBlockGasLimit.String()), "L2 Genesis Block Gas Limit should be 30_000_000")
+	require.Equal(t, expectedBaseFeeVaultRecipient, cfg.L2InitializationConfig.L2VaultsDeployConfig.BaseFeeVaultRecipient, "Base Fee Vault Recipient should be the expected address")
+	require.Equal(t, expectedL1FeeVaultRecipient, cfg.L2InitializationConfig.L2VaultsDeployConfig.L1FeeVaultRecipient, "L1 Fee Vault Recipient should be the expected address")
+	require.Equal(t, expectedSequencerFeeVaultRecipient, cfg.L2InitializationConfig.L2VaultsDeployConfig.SequencerFeeVaultRecipient, "Sequencer Fee Vault Recipient should be the expected address")
+	require.Equal(t, expectedBaseFeeVaultMinimumWithdrawalAmount, strings.ToLower(cfg.L2InitializationConfig.L2VaultsDeployConfig.BaseFeeVaultMinimumWithdrawalAmount.String()), "Base Fee Vault Minimum Withdrawal Amount should be the expected value")
+	require.Equal(t, expectedBaseFeeVaultWithdrawalNetwork, cfg.L2InitializationConfig.L2VaultsDeployConfig.BaseFeeVaultWithdrawalNetwork, "Base Fee Vault Withdrawal Network should be the expected value")
+	require.Equal(t, expectedEnableGovernance, cfg.L2InitializationConfig.GovernanceDeployConfig.EnableGovernance, "Governance should be disabled")
+	require.Equal(t, expectedGasPriceOracleBaseFeeScalar, cfg.L2InitializationConfig.GasPriceOracleDeployConfig.GasPriceOracleBaseFeeScalar, "Gas Price Oracle Base Fee Scalar should be the expected value")
+	require.Equal(t, expectedEIP1559Denominator, cfg.L2InitializationConfig.EIP1559DeployConfig.EIP1559Denominator, "EIP-1559 Denominator should be the expected value")
+	require.Equal(t, expectedUseFaultProofs, cfg.L2InitializationConfig.UseInterop, "Fault proofs should be enabled")
 }
 
 func TestApplyGenesisStrategy(t *testing.T) {

From 63140ba2bd4fb407ce4155ffc0f81a7e07b00f39 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 12:42:58 -0700
Subject: [PATCH 401/451] op-deployer: Bootstrap superchain command (#13294)

* op-deployer: Bootstrap superchain command

Fixes https://github.com/ethereum-optimism/optimism/issues/13265.

* fix test
---
 op-deployer/pkg/deployer/bootstrap/flags.go   |  57 +++++
 .../pkg/deployer/bootstrap/opcm_test.go       |   6 +-
 .../pkg/deployer/bootstrap/superchain.go      | 218 ++++++++++++++++++
 .../pkg/deployer/bootstrap/superchain_test.go |  95 ++++++++
 4 files changed, 375 insertions(+), 1 deletion(-)
 create mode 100644 op-deployer/pkg/deployer/bootstrap/superchain.go
 create mode 100644 op-deployer/pkg/deployer/bootstrap/superchain_test.go

diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index 20cf02b93376..3991829bd460 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -35,6 +35,12 @@ const (
 	DelayedWethProxyFlagName                = "delayed-weth-proxy"
 	DelayedWethImplFlagName                 = "delayed-weth-impl"
 	ProxyOwnerFlagName                      = "proxy-owner"
+	SuperchainProxyAdminOwnerFlagName       = "superchain-proxy-admin-owner"
+	ProtocolVersionsOwnerFlagName           = "protocol-versions-owner"
+	GuardianFlagName                        = "guardian"
+	PausedFlagName                          = "paused"
+	RequiredProtocolVersionFlagName         = "required-protocol-version"
+	RecommendedProtocolVersionFlagName      = "recommended-protocol-version"
 )
 
 var (
@@ -176,6 +182,39 @@ var (
 		EnvVars: deployer.PrefixEnvVar("PROXY_OWNER"),
 		Value:   common.Address{}.Hex(),
 	}
+	SuperchainProxyAdminOwnerFlag = &cli.StringFlag{
+		Name:    SuperchainProxyAdminOwnerFlagName,
+		Usage:   "Owner address for the superchain proxy admin",
+		EnvVars: deployer.PrefixEnvVar("SUPERCHAIN_PROXY_ADMIN_OWNER"),
+		Value:   common.Address{}.Hex(),
+	}
+	ProtocolVersionsOwnerFlag = &cli.StringFlag{
+		Name:    ProtocolVersionsOwnerFlagName,
+		Usage:   "Owner address for protocol versions",
+		EnvVars: deployer.PrefixEnvVar("PROTOCOL_VERSIONS_OWNER"),
+		Value:   common.Address{}.Hex(),
+	}
+	GuardianFlag = &cli.StringFlag{
+		Name:    GuardianFlagName,
+		Usage:   "Guardian address",
+		EnvVars: deployer.PrefixEnvVar("GUARDIAN"),
+		Value:   common.Address{}.Hex(),
+	}
+	PausedFlag = &cli.BoolFlag{
+		Name:    PausedFlagName,
+		Usage:   "Initial paused state",
+		EnvVars: deployer.PrefixEnvVar("PAUSED"),
+	}
+	RequiredProtocolVersionFlag = &cli.StringFlag{
+		Name:    RequiredProtocolVersionFlagName,
+		Usage:   "Required protocol version (semver)",
+		EnvVars: deployer.PrefixEnvVar("REQUIRED_PROTOCOL_VERSION"),
+	}
+	RecommendedProtocolVersionFlag = &cli.StringFlag{
+		Name:    RecommendedProtocolVersionFlagName,
+		Usage:   "Recommended protocol version (semver)",
+		EnvVars: deployer.PrefixEnvVar("RECOMMENDED_PROTOCOL_VERSION"),
+	}
 )
 
 var OPCMFlags = []cli.Flag{
@@ -239,6 +278,18 @@ var ProxyFlags = []cli.Flag{
 	ProxyOwnerFlag,
 }
 
+var SuperchainFlags = []cli.Flag{
+	deployer.L1RPCURLFlag,
+	deployer.PrivateKeyFlag,
+	ArtifactsLocatorFlag,
+	SuperchainProxyAdminOwnerFlag,
+	ProtocolVersionsOwnerFlag,
+	GuardianFlag,
+	PausedFlag,
+	RequiredProtocolVersionFlag,
+	RecommendedProtocolVersionFlag,
+}
+
 var Commands = []*cli.Command{
 	{
 		Name:   "opcm",
@@ -285,4 +336,10 @@ var Commands = []*cli.Command{
 		Flags:  cliapp.ProtectFlags(ProxyFlags),
 		Action: ProxyCLI,
 	},
+	{
+		Name:   "superchain",
+		Usage:  "Bootstrap the Superchain configuration",
+		Flags:  cliapp.ProtectFlags(SuperchainFlags),
+		Action: SuperchainCLI,
+	},
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/opcm_test.go b/op-deployer/pkg/deployer/bootstrap/opcm_test.go
index 5a4d1e8de3d5..4ee089229dfc 100644
--- a/op-deployer/pkg/deployer/bootstrap/opcm_test.go
+++ b/op-deployer/pkg/deployer/bootstrap/opcm_test.go
@@ -17,7 +17,7 @@ import (
 
 var networks = []string{"mainnet", "sepolia"}
 
-var versions = []string{"v1.8.0-rc.3"}
+var versions = []string{"v1.8.0-rc.3", "v1.6.0"}
 
 func TestOPCMLiveChain(t *testing.T) {
 	for _, network := range networks {
@@ -27,6 +27,10 @@ func TestOPCMLiveChain(t *testing.T) {
 					t.Skip("v1.8.0-rc.3 not supported on mainnet yet")
 				}
 
+				if version == "v1.6.0" {
+					t.Skip("v1.6.0 not supported")
+				}
+
 				envVar := strings.ToUpper(network) + "_RPC_URL"
 				rpcURL := os.Getenv(envVar)
 				require.NotEmpty(t, rpcURL, "must specify RPC url via %s env var", envVar)
diff --git a/op-deployer/pkg/deployer/bootstrap/superchain.go b/op-deployer/pkg/deployer/bootstrap/superchain.go
new file mode 100644
index 000000000000..837f406c091b
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/superchain.go
@@ -0,0 +1,218 @@
+package bootstrap
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"fmt"
+	"strings"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
+	"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/urfave/cli/v2"
+)
+
+type SuperchainConfig struct {
+	L1RPCUrl         string
+	PrivateKey       string
+	Logger           log.Logger
+	ArtifactsLocator *artifacts.Locator
+
+	privateKeyECDSA *ecdsa.PrivateKey
+
+	SuperchainProxyAdminOwner  common.Address
+	ProtocolVersionsOwner      common.Address
+	Guardian                   common.Address
+	Paused                     bool
+	RequiredProtocolVersion    params.ProtocolVersion
+	RecommendedProtocolVersion params.ProtocolVersion
+}
+
+func (c *SuperchainConfig) Check() error {
+	if c.L1RPCUrl == "" {
+		return fmt.Errorf("l1RPCUrl must be specified")
+	}
+
+	if c.PrivateKey == "" {
+		return fmt.Errorf("private key must be specified")
+	}
+
+	privECDSA, err := crypto.HexToECDSA(strings.TrimPrefix(c.PrivateKey, "0x"))
+	if err != nil {
+		return fmt.Errorf("failed to parse private key: %w", err)
+	}
+	c.privateKeyECDSA = privECDSA
+
+	if c.Logger == nil {
+		return fmt.Errorf("logger must be specified")
+	}
+
+	if c.ArtifactsLocator == nil {
+		return fmt.Errorf("artifacts locator must be specified")
+	}
+
+	if c.SuperchainProxyAdminOwner == (common.Address{}) {
+		return fmt.Errorf("superchain proxy admin owner must be specified")
+	}
+
+	if c.ProtocolVersionsOwner == (common.Address{}) {
+		return fmt.Errorf("protocol versions owner must be specified")
+	}
+
+	if c.Guardian == (common.Address{}) {
+		return fmt.Errorf("guardian must be specified")
+	}
+
+	return nil
+}
+
+func SuperchainCLI(cliCtx *cli.Context) error {
+	logCfg := oplog.ReadCLIConfig(cliCtx)
+	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
+	oplog.SetGlobalLogHandler(l.Handler())
+
+	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
+	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
+	artifactsLocator := new(artifacts.Locator)
+	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
+		return fmt.Errorf("failed to parse artifacts URL: %w", err)
+	}
+
+	superchainProxyAdminOwner := common.HexToAddress(cliCtx.String(SuperchainProxyAdminOwnerFlagName))
+	protocolVersionsOwner := common.HexToAddress(cliCtx.String(ProtocolVersionsOwnerFlagName))
+	guardian := common.HexToAddress(cliCtx.String(GuardianFlagName))
+	paused := cliCtx.Bool(PausedFlagName)
+	requiredVersionStr := cliCtx.String(RequiredProtocolVersionFlagName)
+	recommendedVersionStr := cliCtx.String(RecommendedProtocolVersionFlagName)
+
+	cfg := SuperchainConfig{
+		L1RPCUrl:                  l1RPCUrl,
+		PrivateKey:                privateKey,
+		Logger:                    l,
+		ArtifactsLocator:          artifactsLocator,
+		SuperchainProxyAdminOwner: superchainProxyAdminOwner,
+		ProtocolVersionsOwner:     protocolVersionsOwner,
+		Guardian:                  guardian,
+		Paused:                    paused,
+	}
+
+	if err := cfg.RequiredProtocolVersion.UnmarshalText([]byte(requiredVersionStr)); err != nil {
+		return fmt.Errorf("failed to parse required protocol version: %w", err)
+	}
+	if err := cfg.RecommendedProtocolVersion.UnmarshalText([]byte(recommendedVersionStr)); err != nil {
+		return fmt.Errorf("failed to parse required protocol version: %w", err)
+	}
+
+	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
+
+	dso, err := Superchain(ctx, cfg)
+	if err != nil {
+		return fmt.Errorf("failed to deploy superchain: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(dso, ioutil.ToStdOut()); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
+}
+
+func Superchain(ctx context.Context, cfg SuperchainConfig) (opcm.DeploySuperchainOutput, error) {
+	var dso opcm.DeploySuperchainOutput
+
+	if err := cfg.Check(); err != nil {
+		return dso, fmt.Errorf("invalid config for Superchain: %w", err)
+	}
+
+	lgr := cfg.Logger
+	progressor := func(curr, total int64) {
+		lgr.Info("artifacts download progress", "current", curr, "total", total)
+	}
+
+	artifactsFS, cleanup, err := artifacts.Download(ctx, cfg.ArtifactsLocator, progressor)
+	if err != nil {
+		return dso, fmt.Errorf("failed to download artifacts: %w", err)
+	}
+	defer func() {
+		if err := cleanup(); err != nil {
+			lgr.Warn("failed to clean up artifacts", "err", err)
+		}
+	}()
+
+	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return dso, fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	chainID, err := l1Client.ChainID(ctx)
+	if err != nil {
+		return dso, fmt.Errorf("failed to get chain ID: %w", err)
+	}
+
+	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
+	chainDeployer := crypto.PubkeyToAddress(cfg.privateKeyECDSA.PublicKey)
+
+	bcaster, err := broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
+		Logger:  lgr,
+		ChainID: chainID,
+		Client:  l1Client,
+		Signer:  signer,
+		From:    chainDeployer,
+	})
+	if err != nil {
+		return dso, fmt.Errorf("failed to create broadcaster: %w", err)
+	}
+
+	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
+	if err != nil {
+		return dso, fmt.Errorf("failed to connect to L1 RPC: %w", err)
+	}
+
+	l1Host, err := env.DefaultForkedScriptHost(
+		ctx,
+		bcaster,
+		lgr,
+		chainDeployer,
+		artifactsFS,
+		l1RPC,
+	)
+	if err != nil {
+		return dso, fmt.Errorf("failed to create script host: %w", err)
+	}
+
+	dso, err = opcm.DeploySuperchain(
+		l1Host,
+		opcm.DeploySuperchainInput{
+			SuperchainProxyAdminOwner:  cfg.SuperchainProxyAdminOwner,
+			ProtocolVersionsOwner:      cfg.ProtocolVersionsOwner,
+			Guardian:                   cfg.Guardian,
+			Paused:                     cfg.Paused,
+			RequiredProtocolVersion:    cfg.RequiredProtocolVersion,
+			RecommendedProtocolVersion: cfg.RecommendedProtocolVersion,
+		},
+	)
+	if err != nil {
+		return dso, fmt.Errorf("error deploying superchain: %w", err)
+	}
+
+	if _, err := bcaster.Broadcast(ctx); err != nil {
+		return dso, fmt.Errorf("failed to broadcast: %w", err)
+	}
+
+	lgr.Info("deployed superchain configuration")
+
+	return dso, nil
+}
diff --git a/op-deployer/pkg/deployer/bootstrap/superchain_test.go b/op-deployer/pkg/deployer/bootstrap/superchain_test.go
new file mode 100644
index 000000000000..f2198102acb2
--- /dev/null
+++ b/op-deployer/pkg/deployer/bootstrap/superchain_test.go
@@ -0,0 +1,95 @@
+package bootstrap
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/retryproxy"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/params"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSuperchain(t *testing.T) {
+	for _, network := range networks {
+		for _, version := range versions {
+			t.Run(network+"-"+version, func(t *testing.T) {
+				envVar := strings.ToUpper(network) + "_RPC_URL"
+				rpcURL := os.Getenv(envVar)
+				require.NotEmpty(t, rpcURL, "must specify RPC url via %s env var", envVar)
+				testSuperchain(t, rpcURL, version)
+			})
+		}
+	}
+}
+
+func testSuperchain(t *testing.T, forkRPCURL string, version string) {
+	t.Parallel()
+
+	if forkRPCURL == "" {
+		t.Skip("forkRPCURL not set")
+	}
+
+	lgr := testlog.Logger(t, slog.LevelDebug)
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
+	retryProxy := retryproxy.New(lgr, forkRPCURL)
+	require.NoError(t, retryProxy.Start())
+	t.Cleanup(func() {
+		require.NoError(t, retryProxy.Stop())
+	})
+
+	runner, err := anvil.New(
+		retryProxy.Endpoint(),
+		lgr,
+	)
+	require.NoError(t, err)
+
+	require.NoError(t, runner.Start(ctx))
+	t.Cleanup(func() {
+		require.NoError(t, runner.Stop())
+	})
+
+	out, err := Superchain(ctx, SuperchainConfig{
+		L1RPCUrl:         runner.RPCUrl(),
+		PrivateKey:       "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
+		ArtifactsLocator: artifacts.MustNewLocatorFromTag("op-contracts/" + version),
+		Logger:           lgr,
+
+		SuperchainProxyAdminOwner:  common.Address{'S'},
+		ProtocolVersionsOwner:      common.Address{'P'},
+		Guardian:                   common.Address{'G'},
+		Paused:                     false,
+		RequiredProtocolVersion:    params.ProtocolVersionV0{Major: 1}.Encode(),
+		RecommendedProtocolVersion: params.ProtocolVersionV0{Major: 2}.Encode(),
+	})
+	require.NoError(t, err)
+
+	client, err := ethclient.Dial(runner.RPCUrl())
+	require.NoError(t, err)
+
+	addresses := []common.Address{
+		out.SuperchainConfigProxy,
+		out.SuperchainConfigImpl,
+		out.SuperchainProxyAdmin,
+		out.ProtocolVersionsImpl,
+		out.ProtocolVersionsProxy,
+	}
+	for _, addr := range addresses {
+		require.NotEmpty(t, addr)
+
+		code, err := client.CodeAt(ctx, addr, nil)
+		require.NoError(t, err)
+		require.NotEmpty(t, code)
+	}
+}

From e1dbb88060d20553ccaa3a45ee86ea3ad6d3541d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:45:25 -0700
Subject: [PATCH 402/451] dependabot(gomod): bump github.com/holiman/uint256
 from 1.3.1 to 1.3.2 (#13298)

Bumps [github.com/holiman/uint256](https://github.com/holiman/uint256) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/holiman/uint256/releases)
- [Commits](https://github.com/holiman/uint256/compare/v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: github.com/holiman/uint256
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index e3b57ace633c..b28cb70089b2 100644
--- a/go.mod
+++ b/go.mod
@@ -25,7 +25,7 @@ require (
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/hashicorp/raft v1.7.1
 	github.com/hashicorp/raft-boltdb/v2 v2.3.0
-	github.com/holiman/uint256 v1.3.1
+	github.com/holiman/uint256 v1.3.2
 	github.com/ipfs/go-datastore v0.6.0
 	github.com/ipfs/go-ds-leveldb v0.5.0
 	github.com/klauspost/compress v1.17.11
diff --git a/go.sum b/go.sum
index bcae4d056f09..5ee5e903e71a 100644
--- a/go.sum
+++ b/go.sum
@@ -368,8 +368,8 @@ github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6w
 github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
-github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs=
-github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
+github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA=
+github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
 github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=

From b4b90adf20b37bd1ed46fec25cd13507dfb617a9 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 12:46:17 -0700
Subject: [PATCH 403/451] ctb: Reduce heavy fuzz runs in CI (#13296)

---
 packages/contracts-bedrock/foundry.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index b77e7bca4312..167826343cad 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -98,12 +98,12 @@ depth = 32
 
 [profile.ciheavy.fuzz]
 runs = 20000
-timeout = 600
+timeout = 300
 
 [profile.ciheavy.invariant]
 runs = 128
 depth = 512
-timeout = 600
+timeout = 300
 
 ################################################################
 #                         PROFILE: LITE                        #

From f6d5ff4bb0b385c1cd2bbe67e8fe231c5a01226b Mon Sep 17 00:00:00 2001
From: Dmitry <98899785+mdqst@users.noreply.github.com>
Date: Fri, 6 Dec 2024 22:52:22 +0300
Subject: [PATCH 404/451] docs: Clarify directory reference Update README.md
 (#13293)

---
 bedrock-devnet/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bedrock-devnet/README.md b/bedrock-devnet/README.md
index dccb8cee9d30..f3ed9e2ae851 100644
--- a/bedrock-devnet/README.md
+++ b/bedrock-devnet/README.md
@@ -2,4 +2,4 @@
 
 This is a utility for running a local Bedrock devnet. It is designed to replace the legacy Bash-based devnet runner as part of a progressive migration away from Bash automation.
 
-The easiest way to invoke this script is to run `make devnet-up` from the root of this repository. Otherwise, to use this script run `python3 main.py --monorepo-dir=<path to the monorepo>`. You may need to set `PYTHONPATH` to this directory if you are invoking the script from somewhere other than `bedrock-devnet`.
+The easiest way to invoke this script is to run `make devnet-up` from the root of this repository. Otherwise, to use this script run `python3 main.py --monorepo-dir=<path to the monorepo>`. You may need to set `PYTHONPATH` to this directory if you invoke the script from somewhere other than the `bedrock-devnet` directory.

From cf1ce689d66334d353bd295b1502573143c45c08 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Fri, 6 Dec 2024 15:18:46 -0500
Subject: [PATCH 405/451] feat: remove unused systemConfigs mapping from OPCM
 (#13295)

* feat: remove unused systemConfigs mapping from OPCM

* fix semver lock
---
 .../snapshots/abi/OPContractsManager.json     | 19 -------------------
 .../abi/OPContractsManagerInterop.json        | 19 -------------------
 .../snapshots/semver-lock.json                |  4 ++--
 .../storageLayout/OPContractsManager.json     | 11 ++---------
 .../OPContractsManagerInterop.json            | 11 ++---------
 .../src/L1/OPContractsManager.sol             | 11 ++++-------
 .../test/universal/Specs.t.sol                |  2 --
 7 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
index b5758eca610f..a541ae2e1016 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
@@ -500,25 +500,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "systemConfigs",
-    "outputs": [
-      {
-        "internalType": "contract ISystemConfig",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
index b5758eca610f..a541ae2e1016 100644
--- a/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
+++ b/packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
@@ -500,25 +500,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "systemConfigs",
-    "outputs": [
-      {
-        "internalType": "contract ISystemConfig",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "version",
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index b31b3f287e7c..dcfdaeb982fa 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -20,8 +20,8 @@
     "sourceCodeHash": "0x8aafeffb41332fddf2fb1ef4fc033bd1f323cdc5b199c6951da73e3cb86276e6"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0x320a6d4417eb0d2597b4c6f4caa37bbf9e35f38d3ad27ddb57f149c680e6afff",
-    "sourceCodeHash": "0x3a6ac40939df1d9f4c88caa4e6139454de5e0ad4a241b27d1bab65a3ae44610d"
+    "initCodeHash": "0x1eb781ca3f3609dbf13ecb9fe34063155871510b148ac63348a4947858c196ba",
+    "sourceCodeHash": "0xf1e9fe3f37414e1f1824ce18cd6164c33ca64527b419d6fa52690b6351534822"
   },
   "src/L1/OptimismPortal.sol": {
     "initCodeHash": "0xa8b2f8a6d1092c5e64529736462ebb35daa9ea9e67585f7de8e3e5394682ee64",
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
index aa8148b34cba..5eae73490b12 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
@@ -6,25 +6,18 @@
     "slot": "0",
     "type": "string"
   },
-  {
-    "bytes": "32",
-    "label": "systemConfigs",
-    "offset": 0,
-    "slot": "1",
-    "type": "mapping(uint256 => contract ISystemConfig)"
-  },
   {
     "bytes": "256",
     "label": "blueprint",
     "offset": 0,
-    "slot": "2",
+    "slot": "1",
     "type": "struct OPContractsManager.Blueprints"
   },
   {
     "bytes": "288",
     "label": "implementation",
     "offset": 0,
-    "slot": "10",
+    "slot": "9",
     "type": "struct OPContractsManager.Implementations"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
index aa8148b34cba..5eae73490b12 100644
--- a/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
@@ -6,25 +6,18 @@
     "slot": "0",
     "type": "string"
   },
-  {
-    "bytes": "32",
-    "label": "systemConfigs",
-    "offset": 0,
-    "slot": "1",
-    "type": "mapping(uint256 => contract ISystemConfig)"
-  },
   {
     "bytes": "256",
     "label": "blueprint",
     "offset": 0,
-    "slot": "2",
+    "slot": "1",
     "type": "struct OPContractsManager.Blueprints"
   },
   {
     "bytes": "288",
     "label": "implementation",
     "offset": 0,
-    "slot": "10",
+    "slot": "9",
     "type": "struct OPContractsManager.Implementations"
   }
 ]
\ No newline at end of file
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
index aad48374704b..fb7da0aa6edf 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -114,8 +114,8 @@ contract OPContractsManager is ISemver {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.0.0-beta.23
-    string public constant version = "1.0.0-beta.23";
+    /// @custom:semver 1.0.0-beta.24
+    string public constant version = "1.0.0-beta.24";
 
     /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
     /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
@@ -127,13 +127,10 @@ contract OPContractsManager is ISemver {
     /// @notice Address of the ProtocolVersions contract shared by all chains.
     IProtocolVersions public immutable protocolVersions;
 
-    // @notice L1 smart contracts release deployed by this version of OPCM. This is used in opcm to signal which version
-    // of the L1 smart contracts is deployed. It takes the format of `op-contracts/vX.Y.Z`.
+    /// @notice L1 smart contracts release deployed by this version of OPCM. This is used in opcm to signal which
+    /// version of the L1 smart contracts is deployed. It takes the format of `op-contracts/vX.Y.Z`.
     string public l1ContractsRelease;
 
-    /// @notice Maps an L2 Chain ID to the SystemConfig for that chain.
-    mapping(uint256 => ISystemConfig) public systemConfigs;
-
     /// @notice Addresses of the Blueprint contracts.
     /// This is internal because if public the autogenerated getter method would return a tuple of
     /// addresses, but we want it to return a struct.
diff --git a/packages/contracts-bedrock/test/universal/Specs.t.sol b/packages/contracts-bedrock/test/universal/Specs.t.sol
index d8c48849875d..cbd00c0569e9 100644
--- a/packages/contracts-bedrock/test/universal/Specs.t.sol
+++ b/packages/contracts-bedrock/test/universal/Specs.t.sol
@@ -838,7 +838,6 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("superchainConfig()") });
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("protocolVersions()") });
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("l1ContractsRelease()") });
-        _addSpec({ _name: "OPContractsManager", _sel: _getSel("systemConfigs(uint256)") });
         _addSpec({ _name: "OPContractsManager", _sel: _getSel("OUTPUT_VERSION()") });
         _addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.deploy.selector });
         _addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.blueprints.selector });
@@ -850,7 +849,6 @@ contract Specification_Test is CommonTest {
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("superchainConfig()") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("protocolVersions()") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("l1ContractsRelease()") });
-        _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("systemConfigs(uint256)") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("OUTPUT_VERSION()") });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.deploy.selector });
         _addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.blueprints.selector });

From 4317c093fbe951c57c0e36037a9aa281e8e0795c Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Sat, 7 Dec 2024 04:46:12 +0800
Subject: [PATCH 406/451] refactor: single source of truth for
 `DerivationVersion` (#11901)

* single source of truth for DerivationVersion

* op-node/rollup: fix imports

---------

Co-authored-by: protolambda <proto@protolambda.com>
---
 op-alt-da/commitment.go                    | 5 +++--
 op-alt-da/commitment_test.go               | 3 ++-
 op-alt-da/params.go                        | 5 -----
 op-batcher/batcher/tx_data.go              | 5 +++--
 op-e2e/actions/helpers/l2_batcher.go       | 5 +++--
 op-node/rollup/derive/altda_data_source.go | 3 ++-
 op-node/rollup/derive/channel_out.go       | 3 ++-
 op-node/rollup/derive/frame.go             | 4 +++-
 op-node/rollup/derive/frame_queue_test.go  | 8 +++++---
 op-node/rollup/derive/frame_test.go        | 8 +++++---
 op-node/rollup/derive/params.go            | 7 -------
 op-node/rollup/derive/params/versions.go   | 6 ++++++
 12 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 op-node/rollup/derive/params/versions.go

diff --git a/op-alt-da/commitment.go b/op-alt-da/commitment.go
index a6fa5424665b..157eb8b18543 100644
--- a/op-alt-da/commitment.go
+++ b/op-alt-da/commitment.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
@@ -115,7 +116,7 @@ func (c Keccak256Commitment) Encode() []byte {
 
 // TxData adds an extra version byte to signal it's a commitment.
 func (c Keccak256Commitment) TxData() []byte {
-	return append([]byte{TxDataVersion1}, c.Encode()...)
+	return append([]byte{params.DerivationVersion1}, c.Encode()...)
 }
 
 // Verify checks if the commitment matches the given input.
@@ -155,7 +156,7 @@ func (c GenericCommitment) Encode() []byte {
 
 // TxData adds an extra version byte to signal it's a commitment.
 func (c GenericCommitment) TxData() []byte {
-	return append([]byte{TxDataVersion1}, c.Encode()...)
+	return append([]byte{params.DerivationVersion1}, c.Encode()...)
 }
 
 // Verify always returns true for GenericCommitment because the DA Server must validate the data before returning it to the op-node.
diff --git a/op-alt-da/commitment_test.go b/op-alt-da/commitment_test.go
index 52abc5d88657..e4656133d69e 100644
--- a/op-alt-da/commitment_test.go
+++ b/op-alt-da/commitment_test.go
@@ -3,6 +3,7 @@ package altda
 import (
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 	"github.com/stretchr/testify/require"
 )
 
@@ -54,7 +55,7 @@ func TestCommitmentData(t *testing.T) {
 				// Test that reencoding the commitment returns the same data
 				require.Equal(t, tc.commData, comm.Encode())
 				// Test that TxData() returns the same data as the original, prepended with a version byte
-				require.Equal(t, append([]byte{TxDataVersion1}, tc.commData...), comm.TxData())
+				require.Equal(t, append([]byte{params.DerivationVersion1}, tc.commData...), comm.TxData())
 
 				// Test that Verify() returns no error for the correct data
 				require.NoError(t, comm.Verify(tc.commData))
diff --git a/op-alt-da/params.go b/op-alt-da/params.go
index 86339200f7fc..bc0762ba1319 100644
--- a/op-alt-da/params.go
+++ b/op-alt-da/params.go
@@ -4,8 +4,3 @@ package altda
 // challenge in the Data Availability Challenge contract. Value in number of bytes.
 // This value can only be changed in a hard fork.
 const MaxInputSize = 130672
-
-// TxDataVersion1 is the version number for batcher transactions containing
-// altDA commitments. It should not collide with DerivationVersion which is still
-// used downstream when parsing the frames.
-const TxDataVersion1 = 1
diff --git a/op-batcher/batcher/tx_data.go b/op-batcher/batcher/tx_data.go
index d0f5474fd5f2..0165f85f079e 100644
--- a/op-batcher/batcher/tx_data.go
+++ b/op-batcher/batcher/tx_data.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
@@ -35,7 +36,7 @@ func (td *txData) ID() txID {
 // It's a version byte (0) followed by the concatenated frames for this transaction.
 func (td *txData) CallData() []byte {
 	data := make([]byte, 1, 1+td.Len())
-	data[0] = derive.DerivationVersion0
+	data[0] = params.DerivationVersion0
 	for _, f := range td.frames {
 		data = append(data, f.data...)
 	}
@@ -46,7 +47,7 @@ func (td *txData) Blobs() ([]*eth.Blob, error) {
 	blobs := make([]*eth.Blob, 0, len(td.frames))
 	for _, f := range td.frames {
 		var blob eth.Blob
-		if err := blob.FromData(append([]byte{derive.DerivationVersion0}, f.data...)); err != nil {
+		if err := blob.FromData(append([]byte{params.DerivationVersion0}, f.data...)); err != nil {
 			return nil, err
 		}
 		blobs = append(blobs, &blob)
diff --git a/op-e2e/actions/helpers/l2_batcher.go b/op-e2e/actions/helpers/l2_batcher.go
index 9fc9971a26e2..88fde9bd9a9a 100644
--- a/op-e2e/actions/helpers/l2_batcher.go
+++ b/op-e2e/actions/helpers/l2_batcher.go
@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
+	derive_params "github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 )
@@ -295,7 +296,7 @@ func (s *L2Batcher) ReadNextOutputFrame(t Testing) []byte {
 	}
 	// Collect the output frame
 	data := new(bytes.Buffer)
-	data.WriteByte(derive.DerivationVersion0)
+	data.WriteByte(derive_params.DerivationVersion0)
 	// subtract one, to account for the version byte
 	if _, err := s.L2ChannelOut.OutputFrame(data, s.l2BatcherCfg.MaxL1TxSize-1); err == io.EOF {
 		s.L2ChannelOut = nil
@@ -400,7 +401,7 @@ func (s *L2Batcher) ActL2BatchSubmitMultiBlob(t Testing, numBlobs int) {
 	blobs := make([]*eth.Blob, numBlobs)
 	for i := 0; i < numBlobs; i++ {
 		data := new(bytes.Buffer)
-		data.WriteByte(derive.DerivationVersion0)
+		data.WriteByte(derive_params.DerivationVersion0)
 		// write only a few bytes to all but the last blob
 		l := uint64(derive.FrameV0OverHeadSize + 4) // 4 bytes content
 		if i == numBlobs-1 {
diff --git a/op-node/rollup/derive/altda_data_source.go b/op-node/rollup/derive/altda_data_source.go
index 829d9399a4d2..2945a2a9e57b 100644
--- a/op-node/rollup/derive/altda_data_source.go
+++ b/op-node/rollup/derive/altda_data_source.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum/go-ethereum/log"
 )
@@ -56,7 +57,7 @@ func (s *AltDADataSource) Next(ctx context.Context) (eth.Data, error) {
 		}
 		// If the tx data type is not altDA, we forward it downstream to let the next
 		// steps validate and potentially parse it as L1 DA inputs.
-		if data[0] != altda.TxDataVersion1 {
+		if data[0] != params.DerivationVersion1 {
 			return data, nil
 		}
 
diff --git a/op-node/rollup/derive/channel_out.go b/op-node/rollup/derive/channel_out.go
index 87f39d2eb092..7a97d7708efa 100644
--- a/op-node/rollup/derive/channel_out.go
+++ b/op-node/rollup/derive/channel_out.go
@@ -8,6 +8,7 @@ import (
 	"io"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rlp"
@@ -275,7 +276,7 @@ func ForceCloseTxData(frames []Frame) ([]byte, error) {
 	}
 
 	var out bytes.Buffer
-	out.WriteByte(DerivationVersion0)
+	out.WriteByte(params.DerivationVersion0)
 
 	if !closed {
 		f := Frame{
diff --git a/op-node/rollup/derive/frame.go b/op-node/rollup/derive/frame.go
index 0baa1e120a14..e18562560e79 100644
--- a/op-node/rollup/derive/frame.go
+++ b/op-node/rollup/derive/frame.go
@@ -6,6 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"io"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 )
 
 // Frames cannot be larger than 1 MB.
@@ -130,7 +132,7 @@ func ParseFrames(data []byte) ([]Frame, error) {
 	if len(data) == 0 {
 		return nil, errors.New("data array must not be empty")
 	}
-	if data[0] != DerivationVersion0 {
+	if data[0] != params.DerivationVersion0 {
 		return nil, fmt.Errorf("invalid derivation format byte: got %d", data[0])
 	}
 	buf := bytes.NewBuffer(data[1:])
diff --git a/op-node/rollup/derive/frame_queue_test.go b/op-node/rollup/derive/frame_queue_test.go
index a0a57f4f387d..14ca377f6a68 100644
--- a/op-node/rollup/derive/frame_queue_test.go
+++ b/op-node/rollup/derive/frame_queue_test.go
@@ -7,12 +7,14 @@ import (
 	"log/slog"
 	"testing"
 
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/mocks"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 )
 
 func TestPruneFrameQueue(t *testing.T) {
@@ -126,7 +128,7 @@ func testFrameQueue_NextFrame(t *testing.T, holocene bool) {
 	}
 
 	var inBuf bytes.Buffer
-	inBuf.WriteByte(DerivationVersion0)
+	inBuf.WriteByte(params.DerivationVersion0)
 	for _, f := range inFrames {
 		require.NoError(t, f.MarshalBinary(&inBuf))
 	}
diff --git a/op-node/rollup/derive/frame_test.go b/op-node/rollup/derive/frame_test.go
index 240cc0a58d8d..277e976fccae 100644
--- a/op-node/rollup/derive/frame_test.go
+++ b/op-node/rollup/derive/frame_test.go
@@ -9,8 +9,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-service/testutils"
 	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive/params"
+	"github.com/ethereum-optimism/optimism/op-service/testutils"
 )
 
 func FuzzFrameUnmarshalBinary(f *testing.F) {
@@ -164,7 +166,7 @@ func TestParseFramesInvalidVer(t *testing.T) {
 }
 
 func TestParseFramesOnlyVersion(t *testing.T) {
-	frames, err := ParseFrames([]byte{DerivationVersion0})
+	frames, err := ParseFrames([]byte{params.DerivationVersion0})
 	require.Empty(t, frames)
 	require.Error(t, err)
 }
@@ -206,7 +208,7 @@ func TestParseFramesTruncated(t *testing.T) {
 // frames.
 func txMarshalFrames(frames []Frame) ([]byte, error) {
 	var data bytes.Buffer
-	if err := data.WriteByte(DerivationVersion0); err != nil {
+	if err := data.WriteByte(params.DerivationVersion0); err != nil {
 		return nil, err
 	}
 	for _, frame := range frames {
diff --git a/op-node/rollup/derive/params.go b/op-node/rollup/derive/params.go
index 385c4087930b..c4511d950882 100644
--- a/op-node/rollup/derive/params.go
+++ b/op-node/rollup/derive/params.go
@@ -4,8 +4,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-
-	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 )
 
 // count the tagging info as 200 in terms of buffer size.
@@ -19,11 +17,6 @@ func frameSize(frame Frame) uint64 {
 	return uint64(len(frame.Data)) + frameOverhead
 }
 
-const DerivationVersion0 = 0
-
-// DerivationVersion1 is reserved for batcher transactions containing altDA commitments.
-const DerivationVersion1 = altda.TxDataVersion1
-
 // MaxSpanBatchElementCount is the maximum number of blocks, transactions in total,
 // or transaction per block allowed in a span batch.
 const MaxSpanBatchElementCount = 10_000_000
diff --git a/op-node/rollup/derive/params/versions.go b/op-node/rollup/derive/params/versions.go
new file mode 100644
index 000000000000..0c723e8a9c23
--- /dev/null
+++ b/op-node/rollup/derive/params/versions.go
@@ -0,0 +1,6 @@
+package params
+
+const DerivationVersion0 = 0
+
+// DerivationVersion1 is reserved for batcher transactions containing altDA commitments.
+const DerivationVersion1 = 1

From 6de3799c7f13e4f5699a29be43505ac05786769d Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 14:39:53 -0700
Subject: [PATCH 407/451] ci: Reduce fuzz runs in basic CI (#13299)

* ci: Specify number of jobs in contract tests

* reduce runs

* decrease runs

* don't rebuild on semver lock

* remove -j
---
 .circleci/config.yml                    | 2 +-
 packages/contracts-bedrock/foundry.toml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1cdb7c4fe9da..3ae5b5f78487 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -733,7 +733,7 @@ jobs:
       - run-contracts-check:
           command: semgrep
       - run-contracts-check:
-          command: semver-lock
+          command: semver-lock-no-build
       - run-contracts-check:
           command: semver-diff-check-no-build
       - run-contracts-check:
diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 167826343cad..181391e7c49e 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -72,10 +72,10 @@ wrap_comments=true
 ################################################################
 
 [profile.ci.fuzz]
-runs = 512
+runs = 128
 
 [profile.ci.invariant]
-runs = 256
+runs = 64
 depth = 32
 
 ################################################################

From a2e7d852a8a16e526564401c41abad56173790d3 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Fri, 6 Dec 2024 17:10:28 -0500
Subject: [PATCH 408/451] maint: bump forge version (#13301)

Bumps versions being used for forge, cast, and anvil.
---
 mise.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mise.toml b/mise.toml
index 5fb473de8891..0dba715900c8 100644
--- a/mise.toml
+++ b/mise.toml
@@ -31,9 +31,9 @@ just = "1.37.0"
 # Foundry dependencies
 # Foundry is a special case because it supplies multiple binaries at the same
 # GitHub release, so we need to use the aliasing trick to get mise to not error
-forge = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
-cast = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
-anvil = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
+forge = "nightly-e52076714ace23c7a68e14f0048a40be3c6c8f0b"
+cast = "nightly-e52076714ace23c7a68e14f0048a40be3c6c8f0b"
+anvil = "nightly-e52076714ace23c7a68e14f0048a40be3c6c8f0b"
 
 # Fake dependencies
 # Put things here if you need to track versions of tools or projects that can't

From d6106dde5551252b96f9fd24b4fe46e01313e316 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 15:25:31 -0700
Subject: [PATCH 409/451] op-deployer: Support output files in bootstrap
 (#13302)

* op-deployer: Support output files in bootstrap

* lint
---
 .../pkg/deployer/bootstrap/asterisc.go        | 40 +++++++++-------
 .../pkg/deployer/bootstrap/delayed_weth.go    | 46 +++++++++++--------
 .../pkg/deployer/bootstrap/dispute_game.go    | 44 ++++++++++--------
 op-deployer/pkg/deployer/bootstrap/flags.go   | 13 ++++++
 op-deployer/pkg/deployer/bootstrap/mips.go    | 37 +++++++++------
 op-deployer/pkg/deployer/bootstrap/opcm.go    |  3 +-
 op-deployer/pkg/deployer/bootstrap/proxy.go   | 40 +++++++++-------
 .../pkg/deployer/bootstrap/superchain.go      |  3 +-
 8 files changed, 137 insertions(+), 89 deletions(-)

diff --git a/op-deployer/pkg/deployer/bootstrap/asterisc.go b/op-deployer/pkg/deployer/bootstrap/asterisc.go
index e7cd4e6036c9..22039f65fafb 100644
--- a/op-deployer/pkg/deployer/bootstrap/asterisc.go
+++ b/op-deployer/pkg/deployer/bootstrap/asterisc.go
@@ -73,6 +73,7 @@ func AsteriscCLI(cliCtx *cli.Context) error {
 	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
 	oplog.SetGlobalLogHandler(l.Handler())
 
+	outfile := cliCtx.String(OutfileFlagName)
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
 	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
@@ -85,18 +86,27 @@ func AsteriscCLI(cliCtx *cli.Context) error {
 
 	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
 
-	return Asterisc(ctx, AsteriscConfig{
+	dao, err := Asterisc(ctx, AsteriscConfig{
 		L1RPCUrl:         l1RPCUrl,
 		PrivateKey:       privateKey,
 		Logger:           l,
 		ArtifactsLocator: artifactsLocator,
 		PreimageOracle:   preimageOracle,
 	})
+	if err != nil {
+		return fmt.Errorf("failed to deploy Asterisc: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(dao, ioutil.ToStdOutOrFileOrNoop(outfile, 0o755)); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
 }
 
-func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
+func Asterisc(ctx context.Context, cfg AsteriscConfig) (opcm.DeployAsteriscOutput, error) {
+	var dao opcm.DeployAsteriscOutput
 	if err := cfg.Check(); err != nil {
-		return fmt.Errorf("invalid config for Asterisc: %w", err)
+		return dao, fmt.Errorf("invalid config for Asterisc: %w", err)
 	}
 
 	lgr := cfg.Logger
@@ -106,7 +116,7 @@ func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
 
 	artifactsFS, cleanup, err := artifacts.Download(ctx, cfg.ArtifactsLocator, progressor)
 	if err != nil {
-		return fmt.Errorf("failed to download artifacts: %w", err)
+		return dao, fmt.Errorf("failed to download artifacts: %w", err)
 	}
 	defer func() {
 		if err := cleanup(); err != nil {
@@ -116,12 +126,12 @@ func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
 
 	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dao, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to get chain ID: %w", err)
+		return dao, fmt.Errorf("failed to get chain ID: %w", err)
 	}
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
@@ -135,12 +145,12 @@ func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
 		From:    chainDeployer,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to create broadcaster: %w", err)
+		return dao, fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
 	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dao, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	l1Host, err := env.DefaultForkedScriptHost(
@@ -152,27 +162,23 @@ func Asterisc(ctx context.Context, cfg AsteriscConfig) error {
 		l1RPC,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create script host: %w", err)
+		return dao, fmt.Errorf("failed to create script host: %w", err)
 	}
 
-	dgo, err := opcm.DeployAsterisc(
+	dao, err = opcm.DeployAsterisc(
 		l1Host,
 		opcm.DeployAsteriscInput{
 			PreimageOracle: cfg.PreimageOracle,
 		},
 	)
 	if err != nil {
-		return fmt.Errorf("error deploying asterisc VM: %w", err)
+		return dao, fmt.Errorf("error deploying asterisc VM: %w", err)
 	}
 
 	if _, err := bcaster.Broadcast(ctx); err != nil {
-		return fmt.Errorf("failed to broadcast: %w", err)
+		return dao, fmt.Errorf("failed to broadcast: %w", err)
 	}
 
 	lgr.Info("deployed asterisc VM")
-
-	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
-		return fmt.Errorf("failed to write output: %w", err)
-	}
-	return nil
+	return dao, nil
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index 9c3e0bc07fab..71fea24cc73f 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -71,6 +71,7 @@ func DelayedWETHCLI(cliCtx *cli.Context) error {
 	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
 	oplog.SetGlobalLogHandler(l.Handler())
 
+	outfile := cliCtx.String(OutfileFlagName)
 	config, err := NewDelayedWETHConfigFromClI(cliCtx, l)
 	if err != nil {
 		return err
@@ -78,7 +79,15 @@ func DelayedWETHCLI(cliCtx *cli.Context) error {
 
 	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
 
-	return DelayedWETH(ctx, config)
+	dwo, err := DelayedWETH(ctx, config)
+	if err != nil {
+		return fmt.Errorf("failed to deploy DelayedWETH: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(dwo, ioutil.ToStdOutOrFileOrNoop(outfile, 0o755)); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
 }
 
 func NewDelayedWETHConfigFromClI(cliCtx *cli.Context, l log.Logger) (DelayedWETHConfig, error) {
@@ -100,9 +109,10 @@ func NewDelayedWETHConfigFromClI(cliCtx *cli.Context, l log.Logger) (DelayedWETH
 	return config, nil
 }
 
-func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
+func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) (opcm.DeployDelayedWETHOutput, error) {
+	var dwo opcm.DeployDelayedWETHOutput
 	if err := cfg.Check(); err != nil {
-		return fmt.Errorf("invalid config for DelayedWETH: %w", err)
+		return dwo, fmt.Errorf("invalid config for DelayedWETH: %w", err)
 	}
 
 	lgr := cfg.Logger
@@ -112,7 +122,7 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 
 	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
 	if err != nil {
-		return fmt.Errorf("failed to download artifacts: %w", err)
+		return dwo, fmt.Errorf("failed to download artifacts: %w", err)
 	}
 	defer func() {
 		if err := cleanup(); err != nil {
@@ -122,26 +132,26 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 
 	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dwo, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to get chain ID: %w", err)
+		return dwo, fmt.Errorf("failed to get chain ID: %w", err)
 	}
 	chainIDU64 := chainID.Uint64()
 
 	superCfg, err := standard.SuperchainFor(chainIDU64)
 	if err != nil {
-		return fmt.Errorf("error getting superchain config: %w", err)
+		return dwo, fmt.Errorf("error getting superchain config: %w", err)
 	}
 	proxyAdmin, err := standard.ManagerOwnerAddrFor(chainIDU64)
 	if err != nil {
-		return fmt.Errorf("error getting superchain proxy admin: %w", err)
+		return dwo, fmt.Errorf("error getting superchain proxy admin: %w", err)
 	}
 	delayedWethOwner, err := standard.SystemOwnerAddrFor(chainIDU64)
 	if err != nil {
-		return fmt.Errorf("error getting superchain system owner: %w", err)
+		return dwo, fmt.Errorf("error getting superchain system owner: %w", err)
 	}
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
@@ -155,12 +165,12 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		From:    chainDeployer,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to create broadcaster: %w", err)
+		return dwo, fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
 	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dwo, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	host, err := env.DefaultForkedScriptHost(
@@ -172,7 +182,7 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		l1RPC,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create script host: %w", err)
+		return dwo, fmt.Errorf("failed to create script host: %w", err)
 	}
 
 	var release string
@@ -186,7 +196,7 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 
 	superchainConfigAddr := common.Address(*superCfg.Config.SuperchainConfigAddr)
 
-	dwo, err := opcm.DeployDelayedWETH(
+	dwo, err = opcm.DeployDelayedWETH(
 		host,
 		opcm.DeployDelayedWETHInput{
 			Release:               release,
@@ -198,17 +208,13 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) error {
 		},
 	)
 	if err != nil {
-		return fmt.Errorf("error deploying DelayedWETH: %w", err)
+		return dwo, fmt.Errorf("error deploying DelayedWETH: %w", err)
 	}
 
 	if _, err := bcaster.Broadcast(ctx); err != nil {
-		return fmt.Errorf("failed to broadcast: %w", err)
+		return dwo, fmt.Errorf("failed to broadcast: %w", err)
 	}
 
 	lgr.Info("deployed DelayedWETH")
-
-	if err := jsonutil.WriteJSON(dwo, ioutil.ToStdOut()); err != nil {
-		return fmt.Errorf("failed to write output: %w", err)
-	}
-	return nil
+	return dwo, nil
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
index 3f1d354f28fc..acadd1ab9f92 100644
--- a/op-deployer/pkg/deployer/bootstrap/dispute_game.go
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -83,12 +83,22 @@ func DisputeGameCLI(cliCtx *cli.Context) error {
 	l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
 	oplog.SetGlobalLogHandler(l.Handler())
 
+	outfile := cliCtx.String(OutfileFlagName)
 	cfg, err := NewDisputeGameConfigFromCLI(cliCtx, l)
 	if err != nil {
 		return err
 	}
 	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
-	return DisputeGame(ctx, cfg)
+	dgo, err := DisputeGame(ctx, cfg)
+	if err != nil {
+		return fmt.Errorf("failed to deploy dispute game: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOutOrFileOrNoop(outfile, 0o755)); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+
+	return nil
 }
 
 func NewDisputeGameConfigFromCLI(cliCtx *cli.Context, l log.Logger) (DisputeGameConfig, error) {
@@ -123,9 +133,10 @@ func NewDisputeGameConfigFromCLI(cliCtx *cli.Context, l log.Logger) (DisputeGame
 	return cfg, nil
 }
 
-func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
+func DisputeGame(ctx context.Context, cfg DisputeGameConfig) (opcm.DeployDisputeGameOutput, error) {
+	var dgo opcm.DeployDisputeGameOutput
 	if err := cfg.Check(); err != nil {
-		return fmt.Errorf("invalid config for DisputeGame: %w", err)
+		return dgo, fmt.Errorf("invalid config for DisputeGame: %w", err)
 	}
 
 	lgr := cfg.Logger
@@ -135,7 +146,7 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 
 	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
 	if err != nil {
-		return fmt.Errorf("failed to download artifacts: %w", err)
+		return dgo, fmt.Errorf("failed to download artifacts: %w", err)
 	}
 	defer func() {
 		if err := cleanup(); err != nil {
@@ -145,22 +156,22 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 
 	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dgo, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 	l1Rpc, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dgo, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to get chain ID: %w", err)
+		return dgo, fmt.Errorf("failed to get chain ID: %w", err)
 	}
 	chainIDU64 := chainID.Uint64()
 
 	standardVersionsTOML, err := standard.L1VersionsDataFor(chainIDU64)
 	if err != nil {
-		return fmt.Errorf("error getting standard versions TOML: %w", err)
+		return dgo, fmt.Errorf("error getting standard versions TOML: %w", err)
 	}
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
@@ -174,7 +185,7 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		From:    chainDeployer,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to create broadcaster: %w", err)
+		return dgo, fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
 	host, err := env.DefaultForkedScriptHost(
@@ -186,7 +197,7 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		l1Rpc,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create L1 script host: %w", err)
+		return dgo, fmt.Errorf("failed to create L1 script host: %w", err)
 	}
 
 	var release string
@@ -197,7 +208,8 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 	}
 
 	lgr.Info("deploying dispute game", "release", release)
-	dgo, err := opcm.DeployDisputeGame(
+
+	dgo, err = opcm.DeployDisputeGame(
 		host,
 		opcm.DeployDisputeGameInput{
 			Release:                  release,
@@ -218,17 +230,13 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) error {
 		},
 	)
 	if err != nil {
-		return fmt.Errorf("error deploying dispute game: %w", err)
+		return dgo, fmt.Errorf("error deploying dispute game: %w", err)
 	}
 
 	if _, err := bcaster.Broadcast(ctx); err != nil {
-		return fmt.Errorf("failed to broadcast: %w", err)
+		return dgo, fmt.Errorf("failed to broadcast: %w", err)
 	}
 
 	lgr.Info("deployed dispute game")
-
-	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
-		return fmt.Errorf("failed to write output: %w", err)
-	}
-	return nil
+	return dgo, nil
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index 3991829bd460..c7c720d310d5 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -11,6 +11,7 @@ import (
 )
 
 const (
+	OutfileFlagName                         = "outfile"
 	ArtifactsLocatorFlagName                = "artifacts-locator"
 	WithdrawalDelaySecondsFlagName          = "withdrawal-delay-seconds"
 	MinProposalSizeBytesFlagName            = "min-proposal-size-bytes"
@@ -44,6 +45,12 @@ const (
 )
 
 var (
+	OutfileFlag = &cli.StringFlag{
+		Name:    OutfileFlagName,
+		Usage:   "Output file. Use - for stdout.",
+		EnvVars: deployer.PrefixEnvVar("OUTFILE"),
+		Value:   "-",
+	}
 	ArtifactsLocatorFlag = &cli.StringFlag{
 		Name:    ArtifactsLocatorFlagName,
 		Usage:   "Locator for artifacts.",
@@ -221,6 +228,7 @@ var OPCMFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
 	ReleaseFlag,
+	OutfileFlag,
 }
 
 var ImplementationsFlags = []cli.Flag{
@@ -235,6 +243,7 @@ var ImplementationsFlags = []cli.Flag{
 var DelayedWETHFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
+	OutfileFlag,
 	ArtifactsLocatorFlag,
 	DelayedWethImplFlag,
 }
@@ -242,6 +251,7 @@ var DelayedWETHFlags = []cli.Flag{
 var DisputeGameFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
+	OutfileFlag,
 	ArtifactsLocatorFlag,
 	MinProposalSizeBytesFlag,
 	ChallengePeriodSecondsFlag,
@@ -263,6 +273,7 @@ var DisputeGameFlags = []cli.Flag{
 var BaseFPVMFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
+	OutfileFlag,
 	ArtifactsLocatorFlag,
 	PreimageOracleFlag,
 }
@@ -274,6 +285,7 @@ var AsteriscFlags = BaseFPVMFlags
 var ProxyFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
+	OutfileFlag,
 	ArtifactsLocatorFlag,
 	ProxyOwnerFlag,
 }
@@ -281,6 +293,7 @@ var ProxyFlags = []cli.Flag{
 var SuperchainFlags = []cli.Flag{
 	deployer.L1RPCURLFlag,
 	deployer.PrivateKeyFlag,
+	OutfileFlag,
 	ArtifactsLocatorFlag,
 	SuperchainProxyAdminOwnerFlag,
 	ProtocolVersionsOwnerFlag,
diff --git a/op-deployer/pkg/deployer/bootstrap/mips.go b/op-deployer/pkg/deployer/bootstrap/mips.go
index 9c8fd555fb42..d5bd95752f98 100644
--- a/op-deployer/pkg/deployer/bootstrap/mips.go
+++ b/op-deployer/pkg/deployer/bootstrap/mips.go
@@ -84,6 +84,7 @@ func MIPSCLI(cliCtx *cli.Context) error {
 
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	outfile := cliCtx.String(OutfileFlagName)
 	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
 	artifactsLocator := new(artifacts2.Locator)
 	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
@@ -95,7 +96,7 @@ func MIPSCLI(cliCtx *cli.Context) error {
 
 	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
 
-	return MIPS(ctx, MIPSConfig{
+	dmo, err := MIPS(ctx, MIPSConfig{
 		L1RPCUrl:         l1RPCUrl,
 		PrivateKey:       privateKey,
 		Logger:           l,
@@ -103,11 +104,20 @@ func MIPSCLI(cliCtx *cli.Context) error {
 		MipsVersion:      mipsVersion,
 		PreimageOracle:   preimageOracle,
 	})
+	if err != nil {
+		return fmt.Errorf("failed to deploy MIPS: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(dmo, ioutil.ToStdOutOrFileOrNoop(outfile, 0o755)); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
 }
 
-func MIPS(ctx context.Context, cfg MIPSConfig) error {
+func MIPS(ctx context.Context, cfg MIPSConfig) (opcm.DeployMIPSOutput, error) {
+	var dmo opcm.DeployMIPSOutput
 	if err := cfg.Check(); err != nil {
-		return fmt.Errorf("invalid config for MIPS: %w", err)
+		return dmo, fmt.Errorf("invalid config for MIPS: %w", err)
 	}
 
 	lgr := cfg.Logger
@@ -117,7 +127,7 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 
 	artifactsFS, cleanup, err := artifacts2.Download(ctx, cfg.ArtifactsLocator, progressor)
 	if err != nil {
-		return fmt.Errorf("failed to download artifacts: %w", err)
+		return dmo, fmt.Errorf("failed to download artifacts: %w", err)
 	}
 	defer func() {
 		if err := cleanup(); err != nil {
@@ -127,14 +137,14 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 
 	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dmo, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	l1Client := ethclient.NewClient(l1RPC)
 
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to get chain ID: %w", err)
+		return dmo, fmt.Errorf("failed to get chain ID: %w", err)
 	}
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
@@ -148,7 +158,7 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 		From:    chainDeployer,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to create broadcaster: %w", err)
+		return dmo, fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
 	host, err := env.DefaultForkedScriptHost(
@@ -160,7 +170,7 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 		l1RPC,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create script host: %w", err)
+		return dmo, fmt.Errorf("failed to create script host: %w", err)
 	}
 
 	var release string
@@ -172,7 +182,7 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 
 	lgr.Info("deploying dispute game", "release", release)
 
-	dgo, err := opcm.DeployMIPS(
+	dmo, err = opcm.DeployMIPS(
 		host,
 		opcm.DeployMIPSInput{
 			MipsVersion:    cfg.MipsVersion,
@@ -180,17 +190,14 @@ func MIPS(ctx context.Context, cfg MIPSConfig) error {
 		},
 	)
 	if err != nil {
-		return fmt.Errorf("error deploying dispute game: %w", err)
+		return dmo, fmt.Errorf("error deploying dispute game: %w", err)
 	}
 
 	if _, err := bcaster.Broadcast(ctx); err != nil {
-		return fmt.Errorf("failed to broadcast: %w", err)
+		return dmo, fmt.Errorf("failed to broadcast: %w", err)
 	}
 
 	lgr.Info("deployed dispute game")
 
-	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
-		return fmt.Errorf("failed to write output: %w", err)
-	}
-	return nil
+	return dmo, nil
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/opcm.go b/op-deployer/pkg/deployer/bootstrap/opcm.go
index 5d42d1bfa955..0aaadd5c1d19 100644
--- a/op-deployer/pkg/deployer/bootstrap/opcm.go
+++ b/op-deployer/pkg/deployer/bootstrap/opcm.go
@@ -73,6 +73,7 @@ func OPCMCLI(cliCtx *cli.Context) error {
 
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	outfile := cliCtx.String(OutfileFlagName)
 	release := cliCtx.String(ReleaseFlagName)
 
 	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
@@ -87,7 +88,7 @@ func OPCMCLI(cliCtx *cli.Context) error {
 		return fmt.Errorf("failed to deploy OPCM: %w", err)
 	}
 
-	if err := jsonutil.WriteJSON(out, ioutil.ToStdOut()); err != nil {
+	if err := jsonutil.WriteJSON(out, ioutil.ToStdOutOrFileOrNoop(outfile, 0o755)); err != nil {
 		return fmt.Errorf("failed to write output: %w", err)
 	}
 	return nil
diff --git a/op-deployer/pkg/deployer/bootstrap/proxy.go b/op-deployer/pkg/deployer/bootstrap/proxy.go
index c96e497c8c73..ee8399b4bb55 100644
--- a/op-deployer/pkg/deployer/bootstrap/proxy.go
+++ b/op-deployer/pkg/deployer/bootstrap/proxy.go
@@ -75,6 +75,7 @@ func ProxyCLI(cliCtx *cli.Context) error {
 
 	l1RPCUrl := cliCtx.String(deployer.L1RPCURLFlagName)
 	privateKey := cliCtx.String(deployer.PrivateKeyFlagName)
+	outfile := cliCtx.String(OutfileFlagName)
 	artifactsURLStr := cliCtx.String(ArtifactsLocatorFlagName)
 	artifactsLocator := new(artifacts.Locator)
 	if err := artifactsLocator.UnmarshalText([]byte(artifactsURLStr)); err != nil {
@@ -85,18 +86,27 @@ func ProxyCLI(cliCtx *cli.Context) error {
 
 	ctx := ctxinterrupt.WithCancelOnInterrupt(cliCtx.Context)
 
-	return Proxy(ctx, ProxyConfig{
+	dpo, err := Proxy(ctx, ProxyConfig{
 		L1RPCUrl:         l1RPCUrl,
 		PrivateKey:       privateKey,
 		Logger:           l,
 		ArtifactsLocator: artifactsLocator,
 		Owner:            owner,
 	})
+	if err != nil {
+		return fmt.Errorf("failed to deploy Proxy: %w", err)
+	}
+
+	if err := jsonutil.WriteJSON(dpo, ioutil.ToStdOutOrFileOrNoop(outfile, 0o755)); err != nil {
+		return fmt.Errorf("failed to write output: %w", err)
+	}
+	return nil
 }
 
-func Proxy(ctx context.Context, cfg ProxyConfig) error {
+func Proxy(ctx context.Context, cfg ProxyConfig) (opcm.DeployProxyOutput, error) {
+	var dpo opcm.DeployProxyOutput
 	if err := cfg.Check(); err != nil {
-		return fmt.Errorf("invalid config for Proxy: %w", err)
+		return dpo, fmt.Errorf("invalid config for Proxy: %w", err)
 	}
 
 	lgr := cfg.Logger
@@ -106,7 +116,7 @@ func Proxy(ctx context.Context, cfg ProxyConfig) error {
 
 	artifactsFS, cleanup, err := artifacts.Download(ctx, cfg.ArtifactsLocator, progressor)
 	if err != nil {
-		return fmt.Errorf("failed to download artifacts: %w", err)
+		return dpo, fmt.Errorf("failed to download artifacts: %w", err)
 	}
 	defer func() {
 		if err := cleanup(); err != nil {
@@ -116,12 +126,12 @@ func Proxy(ctx context.Context, cfg ProxyConfig) error {
 
 	l1Client, err := ethclient.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dpo, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	chainID, err := l1Client.ChainID(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to get chain ID: %w", err)
+		return dpo, fmt.Errorf("failed to get chain ID: %w", err)
 	}
 
 	signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(cfg.privateKeyECDSA, chainID))
@@ -135,12 +145,12 @@ func Proxy(ctx context.Context, cfg ProxyConfig) error {
 		From:    chainDeployer,
 	})
 	if err != nil {
-		return fmt.Errorf("failed to create broadcaster: %w", err)
+		return dpo, fmt.Errorf("failed to create broadcaster: %w", err)
 	}
 
 	l1RPC, err := rpc.Dial(cfg.L1RPCUrl)
 	if err != nil {
-		return fmt.Errorf("failed to connect to L1 RPC: %w", err)
+		return dpo, fmt.Errorf("failed to connect to L1 RPC: %w", err)
 	}
 
 	l1Host, err := env.DefaultForkedScriptHost(
@@ -152,27 +162,23 @@ func Proxy(ctx context.Context, cfg ProxyConfig) error {
 		l1RPC,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to create script host: %w", err)
+		return dpo, fmt.Errorf("failed to create script host: %w", err)
 	}
 
-	dgo, err := opcm.DeployProxy(
+	dpo, err = opcm.DeployProxy(
 		l1Host,
 		opcm.DeployProxyInput{
 			Owner: cfg.Owner,
 		},
 	)
 	if err != nil {
-		return fmt.Errorf("error deploying proxy: %w", err)
+		return dpo, fmt.Errorf("error deploying proxy: %w", err)
 	}
 
 	if _, err := bcaster.Broadcast(ctx); err != nil {
-		return fmt.Errorf("failed to broadcast: %w", err)
+		return dpo, fmt.Errorf("failed to broadcast: %w", err)
 	}
 
 	lgr.Info("deployed new ERC-1967 proxy")
-
-	if err := jsonutil.WriteJSON(dgo, ioutil.ToStdOut()); err != nil {
-		return fmt.Errorf("failed to write output: %w", err)
-	}
-	return nil
+	return dpo, nil
 }
diff --git a/op-deployer/pkg/deployer/bootstrap/superchain.go b/op-deployer/pkg/deployer/bootstrap/superchain.go
index 837f406c091b..d9c5ed3d5238 100644
--- a/op-deployer/pkg/deployer/bootstrap/superchain.go
+++ b/op-deployer/pkg/deployer/bootstrap/superchain.go
@@ -98,6 +98,7 @@ func SuperchainCLI(cliCtx *cli.Context) error {
 	paused := cliCtx.Bool(PausedFlagName)
 	requiredVersionStr := cliCtx.String(RequiredProtocolVersionFlagName)
 	recommendedVersionStr := cliCtx.String(RecommendedProtocolVersionFlagName)
+	outfile := cliCtx.String(OutfileFlagName)
 
 	cfg := SuperchainConfig{
 		L1RPCUrl:                  l1RPCUrl,
@@ -124,7 +125,7 @@ func SuperchainCLI(cliCtx *cli.Context) error {
 		return fmt.Errorf("failed to deploy superchain: %w", err)
 	}
 
-	if err := jsonutil.WriteJSON(dso, ioutil.ToStdOut()); err != nil {
+	if err := jsonutil.WriteJSON(dso, ioutil.ToStdOutOrFileOrNoop(outfile, 0o755)); err != nil {
 		return fmt.Errorf("failed to write output: %w", err)
 	}
 	return nil

From 830fa2a7b327eb9738ebe51869d66ae5db2acfed Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Fri, 6 Dec 2024 15:53:34 -0700
Subject: [PATCH 410/451] Revert "maint: bump forge version (#13301)" (#13304)

This reverts commit a2e7d852a8a16e526564401c41abad56173790d3.
---
 mise.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mise.toml b/mise.toml
index 0dba715900c8..5fb473de8891 100644
--- a/mise.toml
+++ b/mise.toml
@@ -31,9 +31,9 @@ just = "1.37.0"
 # Foundry dependencies
 # Foundry is a special case because it supplies multiple binaries at the same
 # GitHub release, so we need to use the aliasing trick to get mise to not error
-forge = "nightly-e52076714ace23c7a68e14f0048a40be3c6c8f0b"
-cast = "nightly-e52076714ace23c7a68e14f0048a40be3c6c8f0b"
-anvil = "nightly-e52076714ace23c7a68e14f0048a40be3c6c8f0b"
+forge = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
+cast = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
+anvil = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
 
 # Fake dependencies
 # Put things here if you need to track versions of tools or projects that can't

From ad9e554945a76e379ee78580348ee49325a7374d Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Fri, 6 Dec 2024 15:01:47 -0800
Subject: [PATCH 411/451] cannon: Forward evm options in testutil.ValidateEVM
 (#13221)

---
 cannon/mipsevm/testutil/mips.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cannon/mipsevm/testutil/mips.go b/cannon/mipsevm/testutil/mips.go
index 0d5322c6fb6e..43de91f0962e 100644
--- a/cannon/mipsevm/testutil/mips.go
+++ b/cannon/mipsevm/testutil/mips.go
@@ -223,7 +223,7 @@ func (v *EvmValidator) ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitnes
 
 // ValidateEVM runs a single evm step and validates against an FPVM poststate
 func ValidateEVM(t *testing.T, stepWitness *mipsevm.StepWitness, step uint64, goVm mipsevm.FPVM, hashFn mipsevm.HashFn, contracts *ContractMetadata, opts ...evmOption) {
-	validator := NewEvmValidator(t, hashFn, contracts)
+	validator := NewEvmValidator(t, hashFn, contracts, opts...)
 	validator.ValidateEVM(t, stepWitness, step, goVm)
 }
 

From 4c88138e9f0d2922337d825fb3a34f435eee67c0 Mon Sep 17 00:00:00 2001
From: I love OP <odysseasmankt@gmail.com>
Date: Fri, 6 Dec 2024 20:39:42 -0300
Subject: [PATCH 412/451] Update op-conductor rpc api path (#12760)

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-conductor/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-conductor/README.md b/op-conductor/README.md
index c436d0248ace..aacc0ab65cba 100644
--- a/op-conductor/README.md
+++ b/op-conductor/README.md
@@ -48,7 +48,7 @@ This way you could understand how we handle the state transitions.
 
 ### RPC design
 
-conductor provides rpc APIs for ease of cluster management, see [api](./op-conductor/rpc/api.go) for rpc definitions and how they can be used.
+conductor provides rpc APIs for ease of cluster management, see [api](./rpc/api.go) for rpc definitions and how they can be used.
 
 ### Failure Scenario walkthrough
 

From 2824b3b2c001f07c582c37213e6f0152b12ac3e2 Mon Sep 17 00:00:00 2001
From: Francis Li <francis.li@coinbase.com>
Date: Sun, 8 Dec 2024 12:19:25 -0800
Subject: [PATCH 413/451] [conductor] Fix test race condition (#13314)

* Fix conductor test race condition

* update

* Address shell ci check

* rerun CI for non-related issue
---
 op-conductor/conductor/service.go                           | 4 +---
 op-conductor/conductor/service_test.go                      | 6 +++---
 .../{run_test_100times.sh => run_test_1000times.sh}         | 5 +++--
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename op-conductor/{run_test_100times.sh => run_test_1000times.sh} (54%)

diff --git a/op-conductor/conductor/service.go b/op-conductor/conductor/service.go
index 89948b614f06..cccba2c76ac9 100644
--- a/op-conductor/conductor/service.go
+++ b/op-conductor/conductor/service.go
@@ -381,9 +381,7 @@ func (oc *OpConductor) Start(ctx context.Context) error {
 	oc.log.Info("OpConductor started")
 	// queue an action in case sequencer is not in the desired state.
 	oc.prevState = NewState(oc.leader.Load(), oc.healthy.Load(), oc.seqActive.Load())
-	// Immediately queue an action. This is made blocking to ensure that start is not
-	// considered complete until the first action is executed.
-	oc.actionCh <- struct{}{}
+	oc.queueAction()
 
 	return nil
 }
diff --git a/op-conductor/conductor/service_test.go b/op-conductor/conductor/service_test.go
index 196c7e3456c2..ae7332af2b9f 100644
--- a/op-conductor/conductor/service_test.go
+++ b/op-conductor/conductor/service_test.go
@@ -106,7 +106,7 @@ func (s *OpConductorTestSuite) SetupSuite() {
 	s.metrics = &metrics.NoopMetricsImpl{}
 	s.cfg = mockConfig(s.T())
 	s.version = "v0.0.1"
-	s.next = make(chan struct{}, 1)
+	s.next = make(chan struct{})
 }
 
 func (s *OpConductorTestSuite) SetupTest() {
@@ -129,7 +129,8 @@ func (s *OpConductorTestSuite) SetupTest() {
 	s.conductor.leaderUpdateCh = s.leaderUpdateCh
 
 	s.err = errors.New("error")
-	s.syncEnabled = false // default to no sync, turn it on by calling s.enableSynchronization()
+	s.syncEnabled = false   // default to no sync, turn it on by calling s.enableSynchronization()
+	s.wg = sync.WaitGroup{} // create new wg for every test in case last test didn't finish the action loop during shutdown.
 }
 
 func (s *OpConductorTestSuite) TearDownTest() {
@@ -876,6 +877,5 @@ func (s *OpConductorTestSuite) TestHandleInitError() {
 }
 
 func TestControlLoop(t *testing.T) {
-	t.Skipf("Skipping test, it's flaky and needs to be fixed")
 	suite.Run(t, new(OpConductorTestSuite))
 }
diff --git a/op-conductor/run_test_100times.sh b/op-conductor/run_test_1000times.sh
similarity index 54%
rename from op-conductor/run_test_100times.sh
rename to op-conductor/run_test_1000times.sh
index 5d7500c44e20..f7fde44a00ac 100755
--- a/op-conductor/run_test_100times.sh
+++ b/op-conductor/run_test_1000times.sh
@@ -2,10 +2,11 @@
 
 set -e
 
-for i in {1..100}; do
+for i in {1..1000}; do
   echo "======================="
   echo "Running iteration $i"
-  if ! gotestsum -- -run 'TestControlLoop' ./... --count=1 --timeout=5s -race; then
+
+  if ! go test -v ./conductor/... -race -count=1; then
     echo "Test failed"
     exit 1
   fi

From 53034d287fb0026a3efe9bb3cbf094b8c8153f99 Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Mon, 9 Dec 2024 14:40:57 +0000
Subject: [PATCH 414/451] op-batcher: syncActions is aware of safe=unsafe edge
 case (#13292)

* add additional test case for computeSyncActions

* fixup test

* check for unsafe = safe edge case & replace oldestUnsafeBlock with nextSafeBlock

* add test case for no progress and safe=unsafe

* refine log

* rename variable

* harmonize log ordering and labels

* tighten up test behaviour for expectedLogs

* add test case: no progress + unsafe=safe + blocks in state

and fix behaviour so we don't try to fetch unsafe blocks if there aren't any, even when there are blocks in state

* typo
---
 op-batcher/batcher/sync_actions.go      | 49 ++++++++++--------
 op-batcher/batcher/sync_actions_test.go | 67 ++++++++++++++++++++++---
 2 files changed, 89 insertions(+), 27 deletions(-)

diff --git a/op-batcher/batcher/sync_actions.go b/op-batcher/batcher/sync_actions.go
index 6031d2ce2585..76cdf846ad91 100644
--- a/op-batcher/batcher/sync_actions.go
+++ b/op-batcher/batcher/sync_actions.go
@@ -48,14 +48,17 @@ func computeSyncActions[T channelStatuser](newSyncStatus eth.SyncStatus, prevCur
 		return syncActions{}, true
 	}
 
+	var allUnsafeBlocks *inclusiveBlockRange
+	if newSyncStatus.UnsafeL2.Number > newSyncStatus.SafeL2.Number {
+		allUnsafeBlocks = &inclusiveBlockRange{newSyncStatus.SafeL2.Number + 1, newSyncStatus.UnsafeL2.Number}
+	}
+
 	// PART 2: checks involving only the oldest block in the state
 	oldestBlockInState, hasBlocks := blocks.Peek()
-	oldestUnsafeBlockNum := newSyncStatus.SafeL2.Number + 1
-	youngestUnsafeBlockNum := newSyncStatus.UnsafeL2.Number
 
 	if !hasBlocks {
 		s := syncActions{
-			blocksToLoad: &inclusiveBlockRange{oldestUnsafeBlockNum, youngestUnsafeBlockNum},
+			blocksToLoad: allUnsafeBlocks,
 		}
 		l.Info("no blocks in state", "syncActions", s)
 		return s, false
@@ -63,17 +66,21 @@ func computeSyncActions[T channelStatuser](newSyncStatus eth.SyncStatus, prevCur
 
 	// These actions apply in multiple unhappy scenarios below, where
 	// we detect that the existing state is invalidated
-	// and we need to start over from the sequencer's oldest
-	// unsafe (and not safe) block.
+	// and we need to start over, loading all unsafe blocks
+	// from the sequencer.
 	startAfresh := syncActions{
 		clearState:   &newSyncStatus.SafeL2.L1Origin,
-		blocksToLoad: &inclusiveBlockRange{oldestUnsafeBlockNum, youngestUnsafeBlockNum},
+		blocksToLoad: allUnsafeBlocks,
 	}
 
 	oldestBlockInStateNum := oldestBlockInState.NumberU64()
+	nextSafeBlockNum := newSyncStatus.SafeL2.Number + 1
 
-	if oldestUnsafeBlockNum < oldestBlockInStateNum {
-		l.Warn("oldest unsafe block is below oldest block in state", "syncActions", startAfresh, "oldestBlockInState", oldestBlockInState, "newSafeBlock", newSyncStatus.SafeL2)
+	if nextSafeBlockNum < oldestBlockInStateNum {
+		l.Warn("next safe block is below oldest block in state",
+			"syncActions", startAfresh,
+			"oldestBlockInState", oldestBlockInState,
+			"safeL2", newSyncStatus.SafeL2)
 		return startAfresh, false
 	}
 
@@ -81,25 +88,25 @@ func computeSyncActions[T channelStatuser](newSyncStatus eth.SyncStatus, prevCur
 	newestBlockInState := blocks[blocks.Len()-1]
 	newestBlockInStateNum := newestBlockInState.NumberU64()
 
-	numBlocksToDequeue := oldestUnsafeBlockNum - oldestBlockInStateNum
+	numBlocksToDequeue := nextSafeBlockNum - oldestBlockInStateNum
 
 	if numBlocksToDequeue > uint64(blocks.Len()) {
 		// This could happen if the batcher restarted.
 		// The sequencer may have derived the safe chain
 		// from channels sent by a previous batcher instance.
-		l.Warn("oldest unsafe block above newest block in state, clearing channel manager state",
-			"oldestUnsafeBlockNum", oldestUnsafeBlockNum,
+		l.Warn("safe head above newest block in state, clearing channel manager state",
+			"syncActions", startAfresh,
+			"safeL2", newSyncStatus.SafeL2,
 			"newestBlockInState", eth.ToBlockID(newestBlockInState),
-			"syncActions",
-			startAfresh)
+		)
 		return startAfresh, false
 	}
 
 	if numBlocksToDequeue > 0 && blocks[numBlocksToDequeue-1].Hash() != newSyncStatus.SafeL2.Hash {
 		l.Warn("safe chain reorg, clearing channel manager state",
+			"syncActions", startAfresh,
 			"existingBlock", eth.ToBlockID(blocks[numBlocksToDequeue-1]),
-			"newSafeBlock", newSyncStatus.SafeL2,
-			"syncActions", startAfresh)
+			"safeL2", newSyncStatus.SafeL2)
 		return startAfresh, false
 	}
 
@@ -114,9 +121,9 @@ func computeSyncActions[T channelStatuser](newSyncStatus eth.SyncStatus, prevCur
 			// that the derivation pipeline may have stalled
 			// e.g. because of Holocene strict ordering rules.
 			l.Warn("sequencer did not make expected progress",
+				"syncActions", startAfresh,
 				"existingBlock", ch.LatestL2(),
-				"newSafeBlock", newSyncStatus.SafeL2,
-				"syncActions", startAfresh)
+				"safeL2", newSyncStatus.SafeL2)
 			return startAfresh, false
 		}
 	}
@@ -132,12 +139,14 @@ func computeSyncActions[T channelStatuser](newSyncStatus eth.SyncStatus, prevCur
 		numChannelsToPrune++
 	}
 
-	start := newestBlockInStateNum + 1
-	end := youngestUnsafeBlockNum
+	var allUnsafeBlocksAboveState *inclusiveBlockRange
+	if newSyncStatus.UnsafeL2.Number > newestBlockInStateNum {
+		allUnsafeBlocksAboveState = &inclusiveBlockRange{newestBlockInStateNum + 1, newSyncStatus.UnsafeL2.Number}
+	}
 
 	return syncActions{
 		blocksToPrune:   int(numBlocksToDequeue),
 		channelsToPrune: numChannelsToPrune,
-		blocksToLoad:    &inclusiveBlockRange{start, end},
+		blocksToLoad:    allUnsafeBlocksAboveState,
 	}, false
 }
diff --git a/op-batcher/batcher/sync_actions_test.go b/op-batcher/batcher/sync_actions_test.go
index f48ed9dabfbe..7c4e9b8b96cf 100644
--- a/op-batcher/batcher/sync_actions_test.go
+++ b/op-batcher/batcher/sync_actions_test.go
@@ -55,6 +55,8 @@ func TestBatchSubmitter_computeSyncActions(t *testing.T) {
 		timedOut:       false,
 	}
 
+	happyCaseLogs := []string{} // in the happy case we expect no logs
+
 	type TestCase struct {
 		name string
 		// inputs
@@ -105,7 +107,7 @@ func TestBatchSubmitter_computeSyncActions(t *testing.T) {
 				clearState:   &eth.BlockID{Number: 1},
 				blocksToLoad: &inclusiveBlockRange{101, 109},
 			},
-			expectedLogs: []string{"oldest unsafe block is below oldest block in state"},
+			expectedLogs: []string{"next safe block is below oldest block in state"},
 		},
 		{name: "unexpectedly good progress",
 			// This can happen if another batcher instance got some blocks
@@ -123,7 +125,7 @@ func TestBatchSubmitter_computeSyncActions(t *testing.T) {
 				clearState:   &eth.BlockID{Number: 1},
 				blocksToLoad: &inclusiveBlockRange{105, 109},
 			},
-			expectedLogs: []string{"oldest unsafe block above newest block in state"},
+			expectedLogs: []string{"safe head above newest block in state"},
 		},
 		{name: "safe chain reorg",
 			// This can happen if there is an L1 reorg, the safe chain is at an acceptable
@@ -161,6 +163,23 @@ func TestBatchSubmitter_computeSyncActions(t *testing.T) {
 			},
 			expectedLogs: []string{"sequencer did not make expected progress"},
 		},
+		{name: "failed to make expected progress (unsafe=safe)",
+			// Edge case where unsafe = safe
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 3},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 101, Hash: block101.Hash(), L1Origin: eth.BlockID{Number: 1}},
+				UnsafeL2:  eth.L2BlockRef{Number: 101},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block102, block103},
+			channels:      []channelStatuser{channel103},
+			expected: syncActions{
+				clearState: &eth.BlockID{Number: 1},
+				// no blocks to load since there are no unsafe blocks
+			},
+			expectedLogs: []string{"sequencer did not make expected progress"},
+		},
 		{name: "no progress",
 			// This can happen if we have a long channel duration
 			// and we didn't submit or have any txs confirmed since
@@ -192,6 +211,7 @@ func TestBatchSubmitter_computeSyncActions(t *testing.T) {
 			expected: syncActions{
 				blocksToLoad: &inclusiveBlockRange{104, 109},
 			},
+			expectedLogs: []string{"no blocks in state"},
 		},
 		{name: "happy path",
 			// This happens when the safe chain is being progressed as expected:
@@ -225,10 +245,39 @@ func TestBatchSubmitter_computeSyncActions(t *testing.T) {
 				channelsToPrune: 1,
 				blocksToLoad:    &inclusiveBlockRange{105, 109},
 			},
+			expectedLogs: happyCaseLogs,
+		},
+		{name: "no progress + unsafe=safe",
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 5},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 100},
+				UnsafeL2:  eth.L2BlockRef{Number: 100},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{},
+			channels:      []channelStatuser{},
+			expected:      syncActions{},
+			expectedLogs:  []string{"no blocks in state"},
+		},
+		{name: "no progress + unsafe=safe + blocks in state",
+			newSyncStatus: eth.SyncStatus{
+				HeadL1:    eth.BlockRef{Number: 5},
+				CurrentL1: eth.BlockRef{Number: 2},
+				SafeL2:    eth.L2BlockRef{Number: 101, Hash: block101.Hash()},
+				UnsafeL2:  eth.L2BlockRef{Number: 101},
+			},
+			prevCurrentL1: eth.BlockRef{Number: 1},
+			blocks:        queue.Queue[*types.Block]{block101},
+			channels:      []channelStatuser{},
+			expected: syncActions{
+				blocksToPrune: 1,
+			},
+			expectedLogs: happyCaseLogs,
 		},
 	}
 
-	for _, tc := range testCases {
+	for _, tc := range testCases[len(testCases)-1:] {
 
 		t.Run(tc.name, func(t *testing.T) {
 			l, h := testlog.CaptureLogger(t, log.LevelDebug)
@@ -237,11 +286,15 @@ func TestBatchSubmitter_computeSyncActions(t *testing.T) {
 				tc.newSyncStatus, tc.prevCurrentL1, tc.blocks, tc.channels, l,
 			)
 
-			require.Equal(t, tc.expected, result)
+			require.Equal(t, tc.expected, result, "unexpected actions")
 			require.Equal(t, tc.expectedSeqOutOfSync, outOfSync)
-			for _, e := range tc.expectedLogs {
-				r := h.FindLog(testlog.NewMessageContainsFilter(e))
-				require.NotNil(t, r, "could not find log message containing '%s'", e)
+			if tc.expectedLogs == nil {
+				require.Empty(t, h.Logs, "expected no logs but found some", "logs", h.Logs)
+			} else {
+				for _, e := range tc.expectedLogs {
+					r := h.FindLog(testlog.NewMessageContainsFilter(e))
+					require.NotNil(t, r, "could not find log message containing '%s'", e)
+				}
 			}
 		})
 	}

From b6131611bc29bfdb7a3984938e14e7ce8a1b80ef Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Mon, 9 Dec 2024 09:20:38 -0600
Subject: [PATCH 415/451] supervisor: L1 Processor (#13206)

* supervisor: L1 Processor

* comments ; test fixes

* Make L1 source separate from RPC Addr

* fix test

* Add atomic bool for singleton processor routine
---
 op-e2e/interop/supersystem.go                 |   6 +-
 op-supervisor/cmd/main_test.go                |   4 +-
 op-supervisor/config/config.go                |   5 +-
 op-supervisor/config/config_test.go           |   2 +-
 op-supervisor/flags/flags.go                  |   7 +
 op-supervisor/supervisor/backend/backend.go   |  54 ++++++++
 .../supervisor/backend/backend_test.go        |   2 +
 op-supervisor/supervisor/backend/db/query.go  |  26 ++++
 op-supervisor/supervisor/backend/db/update.go |  38 ++++++
 .../backend/processors/l1_processor.go        | 127 ++++++++++++++++++
 .../backend/processors/l1_processor_test.go   | 107 +++++++++++++++
 11 files changed, 373 insertions(+), 5 deletions(-)
 create mode 100644 op-supervisor/supervisor/backend/processors/l1_processor.go
 create mode 100644 op-supervisor/supervisor/backend/processors/l1_processor_test.go

diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index 8fc663f377a0..158f5d61ec7f 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -480,6 +480,7 @@ func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 			EnableAdmin: true,
 		},
 		L2RPCs:  []string{},
+		L1RPC:   s.l1.UserRPC().RPC(),
 		Datadir: path.Join(s.t.TempDir(), "supervisor"),
 	}
 	depSet := make(map[supervisortypes.ChainID]*depset.StaticConfigDependency)
@@ -536,10 +537,11 @@ func (s *interopE2ESystem) prepare(t *testing.T, w worldResourcePaths) {
 	s.hdWallet = s.prepareHDWallet()
 	s.worldDeployment, s.worldOutput = s.prepareWorld(w)
 
-	// the supervisor and client are created first so that the L2s can use the supervisor
+	// L1 first so that the Supervisor and L2s can connect to it
+	s.beacon, s.l1 = s.prepareL1()
+
 	s.supervisor = s.prepareSupervisor()
 
-	s.beacon, s.l1 = s.prepareL1()
 	s.l2s = s.prepareL2s()
 
 	s.prepareContracts()
diff --git a/op-supervisor/cmd/main_test.go b/op-supervisor/cmd/main_test.go
index c61b6f3cb1ca..06fcf78440dd 100644
--- a/op-supervisor/cmd/main_test.go
+++ b/op-supervisor/cmd/main_test.go
@@ -16,6 +16,7 @@ import (
 )
 
 var (
+	ValidL1RPC   = "http://localhost:8545"
 	ValidL2RPCs  = []string{"http;//localhost:8545"}
 	ValidDatadir = "./supervisor_test_datadir"
 )
@@ -38,7 +39,7 @@ func TestLogLevel(t *testing.T) {
 func TestDefaultCLIOptionsMatchDefaultConfig(t *testing.T) {
 	cfg := configForArgs(t, addRequiredArgs())
 	depSet := &depset.JsonDependencySetLoader{Path: "test"}
-	defaultCfgTempl := config.NewConfig(ValidL2RPCs, depSet, ValidDatadir)
+	defaultCfgTempl := config.NewConfig(ValidL1RPC, ValidL2RPCs, depSet, ValidDatadir)
 	defaultCfg := *defaultCfgTempl
 	defaultCfg.Version = Version
 	require.Equal(t, defaultCfg, *cfg)
@@ -125,6 +126,7 @@ func toArgList(req map[string]string) []string {
 
 func requiredArgs() map[string]string {
 	args := map[string]string{
+		"--l1-rpc":         ValidL1RPC,
 		"--l2-rpcs":        ValidL2RPCs[0],
 		"--dependency-set": "test",
 		"--datadir":        ValidDatadir,
diff --git a/op-supervisor/config/config.go b/op-supervisor/config/config.go
index b06d0592593b..9d733207eaf4 100644
--- a/op-supervisor/config/config.go
+++ b/op-supervisor/config/config.go
@@ -33,6 +33,8 @@ type Config struct {
 	// requiring manual triggers for the backend to process anything.
 	SynchronousProcessors bool
 
+	L1RPC string
+
 	L2RPCs  []string
 	Datadir string
 }
@@ -56,7 +58,7 @@ func (c *Config) Check() error {
 
 // NewConfig creates a new config using default values whenever possible.
 // Required options with no suitable default are passed as parameters.
-func NewConfig(l2RPCs []string, depSet depset.DependencySetSource, datadir string) *Config {
+func NewConfig(l1RPC string, l2RPCs []string, depSet depset.DependencySetSource, datadir string) *Config {
 	return &Config{
 		LogConfig:           oplog.DefaultCLIConfig(),
 		MetricsConfig:       opmetrics.DefaultCLIConfig(),
@@ -64,6 +66,7 @@ func NewConfig(l2RPCs []string, depSet depset.DependencySetSource, datadir strin
 		RPC:                 oprpc.DefaultCLIConfig(),
 		DependencySetSource: depSet,
 		MockRun:             false,
+		L1RPC:               l1RPC,
 		L2RPCs:              l2RPCs,
 		Datadir:             datadir,
 	}
diff --git a/op-supervisor/config/config_test.go b/op-supervisor/config/config_test.go
index 0d354ca134a5..1e2f6f40c004 100644
--- a/op-supervisor/config/config_test.go
+++ b/op-supervisor/config/config_test.go
@@ -67,5 +67,5 @@ func validConfig() *Config {
 		panic(err)
 	}
 	// Should be valid using only the required arguments passed in via the constructor.
-	return NewConfig([]string{"http://localhost:8545"}, depSet, "./supervisor_testdir")
+	return NewConfig("http://localhost:8545", []string{"http://localhost:8545"}, depSet, "./supervisor_testdir")
 }
diff --git a/op-supervisor/flags/flags.go b/op-supervisor/flags/flags.go
index 9b49823f304a..d12695010a3c 100644
--- a/op-supervisor/flags/flags.go
+++ b/op-supervisor/flags/flags.go
@@ -21,6 +21,11 @@ func prefixEnvVars(name string) []string {
 }
 
 var (
+	L1RPCFlag = &cli.StringFlag{
+		Name:    "l1-rpc",
+		Usage:   "L1 RPC source.",
+		EnvVars: prefixEnvVars("L1_RPC"),
+	}
 	L2RPCsFlag = &cli.StringSliceFlag{
 		Name:    "l2-rpcs",
 		Usage:   "L2 RPC sources.",
@@ -46,6 +51,7 @@ var (
 )
 
 var requiredFlags = []cli.Flag{
+	L1RPCFlag,
 	L2RPCsFlag,
 	DataDirFlag,
 	DependencySetFlag,
@@ -86,6 +92,7 @@ func ConfigFromCLI(ctx *cli.Context, version string) *config.Config {
 		RPC:                 oprpc.ReadCLIConfig(ctx),
 		DependencySetSource: &depset.JsonDependencySetLoader{Path: ctx.Path(DependencySetFlag.Name)},
 		MockRun:             ctx.Bool(MockRunFlag.Name),
+		L1RPC:               ctx.String(L1RPCFlag.Name),
 		L2RPCs:              ctx.StringSlice(L2RPCsFlag.Name),
 		Datadir:             ctx.Path(DataDirFlag.Name),
 	}
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 7d368cb40f15..722cabcf3eba 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -36,6 +36,9 @@ type SupervisorBackend struct {
 	// chainDBs holds on to the DB indices for each chain
 	chainDBs *db.ChainsDB
 
+	// l1Processor watches for new L1 blocks, updates the local-safe DB, and kicks off derivation orchestration
+	l1Processor *processors.L1Processor
+
 	// chainProcessors are notified of new unsafe blocks, and add the unsafe log events data into the events DB
 	chainProcessors locks.RWMap[types.ChainID, *processors.ChainProcessor]
 
@@ -125,6 +128,14 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 		su.chainProcessors.Set(chainID, chainProcessor)
 	}
 
+	if cfg.L1RPC != "" {
+		if err := su.attachL1RPC(ctx, cfg.L1RPC); err != nil {
+			return fmt.Errorf("failed to create L1 processor: %w", err)
+		}
+	} else {
+		su.logger.Warn("No L1 RPC configured, L1 processor will not be started")
+	}
+
 	// the config has some RPC connections to attach to the chain-processors
 	for _, rpc := range cfg.L2RPCs {
 		err := su.attachRPC(ctx, rpc)
@@ -230,6 +241,38 @@ func (su *SupervisorBackend) AttachProcessorSource(chainID types.ChainID, src pr
 	return nil
 }
 
+func (su *SupervisorBackend) attachL1RPC(ctx context.Context, l1RPCAddr string) error {
+	su.logger.Info("attaching L1 RPC to L1 processor", "rpc", l1RPCAddr)
+
+	logger := su.logger.New("l1-rpc", l1RPCAddr)
+	l1RPC, err := client.NewRPC(ctx, logger, l1RPCAddr)
+	if err != nil {
+		return fmt.Errorf("failed to setup L1 RPC: %w", err)
+	}
+	l1Client, err := sources.NewL1Client(
+		l1RPC,
+		su.logger,
+		nil,
+		// placeholder config for the L1
+		sources.L1ClientSimpleConfig(true, sources.RPCKindBasic, 100))
+	if err != nil {
+		return fmt.Errorf("failed to setup L1 Client: %w", err)
+	}
+	su.AttachL1Source(l1Client)
+	return nil
+}
+
+// attachL1Source attaches an L1 source to the L1 processor.
+// If the L1 processor does not exist, it is created and started.
+func (su *SupervisorBackend) AttachL1Source(source processors.L1Source) {
+	if su.l1Processor == nil {
+		su.l1Processor = processors.NewL1Processor(su.logger, su.chainDBs, source)
+		su.l1Processor.Start()
+	} else {
+		su.l1Processor.AttachClient(source)
+	}
+}
+
 func clientForL2(ctx context.Context, logger log.Logger, rpc string) (client.RPC, types.ChainID, error) {
 	ethClient, err := dial.DialEthClientWithTimeout(ctx, 10*time.Second, logger, rpc)
 	if err != nil {
@@ -254,6 +297,11 @@ func (su *SupervisorBackend) Start(ctx context.Context) error {
 		return fmt.Errorf("failed to resume chains db: %w", err)
 	}
 
+	// start the L1 processor if it exists
+	if su.l1Processor != nil {
+		su.l1Processor.Start()
+	}
+
 	if !su.synchronousProcessors {
 		// Make all the chain-processors run automatic background processing
 		su.chainProcessors.Range(func(_ types.ChainID, processor *processors.ChainProcessor) bool {
@@ -278,6 +326,12 @@ func (su *SupervisorBackend) Stop(ctx context.Context) error {
 		return errAlreadyStopped
 	}
 	su.logger.Info("Closing supervisor backend")
+
+	// stop the L1 processor
+	if su.l1Processor != nil {
+		su.l1Processor.Stop()
+	}
+
 	// close all processors
 	su.chainProcessors.Range(func(id types.ChainID, processor *processors.ChainProcessor) bool {
 		su.logger.Info("stopping chain processor", "chainID", id)
diff --git a/op-supervisor/supervisor/backend/backend_test.go b/op-supervisor/supervisor/backend/backend_test.go
index c104bf0bae5d..a8fc4de438e7 100644
--- a/op-supervisor/supervisor/backend/backend_test.go
+++ b/op-supervisor/supervisor/backend/backend_test.go
@@ -62,6 +62,7 @@ func TestBackendLifetime(t *testing.T) {
 	require.NoError(t, err)
 	t.Log("initialized!")
 
+	l1Src := &testutils.MockL1Source{}
 	src := &testutils.MockL1Source{}
 
 	blockX := eth.BlockRef{
@@ -77,6 +78,7 @@ func TestBackendLifetime(t *testing.T) {
 		Time:       blockX.Time + 2,
 	}
 
+	b.AttachL1Source(l1Src)
 	require.NoError(t, b.AttachProcessorSource(chainA, src))
 
 	require.FileExists(t, filepath.Join(cfg.Datadir, "900", "log.db"), "must have logs DB 900")
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index bbee01d71b4d..5897ff3c9242 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -30,6 +30,32 @@ func (db *ChainsDB) LatestBlockNum(chain types.ChainID) (num uint64, ok bool) {
 	return logDB.LatestSealedBlockNum()
 }
 
+// LastCommonL1 returns the latest common L1 block between all chains in the database.
+// it only considers block numbers, not hash. That's because the L1 source is the same for all chains
+// this data can be used to determine the starting point for L1 processing
+func (db *ChainsDB) LastCommonL1() (types.BlockSeal, error) {
+	common := types.BlockSeal{}
+	for _, chain := range db.depSet.Chains() {
+		ldb, ok := db.localDBs.Get(chain)
+		if !ok {
+			return types.BlockSeal{}, types.ErrUnknownChain
+		}
+		_, derivedFrom, err := ldb.Latest()
+		if err != nil {
+			return types.BlockSeal{}, fmt.Errorf("failed to determine Last Common L1: %w", err)
+		}
+		common = derivedFrom
+		// if the common block isn't yet set,
+		// or if the new common block is older than the current common block
+		// set the common block
+		if common == (types.BlockSeal{}) ||
+			derivedFrom.Number < common.Number {
+			common = derivedFrom
+		}
+	}
+	return common, nil
+}
+
 func (db *ChainsDB) IsCrossUnsafe(chainID types.ChainID, block eth.BlockID) error {
 	v, ok := db.crossUnsafe.Get(chainID)
 	if !ok {
diff --git a/op-supervisor/supervisor/backend/db/update.go b/op-supervisor/supervisor/backend/db/update.go
index 7ae7fde58a8b..92c78b408a38 100644
--- a/op-supervisor/supervisor/backend/db/update.go
+++ b/op-supervisor/supervisor/backend/db/update.go
@@ -1,6 +1,7 @@
 package db
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -86,3 +87,40 @@ func (db *ChainsDB) UpdateFinalizedL1(finalized eth.BlockRef) error {
 	db.logger.Info("Updated finalized L1", "finalizedL1", finalized)
 	return nil
 }
+
+// RecordNewL1 records a new L1 block in the database.
+// it uses the latest derived L2 block as the derived block for the new L1 block.
+func (db *ChainsDB) RecordNewL1(ref eth.BlockRef) error {
+	for _, chain := range db.depSet.Chains() {
+		// get local derivation database
+		ldb, ok := db.localDBs.Get(chain)
+		if !ok {
+			return fmt.Errorf("cannot RecordNewL1 to chain %s: %w", chain, types.ErrUnknownChain)
+		}
+		// get the latest derived and derivedFrom blocks
+		derivedFrom, derived, err := ldb.Latest()
+		if err != nil {
+			return fmt.Errorf("failed to get latest derivedFrom for chain %s: %w", chain, err)
+		}
+		// make a ref from the latest derived block
+		derivedParent, err := ldb.PreviousDerived(derived.ID())
+		if errors.Is(err, types.ErrFuture) {
+			db.logger.Warn("Empty DB, Recording first L1 block", "chain", chain, "err", err)
+		} else if err != nil {
+			db.logger.Warn("Failed to get latest derivedfrom to insert new L1 block", "chain", chain, "err", err)
+			return err
+		}
+		derivedRef := derived.MustWithParent(derivedParent.ID())
+		// don't push the new L1 block if it's not newer than the latest derived block
+		if derivedFrom.Number >= ref.Number {
+			db.logger.Warn("L1 block has already been processed for this height", "chain", chain, "block", ref, "latest", derivedFrom)
+			continue
+		}
+		// the database is extended with the new L1 and the existing L2
+		if err = db.UpdateLocalSafe(chain, ref, derivedRef); err != nil {
+			db.logger.Error("Failed to update local safe", "chain", chain, "block", ref, "derived", derived, "err", err)
+			return err
+		}
+	}
+	return nil
+}
diff --git a/op-supervisor/supervisor/backend/processors/l1_processor.go b/op-supervisor/supervisor/backend/processors/l1_processor.go
new file mode 100644
index 000000000000..063acd056e0a
--- /dev/null
+++ b/op-supervisor/supervisor/backend/processors/l1_processor.go
@@ -0,0 +1,127 @@
+package processors
+
+import (
+	"context"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+type chainsDB interface {
+	RecordNewL1(ref eth.BlockRef) error
+	LastCommonL1() (types.BlockSeal, error)
+}
+
+type L1Source interface {
+	L1BlockRefByNumber(ctx context.Context, number uint64) (eth.L1BlockRef, error)
+}
+
+type L1Processor struct {
+	log      log.Logger
+	client   L1Source
+	clientMu sync.Mutex
+	running  atomic.Bool
+
+	currentNumber uint64
+	tickDuration  time.Duration
+
+	db chainsDB
+
+	ctx    context.Context
+	cancel context.CancelFunc
+	wg     sync.WaitGroup
+}
+
+func NewL1Processor(log log.Logger, cdb chainsDB, client L1Source) *L1Processor {
+	ctx, cancel := context.WithCancel(context.Background())
+	return &L1Processor{
+		client:       client,
+		db:           cdb,
+		log:          log.New("service", "l1-processor"),
+		tickDuration: 6 * time.Second,
+		ctx:          ctx,
+		cancel:       cancel,
+	}
+}
+
+func (p *L1Processor) AttachClient(client L1Source) {
+	p.clientMu.Lock()
+	defer p.clientMu.Unlock()
+	p.client = client
+}
+
+func (p *L1Processor) Start() {
+	// if already running, do nothing
+	if p.running.Load() {
+		return
+	}
+	p.running.Store(true)
+	p.currentNumber = 0
+	// if there is an issue getting the last common L1, default to starting from 0
+	// consider making this a fatal error in the future once initialization is more robust
+	if lastL1, err := p.db.LastCommonL1(); err == nil {
+		p.currentNumber = lastL1.Number
+	}
+	p.wg.Add(1)
+	go p.worker()
+}
+
+func (p *L1Processor) Stop() {
+	// if not running, do nothing
+	if !p.running.Load() {
+		return
+	}
+	p.cancel()
+	p.wg.Wait()
+	p.running.Store(false)
+}
+
+// worker runs a loop that checks for new L1 blocks at a regular interval
+func (p *L1Processor) worker() {
+	defer p.wg.Done()
+	delay := time.NewTicker(p.tickDuration)
+	for {
+		select {
+		case <-p.ctx.Done():
+			return
+		case <-delay.C:
+			p.log.Debug("Checking for new L1 block", "current", p.currentNumber)
+			err := p.work()
+			if err != nil {
+				p.log.Warn("Failed to process L1", "err", err)
+			}
+		}
+	}
+}
+
+// work checks for a new L1 block and processes it if found
+// the starting point is set when Start is called, and blocks are processed searched incrementally
+// if a new block is found, it is recorded in the database and the target number is updated
+// in the future it will also kick of derivation management for the sync nodes
+func (p *L1Processor) work() error {
+	p.clientMu.Lock()
+	defer p.clientMu.Unlock()
+	nextNumber := p.currentNumber + 1
+	ref, err := p.client.L1BlockRefByNumber(p.ctx, nextNumber)
+	if err != nil {
+		return err
+	}
+	// record the new L1 block
+	p.log.Debug("Processing new L1 block", "block", ref)
+	err = p.db.RecordNewL1(ref)
+	if err != nil {
+		return err
+	}
+
+	// go drive derivation on this new L1 input
+	// only possible once bidirectional RPC and new derivers are in place
+	// could do this as a function callback to a more appropriate driver
+
+	// update the target number
+	p.currentNumber = nextNumber
+	return nil
+}
diff --git a/op-supervisor/supervisor/backend/processors/l1_processor_test.go b/op-supervisor/supervisor/backend/processors/l1_processor_test.go
new file mode 100644
index 000000000000..143ebb66b74e
--- /dev/null
+++ b/op-supervisor/supervisor/backend/processors/l1_processor_test.go
@@ -0,0 +1,107 @@
+package processors
+
+import (
+	"context"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+type mockChainsDB struct {
+	recordNewL1Fn  func(ref eth.BlockRef) error
+	lastCommonL1Fn func() (types.BlockSeal, error)
+}
+
+func (m *mockChainsDB) RecordNewL1(ref eth.BlockRef) error {
+	if m.recordNewL1Fn != nil {
+		return m.recordNewL1Fn(ref)
+	}
+	return nil
+}
+
+func (m *mockChainsDB) LastCommonL1() (types.BlockSeal, error) {
+	if m.lastCommonL1Fn != nil {
+		return m.lastCommonL1Fn()
+	}
+	return types.BlockSeal{}, nil
+}
+
+type mockL1BlockRefByNumberFetcher struct {
+	l1BlockByNumberFn func() (eth.L1BlockRef, error)
+}
+
+func (m *mockL1BlockRefByNumberFetcher) L1BlockRefByNumber(context.Context, uint64) (eth.L1BlockRef, error) {
+	if m.l1BlockByNumberFn != nil {
+		return m.l1BlockByNumberFn()
+	}
+	return eth.L1BlockRef{}, nil
+}
+
+func TestL1Processor(t *testing.T) {
+	processorForTesting := func() *L1Processor {
+		ctx, cancel := context.WithCancel(context.Background())
+		proc := &L1Processor{
+			log:           testlog.Logger(t, log.LvlInfo),
+			client:        &mockL1BlockRefByNumberFetcher{},
+			currentNumber: 0,
+			tickDuration:  1 * time.Second,
+			db:            &mockChainsDB{},
+			ctx:           ctx,
+			cancel:        cancel,
+		}
+		return proc
+	}
+	t.Run("Initializes LastCommonL1", func(t *testing.T) {
+		proc := processorForTesting()
+		proc.db.(*mockChainsDB).lastCommonL1Fn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 10}, nil
+		}
+		// before starting, the current number should be 0
+		require.Equal(t, uint64(0), proc.currentNumber)
+		proc.Start()
+		defer proc.Stop()
+		// after starting, the current number should still be 0
+		require.Equal(t, uint64(10), proc.currentNumber)
+	})
+	t.Run("Initializes LastCommonL1 at 0 if error", func(t *testing.T) {
+		proc := processorForTesting()
+		proc.db.(*mockChainsDB).lastCommonL1Fn = func() (types.BlockSeal, error) {
+			return types.BlockSeal{Number: 10}, fmt.Errorf("error")
+		}
+		// before starting, the current number should be 0
+		require.Equal(t, uint64(0), proc.currentNumber)
+		proc.Start()
+		defer proc.Stop()
+		// the error means the current number should still be 0
+		require.Equal(t, uint64(0), proc.currentNumber)
+	})
+	t.Run("Records new L1", func(t *testing.T) {
+		proc := processorForTesting()
+		// return a new block number each time
+		num := uint64(0)
+		proc.client.(*mockL1BlockRefByNumberFetcher).l1BlockByNumberFn = func() (eth.L1BlockRef, error) {
+			defer func() { num++ }()
+			return eth.L1BlockRef{Number: num}, nil
+		}
+		// confirm that recordNewL1 is called for each block number received
+		called := uint64(0)
+		proc.db.(*mockChainsDB).recordNewL1Fn = func(ref eth.BlockRef) error {
+			require.Equal(t, called, ref.Number)
+			called++
+			return nil
+		}
+		proc.Start()
+		defer proc.Stop()
+		require.Eventually(t, func() bool {
+			return called >= 1 && proc.currentNumber >= 1
+		}, 10*time.Second, 100*time.Millisecond)
+
+	})
+
+}

From a47441c8995e1b02fcddbbe558c65be3763a8a7f Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Mon, 9 Dec 2024 23:35:36 +0800
Subject: [PATCH 416/451] cannon: add `RegSP` constant (#13316)

* add RegSP constant

* address comments

* fix natspec

* update semver-lock
---
 cannon/mipsevm/exec/mips_syscalls.go              | 15 ++++++++-------
 cannon/mipsevm/multithreaded/mips.go              |  7 ++++---
 cannon/mipsevm/program/patch.go                   |  3 ++-
 .../{exec => register}/calling_convention.go      |  4 +++-
 cannon/mipsevm/tests/evm_multithreaded_test.go    |  7 ++++---
 .../mipsevm/tests/fuzz_evm_multithreaded_test.go  |  7 ++++---
 .../contracts-bedrock/snapshots/semver-lock.json  |  4 ++--
 packages/contracts-bedrock/src/cannon/MIPS2.sol   | 10 +++++-----
 .../src/cannon/libraries/MIPSSyscalls.sol         |  1 +
 9 files changed, 33 insertions(+), 25 deletions(-)
 rename cannon/mipsevm/{exec => register}/calling_convention.go (92%)

diff --git a/cannon/mipsevm/exec/mips_syscalls.go b/cannon/mipsevm/exec/mips_syscalls.go
index 6387a2a2b91f..8b06c3e2a2d8 100644
--- a/cannon/mipsevm/exec/mips_syscalls.go
+++ b/cannon/mipsevm/exec/mips_syscalls.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 )
 
 type Word = arch.Word
@@ -99,12 +100,12 @@ const (
 )
 
 func GetSyscallArgs(registers *[32]Word) (syscallNum, a0, a1, a2, a3 Word) {
-	syscallNum = registers[RegSyscallNum] // v0
+	syscallNum = registers[register.RegSyscallNum] // v0
 
-	a0 = registers[RegSyscallParam1]
-	a1 = registers[RegSyscallParam2]
-	a2 = registers[RegSyscallParam3]
-	a3 = registers[RegSyscallParam4]
+	a0 = registers[register.RegSyscallParam1]
+	a1 = registers[register.RegSyscallParam2]
+	a2 = registers[register.RegSyscallParam3]
+	a3 = registers[register.RegSyscallParam4]
 
 	return syscallNum, a0, a1, a2, a3
 }
@@ -281,8 +282,8 @@ func HandleSysFcntl(a0, a1 Word) (v0, v1 Word) {
 }
 
 func HandleSyscallUpdates(cpu *mipsevm.CpuScalars, registers *[32]Word, v0, v1 Word) {
-	registers[RegSyscallRet1] = v0
-	registers[RegSyscallErrno] = v1
+	registers[register.RegSyscallRet1] = v0
+	registers[register.RegSyscallErrno] = v1
 
 	cpu.PC = cpu.NextPC
 	cpu.NextPC = cpu.NextPC + 4
diff --git a/cannon/mipsevm/multithreaded/mips.go b/cannon/mipsevm/multithreaded/mips.go
index b537953a31e6..8800c4f7aa62 100644
--- a/cannon/mipsevm/multithreaded/mips.go
+++ b/cannon/mipsevm/multithreaded/mips.go
@@ -12,6 +12,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/program"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 )
 
 type Word = arch.Word
@@ -57,10 +58,10 @@ func (m *InstrumentedState) handleSyscall() error {
 			Registers: thread.Registers,
 		}
 
-		newThread.Registers[29] = a1
+		newThread.Registers[register.RegSP] = a1
 		// the child will perceive a 0 value as returned value instead, and no error
-		newThread.Registers[exec.RegSyscallRet1] = 0
-		newThread.Registers[exec.RegSyscallErrno] = 0
+		newThread.Registers[register.RegSyscallRet1] = 0
+		newThread.Registers[register.RegSyscallErrno] = 0
 		m.state.NextThreadId++
 
 		// Preempt this thread for the new one. But not before updating PCs
diff --git a/cannon/mipsevm/program/patch.go b/cannon/mipsevm/program/patch.go
index 603bb41086ac..7f7c72f4939e 100644
--- a/cannon/mipsevm/program/patch.go
+++ b/cannon/mipsevm/program/patch.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/memory"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 )
 
 const WordSizeBytes = arch.WordSizeBytes
@@ -63,7 +64,7 @@ func PatchStack(st mipsevm.FPVMState) error {
 	if err := st.GetMemory().SetMemoryRange(sp-4*memory.PageSize, bytes.NewReader(make([]byte, 5*memory.PageSize))); err != nil {
 		return errors.New("failed to allocate page for stack content")
 	}
-	st.GetRegistersRef()[29] = sp
+	st.GetRegistersRef()[register.RegSP] = sp
 
 	storeMem := func(addr Word, v Word) {
 		var dat [WordSizeBytes]byte
diff --git a/cannon/mipsevm/exec/calling_convention.go b/cannon/mipsevm/register/calling_convention.go
similarity index 92%
rename from cannon/mipsevm/exec/calling_convention.go
rename to cannon/mipsevm/register/calling_convention.go
index 8cbb963a9649..37a7931c4c87 100644
--- a/cannon/mipsevm/exec/calling_convention.go
+++ b/cannon/mipsevm/register/calling_convention.go
@@ -1,4 +1,4 @@
-package exec
+package register
 
 // FYI: https://en.wikibooks.org/wiki/MIPS_Assembly/Register_File
 //
@@ -12,6 +12,8 @@ const (
 	RegA2 = 6
 	// 4th syscall argument; set to 0/1 for success/error
 	RegA3 = 7
+	// Stack pointer
+	RegSP = 29
 )
 
 // FYI: https://web.archive.org/web/20231223163047/https://www.linux-mips.org/wiki/Syscall
diff --git a/cannon/mipsevm/tests/evm_multithreaded_test.go b/cannon/mipsevm/tests/evm_multithreaded_test.go
index 1353932dd71f..02cce0addf22 100644
--- a/cannon/mipsevm/tests/evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/evm_multithreaded_test.go
@@ -17,6 +17,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
 	mttestutil "github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded/testutil"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
@@ -327,9 +328,9 @@ func TestEVM_SysClone_Successful(t *testing.T) {
 			expectedNewThread.PC = state.GetCpu().NextPC
 			expectedNewThread.NextPC = state.GetCpu().NextPC + 4
 			expectedNewThread.ThreadId = 1
-			expectedNewThread.Registers[2] = 0
-			expectedNewThread.Registers[7] = 0
-			expectedNewThread.Registers[29] = stackPtr
+			expectedNewThread.Registers[register.RegSyscallRet1] = 0
+			expectedNewThread.Registers[register.RegSyscallErrno] = 0
+			expectedNewThread.Registers[register.RegSP] = stackPtr
 
 			var err error
 			var stepWitness *mipsevm.StepWitness
diff --git a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
index 49f45a4a5f2c..20a628f4e34e 100644
--- a/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
+++ b/cannon/mipsevm/tests/fuzz_evm_multithreaded_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded"
 	mttestutil "github.com/ethereum-optimism/optimism/cannon/mipsevm/multithreaded/testutil"
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm/register"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/testutil"
 )
 
@@ -46,9 +47,9 @@ func FuzzStateSyscallCloneMT(f *testing.F) {
 		epxectedNewThread := expected.ExpectNewThread()
 		epxectedNewThread.PC = state.GetCpu().NextPC
 		epxectedNewThread.NextPC = state.GetCpu().NextPC + 4
-		epxectedNewThread.Registers[2] = 0
-		epxectedNewThread.Registers[7] = 0
-		epxectedNewThread.Registers[29] = stackPtr
+		epxectedNewThread.Registers[register.RegSyscallNum] = 0
+		epxectedNewThread.Registers[register.RegSyscallErrno] = 0
+		epxectedNewThread.Registers[register.RegSP] = stackPtr
 		expected.NextThreadId = nextThreadId + 1
 		expected.StepsSinceLastContextSwitch = 0
 		if state.TraverseRight {
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index dcfdaeb982fa..332d30d23b4a 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -140,8 +140,8 @@
     "sourceCodeHash": "0x6c45dd23cb0d6f9bf4f84855ad0caf70e53dee3fe6c41454f7bf8df52ec3a9af"
   },
   "src/cannon/MIPS2.sol": {
-    "initCodeHash": "0x7476695bb101cb45213793291124e3ec41e13a02d291837b76d8a35bfc8ec2c1",
-    "sourceCodeHash": "0xeaceb5d28bd58fca6a234d9291ca01424bf83576d191ee3046272bc4987d0b29"
+    "initCodeHash": "0x4971f62a6aecf91bd795fa44b5ce3cb77a987719af4f351d4aec5b6c3bf81387",
+    "sourceCodeHash": "0x8da8be0b7d60af0eb11bd58653f1854d56a8f0616f3aeaeba7ab9ec340d02ac7"
   },
   "src/cannon/MIPS64.sol": {
     "initCodeHash": "0x6516160f35a85abb65d8102fa71f03cb57518787f9af85bc951f27ee60e6bb8f",
diff --git a/packages/contracts-bedrock/src/cannon/MIPS2.sol b/packages/contracts-bedrock/src/cannon/MIPS2.sol
index e2af829be6e9..56024171dacf 100644
--- a/packages/contracts-bedrock/src/cannon/MIPS2.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS2.sol
@@ -63,8 +63,8 @@ contract MIPS2 is ISemver {
     }
 
     /// @notice The semantic version of the MIPS2 contract.
-    /// @custom:semver 1.0.0-beta.25
-    string public constant version = "1.0.0-beta.25";
+    /// @custom:semver 1.0.0-beta.26
+    string public constant version = "1.0.0-beta.26";
 
     /// @notice The preimage oracle contract.
     IPreimageOracle internal immutable ORACLE;
@@ -428,10 +428,10 @@ contract MIPS2 is ISemver {
                 for (uint256 i; i < 32; i++) {
                     newThread.registers[i] = thread.registers[i];
                 }
-                newThread.registers[29] = a1; // set stack pointer
+                newThread.registers[sys.REG_SP] = a1; // set stack pointer
                 // the child will perceive a 0 value as returned value instead, and no error
-                newThread.registers[2] = 0;
-                newThread.registers[7] = 0;
+                newThread.registers[sys.REG_SYSCALL_RET1] = 0;
+                newThread.registers[sys.REG_SYSCALL_ERRNO] = 0;
                 state.nextThreadID++;
 
                 // Preempt this thread for the new one. But not before updating PCs
diff --git a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
index 8fa62dbbad78..e273c54d6543 100644
--- a/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
+++ b/packages/contracts-bedrock/src/cannon/libraries/MIPSSyscalls.sol
@@ -156,6 +156,7 @@ library MIPSSyscalls {
     uint32 internal constant REG_A1 = 5;
     uint32 internal constant REG_A2 = 6;
     uint32 internal constant REG_A3 = 7;
+    uint32 internal constant REG_SP = 29;
 
     // FYI: https://web.archive.org/web/20231223163047/https://www.linux-mips.org/wiki/Syscall
     uint32 internal constant REG_SYSCALL_NUM = REG_V0;

From c8d8d7b6ac9da6036880152bad3462d9b4f7b7e1 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 9 Dec 2024 13:42:49 -0700
Subject: [PATCH 417/451] feat/upgrade forge (#13305)

* Revert "maint: bump forge version (#13301)"

This reverts commit a2e7d852a8a16e526564401c41abad56173790d3.

* Reapply "maint: bump forge version (#13301)"

This reverts commit 048f0742eaa338e54105ab23a919af8a22f13e0a.

* Rebuild all on mise.toml

* fix: verify mise dependencies if necessary

---------

Co-authored-by: Kelvin Fichter <kelvinfichter@gmail.com>
---
 .circleci/config.yml      | 8 ++++++++
 ops/check-changed/main.py | 1 +
 2 files changed, 9 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ae5b5f78487..eacef9f4e23d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -129,6 +129,14 @@ commands:
             # of the -j parameter, which speeds it up a lot.
             git submodule update --init --recursive --force -j 8
           working_directory: packages/contracts-bedrock
+      - run:
+          name: Verify mise dependencies
+          command: |
+            if command -v mise &> /dev/null; then
+              mise install
+            else
+              echo "mise not found, skipping"
+            fi
 
   notify-failures-on-develop:
     description: "Notify Slack"
diff --git a/ops/check-changed/main.py b/ops/check-changed/main.py
index fbebff51da96..a1bd1ea187f4 100644
--- a/ops/check-changed/main.py
+++ b/ops/check-changed/main.py
@@ -11,6 +11,7 @@
     r'^\.github/\.*',
     r'^package\.json',
     r'ops/check-changed/.*',
+    r'^mise.toml',
 ]
 
 GO_PATTERNS = [

From 70e71c238ee7cc64199e069075f31a2b85dc75df Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 9 Dec 2024 15:03:17 -0700
Subject: [PATCH 418/451] op-service: Fix failing SSZ fuzz test (#13324)

The SSZ fuzz tests were not erroring when the `edOffset` was 508 and the `txOffset` was 514. This is because the transaction unmarshaler was reading the number of transactions in the payload as zero, but not checking to see if there was additional data left over. This should never be the case for a valid payload.

To verify, I ran the fuzz suite for 5 minutes:

```
fuzz: elapsed: 5m1s, execs: 12910962 (42267/sec), new interesting: 9 (total: 41)
```
---
 op-service/eth/ssz.go      |  3 +++
 op-service/eth/ssz_test.go | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/op-service/eth/ssz.go b/op-service/eth/ssz.go
index ae3d89ec3614..a667ac4f68f5 100644
--- a/op-service/eth/ssz.go
+++ b/op-service/eth/ssz.go
@@ -412,6 +412,9 @@ func unmarshalTransactions(in []byte) (txs []Data, err error) {
 		return nil, fmt.Errorf("invalid first tx offset: %d, out of scope %d", firstTxOffset, scope)
 	}
 	txCount := firstTxOffset / 4
+	if txCount == 0 && scope > 0 {
+		return nil, fmt.Errorf("invalid first tx offset: %d, no transactions in scope %d", firstTxOffset, scope)
+	}
 	if txCount > maxTransactionsPerPayload {
 		return nil, fmt.Errorf("too many transactions: %d > %d", txCount, maxTransactionsPerPayload)
 	}
diff --git a/op-service/eth/ssz_test.go b/op-service/eth/ssz_test.go
index c08c5fa32040..389ac90c9078 100644
--- a/op-service/eth/ssz_test.go
+++ b/op-service/eth/ssz_test.go
@@ -258,7 +258,16 @@ func FuzzOBP01(f *testing.F) {
 	require.NoError(f, err)
 	data := buf.Bytes()
 
+	// Represents a weird txOffset that is long enough to seem valid,
+	// but actually doesn't allow transactions to be serialized.
+	f.Add(uint32(508), uint32(514))
+
 	f.Fuzz(func(t *testing.T, edOffset uint32, txOffset uint32) {
+		if edOffset == 508 && txOffset == 540 {
+			// These values are the correct serialization, so don't test them.
+			return
+		}
+
 		clone := make([]byte, len(data))
 		copy(clone, data)
 
@@ -268,7 +277,7 @@ func FuzzOBP01(f *testing.F) {
 		var unmarshalled ExecutionPayload
 		err = unmarshalled.UnmarshalSSZ(BlockV1, uint32(len(clone)), bytes.NewReader(clone))
 		if err == nil {
-			t.Fatalf("expected a failure, but didn't get one")
+			t.Fatalf("expected a failure, but didn't get one. ed: %d, tx: %d", edOffset, txOffset)
 		}
 	})
 }

From 2bdb81824619e338484f15d83a47e91c652bc06b Mon Sep 17 00:00:00 2001
From: ControlCplusControlV
 <44706811+ControlCplusControlV@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:16:11 -0700
Subject: [PATCH 419/451] open up anvil args (#13320)

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-service/testutils/anvil/anvil.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/op-service/testutils/anvil/anvil.go b/op-service/testutils/anvil/anvil.go
index 406d7d07c77e..fdfcf7c8601c 100644
--- a/op-service/testutils/anvil/anvil.go
+++ b/op-service/testutils/anvil/anvil.go
@@ -33,18 +33,21 @@ type Runner struct {
 }
 
 func New(l1RPCURL string, logger log.Logger) (*Runner, error) {
+	return NewWithOpts(l1RPCURL, "1000000000", logger)
+}
+
+func NewWithOpts(l1RPCURL string, baseFee string, logger log.Logger) (*Runner, error) {
 	if _, err := exec.LookPath("anvil"); err != nil {
 		return nil, fmt.Errorf("anvil not found in PATH: %w", err)
 	}
 
-	proc := exec.Command(
-		"anvil",
-		"--fork-url", l1RPCURL,
-		"--port",
-		"0",
-		"--base-fee",
-		"1000000000",
-	)
+	args := []string{"--port", "0", "--base-fee", baseFee}
+	if l1RPCURL != "" {
+		args = append([]string{"--fork-url", l1RPCURL}, args...)
+	}
+
+	proc := exec.Command("anvil", args...)
+
 	stdout, err := proc.StdoutPipe()
 	if err != nil {
 		return nil, err

From d1ccf72e9601d9ed1f12c3822a676dcb462d920e Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Mon, 9 Dec 2024 15:24:18 -0700
Subject: [PATCH 420/451] ci: Archive fuzz test data (#13321)

When fuzz tests fail they write data to the test directory. This PR archives the fuzz data to make future debugging easier.
---
 .circleci/config.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eacef9f4e23d..54420f0b4b1c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -801,8 +801,18 @@ jobs:
           if: ${{ uses_artifacts }}
       - run:
           name: Fuzz
-          command: make fuzz
+          command: |
+            make fuzz
           working_directory: "<<parameters.package_name>>"
+      - run:
+          name: Copy fuzz artifacts
+          command: |
+            mkdir -p fuzzdata
+            find ./<<parameters.package_name>> -type d -name "fuzz" -exec sh -c 'cp -r "{}"/* fuzzdata/ 2>/dev/null || true' \;
+          when: always
+      - store_artifacts:
+          path: ./fuzzdata
+          when: always
 
   go-lint:
     machine: true

From 34d5f66ade24bd1f3ce4ce7c0a6cfc1a6540eca1 Mon Sep 17 00:00:00 2001
From: Dmitry <98899785+mdqst@users.noreply.github.com>
Date: Tue, 10 Dec 2024 01:56:14 +0300
Subject: [PATCH 421/451] docs: fix typo Update README.md (#13310)

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
---
 op-supervisor/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-supervisor/README.md b/op-supervisor/README.md
index 20159aa4db1a..8e5468bdc439 100644
--- a/op-supervisor/README.md
+++ b/op-supervisor/README.md
@@ -290,7 +290,7 @@ such that a chain which does not take on new interop dependencies, can continue
 
 I.e. safety must be guaranteed at all times,
 but a minimal level of liveness can be maintained by holding off on cross-chain message acceptance
-while allowing regular single-chain functionaltiy to proceed.
+while allowing regular single-chain functionality to proceed.
 
 ## Testing
 

From 69cc5bd5f5bf555507a145fe3fd99b0b4c0a2e72 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Tue, 10 Dec 2024 15:16:02 +0800
Subject: [PATCH 422/451] fix RunStopAtPreimageLargerThanFlag (#13326)

---
 cannon/cmd/run.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cannon/cmd/run.go b/cannon/cmd/run.go
index 615e913f1e47..4ee67581244c 100644
--- a/cannon/cmd/run.go
+++ b/cannon/cmd/run.go
@@ -83,7 +83,7 @@ var (
 		Usage:    "stop at the first preimage request matching this type",
 		Required: false,
 	}
-	RunStopAtPreimageLargerThanFlag = &cli.StringFlag{
+	RunStopAtPreimageLargerThanFlag = &cli.IntFlag{
 		Name:     "stop-at-preimage-larger-than",
 		Usage:    "stop at the first step that requests a preimage larger than the specified size (in bytes)",
 		Required: false,

From 18665405c8ad55682bad41e71a04dc4c140dd534 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Tue, 10 Dec 2024 17:07:00 +0800
Subject: [PATCH 423/451] op-node/rollup/derive: enhance `TestBatchReader`
 (#13306)

* enhance TestBatchReader

* add more test

* address comments

* address comments

* remove extra comment
---
 op-node/rollup/derive/channel_test.go | 41 ++++++++++++++++++---------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/op-node/rollup/derive/channel_test.go b/op-node/rollup/derive/channel_test.go
index 034e847b5d34..32993b52199a 100644
--- a/op-node/rollup/derive/channel_test.go
+++ b/op-node/rollup/derive/channel_test.go
@@ -145,12 +145,20 @@ func TestFrameValidity(t *testing.T) {
 
 func TestBatchReader(t *testing.T) {
 	rng := rand.New(rand.NewSource(0x543331))
-	singularBatch := RandomSingularBatch(rng, 20, big.NewInt(333))
-	batchDataInput := NewBatchData(singularBatch)
+
+	batchCount := 3
+	batches := make([]*BatchData, batchCount)
+	for i := 0; i < batchCount; i++ {
+		singularBatch := RandomSingularBatch(rng, 20, big.NewInt(333))
+		batchDataInput := NewBatchData(singularBatch)
+		batches[i] = batchDataInput
+	}
 
 	encodedBatch := new(bytes.Buffer)
-	err := batchDataInput.EncodeRLP(encodedBatch)
-	require.NoError(t, err)
+	for _, batchData := range batches {
+		err := batchData.EncodeRLP(encodedBatch)
+		require.NoError(t, err)
+	}
 
 	const Zstd CompressionAlgo = "zstd" // invalid algo
 	compressor := func(ca CompressionAlgo) func(buf *bytes.Buffer, t *testing.T) {
@@ -253,17 +261,22 @@ func TestBatchReader(t *testing.T) {
 			}
 			require.NoError(t, err)
 
-			// read the batch data
-			batchData, err := reader()
-			require.NoError(t, err)
-			require.NotNil(t, batchData)
-			if tc.algo.IsBrotli() {
-				// special case because reader doesn't decode level
-				batchDataInput.ComprAlgo = Brotli
-			} else {
-				batchDataInput.ComprAlgo = tc.algo
+			for i := 0; i < batchCount; i++ {
+				batchData, err := reader()
+				require.NoError(t, err)
+				require.NotNil(t, batchData)
+				if tc.algo.IsBrotli() {
+					// special case because reader doesn't decode level
+					batches[i].ComprAlgo = Brotli
+				} else {
+					batches[i].ComprAlgo = tc.algo
+				}
+				require.Equal(t, batches[i], batchData)
 			}
-			require.Equal(t, batchDataInput, batchData)
+
+			// further read should error out
+			_, err = reader()
+			require.Error(t, err)
 		})
 	}
 }

From 370b77e5282011ab81b43513d190788a2829795f Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Tue, 10 Dec 2024 13:48:37 +0000
Subject: [PATCH 424/451] op-batcher: use `pendingBlocks()` for
 `s.metr.RecordL2BlocksAdded` (#13329)

* use pendingBlocks() for s.metr.RecordL2BlocksAdded

* use pendingBlocks when channel is opened
---
 op-batcher/batcher/channel_manager.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-batcher/batcher/channel_manager.go b/op-batcher/batcher/channel_manager.go
index b5cfc6ebc1bc..d394111396a0 100644
--- a/op-batcher/batcher/channel_manager.go
+++ b/op-batcher/batcher/channel_manager.go
@@ -328,7 +328,7 @@ func (s *channelManager) ensureChannelWithSpace(l1Head eth.BlockID) error {
 		"max_frame_size", cfg.MaxFrameSize,
 		"use_blobs", cfg.UseBlobs,
 	)
-	s.metr.RecordChannelOpened(pc.ID(), s.blocks.Len())
+	s.metr.RecordChannelOpened(pc.ID(), s.pendingBlocks())
 
 	return nil
 }
@@ -380,7 +380,7 @@ func (s *channelManager) processBlocks() error {
 
 	s.metr.RecordL2BlocksAdded(latestL2ref,
 		blocksAdded,
-		s.blocks.Len(),
+		s.pendingBlocks(),
 		s.currentChannel.InputBytes(),
 		s.currentChannel.ReadyBytes())
 	s.log.Debug("Added blocks to channel",

From e51c6e834163315ac72f218b2d1ba3bed82165a2 Mon Sep 17 00:00:00 2001
From: blaine <blainemalone01@gmail.com>
Date: Tue, 10 Dec 2024 10:20:33 -0500
Subject: [PATCH 425/451] Add clarity on how OPCM deals with salts (#13273)

* fix: clarity around how salts are made.

* fix: removed named return value.

* fix: semver lock updated.

* fix: pr comments.

* fix: adding natpsec to the new salt helper functions.

fix: adding natpsec to the new salt helper functions.

* fix: more details around why proxy salts include contract name.

* Update packages/contracts-bedrock/src/L1/OPContractsManager.sol

Co-authored-by: Matt Solomon <matt@mattsolomon.dev>

* Update packages/contracts-bedrock/src/L1/OPContractsManager.sol

Co-authored-by: Matt Solomon <matt@mattsolomon.dev>

* fix: only having one compute salt function

* fix: pre-pr ran

* Update packages/contracts-bedrock/src/L1/OPContractsManager.sol

Co-authored-by: Matt Solomon <matt@mattsolomon.dev>

* fix: fix pre-pr

---------

Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
---
 .../snapshots/semver-lock.json                |  4 +-
 .../src/L1/OPContractsManager.sol             | 59 +++++++++++++++----
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 332d30d23b4a..2878c4117c40 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -20,8 +20,8 @@
     "sourceCodeHash": "0x8aafeffb41332fddf2fb1ef4fc033bd1f323cdc5b199c6951da73e3cb86276e6"
   },
   "src/L1/OPContractsManager.sol": {
-    "initCodeHash": "0x1eb781ca3f3609dbf13ecb9fe34063155871510b148ac63348a4947858c196ba",
-    "sourceCodeHash": "0xf1e9fe3f37414e1f1824ce18cd6164c33ca64527b419d6fa52690b6351534822"
+    "initCodeHash": "0x73dbd0af5c85a20a147a87e795526c2da31e56157d11cfc8db5445f4bd1fa13f",
+    "sourceCodeHash": "0x52b2ea7508d89e51412de333950da8f5a504a214590bcb67566151c5240eaad1"
   },
   "src/L1/OptimismPortal.sol": {
     "initCodeHash": "0xa8b2f8a6d1092c5e64529736462ebb35daa9ea9e67585f7de8e3e5394682ee64",
diff --git a/packages/contracts-bedrock/src/L1/OPContractsManager.sol b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
index fb7da0aa6edf..1d3165f1e463 100644
--- a/packages/contracts-bedrock/src/L1/OPContractsManager.sol
+++ b/packages/contracts-bedrock/src/L1/OPContractsManager.sol
@@ -114,8 +114,8 @@ contract OPContractsManager is ISemver {
 
     // -------- Constants and Variables --------
 
-    /// @custom:semver 1.0.0-beta.24
-    string public constant version = "1.0.0-beta.24";
+    /// @custom:semver 1.0.0-beta.25
+    string public constant version = "1.0.0-beta.25";
 
     /// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
     /// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
@@ -195,9 +195,7 @@ contract OPContractsManager is ISemver {
     function deploy(DeployInput calldata _input) external returns (DeployOutput memory) {
         assertValidInputs(_input);
         uint256 l2ChainId = _input.l2ChainId;
-        // The salt for a non-proxy contract is a function of the chain ID and the salt mixer.
         string memory saltMixer = _input.saltMixer;
-        bytes32 salt = keccak256(abi.encode(l2ChainId, saltMixer));
         DeployOutput memory output;
 
         // -------- Deploy Chain Singletons --------
@@ -206,9 +204,16 @@ contract OPContractsManager is ISemver {
         // this contract, and then transfer ownership to the specified owner at the end of deployment.
         // The AddressManager is used to store the implementation for the L1CrossDomainMessenger
         // due to it's usage of the legacy ResolvedDelegateProxy.
-        output.addressManager = IAddressManager(Blueprint.deployFrom(blueprint.addressManager, salt));
-        output.opChainProxyAdmin =
-            IProxyAdmin(Blueprint.deployFrom(blueprint.proxyAdmin, salt, abi.encode(address(this))));
+        output.addressManager = IAddressManager(
+            Blueprint.deployFrom(
+                blueprint.addressManager, computeSalt(l2ChainId, saltMixer, "AddressManager"), abi.encode()
+            )
+        );
+        output.opChainProxyAdmin = IProxyAdmin(
+            Blueprint.deployFrom(
+                blueprint.proxyAdmin, computeSalt(l2ChainId, saltMixer, "ProxyAdmin"), abi.encode(address(this))
+            )
+        );
         output.opChainProxyAdmin.setAddressManager(output.addressManager);
 
         // -------- Deploy Proxy Contracts --------
@@ -230,12 +235,22 @@ contract OPContractsManager is ISemver {
 
         // Deploy legacy proxied contracts.
         output.l1StandardBridgeProxy = IL1StandardBridge(
-            payable(Blueprint.deployFrom(blueprint.l1ChugSplashProxy, salt, abi.encode(output.opChainProxyAdmin)))
+            payable(
+                Blueprint.deployFrom(
+                    blueprint.l1ChugSplashProxy,
+                    computeSalt(l2ChainId, saltMixer, "L1StandardBridge"),
+                    abi.encode(output.opChainProxyAdmin)
+                )
+            )
         );
         output.opChainProxyAdmin.setProxyType(address(output.l1StandardBridgeProxy), IProxyAdmin.ProxyType.CHUGSPLASH);
         string memory contractName = "OVM_L1CrossDomainMessenger";
         output.l1CrossDomainMessengerProxy = IL1CrossDomainMessenger(
-            Blueprint.deployFrom(blueprint.resolvedDelegateProxy, salt, abi.encode(output.addressManager, contractName))
+            Blueprint.deployFrom(
+                blueprint.resolvedDelegateProxy,
+                computeSalt(l2ChainId, saltMixer, "L1CrossDomainMessenger"),
+                abi.encode(output.addressManager, contractName)
+            )
         );
         output.opChainProxyAdmin.setProxyType(
             address(output.l1CrossDomainMessengerProxy), IProxyAdmin.ProxyType.RESOLVED
@@ -246,7 +261,11 @@ contract OPContractsManager is ISemver {
         // The AnchorStateRegistry Implementation is not MCP Ready, and therefore requires an implementation per chain.
         // It must be deployed after the DisputeGameFactoryProxy so that it can be provided as a constructor argument.
         output.anchorStateRegistryImpl = IAnchorStateRegistry(
-            Blueprint.deployFrom(blueprint.anchorStateRegistry, salt, abi.encode(output.disputeGameFactoryProxy))
+            Blueprint.deployFrom(
+                blueprint.anchorStateRegistry,
+                computeSalt(l2ChainId, saltMixer, "AnchorStateRegistry"),
+                abi.encode(output.disputeGameFactoryProxy)
+            )
         );
 
         // Eventually we will switch from DelayedWETHPermissionedGameProxy to DelayedWETHPermissionlessGameProxy.
@@ -259,7 +278,7 @@ contract OPContractsManager is ISemver {
             Blueprint.deployFrom(
                 blueprint.permissionedDisputeGame1,
                 blueprint.permissionedDisputeGame2,
-                salt,
+                computeSalt(l2ChainId, saltMixer, "PermissionedDisputeGame"),
                 encodePermissionedDisputeGameConstructor(_input, output)
             )
         );
@@ -372,6 +391,22 @@ contract OPContractsManager is ISemver {
         return address(uint160(bytes20(bytes.concat(versionByte, first19Bytes))));
     }
 
+    /// @notice Helper method for computing a salt that's used in CREATE2 deployments.
+    /// Including the contract name ensures that the resultant address from CREATE2 is unique
+    /// across our smart contract system. For example, we deploy multiple proxy contracts
+    /// with the same bytecode from this contract, so they need different salts to avoid an address collision
+    function computeSalt(
+        uint256 _l2ChainId,
+        string memory _saltMixer,
+        string memory _contractName
+    )
+        internal
+        pure
+        returns (bytes32)
+    {
+        return keccak256(abi.encode(_l2ChainId, _saltMixer, _contractName));
+    }
+
     /// @notice Deterministically deploys a new proxy contract owned by the provided ProxyAdmin.
     /// The salt is computed as a function of the L2 chain ID, the salt mixer and the contract name.
     /// This is required because we deploy many identical proxies, so they each require a unique salt for determinism.
@@ -384,7 +419,7 @@ contract OPContractsManager is ISemver {
         internal
         returns (address)
     {
-        bytes32 salt = keccak256(abi.encode(_l2ChainId, _saltMixer, _contractName));
+        bytes32 salt = computeSalt(_l2ChainId, _saltMixer, _contractName);
         return Blueprint.deployFrom(blueprint.proxy, salt, abi.encode(_proxyAdmin));
     }
 

From eabf70498f68f321f5de003f1d443d3e3c8100b8 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 10 Dec 2024 08:50:08 -0700
Subject: [PATCH 426/451] op-deployer: Add more FP deploy scripts (#13325)

Adds additional op-deployer scripts to support alternative fault proof implementations. This is a prerequisite to deleting the allocs files, since many tests need a fast dispute game and an alphabet VM.
---
 op-chain-ops/script/script.go                 |   4 +
 op-deployer/pkg/deployer/opcm/alphabet.go     |  27 ++++
 .../pkg/deployer/opcm/alphabet_test.go        |  37 ++++++
 op-deployer/pkg/deployer/opcm/alt_da_test.go  |   2 +
 op-deployer/pkg/deployer/opcm/asterisc.go     |   2 +-
 .../pkg/deployer/opcm/asterisc_test.go        |   2 +
 op-deployer/pkg/deployer/opcm/delayed_weth.go |   2 +-
 .../pkg/deployer/opcm/delayed_weth_test.go    |   2 +
 op-deployer/pkg/deployer/opcm/dispute_game.go |   2 +-
 .../pkg/deployer/opcm/dispute_game_factory.go |  24 ++++
 .../opcm/dispute_game_factory_test.go         |  55 ++++++++
 .../pkg/deployer/opcm/dispute_game_test.go    |   2 +
 op-deployer/pkg/deployer/opcm/mips.go         |   2 +-
 op-deployer/pkg/deployer/opcm/mips_test.go    |   2 +
 op-deployer/pkg/deployer/opcm/opchain.go      |   2 +-
 op-deployer/pkg/deployer/opcm/opcm.go         |   2 +-
 .../pkg/deployer/opcm/preimage_oracle.go      |  29 +++++
 .../pkg/deployer/opcm/preimage_oracle_test.go |  38 ++++++
 op-deployer/pkg/deployer/opcm/proxy.go        |   2 +-
 op-deployer/pkg/deployer/opcm/proxy_test.go   |   2 +
 op-deployer/pkg/deployer/opcm/script.go       |  37 +++++-
 op-deployer/pkg/deployer/opcm/superchain.go   |   2 +-
 .../scripts/deploy/DeployAlphabetVM.s.sol     |  63 +++++++++
 .../scripts/deploy/DeployPreimageOracle.s.sol |  72 +++++++++++
 .../scripts/deploy/SetDisputeGameImpl.s.sol   |  63 +++++++++
 .../test/opcm/DeployAlphabetVM.t.sol          | 102 +++++++++++++++
 .../test/opcm/DeployPreimageOracle.t.sol      | 105 +++++++++++++++
 .../test/opcm/SetDisputeGameImpl.t.sol        | 121 ++++++++++++++++++
 28 files changed, 794 insertions(+), 11 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/opcm/alphabet.go
 create mode 100644 op-deployer/pkg/deployer/opcm/alphabet_test.go
 create mode 100644 op-deployer/pkg/deployer/opcm/dispute_game_factory.go
 create mode 100644 op-deployer/pkg/deployer/opcm/dispute_game_factory_test.go
 create mode 100644 op-deployer/pkg/deployer/opcm/preimage_oracle.go
 create mode 100644 op-deployer/pkg/deployer/opcm/preimage_oracle_test.go
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol
 create mode 100644 packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol
 create mode 100644 packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol
 create mode 100644 packages/contracts-bedrock/test/opcm/DeployAlphabetVM.t.sol
 create mode 100644 packages/contracts-bedrock/test/opcm/DeployPreimageOracle.t.sol
 create mode 100644 packages/contracts-bedrock/test/opcm/SetDisputeGameImpl.t.sol

diff --git a/op-chain-ops/script/script.go b/op-chain-ops/script/script.go
index 9a3d9ae80201..7185c9e08b2d 100644
--- a/op-chain-ops/script/script.go
+++ b/op-chain-ops/script/script.go
@@ -440,6 +440,10 @@ func (h *Host) ImportAccount(addr common.Address, account types.Account) {
 	}
 }
 
+func (h *Host) SetStorage(addr common.Address, key common.Hash, value common.Hash) {
+	h.state.SetState(addr, key, value)
+}
+
 // getPrecompile overrides any accounts during runtime, to insert special precompiles, if activated.
 func (h *Host) getPrecompile(rules params.Rules, original vm.PrecompiledContract, addr common.Address) vm.PrecompiledContract {
 	if p, ok := h.precompiles[addr]; ok {
diff --git a/op-deployer/pkg/deployer/opcm/alphabet.go b/op-deployer/pkg/deployer/opcm/alphabet.go
new file mode 100644
index 000000000000..a3d2016f3ef8
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/alphabet.go
@@ -0,0 +1,27 @@
+package opcm
+
+import (
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type DeployAlphabetVMInput struct {
+	AbsolutePrestate common.Hash
+	PreimageOracle   common.Address
+}
+
+type DeployAlphabetVMOutput struct {
+	AlphabetVM common.Address
+}
+
+func DeployAlphabetVM(
+	host *script.Host,
+	input DeployAlphabetVMInput,
+) (DeployAlphabetVMOutput, error) {
+	return RunScriptSingle[DeployAlphabetVMInput, DeployAlphabetVMOutput](
+		host,
+		input,
+		"DeployAlphabetVM.s.sol",
+		"DeployAlphabetVM",
+	)
+}
diff --git a/op-deployer/pkg/deployer/opcm/alphabet_test.go b/op-deployer/pkg/deployer/opcm/alphabet_test.go
new file mode 100644
index 000000000000..a1595156ac1b
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/alphabet_test.go
@@ -0,0 +1,37 @@
+package opcm
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployAlphabetVM(t *testing.T) {
+	t.Parallel()
+
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+	)
+	require.NoError(t, err)
+
+	input := DeployAlphabetVMInput{
+		AbsolutePrestate: common.Hash{'A'},
+		PreimageOracle:   common.Address{'O'},
+	}
+
+	output, err := DeployAlphabetVM(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.AlphabetVM)
+}
diff --git a/op-deployer/pkg/deployer/opcm/alt_da_test.go b/op-deployer/pkg/deployer/opcm/alt_da_test.go
index 97e2b485b900..eab5d8b706ad 100644
--- a/op-deployer/pkg/deployer/opcm/alt_da_test.go
+++ b/op-deployer/pkg/deployer/opcm/alt_da_test.go
@@ -14,6 +14,8 @@ import (
 )
 
 func TestDeployAltDA(t *testing.T) {
+	t.Parallel()
+
 	_, artifacts := testutil.LocalArtifacts(t)
 
 	host, err := env.DefaultScriptHost(
diff --git a/op-deployer/pkg/deployer/opcm/asterisc.go b/op-deployer/pkg/deployer/opcm/asterisc.go
index 053da43b4258..c034e6bf3ba5 100644
--- a/op-deployer/pkg/deployer/opcm/asterisc.go
+++ b/op-deployer/pkg/deployer/opcm/asterisc.go
@@ -26,5 +26,5 @@ func DeployAsterisc(
 	host *script.Host,
 	input DeployAsteriscInput,
 ) (DeployAsteriscOutput, error) {
-	return RunBasicScript[DeployAsteriscInput, DeployAsteriscOutput](host, input, "DeployAsterisc.s.sol", "DeployAsterisc")
+	return RunScriptSingle[DeployAsteriscInput, DeployAsteriscOutput](host, input, "DeployAsterisc.s.sol", "DeployAsterisc")
 }
diff --git a/op-deployer/pkg/deployer/opcm/asterisc_test.go b/op-deployer/pkg/deployer/opcm/asterisc_test.go
index 0ed68f7aeaff..91d463825d24 100644
--- a/op-deployer/pkg/deployer/opcm/asterisc_test.go
+++ b/op-deployer/pkg/deployer/opcm/asterisc_test.go
@@ -13,6 +13,8 @@ import (
 )
 
 func TestDeployAsterisc(t *testing.T) {
+	t.Parallel()
+
 	_, artifacts := testutil.LocalArtifacts(t)
 
 	host, err := env.DefaultScriptHost(
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth.go b/op-deployer/pkg/deployer/opcm/delayed_weth.go
index 06f533956f89..ecee2a4df29f 100644
--- a/op-deployer/pkg/deployer/opcm/delayed_weth.go
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth.go
@@ -34,5 +34,5 @@ func DeployDelayedWETH(
 	host *script.Host,
 	input DeployDelayedWETHInput,
 ) (DeployDelayedWETHOutput, error) {
-	return RunBasicScript[DeployDelayedWETHInput, DeployDelayedWETHOutput](host, input, "DeployDelayedWETH.s.sol", "DeployDelayedWETH")
+	return RunScriptSingle[DeployDelayedWETHInput, DeployDelayedWETHOutput](host, input, "DeployDelayedWETH.s.sol", "DeployDelayedWETH")
 }
diff --git a/op-deployer/pkg/deployer/opcm/delayed_weth_test.go b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
index 3a8be1b3e0d6..caa555ac0fcf 100644
--- a/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
+++ b/op-deployer/pkg/deployer/opcm/delayed_weth_test.go
@@ -14,6 +14,8 @@ import (
 )
 
 func TestDeployDelayedWETH(t *testing.T) {
+	t.Parallel()
+
 	_, artifacts := testutil.LocalArtifacts(t)
 
 	testCases := []struct {
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game.go b/op-deployer/pkg/deployer/opcm/dispute_game.go
index 7128a08e8b02..b6e60dd0281d 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game.go
@@ -44,5 +44,5 @@ func DeployDisputeGame(
 	host *script.Host,
 	input DeployDisputeGameInput,
 ) (DeployDisputeGameOutput, error) {
-	return RunBasicScript[DeployDisputeGameInput, DeployDisputeGameOutput](host, input, "DeployDisputeGame.s.sol", "DeployDisputeGame")
+	return RunScriptSingle[DeployDisputeGameInput, DeployDisputeGameOutput](host, input, "DeployDisputeGame.s.sol", "DeployDisputeGame")
 }
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game_factory.go b/op-deployer/pkg/deployer/opcm/dispute_game_factory.go
new file mode 100644
index 000000000000..eb34e9f2206b
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/dispute_game_factory.go
@@ -0,0 +1,24 @@
+package opcm
+
+import (
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type SetDisputeGameImplInput struct {
+	Factory  common.Address
+	Impl     common.Address
+	GameType uint32
+}
+
+func SetDisputeGameImpl(
+	h *script.Host,
+	input SetDisputeGameImplInput,
+) error {
+	return RunScriptVoid[SetDisputeGameImplInput](
+		h,
+		input,
+		"SetDisputeGameImpl.s.sol",
+		"SetDisputeGameImpl",
+	)
+}
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game_factory_test.go b/op-deployer/pkg/deployer/opcm/dispute_game_factory_test.go
new file mode 100644
index 000000000000..c2003cb365ca
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/dispute_game_factory_test.go
@@ -0,0 +1,55 @@
+package opcm
+
+import (
+	"context"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/ethereum/go-ethereum/rpc"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestSetDisputeGameImpl(t *testing.T) {
+	t.Parallel()
+
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	l1RPCUrl := os.Getenv("SEPOLIA_RPC_URL")
+	require.NotEmpty(t, l1RPCUrl, "SEPOLIA_RPC_URL must be set")
+
+	l1RPC, err := rpc.Dial(l1RPCUrl)
+	require.NoError(t, err)
+
+	// OP Sepolia DGF owner
+	deployer := common.HexToAddress("0x1Eb2fFc903729a0F03966B917003800b145F56E2")
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	defer cancel()
+	host, err := env.DefaultForkedScriptHost(
+		ctx,
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		deployer,
+		artifacts,
+		l1RPC,
+	)
+	require.NoError(t, err)
+
+	// Use OP Sepolia's dispute game factory
+	factoryAddr := common.HexToAddress("0x05F9613aDB30026FFd634f38e5C4dFd30a197Fa1")
+
+	input := SetDisputeGameImplInput{
+		Factory:  factoryAddr,
+		Impl:     common.Address{'I'},
+		GameType: 999,
+	}
+	require.NoError(t, SetDisputeGameImpl(host, input))
+}
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game_test.go b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
index 2b2d33f9efe0..9fcae49ef555 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game_test.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
@@ -15,6 +15,8 @@ import (
 )
 
 func TestDeployDisputeGame(t *testing.T) {
+	t.Parallel()
+
 	_, artifacts := testutil.LocalArtifacts(t)
 
 	host, err := env.DefaultScriptHost(
diff --git a/op-deployer/pkg/deployer/opcm/mips.go b/op-deployer/pkg/deployer/opcm/mips.go
index 6150b3088351..77919ffbd796 100644
--- a/op-deployer/pkg/deployer/opcm/mips.go
+++ b/op-deployer/pkg/deployer/opcm/mips.go
@@ -31,5 +31,5 @@ func DeployMIPS(
 	host *script.Host,
 	input DeployMIPSInput,
 ) (DeployMIPSOutput, error) {
-	return RunBasicScript[DeployMIPSInput, DeployMIPSOutput](host, input, "DeployMIPS.s.sol", "DeployMIPS")
+	return RunScriptSingle[DeployMIPSInput, DeployMIPSOutput](host, input, "DeployMIPS.s.sol", "DeployMIPS")
 }
diff --git a/op-deployer/pkg/deployer/opcm/mips_test.go b/op-deployer/pkg/deployer/opcm/mips_test.go
index 848b46356525..1357c55cac90 100644
--- a/op-deployer/pkg/deployer/opcm/mips_test.go
+++ b/op-deployer/pkg/deployer/opcm/mips_test.go
@@ -13,6 +13,8 @@ import (
 )
 
 func TestDeployMIPS(t *testing.T) {
+	t.Parallel()
+
 	_, artifacts := testutil.LocalArtifacts(t)
 
 	host, err := env.DefaultScriptHost(
diff --git a/op-deployer/pkg/deployer/opcm/opchain.go b/op-deployer/pkg/deployer/opcm/opchain.go
index 2a8664501337..69891358dfbe 100644
--- a/op-deployer/pkg/deployer/opcm/opchain.go
+++ b/op-deployer/pkg/deployer/opcm/opchain.go
@@ -88,7 +88,7 @@ func DeployOPChainIsthmus(host *script.Host, input DeployOPChainInputIsthmus) (D
 }
 
 func deployOPChain[T any](host *script.Host, input T) (DeployOPChainOutput, error) {
-	return RunBasicScript[T, DeployOPChainOutput](host, input, "DeployOPChain.s.sol", "DeployOPChain")
+	return RunScriptSingle[T, DeployOPChainOutput](host, input, "DeployOPChain.s.sol", "DeployOPChain")
 }
 
 type ReadImplementationAddressesInput struct {
diff --git a/op-deployer/pkg/deployer/opcm/opcm.go b/op-deployer/pkg/deployer/opcm/opcm.go
index 26179271b692..dbcc9281ee06 100644
--- a/op-deployer/pkg/deployer/opcm/opcm.go
+++ b/op-deployer/pkg/deployer/opcm/opcm.go
@@ -40,7 +40,7 @@ func DeployOPCM(
 	host *script.Host,
 	input DeployOPCMInput,
 ) (DeployOPCMOutput, error) {
-	out, err := RunBasicScript[DeployOPCMInput, DeployOPCMOutput](host, input, "DeployOPCM.s.sol", "DeployOPCM")
+	out, err := RunScriptSingle[DeployOPCMInput, DeployOPCMOutput](host, input, "DeployOPCM.s.sol", "DeployOPCM")
 	if err != nil {
 		return DeployOPCMOutput{}, fmt.Errorf("failed to deploy OPCM: %w", err)
 	}
diff --git a/op-deployer/pkg/deployer/opcm/preimage_oracle.go b/op-deployer/pkg/deployer/opcm/preimage_oracle.go
new file mode 100644
index 000000000000..fb8a5c8e4c1a
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/preimage_oracle.go
@@ -0,0 +1,29 @@
+package opcm
+
+import (
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type DeployPreimageOracleInput struct {
+	MinProposalSize *big.Int
+	ChallengePeriod *big.Int
+}
+
+type DeployPreimageOracleOutput struct {
+	PreimageOracle common.Address
+}
+
+func DeployPreimageOracle(
+	host *script.Host,
+	input DeployPreimageOracleInput,
+) (DeployPreimageOracleOutput, error) {
+	return RunScriptSingle[DeployPreimageOracleInput, DeployPreimageOracleOutput](
+		host,
+		input,
+		"DeployPreimageOracle.s.sol",
+		"DeployPreimageOracle",
+	)
+}
diff --git a/op-deployer/pkg/deployer/opcm/preimage_oracle_test.go b/op-deployer/pkg/deployer/opcm/preimage_oracle_test.go
new file mode 100644
index 000000000000..04aeeca41785
--- /dev/null
+++ b/op-deployer/pkg/deployer/opcm/preimage_oracle_test.go
@@ -0,0 +1,38 @@
+package opcm
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDeployPreimageOracle(t *testing.T) {
+	t.Parallel()
+
+	_, artifacts := testutil.LocalArtifacts(t)
+
+	host, err := env.DefaultScriptHost(
+		broadcaster.NoopBroadcaster(),
+		testlog.Logger(t, log.LevelInfo),
+		common.Address{'D'},
+		artifacts,
+	)
+	require.NoError(t, err)
+
+	input := DeployPreimageOracleInput{
+		MinProposalSize: big.NewInt(123),
+		ChallengePeriod: big.NewInt(456),
+	}
+
+	output, err := DeployPreimageOracle(host, input)
+	require.NoError(t, err)
+
+	require.NotEmpty(t, output.PreimageOracle)
+}
diff --git a/op-deployer/pkg/deployer/opcm/proxy.go b/op-deployer/pkg/deployer/opcm/proxy.go
index 850c337f83f4..ce463b1c2d1f 100644
--- a/op-deployer/pkg/deployer/opcm/proxy.go
+++ b/op-deployer/pkg/deployer/opcm/proxy.go
@@ -26,5 +26,5 @@ func DeployProxy(
 	host *script.Host,
 	input DeployProxyInput,
 ) (DeployProxyOutput, error) {
-	return RunBasicScript[DeployProxyInput, DeployProxyOutput](host, input, "DeployProxy.s.sol", "DeployProxy")
+	return RunScriptSingle[DeployProxyInput, DeployProxyOutput](host, input, "DeployProxy.s.sol", "DeployProxy")
 }
diff --git a/op-deployer/pkg/deployer/opcm/proxy_test.go b/op-deployer/pkg/deployer/opcm/proxy_test.go
index bb9cb350a369..30f0b1482f3d 100644
--- a/op-deployer/pkg/deployer/opcm/proxy_test.go
+++ b/op-deployer/pkg/deployer/opcm/proxy_test.go
@@ -13,6 +13,8 @@ import (
 )
 
 func TestDeployProxy(t *testing.T) {
+	t.Parallel()
+
 	_, artifacts := testutil.LocalArtifacts(t)
 
 	host, err := env.DefaultScriptHost(
diff --git a/op-deployer/pkg/deployer/opcm/script.go b/op-deployer/pkg/deployer/opcm/script.go
index 6a138f67cb8f..bbb978b1c02a 100644
--- a/op-deployer/pkg/deployer/opcm/script.go
+++ b/op-deployer/pkg/deployer/opcm/script.go
@@ -7,11 +7,11 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-type BasicScriptIO struct {
+type SingleScript struct {
 	Run func(input, output common.Address) error
 }
 
-func RunBasicScript[I any, O any](
+func RunScriptSingle[I any, O any](
 	host *script.Host,
 	input I,
 	scriptFile string,
@@ -34,7 +34,7 @@ func RunBasicScript[I any, O any](
 	}
 	defer cleanupOutput()
 
-	deployScript, cleanupDeploy, err := script.WithScript[BasicScriptIO](host, scriptFile, contractName)
+	deployScript, cleanupDeploy, err := script.WithScript[SingleScript](host, scriptFile, contractName)
 	if err != nil {
 		return output, fmt.Errorf("failed to load %s script: %w", scriptFile, err)
 	}
@@ -46,3 +46,34 @@ func RunBasicScript[I any, O any](
 
 	return output, nil
 }
+
+type VoidScript struct {
+	Run func(common.Address) error
+}
+
+func RunScriptVoid[I any](
+	host *script.Host,
+	input I,
+	scriptFile string,
+	contractName string,
+) error {
+	inputAddr := host.NewScriptAddress()
+
+	cleanupInput, err := script.WithPrecompileAtAddress[*I](host, inputAddr, &input)
+	if err != nil {
+		return fmt.Errorf("failed to insert input precompile: %w", err)
+	}
+	defer cleanupInput()
+
+	deployScript, cleanupDeploy, err := script.WithScript[VoidScript](host, scriptFile, contractName)
+	if err != nil {
+		return fmt.Errorf("failed to load %s script: %w", scriptFile, err)
+	}
+	defer cleanupDeploy()
+
+	if err := deployScript.Run(inputAddr); err != nil {
+		return fmt.Errorf("failed to run %s script: %w", scriptFile, err)
+	}
+
+	return nil
+}
diff --git a/op-deployer/pkg/deployer/opcm/superchain.go b/op-deployer/pkg/deployer/opcm/superchain.go
index fcbccc3cea4a..4bd918757ff9 100644
--- a/op-deployer/pkg/deployer/opcm/superchain.go
+++ b/op-deployer/pkg/deployer/opcm/superchain.go
@@ -52,5 +52,5 @@ type DeploySuperchainOpts struct {
 }
 
 func DeploySuperchain(h *script.Host, input DeploySuperchainInput) (DeploySuperchainOutput, error) {
-	return RunBasicScript[DeploySuperchainInput, DeploySuperchainOutput](h, input, "DeploySuperchain.s.sol", "DeploySuperchain")
+	return RunScriptSingle[DeploySuperchainInput, DeploySuperchainOutput](h, input, "DeploySuperchain.s.sol", "DeploySuperchain")
 }
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol
new file mode 100644
index 000000000000..11f1c35ce1bb
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { Script } from "forge-std/Script.sol";
+
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
+import { Claim } from "src/dispute/lib/Types.sol";
+
+contract DeployAlphabetVMInput is BaseDeployIO {
+    bytes32 internal _absolutePrestate;
+    IPreimageOracle internal _preimageOracle;
+
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "DeployAlphabetVMInput: cannot set zero address");
+
+        if (_sel == this.preimageOracle.selector) _preimageOracle = IPreimageOracle(_addr);
+        else revert("DeployAlphabetVMInput: unknown selector");
+    }
+
+    function set(bytes4 _sel, bytes32 _value) public {
+        if (_sel == this.absolutePrestate.selector) _absolutePrestate = _value;
+        else revert("DeployAlphabetVMInput: unknown selector");
+    }
+
+    function absolutePrestate() public view returns (bytes32) {
+        require(_absolutePrestate != bytes32(0), "DeployAlphabetVMInput: not set");
+        return _absolutePrestate;
+    }
+
+    function preimageOracle() public view returns (IPreimageOracle) {
+        require(address(_preimageOracle) != address(0), "DeployAlphabetVMInput: not set");
+        return _preimageOracle;
+    }
+}
+
+contract DeployAlphabetVMOutput is BaseDeployIO {
+    AlphabetVM internal _alphabetVM;
+
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "DeployAlphabetVMOutput: cannot set zero address");
+        if (_sel == this.alphabetVM.selector) _alphabetVM = AlphabetVM(_addr);
+        else revert("DeployAlphabetVMOutput: unknown selector");
+    }
+
+    function alphabetVM() public view returns (AlphabetVM) {
+        require(address(_alphabetVM) != address(0), "DeployAlphabetVMOutput: not set");
+        return _alphabetVM;
+    }
+}
+
+contract DeployAlphabetVM is Script {
+    function run(DeployAlphabetVMInput _input, DeployAlphabetVMOutput _output) public {
+        Claim absolutePrestate = Claim.wrap(_input.absolutePrestate());
+        IPreimageOracle preimageOracle = _input.preimageOracle();
+
+        vm.broadcast(msg.sender);
+        AlphabetVM alphabetVM = new AlphabetVM(absolutePrestate, preimageOracle);
+
+        _output.set(_output.alphabetVM.selector, address(alphabetVM));
+    }
+}
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol
new file mode 100644
index 000000000000..eff286d19134
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { Script } from "forge-std/Script.sol";
+
+import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+contract DeployPreimageOracleInput is BaseDeployIO {
+    uint256 internal _minProposalSize;
+    uint256 internal _challengePeriod;
+
+    function set(bytes4 _sel, uint256 _value) public {
+        if (_sel == this.minProposalSize.selector) _minProposalSize = _value;
+        else if (_sel == this.challengePeriod.selector) _challengePeriod = _value;
+        else revert("DeployPreimageOracleInput: unknown selector");
+    }
+
+    function minProposalSize() public view returns (uint256) {
+        require(_minProposalSize > 0, "DeployPreimageOracleInput: not set");
+        return _minProposalSize;
+    }
+
+    function challengePeriod() public view returns (uint256) {
+        require(_challengePeriod > 0, "DeployPreimageOracleInput: not set");
+        return _challengePeriod;
+    }
+}
+
+contract DeployPreimageOracleOutput is BaseDeployIO {
+    IPreimageOracle internal _preimageOracle;
+
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "DeployPreimageOracleOutput: cannot set zero address");
+
+        if (_sel == this.preimageOracle.selector) _preimageOracle = IPreimageOracle(_addr);
+        else revert("DeployPreimageOracleOutput: unknown selector");
+    }
+
+    function preimageOracle() public view returns (IPreimageOracle) {
+        require(address(_preimageOracle) != address(0), "DeployPreimageOracleOutput: not set");
+        return _preimageOracle;
+    }
+}
+
+contract DeployPreimageOracle is Script {
+    function run(DeployPreimageOracleInput _input, DeployPreimageOracleOutput _output) public {
+        uint256 minProposalSize = _input.minProposalSize();
+        uint256 challengePeriod = _input.challengePeriod();
+
+        vm.broadcast(msg.sender);
+        IPreimageOracle preimageOracle = IPreimageOracle(
+            DeployUtils.create1({
+                _name: "PreimageOracle",
+                _args: DeployUtils.encodeConstructor(
+                    abi.encodeCall(IPreimageOracle.__constructor__, (minProposalSize, challengePeriod))
+                )
+            })
+        );
+
+        _output.set(_output.preimageOracle.selector, address(preimageOracle));
+        assertValid(_input, _output);
+    }
+
+    function assertValid(DeployPreimageOracleInput _input, DeployPreimageOracleOutput _output) public view {
+        IPreimageOracle oracle = _output.preimageOracle();
+        require(address(oracle) != address(0), "DPO-10");
+        require(oracle.minProposalSize() == _input.minProposalSize(), "DPO-20");
+        require(oracle.challengePeriod() == _input.challengePeriod(), "DPO-30");
+    }
+}
diff --git a/packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol b/packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol
new file mode 100644
index 000000000000..0a0896c69ef7
--- /dev/null
+++ b/packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { Script } from "forge-std/Script.sol";
+
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { BaseDeployIO } from "scripts/deploy/BaseDeployIO.sol";
+import { GameType } from "src/dispute/lib/Types.sol";
+
+contract SetDisputeGameImplInput is BaseDeployIO {
+    IDisputeGameFactory internal _factory;
+    IDisputeGame internal _impl;
+    uint32 internal _gameType;
+
+    // Setter for address type
+    function set(bytes4 _sel, address _addr) public {
+        require(_addr != address(0), "SetDisputeGameImplInput: cannot set zero address");
+
+        if (_sel == this.factory.selector) _factory = IDisputeGameFactory(_addr);
+        else if (_sel == this.impl.selector) _impl = IDisputeGame(_addr);
+        else revert("SetDisputeGameImplInput: unknown selector");
+    }
+
+    // Setter for GameType
+    function set(bytes4 _sel, uint32 _type) public {
+        if (_sel == this.gameType.selector) _gameType = _type;
+        else revert("SetDisputeGameImplInput: unknown selector");
+    }
+
+    // Getters
+    function factory() public view returns (IDisputeGameFactory) {
+        require(address(_factory) != address(0), "SetDisputeGameImplInput: not set");
+        return _factory;
+    }
+
+    function impl() public view returns (IDisputeGame) {
+        require(address(_impl) != address(0), "SetDisputeGameImplInput: not set");
+        return _impl;
+    }
+
+    function gameType() public view returns (uint32) {
+        return _gameType;
+    }
+}
+
+contract SetDisputeGameImpl is Script {
+    function run(SetDisputeGameImplInput _input) public {
+        IDisputeGameFactory factory = _input.factory();
+        GameType gameType = GameType.wrap(_input.gameType());
+        require(address(factory.gameImpls(gameType)) == address(0), "SDGI-10");
+
+        IDisputeGame impl = _input.impl();
+        vm.broadcast(msg.sender);
+        factory.setImplementation(gameType, impl);
+        assertValid(_input);
+    }
+
+    function assertValid(SetDisputeGameImplInput _input) public view {
+        GameType gameType = GameType.wrap(_input.gameType());
+        require(address(_input.factory().gameImpls(gameType)) == address(_input.impl()), "SDGI-20");
+    }
+}
diff --git a/packages/contracts-bedrock/test/opcm/DeployAlphabetVM.t.sol b/packages/contracts-bedrock/test/opcm/DeployAlphabetVM.t.sol
new file mode 100644
index 000000000000..ac5938061f9f
--- /dev/null
+++ b/packages/contracts-bedrock/test/opcm/DeployAlphabetVM.t.sol
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { Test } from "forge-std/Test.sol";
+import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
+import { DeployAlphabetVM, DeployAlphabetVMInput, DeployAlphabetVMOutput } from "scripts/deploy/DeployAlphabetVM.s.sol";
+
+contract DeployAlphabetVMInput_Test is Test {
+    DeployAlphabetVMInput input;
+
+    function setUp() public {
+        input = new DeployAlphabetVMInput();
+    }
+
+    function test_getters_whenNotSet_reverts() public {
+        vm.expectRevert("DeployAlphabetVMInput: not set");
+        input.preimageOracle();
+
+        vm.expectRevert("DeployAlphabetVMInput: not set");
+        input.absolutePrestate();
+    }
+
+    function test_set_succeeds() public {
+        address oracle = makeAddr("oracle");
+        bytes32 prestate = bytes32(uint256(1));
+
+        vm.etch(oracle, hex"01");
+
+        input.set(input.preimageOracle.selector, oracle);
+        input.set(input.absolutePrestate.selector, prestate);
+
+        assertEq(address(input.preimageOracle()), oracle);
+        assertEq(input.absolutePrestate(), prestate);
+    }
+
+    function test_set_withZeroAddress_reverts() public {
+        vm.expectRevert("DeployAlphabetVMInput: cannot set zero address");
+        input.set(input.preimageOracle.selector, address(0));
+    }
+
+    function test_set_withInvalidSelector_reverts() public {
+        vm.expectRevert("DeployAlphabetVMInput: unknown selector");
+        input.set(bytes4(0xdeadbeef), makeAddr("test"));
+
+        vm.expectRevert("DeployAlphabetVMInput: unknown selector");
+        input.set(bytes4(0xdeadbeef), bytes32(0));
+    }
+}
+
+contract DeployAlphabetVMOutput_Test is Test {
+    DeployAlphabetVMOutput output;
+    address mockVM;
+
+    function setUp() public {
+        output = new DeployAlphabetVMOutput();
+        mockVM = makeAddr("vm");
+        vm.etch(mockVM, hex"01");
+    }
+
+    function test_getters_whenNotSet_reverts() public {
+        vm.expectRevert("DeployAlphabetVMOutput: not set");
+        output.alphabetVM();
+    }
+
+    function test_set_succeeds() public {
+        output.set(output.alphabetVM.selector, mockVM);
+        assertEq(address(output.alphabetVM()), mockVM);
+    }
+
+    function test_set_withZeroAddress_reverts() public {
+        vm.expectRevert("DeployAlphabetVMOutput: cannot set zero address");
+        output.set(output.alphabetVM.selector, address(0));
+    }
+
+    function test_set_withInvalidSelector_reverts() public {
+        vm.expectRevert("DeployAlphabetVMOutput: unknown selector");
+        output.set(bytes4(0xdeadbeef), mockVM);
+    }
+}
+
+contract DeployAlphabetVM_Test is Test {
+    DeployAlphabetVM script;
+    DeployAlphabetVMInput input;
+    DeployAlphabetVMOutput output;
+    address mockOracle;
+    bytes32 mockPrestate;
+
+    function setUp() public {
+        script = new DeployAlphabetVM();
+        input = new DeployAlphabetVMInput();
+        output = new DeployAlphabetVMOutput();
+        mockOracle = makeAddr("oracle");
+        mockPrestate = bytes32(uint256(1));
+    }
+
+    function test_run_succeeds() public {
+        input.set(input.preimageOracle.selector, mockOracle);
+        input.set(input.absolutePrestate.selector, mockPrestate);
+        script.run(input, output);
+        require(address(output.alphabetVM()) != address(0), "DeployAlphabetVM_Test: alphabetVM not set");
+    }
+}
diff --git a/packages/contracts-bedrock/test/opcm/DeployPreimageOracle.t.sol b/packages/contracts-bedrock/test/opcm/DeployPreimageOracle.t.sol
new file mode 100644
index 000000000000..ab9dc7b6278c
--- /dev/null
+++ b/packages/contracts-bedrock/test/opcm/DeployPreimageOracle.t.sol
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { Test } from "forge-std/Test.sol";
+
+import {
+    DeployPreimageOracle,
+    DeployPreimageOracleInput,
+    DeployPreimageOracleOutput
+} from "scripts/deploy/DeployPreimageOracle.s.sol";
+
+contract DeployPreimageOracleInput_Test is Test {
+    DeployPreimageOracleInput input;
+
+    function setUp() public {
+        input = new DeployPreimageOracleInput();
+    }
+
+    function test_getters_whenNotSet_reverts() public {
+        vm.expectRevert("DeployPreimageOracleInput: not set");
+        input.minProposalSize();
+
+        vm.expectRevert("DeployPreimageOracleInput: not set");
+        input.challengePeriod();
+    }
+
+    function test_set_succeeds() public {
+        uint256 minProposalSize = 1000;
+        uint256 challengePeriod = 7 days;
+
+        input.set(input.minProposalSize.selector, minProposalSize);
+        input.set(input.challengePeriod.selector, challengePeriod);
+
+        assertEq(input.minProposalSize(), minProposalSize);
+        assertEq(input.challengePeriod(), challengePeriod);
+    }
+
+    function test_set_withInvalidSelector_reverts() public {
+        vm.expectRevert("DeployPreimageOracleInput: unknown selector");
+        input.set(bytes4(0xdeadbeef), 100);
+    }
+}
+
+contract DeployPreimageOracleOutput_Test is Test {
+    DeployPreimageOracleOutput output;
+    address mockOracle;
+
+    function setUp() public {
+        output = new DeployPreimageOracleOutput();
+        mockOracle = makeAddr("oracle");
+        vm.etch(mockOracle, hex"01");
+    }
+
+    function test_getters_whenNotSet_reverts() public {
+        vm.expectRevert("DeployPreimageOracleOutput: not set");
+        output.preimageOracle();
+    }
+
+    function test_set_succeeds() public {
+        output.set(output.preimageOracle.selector, mockOracle);
+        assertEq(address(output.preimageOracle()), mockOracle);
+    }
+
+    function test_set_withZeroAddress_reverts() public {
+        vm.expectRevert("DeployPreimageOracleOutput: cannot set zero address");
+        output.set(output.preimageOracle.selector, address(0));
+    }
+
+    function test_set_withInvalidSelector_reverts() public {
+        vm.expectRevert("DeployPreimageOracleOutput: unknown selector");
+        output.set(bytes4(0xdeadbeef), mockOracle);
+    }
+}
+
+contract DeployPreimageOracle_Test is Test {
+    DeployPreimageOracle script;
+    DeployPreimageOracleInput input;
+    DeployPreimageOracleOutput output;
+
+    uint256 minProposalSize;
+    uint256 challengePeriod;
+
+    function setUp() public {
+        script = new DeployPreimageOracle();
+        input = new DeployPreimageOracleInput();
+        output = new DeployPreimageOracleOutput();
+
+        minProposalSize = 1000;
+        challengePeriod = 7 days;
+    }
+
+    function test_run_succeeds() public {
+        input.set(input.minProposalSize.selector, minProposalSize);
+        input.set(input.challengePeriod.selector, challengePeriod);
+
+        script.run(input, output);
+
+        assertTrue(address(output.preimageOracle()) != address(0));
+    }
+
+    function test_assertValid_whenInvalid_reverts() public {
+        vm.expectRevert("DeployPreimageOracleOutput: not set");
+        script.assertValid(input, output);
+    }
+}
diff --git a/packages/contracts-bedrock/test/opcm/SetDisputeGameImpl.t.sol b/packages/contracts-bedrock/test/opcm/SetDisputeGameImpl.t.sol
new file mode 100644
index 000000000000..7477350a4f62
--- /dev/null
+++ b/packages/contracts-bedrock/test/opcm/SetDisputeGameImpl.t.sol
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { Test } from "forge-std/Test.sol";
+import { IDisputeGame } from "interfaces/dispute/IDisputeGame.sol";
+import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
+import { GameType } from "src/dispute/lib/Types.sol";
+import { SetDisputeGameImpl, SetDisputeGameImplInput } from "scripts/deploy/SetDisputeGameImpl.s.sol";
+import { DisputeGameFactory } from "src/dispute/DisputeGameFactory.sol";
+import { Proxy } from "src/universal/Proxy.sol";
+
+contract SetDisputeGameImplInput_Test is Test {
+    SetDisputeGameImplInput input;
+
+    function setUp() public {
+        input = new SetDisputeGameImplInput();
+    }
+
+    function test_getters_whenNotSet_reverts() public {
+        vm.expectRevert("SetDisputeGameImplInput: not set");
+        input.factory();
+
+        vm.expectRevert("SetDisputeGameImplInput: not set");
+        input.impl();
+
+        // gameType doesn't revert when not set, returns 0
+        assertEq(input.gameType(), 0);
+    }
+
+    function test_set_succeeds() public {
+        address factory = makeAddr("factory");
+        address impl = makeAddr("impl");
+        uint32 gameType = 1;
+
+        vm.etch(factory, hex"01");
+        vm.etch(impl, hex"01");
+
+        input.set(input.factory.selector, factory);
+        input.set(input.impl.selector, impl);
+        input.set(input.gameType.selector, gameType);
+
+        assertEq(address(input.factory()), factory);
+        assertEq(address(input.impl()), impl);
+        assertEq(input.gameType(), gameType);
+    }
+
+    function test_set_withZeroAddress_reverts() public {
+        vm.expectRevert("SetDisputeGameImplInput: cannot set zero address");
+        input.set(input.factory.selector, address(0));
+
+        vm.expectRevert("SetDisputeGameImplInput: cannot set zero address");
+        input.set(input.impl.selector, address(0));
+    }
+
+    function test_set_withInvalidSelector_reverts() public {
+        vm.expectRevert("SetDisputeGameImplInput: unknown selector");
+        input.set(bytes4(0xdeadbeef), makeAddr("test"));
+
+        vm.expectRevert("SetDisputeGameImplInput: unknown selector");
+        input.set(bytes4(0xdeadbeef), uint32(1));
+    }
+}
+
+contract SetDisputeGameImpl_Test is Test {
+    SetDisputeGameImpl script;
+    SetDisputeGameImplInput input;
+    IDisputeGameFactory factory;
+    address mockImpl;
+    uint32 gameType;
+
+    function setUp() public {
+        script = new SetDisputeGameImpl();
+        input = new SetDisputeGameImplInput();
+        DisputeGameFactory impl = new DisputeGameFactory();
+
+        // Needs to be a proxy to properly initialize
+        Proxy proxy = new Proxy(address(1));
+        vm.prank(address(1));
+        proxy.upgradeToAndCall(address(impl), abi.encodeCall(impl.initialize, address(this)));
+        factory = IDisputeGameFactory(address(proxy));
+
+        mockImpl = makeAddr("impl");
+        gameType = 999;
+    }
+
+    function test_run_succeeds() public {
+        input.set(input.factory.selector, address(factory));
+        input.set(input.impl.selector, mockImpl);
+        input.set(input.gameType.selector, gameType);
+
+        script.run(input);
+    }
+
+    function test_run_whenImplAlreadySet_reverts() public {
+        input.set(input.factory.selector, address(factory));
+        input.set(input.impl.selector, mockImpl);
+        input.set(input.gameType.selector, gameType);
+
+        // First run should succeed
+        script.run(input);
+
+        // Subsequent runs should revert
+        vm.expectRevert("SDGI-10");
+        script.run(input);
+    }
+
+    function test_assertValid_whenNotValid_reverts() public {
+        input.set(input.factory.selector, address(factory));
+        input.set(input.impl.selector, mockImpl);
+        input.set(input.gameType.selector, gameType);
+
+        // First run should succeed
+        script.run(input);
+
+        vm.broadcast(address(this));
+        factory.setImplementation(GameType.wrap(gameType), IDisputeGame(address(0)));
+
+        vm.expectRevert("SDGI-20");
+        script.assertValid(input);
+    }
+}

From 2f188a6073f864a091b5ff50ad3c4ecb1da4e784 Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Tue, 10 Dec 2024 20:21:22 +0100
Subject: [PATCH 427/451] Prepare Holocene Mainnet release (#13334)

---
 go.mod                          |  4 ++--
 go.sum                          |  8 ++++----
 op-node/chaincfg/chains_test.go | 32 ++++++++++++++++----------------
 op-node/rollup/superchain.go    |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/go.mod b/go.mod
index b28cb70089b2..2b8bf3ddf3a5 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/crate-crypto/go-kzg-4844 v1.0.0
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
-	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048
+	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241210175229-327d7af91761
 	github.com/ethereum/go-ethereum v1.14.11
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
@@ -251,7 +251,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.3-rc.1.0.20241126165630-b84907bf4d95
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.4-rc.2
 
 //replace github.com/ethereum/go-ethereum => ../go-ethereum
 
diff --git a/go.sum b/go.sum
index 5ee5e903e71a..9975b7ddaa47 100644
--- a/go.sum
+++ b/go.sum
@@ -189,10 +189,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.3-rc.1.0.20241126165630-b84907bf4d95 h1:4bgr/Y/Vl2lntFvFM6l/W6P8EWLMxAdF5CRnJStHGGI=
-github.com/ethereum-optimism/op-geth v1.101411.3-rc.1.0.20241126165630-b84907bf4d95/go.mod h1:zBADVb3+aon0Idb3uEg/1TFpep+Jdkz3ge9SLFDBXOo=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048 h1:kb220NeqVRRt/XP5JHt3i4zpLsYNCdWMM/0tDnOFk3o=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241126105717-d31591e83048/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
+github.com/ethereum-optimism/op-geth v1.101411.4-rc.2 h1:4u4RUlN3iwwRxYfHGfihjZ0fwY1bfCjFH5/4hVzrwCE=
+github.com/ethereum-optimism/op-geth v1.101411.4-rc.2/go.mod h1:1InG/wgdGY/PgH8BSkjUBd6DfoSHyEN3/v0OTFyywsw=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241210175229-327d7af91761 h1:sk8fDY7QJOhP/mOnEjMj9K8G+3dmPp5MVZsJu4lhZ2E=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241210175229-327d7af91761/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
 github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=
diff --git a/op-node/chaincfg/chains_test.go b/op-node/chaincfg/chains_test.go
index bd9956253cd5..fbb1247b9eb0 100644
--- a/op-node/chaincfg/chains_test.go
+++ b/op-node/chaincfg/chains_test.go
@@ -52,22 +52,22 @@ var mainnetCfg = rollup.Config{
 			GasLimit:    30_000_000,
 		},
 	},
-	BlockTime:              2,
-	MaxSequencerDrift:      600,
-	SeqWindowSize:          3600,
-	ChannelTimeoutBedrock:  300,
-	L1ChainID:              big.NewInt(1),
-	L2ChainID:              big.NewInt(10),
-	BatchInboxAddress:      common.HexToAddress("0xff00000000000000000000000000000000000010"),
-	DepositContractAddress: common.HexToAddress("0xbEb5Fc579115071764c7423A4f12eDde41f106Ed"),
-	L1SystemConfigAddress:  common.HexToAddress("0x229047fed2591dbec1eF1118d64F7aF3dB9EB290"),
-	RegolithTime:           u64Ptr(0),
-	CanyonTime:             u64Ptr(1704992401),
-	DeltaTime:              u64Ptr(1708560000),
-	EcotoneTime:            u64Ptr(1710374401),
-	FjordTime:              u64Ptr(1720627201),
-	GraniteTime:            u64Ptr(1726070401),
-	// HoloceneTime: TBD
+	BlockTime:               2,
+	MaxSequencerDrift:       600,
+	SeqWindowSize:           3600,
+	ChannelTimeoutBedrock:   300,
+	L1ChainID:               big.NewInt(1),
+	L2ChainID:               big.NewInt(10),
+	BatchInboxAddress:       common.HexToAddress("0xff00000000000000000000000000000000000010"),
+	DepositContractAddress:  common.HexToAddress("0xbEb5Fc579115071764c7423A4f12eDde41f106Ed"),
+	L1SystemConfigAddress:   common.HexToAddress("0x229047fed2591dbec1eF1118d64F7aF3dB9EB290"),
+	RegolithTime:            u64Ptr(0),
+	CanyonTime:              u64Ptr(1704992401),
+	DeltaTime:               u64Ptr(1708560000),
+	EcotoneTime:             u64Ptr(1710374401),
+	FjordTime:               u64Ptr(1720627201),
+	GraniteTime:             u64Ptr(1726070401),
+	HoloceneTime:            u64Ptr(1736445601),
 	ProtocolVersionsAddress: common.HexToAddress("0x8062AbC286f5e7D9428a0Ccb9AbD71e50d93b935"),
 }
 
diff --git a/op-node/rollup/superchain.go b/op-node/rollup/superchain.go
index 577a8dab7cea..ef6ed1f51676 100644
--- a/op-node/rollup/superchain.go
+++ b/op-node/rollup/superchain.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum-optimism/superchain-registry/superchain"
 )
 
-var OPStackSupport = params.ProtocolVersionV0{Build: [8]byte{}, Major: 9, Minor: 0, Patch: 0, PreRelease: 1}.Encode()
+var OPStackSupport = params.ProtocolVersionV0{Build: [8]byte{}, Major: 9, Minor: 0, Patch: 0, PreRelease: 0}.Encode()
 
 // LoadOPStackRollupConfig loads the rollup configuration of the requested chain ID from the superchain-registry.
 // Some chains may require a SystemConfigProvider to retrieve any values not part of the registry.

From 6cfe76f1ab38132bd5812362048232dbb35d7929 Mon Sep 17 00:00:00 2001
From: protolambda <proto@protolambda.com>
Date: Tue, 10 Dec 2024 22:16:33 +0100
Subject: [PATCH 428/451] op-supervisor,op-node: introduce follow/managed
 interop mode (#13285)

* op-supervisor,op-node: introduce follow/managed interop mode v2

* interop: test workaround, serve supervisor while using old deriver

* interop: fix API setup/usage, fix action test setup

* op-node: fix interop server endpoint getter

* interop: minor fixes, update TODO references
---
 interop-devnet/docker-compose.yml             |  13 +-
 op-e2e/actions/helpers/l2_verifier.go         |  23 ++++
 op-e2e/actions/interop/interop.go             |   8 +-
 op-e2e/e2eutils/opnode/opnode.go              |   5 +
 op-e2e/interop/supersystem.go                 |  34 ++---
 op-node/flags/flags.go                        |  47 +++++--
 op-node/node/client.go                        |  26 ----
 op-node/node/config.go                        |  14 +-
 op-node/node/node.go                          |  31 +++--
 op-node/rollup/interop/config.go              |  83 ++++++++++++
 op-node/rollup/interop/iface.go               |  24 ++++
 op-node/rollup/interop/interop.go             |   2 +-
 op-node/rollup/interop/managed.go             | 125 ++++++++++++++++++
 op-node/rollup/interop/standard.go            |  42 ++++++
 op-node/rollup/interop/tmpapi.go              |  76 +++++++++++
 op-node/service.go                            |  59 +++------
 op-service/rpc/jwt.go                         |  51 +++++++
 op-service/rpc/server.go                      |  12 ++
 op-service/sources/eth_client.go              |  52 ++++++++
 op-service/sources/l1_client.go               |  48 +------
 op-service/sources/l2_client.go               |   1 +
 op-service/sources/supervisor_client.go       |   4 +-
 op-service/testutils/mock_eth_client.go       |  27 ++++
 op-supervisor/cmd/main_test.go                |  31 +++--
 op-supervisor/config/config.go                |  19 ++-
 op-supervisor/config/config_test.go           |   9 +-
 op-supervisor/flags/flags.go                  |  43 +++++-
 op-supervisor/supervisor/backend/backend.go   |  72 ++++------
 .../supervisor/backend/backend_test.go        |  57 +++++---
 op-supervisor/supervisor/backend/mock.go      |   2 +-
 .../backend/processors/chain_processor.go     |   8 +-
 .../supervisor/backend/syncsrc/collection.go  |  66 +++++++++
 .../supervisor/backend/syncsrc/dial.go        |  42 ++++++
 .../supervisor/backend/syncsrc/iface.go       |  33 +++++
 .../supervisor/backend/syncsrc/rpc.go         |  70 ++++++++++
 op-supervisor/supervisor/frontend/frontend.go |   6 +-
 op-supervisor/supervisor/service.go           |  11 --
 37 files changed, 1012 insertions(+), 264 deletions(-)
 create mode 100644 op-node/rollup/interop/config.go
 create mode 100644 op-node/rollup/interop/iface.go
 create mode 100644 op-node/rollup/interop/managed.go
 create mode 100644 op-node/rollup/interop/standard.go
 create mode 100644 op-node/rollup/interop/tmpapi.go
 create mode 100644 op-service/rpc/jwt.go
 create mode 100644 op-supervisor/supervisor/backend/syncsrc/collection.go
 create mode 100644 op-supervisor/supervisor/backend/syncsrc/dial.go
 create mode 100644 op-supervisor/supervisor/backend/syncsrc/iface.go
 create mode 100644 op-supervisor/supervisor/backend/syncsrc/rpc.go

diff --git a/interop-devnet/docker-compose.yml b/interop-devnet/docker-compose.yml
index c4cbab978a12..386967df7c89 100644
--- a/interop-devnet/docker-compose.yml
+++ b/interop-devnet/docker-compose.yml
@@ -89,11 +89,10 @@ services:
       op-supervisor
       --datadir="/db"
       --dependency-set="/depset.json"
-      --l2-rpcs=""
       --rpc.addr="0.0.0.0"
       --rpc.port=8545
       --rpc.enable-admin
-      --l2-rpcs="ws://l2-a:8546,ws://l2-b:8546"
+      --l2-consensus.nodes="http://op-node-a:9645,http://op-node-b:9645"
     environment:
       OP_SUPERVISOR_METRICS_ENABLED: "true"
 
@@ -157,7 +156,9 @@ services:
       --l1.http-poll-interval=6s
       --l2=http://l2-a:8551
       --l2.jwt-secret=/config/jwt-secret.txt
-      --supervisor=http://op-supervisor:8545
+      --interop.supervisor=http://op-supervisor:8545
+      --interop.rpc.addr=0.0.0.0
+      --interop.rpc.port=9645
       --sequencer.enabled
       --sequencer.l1-confs=0
       --verifier.l1-confs=0
@@ -180,6 +181,7 @@ services:
       - "9103:9003"
       - "7100:7300"
       - "6160:6060"
+      - "9645:9645"
     volumes:
       - "safedb_a_data:/db"
       - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
@@ -208,7 +210,9 @@ services:
       --l1.http-poll-interval=6s
       --l2=http://l2-b:8551
       --l2.jwt-secret=/config/jwt-secret.txt
-      --supervisor=http://op-supervisor:8545
+      --interop.supervisor=http://op-supervisor:8545
+      --interop.rpc.addr=0.0.0.0
+      --interop.rpc.port=9645
       --sequencer.enabled
       --sequencer.l1-confs=0
       --verifier.l1-confs=0
@@ -231,6 +235,7 @@ services:
       - "9203:9003"
       - "7200:7300"
       - "6260:6060"
+      - "9645:9645"
     volumes:
       - "safedb_b_data:/db"
       - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
diff --git a/op-e2e/actions/helpers/l2_verifier.go b/op-e2e/actions/helpers/l2_verifier.go
index 6f9d80169875..0e951e05ac81 100644
--- a/op-e2e/actions/helpers/l2_verifier.go
+++ b/op-e2e/actions/helpers/l2_verifier.go
@@ -5,11 +5,13 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math/big"
 
 	"github.com/stretchr/testify/require"
 	"golang.org/x/time/rate"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 	gnode "github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -31,6 +33,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/safego"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/testutils"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 )
 
 // L2Verifier is an actor that functions like a rollup node,
@@ -65,6 +68,8 @@ type L2Verifier struct {
 
 	rpc *rpc.Server
 
+	interopRPC *rpc.Server
+
 	failRPC func(call []rpc.BatchElem) error // mock error
 
 	// The L2Verifier actor is embedded in the L2Sequencer actor,
@@ -79,6 +84,10 @@ type L2API interface {
 	// GetProof returns a proof of the account, it may return a nil result without error if the address was not found.
 	GetProof(ctx context.Context, address common.Address, storage []common.Hash, blockTag string) (*eth.AccountResult, error)
 	OutputV0AtBlock(ctx context.Context, blockHash common.Hash) (*eth.OutputV0, error)
+
+	FetchReceipts(ctx context.Context, blockHash common.Hash) (eth.BlockInfo, types.Receipts, error)
+	BlockRefByNumber(ctx context.Context, num uint64) (eth.BlockRef, error)
+	ChainID(ctx context.Context) (*big.Int, error)
 }
 
 type safeDB interface {
@@ -181,6 +190,13 @@ func NewL2Verifier(t Testing, log log.Logger, l1 derive.L1Fetcher,
 
 	t.Cleanup(rollupNode.rpc.Stop)
 
+	if cfg.InteropTime != nil {
+		rollupNode.interopRPC = rpc.NewServer()
+		api := &interop.TemporaryInteropAPI{Eng: eng}
+		require.NoError(t, rollupNode.interopRPC.RegisterName("interop", api))
+		t.Cleanup(rollupNode.interopRPC.Stop)
+	}
+
 	// setup RPC server for rollup node, hooked to the actor as backend
 	m := &testutils.TestRPCMetrics{}
 	backend := &l2VerifierBackend{verifier: rollupNode}
@@ -203,6 +219,13 @@ func NewL2Verifier(t Testing, log log.Logger, l1 derive.L1Fetcher,
 	return rollupNode
 }
 
+func (v *L2Verifier) InteropSyncSource(t Testing) syncsrc.SyncSource {
+	require.NotNil(t, v.interopRPC, "interop rpc must be running")
+	cl := rpc.DialInProc(v.interopRPC)
+	bCl := client.NewBaseRPCClient(cl)
+	return syncsrc.NewRPCSyncSource("action-tests-l2-verifier", bCl)
+}
+
 type l2VerifierBackend struct {
 	verifier *L2Verifier
 }
diff --git a/op-e2e/actions/interop/interop.go b/op-e2e/actions/interop/interop.go
index 4ac2b0cb80ff..0129e248a47e 100644
--- a/op-e2e/actions/interop/interop.go
+++ b/op-e2e/actions/interop/interop.go
@@ -27,6 +27,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/metrics"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/frontend"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -109,8 +110,10 @@ func (is *InteropSetup) CreateActors() *InteropActors {
 	chainA := createL2Services(is.T, is.Log, l1Miner, is.Keys, is.Out.L2s["900200"], supervisorAPI)
 	chainB := createL2Services(is.T, is.Log, l1Miner, is.Keys, is.Out.L2s["900201"], supervisorAPI)
 	// Hook up L2 RPCs to supervisor, to fetch event data from
-	require.NoError(is.T, supervisorAPI.AddL2RPC(is.T.Ctx(), chainA.SequencerEngine.HTTPEndpoint()))
-	require.NoError(is.T, supervisorAPI.AddL2RPC(is.T.Ctx(), chainB.SequencerEngine.HTTPEndpoint()))
+	srcA := chainA.Sequencer.InteropSyncSource(is.T)
+	srcB := chainB.Sequencer.InteropSyncSource(is.T)
+	require.NoError(is.T, supervisorAPI.backend.AttachSyncSource(is.T.Ctx(), srcA))
+	require.NoError(is.T, supervisorAPI.backend.AttachSyncSource(is.T.Ctx(), srcB))
 	return &InteropActors{
 		L1Miner:    l1Miner,
 		Supervisor: supervisorAPI,
@@ -163,6 +166,7 @@ func NewSupervisor(t helpers.Testing, logger log.Logger, depSet depset.Dependenc
 		DependencySetSource:   depSet,
 		SynchronousProcessors: true,
 		Datadir:               supervisorDataDir,
+		SyncSources:           &syncsrc.CLISyncSources{}, // sources are added dynamically afterwards
 	}
 	b, err := backend.NewSupervisorBackend(t.Ctx(),
 		logger.New("role", "supervisor"), metrics.NoopMetrics, svCfg)
diff --git a/op-e2e/e2eutils/opnode/opnode.go b/op-e2e/e2eutils/opnode/opnode.go
index b21e62e62b36..fa6349ca1473 100644
--- a/op-e2e/e2eutils/opnode/opnode.go
+++ b/op-e2e/e2eutils/opnode/opnode.go
@@ -11,12 +11,17 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
 	"github.com/ethereum-optimism/optimism/op-service/endpoint"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
 type Opnode struct {
 	node *rollupNode.OpNode
 }
 
+func (o *Opnode) InteropRPC() (endpoint string, jwtSecret eth.Bytes32) {
+	return o.node.InteropRPC()
+}
+
 func (o *Opnode) UserRPC() endpoint.RPC {
 	return endpoint.HttpURL(o.node.HTTPEndpoint())
 }
diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index 158f5d61ec7f..209b88bdc583 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -11,9 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum/go-ethereum/eth/ethconfig"
-	gn "github.com/ethereum/go-ethereum/node"
-
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -21,16 +18,12 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/eth/ethconfig"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
+	gn "github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"
 
-	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/emit"
-	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/inbox"
-	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/systemconfig"
-	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
-	"github.com/ethereum-optimism/optimism/op-service/predeploys"
-
 	bss "github.com/ethereum-optimism/optimism/op-batcher/batcher"
 	batcherFlags "github.com/ethereum-optimism/optimism/op-batcher/flags"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
@@ -39,14 +32,19 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/fakebeacon"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/geth"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/emit"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/inbox"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/interop/contracts/bindings/systemconfig"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/opnode"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/services"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/setuputils"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
 	"github.com/ethereum-optimism/optimism/op-e2e/system/helpers"
 	"github.com/ethereum-optimism/optimism/op-node/node"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/interop"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
 	l2os "github.com/ethereum-optimism/optimism/op-proposer/proposer"
 	"github.com/ethereum-optimism/optimism/op-service/client"
@@ -56,12 +54,14 @@ import (
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
 	"github.com/ethereum-optimism/optimism/op-service/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/oppprof"
+	"github.com/ethereum-optimism/optimism/op-service/predeploys"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	supervisorConfig "github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 	supervisortypes "github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -317,8 +317,11 @@ func (s *interopE2ESystem) newNodeForL2(
 			ListenPort:  0,
 			EnableAdmin: true,
 		},
-		Supervisor: &node.SupervisorEndpointConfig{
-			SupervisorAddr: s.supervisor.RPC(),
+		InteropConfig: &interop.Config{
+			SupervisorAddr:   s.supervisor.RPC(),
+			RPCAddr:          "127.0.0.1",
+			RPCPort:          0,
+			RPCJwtSecretPath: "",
 		},
 		P2P:                         nil, // disabled P2P setup for now
 		L1EpochPollInterval:         time.Second * 2,
@@ -479,9 +482,9 @@ func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 			ListenPort:  0,
 			EnableAdmin: true,
 		},
-		L2RPCs:  []string{},
-		L1RPC:   s.l1.UserRPC().RPC(),
-		Datadir: path.Join(s.t.TempDir(), "supervisor"),
+		SyncSources: &syncsrc.CLISyncSources{}, // no sync-sources
+		L1RPC:       s.l1.UserRPC().RPC(),
+		Datadir:     path.Join(s.t.TempDir(), "supervisor"),
 	}
 	depSet := make(map[supervisortypes.ChainID]*depset.StaticConfigDependency)
 
@@ -549,7 +552,8 @@ func (s *interopE2ESystem) prepare(t *testing.T, w worldResourcePaths) {
 	// add the L2 RPCs to the supervisor now that the L2s are created
 	ctx := context.Background()
 	for _, l2 := range s.l2s {
-		err := s.SupervisorClient().AddL2RPC(ctx, l2.l2Geth.UserRPC().RPC())
+		rpcEndpoint, secret := l2.opNode.InteropRPC()
+		err := s.SupervisorClient().AddL2RPC(ctx, rpcEndpoint, secret)
 		require.NoError(s.t, err, "failed to add L2 RPC to supervisor")
 	}
 
diff --git a/op-node/flags/flags.go b/op-node/flags/flags.go
index de94b59c0e04..dc02e0272092 100644
--- a/op-node/flags/flags.go
+++ b/op-node/flags/flags.go
@@ -28,6 +28,7 @@ const (
 	P2PCategory        = "5. PEER-TO-PEER"
 	AltDACategory      = "6. ALT-DA (EXPERIMENTAL)"
 	MiscCategory       = "7. MISC"
+	InteropCategory    = "8. INTEROP (SUPER EXPERIMENTAL)"
 )
 
 func init() {
@@ -74,13 +75,6 @@ var (
 		Category: RollupCategory,
 	}
 	/* Optional Flags */
-	SupervisorAddr = &cli.StringFlag{
-		Name: "supervisor",
-		Usage: "RPC address of interop supervisor service for cross-chain safety verification." +
-			"Applies only to Interop-enabled networks.",
-		Hidden:  true, // hidden for now during early testing.
-		EnvVars: prefixEnvVars("SUPERVISOR"),
-	}
 	BeaconHeader = &cli.StringFlag{
 		Name:     "l1.beacon-header",
 		Usage:    "Optional HTTP header to add to all requests to the L1 Beacon endpoint. Format: 'X-Key: Value'",
@@ -372,6 +366,40 @@ var (
 		Value:    time.Second * 1,
 		Category: SequencerCategory,
 	}
+	/* Interop flags, experimental. */
+	InteropSupervisor = &cli.StringFlag{
+		Name: "interop.supervisor",
+		Usage: "Interop standard-mode: RPC address of interop supervisor to use for cross-chain safety verification." +
+			"Applies only to Interop-enabled networks.",
+		EnvVars:  prefixEnvVars("INTEROP_SUPERVISOR"),
+		Category: InteropCategory,
+	}
+	InteropRPCAddr = &cli.StringFlag{
+		Name: "interop.rpc.addr",
+		Usage: "Interop Websocket-only RPC listening address, to serve supervisor syncing." +
+			"Applies only to Interop-enabled networks. Optional, alternative to follow-mode.",
+		EnvVars:  prefixEnvVars("INTEROP_RPC_ADDR"),
+		Value:    "127.0.0.1",
+		Category: InteropCategory,
+	}
+	InteropRPCPort = &cli.IntFlag{
+		Name: "interop.rpc.port",
+		Usage: "Interop RPC listening port, to serve supervisor syncing." +
+			"Applies only to Interop-enabled networks.",
+		EnvVars:  prefixEnvVars("INTEROP_RPC_PORT"),
+		Value:    9645, // Note: op-service/rpc/cli.go uses 8545 as the default.
+		Category: InteropCategory,
+	}
+	InteropJWTSecret = &cli.StringFlag{
+		Name: "interop.jwt-secret",
+		Usage: "Interop RPC server authentication. Path to JWT secret key. Keys are 32 bytes, hex encoded in a file. " +
+			"A new key will be generated if the file is empty. " +
+			"Applies only to Interop-enabled networks.",
+		EnvVars:     prefixEnvVars("INTEROP_JWT_SECRET"),
+		Value:       "",
+		Destination: new(string),
+		Category:    InteropCategory,
+	}
 )
 
 var requiredFlags = []cli.Flag{
@@ -381,7 +409,6 @@ var requiredFlags = []cli.Flag{
 }
 
 var optionalFlags = []cli.Flag{
-	SupervisorAddr,
 	BeaconAddr,
 	BeaconHeader,
 	BeaconFallbackAddrs,
@@ -419,6 +446,10 @@ var optionalFlags = []cli.Flag{
 	ConductorRpcTimeoutFlag,
 	SafeDBPath,
 	L2EngineKind,
+	InteropSupervisor,
+	InteropRPCAddr,
+	InteropRPCPort,
+	InteropJWTSecret,
 }
 
 var DeprecatedFlags = []cli.Flag{
diff --git a/op-node/node/client.go b/op-node/node/client.go
index 796375a84365..d8df28daebf7 100644
--- a/op-node/node/client.go
+++ b/op-node/node/client.go
@@ -230,29 +230,3 @@ func parseHTTPHeader(headerStr string) (http.Header, error) {
 	h.Add(s[0], s[1])
 	return h, nil
 }
-
-type SupervisorEndpointSetup interface {
-	SupervisorClient(ctx context.Context, log log.Logger) (*sources.SupervisorClient, error)
-	Check() error
-}
-
-type SupervisorEndpointConfig struct {
-	SupervisorAddr string
-}
-
-var _ SupervisorEndpointSetup = (*SupervisorEndpointConfig)(nil)
-
-func (cfg *SupervisorEndpointConfig) Check() error {
-	if cfg.SupervisorAddr == "" {
-		return errors.New("supervisor RPC address is not set")
-	}
-	return nil
-}
-
-func (cfg *SupervisorEndpointConfig) SupervisorClient(ctx context.Context, log log.Logger) (*sources.SupervisorClient, error) {
-	cl, err := client.NewRPC(ctx, log, cfg.SupervisorAddr, client.WithLazyDial())
-	if err != nil {
-		return nil, fmt.Errorf("failed to create supervisor RPC: %w", err)
-	}
-	return sources.NewSupervisorClient(cl), nil
-}
diff --git a/op-node/node/config.go b/op-node/node/config.go
index 6591a756e715..5cbb5b9de166 100644
--- a/op-node/node/config.go
+++ b/op-node/node/config.go
@@ -7,14 +7,16 @@ import (
 	"math"
 	"time"
 
+	"github.com/ethereum/go-ethereum/log"
+
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	"github.com/ethereum-optimism/optimism/op-node/flags"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/interop"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
 	"github.com/ethereum-optimism/optimism/op-service/oppprof"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 type Config struct {
@@ -23,7 +25,7 @@ type Config struct {
 
 	Beacon L1BeaconEndpointSetup
 
-	Supervisor SupervisorEndpointSetup
+	InteropConfig interop.Setup
 
 	Driver driver.Config
 
@@ -142,11 +144,11 @@ func (cfg *Config) Check() error {
 		}
 	}
 	if cfg.Rollup.InteropTime != nil {
-		if cfg.Supervisor == nil {
-			return fmt.Errorf("the Interop upgrade is scheduled (timestamp = %d) but no supervisor RPC endpoint is configured", *cfg.Rollup.InteropTime)
+		if cfg.InteropConfig == nil {
+			return fmt.Errorf("the Interop upgrade is scheduled (timestamp = %d) but no interop node config is set", *cfg.Rollup.InteropTime)
 		}
-		if err := cfg.Supervisor.Check(); err != nil {
-			return fmt.Errorf("misconfigured supervisor RPC endpoint: %w", err)
+		if err := cfg.InteropConfig.Check(); err != nil {
+			return fmt.Errorf("misconfigured interop: %w", err)
 		}
 	}
 	if err := cfg.Rollup.Check(); err != nil {
diff --git a/op-node/node/node.go b/op-node/node/node.go
index 8bf8040b465c..70558dda5684 100644
--- a/op-node/node/node.go
+++ b/op-node/node/node.go
@@ -24,6 +24,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-node/rollup/conductor"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/event"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/interop"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sequencing"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
 	"github.com/ethereum-optimism/optimism/op-service/client"
@@ -75,7 +76,8 @@ type OpNode struct {
 
 	beacon *sources.L1BeaconClient
 
-	supervisor *sources.SupervisorClient
+	supervisor       *sources.SupervisorClient
+	tmpInteropServer *interop.TemporaryInteropServer
 
 	// some resources cannot be stopped directly, like the p2p gossipsub router (not our design),
 	// and depend on this ctx to be closed.
@@ -398,11 +400,12 @@ func (n *OpNode) initL2(ctx context.Context, cfg *Config) error {
 	}
 
 	if cfg.Rollup.InteropTime != nil {
-		cl, err := cfg.Supervisor.SupervisorClient(ctx, n.log)
+		cl, srv, err := cfg.InteropConfig.TemporarySetup(ctx, n.log, n.l2Source)
 		if err != nil {
-			return fmt.Errorf("failed to setup supervisor RPC client: %w", err)
+			return fmt.Errorf("failed to setup interop: %w", err)
 		}
 		n.supervisor = cl
+		n.tmpInteropServer = srv
 	}
 
 	var sequencerConductor conductor.SequencerConductor = &conductor.NoOpConductor{}
@@ -717,6 +720,16 @@ func (n *OpNode) Stop(ctx context.Context) error {
 		}
 	}
 
+	// close the interop sub system
+	if n.supervisor != nil {
+		n.supervisor.Close()
+	}
+	if n.tmpInteropServer != nil {
+		if err := n.tmpInteropServer.Close(); err != nil {
+			result = multierror.Append(result, fmt.Errorf("failed to close interop RPC server: %w", err))
+		}
+	}
+
 	if n.eventSys != nil {
 		n.eventSys.Stop()
 	}
@@ -737,11 +750,6 @@ func (n *OpNode) Stop(ctx context.Context) error {
 		n.l2Source.Close()
 	}
 
-	// close the supervisor RPC client
-	if n.supervisor != nil {
-		n.supervisor.Close()
-	}
-
 	// close L1 data source
 	if n.l1Source != nil {
 		n.l1Source.Close()
@@ -788,6 +796,13 @@ func (n *OpNode) HTTPEndpoint() string {
 	return fmt.Sprintf("http://%s", n.server.Addr().String())
 }
 
+func (n *OpNode) InteropRPC() (rpcEndpoint string, jwtSecret eth.Bytes32) {
+	if n.tmpInteropServer == nil {
+		return "", [32]byte{}
+	}
+	return n.tmpInteropServer.Endpoint(), [32]byte{} // tmp server has no secret
+}
+
 func (n *OpNode) getP2PNodeIfEnabled() *p2p.NodeP2P {
 	if !n.p2pEnabled() {
 		return nil
diff --git a/op-node/rollup/interop/config.go b/op-node/rollup/interop/config.go
new file mode 100644
index 000000000000..74a247de0741
--- /dev/null
+++ b/op-node/rollup/interop/config.go
@@ -0,0 +1,83 @@
+package interop
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-service/client"
+	"github.com/ethereum-optimism/optimism/op-service/rpc"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
+)
+
+type Config struct {
+	// SupervisorAddr to follow for cross-chain safety updates.
+	// Non-empty if running in follow-mode.
+	// Cannot be set if RPCAddr is set.
+	SupervisorAddr string
+
+	// RPCAddr address to bind RPC server to, to serve external supervisor nodes.
+	// Cannot be set if SupervisorAddr is set.
+	RPCAddr string
+	// RPCPort port to bind RPC server to, to serve external supervisor nodes.
+	// Binds to any available port if set to 0.
+	// Only applicable if RPCAddr is set.
+	RPCPort int
+	// RPCJwtSecretPath path of JWT secret file to apply authentication to the interop server address.
+	RPCJwtSecretPath string
+}
+
+func (cfg *Config) Check() error {
+	// TODO(#13338): temporary workaround needs both to be configured.
+	//if (cfg.SupervisorAddr == "") != (cfg.RPCAddr == "") {
+	//	return errors.New("must have either a supervisor RPC endpoint to follow, or interop RPC address to serve from")
+	//}
+	return nil
+}
+
+func (cfg *Config) Setup(ctx context.Context, logger log.Logger) (SubSystem, error) {
+	if cfg.RPCAddr != "" {
+		logger.Info("Setting up Interop RPC server to serve supervisor sync work")
+		// Load JWT secret, if any, generate one otherwise.
+		jwtSecret, err := rpc.ObtainJWTSecret(logger, cfg.RPCJwtSecretPath, true)
+		if err != nil {
+			return nil, err
+		}
+		out := &ManagedMode{}
+		out.srv = rpc.NewServer(cfg.RPCAddr, cfg.RPCPort, "v0.0.0",
+			rpc.WithWebsocketEnabled(), rpc.WithJWTSecret(jwtSecret[:]))
+		return out, nil
+	} else {
+		logger.Info("Setting up Interop RPC client to sync from read-only supervisor")
+		cl, err := client.NewRPC(ctx, logger, cfg.SupervisorAddr, client.WithLazyDial())
+		if err != nil {
+			return nil, fmt.Errorf("failed to create supervisor RPC: %w", err)
+		}
+		out := &StandardMode{}
+		out.cl = sources.NewSupervisorClient(cl)
+		return out, nil
+	}
+}
+
+// TemporarySetup is a work-around until ManagedMode and StandardMode are ready for use.
+func (cfg *Config) TemporarySetup(ctx context.Context, logger log.Logger, eng Engine) (
+	*sources.SupervisorClient, *TemporaryInteropServer, error) {
+	logger.Info("Setting up Interop RPC client run interop legacy deriver with supervisor API")
+	if cfg.SupervisorAddr == "" {
+		return nil, nil, errors.New("supervisor RPC is required for legacy interop deriver")
+	}
+	cl, err := client.NewRPC(ctx, logger, cfg.SupervisorAddr, client.WithLazyDial())
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to create supervisor RPC: %w", err)
+	}
+	scl := sources.NewSupervisorClient(cl)
+	// Note: there's no JWT secret on the temp RPC server workaround
+	srv := NewTemporaryInteropServer(cfg.RPCAddr, cfg.RPCPort, eng)
+	if err := srv.Start(); err != nil {
+		scl.Close()
+		return nil, nil, fmt.Errorf("failed to start interop RPC server: %w", err)
+	}
+	return scl, srv, nil
+}
diff --git a/op-node/rollup/interop/iface.go b/op-node/rollup/interop/iface.go
new file mode 100644
index 000000000000..128975dbcad7
--- /dev/null
+++ b/op-node/rollup/interop/iface.go
@@ -0,0 +1,24 @@
+package interop
+
+import (
+	"context"
+
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup/event"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
+)
+
+type SubSystem interface {
+	event.Deriver
+	event.AttachEmitter
+	Start(ctx context.Context) error
+	Stop(ctx context.Context) error
+}
+
+type Setup interface {
+	Setup(ctx context.Context, logger log.Logger) (SubSystem, error)
+	TemporarySetup(ctx context.Context, logger log.Logger, eng Engine) (
+		*sources.SupervisorClient, *TemporaryInteropServer, error)
+	Check() error
+}
diff --git a/op-node/rollup/interop/interop.go b/op-node/rollup/interop/interop.go
index 94fa77a5b309..2be92eb4d3a2 100644
--- a/op-node/rollup/interop/interop.go
+++ b/op-node/rollup/interop/interop.go
@@ -228,7 +228,7 @@ func (d *InteropDeriver) onCrossSafeUpdateEvent(x engine.CrossSafeUpdateEvent) e
 	}
 	if result.Cross.Number < x.CrossSafe.Number {
 		d.log.Warn("op-supervisor is behind known cross-safe block", "supervisor", result.Cross, "known", x.CrossSafe)
-		// TODO: we may want to force set the cross-safe block in the engine,
+		// TODO(#13337): we may want to force set the cross-safe block in the engine,
 		//  and then reset derivation, so this op-node can help get the supervisor back in sync.
 		return nil
 	}
diff --git a/op-node/rollup/interop/managed.go b/op-node/rollup/interop/managed.go
new file mode 100644
index 000000000000..e994923fe5e4
--- /dev/null
+++ b/op-node/rollup/interop/managed.go
@@ -0,0 +1,125 @@
+package interop
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
+	gethrpc "github.com/ethereum/go-ethereum/rpc"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup/event"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/rpc"
+	supervisortypes "github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+// ManagedMode makes the op-node managed by an op-supervisor,
+// by serving sync work and updating the canonical chain based on instructions.
+type ManagedMode struct {
+	log log.Logger
+
+	emitter event.Emitter
+
+	srv *rpc.Server
+}
+
+var _ SubSystem = (*ManagedMode)(nil)
+
+func (s *ManagedMode) AttachEmitter(em event.Emitter) {
+	s.emitter = em
+}
+
+func (s *ManagedMode) OnEvent(ev event.Event) bool {
+	// TODO(#13336): let all active subscriptions now
+	return false
+}
+
+func (s *ManagedMode) Start(ctx context.Context) error {
+	interopAPI := &InteropAPI{}
+	s.srv.AddAPI(gethrpc.API{
+		Namespace:     "interop",
+		Service:       interopAPI,
+		Authenticated: true,
+	})
+	if err := s.srv.Start(); err != nil {
+		return fmt.Errorf("failed to start interop RPC server: %w", err)
+	}
+
+	return nil
+}
+
+func (s *ManagedMode) Stop(ctx context.Context) error {
+	// TODO(#13336): toggle closing state
+
+	// stop RPC server
+	if err := s.srv.Stop(); err != nil {
+		return fmt.Errorf("failed to stop interop sub-system RPC server: %w", err)
+	}
+
+	s.log.Info("Interop sub-system stopped")
+	return nil
+}
+
+type InteropAPI struct {
+	// TODO(#13336): event emitter handle
+	// TODO(#13336): event await util
+}
+
+func (ib *InteropAPI) SubscribeUnsafeBlocks(ctx context.Context) (*gethrpc.Subscription, error) {
+	// TODO(#13336): create subscription, and get new unsafe-block events to feed into it
+	return nil, nil
+}
+
+func (ib *InteropAPI) UpdateCrossUnsafe(ctx context.Context, ref eth.BlockRef) error {
+	// TODO(#13336): cross-unsafe update -> fire event
+	// TODO(#13336): await engine update or ctx timeout -> error maybe
+	return nil
+}
+
+func (ib *InteropAPI) UpdateCrossSafe(ctx context.Context, ref eth.BlockRef) error {
+	// TODO(#13336): cross-safe update -> fire event
+	// TODO(#13336): await forkchoice update or ctx timeout -> error maybe
+	return nil
+}
+
+func (ib *InteropAPI) UpdateFinalized(ctx context.Context, ref eth.BlockRef) error {
+	// TODO(#13336): finalized update -> fire event
+	// TODO(#13336): await forkchoice update or ctx timeout -> error maybe
+	return nil
+}
+
+func (ib *InteropAPI) AnchorPoint(ctx context.Context) (l1, l2 eth.BlockRef, err error) {
+	// TODO(#13336): return genesis anchor point from rollup config
+	return
+}
+
+func (ib *InteropAPI) Reset(ctx context.Context) error {
+	// TODO(#13336): fire reset event
+	// TODO(#13336): await reset-confirmed event or ctx timeout
+	return nil
+}
+
+func (ib *InteropAPI) TryDeriveNext(ctx context.Context, nextL1 eth.BlockRef) error {
+	// TODO(#13336): fire derivation step event
+	// TODO(#13336): await deriver progress (L1 or L2 kind of progress) or ctx timeout
+	// TODO(#13336): need to not auto-derive the next thing until next TryDeriveNext call: need to modify driver
+	// TODO(#13336): return the L1 or L2 progress
+	return nil
+}
+
+func (ib *InteropAPI) FetchReceipts(ctx context.Context, blockHash common.Hash) (types.Receipts, error) {
+	// TODO(#13336): use execution engine to fetch the receipts
+	return nil, nil
+}
+
+func (ib *InteropAPI) BlockRefByNumber(ctx context.Context, num uint64) (eth.BlockRef, error) {
+	// (#13336): use execution engine to fetch block-ref by number
+	return eth.BlockRef{}, nil
+}
+
+func (ib *InteropAPI) ChainID(ctx context.Context) (supervisortypes.ChainID, error) {
+	// (#13336): fetch chain ID
+	return supervisortypes.ChainID{}, nil
+}
diff --git a/op-node/rollup/interop/standard.go b/op-node/rollup/interop/standard.go
new file mode 100644
index 000000000000..a0c8ca2ee543
--- /dev/null
+++ b/op-node/rollup/interop/standard.go
@@ -0,0 +1,42 @@
+package interop
+
+import (
+	"context"
+
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-node/rollup/event"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
+)
+
+// StandardMode makes the op-node follow the canonical chain based on a read-only supervisor endpoint.
+type StandardMode struct {
+	log log.Logger
+
+	emitter event.Emitter
+
+	cl *sources.SupervisorClient
+}
+
+var _ SubSystem = (*StandardMode)(nil)
+
+func (s *StandardMode) AttachEmitter(em event.Emitter) {
+	s.emitter = em
+}
+
+func (s *StandardMode) OnEvent(ev event.Event) bool {
+	// TODO(#13337): hook up to existing interop deriver
+	return false
+}
+
+func (s *StandardMode) Start(ctx context.Context) error {
+	s.log.Info("Interop sub-system started in follow-mode")
+	return nil
+}
+
+func (s *StandardMode) Stop(ctx context.Context) error {
+	// TODO(#13337) toggle closing state
+
+	s.log.Info("Interop sub-system stopped")
+	return s.cl.Stop(ctx)
+}
diff --git a/op-node/rollup/interop/tmpapi.go b/op-node/rollup/interop/tmpapi.go
new file mode 100644
index 000000000000..19592c0d60a9
--- /dev/null
+++ b/op-node/rollup/interop/tmpapi.go
@@ -0,0 +1,76 @@
+package interop
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	gethrpc "github.com/ethereum/go-ethereum/rpc"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/rpc"
+	supervisortypes "github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+// TemporaryInteropServer is a work-around to serve the "managed"-
+// mode endpoints used by the op-supervisor for data,
+// while still using the old interop deriver for syncing.
+type TemporaryInteropServer struct {
+	srv *rpc.Server
+}
+
+func NewTemporaryInteropServer(host string, port int, eng Engine) *TemporaryInteropServer {
+	interopAPI := &TemporaryInteropAPI{Eng: eng}
+
+	srv := rpc.NewServer(host, port, "v0.0.1",
+		rpc.WithAPIs([]gethrpc.API{
+			{
+				Namespace:     "interop",
+				Service:       interopAPI,
+				Authenticated: false,
+			},
+		}))
+
+	return &TemporaryInteropServer{srv: srv}
+}
+
+func (s *TemporaryInteropServer) Start() error {
+	return s.srv.Start()
+}
+
+func (s *TemporaryInteropServer) Endpoint() string {
+	return fmt.Sprintf("http://%s", s.srv.Endpoint())
+}
+
+func (s *TemporaryInteropServer) Close() error {
+	return s.srv.Stop()
+}
+
+type Engine interface {
+	FetchReceipts(ctx context.Context, blockHash common.Hash) (eth.BlockInfo, types.Receipts, error)
+	BlockRefByNumber(ctx context.Context, num uint64) (eth.BlockRef, error)
+	ChainID(ctx context.Context) (*big.Int, error)
+}
+
+type TemporaryInteropAPI struct {
+	Eng Engine
+}
+
+func (ib *TemporaryInteropAPI) FetchReceipts(ctx context.Context, blockHash common.Hash) (types.Receipts, error) {
+	_, receipts, err := ib.Eng.FetchReceipts(ctx, blockHash)
+	return receipts, err
+}
+
+func (ib *TemporaryInteropAPI) BlockRefByNumber(ctx context.Context, num uint64) (eth.BlockRef, error) {
+	return ib.Eng.BlockRefByNumber(ctx, num)
+}
+
+func (ib *TemporaryInteropAPI) ChainID(ctx context.Context) (supervisortypes.ChainID, error) {
+	v, err := ib.Eng.ChainID(ctx)
+	if err != nil {
+		return supervisortypes.ChainID{}, err
+	}
+	return supervisortypes.ChainIDFromBig(v), nil
+}
diff --git a/op-node/service.go b/op-node/service.go
index 55c1c7173b74..d3e9c29b3c6b 100644
--- a/op-node/service.go
+++ b/op-node/service.go
@@ -2,31 +2,30 @@ package opnode
 
 import (
 	"context"
-	"crypto/rand"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"strings"
 
-	altda "github.com/ethereum-optimism/optimism/op-alt-da"
-	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
-	"github.com/ethereum-optimism/optimism/op-service/oppprof"
-	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/flags"
 	"github.com/ethereum-optimism/optimism/op-node/node"
 	p2pcli "github.com/ethereum-optimism/optimism/op-node/p2p/cli"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/driver"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/interop"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
 	opflags "github.com/ethereum-optimism/optimism/op-service/flags"
+	"github.com/ethereum-optimism/optimism/op-service/oppprof"
+	"github.com/ethereum-optimism/optimism/op-service/rpc"
+	"github.com/ethereum-optimism/optimism/op-service/sources"
 )
 
 // NewConfig creates a Config from the provided flags or environment variables.
@@ -83,12 +82,12 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 	}
 	conductorRPCEndpoint := ctx.String(flags.ConductorRpcFlag.Name)
 	cfg := &node.Config{
-		L1:         l1Endpoint,
-		L2:         l2Endpoint,
-		Rollup:     *rollupConfig,
-		Driver:     *driverConfig,
-		Beacon:     NewBeaconEndpointConfig(ctx),
-		Supervisor: NewSupervisorEndpointConfig(ctx),
+		L1:            l1Endpoint,
+		L2:            l2Endpoint,
+		Rollup:        *rollupConfig,
+		Driver:        *driverConfig,
+		Beacon:        NewBeaconEndpointConfig(ctx),
+		InteropConfig: NewSupervisorEndpointConfig(ctx),
 		RPC: node.RPCConfig{
 			ListenAddr:  ctx.String(flags.RPCListenAddr.Name),
 			ListenPort:  ctx.Int(flags.RPCListenPort.Name),
@@ -133,9 +132,12 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 	return cfg, nil
 }
 
-func NewSupervisorEndpointConfig(ctx *cli.Context) node.SupervisorEndpointSetup {
-	return &node.SupervisorEndpointConfig{
-		SupervisorAddr: ctx.String(flags.SupervisorAddr.Name),
+func NewSupervisorEndpointConfig(ctx *cli.Context) *interop.Config {
+	return &interop.Config{
+		SupervisorAddr:   ctx.String(flags.InteropSupervisor.Name),
+		RPCAddr:          ctx.String(flags.InteropRPCAddr.Name),
+		RPCPort:          ctx.Int(flags.InteropRPCPort.Name),
+		RPCJwtSecretPath: ctx.String(flags.InteropJWTSecret.Name),
 	}
 }
 
@@ -161,30 +163,13 @@ func NewL1EndpointConfig(ctx *cli.Context) *node.L1EndpointConfig {
 	}
 }
 
-func NewL2EndpointConfig(ctx *cli.Context, log log.Logger) (*node.L2EndpointConfig, error) {
+func NewL2EndpointConfig(ctx *cli.Context, logger log.Logger) (*node.L2EndpointConfig, error) {
 	l2Addr := ctx.String(flags.L2EngineAddr.Name)
 	fileName := ctx.String(flags.L2EngineJWTSecret.Name)
-	var secret [32]byte
-	fileName = strings.TrimSpace(fileName)
-	if fileName == "" {
-		return nil, fmt.Errorf("file-name of jwt secret is empty")
-	}
-	if data, err := os.ReadFile(fileName); err == nil {
-		jwtSecret := common.FromHex(strings.TrimSpace(string(data)))
-		if len(jwtSecret) != 32 {
-			return nil, fmt.Errorf("invalid jwt secret in path %s, not 32 hex-formatted bytes", fileName)
-		}
-		copy(secret[:], jwtSecret)
-	} else {
-		log.Warn("Failed to read JWT secret from file, generating a new one now. Configure L2 geth with --authrpc.jwt-secret=" + fmt.Sprintf("%q", fileName))
-		if _, err := io.ReadFull(rand.Reader, secret[:]); err != nil {
-			return nil, fmt.Errorf("failed to generate jwt secret: %w", err)
-		}
-		if err := os.WriteFile(fileName, []byte(hexutil.Encode(secret[:])), 0o600); err != nil {
-			return nil, err
-		}
+	secret, err := rpc.ObtainJWTSecret(logger, fileName, true)
+	if err != nil {
+		return nil, err
 	}
-
 	return &node.L2EndpointConfig{
 		L2EngineAddr:      l2Addr,
 		L2EngineJWTSecret: secret,
diff --git a/op-service/rpc/jwt.go b/op-service/rpc/jwt.go
new file mode 100644
index 000000000000..0e7d0a087dc2
--- /dev/null
+++ b/op-service/rpc/jwt.go
@@ -0,0 +1,51 @@
+package rpc
+
+import (
+	"crypto/rand"
+	"errors"
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"strings"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+// ObtainJWTSecret attempts to read a JWT secret, and generates one if necessary.
+// Unlike the geth rpc.ObtainJWTSecret variant, this uses local logging,
+// makes generation optional, and does not blindly overwrite a JWT secret on any read error.
+// Generally it is advised to generate a JWT secret if missing, as a server.
+// Clients should not generate a JWT secret, and use the secret of the server instead.
+func ObtainJWTSecret(logger log.Logger, jwtSecretPath string, generateMissing bool) (eth.Bytes32, error) {
+	jwtSecretPath = strings.TrimSpace(jwtSecretPath)
+	if jwtSecretPath == "" {
+		return eth.Bytes32{}, fmt.Errorf("file-name of jwt secret is empty")
+	}
+	data, err := os.ReadFile(jwtSecretPath)
+	if err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			if !generateMissing {
+				return eth.Bytes32{}, fmt.Errorf("JWT-secret in path %q does not exist: %w", jwtSecretPath, err)
+			}
+			logger.Warn("Failed to read JWT secret from file, generating a new one now.", "path", jwtSecretPath)
+			var secret eth.Bytes32
+			if _, err := io.ReadFull(rand.Reader, secret[:]); err != nil {
+				return eth.Bytes32{}, fmt.Errorf("failed to generate jwt secret: %w", err)
+			}
+			if err := os.WriteFile(jwtSecretPath, []byte(hexutil.Encode(secret[:])), 0o600); err != nil {
+				return eth.Bytes32{}, err
+			}
+		} else {
+			return eth.Bytes32{}, fmt.Errorf("failed to read JWT secret from file path %q", jwtSecretPath)
+		}
+	}
+	jwtSecret := common.FromHex(strings.TrimSpace(string(data))) // FromHex handles optional '0x' prefix
+	if len(jwtSecret) != 32 {
+		return eth.Bytes32{}, fmt.Errorf("invalid jwt secret in path %q, not 32 hex-formatted bytes", jwtSecretPath)
+	}
+	return eth.Bytes32(jwtSecret), nil
+}
diff --git a/op-service/rpc/server.go b/op-service/rpc/server.go
index a715c0de699b..00a30713a831 100644
--- a/op-service/rpc/server.go
+++ b/op-service/rpc/server.go
@@ -29,6 +29,7 @@ type Server struct {
 	corsHosts      []string
 	vHosts         []string
 	jwtSecret      []byte
+	wsEnabled      bool
 	rpcPath        string
 	healthzPath    string
 	httpRecorder   opmetrics.HTTPRecorder
@@ -72,6 +73,12 @@ func WithVHosts(hosts []string) ServerOption {
 	}
 }
 
+func WithWebsocketEnabled() ServerOption {
+	return func(b *Server) {
+		b.wsEnabled = true
+	}
+}
+
 func WithJWTSecret(secret []byte) ServerOption {
 	return func(b *Server) {
 		b.jwtSecret = secret
@@ -174,6 +181,11 @@ func (b *Server) Start() error {
 	mux.Handle(b.rpcPath, nodeHdlr)
 	mux.Handle(b.healthzPath, b.healthzHandler)
 
+	if b.wsEnabled {
+		wsHandler := node.NewWSHandlerStack(srv.WebsocketHandler(b.corsHosts), b.jwtSecret)
+		mux.Handle("/ws", wsHandler)
+	}
+
 	// http middleware
 	var handler http.Handler = mux
 	handler = optls.NewPeerTLSMiddleware(handler)
diff --git a/op-service/sources/eth_client.go b/op-service/sources/eth_client.go
index 39587fd19750..fe8a0ecbef42 100644
--- a/op-service/sources/eth_client.go
+++ b/op-service/sources/eth_client.go
@@ -14,6 +14,7 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
+	"strings"
 	"time"
 
 	"github.com/ethereum/go-ethereum"
@@ -45,6 +46,8 @@ type EthClientConfig struct {
 	// Number of payloads to cache
 	PayloadsCacheSize int
 
+	BlockRefsCacheSize int
+
 	// If the RPC is untrusted, then we should not use cached information from responses,
 	// and instead verify against the block-hash.
 	// Of real L1 blocks no deposits can be missed/faked, no batches can be missed/faked,
@@ -113,6 +116,10 @@ type EthClient struct {
 	// cache payloads by hash
 	// common.Hash -> *eth.ExecutionPayload
 	payloadsCache *caching.LRUCache[common.Hash, *eth.ExecutionPayloadEnvelope]
+
+	// cache BlockRef by hash
+	// common.Hash -> eth.BlockRef
+	blockRefsCache *caching.LRUCache[common.Hash, eth.BlockRef]
 }
 
 // NewEthClient returns an [EthClient], wrapping an RPC with bindings to fetch ethereum data with added error logging,
@@ -136,6 +143,7 @@ func NewEthClient(client client.RPC, log log.Logger, metrics caching.Metrics, co
 		transactionsCache: caching.NewLRUCache[common.Hash, types.Transactions](metrics, "txs", config.TransactionsCacheSize),
 		headersCache:      caching.NewLRUCache[common.Hash, eth.BlockInfo](metrics, "headers", config.HeadersCacheSize),
 		payloadsCache:     caching.NewLRUCache[common.Hash, *eth.ExecutionPayloadEnvelope](metrics, "payloads", config.PayloadsCacheSize),
+		blockRefsCache:    caching.NewLRUCache[common.Hash, eth.L1BlockRef](metrics, "blockrefs", config.BlockRefsCacheSize),
 	}, nil
 }
 
@@ -389,3 +397,47 @@ func (s *EthClient) ReadStorageAt(ctx context.Context, address common.Address, s
 func (s *EthClient) Close() {
 	s.client.Close()
 }
+
+// BlockRefByLabel returns the [eth.BlockRef] for the given block label.
+// Notice, we cannot cache a block reference by label because labels are not guaranteed to be unique.
+func (s *EthClient) BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.BlockRef, error) {
+	info, err := s.InfoByLabel(ctx, label)
+	if err != nil {
+		// Both geth and erigon like to serve non-standard errors for the safe and finalized heads, correct that.
+		// This happens when the chain just started and nothing is marked as safe/finalized yet.
+		if strings.Contains(err.Error(), "block not found") || strings.Contains(err.Error(), "Unknown block") {
+			err = ethereum.NotFound
+		}
+		return eth.L1BlockRef{}, fmt.Errorf("failed to fetch head header: %w", err)
+	}
+	ref := eth.InfoToL1BlockRef(info)
+	s.blockRefsCache.Add(ref.Hash, ref)
+	return ref, nil
+}
+
+// BlockRefByNumber returns an [eth.BlockRef] for the given block number.
+// Notice, we cannot cache a block reference by number because L1 re-orgs can invalidate the cached block reference.
+func (s *EthClient) BlockRefByNumber(ctx context.Context, num uint64) (eth.BlockRef, error) {
+	info, err := s.InfoByNumber(ctx, num)
+	if err != nil {
+		return eth.L1BlockRef{}, fmt.Errorf("failed to fetch header by num %d: %w", num, err)
+	}
+	ref := eth.InfoToL1BlockRef(info)
+	s.blockRefsCache.Add(ref.Hash, ref)
+	return ref, nil
+}
+
+// BlockRefByHash returns the [eth.BlockRef] for the given block hash.
+// We cache the block reference by hash as it is safe to assume collision will not occur.
+func (s *EthClient) BlockRefByHash(ctx context.Context, hash common.Hash) (eth.BlockRef, error) {
+	if v, ok := s.blockRefsCache.Get(hash); ok {
+		return v, nil
+	}
+	info, err := s.InfoByHash(ctx, hash)
+	if err != nil {
+		return eth.BlockRef{}, fmt.Errorf("failed to fetch header by hash %v: %w", hash, err)
+	}
+	ref := eth.InfoToL1BlockRef(info)
+	s.blockRefsCache.Add(ref.Hash, ref)
+	return ref, nil
+}
diff --git a/op-service/sources/l1_client.go b/op-service/sources/l1_client.go
index d67ce1c87abd..0f1ed7ebcf7e 100644
--- a/op-service/sources/l1_client.go
+++ b/op-service/sources/l1_client.go
@@ -2,11 +2,8 @@ package sources
 
 import (
 	"context"
-	"fmt"
-	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 
@@ -18,8 +15,6 @@ import (
 
 type L1ClientConfig struct {
 	EthClientConfig
-
-	L1BlockRefsCacheSize int
 }
 
 func L1ClientDefaultConfig(config *rollup.Config, trustRPC bool, kind RPCProviderKind) *L1ClientConfig {
@@ -46,9 +41,9 @@ func L1ClientSimpleConfig(trustRPC bool, kind RPCProviderKind, cacheSize int) *L
 			MustBePostMerge:       false,
 			RPCProviderKind:       kind,
 			MethodResetDuration:   time.Minute,
+			// Not bounded by span, to cover find-sync-start range fully for speedy recovery after errors.
+			BlockRefsCacheSize: cacheSize,
 		},
-		// Not bounded by span, to cover find-sync-start range fully for speedy recovery after errors.
-		L1BlockRefsCacheSize: cacheSize,
 	}
 }
 
@@ -57,10 +52,6 @@ func L1ClientSimpleConfig(trustRPC bool, kind RPCProviderKind, cacheSize int) *L
 // (i.e. to verify all returned contents against corresponding block hashes).
 type L1Client struct {
 	*EthClient
-
-	// cache L1BlockRef by hash
-	// common.Hash -> eth.L1BlockRef
-	l1BlockRefsCache *caching.LRUCache[common.Hash, eth.L1BlockRef]
 }
 
 // NewL1Client wraps a RPC with bindings to fetch L1 data, while logging errors, tracking metrics (optional), and caching.
@@ -71,51 +62,24 @@ func NewL1Client(client client.RPC, log log.Logger, metrics caching.Metrics, con
 	}
 
 	return &L1Client{
-		EthClient:        ethClient,
-		l1BlockRefsCache: caching.NewLRUCache[common.Hash, eth.L1BlockRef](metrics, "blockrefs", config.L1BlockRefsCacheSize),
+		EthClient: ethClient,
 	}, nil
 }
 
 // L1BlockRefByLabel returns the [eth.L1BlockRef] for the given block label.
 // Notice, we cannot cache a block reference by label because labels are not guaranteed to be unique.
 func (s *L1Client) L1BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.L1BlockRef, error) {
-	info, err := s.InfoByLabel(ctx, label)
-	if err != nil {
-		// Both geth and erigon like to serve non-standard errors for the safe and finalized heads, correct that.
-		// This happens when the chain just started and nothing is marked as safe/finalized yet.
-		if strings.Contains(err.Error(), "block not found") || strings.Contains(err.Error(), "Unknown block") {
-			err = ethereum.NotFound
-		}
-		return eth.L1BlockRef{}, fmt.Errorf("failed to fetch head header: %w", err)
-	}
-	ref := eth.InfoToL1BlockRef(info)
-	s.l1BlockRefsCache.Add(ref.Hash, ref)
-	return ref, nil
+	return s.BlockRefByLabel(ctx, label)
 }
 
 // L1BlockRefByNumber returns an [eth.L1BlockRef] for the given block number.
 // Notice, we cannot cache a block reference by number because L1 re-orgs can invalidate the cached block reference.
 func (s *L1Client) L1BlockRefByNumber(ctx context.Context, num uint64) (eth.L1BlockRef, error) {
-	info, err := s.InfoByNumber(ctx, num)
-	if err != nil {
-		return eth.L1BlockRef{}, fmt.Errorf("failed to fetch header by num %d: %w", num, err)
-	}
-	ref := eth.InfoToL1BlockRef(info)
-	s.l1BlockRefsCache.Add(ref.Hash, ref)
-	return ref, nil
+	return s.BlockRefByNumber(ctx, num)
 }
 
 // L1BlockRefByHash returns the [eth.L1BlockRef] for the given block hash.
 // We cache the block reference by hash as it is safe to assume collision will not occur.
 func (s *L1Client) L1BlockRefByHash(ctx context.Context, hash common.Hash) (eth.L1BlockRef, error) {
-	if v, ok := s.l1BlockRefsCache.Get(hash); ok {
-		return v, nil
-	}
-	info, err := s.InfoByHash(ctx, hash)
-	if err != nil {
-		return eth.L1BlockRef{}, fmt.Errorf("failed to fetch header by hash %v: %w", hash, err)
-	}
-	ref := eth.InfoToL1BlockRef(info)
-	s.l1BlockRefsCache.Add(ref.Hash, ref)
-	return ref, nil
+	return s.BlockRefByHash(ctx, hash)
 }
diff --git a/op-service/sources/l2_client.go b/op-service/sources/l2_client.go
index 078385d40510..8c9b7721f9ea 100644
--- a/op-service/sources/l2_client.go
+++ b/op-service/sources/l2_client.go
@@ -49,6 +49,7 @@ func L2ClientDefaultConfig(config *rollup.Config, trustRPC bool) *L2ClientConfig
 			PayloadsCacheSize:     span,
 			MaxRequestsPerBatch:   20, // TODO: tune batch param
 			MaxConcurrentRequests: 10,
+			BlockRefsCacheSize:    span,
 			TrustRPC:              trustRPC,
 			MustBePostMerge:       true,
 			RPCProviderKind:       RPCKindStandard,
diff --git a/op-service/sources/supervisor_client.go b/op-service/sources/supervisor_client.go
index d6191b9cfb20..00cfa761df4d 100644
--- a/op-service/sources/supervisor_client.go
+++ b/op-service/sources/supervisor_client.go
@@ -44,13 +44,13 @@ func (cl *SupervisorClient) Start(ctx context.Context) error {
 	return result
 }
 
-func (cl *SupervisorClient) AddL2RPC(ctx context.Context, rpc string) error {
+func (cl *SupervisorClient) AddL2RPC(ctx context.Context, rpc string, auth eth.Bytes32) error {
 	var result error
 	err := cl.client.CallContext(
 		ctx,
 		&result,
 		"admin_addL2RPC",
-		rpc)
+		rpc, auth)
 	if err != nil {
 		return fmt.Errorf("failed to Add L2 to Supervisor (rpc: %s): %w", rpc, err)
 	}
diff --git a/op-service/testutils/mock_eth_client.go b/op-service/testutils/mock_eth_client.go
index 2d82966724b3..062082ed907e 100644
--- a/op-service/testutils/mock_eth_client.go
+++ b/op-service/testutils/mock_eth_client.go
@@ -148,6 +148,33 @@ func (m *MockEthClient) ExpectBlockByNumber(number *big.Int, block *types.Block,
 	m.Mock.On("BlockByNumber", number).Once().Return(block, err)
 }
 
+func (m *MockEthClient) BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.BlockRef, error) {
+	out := m.Mock.Called(label)
+	return out.Get(0).(eth.BlockRef), out.Error(1)
+}
+
+func (m *MockEthClient) ExpectBlockRefByLabel(label eth.BlockLabel, ref eth.BlockRef, err error) {
+	m.Mock.On("BlockRefByLabel", label).Once().Return(ref, err)
+}
+
+func (m *MockEthClient) BlockRefByNumber(ctx context.Context, num uint64) (eth.BlockRef, error) {
+	out := m.Mock.Called(num)
+	return out.Get(0).(eth.BlockRef), out.Error(1)
+}
+
+func (m *MockEthClient) ExpectBlockRefByNumber(num uint64, ref eth.BlockRef, err error) {
+	m.Mock.On("BlockRefByNumber", num).Once().Return(ref, err)
+}
+
+func (m *MockEthClient) BlockRefByHash(ctx context.Context, hash common.Hash) (eth.BlockRef, error) {
+	out := m.Mock.Called(hash)
+	return out.Get(0).(eth.BlockRef), out.Error(1)
+}
+
+func (m *MockEthClient) ExpectBlockRefByHash(hash common.Hash, ref eth.BlockRef, err error) {
+	m.Mock.On("BlockRefByHash", hash).Once().Return(ref, err)
+}
+
 func (m *MockEthClient) ExpectClose() {
 	m.Mock.On("Close").Once()
 }
diff --git a/op-supervisor/cmd/main_test.go b/op-supervisor/cmd/main_test.go
index 06fcf78440dd..be27deabdf33 100644
--- a/op-supervisor/cmd/main_test.go
+++ b/op-supervisor/cmd/main_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -13,11 +14,14 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 )
 
 var (
-	ValidL1RPC   = "http://localhost:8545"
-	ValidL2RPCs  = []string{"http;//localhost:8545"}
+	ValidL1RPC  = "http://localhost:8545"
+	ValidL2RPCs = &syncsrc.CLISyncSources{
+		JWTSecretPaths: []string{"./jwt_secret.txt"},
+	}
 	ValidDatadir = "./supervisor_test_datadir"
 )
 
@@ -42,19 +46,19 @@ func TestDefaultCLIOptionsMatchDefaultConfig(t *testing.T) {
 	defaultCfgTempl := config.NewConfig(ValidL1RPC, ValidL2RPCs, depSet, ValidDatadir)
 	defaultCfg := *defaultCfgTempl
 	defaultCfg.Version = Version
+	// Sync sources may be attached later via RPC. These are thus not strictly required.
+	defaultCfg.SyncSources = nil
+	cfg.SyncSources = nil
 	require.Equal(t, defaultCfg, *cfg)
 }
 
-func TestL2RPCs(t *testing.T) {
-	t.Run("Required", func(t *testing.T) {
-		verifyArgsInvalid(t, "flag l2-rpcs is required", addRequiredArgsExcept("--l2-rpcs"))
-	})
-
+func TestL2ConsensusNodes(t *testing.T) {
 	t.Run("Valid", func(t *testing.T) {
 		url1 := "http://example.com:1234"
 		url2 := "http://foobar.com:1234"
-		cfg := configForArgs(t, addRequiredArgsExcept("--l2-rpcs", "--l2-rpcs="+url1+","+url2))
-		require.Equal(t, []string{url1, url2}, cfg.L2RPCs)
+		cfg := configForArgs(t, addRequiredArgsExcept(
+			"--l2-consensus-nodes", "--l2-consensus.nodes="+url1+","+url2))
+		require.Equal(t, []string{url1, url2}, cfg.SyncSources.(*syncsrc.CLISyncSources).Endpoints)
 	})
 }
 
@@ -126,10 +130,11 @@ func toArgList(req map[string]string) []string {
 
 func requiredArgs() map[string]string {
 	args := map[string]string{
-		"--l1-rpc":         ValidL1RPC,
-		"--l2-rpcs":        ValidL2RPCs[0],
-		"--dependency-set": "test",
-		"--datadir":        ValidDatadir,
+		"--l1-rpc":                  ValidL1RPC,
+		"--l2-consensus.nodes":      strings.Join(ValidL2RPCs.Endpoints, ","),
+		"--l2-consensus.jwt-secret": strings.Join(ValidL2RPCs.JWTSecretPaths, ","),
+		"--dependency-set":          "test",
+		"--datadir":                 ValidDatadir,
 	}
 	return args
 }
diff --git a/op-supervisor/config/config.go b/op-supervisor/config/config.go
index 9d733207eaf4..339167c1add5 100644
--- a/op-supervisor/config/config.go
+++ b/op-supervisor/config/config.go
@@ -8,10 +8,11 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/oppprof"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 )
 
 var (
-	ErrMissingL2RPC         = errors.New("must specify at least one L2 RPC")
+	ErrMissingSyncSources   = errors.New("must specify sync source collection")
 	ErrMissingDependencySet = errors.New("must specify a dependency set source")
 	ErrMissingDatadir       = errors.New("must specify datadir")
 )
@@ -35,7 +36,9 @@ type Config struct {
 
 	L1RPC string
 
-	L2RPCs  []string
+	// SyncSources lists the consensus nodes that help sync the supervisor
+	SyncSources syncsrc.SyncSourceCollection
+
 	Datadir string
 }
 
@@ -44,21 +47,23 @@ func (c *Config) Check() error {
 	result = errors.Join(result, c.MetricsConfig.Check())
 	result = errors.Join(result, c.PprofConfig.Check())
 	result = errors.Join(result, c.RPC.Check())
-	if len(c.L2RPCs) == 0 {
-		result = errors.Join(result, ErrMissingL2RPC)
-	}
 	if c.DependencySetSource == nil {
 		result = errors.Join(result, ErrMissingDependencySet)
 	}
 	if c.Datadir == "" {
 		result = errors.Join(result, ErrMissingDatadir)
 	}
+	if c.SyncSources == nil {
+		result = errors.Join(result, ErrMissingSyncSources)
+	} else {
+		result = errors.Join(result, c.SyncSources.Check())
+	}
 	return result
 }
 
 // NewConfig creates a new config using default values whenever possible.
 // Required options with no suitable default are passed as parameters.
-func NewConfig(l1RPC string, l2RPCs []string, depSet depset.DependencySetSource, datadir string) *Config {
+func NewConfig(l1RPC string, syncSrcs syncsrc.SyncSourceCollection, depSet depset.DependencySetSource, datadir string) *Config {
 	return &Config{
 		LogConfig:           oplog.DefaultCLIConfig(),
 		MetricsConfig:       opmetrics.DefaultCLIConfig(),
@@ -67,7 +72,7 @@ func NewConfig(l1RPC string, l2RPCs []string, depSet depset.DependencySetSource,
 		DependencySetSource: depSet,
 		MockRun:             false,
 		L1RPC:               l1RPC,
-		L2RPCs:              l2RPCs,
+		SyncSources:         syncSrcs,
 		Datadir:             datadir,
 	}
 }
diff --git a/op-supervisor/config/config_test.go b/op-supervisor/config/config_test.go
index 1e2f6f40c004..68e9c952877c 100644
--- a/op-supervisor/config/config_test.go
+++ b/op-supervisor/config/config_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/oppprof"
 	"github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -17,10 +18,10 @@ func TestDefaultConfigIsValid(t *testing.T) {
 	require.NoError(t, cfg.Check())
 }
 
-func TestRequireL2RPC(t *testing.T) {
+func TestRequireSyncSources(t *testing.T) {
 	cfg := validConfig()
-	cfg.L2RPCs = []string{}
-	require.ErrorIs(t, cfg.Check(), ErrMissingL2RPC)
+	cfg.SyncSources = nil
+	require.ErrorIs(t, cfg.Check(), ErrMissingSyncSources)
 }
 
 func TestRequireDependencySet(t *testing.T) {
@@ -67,5 +68,5 @@ func validConfig() *Config {
 		panic(err)
 	}
 	// Should be valid using only the required arguments passed in via the constructor.
-	return NewConfig("http://localhost:8545", []string{"http://localhost:8545"}, depSet, "./supervisor_testdir")
+	return NewConfig("http://localhost:8545", &syncsrc.CLISyncSources{}, depSet, "./supervisor_testdir")
 }
diff --git a/op-supervisor/flags/flags.go b/op-supervisor/flags/flags.go
index d12695010a3c..8a203653c3e9 100644
--- a/op-supervisor/flags/flags.go
+++ b/op-supervisor/flags/flags.go
@@ -12,6 +12,7 @@ import (
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 )
 
 const EnvVarPrefix = "OP_SUPERVISOR"
@@ -26,10 +27,18 @@ var (
 		Usage:   "L1 RPC source.",
 		EnvVars: prefixEnvVars("L1_RPC"),
 	}
-	L2RPCsFlag = &cli.StringSliceFlag{
-		Name:    "l2-rpcs",
-		Usage:   "L2 RPC sources.",
-		EnvVars: prefixEnvVars("L2_RPCS"),
+	L2ConsensusNodesFlag = &cli.StringSliceFlag{
+		Name:    "l2-consensus.nodes",
+		Usage:   "L2 Consensus rollup node RPC addresses (with auth).",
+		EnvVars: prefixEnvVars("L2_CONSENSUS_NODES"),
+	}
+	L2ConsensusJWTSecret = &cli.StringSliceFlag{
+		Name: "l2-consensus.jwt-secret",
+		Usage: "Path to JWT secret key. Keys are 32 bytes, hex encoded in a file. " +
+			"If multiple paths are specified, secrets are assumed to match l2-consensus-nodes order.",
+		EnvVars:   prefixEnvVars("L2_CONSENSUS_JWT_SECRET"),
+		Value:     cli.NewStringSlice(),
+		TakesFile: true,
 	}
 	DataDirFlag = &cli.PathFlag{
 		Name:    "datadir",
@@ -52,7 +61,8 @@ var (
 
 var requiredFlags = []cli.Flag{
 	L1RPCFlag,
-	L2RPCsFlag,
+	L2ConsensusNodesFlag,
+	L2ConsensusJWTSecret,
 	DataDirFlag,
 	DependencySetFlag,
 }
@@ -93,7 +103,28 @@ func ConfigFromCLI(ctx *cli.Context, version string) *config.Config {
 		DependencySetSource: &depset.JsonDependencySetLoader{Path: ctx.Path(DependencySetFlag.Name)},
 		MockRun:             ctx.Bool(MockRunFlag.Name),
 		L1RPC:               ctx.String(L1RPCFlag.Name),
-		L2RPCs:              ctx.StringSlice(L2RPCsFlag.Name),
+		SyncSources:         syncSourceSetups(ctx),
 		Datadir:             ctx.Path(DataDirFlag.Name),
 	}
 }
+
+// syncSourceSetups creates a sync source collection, from CLI arguments.
+// These sources can share JWT secret configuration.
+func syncSourceSetups(ctx *cli.Context) syncsrc.SyncSourceCollection {
+	return &syncsrc.CLISyncSources{
+		Endpoints:      filterEmpty(ctx.StringSlice(L2ConsensusNodesFlag.Name)),
+		JWTSecretPaths: filterEmpty(ctx.StringSlice(L2ConsensusJWTSecret.Name)),
+	}
+}
+
+// filterEmpty cleans empty entries from a string-slice flag,
+// which has the potential to have empty strings.
+func filterEmpty(in []string) []string {
+	out := make([]string, 0, len(in))
+	for _, s := range in {
+		if s != "" {
+			out = append(out, s)
+		}
+	}
+	return out
+}
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 722cabcf3eba..4c8fb1c411e8 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -5,13 +5,11 @@ import (
 	"errors"
 	"fmt"
 	"sync/atomic"
-	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 
 	"github.com/ethereum-optimism/optimism/op-service/client"
-	"github.com/ethereum-optimism/optimism/op-service/dial"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/locks"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
@@ -20,6 +18,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/processors"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/frontend"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -136,11 +135,18 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 		su.logger.Warn("No L1 RPC configured, L1 processor will not be started")
 	}
 
-	// the config has some RPC connections to attach to the chain-processors
-	for _, rpc := range cfg.L2RPCs {
-		err := su.attachRPC(ctx, rpc)
+	setups, err := cfg.SyncSources.Load(ctx, su.logger)
+	if err != nil {
+		return fmt.Errorf("failed to load sync-source setups: %w", err)
+	}
+	// the config has some sync sources (RPC connections) to attach to the chain-processors
+	for _, srcSetup := range setups {
+		src, err := srcSetup.Setup(ctx, su.logger)
 		if err != nil {
-			return fmt.Errorf("failed to add chain monitor for rpc %v: %w", rpc, err)
+			return fmt.Errorf("failed to set up sync source: %w", err)
+		}
+		if err := su.AttachSyncSource(ctx, src); err != nil {
+			return fmt.Errorf("failed to attach sync source %s: %w", src, err)
 		}
 	}
 	return nil
@@ -201,38 +207,22 @@ func (su *SupervisorBackend) openChainDBs(chainID types.ChainID) error {
 	return nil
 }
 
-func (su *SupervisorBackend) attachRPC(ctx context.Context, rpc string) error {
-	su.logger.Info("attaching RPC to chain processor", "rpc", rpc)
+func (su *SupervisorBackend) AttachSyncSource(ctx context.Context, src syncsrc.SyncSource) error {
+	su.logger.Info("attaching sync source to chain processor", "source", src)
 
-	logger := su.logger.New("rpc", rpc)
-	// create the rpc client, which yields the chain id
-	rpcClient, chainID, err := clientForL2(ctx, logger, rpc)
+	chainID, err := src.ChainID(ctx)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to identify chain ID of sync source: %w", err)
 	}
 	if !su.depSet.HasChain(chainID) {
 		return fmt.Errorf("chain %s is not part of the interop dependency set: %w", chainID, types.ErrUnknownChain)
 	}
-	cm, ok := su.chainMetrics.Get(chainID)
-	if !ok {
-		return fmt.Errorf("failed to find metrics for chain %v", chainID)
-	}
-	// create an RPC client that the processor can use
-	cl, err := processors.NewEthClient(
-		ctx,
-		logger.New("chain", chainID),
-		cm,
-		rpc,
-		rpcClient, 2*time.Second,
-		false,
-		sources.RPCKindStandard)
-	if err != nil {
-		return err
-	}
-	return su.AttachProcessorSource(chainID, cl)
+	return su.AttachProcessorSource(chainID, src)
 }
 
 func (su *SupervisorBackend) AttachProcessorSource(chainID types.ChainID, src processors.Source) error {
+	// TODO: register sync sources in the backend, to trigger derivation work etc.
+
 	proc, ok := su.chainProcessors.Get(chainID)
 	if !ok {
 		return fmt.Errorf("unknown chain %s, cannot attach RPC to processor", chainID)
@@ -273,18 +263,6 @@ func (su *SupervisorBackend) AttachL1Source(source processors.L1Source) {
 	}
 }
 
-func clientForL2(ctx context.Context, logger log.Logger, rpc string) (client.RPC, types.ChainID, error) {
-	ethClient, err := dial.DialEthClientWithTimeout(ctx, 10*time.Second, logger, rpc)
-	if err != nil {
-		return nil, types.ChainID{}, fmt.Errorf("failed to connect to rpc %v: %w", rpc, err)
-	}
-	chainID, err := ethClient.ChainID(ctx)
-	if err != nil {
-		return nil, types.ChainID{}, fmt.Errorf("failed to load chain id for rpc %v: %w", rpc, err)
-	}
-	return client.NewBaseRPCClient(ethClient.Client()), types.ChainIDFromBig(chainID), nil
-}
-
 func (su *SupervisorBackend) Start(ctx context.Context) error {
 	// ensure we only start once
 	if !su.started.CompareAndSwap(false, true) {
@@ -359,8 +337,16 @@ func (su *SupervisorBackend) Stop(ctx context.Context) error {
 }
 
 // AddL2RPC attaches an RPC as the RPC for the given chain, overriding the previous RPC source, if any.
-func (su *SupervisorBackend) AddL2RPC(ctx context.Context, rpc string) error {
-	return su.attachRPC(ctx, rpc)
+func (su *SupervisorBackend) AddL2RPC(ctx context.Context, rpc string, jwtSecret eth.Bytes32) error {
+	setupSrc := &syncsrc.RPCDialSetup{
+		JWTSecret: jwtSecret,
+		Endpoint:  rpc,
+	}
+	src, err := setupSrc.Setup(ctx, su.logger)
+	if err != nil {
+		return fmt.Errorf("failed to set up sync source from RPC: %w", err)
+	}
+	return su.AttachSyncSource(ctx, src)
 }
 
 // Internal methods, for processors
diff --git a/op-supervisor/supervisor/backend/backend_test.go b/op-supervisor/supervisor/backend/backend_test.go
index a8fc4de438e7..3c1d08535d74 100644
--- a/op-supervisor/supervisor/backend/backend_test.go
+++ b/op-supervisor/supervisor/backend/backend_test.go
@@ -5,6 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ethereum/go-ethereum"
@@ -22,6 +23,8 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/metrics"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/processors"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -54,7 +57,7 @@ func TestBackendLifetime(t *testing.T) {
 		DependencySetSource:   depSet,
 		SynchronousProcessors: true,
 		MockRun:               false,
-		L2RPCs:                nil,
+		SyncSources:           &syncsrc.CLISyncSources{},
 		Datadir:               dataDir,
 	}
 
@@ -63,7 +66,7 @@ func TestBackendLifetime(t *testing.T) {
 	t.Log("initialized!")
 
 	l1Src := &testutils.MockL1Source{}
-	src := &testutils.MockL1Source{}
+	src := &MockProcessorSource{}
 
 	blockX := eth.BlockRef{
 		Hash:       common.Hash{0xaa},
@@ -95,25 +98,13 @@ func TestBackendLifetime(t *testing.T) {
 	_, err = b.UnsafeView(context.Background(), chainA, types.ReferenceView{})
 	require.ErrorIs(t, err, types.ErrFuture, "no data yet, need local-unsafe")
 
-	src.ExpectL1BlockRefByNumber(0, blockX, nil)
-	src.ExpectFetchReceipts(blockX.Hash, &testutils.MockBlockInfo{
-		InfoHash:        blockX.Hash,
-		InfoParentHash:  blockX.ParentHash,
-		InfoNum:         blockX.Number,
-		InfoTime:        blockX.Time,
-		InfoReceiptRoot: types2.EmptyReceiptsHash,
-	}, nil, nil)
-
-	src.ExpectL1BlockRefByNumber(1, blockY, nil)
-	src.ExpectFetchReceipts(blockY.Hash, &testutils.MockBlockInfo{
-		InfoHash:        blockY.Hash,
-		InfoParentHash:  blockY.ParentHash,
-		InfoNum:         blockY.Number,
-		InfoTime:        blockY.Time,
-		InfoReceiptRoot: types2.EmptyReceiptsHash,
-	}, nil, nil)
-
-	src.ExpectL1BlockRefByNumber(2, eth.L1BlockRef{}, ethereum.NotFound)
+	src.ExpectBlockRefByNumber(0, blockX, nil)
+	src.ExpectFetchReceipts(blockX.Hash, nil, nil)
+
+	src.ExpectBlockRefByNumber(1, blockY, nil)
+	src.ExpectFetchReceipts(blockY.Hash, nil, nil)
+
+	src.ExpectBlockRefByNumber(2, eth.L1BlockRef{}, ethereum.NotFound)
 
 	err = b.UpdateLocalUnsafe(context.Background(), chainA, blockY)
 	require.NoError(t, err)
@@ -141,3 +132,27 @@ func TestBackendLifetime(t *testing.T) {
 	require.NoError(t, err)
 	t.Log("stopped!")
 }
+
+type MockProcessorSource struct {
+	mock.Mock
+}
+
+var _ processors.Source = (*MockProcessorSource)(nil)
+
+func (m *MockProcessorSource) FetchReceipts(ctx context.Context, blockHash common.Hash) (types2.Receipts, error) {
+	out := m.Mock.Called(blockHash)
+	return out.Get(0).(types2.Receipts), out.Error(1)
+}
+
+func (m *MockProcessorSource) ExpectFetchReceipts(hash common.Hash, receipts types2.Receipts, err error) {
+	m.Mock.On("FetchReceipts", hash).Once().Return(receipts, err)
+}
+
+func (m *MockProcessorSource) BlockRefByNumber(ctx context.Context, num uint64) (eth.BlockRef, error) {
+	out := m.Mock.Called(num)
+	return out.Get(0).(eth.BlockRef), out.Error(1)
+}
+
+func (m *MockProcessorSource) ExpectBlockRefByNumber(num uint64, ref eth.BlockRef, err error) {
+	m.Mock.On("BlockRefByNumber", num).Once().Return(ref, err)
+}
diff --git a/op-supervisor/supervisor/backend/mock.go b/op-supervisor/supervisor/backend/mock.go
index b40c5209d5ef..71c1efacb940 100644
--- a/op-supervisor/supervisor/backend/mock.go
+++ b/op-supervisor/supervisor/backend/mock.go
@@ -38,7 +38,7 @@ func (m *MockBackend) Stop(ctx context.Context) error {
 	return nil
 }
 
-func (m *MockBackend) AddL2RPC(ctx context.Context, rpc string) error {
+func (m *MockBackend) AddL2RPC(ctx context.Context, rpc string, jwtSecret eth.Bytes32) error {
 	return nil
 }
 
diff --git a/op-supervisor/supervisor/backend/processors/chain_processor.go b/op-supervisor/supervisor/backend/processors/chain_processor.go
index 1b4ffcc822e6..e181d1535f16 100644
--- a/op-supervisor/supervisor/backend/processors/chain_processor.go
+++ b/op-supervisor/supervisor/backend/processors/chain_processor.go
@@ -19,8 +19,8 @@ import (
 )
 
 type Source interface {
-	L1BlockRefByNumber(ctx context.Context, number uint64) (eth.L1BlockRef, error)
-	FetchReceipts(ctx context.Context, blockHash common.Hash) (eth.BlockInfo, gethtypes.Receipts, error)
+	BlockRefByNumber(ctx context.Context, number uint64) (eth.BlockRef, error)
+	FetchReceipts(ctx context.Context, blockHash common.Hash) (gethtypes.Receipts, error)
 }
 
 type LogProcessor interface {
@@ -199,7 +199,7 @@ func (s *ChainProcessor) rangeUpdate() (int, error) {
 
 		// fetch the block ref
 		ctx, cancel := context.WithTimeout(s.ctx, time.Second*10)
-		nextL1, err := s.client.L1BlockRefByNumber(ctx, num)
+		nextL1, err := s.client.BlockRefByNumber(ctx, num)
 		cancel()
 		if err != nil {
 			result.err = err
@@ -215,7 +215,7 @@ func (s *ChainProcessor) rangeUpdate() (int, error) {
 
 		// fetch receipts
 		ctx, cancel = context.WithTimeout(s.ctx, time.Second*10)
-		_, receipts, err := s.client.FetchReceipts(ctx, next.Hash)
+		receipts, err := s.client.FetchReceipts(ctx, next.Hash)
 		cancel()
 		if err != nil {
 			result.err = err
diff --git a/op-supervisor/supervisor/backend/syncsrc/collection.go b/op-supervisor/supervisor/backend/syncsrc/collection.go
new file mode 100644
index 000000000000..01c027f2fc93
--- /dev/null
+++ b/op-supervisor/supervisor/backend/syncsrc/collection.go
@@ -0,0 +1,66 @@
+package syncsrc
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/rpc"
+)
+
+// CLISyncSources is a bundle of CLI-specified (and thus stringified) sync-source options.
+// These sources can be loaded into SyncSourceSetup instances, to retrieve the active sync sources from.
+type CLISyncSources struct {
+	Endpoints      []string
+	JWTSecretPaths []string
+}
+
+var _ SyncSourceCollection = (*CLISyncSources)(nil)
+
+func (p *CLISyncSources) Load(ctx context.Context, logger log.Logger) ([]SyncSourceSetup, error) {
+	if err := p.Check(); err != nil { // sanity-check, in case the caller did not check.
+		return nil, err
+	}
+	if len(p.Endpoints) == 0 {
+		logger.Warn("No sync sources were configured")
+		return nil, nil
+	}
+	if len(p.JWTSecretPaths) == 0 {
+		return nil, errors.New("need at least 1 JWT secret to setup sync-sources")
+	}
+	secrets := make([]eth.Bytes32, 0, len(p.JWTSecretPaths))
+	for i, secretPath := range p.JWTSecretPaths {
+		secret, err := rpc.ObtainJWTSecret(logger, secretPath, false)
+		if err != nil {
+			return nil, fmt.Errorf("failed to load JWT secret %d from path %q", i, secretPath)
+		}
+		secrets = append(secrets, secret)
+	}
+	setups := make([]SyncSourceSetup, 0, len(p.Endpoints))
+	for i, endpoint := range p.Endpoints {
+		var secret eth.Bytes32
+		if i >= len(secrets) {
+			secret = secrets[0]
+		}
+		setups = append(setups, &RPCDialSetup{
+			JWTSecret: secret,
+			Endpoint:  endpoint,
+		})
+	}
+	return setups, nil
+}
+
+func (p *CLISyncSources) Check() error {
+	if len(p.Endpoints) == len(p.JWTSecretPaths) {
+		return nil
+	}
+	if len(p.JWTSecretPaths) == 1 {
+		return nil // repeating JWT secret, for any number of endpoints
+	}
+	return fmt.Errorf("expected each sync source endpoint to come with a JWT secret, "+
+		"or all share the same JWT secret, but got %d endpoints and %d secrets",
+		len(p.Endpoints), len(p.JWTSecretPaths))
+}
diff --git a/op-supervisor/supervisor/backend/syncsrc/dial.go b/op-supervisor/supervisor/backend/syncsrc/dial.go
new file mode 100644
index 000000000000..9356c9ea7ac0
--- /dev/null
+++ b/op-supervisor/supervisor/backend/syncsrc/dial.go
@@ -0,0 +1,42 @@
+package syncsrc
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/ethereum/go-ethereum/log"
+	gn "github.com/ethereum/go-ethereum/node"
+	"github.com/ethereum/go-ethereum/rpc"
+
+	"github.com/ethereum-optimism/optimism/op-service/client"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+)
+
+// RPCDialSetup implements SyncSourceSetup by dialing an RPC
+// and providing an RPC-client binding to sync with.
+type RPCDialSetup struct {
+	JWTSecret eth.Bytes32
+	Endpoint  string
+}
+
+var _ SyncSourceSetup = (*RPCDialSetup)(nil)
+
+func (r *RPCDialSetup) Setup(ctx context.Context, logger log.Logger) (SyncSource, error) {
+	ctx, cancel := context.WithTimeout(ctx, time.Second*60)
+	defer cancel()
+
+	auth := rpc.WithHTTPAuth(gn.NewJWTAuth(r.JWTSecret))
+	opts := []client.RPCOption{
+		client.WithGethRPCOptions(auth),
+		client.WithDialAttempts(10),
+	}
+	rpcCl, err := client.NewRPC(ctx, logger, r.Endpoint, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &RPCSyncSource{
+		name: fmt.Sprintf("RPCSyncSource(%s)", r.Endpoint),
+		cl:   rpcCl,
+	}, nil
+}
diff --git a/op-supervisor/supervisor/backend/syncsrc/iface.go b/op-supervisor/supervisor/backend/syncsrc/iface.go
new file mode 100644
index 000000000000..3c93ce34988e
--- /dev/null
+++ b/op-supervisor/supervisor/backend/syncsrc/iface.go
@@ -0,0 +1,33 @@
+package syncsrc
+
+import (
+	"context"
+
+	"github.com/ethereum/go-ethereum/common"
+	gethtypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+// SyncSourceCollection turns a bundle of options into individual options for SyncSourceSetup.
+// This enables configurations to share properties.
+type SyncSourceCollection interface {
+	Load(ctx context.Context, logger log.Logger) ([]SyncSourceSetup, error)
+	Check() error
+}
+
+// SyncSourceSetup sets up a new active SyncSource. Setup may fail, e.g. an RPC endpoint is invalid.
+type SyncSourceSetup interface {
+	Setup(ctx context.Context, logger log.Logger) (SyncSource, error)
+}
+
+// SyncSource provides an interface to interact with a source node to e.g. sync event data.
+type SyncSource interface {
+	BlockRefByNumber(ctx context.Context, number uint64) (eth.BlockRef, error)
+	FetchReceipts(ctx context.Context, blockHash common.Hash) (gethtypes.Receipts, error)
+	ChainID(ctx context.Context) (types.ChainID, error)
+	// String identifies the sync source
+	String() string
+}
diff --git a/op-supervisor/supervisor/backend/syncsrc/rpc.go b/op-supervisor/supervisor/backend/syncsrc/rpc.go
new file mode 100644
index 000000000000..b139119f6f2b
--- /dev/null
+++ b/op-supervisor/supervisor/backend/syncsrc/rpc.go
@@ -0,0 +1,70 @@
+package syncsrc
+
+import (
+	"context"
+	"errors"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	gethtypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rpc"
+
+	"github.com/ethereum-optimism/optimism/op-service/client"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+)
+
+// RPCSyncSource is an active RPC, wrapped with bindings, implementing the SyncSource interface.
+type RPCSyncSource struct {
+	name string
+	cl   client.RPC
+}
+
+func NewRPCSyncSource(name string, cl client.RPC) *RPCSyncSource {
+	return &RPCSyncSource{
+		name: name,
+		cl:   cl,
+	}
+}
+
+var _ SyncSource = (*RPCSyncSource)(nil)
+
+func (rs *RPCSyncSource) BlockRefByNumber(ctx context.Context, number uint64) (eth.BlockRef, error) {
+	var out *eth.BlockRef
+	err := rs.cl.CallContext(ctx, &out, "interop_blockRefByNumber", number)
+	if err != nil {
+		var jsonErr rpc.Error
+		if errors.As(err, &jsonErr) {
+			if jsonErr.ErrorCode() == 0 { // TODO
+				return eth.BlockRef{}, ethereum.NotFound
+			}
+		}
+		return eth.BlockRef{}, err
+	}
+	return *out, nil
+}
+
+func (rs *RPCSyncSource) FetchReceipts(ctx context.Context, blockHash common.Hash) (gethtypes.Receipts, error) {
+	var out gethtypes.Receipts
+	err := rs.cl.CallContext(ctx, &out, "interop_fetchReceipts", blockHash)
+	if err != nil {
+		var jsonErr rpc.Error
+		if errors.As(err, &jsonErr) {
+			if jsonErr.ErrorCode() == 0 { // TODO
+				return nil, ethereum.NotFound
+			}
+		}
+		return nil, err
+	}
+	return out, nil
+}
+
+func (rs *RPCSyncSource) ChainID(ctx context.Context) (types.ChainID, error) {
+	var chainID types.ChainID
+	err := rs.cl.CallContext(ctx, &chainID, "interop_chainID")
+	return chainID, err
+}
+
+func (rs *RPCSyncSource) String() string {
+	return rs.name
+}
diff --git a/op-supervisor/supervisor/frontend/frontend.go b/op-supervisor/supervisor/frontend/frontend.go
index 6a43e1fedb0f..bc21d977c337 100644
--- a/op-supervisor/supervisor/frontend/frontend.go
+++ b/op-supervisor/supervisor/frontend/frontend.go
@@ -11,7 +11,7 @@ import (
 type AdminBackend interface {
 	Start(ctx context.Context) error
 	Stop(ctx context.Context) error
-	AddL2RPC(ctx context.Context, rpc string) error
+	AddL2RPC(ctx context.Context, rpc string, jwtSecret eth.Bytes32) error
 }
 
 type QueryBackend interface {
@@ -88,8 +88,8 @@ func (a *AdminFrontend) Stop(ctx context.Context) error {
 }
 
 // AddL2RPC adds a new L2 chain to the supervisor backend
-func (a *AdminFrontend) AddL2RPC(ctx context.Context, rpc string) error {
-	return a.Supervisor.AddL2RPC(ctx, rpc)
+func (a *AdminFrontend) AddL2RPC(ctx context.Context, rpc string, jwtSecret eth.Bytes32) error {
+	return a.Supervisor.AddL2RPC(ctx, rpc, jwtSecret)
 }
 
 type UpdatesFrontend struct {
diff --git a/op-supervisor/supervisor/service.go b/op-supervisor/supervisor/service.go
index 7054c7e0ff55..3e6dd1395f9b 100644
--- a/op-supervisor/supervisor/service.go
+++ b/op-supervisor/supervisor/service.go
@@ -72,17 +72,6 @@ func (su *SupervisorService) initBackend(ctx context.Context, cfg *config.Config
 		su.backend = backend.NewMockBackend()
 		return nil
 	}
-	// the flag is a string slice, which has the potential to have empty strings
-	filterBlank := func(in []string) []string {
-		out := make([]string, 0, len(in))
-		for _, s := range in {
-			if s != "" {
-				out = append(out, s)
-			}
-		}
-		return out
-	}
-	cfg.L2RPCs = filterBlank(cfg.L2RPCs)
 	be, err := backend.NewSupervisorBackend(ctx, su.log, su.metrics, cfg)
 	if err != nil {
 		return fmt.Errorf("failed to create supervisor backend: %w", err)

From be083a0255c9d4b59308840f0e0dedf07e05e9dd Mon Sep 17 00:00:00 2001
From: Sebastian Stammler <seb@oplabs.co>
Date: Tue, 10 Dec 2024 22:50:50 +0100
Subject: [PATCH 429/451] op-program: add release v1.4.0-rc.3 (#13340)

---
 op-program/prestates/releases.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/op-program/prestates/releases.json b/op-program/prestates/releases.json
index 75106c4b3c99..38f65b706007 100644
--- a/op-program/prestates/releases.json
+++ b/op-program/prestates/releases.json
@@ -1,8 +1,13 @@
 [
+  {
+    "version": "1.4.0-rc.3",
+    "hash": "0x03f89406817db1ed7fd8b31e13300444652cdb0b9c509a674de43483b2f83568"
+  },
   {
     "version": "1.4.0-rc.2",
     "hash": "0x0364e4e72922e7d649338f558f8a14b50ca31922a1484e73ea03987fb1516095"
-  }, {
+  },
+  {
     "version": "1.4.0-rc.1",
     "hash": "0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe"
   },

From 839d3821e8896d60ecdf191b008b95e4561298aa Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Tue, 10 Dec 2024 17:37:11 -0500
Subject: [PATCH 430/451] feat: contracts dev build and test commands (#13345)

Adds new dev commands that use the lite profile to execute
everything and ultimately reduce compile time by several minutes.
---
 packages/contracts-bedrock/justfile             | 17 ++++++++++++++++-
 .../test/legacy/L1ChugSplashProxy.t.sol         | 16 ++++++++++++----
 .../test/libraries/SafeCall.t.sol               | 15 +++++++++++----
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile
index c4669f63130c..cc1160479144 100644
--- a/packages/contracts-bedrock/justfile
+++ b/packages/contracts-bedrock/justfile
@@ -15,13 +15,20 @@ dep-status:
 #                         BUILD                        #
 ########################################################
 
-# Core forge build command
+# Core forge build command.
 forge-build:
   forge build
 
+# Developer build command (faster).
+forge-build-dev:
+  FOUNDRY_PROFILE=lite forge build
+
 # Builds the contracts.
 build: lint-fix-no-fail forge-build interfaces-check-no-build
 
+# Builds the contracts (developer mode).
+build-dev: lint-fix-no-fail forge-build-dev interfaces-check-no-build
+
 # Builds the go-ffi tool for contract tests.
 build-go-ffi-default:
   cd ./scripts/go-ffi && go build
@@ -45,10 +52,18 @@ clean:
 test *ARGS: build-go-ffi
   forge test {{ARGS}}
 
+# Runs standard contract tests (developer mode).
+test-dev *ARGS: build-go-ffi
+  FOUNDRY_PROFILE=lite forge test {{ARGS}}
+
 # Runs standard contract tests with rerun flag.
 test-rerun: build-go-ffi
   forge test --rerun -vvv
 
+# Runs standard contract tests with rerun flag (developer mode).
+test-dev-rerun: build-go-ffi
+  FOUNDRY_PROFILE=lite forge test --rerun -vvv
+
 # Run Kontrol tests and build all dependencies.
 test-kontrol: build-go-ffi build kontrol-summary-full test-kontrol-no-build
 
diff --git a/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
index 28d9e58ed8a7..b10cf264defb 100644
--- a/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
+++ b/packages/contracts-bedrock/test/legacy/L1ChugSplashProxy.t.sol
@@ -1,14 +1,19 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.15;
 
-// Testing utilities
+// Forge
 import { Test } from "forge-std/Test.sol";
 import { VmSafe } from "forge-std/Vm.sol";
 
-// Target contract
-import { IL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
+// Scripts
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 
+// Libraries
+import { LibString } from "@solady/utils/LibString.sol";
+
+// Interfaces
+import { IL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
+
 contract Owner {
     bool public isUpgrading;
 
@@ -103,7 +108,10 @@ contract L1ChugSplashProxy_Test is Test {
         // Because forge coverage always runs with the optimizer disabled,
         // if forge coverage is run before testing this with forge test or forge snapshot, forge clean should be
         // run first so that it recompiles the contracts using the foundry.toml optimizer settings.
-        if (vm.isContext(VmSafe.ForgeContext.Coverage)) {
+        if (
+            vm.isContext(VmSafe.ForgeContext.Coverage)
+                || LibString.eq(vm.envOr("FOUNDRY_PROFILE", string("default")), "lite")
+        ) {
             gasLimit = 95_000;
         } else if (vm.isContext(VmSafe.ForgeContext.Test) || vm.isContext(VmSafe.ForgeContext.Snapshot)) {
             gasLimit = 65_000;
diff --git a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
index b87970dbb232..60aba27f83eb 100644
--- a/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
+++ b/packages/contracts-bedrock/test/libraries/SafeCall.t.sol
@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-// Testing utilities
+// Forge
 import { Test } from "forge-std/Test.sol";
 import { VmSafe } from "forge-std/Vm.sol";
 import { StdCheatsSafe } from "forge-std/StdCheats.sol";
 
-// Target contract
+// Libraries
+import { LibString } from "@solady/utils/LibString.sol";
 import { SafeCall } from "src/libraries/SafeCall.sol";
 
 contract SafeCall_Test is Test {
@@ -133,7 +134,10 @@ contract SafeCall_Test is Test {
             // Because forge coverage always runs with the optimizer disabled,
             // if forge coverage is run before testing this with forge test or forge snapshot, forge clean should be
             // run first so that it recompiles the contracts using the foundry.toml optimizer settings.
-            if (vm.isContext(VmSafe.ForgeContext.Coverage)) {
+            if (
+                vm.isContext(VmSafe.ForgeContext.Coverage)
+                    || LibString.eq(vm.envOr("FOUNDRY_PROFILE", string("default")), "lite")
+            ) {
                 // 66_290 is the exact amount of gas required to make the safe call
                 // successfully with the optimizer disabled (ran via forge coverage)
                 expected = 66_290;
@@ -173,7 +177,10 @@ contract SafeCall_Test is Test {
             // Because forge coverage always runs with the optimizer disabled,
             // if forge coverage is run before testing this with forge test or forge snapshot, forge clean should be
             // run first so that it recompiles the contracts using the foundry.toml optimizer settings.
-            if (vm.isContext(VmSafe.ForgeContext.Coverage)) {
+            if (
+                vm.isContext(VmSafe.ForgeContext.Coverage)
+                    || LibString.eq(vm.envOr("FOUNDRY_PROFILE", string("default")), "lite")
+            ) {
                 // 15_278_989 is the exact amount of gas required to make the safe call
                 // successfully with the optimizer disabled (ran via forge coverage)
                 expected = 15_278_989;

From 89015e18d5521c1939da9b00f5d6f3ea3af9740a Mon Sep 17 00:00:00 2001
From: leopardracer <136604165+leopardracer@users.noreply.github.com>
Date: Wed, 11 Dec 2024 01:16:34 +0200
Subject: [PATCH 431/451] fix: typos in documentation files (#13319)

* Update PROPERTIES.md

* Update README.md

* Update GovernanceToken.sol

* Update Burn.Eth.t.sol
---
 op-supervisor/README.md                                         | 2 +-
 packages/contracts-bedrock/src/governance/GovernanceToken.sol   | 2 +-
 packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol       | 2 +-
 .../test/invariants/OptimismSuperchainERC20/PROPERTIES.md       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/op-supervisor/README.md b/op-supervisor/README.md
index 8e5468bdc439..47e5a1484795 100644
--- a/op-supervisor/README.md
+++ b/op-supervisor/README.md
@@ -117,7 +117,7 @@ participant opnodeB as op-node B
 Note over opnodeA: on new block
 
 opnodeA ->> opgethA: engine process unsafe block
-opgethA -->> opnodeA: engine proccessed unsafe block
+opgethA -->> opnodeA: engine processed unsafe block
 opnodeA ->> opsup: update Local unsafe
 opnodeB ->> opsup: update Local unsafe (maybe)
 opsup ->> opgethA: Fetch receipts
diff --git a/packages/contracts-bedrock/src/governance/GovernanceToken.sol b/packages/contracts-bedrock/src/governance/GovernanceToken.sol
index 3843c3241b2b..eecfafc5d751 100644
--- a/packages/contracts-bedrock/src/governance/GovernanceToken.sol
+++ b/packages/contracts-bedrock/src/governance/GovernanceToken.sol
@@ -27,7 +27,7 @@ contract GovernanceToken is ERC20Burnable, ERC20Votes, Ownable {
     /// @notice Callback called after a token transfer.
     /// @param from   The account sending tokens.
     /// @param to     The account receiving tokens.
-    /// @param amount The amount of tokens being transfered.
+    /// @param amount The amount of tokens being transferred.
     function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20, ERC20Votes) {
         super._afterTokenTransfer(from, to, amount);
     }
diff --git a/packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol b/packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol
index c57b50fd6f09..e68fe4e042ad 100644
--- a/packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol
+++ b/packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol
@@ -33,7 +33,7 @@ contract Burn_EthBurner is StdUtils {
         // execute a burn of _value eth
         Burn.eth(value);
 
-        // check that exactly value eth was transfered from the contract
+        // check that exactly value eth was transferred from the contract
         unchecked {
             if (address(this).balance != preBurnBalance - value) {
                 failedEthBurn = true;
diff --git a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/PROPERTIES.md b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/PROPERTIES.md
index 1c8c90bb0301..ea425d2928f7 100644
--- a/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/PROPERTIES.md
+++ b/packages/contracts-bedrock/test/invariants/OptimismSuperchainERC20/PROPERTIES.md
@@ -16,7 +16,7 @@ Considering only the supertoken contract is merged into the `develop` branch, an
 
 ## Definitions
 
-- _legacy token:_ an OptimismMintableERC20 or L2StandardERC20 token on the suprechain that has either been deployed by the factory after the liquidity migration upgrade to the latter, or has been deployed before it **but** added to factory’s `deployments` mapping as part of the upgrade. This testing campaign is not concerned with tokens on L1 or not listed in the factory’s `deployments` mapping.
+- _legacy token:_ an OptimismMintableERC20 or L2StandardERC20 token on the superchain that has either been deployed by the factory after the liquidity migration upgrade to the latter, or has been deployed before it **but** added to factory’s `deployments` mapping as part of the upgrade. This testing campaign is not concerned with tokens on L1 or not listed in the factory’s `deployments` mapping.
 - _supertoken:_ a SuperchainERC20 contract deployed by the `OptimismSuperchainERC20Factory`
 
 # Ecosystem properties

From 8398e25f83aa5ef1a19c553affa42466a1480a04 Mon Sep 17 00:00:00 2001
From: Tyler Smith <mail@tcry.pt>
Date: Tue, 10 Dec 2024 15:30:59 -0800
Subject: [PATCH 432/451] interop-devnet,fix: Add newly required op-supervisor
 flags. (#13343)

* interop-devnet,fix: Add newly required op-supervisor flags.

* interop,tweak: Add interop.jwt-secret flags to op-nodes.
---
 interop-devnet/docker-compose.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/interop-devnet/docker-compose.yml b/interop-devnet/docker-compose.yml
index 386967df7c89..5d01a62fa5c3 100644
--- a/interop-devnet/docker-compose.yml
+++ b/interop-devnet/docker-compose.yml
@@ -84,6 +84,7 @@ services:
     volumes:
       - "supervisor_data:/db"
       - "./depset.json:/depset.json"
+      - "${PWD}/../ops-bedrock/test-jwt-secret.txt:/config/jwt-secret.txt"
     image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-supervisor:devnet
     command: >
       op-supervisor
@@ -92,7 +93,9 @@ services:
       --rpc.addr="0.0.0.0"
       --rpc.port=8545
       --rpc.enable-admin
+      --l1-rpc="http://l1:8545"
       --l2-consensus.nodes="http://op-node-a:9645,http://op-node-b:9645"
+      --l2-consensus.jwt-secret=/config/jwt-secret.txt
     environment:
       OP_SUPERVISOR_METRICS_ENABLED: "true"
 
@@ -159,6 +162,7 @@ services:
       --interop.supervisor=http://op-supervisor:8545
       --interop.rpc.addr=0.0.0.0
       --interop.rpc.port=9645
+      --interop.jwt-secret=/config/jwt-secret.txt
       --sequencer.enabled
       --sequencer.l1-confs=0
       --verifier.l1-confs=0
@@ -213,6 +217,7 @@ services:
       --interop.supervisor=http://op-supervisor:8545
       --interop.rpc.addr=0.0.0.0
       --interop.rpc.port=9645
+      --interop.jwt-secret=/config/jwt-secret.txt
       --sequencer.enabled
       --sequencer.l1-confs=0
       --verifier.l1-confs=0

From 4d30eea5f97535bf1996408a89498d52bea74ef9 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 10 Dec 2024 22:43:03 -0700
Subject: [PATCH 433/451] op-deployer: Add support for additional dispute games
 (#13346)

Users can now specify additional dispute games with custom VM types and preimage oracles. This will help with removing allocs files in the future.
---
 op-deployer/pkg/deployer/apply.go             |  13 +-
 .../pkg/deployer/bootstrap/dispute_game.go    |   3 +-
 .../deployer/integration_test/apply_test.go   |  42 ++++-
 op-deployer/pkg/deployer/opcm/dispute_game.go |   2 +-
 .../pkg/deployer/opcm/dispute_game_test.go    |   3 +-
 .../pkg/deployer/pipeline/dispute_games.go    | 145 ++++++++++++++++++
 .../pkg/deployer/pipeline/implementations.go  |  13 +-
 op-deployer/pkg/deployer/pipeline/opchain.go  |  14 +-
 .../pkg/deployer/state/chain_intent.go        |  25 +++
 op-deployer/pkg/deployer/state/intent.go      |  12 ++
 op-deployer/pkg/deployer/state/intent_test.go |  56 ++++++-
 op-deployer/pkg/deployer/state/state.go       |  43 ++++--
 12 files changed, 320 insertions(+), 51 deletions(-)
 create mode 100644 op-deployer/pkg/deployer/pipeline/dispute_games.go

diff --git a/op-deployer/pkg/deployer/apply.go b/op-deployer/pkg/deployer/apply.go
index b4ff343de351..9092542b7c56 100644
--- a/op-deployer/pkg/deployer/apply.go
+++ b/op-deployer/pkg/deployer/apply.go
@@ -175,7 +175,11 @@ func ApplyPipeline(
 		L2: l2ArtifactsFS,
 	}
 
-	var deployer common.Address
+	deployer := common.Address{0x01}
+	if opts.DeployerPrivateKey != nil {
+		deployer = crypto.PubkeyToAddress(opts.DeployerPrivateKey.PublicKey)
+	}
+
 	var bcaster broadcaster.Broadcaster
 	var l1Client *ethclient.Client
 	var l1Host *script.Host
@@ -193,7 +197,6 @@ func ApplyPipeline(
 		}
 
 		signer := opcrypto.SignerFnFromBind(opcrypto.PrivateKeySignerFn(opts.DeployerPrivateKey, chainID))
-		deployer = crypto.PubkeyToAddress(opts.DeployerPrivateKey.PublicKey)
 
 		bcaster, err = broadcaster.NewKeyedBroadcaster(broadcaster.KeyedBroadcasterOpts{
 			Logger:  opts.Logger,
@@ -235,7 +238,6 @@ func ApplyPipeline(
 			return fmt.Errorf("failed to select fork: %w", err)
 		}
 	} else {
-		deployer = common.Address{0x01}
 		bcaster = broadcaster.NoopBroadcaster()
 		l1Host, err = env.DefaultScriptHost(
 			bcaster,
@@ -286,6 +288,11 @@ func ApplyPipeline(
 			func() error {
 				return pipeline.DeployAltDA(pEnv, intent, st, chainID)
 			},
+		}, pipelineStage{
+			fmt.Sprintf("deploy-additional-dispute-games-%s", chainID.Hex()),
+			func() error {
+				return pipeline.DeployAdditionalDisputeGames(pEnv, intent, st, chainID)
+			},
 		}, pipelineStage{
 			fmt.Sprintf("generate-l2-genesis-%s", chainID.Hex()),
 			func() error {
diff --git a/op-deployer/pkg/deployer/bootstrap/dispute_game.go b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
index acadd1ab9f92..890718bd02d9 100644
--- a/op-deployer/pkg/deployer/bootstrap/dispute_game.go
+++ b/op-deployer/pkg/deployer/bootstrap/dispute_game.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"fmt"
+	"math/big"
 	"strings"
 
 	artifacts2 "github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
@@ -224,7 +225,7 @@ func DisputeGame(ctx context.Context, cfg DisputeGameConfig) (opcm.DeployDispute
 			MaxClockDuration:         cfg.MaxClockDuration,
 			DelayedWethProxy:         cfg.DelayedWethProxy,
 			AnchorStateRegistryProxy: cfg.AnchorStateRegistryProxy,
-			L2ChainId:                cfg.L2ChainId,
+			L2ChainId:                common.BigToHash(new(big.Int).SetUint64(cfg.L2ChainId)),
 			Proposer:                 cfg.Proposer,
 			Challenger:               cfg.Challenger,
 		},
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index 1512da447132..d1280d14f4c7 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -695,6 +695,47 @@ func TestInvalidL2Genesis(t *testing.T) {
 	}
 }
 
+func TestAdditionalDisputeGames(t *testing.T) {
+	op_e2e.InitParallel(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	opts, intent, st := setupGenesisChain(t, defaultL1ChainID)
+	(&intent.Chains[0].Roles).L1ProxyAdminOwner = crypto.PubkeyToAddress(opts.DeployerPrivateKey.PublicKey)
+	intent.GlobalDeployOverrides = map[string]any{
+		"challengePeriodSeconds": 1,
+	}
+	intent.Chains[0].AdditionalDisputeGames = []state.AdditionalDisputeGame{
+		{
+			ChainProofParams: state.ChainProofParams{
+				DisputeGameType:                         255,
+				DisputeAbsolutePrestate:                 standard.DisputeAbsolutePrestate,
+				DisputeMaxGameDepth:                     50,
+				DisputeSplitDepth:                       14,
+				DisputeClockExtension:                   0,
+				DisputeMaxClockDuration:                 1200,
+				DangerouslyAllowCustomDisputeParameters: true,
+			},
+			UseCustomOracle:              true,
+			OracleMinProposalSize:        10000,
+			OracleChallengePeriodSeconds: 120,
+			VMType:                       state.VMTypeAlphabet,
+		},
+	}
+
+	require.NoError(t, deployer.ApplyPipeline(ctx, opts))
+
+	chainState := st.Chains[0]
+	require.Equal(t, 1, len(chainState.AdditionalDisputeGames))
+
+	gameInfo := chainState.AdditionalDisputeGames[0]
+	require.NotEmpty(t, gameInfo.VMAddress)
+	require.NotEmpty(t, gameInfo.GameAddress)
+	require.NotEmpty(t, gameInfo.OracleAddress)
+	require.NotEqual(t, st.ImplementationsDeployment.PreimageOracleSingletonAddress, gameInfo.OracleAddress)
+}
+
 func setupGenesisChain(t *testing.T, l1ChainID uint64) (deployer.ApplyPipelineOpts, *state.Intent, *state.State) {
 	lgr := testlog.Logger(t, slog.LevelDebug)
 
@@ -711,7 +752,6 @@ func setupGenesisChain(t *testing.T, l1ChainID uint64) (deployer.ApplyPipelineOp
 	loc, _ := testutil.LocalArtifacts(t)
 
 	intent, st := newIntent(t, l1ChainIDBig, dk, l2ChainID1, loc, loc)
-	intent.Chains = append(intent.Chains, newChainIntent(t, dk, l1ChainIDBig, l2ChainID1))
 	intent.DeploymentStrategy = state.DeploymentStrategyGenesis
 
 	opts := deployer.ApplyPipelineOpts{
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game.go b/op-deployer/pkg/deployer/opcm/dispute_game.go
index b6e60dd0281d..045091f760dc 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game.go
@@ -19,7 +19,7 @@ type DeployDisputeGameInput struct {
 	MaxClockDuration         uint64
 	DelayedWethProxy         common.Address
 	AnchorStateRegistryProxy common.Address
-	L2ChainId                uint64
+	L2ChainId                common.Hash
 	Proposer                 common.Address
 	Challenger               common.Address
 }
diff --git a/op-deployer/pkg/deployer/opcm/dispute_game_test.go b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
index 9fcae49ef555..604329d7c099 100644
--- a/op-deployer/pkg/deployer/opcm/dispute_game_test.go
+++ b/op-deployer/pkg/deployer/opcm/dispute_game_test.go
@@ -1,6 +1,7 @@
 package opcm
 
 import (
+	"math/big"
 	"testing"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
@@ -47,7 +48,7 @@ func TestDeployDisputeGame(t *testing.T) {
 		MaxClockDuration:         standard.DisputeMaxClockDuration,
 		DelayedWethProxy:         common.Address{'D'},
 		AnchorStateRegistryProxy: common.Address{'A'},
-		L2ChainId:                69,
+		L2ChainId:                common.BigToHash(big.NewInt(69)),
 		Proposer:                 common.Address{'P'},
 		Challenger:               common.Address{'C'},
 	}
diff --git a/op-deployer/pkg/deployer/pipeline/dispute_games.go b/op-deployer/pkg/deployer/pipeline/dispute_games.go
new file mode 100644
index 000000000000..c6ec11e2c3b9
--- /dev/null
+++ b/op-deployer/pkg/deployer/pipeline/dispute_games.go
@@ -0,0 +1,145 @@
+package pipeline
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+func DeployAdditionalDisputeGames(
+	env *Env,
+	intent *state.Intent,
+	st *state.State,
+	chainID common.Hash,
+) error {
+	lgr := env.Logger.New("stage", "deploy-additional-dispute-games")
+
+	thisIntent, err := intent.Chain(chainID)
+	if err != nil {
+		return fmt.Errorf("failed to get chain intent: %w", err)
+	}
+
+	thisState, err := st.Chain(chainID)
+	if err != nil {
+		return fmt.Errorf("failed to get chain state: %w", err)
+	}
+
+	if !shouldDeployAdditionalDisputeGames(thisIntent, thisState) {
+		lgr.Info("additional dispute games deployment not needed")
+		return nil
+	}
+
+	if thisIntent.Roles.L1ProxyAdminOwner != env.Deployer {
+		return fmt.Errorf("cannot deploy additional dispute games when deployer is not L1PAO")
+	}
+
+	for _, game := range thisIntent.AdditionalDisputeGames {
+		if err := deployDisputeGame(env, st, thisIntent, thisState, game); err != nil {
+			return fmt.Errorf("failed to deploy additional dispute game: %w", err)
+		}
+	}
+
+	return nil
+}
+
+func deployDisputeGame(
+	env *Env,
+	st *state.State,
+	thisIntent *state.ChainIntent,
+	thisState *state.ChainState,
+	game state.AdditionalDisputeGame,
+) error {
+	lgr := env.Logger.New("gameType", game.DisputeGameType)
+
+	var oracleAddr common.Address
+	if game.UseCustomOracle {
+		lgr.Info("deploying custom oracle")
+
+		out, err := opcm.DeployPreimageOracle(env.L1ScriptHost, opcm.DeployPreimageOracleInput{
+			MinProposalSize: new(big.Int).SetUint64(game.OracleMinProposalSize),
+			ChallengePeriod: new(big.Int).SetUint64(game.OracleChallengePeriodSeconds),
+		})
+		if err != nil {
+			return fmt.Errorf("failed to deploy preimage oracle: %w", err)
+		}
+		oracleAddr = out.PreimageOracle
+	} else {
+		lgr.Debug("using existing preimage oracle")
+	}
+
+	lgr.Info("deploying VM", "vmType", game.VMType)
+	var vmAddr common.Address
+	switch game.VMType {
+	case state.VMTypeAlphabet:
+		out, err := opcm.DeployAlphabetVM(env.L1ScriptHost, opcm.DeployAlphabetVMInput{
+			AbsolutePrestate: game.DisputeAbsolutePrestate,
+			PreimageOracle:   st.ImplementationsDeployment.PreimageOracleSingletonAddress,
+		})
+		if err != nil {
+			return fmt.Errorf("failed to deploy Alphabet VM: %w", err)
+		}
+		vmAddr = out.AlphabetVM
+	default:
+		return fmt.Errorf("unsupported VM type: %v", game.VMType)
+	}
+	lgr.Info("vm deployed", "vmAddr", vmAddr)
+
+	lgr.Info("deploying dispute game")
+	out, err := opcm.DeployDisputeGame(env.L1ScriptHost, opcm.DeployDisputeGameInput{
+		Release:                  "dev",
+		VmAddress:                vmAddr,
+		GameKind:                 "FaultDisputeGame",
+		GameType:                 game.DisputeGameType,
+		AbsolutePrestate:         standard.DisputeAbsolutePrestate,
+		MaxGameDepth:             game.DisputeMaxGameDepth,
+		SplitDepth:               game.DisputeSplitDepth,
+		ClockExtension:           game.DisputeClockExtension,
+		MaxClockDuration:         game.DisputeMaxClockDuration,
+		DelayedWethProxy:         thisState.DelayedWETHPermissionedGameProxyAddress,
+		AnchorStateRegistryProxy: thisState.AnchorStateRegistryProxyAddress,
+		L2ChainId:                thisIntent.ID,
+		Proposer:                 thisIntent.Roles.Proposer,
+		Challenger:               thisIntent.Roles.Challenger,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to deploy dispute game: %w", err)
+	}
+	lgr.Info("dispute game deployed", "impl", out.DisputeGameImpl)
+
+	lgr.Info("setting dispute game impl on factory")
+	if err := opcm.SetDisputeGameImpl(
+		env.L1ScriptHost,
+		opcm.SetDisputeGameImplInput{
+			Factory: thisState.DisputeGameFactoryProxyAddress,
+			Impl:    out.DisputeGameImpl,
+		},
+	); err != nil {
+		return fmt.Errorf("failed to set dispute game impl: %w", err)
+	}
+
+	thisState.AdditionalDisputeGames = append(thisState.AdditionalDisputeGames, state.AdditionalDisputeGameState{
+		GameType:      game.DisputeGameType,
+		VMType:        game.VMType,
+		GameAddress:   out.DisputeGameImpl,
+		OracleAddress: oracleAddr,
+		VMAddress:     vmAddr,
+	})
+
+	return nil
+}
+
+func shouldDeployAdditionalDisputeGames(thisIntent *state.ChainIntent, thisState *state.ChainState) bool {
+	if len(thisIntent.AdditionalDisputeGames) == 0 {
+		return false
+	}
+
+	if len(thisState.AdditionalDisputeGames) > 0 {
+		return false
+	}
+
+	return true
+}
diff --git a/op-deployer/pkg/deployer/pipeline/implementations.go b/op-deployer/pkg/deployer/pipeline/implementations.go
index c2d409b5c3a4..922186bf2cf8 100644
--- a/op-deployer/pkg/deployer/pipeline/implementations.go
+++ b/op-deployer/pkg/deployer/pipeline/implementations.go
@@ -4,22 +4,13 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 )
 
-type SuperchainProofParams struct {
-	WithdrawalDelaySeconds          uint64 `json:"withdrawalDelaySeconds" toml:"withdrawalDelaySeconds"`
-	MinProposalSizeBytes            uint64 `json:"minProposalSizeBytes" toml:"minProposalSizeBytes"`
-	ChallengePeriodSeconds          uint64 `json:"challengePeriodSeconds" toml:"challengePeriodSeconds"`
-	ProofMaturityDelaySeconds       uint64 `json:"proofMaturityDelaySeconds" toml:"proofMaturityDelaySeconds"`
-	DisputeGameFinalityDelaySeconds uint64 `json:"disputeGameFinalityDelaySeconds" toml:"disputeGameFinalityDelaySeconds"`
-	MIPSVersion                     uint64 `json:"mipsVersion" toml:"mipsVersion"`
-}
-
 func DeployImplementations(env *Env, intent *state.Intent, st *state.State) error {
 	lgr := env.Logger.New("stage", "deploy-implementations")
 
@@ -46,7 +37,7 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 	}
 
 	proofParams, err := jsonutil.MergeJSON(
-		SuperchainProofParams{
+		state.SuperchainProofParams{
 			WithdrawalDelaySeconds:          standard.WithdrawalDelaySeconds,
 			MinProposalSizeBytes:            standard.MinProposalSizeBytes,
 			ChallengePeriodSeconds:          standard.ChallengePeriodSeconds,
diff --git a/op-deployer/pkg/deployer/pipeline/opchain.go b/op-deployer/pkg/deployer/pipeline/opchain.go
index 90cc665e077d..4bc9603347c5 100644
--- a/op-deployer/pkg/deployer/pipeline/opchain.go
+++ b/op-deployer/pkg/deployer/pipeline/opchain.go
@@ -3,10 +3,10 @@ package pipeline
 import (
 	"fmt"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"
 	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
 	"github.com/ethereum/go-ethereum/common"
 )
@@ -89,19 +89,9 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 	return nil
 }
 
-type ChainProofParams struct {
-	DisputeGameType                         uint32      `json:"disputeGameType" toml:"disputeGameType"`
-	DisputeAbsolutePrestate                 common.Hash `json:"disputeAbsolutePrestate" toml:"disputeAbsolutePrestate"`
-	DisputeMaxGameDepth                     uint64      `json:"disputeMaxGameDepth" toml:"disputeMaxGameDepth"`
-	DisputeSplitDepth                       uint64      `json:"disputeSplitDepth" toml:"disputeSplitDepth"`
-	DisputeClockExtension                   uint64      `json:"disputeClockExtension" toml:"disputeClockExtension"`
-	DisputeMaxClockDuration                 uint64      `json:"disputeMaxClockDuration" toml:"disputeMaxClockDuration"`
-	DangerouslyAllowCustomDisputeParameters bool        `json:"dangerouslyAllowCustomDisputeParameters" toml:"dangerouslyAllowCustomDisputeParameters"`
-}
-
 func makeDCIV160(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInputV160, error) {
 	proofParams, err := jsonutil.MergeJSON(
-		ChainProofParams{
+		state.ChainProofParams{
 			DisputeGameType:         standard.DisputeGameType,
 			DisputeAbsolutePrestate: standard.DisputeAbsolutePrestate,
 			DisputeMaxGameDepth:     standard.DisputeMaxGameDepth,
diff --git a/op-deployer/pkg/deployer/state/chain_intent.go b/op-deployer/pkg/deployer/state/chain_intent.go
index bb6693f56b88..c924d3188211 100644
--- a/op-deployer/pkg/deployer/state/chain_intent.go
+++ b/op-deployer/pkg/deployer/state/chain_intent.go
@@ -8,6 +8,30 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+type VMType string
+
+const (
+	VMTypeAlphabet = "ALPHABET"
+)
+
+type ChainProofParams struct {
+	DisputeGameType                         uint32      `json:"disputeGameType" toml:"disputeGameType"`
+	DisputeAbsolutePrestate                 common.Hash `json:"disputeAbsolutePrestate" toml:"disputeAbsolutePrestate"`
+	DisputeMaxGameDepth                     uint64      `json:"disputeMaxGameDepth" toml:"disputeMaxGameDepth"`
+	DisputeSplitDepth                       uint64      `json:"disputeSplitDepth" toml:"disputeSplitDepth"`
+	DisputeClockExtension                   uint64      `json:"disputeClockExtension" toml:"disputeClockExtension"`
+	DisputeMaxClockDuration                 uint64      `json:"disputeMaxClockDuration" toml:"disputeMaxClockDuration"`
+	DangerouslyAllowCustomDisputeParameters bool        `json:"dangerouslyAllowCustomDisputeParameters" toml:"dangerouslyAllowCustomDisputeParameters"`
+}
+
+type AdditionalDisputeGame struct {
+	ChainProofParams
+	VMType                       VMType
+	UseCustomOracle              bool
+	OracleMinProposalSize        uint64
+	OracleChallengePeriodSeconds uint64
+}
+
 type ChainIntent struct {
 	ID                         common.Hash               `json:"id" toml:"id"`
 	BaseFeeVaultRecipient      common.Address            `json:"baseFeeVaultRecipient" toml:"baseFeeVaultRecipient"`
@@ -19,6 +43,7 @@ type ChainIntent struct {
 	Roles                      ChainRoles                `json:"roles" toml:"roles"`
 	DeployOverrides            map[string]any            `json:"deployOverrides" toml:"deployOverrides"`
 	DangerousAltDAConfig       genesis.AltDADeployConfig `json:"dangerousAltDAConfig,omitempty" toml:"dangerousAltDAConfig,omitempty"`
+	AdditionalDisputeGames     []AdditionalDisputeGame   `json:"dangerousAdditionalDisputeGames" toml:"dangerousAdditionalDisputeGames,omitempty"`
 }
 
 type ChainRoles struct {
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index 5b1e4222b3e0..d3d5d44d7ad4 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -45,6 +45,15 @@ const (
 var emptyAddress common.Address
 var emptyHash common.Hash
 
+type SuperchainProofParams struct {
+	WithdrawalDelaySeconds          uint64 `json:"withdrawalDelaySeconds" toml:"withdrawalDelaySeconds"`
+	MinProposalSizeBytes            uint64 `json:"minProposalSizeBytes" toml:"minProposalSizeBytes"`
+	ChallengePeriodSeconds          uint64 `json:"challengePeriodSeconds" toml:"challengePeriodSeconds"`
+	ProofMaturityDelaySeconds       uint64 `json:"proofMaturityDelaySeconds" toml:"proofMaturityDelaySeconds"`
+	DisputeGameFinalityDelaySeconds uint64 `json:"disputeGameFinalityDelaySeconds" toml:"disputeGameFinalityDelaySeconds"`
+	MIPSVersion                     uint64 `json:"mipsVersion" toml:"mipsVersion"`
+}
+
 type Intent struct {
 	DeploymentStrategy    DeploymentStrategy `json:"deploymentStrategy" toml:"deploymentStrategy"`
 	ConfigType            IntentConfigType   `json:"configType" toml:"configType"`
@@ -165,6 +174,9 @@ func (c *Intent) validateStandardValues() error {
 			chain.Eip1559Elasticity != standard.Eip1559Elasticity {
 			return fmt.Errorf("%w: chainId=%s", ErrNonStandardValue, chain.ID)
 		}
+		if len(chain.AdditionalDisputeGames) > 0 {
+			return fmt.Errorf("%w: chainId=%s additionalDisputeGames must be nil", ErrNonStandardValue, chain.ID)
+		}
 	}
 
 	return nil
diff --git a/op-deployer/pkg/deployer/state/intent_test.go b/op-deployer/pkg/deployer/state/intent_test.go
index 1d8c12375f88..684effe0fb58 100644
--- a/op-deployer/pkg/deployer/state/intent_test.go
+++ b/op-deployer/pkg/deployer/state/intent_test.go
@@ -24,10 +24,58 @@ func TestValidateStandardValues(t *testing.T) {
 	err = intent.Check()
 	require.NoError(t, err)
 
-	intent.Chains[0].Eip1559Denominator = 3 // set to non-standard value
-	err = intent.Check()
-	require.Error(t, err)
-	require.ErrorIs(t, err, ErrNonStandardValue)
+	tests := []struct {
+		name    string
+		mutator func(intent *Intent)
+		err     error
+	}{
+		{
+			"EIP1559Denominator",
+			func(intent *Intent) {
+				intent.Chains[0].Eip1559Denominator = 3
+			},
+			ErrNonStandardValue,
+		},
+		{
+			"EIP1559DenominatorCanyon",
+			func(intent *Intent) {
+				intent.Chains[0].Eip1559DenominatorCanyon = 3
+			},
+			ErrNonStandardValue,
+		},
+		{
+			"EIP1559Elasticity",
+			func(intent *Intent) {
+				intent.Chains[0].Eip1559Elasticity = 999
+			},
+			ErrNonStandardValue,
+		},
+		{
+			"AdditionalDisputeGames",
+			func(intent *Intent) {
+				intent.Chains[0].AdditionalDisputeGames = []AdditionalDisputeGame{
+					{
+						VMType: VMTypeAlphabet,
+					},
+				}
+			},
+			ErrNonStandardValue,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			intent, err := NewIntentStandard(DeploymentStrategyLive, 1, []common.Hash{common.HexToHash("0x336")})
+			require.NoError(t, err)
+			setChainRoles(&intent)
+			setFeeAddresses(&intent)
+
+			tt.mutator(&intent)
+
+			err = intent.Check()
+			require.Error(t, err)
+			require.ErrorIs(t, err, tt.err)
+		})
+	}
 }
 
 func TestValidateCustomValues(t *testing.T) {
diff --git a/op-deployer/pkg/deployer/state/state.go b/op-deployer/pkg/deployer/state/state.go
index e17ed6184c5d..4e2572125a4e 100644
--- a/op-deployer/pkg/deployer/state/state.go
+++ b/op-deployer/pkg/deployer/state/state.go
@@ -77,26 +77,35 @@ type ImplementationsDeployment struct {
 	DisputeGameFactoryImplAddress           common.Address `json:"disputeGameFactoryImplAddress"`
 }
 
+type AdditionalDisputeGameState struct {
+	GameType      uint32
+	GameAddress   common.Address
+	VMAddress     common.Address
+	OracleAddress common.Address
+	VMType        VMType
+}
+
 type ChainState struct {
 	ID common.Hash `json:"id"`
 
-	ProxyAdminAddress                         common.Address `json:"proxyAdminAddress"`
-	AddressManagerAddress                     common.Address `json:"addressManagerAddress"`
-	L1ERC721BridgeProxyAddress                common.Address `json:"l1ERC721BridgeProxyAddress"`
-	SystemConfigProxyAddress                  common.Address `json:"systemConfigProxyAddress"`
-	OptimismMintableERC20FactoryProxyAddress  common.Address `json:"optimismMintableERC20FactoryProxyAddress"`
-	L1StandardBridgeProxyAddress              common.Address `json:"l1StandardBridgeProxyAddress"`
-	L1CrossDomainMessengerProxyAddress        common.Address `json:"l1CrossDomainMessengerProxyAddress"`
-	OptimismPortalProxyAddress                common.Address `json:"optimismPortalProxyAddress"`
-	DisputeGameFactoryProxyAddress            common.Address `json:"disputeGameFactoryProxyAddress"`
-	AnchorStateRegistryProxyAddress           common.Address `json:"anchorStateRegistryProxyAddress"`
-	AnchorStateRegistryImplAddress            common.Address `json:"anchorStateRegistryImplAddress"`
-	FaultDisputeGameAddress                   common.Address `json:"faultDisputeGameAddress"`
-	PermissionedDisputeGameAddress            common.Address `json:"permissionedDisputeGameAddress"`
-	DelayedWETHPermissionedGameProxyAddress   common.Address `json:"delayedWETHPermissionedGameProxyAddress"`
-	DelayedWETHPermissionlessGameProxyAddress common.Address `json:"delayedWETHPermissionlessGameProxyAddress"`
-	DataAvailabilityChallengeProxyAddress     common.Address `json:"dataAvailabilityChallengeProxyAddress"`
-	DataAvailabilityChallengeImplAddress      common.Address `json:"dataAvailabilityChallengeImplAddress"`
+	ProxyAdminAddress                         common.Address               `json:"proxyAdminAddress"`
+	AddressManagerAddress                     common.Address               `json:"addressManagerAddress"`
+	L1ERC721BridgeProxyAddress                common.Address               `json:"l1ERC721BridgeProxyAddress"`
+	SystemConfigProxyAddress                  common.Address               `json:"systemConfigProxyAddress"`
+	OptimismMintableERC20FactoryProxyAddress  common.Address               `json:"optimismMintableERC20FactoryProxyAddress"`
+	L1StandardBridgeProxyAddress              common.Address               `json:"l1StandardBridgeProxyAddress"`
+	L1CrossDomainMessengerProxyAddress        common.Address               `json:"l1CrossDomainMessengerProxyAddress"`
+	OptimismPortalProxyAddress                common.Address               `json:"optimismPortalProxyAddress"`
+	DisputeGameFactoryProxyAddress            common.Address               `json:"disputeGameFactoryProxyAddress"`
+	AnchorStateRegistryProxyAddress           common.Address               `json:"anchorStateRegistryProxyAddress"`
+	AnchorStateRegistryImplAddress            common.Address               `json:"anchorStateRegistryImplAddress"`
+	FaultDisputeGameAddress                   common.Address               `json:"faultDisputeGameAddress"`
+	PermissionedDisputeGameAddress            common.Address               `json:"permissionedDisputeGameAddress"`
+	DelayedWETHPermissionedGameProxyAddress   common.Address               `json:"delayedWETHPermissionedGameProxyAddress"`
+	DelayedWETHPermissionlessGameProxyAddress common.Address               `json:"delayedWETHPermissionlessGameProxyAddress"`
+	DataAvailabilityChallengeProxyAddress     common.Address               `json:"dataAvailabilityChallengeProxyAddress"`
+	DataAvailabilityChallengeImplAddress      common.Address               `json:"dataAvailabilityChallengeImplAddress"`
+	AdditionalDisputeGames                    []AdditionalDisputeGameState `json:"additionalDisputeGames"`
 
 	Allocs *GzipData[foundry.ForgeAllocs] `json:"allocs"`
 

From 83c4415f14481a2a7481636e7bc1cf0e34bc91c5 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Wed, 11 Dec 2024 01:06:26 -0500
Subject: [PATCH 434/451] feat: Update foundry to support vm.skip() in setup
 (#13351)

https://github.com/foundry-rs/foundry/pull/9532
---
 mise.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mise.toml b/mise.toml
index 5fb473de8891..8f83820100ba 100644
--- a/mise.toml
+++ b/mise.toml
@@ -31,9 +31,9 @@ just = "1.37.0"
 # Foundry dependencies
 # Foundry is a special case because it supplies multiple binaries at the same
 # GitHub release, so we need to use the aliasing trick to get mise to not error
-forge = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
-cast = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
-anvil = "nightly-e5dbb7a320c2b871c4a4a1006ad3c15a08fcf17b"
+forge = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
+cast = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
+anvil = "nightly-59f354c179f4e7f6d7292acb3d068815c79286d1"
 
 # Fake dependencies
 # Put things here if you need to track versions of tools or projects that can't

From a055e9f477273c08fc61224f9625fa1c2d47fe08 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Wed, 11 Dec 2024 09:12:22 -0500
Subject: [PATCH 435/451] feat: contracts coverage in mainline ci (#13342)

Moves code coverage for smart contracts into mainline ci. CI will
now reject PRs that do not have 100% patch coverage.
---
 .circleci/config.yml                    | 78 ++++++++-----------------
 codecov.yml                             | 22 +++----
 packages/contracts-bedrock/foundry.toml |  6 +-
 3 files changed, 37 insertions(+), 69 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 54420f0b4b1c..8d2b56bf2254 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -608,32 +608,6 @@ jobs:
             docker pull $image_name || exit 1
             docker run $image_name <<parameters.op_component>> --version || exit 1
 
-  contracts-bedrock-coverage:
-    docker:
-      - image: <<pipeline.parameters.ci_builder_image>>
-    resource_class: xlarge
-    steps:
-      - checkout
-      - install-contracts-dependencies
-      - check-changed:
-          patterns: contracts-bedrock,op-node
-      - run:
-          name: print forge version
-          command: forge --version
-          working_directory: packages/contracts-bedrock
-      # We do not use the pre-built contracts becuase forge coverage uses different optimizer settings
-      - run:
-          name: test and generate coverage
-          command: just coverage-lcov
-          no_output_timeout: 18m
-          environment:
-            FOUNDRY_PROFILE: cicoverage
-          working_directory: packages/contracts-bedrock
-      - codecov/upload:
-          disable_search: true
-          files: ./packages/contracts-bedrock/lcov.info
-          flags: contracts-bedrock-tests
-
   contracts-bedrock-tests:
     machine: true
     resource_class: ethereum-optimism/latitude-1
@@ -641,18 +615,14 @@ jobs:
       test_list:
         description: List of test files to run
         type: string
-      test_fuzz_runs:
-        description: Number of fuzz runs to apply
-        type: integer
-        default: 512
-      test_invariant_runs:
-        description: Number of invariant runs to apply
-        type: integer
-        default: 32
-      test_invariant_depth:
-        description: Depth of invariant runs
-        type: integer
-        default: 64
+      test_command:
+        description: Test command to execute (test or coverage)
+        type: string
+        default: test
+      test_flags:
+        description: Additional flags to pass to the test command
+        type: string
+        default: ""
       test_timeout:
         description: Timeout for running tests
         type: string
@@ -699,7 +669,7 @@ jobs:
             TEST_FILES=$(echo "$TEST_FILES" | circleci tests split --split-by=timings)
             TEST_FILES=$(echo "$TEST_FILES" | sed 's|^test/||')
             MATCH_PATH="./test/{$(echo "$TEST_FILES" | paste -sd "," -)}"
-            forge test --match-path "$MATCH_PATH"
+            forge <<parameters.test_command>> <<parameters.test_flags>> --match-path "$MATCH_PATH"
           environment:
             FOUNDRY_PROFILE: <<parameters.test_profile>>
           working_directory: packages/contracts-bedrock
@@ -715,6 +685,14 @@ jobs:
           name: Lint forge test names
           command: just lint-forge-tests-check-no-build
           working_directory: packages/contracts-bedrock
+      - when:
+          condition:
+            equal: ["<<parameters.test_command>>", "coverage"]
+          steps:
+            - codecov/upload:
+                disable_search: true
+                files: ./packages/contracts-bedrock/lcov.info
+                flags: contracts-bedrock-tests
       - save_cache:
           name: Save Go build cache
           key: golang-build-cache-contracts-bedrock-tests-{{ checksum "go.sum" }}
@@ -1214,9 +1192,6 @@ workflows:
           name: contracts-bedrock-build
           # Build with just core + script contracts.
           build_args: --deny-warnings --skip test
-      - contracts-bedrock-build:
-          name: contracts-bedrock-build-coverage
-          profile: cicoverage
       - check-kontrol-build:
           requires:
             - contracts-bedrock-build
@@ -1234,6 +1209,14 @@ workflows:
           test_list: git diff origin/develop...HEAD --name-only --diff-filter=AM -- './test/**/*.t.sol' | sed 's|packages/contracts-bedrock/||'
           test_timeout: 1h
           test_profile: ciheavy
+      - contracts-bedrock-tests:
+          # Generate coverage reports.
+          name: contracts-bedrock-coverage
+          test_list: find test -name "*.t.sol"
+          test_command: coverage
+          test_flags: --report lcov
+          test_timeout: 1h
+          test_profile: cicoverage
       - contracts-bedrock-checks:
           requires:
             - contracts-bedrock-build
@@ -1480,17 +1463,6 @@ workflows:
     jobs:
       - publish-contract-artifacts
 
-  develop-forge-coverage:
-    when:
-      and:
-        - or:
-            - equal: ["develop", <<pipeline.git.branch>>]
-            - equal: [true, <<pipeline.parameters.contracts_coverage_dispatch>>]
-        - not:
-            equal: [scheduled_pipeline, << pipeline.trigger_source >>]
-    jobs:
-      - contracts-bedrock-coverage
-
   develop-fault-proofs:
     when:
       and:
diff --git a/codecov.yml b/codecov.yml
index 8fd1bc517731..9f41fd222787 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -23,24 +23,20 @@ ignore:
 
 coverage:
   status:
-    patch:
-      default:
-        target: auto  # target coverage is equal to the PR base
-        threshold: 0% # coverage is not allowed to reduce vs. the PR base
-        base: auto
-        informational: true
-        enabled: true
     project:
       default:
         informational: true
+    patch:
+      contracts:
+        base: auto
+        target: auto
+        threshold: 5%
+        informational: false
+        flags:
+          - contracts-bedrock-tests
 
 flag_management:
-  # Note: flags should have the same name as the circleci job in which they
-  # are uploaded.
   individual_flags:
-    - name: contracts-bedrock-coverage
+    - name: contracts-bedrock-tests
       paths:
         - packages/contracts-bedrock/src
-      statuses:
-        - type: patch
-          target: 100%
diff --git a/packages/contracts-bedrock/foundry.toml b/packages/contracts-bedrock/foundry.toml
index 181391e7c49e..b99237116a76 100644
--- a/packages/contracts-bedrock/foundry.toml
+++ b/packages/contracts-bedrock/foundry.toml
@@ -86,11 +86,11 @@ depth = 32
 optimizer = false
 
 [profile.cicoverage.fuzz]
-runs = 512
+runs = 1
 
 [profile.cicoverage.invariant]
-runs = 256
-depth = 32
+runs = 1
+depth = 1
 
 ################################################################
 #                       PROFILE: CIHEAVY                       #

From d076e079d67d86a4f4585e667546a8b1cc7f1d96 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Wed, 11 Dec 2024 15:21:37 -0500
Subject: [PATCH 436/451] op-program: Add new prestate (#13359)

---
 op-program/prestates/releases.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/op-program/prestates/releases.json b/op-program/prestates/releases.json
index 38f65b706007..6fe717162124 100644
--- a/op-program/prestates/releases.json
+++ b/op-program/prestates/releases.json
@@ -11,6 +11,10 @@
     "version": "1.4.0-rc.1",
     "hash": "0x03925193e3e89f87835bbdf3a813f60b2aa818a36bbe71cd5d8fd7e79f5e8afe"
   },
+  {
+    "version": "v1.3.1-ink",
+    "hash": "0x03c50b9fd04bdadc228205f340767bbf2d01a030aec39903120d3559d94bb8cc"
+  },
   {
     "version": "1.3.1",
     "hash": "0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c",

From f9b478392fb6dc93bc19a2776e1c17f4a8ed99ba Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 11 Dec 2024 14:39:55 -0700
Subject: [PATCH 437/451] ctb: Pin sol version (#13365)

---
 .../contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol     | 2 +-
 .../contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol | 2 +-
 .../contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol
index 11f1c35ce1bb..540d13a87854 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployAlphabetVM.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity 0.8.15;
 
 import { Script } from "forge-std/Script.sol";
 
diff --git a/packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol
index eff286d19134..3d82b5d054e4 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployPreimageOracle.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity 0.8.15;
 
 import { Script } from "forge-std/Script.sol";
 
diff --git a/packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol b/packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol
index 0a0896c69ef7..a5fab1465cde 100644
--- a/packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/SetDisputeGameImpl.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity 0.8.15;
 
 import { Script } from "forge-std/Script.sol";
 

From 3c27ab289484ea33810f6a53b4ffd50ba4641704 Mon Sep 17 00:00:00 2001
From: mbaxter <meredith@oplabs.co>
Date: Wed, 11 Dec 2024 14:19:57 -0800
Subject: [PATCH 438/451] cannon: Add MTCannon VM metrics (#13133)

* cannon: Track steps between ll and sc

* cannon: Track rmw failures, keep counts for rmw ops

* cannon: Add unit tests for stats tracking

* cannon: Simplify step count stats

* cannon: Track explicit memory reservation invalidation

* cannon: Set stats on DebugInfo

* cannon: Rename method

* cannon: Track forced preemptions

* cannon: Track failed wakeup traversals

* cannon: Track idle steps for thread 0

* cannon: Reorganize vm metrics, add methods to record new stats

* cannon: Use uint64 over int

* cannon: Record new metrics

* cannon: Update readme run-trace flag

* cannon: Use uint64 type consistently

* cannon: Add debugInfo serialization test

* cannon: Check metrics in executor test

* cannon: Record total steps

* cannon: Check error in test

* cannon: Enable stats tracking via --debug-info flag

* cannon: Fix steps json field name

* cannon: Keep a small cache of ll steps for more accurate tracking

* cannon: Tweak test

* cannon: Modify test to better validate json parsing

* cannon: Use non-threadsafe simplelru
---
 cannon/cmd/run.go                             |  16 +-
 cannon/mipsevm/debug.go                       |   9 +
 cannon/mipsevm/debug_test.go                  |  41 ++++
 cannon/mipsevm/iface.go                       |   3 +
 cannon/mipsevm/multithreaded/instrumented.go  |  11 +-
 cannon/mipsevm/multithreaded/mips.go          |  16 +-
 cannon/mipsevm/multithreaded/stats.go         | 147 ++++++++++++
 cannon/mipsevm/multithreaded/stats_test.go    | 173 +++++++++++++++
 cannon/mipsevm/singlethreaded/instrumented.go |   8 +-
 op-challenger/README.md                       |   2 +-
 .../fault/trace/outputs/output_asterisc.go    |   7 +-
 .../game/fault/trace/outputs/output_cannon.go |   7 +-
 op-challenger/game/fault/trace/vm/executor.go |  31 ++-
 .../game/fault/trace/vm/executor_test.go      | 140 ++++++++++--
 op-challenger/metrics/metrics.go              |  57 ++---
 op-challenger/metrics/noop.go                 |  16 +-
 op-challenger/metrics/vm.go                   | 209 +++++++++++++++++-
 op-challenger/runner/metrics.go               |  27 +--
 op-challenger/runner/runner.go                |  10 +-
 .../disputegame/output_cannon_helper.go       |   7 +-
 op-e2e/faultproofs/precompile_test.go         |   2 +-
 21 files changed, 817 insertions(+), 122 deletions(-)
 create mode 100644 cannon/mipsevm/debug_test.go
 create mode 100644 cannon/mipsevm/multithreaded/stats.go
 create mode 100644 cannon/mipsevm/multithreaded/stats_test.go

diff --git a/cannon/cmd/run.go b/cannon/cmd/run.go
index 4ee67581244c..3399c437f1da 100644
--- a/cannon/cmd/run.go
+++ b/cannon/cmd/run.go
@@ -11,6 +11,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/pkg/profile"
+	"github.com/urfave/cli/v2"
+
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/arch"
 	mipsexec "github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
@@ -20,11 +26,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
 	"github.com/ethereum-optimism/optimism/op-service/serialize"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/log"
-	"github.com/pkg/profile"
-	"github.com/urfave/cli/v2"
 )
 
 var (
@@ -379,6 +380,8 @@ func Run(ctx *cli.Context) error {
 	}
 	l.Info("Loaded input state", "version", state.Version)
 	vm := state.CreateVM(l, po, outLog, errLog, meta)
+
+	// Enable debug/stats tracking as requested
 	debugProgram := ctx.Bool(RunDebugFlag.Name)
 	if debugProgram {
 		if metaPath := ctx.Path(RunMetaFlag.Name); metaPath == "" {
@@ -388,6 +391,9 @@ func Run(ctx *cli.Context) error {
 			return fmt.Errorf("failed to initialize debug mode: %w", err)
 		}
 	}
+	if debugInfoFile := ctx.Path(RunDebugInfoFlag.Name); debugInfoFile != "" {
+		vm.EnableStats()
+	}
 
 	proofFmt := ctx.String(RunProofFmtFlag.Name)
 	snapshotFmt := ctx.String(RunSnapshotFmtFlag.Name)
diff --git a/cannon/mipsevm/debug.go b/cannon/mipsevm/debug.go
index f05b770c0ea1..49478392ae2f 100644
--- a/cannon/mipsevm/debug.go
+++ b/cannon/mipsevm/debug.go
@@ -7,4 +7,13 @@ type DebugInfo struct {
 	MemoryUsed          hexutil.Uint64 `json:"memory_used"`
 	NumPreimageRequests int            `json:"num_preimage_requests"`
 	TotalPreimageSize   int            `json:"total_preimage_size"`
+	TotalSteps          uint64         `json:"total_steps"`
+	//  Multithreading-related stats below
+	RmwSuccessCount              uint64 `json:"rmw_success_count"`
+	RmwFailCount                 uint64 `json:"rmw_fail_count"`
+	MaxStepsBetweenLLAndSC       uint64 `json:"max_steps_between_ll_and_sc"`
+	ReservationInvalidationCount uint64 `json:"reservation_invalidation_count"`
+	ForcedPreemptionCount        uint64 `json:"forced_preemption_count"`
+	FailedWakeupCount            uint64 `json:"failed_wakeup_count"`
+	IdleStepCountThread0         uint64 `json:"idle_step_count_thread_0"`
 }
diff --git a/cannon/mipsevm/debug_test.go b/cannon/mipsevm/debug_test.go
new file mode 100644
index 000000000000..710c4ff68926
--- /dev/null
+++ b/cannon/mipsevm/debug_test.go
@@ -0,0 +1,41 @@
+package mipsevm
+
+import (
+	"math"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+)
+
+func TestDebugInfo_Serialization(t *testing.T) {
+	debugInfo := &DebugInfo{
+		Pages:                        1,
+		MemoryUsed:                   2,
+		NumPreimageRequests:          3,
+		TotalPreimageSize:            4,
+		TotalSteps:                   123456,
+		RmwSuccessCount:              5,
+		RmwFailCount:                 6,
+		MaxStepsBetweenLLAndSC:       7,
+		ReservationInvalidationCount: 8,
+		ForcedPreemptionCount:        9,
+		FailedWakeupCount:            10,
+		IdleStepCountThread0:         math.MaxUint64,
+	}
+
+	// Serialize to file
+	dir := t.TempDir()
+	path := filepath.Join(dir, "debug-info-test.txt")
+	err := jsonutil.WriteJSON(debugInfo, ioutil.ToAtomicFile(path, 0o644))
+	require.NoError(t, err)
+
+	// Deserialize
+	fromJson, err := jsonutil.LoadJSON[DebugInfo](path)
+	require.NoError(t, err)
+
+	require.Equal(t, debugInfo, fromJson)
+}
diff --git a/cannon/mipsevm/iface.go b/cannon/mipsevm/iface.go
index 3cf38063ebb3..4b1ab091976b 100644
--- a/cannon/mipsevm/iface.go
+++ b/cannon/mipsevm/iface.go
@@ -90,6 +90,9 @@ type FPVM interface {
 	// InitDebug initializes the debug mode of the VM
 	InitDebug() error
 
+	// EnableStats if supported by the VM, enables some additional statistics that can be retrieved via GetDebugInfo()
+	EnableStats()
+
 	// LookupSymbol returns the symbol located at the specified address.
 	// May return an empty string if there's no symbol table available.
 	LookupSymbol(addr arch.Word) string
diff --git a/cannon/mipsevm/multithreaded/instrumented.go b/cannon/mipsevm/multithreaded/instrumented.go
index db61fd1207e8..5295d7481161 100644
--- a/cannon/mipsevm/multithreaded/instrumented.go
+++ b/cannon/mipsevm/multithreaded/instrumented.go
@@ -20,6 +20,7 @@ type InstrumentedState struct {
 
 	memoryTracker *exec.MemoryTrackerImpl
 	stackTracker  ThreadedStackTracker
+	statsTracker  StatsTracker
 
 	preimageOracle *exec.TrackingPreimageOracleReader
 	meta           mipsevm.Metadata
@@ -35,6 +36,7 @@ func NewInstrumentedState(state *State, po mipsevm.PreimageOracle, stdOut, stdEr
 		stdErr:         stdErr,
 		memoryTracker:  exec.NewMemoryTracker(state.Memory),
 		stackTracker:   &NoopThreadedStackTracker{},
+		statsTracker:   NoopStatsTracker(),
 		preimageOracle: exec.NewTrackingPreimageOracleReader(po),
 		meta:           meta,
 	}
@@ -49,6 +51,10 @@ func (m *InstrumentedState) InitDebug() error {
 	return nil
 }
 
+func (m *InstrumentedState) EnableStats() {
+	m.statsTracker = NewStatsTracker()
+}
+
 func (m *InstrumentedState) Step(proof bool) (wit *mipsevm.StepWitness, err error) {
 	m.preimageOracle.Reset()
 	m.memoryTracker.Reset(proof)
@@ -100,12 +106,15 @@ func (m *InstrumentedState) GetState() mipsevm.FPVMState {
 }
 
 func (m *InstrumentedState) GetDebugInfo() *mipsevm.DebugInfo {
-	return &mipsevm.DebugInfo{
+	debugInfo := &mipsevm.DebugInfo{
 		Pages:               m.state.Memory.PageCount(),
 		MemoryUsed:          hexutil.Uint64(m.state.Memory.UsageRaw()),
 		NumPreimageRequests: m.preimageOracle.NumPreimageRequests(),
 		TotalPreimageSize:   m.preimageOracle.TotalPreimageSize(),
+		TotalSteps:          m.state.GetStep(),
 	}
+	m.statsTracker.populateDebugInfo(debugInfo)
+	return debugInfo
 }
 
 func (m *InstrumentedState) Traceback() {
diff --git a/cannon/mipsevm/multithreaded/mips.go b/cannon/mipsevm/multithreaded/mips.go
index 8800c4f7aa62..47ba1f893645 100644
--- a/cannon/mipsevm/multithreaded/mips.go
+++ b/cannon/mipsevm/multithreaded/mips.go
@@ -129,8 +129,7 @@ func (m *InstrumentedState) handleSyscall() error {
 				return nil
 			}
 		case exec.FutexWakePrivate:
-			// Trigger thread traversal starting from the left stack until we find one waiting on the wakeup
-			// address
+			// Trigger a wakeup traversal
 			m.state.Wakeup = effAddr
 			// Don't indicate to the program that we've woken up a waiting thread, as there are no guarantees.
 			// The woken up thread should indicate this in userspace.
@@ -139,6 +138,7 @@ func (m *InstrumentedState) handleSyscall() error {
 			exec.HandleSyscallUpdates(&thread.Cpu, &thread.Registers, v0, v1)
 			m.preemptThread(thread)
 			m.state.TraverseRight = len(m.state.LeftThreadStack) == 0
+			m.statsTracker.trackWakeupTraversalStart()
 			return nil
 		default:
 			v0 = exec.SysErrorSignal
@@ -289,6 +289,7 @@ func (m *InstrumentedState) doMipsStep() error {
 			if thread.FutexVal == mem {
 				// still got expected value, continue sleeping, try next thread.
 				m.preemptThread(thread)
+				m.statsTracker.trackWakeupFail()
 				return nil
 			} else {
 				// wake thread up, the value at its address changed!
@@ -309,6 +310,7 @@ func (m *InstrumentedState) doMipsStep() error {
 			}
 		}
 		m.preemptThread(thread)
+		m.statsTracker.trackForcedPreemption()
 		return nil
 	}
 	m.state.StepsSinceLastContextSwitch += 1
@@ -349,6 +351,7 @@ func (m *InstrumentedState) handleMemoryUpdate(effMemAddr Word) {
 	if effMemAddr == (arch.AddressMask & m.state.LLAddress) {
 		// Reserved address was modified, clear the reservation
 		m.clearLLMemoryReservation()
+		m.statsTracker.trackReservationInvalidation()
 	}
 }
 
@@ -384,6 +387,8 @@ func (m *InstrumentedState) handleRMWOps(insn, opcode uint32) error {
 		m.state.LLReservationStatus = targetStatus
 		m.state.LLAddress = addr
 		m.state.LLOwnerThread = threadId
+
+		m.statsTracker.trackLL(threadId, m.GetState().GetStep())
 	case exec.OpStoreConditional, exec.OpStoreConditional64:
 		if m.state.LLReservationStatus == targetStatus && m.state.LLOwnerThread == threadId && m.state.LLAddress == addr {
 			// Complete atomic update: set memory and return 1 for success
@@ -393,9 +398,13 @@ func (m *InstrumentedState) handleRMWOps(insn, opcode uint32) error {
 			exec.StoreSubWord(m.state.GetMemory(), addr, byteLength, val, m.memoryTracker)
 
 			retVal = 1
+
+			m.statsTracker.trackSCSuccess(threadId, m.GetState().GetStep())
 		} else {
 			// Atomic update failed, return 0 for failure
 			retVal = 0
+
+			m.statsTracker.trackSCFailure(threadId, m.GetState().GetStep())
 		}
 	default:
 		panic(fmt.Sprintf("Invalid instruction passed to handleRMWOps (opcode %08x)", opcode))
@@ -419,6 +428,7 @@ func (m *InstrumentedState) onWaitComplete(thread *ThreadState, isTimedOut bool)
 		v1 = exec.MipsETIMEDOUT
 	}
 	exec.HandleSyscallUpdates(&thread.Cpu, &thread.Registers, v0, v1)
+	m.statsTracker.trackWakeup()
 }
 
 func (m *InstrumentedState) preemptThread(thread *ThreadState) bool {
@@ -447,6 +457,8 @@ func (m *InstrumentedState) preemptThread(thread *ThreadState) bool {
 	}
 
 	m.state.StepsSinceLastContextSwitch = 0
+
+	m.statsTracker.trackThreadActivated(m.state.GetCurrentThread().ThreadId, m.state.GetStep())
 	return changeDirections
 }
 
diff --git a/cannon/mipsevm/multithreaded/stats.go b/cannon/mipsevm/multithreaded/stats.go
new file mode 100644
index 000000000000..35f11477d40f
--- /dev/null
+++ b/cannon/mipsevm/multithreaded/stats.go
@@ -0,0 +1,147 @@
+package multithreaded
+
+import (
+	lru "github.com/hashicorp/golang-lru/v2/simplelru"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
+)
+
+// Define stats interface
+type StatsTracker interface {
+	trackLL(threadId Word, step uint64)
+	trackSCSuccess(threadId Word, step uint64)
+	trackSCFailure(threadId Word, step uint64)
+	trackReservationInvalidation()
+	trackForcedPreemption()
+	trackWakeupTraversalStart()
+	trackWakeup()
+	trackWakeupFail()
+	trackThreadActivated(tid Word, step uint64)
+	populateDebugInfo(debugInfo *mipsevm.DebugInfo)
+}
+
+// Noop implementation for when tracking is disabled
+type noopStatsTracker struct{}
+
+func NoopStatsTracker() StatsTracker {
+	return &noopStatsTracker{}
+}
+
+func (s *noopStatsTracker) trackLL(threadId Word, step uint64)             {}
+func (s *noopStatsTracker) trackSCSuccess(threadId Word, step uint64)      {}
+func (s *noopStatsTracker) trackSCFailure(threadId Word, step uint64)      {}
+func (s *noopStatsTracker) trackReservationInvalidation()                  {}
+func (s *noopStatsTracker) trackForcedPreemption()                         {}
+func (s *noopStatsTracker) trackWakeupTraversalStart()                     {}
+func (s *noopStatsTracker) trackWakeup()                                   {}
+func (s *noopStatsTracker) trackWakeupFail()                               {}
+func (s *noopStatsTracker) trackThreadActivated(tid Word, step uint64)     {}
+func (s *noopStatsTracker) populateDebugInfo(debugInfo *mipsevm.DebugInfo) {}
+
+var _ StatsTracker = (*noopStatsTracker)(nil)
+
+// Actual implementation
+type statsTrackerImpl struct {
+	// State
+	lastLLStepByThread    *lru.LRU[Word, uint64]
+	isWakeupTraversal     bool
+	activeThreadId        Word
+	lastActiveStepThread0 uint64
+	// Stats
+	rmwSuccessCount        uint64
+	rmwFailCount           uint64
+	maxStepsBetweenLLAndSC uint64
+	// Tracks RMW reservation invalidation due to reserved memory being accessed outside of the RMW sequence
+	reservationInvalidationCount uint64
+	forcedPreemptionCount        uint64
+	failedWakeupCount            uint64
+	idleStepCountThread0         uint64
+}
+
+func (s *statsTrackerImpl) populateDebugInfo(debugInfo *mipsevm.DebugInfo) {
+	debugInfo.RmwSuccessCount = s.rmwSuccessCount
+	debugInfo.RmwFailCount = s.rmwFailCount
+	debugInfo.MaxStepsBetweenLLAndSC = s.maxStepsBetweenLLAndSC
+	debugInfo.ReservationInvalidationCount = s.reservationInvalidationCount
+	debugInfo.ForcedPreemptionCount = s.forcedPreemptionCount
+	debugInfo.FailedWakeupCount = s.failedWakeupCount
+	debugInfo.IdleStepCountThread0 = s.idleStepCountThread0
+}
+
+func (s *statsTrackerImpl) trackLL(threadId Word, step uint64) {
+	s.lastLLStepByThread.Add(threadId, step)
+}
+
+func (s *statsTrackerImpl) trackSCSuccess(threadId Word, step uint64) {
+	s.rmwSuccessCount += 1
+	s.recordStepsBetweenLLAndSC(threadId, step)
+}
+
+func (s *statsTrackerImpl) trackSCFailure(threadId Word, step uint64) {
+	s.rmwFailCount += 1
+	s.recordStepsBetweenLLAndSC(threadId, step)
+}
+
+func (s *statsTrackerImpl) recordStepsBetweenLLAndSC(threadId Word, scStep uint64) {
+	// Track rmw steps if we have the last ll step in our cache
+	if llStep, ok := s.lastLLStepByThread.Get(threadId); ok {
+		diff := scStep - llStep
+		if diff > s.maxStepsBetweenLLAndSC {
+			s.maxStepsBetweenLLAndSC = diff
+		}
+		// Purge ll step since the RMW seq is now complete
+		s.lastLLStepByThread.Remove(threadId)
+	}
+}
+
+func (s *statsTrackerImpl) trackReservationInvalidation() {
+	s.reservationInvalidationCount += 1
+}
+
+func (s *statsTrackerImpl) trackForcedPreemption() {
+	s.forcedPreemptionCount += 1
+}
+
+func (s *statsTrackerImpl) trackWakeupTraversalStart() {
+	s.isWakeupTraversal = true
+}
+
+func (s *statsTrackerImpl) trackWakeup() {
+	s.isWakeupTraversal = false
+}
+
+func (s *statsTrackerImpl) trackWakeupFail() {
+	if s.isWakeupTraversal {
+		s.failedWakeupCount += 1
+	}
+	s.isWakeupTraversal = false
+}
+
+func (s *statsTrackerImpl) trackThreadActivated(tid Word, step uint64) {
+	if s.activeThreadId == Word(0) && tid != Word(0) {
+		// Thread 0 has been deactivated, start tracking to capture idle steps
+		s.lastActiveStepThread0 = step
+	} else if s.activeThreadId != Word(0) && tid == Word(0) {
+		// Thread 0 has been activated, record idle steps
+		idleSteps := step - s.lastActiveStepThread0
+		s.idleStepCountThread0 += idleSteps
+	}
+	s.activeThreadId = tid
+}
+
+func NewStatsTracker() StatsTracker {
+	return newStatsTracker(5)
+}
+
+func newStatsTracker(cacheSize int) StatsTracker {
+	llStepCache, err := lru.NewLRU[Word, uint64](cacheSize, nil)
+	if err != nil {
+		panic(err) // negative size parameter may produce an error
+	}
+
+	return &statsTrackerImpl{
+		lastLLStepByThread: llStepCache,
+	}
+}
+
+var _ StatsTracker = (*statsTrackerImpl)(nil)
diff --git a/cannon/mipsevm/multithreaded/stats_test.go b/cannon/mipsevm/multithreaded/stats_test.go
new file mode 100644
index 000000000000..4f89d2516fdd
--- /dev/null
+++ b/cannon/mipsevm/multithreaded/stats_test.go
@@ -0,0 +1,173 @@
+package multithreaded
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
+)
+
+func TestStatsTracker(t *testing.T) {
+	cases := []struct {
+		name       string
+		operations []Operation
+		expected   *mipsevm.DebugInfo
+	}{
+		{
+			name:       "Successful RMW operation",
+			operations: []Operation{ll(1, 3), scSuccess(1, 13)},
+			expected:   &mipsevm.DebugInfo{RmwSuccessCount: 1, MaxStepsBetweenLLAndSC: 10},
+		},
+		{
+			name:       "Failed RMW operation",
+			operations: []Operation{ll(1, 3), scFail(1, 13)},
+			expected:   &mipsevm.DebugInfo{RmwFailCount: 1, MaxStepsBetweenLLAndSC: 10},
+		},
+		{
+			name:       "Failed isolated sc op",
+			operations: []Operation{scFail(1, 13)},
+			expected:   &mipsevm.DebugInfo{RmwFailCount: 1},
+		},
+		{
+			name:       "Failed isolated sc op preceded by successful sc op",
+			operations: []Operation{ll(1, 1), scSuccess(1, 10), scFail(1, 23)},
+			expected:   &mipsevm.DebugInfo{RmwSuccessCount: 1, RmwFailCount: 1, MaxStepsBetweenLLAndSC: 9},
+		},
+		{
+			name:       "Multiple RMW operations",
+			operations: []Operation{ll(1, 1), scSuccess(1, 2), ll(2, 3), scFail(2, 5), ll(3, 6), scSuccess(3, 16), ll(2, 18), scSuccess(2, 20), ll(1, 21), scFail(1, 30)},
+			expected:   &mipsevm.DebugInfo{RmwSuccessCount: 3, RmwFailCount: 2, MaxStepsBetweenLLAndSC: 10},
+		},
+		{
+			name:       "Multiple RMW operations exceeding cache size",
+			operations: []Operation{ll(1, 1), ll(2, 2), ll(3, 3), ll(4, 4), scSuccess(4, 5), scFail(3, 6), scFail(2, 7), scFail(1, 8)},
+			expected:   &mipsevm.DebugInfo{RmwSuccessCount: 1, RmwFailCount: 3, MaxStepsBetweenLLAndSC: 5},
+		},
+		{
+			name:       "Interleaved RMW operations",
+			operations: []Operation{ll(1, 5), ll(2, 10), scSuccess(2, 15), scFail(1, 25)},
+			expected:   &mipsevm.DebugInfo{RmwSuccessCount: 1, RmwFailCount: 1, MaxStepsBetweenLLAndSC: 20},
+		},
+		{
+			name:       "Invalidate reservation",
+			operations: []Operation{invalidateReservation()},
+			expected:   &mipsevm.DebugInfo{ReservationInvalidationCount: 1},
+		},
+		{
+			name:       "Invalidate reservation multiple times",
+			operations: []Operation{invalidateReservation(), invalidateReservation()},
+			expected:   &mipsevm.DebugInfo{ReservationInvalidationCount: 2},
+		},
+		{
+			name:       "Force preemption",
+			operations: []Operation{forcePreempt()},
+			expected:   &mipsevm.DebugInfo{ForcedPreemptionCount: 1},
+		},
+		{
+			name:       "Force preemption multiple times",
+			operations: []Operation{forcePreempt(), forcePreempt()},
+			expected:   &mipsevm.DebugInfo{ForcedPreemptionCount: 2},
+		},
+		{
+			name:       "Successful wakeup traversal",
+			operations: []Operation{wakeupTraversal(), wakeup(), sleep(), wakeup()},
+			expected:   &mipsevm.DebugInfo{FailedWakeupCount: 0},
+		},
+		{
+			name:       "Failed wakeup traversal",
+			operations: []Operation{wakeupTraversal(), sleep(), wakeup(), sleep()},
+			expected:   &mipsevm.DebugInfo{FailedWakeupCount: 1},
+		},
+		{
+			name:       "Multiple failed wakeup traversals",
+			operations: []Operation{wakeupTraversal(), sleep(), wakeupTraversal(), sleep(), wakeupTraversal(), wakeup()},
+			expected:   &mipsevm.DebugInfo{FailedWakeupCount: 2},
+		},
+		{
+			name:       "Wakeups and sleeps outside of wakeup traversal",
+			operations: []Operation{sleep(), wakeup(), wakeup(), sleep()},
+			expected:   &mipsevm.DebugInfo{FailedWakeupCount: 0},
+		},
+		{
+			name:       "Preempt thread 0 for thread 0",
+			operations: []Operation{activateThread(0, 10), activateThread(0, 20), activateThread(0, 21)},
+			expected:   &mipsevm.DebugInfo{IdleStepCountThread0: 0},
+		},
+		{
+			name:       "Preempt thread 0 for different thread",
+			operations: []Operation{activateThread(1, 10), activateThread(0, 20), activateThread(0, 21), activateThread(1, 22), activateThread(0, 25)},
+			expected:   &mipsevm.DebugInfo{IdleStepCountThread0: 13},
+		},
+	}
+
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			stats := newStatsTracker(3)
+			for _, op := range c.operations {
+				op(stats)
+			}
+
+			// Validate expectations
+			actual := &mipsevm.DebugInfo{}
+			stats.populateDebugInfo(actual)
+			require.Equal(t, c.expected, actual)
+		})
+	}
+}
+
+type Operation func(tracker StatsTracker)
+
+func ll(threadId Word, step uint64) Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackLL(threadId, step)
+	}
+}
+
+func scSuccess(threadId Word, step uint64) Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackSCSuccess(threadId, step)
+	}
+}
+
+func scFail(threadId Word, step uint64) Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackSCFailure(threadId, step)
+	}
+}
+
+func invalidateReservation() Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackReservationInvalidation()
+	}
+}
+
+func forcePreempt() Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackForcedPreemption()
+	}
+}
+
+func wakeupTraversal() Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackWakeupTraversalStart()
+	}
+}
+
+func wakeup() Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackWakeup()
+	}
+}
+
+func sleep() Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackWakeupFail()
+	}
+}
+
+func activateThread(tid Word, step uint64) Operation {
+	return func(tracker StatsTracker) {
+		tracker.trackThreadActivated(tid, step)
+	}
+}
diff --git a/cannon/mipsevm/singlethreaded/instrumented.go b/cannon/mipsevm/singlethreaded/instrumented.go
index 7757ae390d6f..bc1e01103fe6 100644
--- a/cannon/mipsevm/singlethreaded/instrumented.go
+++ b/cannon/mipsevm/singlethreaded/instrumented.go
@@ -3,9 +3,10 @@ package singlethreaded
 import (
 	"io"
 
+	"github.com/ethereum/go-ethereum/common/hexutil"
+
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm/exec"
-	"github.com/ethereum/go-ethereum/common/hexutil"
 )
 
 type InstrumentedState struct {
@@ -53,6 +54,10 @@ func (m *InstrumentedState) InitDebug() error {
 	return nil
 }
 
+func (m *InstrumentedState) EnableStats() {
+	//noop
+}
+
 func (m *InstrumentedState) Step(proof bool) (wit *mipsevm.StepWitness, err error) {
 	m.preimageOracle.Reset()
 	m.memoryTracker.Reset(proof)
@@ -102,6 +107,7 @@ func (m *InstrumentedState) GetDebugInfo() *mipsevm.DebugInfo {
 		MemoryUsed:          hexutil.Uint64(m.state.Memory.UsageRaw()),
 		NumPreimageRequests: m.preimageOracle.NumPreimageRequests(),
 		TotalPreimageSize:   m.preimageOracle.TotalPreimageSize(),
+		TotalSteps:          m.state.GetStep(),
 	}
 }
 
diff --git a/op-challenger/README.md b/op-challenger/README.md
index 5efbbd85b3d3..61fb07aa12b8 100644
--- a/op-challenger/README.md
+++ b/op-challenger/README.md
@@ -192,7 +192,7 @@ Prints the list of current claims in a dispute game.
   --l1-beacon=<L1_BEACON> \
   --l2-eth-rpc=<L2_ETH_RPC> \
   --rollup-rpc=<ROLLUP_RPC> \
-  --data-dir=<DATA_DIR> \
+  --datadir=<DATA_DIR> \
   --prestates-url=<PRESTATES_URL> \
   --run=<RUN_CONFIG>
 ```
diff --git a/op-challenger/game/fault/trace/outputs/output_asterisc.go b/op-challenger/game/fault/trace/outputs/output_asterisc.go
index 82dac14f8453..3879fbb325ca 100644
--- a/op-challenger/game/fault/trace/outputs/output_asterisc.go
+++ b/op-challenger/game/fault/trace/outputs/output_asterisc.go
@@ -5,6 +5,9 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/asterisc"
@@ -14,8 +17,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-challenger/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 func NewOutputAsteriscTraceAccessor(
@@ -41,7 +42,7 @@ func NewOutputAsteriscTraceAccessor(
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch asterisc local inputs: %w", err)
 		}
-		provider := asterisc.NewTraceProvider(logger, m.VmMetrics(cfg.VmType.String()), cfg, vmCfg, prestateProvider, asteriscPrestate, localInputs, subdir, depth)
+		provider := asterisc.NewTraceProvider(logger, m.ToTypedVmMetrics(cfg.VmType.String()), cfg, vmCfg, prestateProvider, asteriscPrestate, localInputs, subdir, depth)
 		return provider, nil
 	}
 
diff --git a/op-challenger/game/fault/trace/outputs/output_cannon.go b/op-challenger/game/fault/trace/outputs/output_cannon.go
index 49b6631b5a7f..6f1dbd087f47 100644
--- a/op-challenger/game/fault/trace/outputs/output_cannon.go
+++ b/op-challenger/game/fault/trace/outputs/output_cannon.go
@@ -5,6 +5,9 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/cannon"
@@ -14,8 +17,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-challenger/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 func NewOutputCannonTraceAccessor(
@@ -41,7 +42,7 @@ func NewOutputCannonTraceAccessor(
 		if err != nil {
 			return nil, fmt.Errorf("failed to fetch cannon local inputs: %w", err)
 		}
-		provider := cannon.NewTraceProvider(logger, m.VmMetrics(cfg.VmType.String()), cfg, serverExecutor, prestateProvider, cannonPrestate, localInputs, subdir, depth)
+		provider := cannon.NewTraceProvider(logger, m.ToTypedVmMetrics(cfg.VmType.String()), cfg, serverExecutor, prestateProvider, cannonPrestate, localInputs, subdir, depth)
 		return provider, nil
 	}
 
diff --git a/op-challenger/game/fault/trace/vm/executor.go b/op-challenger/game/fault/trace/vm/executor.go
index 524124a6eab5..75cf973876f5 100644
--- a/op-challenger/game/fault/trace/vm/executor.go
+++ b/op-challenger/game/fault/trace/vm/executor.go
@@ -10,21 +10,20 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/utils"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
+	"github.com/ethereum-optimism/optimism/op-challenger/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 const (
 	debugFilename = "debug-info.json"
 )
 
-type Metricer interface {
-	RecordExecutionTime(t time.Duration)
-	RecordMemoryUsed(memoryUsed uint64)
-}
+type Metricer = metrics.TypedVmMetricer
 
 type Config struct {
 	// VM Configuration
@@ -139,8 +138,16 @@ func (e *Executor) DoGenerateProof(ctx context.Context, dir string, begin uint64
 		if info, err := jsonutil.LoadJSON[debugInfo](filepath.Join(dataDir, debugFilename)); err != nil {
 			e.logger.Warn("Failed to load debug metrics", "err", err)
 		} else {
-			e.metrics.RecordMemoryUsed(uint64(info.MemoryUsed))
 			memoryUsed = fmt.Sprintf("%d", uint64(info.MemoryUsed))
+			e.metrics.RecordMemoryUsed(uint64(info.MemoryUsed))
+			e.metrics.RecordSteps(info.Steps)
+			e.metrics.RecordRmwSuccessCount(uint64(info.RmwSuccessCount))
+			e.metrics.RecordRmwFailCount(uint64(info.RmwFailCount))
+			e.metrics.RecordMaxStepsBetweenLLAndSC(uint64(info.MaxStepsBetweenLLAndSC))
+			e.metrics.RecordReservationInvalidationCount(uint64(info.ReservationInvalidationCount))
+			e.metrics.RecordForcedPreemptionCount(uint64(info.ForcedPreemptionCount))
+			e.metrics.RecordFailedWakeupCount(uint64(info.FailedWakeupCount))
+			e.metrics.RecordIdleStepCountThread0(uint64(info.IdleStepCountThread0))
 		}
 	}
 	e.logger.Info("VM execution complete", "time", execTime, "memory", memoryUsed)
@@ -148,5 +155,13 @@ func (e *Executor) DoGenerateProof(ctx context.Context, dir string, begin uint64
 }
 
 type debugInfo struct {
-	MemoryUsed hexutil.Uint64 `json:"memory_used"`
+	MemoryUsed                   hexutil.Uint64 `json:"memory_used"`
+	Steps                        uint64         `json:"total_steps"`
+	RmwSuccessCount              uint64         `json:"rmw_success_count"`
+	RmwFailCount                 uint64         `json:"rmw_fail_count"`
+	MaxStepsBetweenLLAndSC       uint64         `json:"max_steps_between_ll_and_sc"`
+	ReservationInvalidationCount uint64         `json:"reservation_invalidation_count"`
+	ForcedPreemptionCount        uint64         `json:"forced_preemption_count"`
+	FailedWakeupCount            uint64         `json:"failed_wakeup_count"`
+	IdleStepCountThread0         uint64         `json:"idle_step_count_thread_0"`
 }
diff --git a/op-challenger/game/fault/trace/vm/executor_test.go b/op-challenger/game/fault/trace/vm/executor_test.go
index 13146d8f263b..a2ec6911b2f6 100644
--- a/op-challenger/game/fault/trace/vm/executor_test.go
+++ b/op-challenger/game/fault/trace/vm/executor_test.go
@@ -8,11 +8,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/utils"
-	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
+	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/utils"
+	"github.com/ethereum-optimism/optimism/op-service/ioutil"
+	"github.com/ethereum-optimism/optimism/op-service/jsonutil"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
 )
 
 func TestGenerateProof(t *testing.T) {
@@ -39,8 +44,20 @@ func TestGenerateProof(t *testing.T) {
 		L2Claim:       common.Hash{0x44},
 		L2BlockNumber: big.NewInt(3333),
 	}
-	captureExec := func(t *testing.T, cfg Config, proofAt uint64) (string, string, map[string]string) {
-		m := &stubVmMetrics{}
+
+	info := &mipsevm.DebugInfo{
+		MemoryUsed:                   11,
+		TotalSteps:                   123455,
+		RmwSuccessCount:              12,
+		RmwFailCount:                 34,
+		MaxStepsBetweenLLAndSC:       56,
+		ReservationInvalidationCount: 78,
+		ForcedPreemptionCount:        910,
+		FailedWakeupCount:            1112,
+		IdleStepCountThread0:         1314,
+	}
+
+	captureExec := func(t *testing.T, cfg Config, proofAt uint64, m Metricer) (string, string, map[string]string) {
 		executor := NewExecutor(testlog.Logger(t, log.LevelInfo), m, cfg, NewOpProgramServerExecutor(testlog.Logger(t, log.LvlInfo)), prestate, inputs)
 		executor.selectSnapshot = func(logger log.Logger, dir string, absolutePreState string, i uint64, binary bool) (string, error) {
 			return input, nil
@@ -60,19 +77,25 @@ func TestGenerateProof(t *testing.T) {
 				args[a[i]] = a[i+1]
 				i += 2
 			}
+
+			// Write debuginfo file
+			debugPath := args["--debug-info"]
+			err := jsonutil.WriteJSON(info, ioutil.ToStdOutOrFileOrNoop(debugPath, 0o755))
+			require.NoError(t, err)
 			return nil
 		}
 		err := executor.GenerateProof(context.Background(), dir, proofAt)
 		require.NoError(t, err)
-		require.Equal(t, 1, m.executionTimeRecordCount, "Should record vm execution time")
 		return binary, subcommand, args
 	}
 
 	t.Run("Network", func(t *testing.T) {
+		m := newMetrics()
 		cfg.Network = "mainnet"
 		cfg.RollupConfigPath = ""
 		cfg.L2GenesisPath = ""
-		binary, subcommand, args := captureExec(t, cfg, 150_000_000)
+		cfg.DebugInfo = true
+		binary, subcommand, args := captureExec(t, cfg, 150_000_000, m)
 		require.DirExists(t, filepath.Join(dir, PreimagesDir))
 		require.DirExists(t, filepath.Join(dir, utils.ProofsDir))
 		require.DirExists(t, filepath.Join(dir, SnapsDir))
@@ -106,50 +129,139 @@ func TestGenerateProof(t *testing.T) {
 		require.Equal(t, inputs.L2OutputRoot.Hex(), args["--l2.outputroot"])
 		require.Equal(t, inputs.L2Claim.Hex(), args["--l2.claim"])
 		require.Equal(t, "3333", args["--l2.blocknumber"])
+
+		// Check metrics
+		validateMetrics(t, m, info, cfg)
 	})
 
 	t.Run("RollupAndGenesis", func(t *testing.T) {
+		m := newMetrics()
 		cfg.Network = ""
 		cfg.RollupConfigPath = "rollup.json"
 		cfg.L2GenesisPath = "genesis.json"
-		_, _, args := captureExec(t, cfg, 150_000_000)
+		cfg.DebugInfo = false
+		_, _, args := captureExec(t, cfg, 150_000_000, m)
 		require.NotContains(t, args, "--network")
 		require.Equal(t, cfg.RollupConfigPath, args["--rollup.config"])
 		require.Equal(t, cfg.L2GenesisPath, args["--l2.genesis"])
+		validateMetrics(t, m, info, cfg)
 	})
 
 	t.Run("NoStopAtWhenProofIsMaxUInt", func(t *testing.T) {
+		m := newMetrics()
 		cfg.Network = "mainnet"
 		cfg.RollupConfigPath = "rollup.json"
 		cfg.L2GenesisPath = "genesis.json"
-		_, _, args := captureExec(t, cfg, math.MaxUint64)
+		cfg.DebugInfo = true
+		_, _, args := captureExec(t, cfg, math.MaxUint64, m)
 		// stop-at would need to be one more than the proof step which would overflow back to 0
 		// so expect that it will be omitted. We'll ultimately want asterisc to execute until the program exits.
 		require.NotContains(t, args, "--stop-at")
+		validateMetrics(t, m, info, cfg)
 	})
 
 	t.Run("BinarySnapshots", func(t *testing.T) {
+		m := newMetrics()
 		cfg.Network = "mainnet"
 		cfg.BinarySnapshots = true
-		_, _, args := captureExec(t, cfg, 100)
+		_, _, args := captureExec(t, cfg, 100, m)
 		require.Equal(t, filepath.Join(dir, SnapsDir, "%d.bin.gz"), args["--snapshot-fmt"])
+		validateMetrics(t, m, info, cfg)
 	})
 
 	t.Run("JsonSnapshots", func(t *testing.T) {
+		m := newMetrics()
 		cfg.Network = "mainnet"
 		cfg.BinarySnapshots = false
-		_, _, args := captureExec(t, cfg, 100)
+		_, _, args := captureExec(t, cfg, 100, m)
 		require.Equal(t, filepath.Join(dir, SnapsDir, "%d.json.gz"), args["--snapshot-fmt"])
+		validateMetrics(t, m, info, cfg)
 	})
 }
 
-type stubVmMetrics struct {
+func validateMetrics(t require.TestingT, m *capturingVmMetrics, expected *mipsevm.DebugInfo, cfg Config) {
+	require.Equal(t, 1, m.executionTimeRecordCount, "Should record vm execution time")
+
+	// Check metrics sourced from cannon.mipsevm.DebugInfo json file
+	if cfg.DebugInfo {
+		require.Equal(t, expected.MemoryUsed, m.memoryUsed)
+		require.Equal(t, expected.TotalSteps, m.steps)
+		require.Equal(t, expected.RmwSuccessCount, m.rmwSuccessCount)
+		require.Equal(t, expected.RmwFailCount, m.rmwFailCount)
+		require.Equal(t, expected.MaxStepsBetweenLLAndSC, m.maxStepsBetweenLLAndSC)
+		require.Equal(t, expected.ReservationInvalidationCount, m.reservationInvalidations)
+		require.Equal(t, expected.ForcedPreemptionCount, m.forcedPreemptions)
+		require.Equal(t, expected.FailedWakeupCount, m.failedWakeup)
+		require.Equal(t, expected.IdleStepCountThread0, m.idleStepsThread0)
+	} else {
+		// If debugInfo is disabled, json file should not be written and metrics should be zeroed out
+		require.Equal(t, hexutil.Uint64(0), m.memoryUsed)
+		require.Equal(t, uint64(0), m.steps)
+		require.Equal(t, uint64(0), m.rmwSuccessCount)
+		require.Equal(t, uint64(0), m.rmwFailCount)
+		require.Equal(t, uint64(0), m.maxStepsBetweenLLAndSC)
+		require.Equal(t, uint64(0), m.reservationInvalidations)
+		require.Equal(t, uint64(0), m.forcedPreemptions)
+		require.Equal(t, uint64(0), m.failedWakeup)
+		require.Equal(t, uint64(0), m.idleStepsThread0)
+	}
+}
+
+func newMetrics() *capturingVmMetrics {
+	return &capturingVmMetrics{}
+}
+
+type capturingVmMetrics struct {
 	executionTimeRecordCount int
+	memoryUsed               hexutil.Uint64
+	steps                    uint64
+	rmwSuccessCount          uint64
+	rmwFailCount             uint64
+	maxStepsBetweenLLAndSC   uint64
+	reservationInvalidations uint64
+	forcedPreemptions        uint64
+	failedWakeup             uint64
+	idleStepsThread0         uint64
 }
 
-func (c *stubVmMetrics) RecordExecutionTime(_ time.Duration) {
-	c.executionTimeRecordCount++
+func (c *capturingVmMetrics) RecordSteps(val uint64) {
+	c.steps = val
 }
 
-func (c *stubVmMetrics) RecordMemoryUsed(_ uint64) {
+func (c *capturingVmMetrics) RecordExecutionTime(t time.Duration) {
+	c.executionTimeRecordCount += 1
 }
+
+func (c *capturingVmMetrics) RecordMemoryUsed(memoryUsed uint64) {
+	c.memoryUsed = hexutil.Uint64(memoryUsed)
+}
+
+func (c *capturingVmMetrics) RecordRmwSuccessCount(val uint64) {
+	c.rmwSuccessCount = val
+}
+
+func (c *capturingVmMetrics) RecordRmwFailCount(val uint64) {
+	c.rmwFailCount = val
+}
+
+func (c *capturingVmMetrics) RecordMaxStepsBetweenLLAndSC(val uint64) {
+	c.maxStepsBetweenLLAndSC = val
+}
+
+func (c *capturingVmMetrics) RecordReservationInvalidationCount(val uint64) {
+	c.reservationInvalidations = val
+}
+
+func (c *capturingVmMetrics) RecordForcedPreemptionCount(val uint64) {
+	c.forcedPreemptions = val
+}
+
+func (c *capturingVmMetrics) RecordFailedWakeupCount(val uint64) {
+	c.failedWakeup = val
+}
+
+func (c *capturingVmMetrics) RecordIdleStepCountThread0(val uint64) {
+	c.idleStepsThread0 = val
+}
+
+var _ Metricer = (*capturingVmMetrics)(nil)
diff --git a/op-challenger/metrics/metrics.go b/op-challenger/metrics/metrics.go
index c6acc2b2f7bb..c0fb64d3d654 100644
--- a/op-challenger/metrics/metrics.go
+++ b/op-challenger/metrics/metrics.go
@@ -2,15 +2,15 @@ package metrics
 
 import (
 	"io"
-	"time"
 
-	"github.com/ethereum-optimism/optimism/op-service/httputil"
-	"github.com/ethereum-optimism/optimism/op-service/sources/caching"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/prometheus/client_golang/prometheus"
 
+	"github.com/ethereum-optimism/optimism/op-service/httputil"
+	"github.com/ethereum-optimism/optimism/op-service/sources/caching"
+
 	contractMetrics "github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts/metrics"
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
 	txmetrics "github.com/ethereum-optimism/optimism/op-service/txmgr/metrics"
@@ -33,6 +33,9 @@ type Metricer interface {
 	// Record contract metrics
 	contractMetrics.ContractMetricer
 
+	// Record Vm metrics
+	VmMetricer
+
 	RecordActedL1Block(n uint64)
 
 	RecordGameStep()
@@ -59,9 +62,7 @@ type Metricer interface {
 	IncIdleExecutors()
 	DecIdleExecutors()
 
-	// Record vm execution metrics
-	VmMetricer
-	VmMetrics(vmType string) *VmMetrics
+	ToTypedVmMetrics(vmType string) TypedVmMetricer
 }
 
 // Metrics implementation must implement RegistryMetricer to allow the metrics server to work.
@@ -75,11 +76,12 @@ type Metrics struct {
 	txmetrics.TxMetrics
 	*opmetrics.CacheMetrics
 	*contractMetrics.ContractMetrics
+	*VmMetrics
 
-	info prometheus.GaugeVec
+	info *prometheus.GaugeVec
 	up   prometheus.Gauge
 
-	executors prometheus.GaugeVec
+	executors *prometheus.GaugeVec
 
 	bondClaimFailures prometheus.Counter
 	bondsClaimed      prometheus.Counter
@@ -96,10 +98,8 @@ type Metrics struct {
 
 	claimResolutionTime prometheus.Histogram
 	gameActTime         prometheus.Histogram
-	vmExecutionTime     *prometheus.HistogramVec
-	vmMemoryUsed        *prometheus.HistogramVec
 
-	trackedGames  prometheus.GaugeVec
+	trackedGames  *prometheus.GaugeVec
 	inflightGames prometheus.Gauge
 }
 
@@ -124,7 +124,9 @@ func NewMetrics() *Metrics {
 
 		ContractMetrics: contractMetrics.MakeContractMetrics(Namespace, factory),
 
-		info: *factory.NewGaugeVec(prometheus.GaugeOpts{
+		VmMetrics: NewVmMetrics(Namespace, factory),
+
+		info: factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: Namespace,
 			Name:      "info",
 			Help:      "Pseudo-metric tracking version and config info",
@@ -136,7 +138,7 @@ func NewMetrics() *Metrics {
 			Name:      "up",
 			Help:      "1 if the op-challenger has finished starting up",
 		}),
-		executors: *factory.NewGaugeVec(prometheus.GaugeOpts{
+		executors: factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: Namespace,
 			Name:      "executors",
 			Help:      "Number of active and idle executors",
@@ -172,21 +174,6 @@ func NewMetrics() *Metrics {
 				[]float64{1.0, 2.0, 5.0, 10.0},
 				prometheus.ExponentialBuckets(30.0, 2.0, 14)...),
 		}),
-		vmExecutionTime: factory.NewHistogramVec(prometheus.HistogramOpts{
-			Namespace: Namespace,
-			Name:      "vm_execution_time",
-			Help:      "Time (in seconds) to execute the fault proof VM",
-			Buckets: append(
-				[]float64{1.0, 10.0},
-				prometheus.ExponentialBuckets(30.0, 2.0, 14)...),
-		}, []string{"vm"}),
-		vmMemoryUsed: factory.NewHistogramVec(prometheus.HistogramOpts{
-			Namespace: Namespace,
-			Name:      "vm_memory_used",
-			Help:      "Memory used (in bytes) to execute the fault proof VM",
-			// 100MiB increments from 0 to 1.5GiB
-			Buckets: prometheus.LinearBuckets(0, 1024*1024*100, 15),
-		}, []string{"vm"}),
 		bondClaimFailures: factory.NewCounter(prometheus.CounterOpts{
 			Namespace: Namespace,
 			Name:      "claim_failures",
@@ -212,7 +199,7 @@ func NewMetrics() *Metrics {
 			Name:      "preimage_count",
 			Help:      "Number of large preimage proposals being tracked by the challenger",
 		}),
-		trackedGames: *factory.NewGaugeVec(prometheus.GaugeOpts{
+		trackedGames: factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: Namespace,
 			Name:      "tracked_games",
 			Help:      "Number of games being tracked by the challenger",
@@ -292,14 +279,6 @@ func (m *Metrics) RecordBondClaimed(amount uint64) {
 	m.bondsClaimed.Add(float64(amount))
 }
 
-func (m *Metrics) RecordVmExecutionTime(vmType string, dur time.Duration) {
-	m.vmExecutionTime.WithLabelValues(vmType).Observe(dur.Seconds())
-}
-
-func (m *Metrics) RecordVmMemoryUsed(vmType string, memoryUsed uint64) {
-	m.vmMemoryUsed.WithLabelValues(vmType).Observe(float64(memoryUsed))
-}
-
 func (m *Metrics) RecordClaimResolutionTime(t float64) {
 	m.claimResolutionTime.Observe(t)
 }
@@ -342,6 +321,6 @@ func (m *Metrics) RecordGameUpdateCompleted() {
 	m.inflightGames.Sub(1)
 }
 
-func (m *Metrics) VmMetrics(vmType string) *VmMetrics {
-	return NewVmMetrics(m, vmType)
+func (m *Metrics) ToTypedVmMetrics(vmType string) TypedVmMetricer {
+	return NewTypedVmMetrics(m, vmType)
 }
diff --git a/op-challenger/metrics/noop.go b/op-challenger/metrics/noop.go
index 84b5923a33d9..ff02ab4eaf5b 100644
--- a/op-challenger/metrics/noop.go
+++ b/op-challenger/metrics/noop.go
@@ -2,21 +2,23 @@ package metrics
 
 import (
 	"io"
-	"time"
 
-	contractMetrics "github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts/metrics"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 
+	contractMetrics "github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts/metrics"
 	txmetrics "github.com/ethereum-optimism/optimism/op-service/txmgr/metrics"
 )
 
 type NoopMetricsImpl struct {
 	txmetrics.NoopTxMetrics
 	contractMetrics.NoopMetrics
+	NoopVmMetrics
 }
 
+var _ Metricer = (*NoopMetricsImpl)(nil)
+
 func (i *NoopMetricsImpl) StartBalanceMetrics(l log.Logger, client *ethclient.Client, account common.Address) io.Closer {
 	return nil
 }
@@ -39,10 +41,8 @@ func (*NoopMetricsImpl) RecordLargePreimageCount(_ int) {}
 func (*NoopMetricsImpl) RecordBondClaimFailed()   {}
 func (*NoopMetricsImpl) RecordBondClaimed(uint64) {}
 
-func (*NoopMetricsImpl) RecordVmExecutionTime(_ string, _ time.Duration) {}
-func (*NoopMetricsImpl) RecordVmMemoryUsed(_ string, _ uint64)           {}
-func (*NoopMetricsImpl) RecordClaimResolutionTime(t float64)             {}
-func (*NoopMetricsImpl) RecordGameActTime(t float64)                     {}
+func (*NoopMetricsImpl) RecordClaimResolutionTime(t float64) {}
+func (*NoopMetricsImpl) RecordGameActTime(t float64)         {}
 
 func (*NoopMetricsImpl) RecordGamesStatus(inProgress, defenderWon, challengerWon int) {}
 
@@ -57,6 +57,6 @@ func (*NoopMetricsImpl) DecIdleExecutors()   {}
 func (*NoopMetricsImpl) CacheAdd(_ string, _ int, _ bool) {}
 func (*NoopMetricsImpl) CacheGet(_ string, _ bool)        {}
 
-func (m *NoopMetricsImpl) VmMetrics(vmType string) *VmMetrics {
-	return NewVmMetrics(m, vmType)
+func (m *NoopMetricsImpl) ToTypedVmMetrics(vmType string) TypedVmMetricer {
+	return NewTypedVmMetrics(m, vmType)
 }
diff --git a/op-challenger/metrics/vm.go b/op-challenger/metrics/vm.go
index 70e9a363cb36..ece10ac57890 100644
--- a/op-challenger/metrics/vm.go
+++ b/op-challenger/metrics/vm.go
@@ -1,28 +1,221 @@
 package metrics
 
-import "time"
+import (
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/ethereum-optimism/optimism/op-service/metrics"
+)
 
 type VmMetricer interface {
 	RecordVmExecutionTime(vmType string, t time.Duration)
 	RecordVmMemoryUsed(vmType string, memoryUsed uint64)
+	RecordVmRmwSuccessCount(vmType string, val uint64)
+	RecordVmSteps(vmType string, val uint64)
+	RecordVmRmwFailCount(vmType string, val uint64)
+	RecordVmMaxStepsBetweenLLAndSC(vmType string, val uint64)
+	RecordVmReservationInvalidationCount(vmType string, val uint64)
+	RecordVmForcedPreemptionCount(vmType string, val uint64)
+	RecordVmFailedWakeupCount(vmType string, val uint64)
+	RecordVmIdleStepCountThread0(vmType string, val uint64)
+}
+
+// TypedVmMetricer matches VmMetricer except the vmType parameter is already baked in and not supplied to each method
+type TypedVmMetricer interface {
+	RecordExecutionTime(t time.Duration)
+	RecordMemoryUsed(memoryUsed uint64)
+	RecordSteps(val uint64)
+	RecordRmwSuccessCount(val uint64)
+	RecordRmwFailCount(val uint64)
+	RecordMaxStepsBetweenLLAndSC(val uint64)
+	RecordReservationInvalidationCount(val uint64)
+	RecordForcedPreemptionCount(val uint64)
+	RecordFailedWakeupCount(val uint64)
+	RecordIdleStepCountThread0(val uint64)
 }
 
 type VmMetrics struct {
-	m      VmMetricer
-	vmType string
+	vmExecutionTime            *prometheus.HistogramVec
+	vmMemoryUsed               *prometheus.HistogramVec
+	vmSteps                    *prometheus.GaugeVec
+	vmRmwSuccessCount          *prometheus.GaugeVec
+	vmRmwFailCount             *prometheus.GaugeVec
+	vmMaxStepsBetweenLLAndSC   *prometheus.GaugeVec
+	vmReservationInvalidations *prometheus.GaugeVec
+	vmForcedPreemptions        *prometheus.GaugeVec
+	vmFailedWakeup             *prometheus.GaugeVec
+	vmIdleStepsThread0         *prometheus.GaugeVec
+}
+
+var _ VmMetricer = (*VmMetrics)(nil)
+
+func (m *VmMetrics) RecordVmExecutionTime(vmType string, dur time.Duration) {
+	m.vmExecutionTime.WithLabelValues(vmType).Observe(dur.Seconds())
+}
+
+func (m *VmMetrics) RecordVmMemoryUsed(vmType string, memoryUsed uint64) {
+	m.vmMemoryUsed.WithLabelValues(vmType).Observe(float64(memoryUsed))
+}
+
+func (m *VmMetrics) RecordVmSteps(vmType string, val uint64) {
+	m.vmSteps.WithLabelValues(vmType).Set(float64(val))
+}
+
+func (m *VmMetrics) RecordVmRmwSuccessCount(vmType string, val uint64) {
+	m.vmRmwSuccessCount.WithLabelValues(vmType).Set(float64(val))
 }
 
-func NewVmMetrics(m VmMetricer, vmType string) *VmMetrics {
+func (m *VmMetrics) RecordVmRmwFailCount(vmType string, val uint64) {
+	m.vmRmwFailCount.WithLabelValues(vmType).Set(float64(val))
+}
+
+func (m *VmMetrics) RecordVmMaxStepsBetweenLLAndSC(vmType string, val uint64) {
+	m.vmMaxStepsBetweenLLAndSC.WithLabelValues(vmType).Set(float64(val))
+}
+
+func (m *VmMetrics) RecordVmReservationInvalidationCount(vmType string, val uint64) {
+	m.vmReservationInvalidations.WithLabelValues(vmType).Set(float64(val))
+}
+
+func (m *VmMetrics) RecordVmForcedPreemptionCount(vmType string, val uint64) {
+	m.vmForcedPreemptions.WithLabelValues(vmType).Set(float64(val))
+}
+
+func (m *VmMetrics) RecordVmFailedWakeupCount(vmType string, val uint64) {
+	m.vmFailedWakeup.WithLabelValues(vmType).Set(float64(val))
+}
+
+func (m *VmMetrics) RecordVmIdleStepCountThread0(vmType string, val uint64) {
+	m.vmIdleStepsThread0.WithLabelValues(vmType).Set(float64(val))
+}
+
+func NewVmMetrics(namespace string, factory metrics.Factory) *VmMetrics {
 	return &VmMetrics{
-		m:      m,
-		vmType: vmType,
+		vmExecutionTime: factory.NewHistogramVec(prometheus.HistogramOpts{
+			Namespace: namespace,
+			Name:      "vm_execution_time",
+			Help:      "Time (in seconds) to execute the fault proof VM",
+			Buckets: append(
+				[]float64{1.0, 10.0},
+				prometheus.ExponentialBuckets(30.0, 2.0, 14)...),
+		}, []string{"vm"}),
+		vmMemoryUsed: factory.NewHistogramVec(prometheus.HistogramOpts{
+			Namespace: namespace,
+			Name:      "vm_memory_used",
+			Help:      "Memory used (in bytes) to execute the fault proof VM",
+			// 100MiB increments from 0 to 1.5GiB
+			Buckets: prometheus.LinearBuckets(0, 1024*1024*100, 15),
+		}, []string{"vm"}),
+		vmSteps: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_step_count",
+			Help:      "Number of steps executed during vm run",
+		}, []string{"vm"}),
+		vmRmwSuccessCount: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_rmw_success_count",
+			Help:      "Number of successful RMW instruction sequences during vm run",
+		}, []string{"vm"}),
+		vmRmwFailCount: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_rmw_fail_count",
+			Help:      "Number of failed RMW instruction sequences during vm run",
+		}, []string{"vm"}),
+		// Note: vmMaxStepsBetweenLLAndSC is not complete and may miss longer ranges for failed rmw sequences.
+		vmMaxStepsBetweenLLAndSC: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_max_steps_between_ll_and_sc",
+			Help:      "The maximum number of steps observed between matching ll(d) and sc(d) instructions during the vm run",
+		}, []string{"vm"}),
+		vmReservationInvalidations: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_reservation_invalidations",
+			Help:      "Number of memory reservations that were invalidated during vm run",
+		}, []string{"vm"}),
+		vmForcedPreemptions: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_forced_preemptions",
+			Help:      "Number of forced preemptions during vm run",
+		}, []string{"vm"}),
+		vmFailedWakeup: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_failed_wakeup",
+			Help:      "Number of failed wakesups during vm run",
+		}, []string{"vm"}),
+		vmIdleStepsThread0: factory.NewGaugeVec(prometheus.GaugeOpts{
+			Namespace: namespace,
+			Name:      "vm_idle_steps_thread0",
+			Help:      "Number of steps thread 0 is idle during vm run",
+		}, []string{"vm"}),
 	}
 }
 
-func (m *VmMetrics) RecordExecutionTime(dur time.Duration) {
+type NoopVmMetrics struct{}
+
+var _ VmMetricer = NoopVmMetrics{}
+
+func (n NoopVmMetrics) RecordVmExecutionTime(vmType string, t time.Duration)           {}
+func (n NoopVmMetrics) RecordVmMemoryUsed(vmType string, memoryUsed uint64)            {}
+func (n NoopVmMetrics) RecordVmSteps(vmType string, val uint64)                        {}
+func (n NoopVmMetrics) RecordVmRmwSuccessCount(vmType string, val uint64)              {}
+func (n NoopVmMetrics) RecordVmRmwFailCount(vmType string, val uint64)                 {}
+func (n NoopVmMetrics) RecordVmMaxStepsBetweenLLAndSC(vmType string, val uint64)       {}
+func (n NoopVmMetrics) RecordVmReservationInvalidationCount(vmType string, val uint64) {}
+func (n NoopVmMetrics) RecordVmForcedPreemptionCount(vmType string, val uint64)        {}
+func (n NoopVmMetrics) RecordVmFailedWakeupCount(vmType string, val uint64)            {}
+func (n NoopVmMetrics) RecordVmIdleStepCountThread0(vmType string, val uint64)         {}
+
+type typedVmMetricsImpl struct {
+	m      VmMetricer
+	vmType string
+}
+
+var _ TypedVmMetricer = (*typedVmMetricsImpl)(nil)
+
+func (m *typedVmMetricsImpl) RecordExecutionTime(dur time.Duration) {
 	m.m.RecordVmExecutionTime(m.vmType, dur)
 }
 
-func (m *VmMetrics) RecordMemoryUsed(memoryUsed uint64) {
+func (m *typedVmMetricsImpl) RecordMemoryUsed(memoryUsed uint64) {
 	m.m.RecordVmMemoryUsed(m.vmType, memoryUsed)
 }
+
+func (m *typedVmMetricsImpl) RecordSteps(val uint64) {
+	m.m.RecordVmSteps(m.vmType, val)
+}
+
+func (m *typedVmMetricsImpl) RecordRmwSuccessCount(val uint64) {
+	m.m.RecordVmRmwSuccessCount(m.vmType, val)
+}
+
+func (m *typedVmMetricsImpl) RecordRmwFailCount(val uint64) {
+	m.m.RecordVmRmwFailCount(m.vmType, val)
+}
+
+func (m *typedVmMetricsImpl) RecordMaxStepsBetweenLLAndSC(val uint64) {
+	m.m.RecordVmMaxStepsBetweenLLAndSC(m.vmType, val)
+}
+
+func (m *typedVmMetricsImpl) RecordReservationInvalidationCount(val uint64) {
+	m.m.RecordVmReservationInvalidationCount(m.vmType, val)
+}
+
+func (m *typedVmMetricsImpl) RecordForcedPreemptionCount(val uint64) {
+	m.m.RecordVmForcedPreemptionCount(m.vmType, val)
+}
+
+func (m *typedVmMetricsImpl) RecordFailedWakeupCount(val uint64) {
+	m.m.RecordVmFailedWakeupCount(m.vmType, val)
+}
+
+func (m *typedVmMetricsImpl) RecordIdleStepCountThread0(val uint64) {
+	m.m.RecordVmIdleStepCountThread0(m.vmType, val)
+}
+
+func NewTypedVmMetrics(m VmMetricer, vmType string) TypedVmMetricer {
+	return &typedVmMetricsImpl{
+		m:      m,
+		vmType: vmType,
+	}
+}
diff --git a/op-challenger/runner/metrics.go b/op-challenger/runner/metrics.go
index 1f347b62aa68..4e63d66e7a0d 100644
--- a/op-challenger/runner/metrics.go
+++ b/op-challenger/runner/metrics.go
@@ -3,9 +3,11 @@ package runner
 import (
 	"time"
 
+	"github.com/prometheus/client_golang/prometheus"
+
 	contractMetrics "github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts/metrics"
+	"github.com/ethereum-optimism/optimism/op-challenger/metrics"
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 const Namespace = "op_challenger_runner"
@@ -15,10 +17,9 @@ type Metrics struct {
 	registry *prometheus.Registry
 	factory  opmetrics.Factory
 	*contractMetrics.ContractMetrics
+	*metrics.VmMetrics
 
-	vmExecutionTime     *prometheus.HistogramVec
 	vmLastExecutionTime *prometheus.GaugeVec
-	vmMemoryUsed        *prometheus.HistogramVec
 	vmLastMemoryUsed    *prometheus.GaugeVec
 	successTotal        *prometheus.CounterVec
 	failuresTotal       *prometheus.CounterVec
@@ -40,27 +41,13 @@ func NewMetrics() *Metrics {
 		factory:  factory,
 
 		ContractMetrics: contractMetrics.MakeContractMetrics(Namespace, factory),
+		VmMetrics:       metrics.NewVmMetrics(Namespace, factory),
 
-		vmExecutionTime: factory.NewHistogramVec(prometheus.HistogramOpts{
-			Namespace: Namespace,
-			Name:      "vm_execution_time",
-			Help:      "Time (in seconds) to execute the fault proof VM",
-			Buckets: append(
-				[]float64{1.0, 10.0},
-				prometheus.ExponentialBuckets(30.0, 2.0, 14)...),
-		}, []string{"vm"}),
 		vmLastExecutionTime: factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: Namespace,
 			Name:      "vm_last_execution_time",
 			Help:      "Time (in seconds) taken for the last execution of the fault proof VM",
 		}, []string{"vm"}),
-		vmMemoryUsed: factory.NewHistogramVec(prometheus.HistogramOpts{
-			Namespace: Namespace,
-			Name:      "vm_memory_used",
-			Help:      "Memory used (in bytes) to execute the fault proof VM",
-			// 100MiB increments from 0 to 1.5GiB
-			Buckets: prometheus.LinearBuckets(0, 1024*1024*100, 15),
-		}, []string{"vm"}),
 		vmLastMemoryUsed: factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: Namespace,
 			Name:      "vm_last_memory_used",
@@ -90,12 +77,12 @@ func (m *Metrics) Registry() *prometheus.Registry {
 
 func (m *Metrics) RecordVmExecutionTime(vmType string, dur time.Duration) {
 	val := dur.Seconds()
-	m.vmExecutionTime.WithLabelValues(vmType).Observe(val)
+	m.VmMetrics.RecordVmExecutionTime(vmType, dur)
 	m.vmLastExecutionTime.WithLabelValues(vmType).Set(val)
 }
 
 func (m *Metrics) RecordVmMemoryUsed(vmType string, memoryUsed uint64) {
-	m.vmMemoryUsed.WithLabelValues(vmType).Observe(float64(memoryUsed))
+	m.VmMetrics.RecordVmMemoryUsed(vmType, memoryUsed)
 	m.vmLastMemoryUsed.WithLabelValues(vmType).Set(float64(memoryUsed))
 }
 
diff --git a/op-challenger/runner/runner.go b/op-challenger/runner/runner.go
index 312981430413..091be46ec353 100644
--- a/op-challenger/runner/runner.go
+++ b/op-challenger/runner/runner.go
@@ -12,6 +12,9 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum-optimism/optimism/cannon/mipsevm"
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
@@ -25,8 +28,6 @@ import (
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 var (
@@ -35,9 +36,8 @@ var (
 
 type Metricer interface {
 	contractMetrics.ContractMetricer
+	metrics.VmMetricer
 
-	RecordVmExecutionTime(vmType string, t time.Duration)
-	RecordVmMemoryUsed(vmType string, memoryUsed uint64)
 	RecordFailure(vmType string)
 	RecordInvalid(vmType string)
 	RecordSuccess(vmType string)
@@ -159,7 +159,7 @@ func (r *Runner) runAndRecordOnce(ctx context.Context, runConfig RunConfig, clie
 }
 
 func (r *Runner) runOnce(ctx context.Context, logger log.Logger, name string, traceType types.TraceType, prestateHash common.Hash, localInputs utils.LocalGameInputs, dir string) error {
-	provider, err := createTraceProvider(ctx, logger, metrics.NewVmMetrics(r.m, name), r.cfg, prestateHash, traceType, localInputs, dir)
+	provider, err := createTraceProvider(ctx, logger, metrics.NewTypedVmMetrics(r.m, name), r.cfg, prestateHash, traceType, localInputs, dir)
 	if err != nil {
 		return fmt.Errorf("failed to create trace provider: %w", err)
 	}
diff --git a/op-e2e/e2eutils/disputegame/output_cannon_helper.go b/op-e2e/e2eutils/disputegame/output_cannon_helper.go
index 43316a185fd3..11ac75643fff 100644
--- a/op-e2e/e2eutils/disputegame/output_cannon_helper.go
+++ b/op-e2e/e2eutils/disputegame/output_cannon_helper.go
@@ -9,6 +9,9 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/cannon"
 	"github.com/ethereum-optimism/optimism/op-challenger/game/fault/trace/outputs"
@@ -25,8 +28,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching"
 	"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
 )
 
 type OutputCannonGameHelper struct {
@@ -316,7 +317,7 @@ func (g *OutputCannonGameHelper) createCannonTraceProvider(ctx context.Context,
 		localContext = outputs.CreateLocalContext(pre, post)
 		dir := filepath.Join(cfg.Datadir, "cannon-trace")
 		subdir := filepath.Join(dir, localContext.Hex())
-		return cannon.NewTraceProviderForTest(logger, metrics.NoopMetrics.VmMetrics(types.TraceTypeCannon.String()), cfg, localInputs, subdir, g.MaxDepth(ctx)-splitDepth-1), nil
+		return cannon.NewTraceProviderForTest(logger, metrics.NoopMetrics.ToTypedVmMetrics(types.TraceTypeCannon.String()), cfg, localInputs, subdir, g.MaxDepth(ctx)-splitDepth-1), nil
 	})
 
 	claims, err := g.Game.GetAllClaims(ctx, rpcblock.Latest)
diff --git a/op-e2e/faultproofs/precompile_test.go b/op-e2e/faultproofs/precompile_test.go
index 89b2ff92d328..404467fd5b0b 100644
--- a/op-e2e/faultproofs/precompile_test.go
+++ b/op-e2e/faultproofs/precompile_test.go
@@ -273,7 +273,7 @@ func runCannon(t *testing.T, ctx context.Context, sys *e2esys.System, inputs uti
 	cannonOpts(&cfg)
 
 	logger := testlog.Logger(t, log.LevelInfo).New("role", "cannon")
-	executor := vm.NewExecutor(logger, metrics.NoopMetrics.VmMetrics("cannon"), cfg.Cannon, vm.NewOpProgramServerExecutor(logger), cfg.CannonAbsolutePreState, inputs)
+	executor := vm.NewExecutor(logger, metrics.NoopMetrics.ToTypedVmMetrics("cannon"), cfg.Cannon, vm.NewOpProgramServerExecutor(logger), cfg.CannonAbsolutePreState, inputs)
 
 	t.Log("Running cannon")
 	err := executor.DoGenerateProof(ctx, proofsDir, math.MaxUint, math.MaxUint, extraVmArgs...)

From 0d99a87a46471dc08939bcbdf6b757bc85785d44 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Wed, 11 Dec 2024 16:16:39 -0700
Subject: [PATCH 439/451] op-deployer: Fix superchain proxy admin addr method
 (#13361)

Renames the ManagerOwnerAddrFor method to reflect what it actually does, and point it at the Sepolia proxy admin.
---
 op-deployer/pkg/deployer/bootstrap/delayed_weth.go      | 2 +-
 op-deployer/pkg/deployer/integration_test/apply_test.go | 2 +-
 op-deployer/pkg/deployer/pipeline/init.go               | 2 +-
 op-deployer/pkg/deployer/standard/standard.go           | 9 +++++----
 op-deployer/pkg/deployer/state/intent.go                | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
index 71fea24cc73f..3c80c0529903 100644
--- a/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
+++ b/op-deployer/pkg/deployer/bootstrap/delayed_weth.go
@@ -145,7 +145,7 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) (opcm.DeployDelayed
 	if err != nil {
 		return dwo, fmt.Errorf("error getting superchain config: %w", err)
 	}
-	proxyAdmin, err := standard.ManagerOwnerAddrFor(chainIDU64)
+	proxyAdmin, err := standard.SuperchainProxyAdminAddrFor(chainIDU64)
 	if err != nil {
 		return dwo, fmt.Errorf("error getting superchain proxy admin: %w", err)
 	}
diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index d1280d14f4c7..ec02e5e94f73 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -275,7 +275,7 @@ func testApplyExistingOPCM(t *testing.T, l1ChainID uint64, forkRPCUrl string, ve
 	superchain, err := standard.SuperchainFor(l1ChainIDBig.Uint64())
 	require.NoError(t, err)
 
-	managerOwner, err := standard.ManagerOwnerAddrFor(l1ChainIDBig.Uint64())
+	managerOwner, err := standard.SuperchainProxyAdminAddrFor(l1ChainIDBig.Uint64())
 	require.NoError(t, err)
 
 	superchainTests := []struct {
diff --git a/op-deployer/pkg/deployer/pipeline/init.go b/op-deployer/pkg/deployer/pipeline/init.go
index 2b9f1cbd45fc..9a8848843719 100644
--- a/op-deployer/pkg/deployer/pipeline/init.go
+++ b/op-deployer/pkg/deployer/pipeline/init.go
@@ -40,7 +40,7 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
 			return fmt.Errorf("error getting superchain config: %w", err)
 		}
 
-		proxyAdmin, err := standard.ManagerOwnerAddrFor(intent.L1ChainID)
+		proxyAdmin, err := standard.SuperchainProxyAdminAddrFor(intent.L1ChainID)
 		if err != nil {
 			return fmt.Errorf("error getting superchain proxy admin address: %w", err)
 		}
diff --git a/op-deployer/pkg/deployer/standard/standard.go b/op-deployer/pkg/deployer/standard/standard.go
index 72cff3cb9269..65fa42ee8b71 100644
--- a/op-deployer/pkg/deployer/standard/standard.go
+++ b/op-deployer/pkg/deployer/standard/standard.go
@@ -216,14 +216,15 @@ func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
 	}
 }
 
-func ManagerOwnerAddrFor(chainID uint64) (common.Address, error) {
+// SuperchainProxyAdminAddrFor returns the address of the Superchain ProxyAdmin for the given chain ID.
+// These have been verified to be the ProxyAdmin addresses on Mainnet and Sepolia.
+// DO NOT MODIFY THIS METHOD WITHOUT CLEARING IT WITH THE EVM SAFETY TEAM.
+func SuperchainProxyAdminAddrFor(chainID uint64) (common.Address, error) {
 	switch chainID {
 	case 1:
-		// Set to superchain proxy admin
 		return common.HexToAddress("0x543bA4AADBAb8f9025686Bd03993043599c6fB04"), nil
 	case 11155111:
-		// Set to development multisig
-		return common.HexToAddress("0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B"), nil
+		return common.HexToAddress("0x189aBAAaa82DfC015A588A7dbaD6F13b1D3485Bc"), nil
 	default:
 		return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
 	}
diff --git a/op-deployer/pkg/deployer/state/intent.go b/op-deployer/pkg/deployer/state/intent.go
index d3d5d44d7ad4..5ed275107a5f 100644
--- a/op-deployer/pkg/deployer/state/intent.go
+++ b/op-deployer/pkg/deployer/state/intent.go
@@ -363,7 +363,7 @@ func NewIntentStrict(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2
 	intent.ConfigType = IntentConfigTypeStrict
 
 	challenger, _ := standard.ChallengerAddressFor(l1ChainId)
-	l1ProxyAdminOwner, _ := standard.ManagerOwnerAddrFor(l1ChainId)
+	l1ProxyAdminOwner, _ := standard.L1ProxyAdminOwner(l1ChainId)
 	for chainIndex := range intent.Chains {
 		intent.Chains[chainIndex].Roles.Challenger = challenger
 		intent.Chains[chainIndex].Roles.L1ProxyAdminOwner = l1ProxyAdminOwner

From 551650878bcc9ab88cd8973b2efd0c11737fa843 Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Wed, 11 Dec 2024 17:18:02 -0600
Subject: [PATCH 440/451] supervisor: L1 Finality Processor (#13274)

* Add Finality Handling to L1 Processor

* Add E2E Test for Finality Tracking

* Completely remove UpdateFinalizedL1 API

* use BlockRef in Supervisor Client return
---
 op-e2e/actions/interop/interop.go             |  6 ++
 op-e2e/actions/interop/interop_test.go        |  1 +
 op-e2e/interop/interop_test.go                | 18 +++++
 op-node/rollup/interop/interop.go             | 11 ++-
 op-node/rollup/interop/interop_test.go        |  1 -
 op-service/sources/supervisor_client.go       | 18 ++---
 op-service/testutils/mock_interop_backend.go  |  4 --
 op-supervisor/supervisor/backend/backend.go   | 12 ++--
 op-supervisor/supervisor/backend/db/query.go  |  4 ++
 op-supervisor/supervisor/backend/mock.go      |  4 ++
 .../backend/processors/l1_processor.go        | 67 +++++++++++++++++--
 .../backend/processors/l1_processor_test.go   | 58 +++++++++++++++-
 op-supervisor/supervisor/frontend/frontend.go | 10 +--
 13 files changed, 174 insertions(+), 40 deletions(-)

diff --git a/op-e2e/actions/interop/interop.go b/op-e2e/actions/interop/interop.go
index 0129e248a47e..5e9f39fe15b8 100644
--- a/op-e2e/actions/interop/interop.go
+++ b/op-e2e/actions/interop/interop.go
@@ -21,6 +21,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/interop"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
@@ -142,6 +143,11 @@ func (sa *SupervisorActor) SyncCrossSafe(t helpers.Testing, chainID types.ChainI
 	require.NoError(t, sa.backend.SyncCrossSafe(chainID))
 }
 
+func (sa *SupervisorActor) SyncFinalizedL1(t helpers.Testing, ref eth.BlockRef) {
+	sa.backend.SyncFinalizedL1(ref)
+	require.Equal(t, ref, sa.backend.FinalizedL1())
+}
+
 // worldToDepSet converts a set of chain configs into a dependency-set for the supervisor.
 func worldToDepSet(t helpers.Testing, worldOutput *interopgen.WorldOutput) *depset.StaticConfigDependencySet {
 	depSetCfg := make(map[types.ChainID]*depset.StaticConfigDependency)
diff --git a/op-e2e/actions/interop/interop_test.go b/op-e2e/actions/interop/interop_test.go
index a39da702db8c..810cd3134982 100644
--- a/op-e2e/actions/interop/interop_test.go
+++ b/op-e2e/actions/interop/interop_test.go
@@ -90,6 +90,7 @@ func TestFullInterop(gt *testing.T) {
 	actors.L1Miner.ActL1FinalizeNext(t)
 	actors.ChainA.Sequencer.ActL1SafeSignal(t)
 	actors.ChainA.Sequencer.ActL1FinalizedSignal(t)
+	actors.Supervisor.SyncFinalizedL1(t, status.HeadL1)
 	actors.ChainA.Sequencer.ActL2PipelineFull(t)
 	finalizedL2BlockID, err := actors.Supervisor.Finalized(t.Ctx(), actors.ChainA.ChainID)
 	require.NoError(t, err)
diff --git a/op-e2e/interop/interop_test.go b/op-e2e/interop/interop_test.go
index 81f09c125aa4..1df24c2b8f31 100644
--- a/op-e2e/interop/interop_test.go
+++ b/op-e2e/interop/interop_test.go
@@ -105,6 +105,24 @@ func TestInterop_IsolatedChains(t *testing.T) {
 	setupAndRun(t, config, test)
 }
 
+// TestInterop_SupervisorFinality tests that the supervisor updates its finality
+// It waits for the finalized block to advance past the genesis block.
+func TestInterop_SupervisorFinality(t *testing.T) {
+	test := func(t *testing.T, s2 SuperSystem) {
+		supervisor := s2.SupervisorClient()
+		require.Eventually(t, func() bool {
+			final, err := supervisor.FinalizedL1(context.Background())
+			require.NoError(t, err)
+			return final.Number > 0
+			// this test takes about 30 seconds, with a longer Eventually timeout for CI
+		}, time.Second*60, time.Second, "wait for finalized block to be greater than 0")
+	}
+	config := SuperSystemConfig{
+		mempoolFiltering: false,
+	}
+	setupAndRun(t, config, test)
+}
+
 // TestInterop_EmitLogs tests a simple interop scenario
 // Chains A and B exist, but no messages are sent between them.
 // A contract is deployed on each chain, and logs are emitted repeatedly.
diff --git a/op-node/rollup/interop/interop.go b/op-node/rollup/interop/interop.go
index 2be92eb4d3a2..37d4cb2ce4ba 100644
--- a/op-node/rollup/interop/interop.go
+++ b/op-node/rollup/interop/interop.go
@@ -32,7 +32,6 @@ type InteropBackend interface {
 
 	UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error
 	UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.L1BlockRef, lastDerived eth.BlockRef) error
-	UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.L1BlockRef) error
 }
 
 // For testing usage, the backend of the supervisor implements the interface, no need for RPC.
@@ -153,12 +152,10 @@ func (d *InteropDeriver) onFinalizedL1(x finality.FinalizeL1Event) {
 	if !d.cfg.IsInterop(x.FinalizedL1.Time) {
 		return
 	}
-	d.log.Debug("Signaling finalized L1 update to interop backend", "finalized", x.FinalizedL1)
-	ctx, cancel := context.WithTimeout(d.driverCtx, rpcTimeout)
-	defer cancel()
-	if err := d.backend.UpdateFinalizedL1(ctx, d.chainID, x.FinalizedL1); err != nil {
-		d.log.Warn("Failed to signal finalized L1 block to interop backend", "finalized", x.FinalizedL1, "err", err)
-	}
+	// there used to be code here which sent the finalized L1 block to the supervisor
+	// but the supervisor manages its own finality now
+	// so we don't need to do anything here besides emit the event.
+
 	// New L2 blocks may be ready to finalize now that the backend knows of new L1 finalized info.
 	d.emitter.Emit(engine.RequestFinalizedUpdateEvent{})
 }
diff --git a/op-node/rollup/interop/interop_test.go b/op-node/rollup/interop/interop_test.go
index d4fb87f0dd92..f061406fd5b3 100644
--- a/op-node/rollup/interop/interop_test.go
+++ b/op-node/rollup/interop/interop_test.go
@@ -158,7 +158,6 @@ func TestInteropDeriver(t *testing.T) {
 	t.Run("finalized L1 trigger cross-L2 finality check", func(t *testing.T) {
 		emitter.ExpectOnce(engine.RequestFinalizedUpdateEvent{})
 		finalizedL1 := testutils.RandomBlockRef(rng)
-		interopBackend.ExpectUpdateFinalizedL1(chainID, finalizedL1, nil)
 		interopDeriver.OnEvent(finality.FinalizeL1Event{
 			FinalizedL1: finalizedL1,
 		})
diff --git a/op-service/sources/supervisor_client.go b/op-service/sources/supervisor_client.go
index 00cfa761df4d..fbd91fa7d0bf 100644
--- a/op-service/sources/supervisor_client.go
+++ b/op-service/sources/supervisor_client.go
@@ -114,6 +114,15 @@ func (cl *SupervisorClient) Finalized(ctx context.Context, chainID types.ChainID
 	return result, err
 }
 
+func (cl *SupervisorClient) FinalizedL1(ctx context.Context) (eth.BlockRef, error) {
+	var result eth.BlockRef
+	err := cl.client.CallContext(
+		ctx,
+		&result,
+		"supervisor_finalizedL1")
+	return result, err
+}
+
 func (cl *SupervisorClient) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (eth.BlockRef, error) {
 	var result eth.BlockRef
 	err := cl.client.CallContext(
@@ -144,15 +153,6 @@ func (cl *SupervisorClient) UpdateLocalSafe(ctx context.Context, chainID types.C
 		lastDerived)
 }
 
-func (cl *SupervisorClient) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalizedL1 eth.L1BlockRef) error {
-	return cl.client.CallContext(
-		ctx,
-		nil,
-		"supervisor_updateFinalizedL1",
-		chainID,
-		finalizedL1)
-}
-
 func (cl *SupervisorClient) Close() {
 	cl.client.Close()
 }
diff --git a/op-service/testutils/mock_interop_backend.go b/op-service/testutils/mock_interop_backend.go
index af6762c204cd..9b43d7724f9c 100644
--- a/op-service/testutils/mock_interop_backend.go
+++ b/op-service/testutils/mock_interop_backend.go
@@ -94,10 +94,6 @@ func (m *MockInteropBackend) UpdateFinalizedL1(ctx context.Context, chainID type
 	return *result.Get(0).(*error)
 }
 
-func (m *MockInteropBackend) ExpectUpdateFinalizedL1(chainID types.ChainID, finalized eth.L1BlockRef, err error) {
-	m.Mock.On("UpdateFinalizedL1", chainID, finalized).Once().Return(&err)
-}
-
 func (m *MockInteropBackend) AssertExpectations(t mock.TestingT) {
 	m.Mock.AssertExpectations(t)
 }
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 4c8fb1c411e8..1d70dd087a1f 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -450,6 +450,10 @@ func (su *SupervisorBackend) Finalized(ctx context.Context, chainID types.ChainI
 	return v.ID(), nil
 }
 
+func (su *SupervisorBackend) FinalizedL1() eth.BlockRef {
+	return su.chainDBs.FinalizedL1()
+}
+
 func (su *SupervisorBackend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	v, err := su.chainDBs.CrossDerivedFromBlockRef(chainID, derived)
 	if err != nil {
@@ -478,10 +482,6 @@ func (su *SupervisorBackend) UpdateLocalSafe(ctx context.Context, chainID types.
 	return nil
 }
 
-func (su *SupervisorBackend) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error {
-	return su.chainDBs.UpdateFinalizedL1(finalized)
-}
-
 // Access to synchronous processing for tests
 // ----------------------------
 
@@ -509,3 +509,7 @@ func (su *SupervisorBackend) SyncCrossSafe(chainID types.ChainID) error {
 	}
 	return ch.ProcessWork()
 }
+
+func (su *SupervisorBackend) SyncFinalizedL1(ref eth.BlockRef) {
+	processors.MaybeUpdateFinalizedL1(context.Background(), su.logger, su.chainDBs, ref)
+}
diff --git a/op-supervisor/supervisor/backend/db/query.go b/op-supervisor/supervisor/backend/db/query.go
index 5897ff3c9242..5e9503c39ade 100644
--- a/op-supervisor/supervisor/backend/db/query.go
+++ b/op-supervisor/supervisor/backend/db/query.go
@@ -148,6 +148,10 @@ func (db *ChainsDB) CrossSafe(chainID types.ChainID) (derivedFrom types.BlockSea
 	return crossDB.Latest()
 }
 
+func (db *ChainsDB) FinalizedL1() eth.BlockRef {
+	return db.finalizedL1.Get()
+}
+
 func (db *ChainsDB) Finalized(chainID types.ChainID) (types.BlockSeal, error) {
 	finalizedL1 := db.finalizedL1.Get()
 	if finalizedL1 == (eth.L1BlockRef{}) {
diff --git a/op-supervisor/supervisor/backend/mock.go b/op-supervisor/supervisor/backend/mock.go
index 71c1efacb940..7de6666135ac 100644
--- a/op-supervisor/supervisor/backend/mock.go
+++ b/op-supervisor/supervisor/backend/mock.go
@@ -62,6 +62,10 @@ func (m *MockBackend) Finalized(ctx context.Context, chainID types.ChainID) (eth
 	return eth.BlockID{}, nil
 }
 
+func (m *MockBackend) FinalizedL1() eth.BlockRef {
+	return eth.BlockRef{}
+}
+
 func (m *MockBackend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	return eth.BlockRef{}, nil
 }
diff --git a/op-supervisor/supervisor/backend/processors/l1_processor.go b/op-supervisor/supervisor/backend/processors/l1_processor.go
index 063acd056e0a..4f024fb599e2 100644
--- a/op-supervisor/supervisor/backend/processors/l1_processor.go
+++ b/op-supervisor/supervisor/backend/processors/l1_processor.go
@@ -8,23 +8,28 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/log"
 )
 
 type chainsDB interface {
 	RecordNewL1(ref eth.BlockRef) error
 	LastCommonL1() (types.BlockSeal, error)
+	FinalizedL1() eth.BlockRef
+	UpdateFinalizedL1(finalized eth.BlockRef) error
 }
 
 type L1Source interface {
 	L1BlockRefByNumber(ctx context.Context, number uint64) (eth.L1BlockRef, error)
+	L1BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.L1BlockRef, error)
 }
 
 type L1Processor struct {
-	log      log.Logger
-	client   L1Source
-	clientMu sync.Mutex
-	running  atomic.Bool
+	log         log.Logger
+	client      L1Source
+	clientMu    sync.RWMutex
+	running     atomic.Bool
+	finalitySub ethereum.Subscription
 
 	currentNumber uint64
 	tickDuration  time.Duration
@@ -38,11 +43,12 @@ type L1Processor struct {
 
 func NewL1Processor(log log.Logger, cdb chainsDB, client L1Source) *L1Processor {
 	ctx, cancel := context.WithCancel(context.Background())
+	tickDuration := 6 * time.Second
 	return &L1Processor{
 		client:       client,
 		db:           cdb,
 		log:          log.New("service", "l1-processor"),
-		tickDuration: 6 * time.Second,
+		tickDuration: tickDuration,
 		ctx:          ctx,
 		cancel:       cancel,
 	}
@@ -51,7 +57,20 @@ func NewL1Processor(log log.Logger, cdb chainsDB, client L1Source) *L1Processor
 func (p *L1Processor) AttachClient(client L1Source) {
 	p.clientMu.Lock()
 	defer p.clientMu.Unlock()
+	// unsubscribe from the old client
+	if p.finalitySub != nil {
+		p.finalitySub.Unsubscribe()
+	}
+	// make the new client the active one
 	p.client = client
+	// resubscribe to the new client
+	p.finalitySub = eth.PollBlockChanges(
+		p.log,
+		p.client,
+		p.handleFinalized,
+		eth.Finalized,
+		3*time.Second,
+		10*time.Second)
 }
 
 func (p *L1Processor) Start() {
@@ -68,6 +87,13 @@ func (p *L1Processor) Start() {
 	}
 	p.wg.Add(1)
 	go p.worker()
+	p.finalitySub = eth.PollBlockChanges(
+		p.log,
+		p.client,
+		p.handleFinalized,
+		eth.Finalized,
+		p.tickDuration,
+		p.tickDuration)
 }
 
 func (p *L1Processor) Stop() {
@@ -103,8 +129,8 @@ func (p *L1Processor) worker() {
 // if a new block is found, it is recorded in the database and the target number is updated
 // in the future it will also kick of derivation management for the sync nodes
 func (p *L1Processor) work() error {
-	p.clientMu.Lock()
-	defer p.clientMu.Unlock()
+	p.clientMu.RLock()
+	defer p.clientMu.RUnlock()
 	nextNumber := p.currentNumber + 1
 	ref, err := p.client.L1BlockRefByNumber(p.ctx, nextNumber)
 	if err != nil {
@@ -125,3 +151,30 @@ func (p *L1Processor) work() error {
 	p.currentNumber = nextNumber
 	return nil
 }
+
+// handleFinalized is called when a new finalized block is received from the L1 chain subscription
+// it updates the database with the new finalized block if it is newer than the current one
+func (p *L1Processor) handleFinalized(ctx context.Context, sig eth.L1BlockRef) {
+	MaybeUpdateFinalizedL1(ctx, p.log, p.db, sig)
+}
+
+// MaybeUpdateFinalizedL1 updates the database with the new finalized block if it is newer than the current one
+// it is defined outside of the L1Processor so tests can call it directly without having a processor
+func MaybeUpdateFinalizedL1(ctx context.Context, logger log.Logger, db chainsDB, ref eth.L1BlockRef) {
+	// do something with the new block
+	logger.Debug("Received new Finalized L1 block", "block", ref)
+	currentFinalized := db.FinalizedL1()
+	if currentFinalized.Number > ref.Number {
+		logger.Warn("Finalized block in database is newer than subscribed finalized block", "current", currentFinalized, "new", ref)
+		return
+	}
+	if ref.Number > currentFinalized.Number || currentFinalized == (eth.BlockRef{}) {
+		// update the database with the new finalized block
+		if err := db.UpdateFinalizedL1(ref); err != nil {
+			logger.Warn("Failed to update finalized L1", "err", err)
+			return
+		}
+		logger.Debug("Updated finalized L1 block", "block", ref)
+	}
+
+}
diff --git a/op-supervisor/supervisor/backend/processors/l1_processor_test.go b/op-supervisor/supervisor/backend/processors/l1_processor_test.go
index 143ebb66b74e..528adf183da0 100644
--- a/op-supervisor/supervisor/backend/processors/l1_processor_test.go
+++ b/op-supervisor/supervisor/backend/processors/l1_processor_test.go
@@ -14,8 +14,10 @@ import (
 )
 
 type mockChainsDB struct {
-	recordNewL1Fn  func(ref eth.BlockRef) error
-	lastCommonL1Fn func() (types.BlockSeal, error)
+	recordNewL1Fn       func(ref eth.BlockRef) error
+	lastCommonL1Fn      func() (types.BlockSeal, error)
+	finalizedL1Fn       func() eth.BlockRef
+	updateFinalizedL1Fn func(finalized eth.BlockRef) error
 }
 
 func (m *mockChainsDB) RecordNewL1(ref eth.BlockRef) error {
@@ -32,10 +34,28 @@ func (m *mockChainsDB) LastCommonL1() (types.BlockSeal, error) {
 	return types.BlockSeal{}, nil
 }
 
+func (m *mockChainsDB) FinalizedL1() eth.BlockRef {
+	if m.finalizedL1Fn != nil {
+		return m.finalizedL1Fn()
+	}
+	return eth.BlockRef{}
+}
+
+func (m *mockChainsDB) UpdateFinalizedL1(finalized eth.BlockRef) error {
+	if m.updateFinalizedL1Fn != nil {
+		return m.updateFinalizedL1Fn(finalized)
+	}
+	return nil
+}
+
 type mockL1BlockRefByNumberFetcher struct {
 	l1BlockByNumberFn func() (eth.L1BlockRef, error)
 }
 
+func (m *mockL1BlockRefByNumberFetcher) L1BlockRefByLabel(context.Context, eth.BlockLabel) (eth.L1BlockRef, error) {
+	return eth.L1BlockRef{}, nil
+}
+
 func (m *mockL1BlockRefByNumberFetcher) L1BlockRefByNumber(context.Context, uint64) (eth.L1BlockRef, error) {
 	if m.l1BlockByNumberFn != nil {
 		return m.l1BlockByNumberFn()
@@ -103,5 +123,37 @@ func TestL1Processor(t *testing.T) {
 		}, 10*time.Second, 100*time.Millisecond)
 
 	})
-
+	t.Run("Updates L1 Finalized", func(t *testing.T) {
+		proc := processorForTesting()
+		proc.db.(*mockChainsDB).finalizedL1Fn = func() eth.BlockRef {
+			return eth.BlockRef{Number: 0}
+		}
+		proc.db.(*mockChainsDB).updateFinalizedL1Fn = func(finalized eth.BlockRef) error {
+			require.Equal(t, uint64(10), finalized.Number)
+			return nil
+		}
+		proc.handleFinalized(context.Background(), eth.BlockRef{Number: 10})
+	})
+	t.Run("No L1 Finalized Update for Same Number", func(t *testing.T) {
+		proc := processorForTesting()
+		proc.db.(*mockChainsDB).finalizedL1Fn = func() eth.BlockRef {
+			return eth.BlockRef{Number: 10}
+		}
+		proc.db.(*mockChainsDB).updateFinalizedL1Fn = func(finalized eth.BlockRef) error {
+			require.Fail(t, "should not be called")
+			return nil
+		}
+		proc.handleFinalized(context.Background(), eth.BlockRef{Number: 10})
+	})
+	t.Run("No L1 Finalized Update When Behind", func(t *testing.T) {
+		proc := processorForTesting()
+		proc.db.(*mockChainsDB).finalizedL1Fn = func() eth.BlockRef {
+			return eth.BlockRef{Number: 20}
+		}
+		proc.db.(*mockChainsDB).updateFinalizedL1Fn = func(finalized eth.BlockRef) error {
+			require.Fail(t, "should not be called")
+			return nil
+		}
+		proc.handleFinalized(context.Background(), eth.BlockRef{Number: 10})
+	})
 }
diff --git a/op-supervisor/supervisor/frontend/frontend.go b/op-supervisor/supervisor/frontend/frontend.go
index bc21d977c337..0afab420c3e6 100644
--- a/op-supervisor/supervisor/frontend/frontend.go
+++ b/op-supervisor/supervisor/frontend/frontend.go
@@ -21,12 +21,12 @@ type QueryBackend interface {
 	UnsafeView(ctx context.Context, chainID types.ChainID, unsafe types.ReferenceView) (types.ReferenceView, error)
 	SafeView(ctx context.Context, chainID types.ChainID, safe types.ReferenceView) (types.ReferenceView, error)
 	Finalized(ctx context.Context, chainID types.ChainID) (eth.BlockID, error)
+	FinalizedL1() eth.BlockRef
 }
 
 type UpdatesBackend interface {
 	UpdateLocalUnsafe(ctx context.Context, chainID types.ChainID, head eth.BlockRef) error
 	UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error
-	UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error
 }
 
 type Backend interface {
@@ -67,6 +67,10 @@ func (q *QueryFrontend) Finalized(ctx context.Context, chainID types.ChainID) (e
 	return q.Supervisor.Finalized(ctx, chainID)
 }
 
+func (q *QueryFrontend) FinalizedL1() eth.BlockRef {
+	return q.Supervisor.FinalizedL1()
+}
+
 func (q *QueryFrontend) CrossDerivedFrom(ctx context.Context, chainID types.ChainID, derived eth.BlockID) (derivedFrom eth.BlockRef, err error) {
 	return q.Supervisor.CrossDerivedFrom(ctx, chainID, derived)
 }
@@ -105,7 +109,3 @@ func (u *UpdatesFrontend) UpdateLocalUnsafe(ctx context.Context, chainID types.C
 func (u *UpdatesFrontend) UpdateLocalSafe(ctx context.Context, chainID types.ChainID, derivedFrom eth.BlockRef, lastDerived eth.BlockRef) error {
 	return u.Supervisor.UpdateLocalSafe(ctx, chainID, derivedFrom, lastDerived)
 }
-
-func (u *UpdatesFrontend) UpdateFinalizedL1(ctx context.Context, chainID types.ChainID, finalized eth.BlockRef) error {
-	return u.Supervisor.UpdateFinalizedL1(ctx, chainID, finalized)
-}

From 5bdc9ac00b49d66c819cf67370c4fba14f22639c Mon Sep 17 00:00:00 2001
From: Axel Kingsley <axel.kingsley@gmail.com>
Date: Wed, 11 Dec 2024 17:21:48 -0600
Subject: [PATCH 441/451] Add SyncNode and Controller (#13344)

* Add SyncNode and Controller

* Add Tests; Real DeriveFromL1 function
---
 op-e2e/actions/helpers/l2_verifier.go         |   6 +-
 op-e2e/actions/interop/interop.go             |  12 +-
 op-e2e/interop/supersystem.go                 |   4 +-
 op-service/locks/rwmap.go                     |   6 +
 op-supervisor/cmd/main_test.go                |   6 +-
 op-supervisor/config/config.go                |   6 +-
 op-supervisor/config/config_test.go           |   4 +-
 op-supervisor/flags/flags.go                  |   6 +-
 op-supervisor/supervisor/backend/backend.go   |  54 +++--
 .../supervisor/backend/backend_test.go        |   4 +-
 .../backend/processors/l1_processor.go        |  17 +-
 .../backend/processors/l1_processor_test.go   |  94 +++++++-
 .../{syncsrc => syncnode}/collection.go       |  14 +-
 .../supervisor/backend/syncnode/controller.go | 100 +++++++++
 .../backend/syncnode/controller_test.go       | 205 ++++++++++++++++++
 .../backend/{syncsrc => syncnode}/dial.go     |  10 +-
 .../backend/{syncsrc => syncnode}/iface.go    |  23 +-
 .../backend/{syncsrc => syncnode}/rpc.go      |  27 ++-
 18 files changed, 506 insertions(+), 92 deletions(-)
 rename op-supervisor/supervisor/backend/{syncsrc => syncnode}/collection.go (75%)
 create mode 100644 op-supervisor/supervisor/backend/syncnode/controller.go
 create mode 100644 op-supervisor/supervisor/backend/syncnode/controller_test.go
 rename op-supervisor/supervisor/backend/{syncsrc => syncnode}/dial.go (78%)
 rename op-supervisor/supervisor/backend/{syncsrc => syncnode}/iface.go (51%)
 rename op-supervisor/supervisor/backend/{syncsrc => syncnode}/rpc.go (59%)

diff --git a/op-e2e/actions/helpers/l2_verifier.go b/op-e2e/actions/helpers/l2_verifier.go
index 0e951e05ac81..0c5f69c83b17 100644
--- a/op-e2e/actions/helpers/l2_verifier.go
+++ b/op-e2e/actions/helpers/l2_verifier.go
@@ -33,7 +33,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/safego"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum-optimism/optimism/op-service/testutils"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 )
 
 // L2Verifier is an actor that functions like a rollup node,
@@ -219,11 +219,11 @@ func NewL2Verifier(t Testing, log log.Logger, l1 derive.L1Fetcher,
 	return rollupNode
 }
 
-func (v *L2Verifier) InteropSyncSource(t Testing) syncsrc.SyncSource {
+func (v *L2Verifier) InteropSyncNode(t Testing) syncnode.SyncNode {
 	require.NotNil(t, v.interopRPC, "interop rpc must be running")
 	cl := rpc.DialInProc(v.interopRPC)
 	bCl := client.NewBaseRPCClient(cl)
-	return syncsrc.NewRPCSyncSource("action-tests-l2-verifier", bCl)
+	return syncnode.NewRPCSyncNode("action-tests-l2-verifier", bCl)
 }
 
 type l2VerifierBackend struct {
diff --git a/op-e2e/actions/interop/interop.go b/op-e2e/actions/interop/interop.go
index 5e9f39fe15b8..0aa1ae750940 100644
--- a/op-e2e/actions/interop/interop.go
+++ b/op-e2e/actions/interop/interop.go
@@ -28,7 +28,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/metrics"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/frontend"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -111,10 +111,10 @@ func (is *InteropSetup) CreateActors() *InteropActors {
 	chainA := createL2Services(is.T, is.Log, l1Miner, is.Keys, is.Out.L2s["900200"], supervisorAPI)
 	chainB := createL2Services(is.T, is.Log, l1Miner, is.Keys, is.Out.L2s["900201"], supervisorAPI)
 	// Hook up L2 RPCs to supervisor, to fetch event data from
-	srcA := chainA.Sequencer.InteropSyncSource(is.T)
-	srcB := chainB.Sequencer.InteropSyncSource(is.T)
-	require.NoError(is.T, supervisorAPI.backend.AttachSyncSource(is.T.Ctx(), srcA))
-	require.NoError(is.T, supervisorAPI.backend.AttachSyncSource(is.T.Ctx(), srcB))
+	srcA := chainA.Sequencer.InteropSyncNode(is.T)
+	srcB := chainB.Sequencer.InteropSyncNode(is.T)
+	require.NoError(is.T, supervisorAPI.backend.AttachSyncNode(is.T.Ctx(), srcA))
+	require.NoError(is.T, supervisorAPI.backend.AttachSyncNode(is.T.Ctx(), srcB))
 	return &InteropActors{
 		L1Miner:    l1Miner,
 		Supervisor: supervisorAPI,
@@ -172,7 +172,7 @@ func NewSupervisor(t helpers.Testing, logger log.Logger, depSet depset.Dependenc
 		DependencySetSource:   depSet,
 		SynchronousProcessors: true,
 		Datadir:               supervisorDataDir,
-		SyncSources:           &syncsrc.CLISyncSources{}, // sources are added dynamically afterwards
+		SyncSources:           &syncnode.CLISyncNodes{}, // sources are added dynamically afterwards
 	}
 	b, err := backend.NewSupervisorBackend(t.Ctx(),
 		logger.New("role", "supervisor"), metrics.NoopMetrics, svCfg)
diff --git a/op-e2e/interop/supersystem.go b/op-e2e/interop/supersystem.go
index 209b88bdc583..b41e5cb9f701 100644
--- a/op-e2e/interop/supersystem.go
+++ b/op-e2e/interop/supersystem.go
@@ -61,7 +61,7 @@ import (
 	supervisorConfig "github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 	supervisortypes "github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -482,7 +482,7 @@ func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 			ListenPort:  0,
 			EnableAdmin: true,
 		},
-		SyncSources: &syncsrc.CLISyncSources{}, // no sync-sources
+		SyncSources: &syncnode.CLISyncNodes{}, // no sync-sources
 		L1RPC:       s.l1.UserRPC().RPC(),
 		Datadir:     path.Join(s.t.TempDir(), "supervisor"),
 	}
diff --git a/op-service/locks/rwmap.go b/op-service/locks/rwmap.go
index 2a6badf25525..c38afd3e6533 100644
--- a/op-service/locks/rwmap.go
+++ b/op-service/locks/rwmap.go
@@ -35,6 +35,12 @@ func (m *RWMap[K, V]) Set(key K, value V) {
 	m.inner[key] = value
 }
 
+func (m *RWMap[K, V]) Len() int {
+	m.mu.RLock()
+	defer m.mu.RUnlock()
+	return len(m.inner)
+}
+
 // Range calls f sequentially for each key and value present in the map.
 // If f returns false, range stops the iteration.
 func (m *RWMap[K, V]) Range(f func(key K, value V) bool) {
diff --git a/op-supervisor/cmd/main_test.go b/op-supervisor/cmd/main_test.go
index be27deabdf33..c77d61530aa4 100644
--- a/op-supervisor/cmd/main_test.go
+++ b/op-supervisor/cmd/main_test.go
@@ -14,12 +14,12 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/cliapp"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 )
 
 var (
 	ValidL1RPC  = "http://localhost:8545"
-	ValidL2RPCs = &syncsrc.CLISyncSources{
+	ValidL2RPCs = &syncnode.CLISyncNodes{
 		JWTSecretPaths: []string{"./jwt_secret.txt"},
 	}
 	ValidDatadir = "./supervisor_test_datadir"
@@ -58,7 +58,7 @@ func TestL2ConsensusNodes(t *testing.T) {
 		url2 := "http://foobar.com:1234"
 		cfg := configForArgs(t, addRequiredArgsExcept(
 			"--l2-consensus-nodes", "--l2-consensus.nodes="+url1+","+url2))
-		require.Equal(t, []string{url1, url2}, cfg.SyncSources.(*syncsrc.CLISyncSources).Endpoints)
+		require.Equal(t, []string{url1, url2}, cfg.SyncSources.(*syncnode.CLISyncNodes).Endpoints)
 	})
 }
 
diff --git a/op-supervisor/config/config.go b/op-supervisor/config/config.go
index 339167c1add5..8875236bbd2f 100644
--- a/op-supervisor/config/config.go
+++ b/op-supervisor/config/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/oppprof"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 )
 
 var (
@@ -37,7 +37,7 @@ type Config struct {
 	L1RPC string
 
 	// SyncSources lists the consensus nodes that help sync the supervisor
-	SyncSources syncsrc.SyncSourceCollection
+	SyncSources syncnode.SyncNodeCollection
 
 	Datadir string
 }
@@ -63,7 +63,7 @@ func (c *Config) Check() error {
 
 // NewConfig creates a new config using default values whenever possible.
 // Required options with no suitable default are passed as parameters.
-func NewConfig(l1RPC string, syncSrcs syncsrc.SyncSourceCollection, depSet depset.DependencySetSource, datadir string) *Config {
+func NewConfig(l1RPC string, syncSrcs syncnode.SyncNodeCollection, depSet depset.DependencySetSource, datadir string) *Config {
 	return &Config{
 		LogConfig:           oplog.DefaultCLIConfig(),
 		MetricsConfig:       opmetrics.DefaultCLIConfig(),
diff --git a/op-supervisor/config/config_test.go b/op-supervisor/config/config_test.go
index 68e9c952877c..f1dbf87d1032 100644
--- a/op-supervisor/config/config_test.go
+++ b/op-supervisor/config/config_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/oppprof"
 	"github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -68,5 +68,5 @@ func validConfig() *Config {
 		panic(err)
 	}
 	// Should be valid using only the required arguments passed in via the constructor.
-	return NewConfig("http://localhost:8545", &syncsrc.CLISyncSources{}, depSet, "./supervisor_testdir")
+	return NewConfig("http://localhost:8545", &syncnode.CLISyncNodes{}, depSet, "./supervisor_testdir")
 }
diff --git a/op-supervisor/flags/flags.go b/op-supervisor/flags/flags.go
index 8a203653c3e9..b30d25031a4c 100644
--- a/op-supervisor/flags/flags.go
+++ b/op-supervisor/flags/flags.go
@@ -12,7 +12,7 @@ import (
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
 	"github.com/ethereum-optimism/optimism/op-supervisor/config"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 )
 
 const EnvVarPrefix = "OP_SUPERVISOR"
@@ -110,8 +110,8 @@ func ConfigFromCLI(ctx *cli.Context, version string) *config.Config {
 
 // syncSourceSetups creates a sync source collection, from CLI arguments.
 // These sources can share JWT secret configuration.
-func syncSourceSetups(ctx *cli.Context) syncsrc.SyncSourceCollection {
-	return &syncsrc.CLISyncSources{
+func syncSourceSetups(ctx *cli.Context) syncnode.SyncNodeCollection {
+	return &syncnode.CLISyncNodes{
 		Endpoints:      filterEmpty(ctx.StringSlice(L2ConsensusNodesFlag.Name)),
 		JWTSecretPaths: filterEmpty(ctx.StringSlice(L2ConsensusJWTSecret.Name)),
 	}
diff --git a/op-supervisor/supervisor/backend/backend.go b/op-supervisor/supervisor/backend/backend.go
index 1d70dd087a1f..b6ca54582eed 100644
--- a/op-supervisor/supervisor/backend/backend.go
+++ b/op-supervisor/supervisor/backend/backend.go
@@ -18,7 +18,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/db"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/processors"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/frontend"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
@@ -32,28 +32,28 @@ type SupervisorBackend struct {
 	// depSet is the dependency set that the backend uses to know about the chains it is indexing
 	depSet depset.DependencySet
 
-	// chainDBs holds on to the DB indices for each chain
+	// chainDBs is the primary interface to the databases, including logs, derived-from information and L1 finalization
 	chainDBs *db.ChainsDB
 
-	// l1Processor watches for new L1 blocks, updates the local-safe DB, and kicks off derivation orchestration
+	// l1Processor watches for new data from the L1 chain including new blocks and block finalization
 	l1Processor *processors.L1Processor
 
 	// chainProcessors are notified of new unsafe blocks, and add the unsafe log events data into the events DB
 	chainProcessors locks.RWMap[types.ChainID, *processors.ChainProcessor]
+	// crossProcessors are used to index cross-chain dependency validity data once the log events are indexed
+	crossSafeProcessors   locks.RWMap[types.ChainID, *cross.Worker]
+	crossUnsafeProcessors locks.RWMap[types.ChainID, *cross.Worker]
 
-	// crossSafeProcessors take local-safe data and promote it to cross-safe when verified
-	crossSafeProcessors locks.RWMap[types.ChainID, *cross.Worker]
+	// syncNodesController controls the derivation or reset of the sync nodes
+	syncNodesController *syncnode.SyncNodesController
 
-	// crossUnsafeProcessors take local-unsafe data and promote it to cross-unsafe when verified
-	crossUnsafeProcessors locks.RWMap[types.ChainID, *cross.Worker]
+	// synchronousProcessors disables background-workers,
+	// requiring manual triggers for the backend to process l2 data.
+	synchronousProcessors bool
 
 	// chainMetrics are used to track metrics for each chain
 	// they are reused for processors and databases of the same chain
 	chainMetrics locks.RWMap[types.ChainID, *chainMetrics]
-
-	// synchronousProcessors disables background-workers,
-	// requiring manual triggers for the backend to process anything.
-	synchronousProcessors bool
 }
 
 var _ frontend.Backend = (*SupervisorBackend)(nil)
@@ -75,13 +75,17 @@ func NewSupervisorBackend(ctx context.Context, logger log.Logger, m Metrics, cfg
 	// create initial per-chain resources
 	chainsDBs := db.NewChainsDB(logger, depSet)
 
+	// create node controller
+	controllers := syncnode.NewSyncNodesController(logger, depSet, chainsDBs)
+
 	// create the supervisor backend
 	super := &SupervisorBackend{
-		logger:   logger,
-		m:        m,
-		dataDir:  cfg.Datadir,
-		depSet:   depSet,
-		chainDBs: chainsDBs,
+		logger:              logger,
+		m:                   m,
+		dataDir:             cfg.Datadir,
+		depSet:              depSet,
+		chainDBs:            chainsDBs,
+		syncNodesController: controllers,
 		// For testing we can avoid running the processors.
 		synchronousProcessors: cfg.SynchronousProcessors,
 	}
@@ -145,7 +149,7 @@ func (su *SupervisorBackend) initResources(ctx context.Context, cfg *config.Conf
 		if err != nil {
 			return fmt.Errorf("failed to set up sync source: %w", err)
 		}
-		if err := su.AttachSyncSource(ctx, src); err != nil {
+		if err := su.AttachSyncNode(ctx, src); err != nil {
 			return fmt.Errorf("failed to attach sync source %s: %w", src, err)
 		}
 	}
@@ -207,7 +211,7 @@ func (su *SupervisorBackend) openChainDBs(chainID types.ChainID) error {
 	return nil
 }
 
-func (su *SupervisorBackend) AttachSyncSource(ctx context.Context, src syncsrc.SyncSource) error {
+func (su *SupervisorBackend) AttachSyncNode(ctx context.Context, src syncnode.SyncNode) error {
 	su.logger.Info("attaching sync source to chain processor", "source", src)
 
 	chainID, err := src.ChainID(ctx)
@@ -217,12 +221,14 @@ func (su *SupervisorBackend) AttachSyncSource(ctx context.Context, src syncsrc.S
 	if !su.depSet.HasChain(chainID) {
 		return fmt.Errorf("chain %s is not part of the interop dependency set: %w", chainID, types.ErrUnknownChain)
 	}
-	return su.AttachProcessorSource(chainID, src)
+	err = su.AttachProcessorSource(chainID, src)
+	if err != nil {
+		return fmt.Errorf("failed to attach sync source to processor: %w", err)
+	}
+	return su.syncNodesController.AttachNodeController(chainID, src)
 }
 
 func (su *SupervisorBackend) AttachProcessorSource(chainID types.ChainID, src processors.Source) error {
-	// TODO: register sync sources in the backend, to trigger derivation work etc.
-
 	proc, ok := su.chainProcessors.Get(chainID)
 	if !ok {
 		return fmt.Errorf("unknown chain %s, cannot attach RPC to processor", chainID)
@@ -256,7 +262,7 @@ func (su *SupervisorBackend) attachL1RPC(ctx context.Context, l1RPCAddr string)
 // If the L1 processor does not exist, it is created and started.
 func (su *SupervisorBackend) AttachL1Source(source processors.L1Source) {
 	if su.l1Processor == nil {
-		su.l1Processor = processors.NewL1Processor(su.logger, su.chainDBs, source)
+		su.l1Processor = processors.NewL1Processor(su.logger, su.chainDBs, su.syncNodesController, source)
 		su.l1Processor.Start()
 	} else {
 		su.l1Processor.AttachClient(source)
@@ -338,7 +344,7 @@ func (su *SupervisorBackend) Stop(ctx context.Context) error {
 
 // AddL2RPC attaches an RPC as the RPC for the given chain, overriding the previous RPC source, if any.
 func (su *SupervisorBackend) AddL2RPC(ctx context.Context, rpc string, jwtSecret eth.Bytes32) error {
-	setupSrc := &syncsrc.RPCDialSetup{
+	setupSrc := &syncnode.RPCDialSetup{
 		JWTSecret: jwtSecret,
 		Endpoint:  rpc,
 	}
@@ -346,7 +352,7 @@ func (su *SupervisorBackend) AddL2RPC(ctx context.Context, rpc string, jwtSecret
 	if err != nil {
 		return fmt.Errorf("failed to set up sync source from RPC: %w", err)
 	}
-	return su.AttachSyncSource(ctx, src)
+	return su.AttachSyncNode(ctx, src)
 }
 
 // Internal methods, for processors
diff --git a/op-supervisor/supervisor/backend/backend_test.go b/op-supervisor/supervisor/backend/backend_test.go
index 3c1d08535d74..decfd394ec9c 100644
--- a/op-supervisor/supervisor/backend/backend_test.go
+++ b/op-supervisor/supervisor/backend/backend_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/metrics"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/processors"
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncsrc"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/syncnode"
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
@@ -57,7 +57,7 @@ func TestBackendLifetime(t *testing.T) {
 		DependencySetSource:   depSet,
 		SynchronousProcessors: true,
 		MockRun:               false,
-		SyncSources:           &syncsrc.CLISyncSources{},
+		SyncSources:           &syncnode.CLISyncNodes{},
 		Datadir:               dataDir,
 	}
 
diff --git a/op-supervisor/supervisor/backend/processors/l1_processor.go b/op-supervisor/supervisor/backend/processors/l1_processor.go
index 4f024fb599e2..e8b037b89123 100644
--- a/op-supervisor/supervisor/backend/processors/l1_processor.go
+++ b/op-supervisor/supervisor/backend/processors/l1_processor.go
@@ -19,6 +19,10 @@ type chainsDB interface {
 	UpdateFinalizedL1(finalized eth.BlockRef) error
 }
 
+type controller interface {
+	DeriveFromL1(eth.BlockRef) error
+}
+
 type L1Source interface {
 	L1BlockRefByNumber(ctx context.Context, number uint64) (eth.L1BlockRef, error)
 	L1BlockRefByLabel(ctx context.Context, label eth.BlockLabel) (eth.L1BlockRef, error)
@@ -34,19 +38,21 @@ type L1Processor struct {
 	currentNumber uint64
 	tickDuration  time.Duration
 
-	db chainsDB
+	db  chainsDB
+	snc controller
 
 	ctx    context.Context
 	cancel context.CancelFunc
 	wg     sync.WaitGroup
 }
 
-func NewL1Processor(log log.Logger, cdb chainsDB, client L1Source) *L1Processor {
+func NewL1Processor(log log.Logger, cdb chainsDB, snc controller, client L1Source) *L1Processor {
 	ctx, cancel := context.WithCancel(context.Background())
 	tickDuration := 6 * time.Second
 	return &L1Processor{
 		client:       client,
 		db:           cdb,
+		snc:          snc,
 		log:          log.New("service", "l1-processor"),
 		tickDuration: tickDuration,
 		ctx:          ctx,
@@ -143,9 +149,10 @@ func (p *L1Processor) work() error {
 		return err
 	}
 
-	// go drive derivation on this new L1 input
-	// only possible once bidirectional RPC and new derivers are in place
-	// could do this as a function callback to a more appropriate driver
+	// send the new L1 block to the sync nodes for derivation
+	if err := p.snc.DeriveFromL1(ref); err != nil {
+		return err
+	}
 
 	// update the target number
 	p.currentNumber = nextNumber
diff --git a/op-supervisor/supervisor/backend/processors/l1_processor_test.go b/op-supervisor/supervisor/backend/processors/l1_processor_test.go
index 528adf183da0..5eb78c6033fe 100644
--- a/op-supervisor/supervisor/backend/processors/l1_processor_test.go
+++ b/op-supervisor/supervisor/backend/processors/l1_processor_test.go
@@ -13,6 +13,17 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+type mockController struct {
+	deriveFromL1Fn func(ref eth.BlockRef) error
+}
+
+func (m *mockController) DeriveFromL1(ref eth.BlockRef) error {
+	if m.deriveFromL1Fn != nil {
+		return m.deriveFromL1Fn(ref)
+	}
+	return nil
+}
+
 type mockChainsDB struct {
 	recordNewL1Fn       func(ref eth.BlockRef) error
 	lastCommonL1Fn      func() (types.BlockSeal, error)
@@ -68,6 +79,7 @@ func TestL1Processor(t *testing.T) {
 		ctx, cancel := context.WithCancel(context.Background())
 		proc := &L1Processor{
 			log:           testlog.Logger(t, log.LvlInfo),
+			snc:           &mockController{},
 			client:        &mockL1BlockRefByNumberFetcher{},
 			currentNumber: 0,
 			tickDuration:  1 * time.Second,
@@ -101,7 +113,7 @@ func TestL1Processor(t *testing.T) {
 		// the error means the current number should still be 0
 		require.Equal(t, uint64(0), proc.currentNumber)
 	})
-	t.Run("Records new L1", func(t *testing.T) {
+	t.Run("Handles new L1", func(t *testing.T) {
 		proc := processorForTesting()
 		// return a new block number each time
 		num := uint64(0)
@@ -109,19 +121,89 @@ func TestL1Processor(t *testing.T) {
 			defer func() { num++ }()
 			return eth.L1BlockRef{Number: num}, nil
 		}
-		// confirm that recordNewL1 is called for each block number received
-		called := uint64(0)
+		// confirm that recordNewL1 is recordCalled for each block number received
+		recordCalled := uint64(0)
 		proc.db.(*mockChainsDB).recordNewL1Fn = func(ref eth.BlockRef) error {
-			require.Equal(t, called, ref.Number)
-			called++
+			require.Equal(t, recordCalled, ref.Number)
+			recordCalled++
+			return nil
+		}
+		// confirm that deriveFromL1 is called for each block number received
+		deriveCalled := uint64(0)
+		proc.snc.(*mockController).deriveFromL1Fn = func(ref eth.BlockRef) error {
+			require.Equal(t, deriveCalled, ref.Number)
+			deriveCalled++
 			return nil
 		}
 		proc.Start()
 		defer proc.Stop()
+		// the new L1 blocks should be recorded
 		require.Eventually(t, func() bool {
-			return called >= 1 && proc.currentNumber >= 1
+			return recordCalled >= 1 && proc.currentNumber >= 1
 		}, 10*time.Second, 100*time.Millisecond)
 
+		// confirm that the db record and derive call counts match
+		require.Equal(t, recordCalled, deriveCalled)
+	})
+	t.Run("Handles L1 record error", func(t *testing.T) {
+		proc := processorForTesting()
+		// return a new block number each time
+		num := uint64(0)
+		proc.client.(*mockL1BlockRefByNumberFetcher).l1BlockByNumberFn = func() (eth.L1BlockRef, error) {
+			defer func() { num++ }()
+			return eth.L1BlockRef{Number: num}, nil
+		}
+		// confirm that recordNewL1 is recordCalled for each block number received
+		recordCalled := 0
+		proc.db.(*mockChainsDB).recordNewL1Fn = func(ref eth.BlockRef) error {
+			recordCalled++
+			return fmt.Errorf("error")
+		}
+		// confirm that deriveFromL1 is called for each block number received
+		deriveCalled := 0
+		proc.snc.(*mockController).deriveFromL1Fn = func(ref eth.BlockRef) error {
+			deriveCalled++
+			return nil
+		}
+		proc.Start()
+		defer proc.Stop()
+		// because the record call fails, the current number should not be updated
+		require.Never(t, func() bool {
+			return recordCalled >= 1 && proc.currentNumber >= 1
+		}, 10*time.Second, 100*time.Millisecond)
+		// confirm derive was never called because the record call failed
+		require.Equal(t, 0, deriveCalled)
+	})
+	t.Run("Handles L1 derive error", func(t *testing.T) {
+		proc := processorForTesting()
+		// return a new block number each time
+		num := uint64(0)
+		proc.client.(*mockL1BlockRefByNumberFetcher).l1BlockByNumberFn = func() (eth.L1BlockRef, error) {
+			defer func() { num++ }()
+			return eth.L1BlockRef{Number: num}, nil
+		}
+		// confirm that recordNewL1 is recordCalled for each block number received
+		recordCalled := uint64(0)
+		proc.db.(*mockChainsDB).recordNewL1Fn = func(ref eth.BlockRef) error {
+			require.Equal(t, recordCalled, ref.Number)
+			recordCalled++
+			return nil
+		}
+		// confirm that deriveFromL1 is called for each block number received
+		deriveCalled := uint64(0)
+		proc.snc.(*mockController).deriveFromL1Fn = func(ref eth.BlockRef) error {
+			deriveCalled++
+			return fmt.Errorf("error")
+		}
+		proc.Start()
+		defer proc.Stop()
+		// because the derive call fails, the current number should not be updated
+		require.Never(t, func() bool {
+			return recordCalled >= 1 && proc.currentNumber >= 1
+		}, 10*time.Second, 100*time.Millisecond)
+		// confirm that the db record and derive call counts match
+		// (because the derive call fails after the record call)
+		require.Equal(t, recordCalled, deriveCalled)
 	})
 	t.Run("Updates L1 Finalized", func(t *testing.T) {
 		proc := processorForTesting()
diff --git a/op-supervisor/supervisor/backend/syncsrc/collection.go b/op-supervisor/supervisor/backend/syncnode/collection.go
similarity index 75%
rename from op-supervisor/supervisor/backend/syncsrc/collection.go
rename to op-supervisor/supervisor/backend/syncnode/collection.go
index 01c027f2fc93..838ebbc1a92c 100644
--- a/op-supervisor/supervisor/backend/syncsrc/collection.go
+++ b/op-supervisor/supervisor/backend/syncnode/collection.go
@@ -1,4 +1,4 @@
-package syncsrc
+package syncnode
 
 import (
 	"context"
@@ -11,16 +11,14 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/rpc"
 )
 
-// CLISyncSources is a bundle of CLI-specified (and thus stringified) sync-source options.
-// These sources can be loaded into SyncSourceSetup instances, to retrieve the active sync sources from.
-type CLISyncSources struct {
+type CLISyncNodes struct {
 	Endpoints      []string
 	JWTSecretPaths []string
 }
 
-var _ SyncSourceCollection = (*CLISyncSources)(nil)
+var _ SyncNodeCollection = (*CLISyncNodes)(nil)
 
-func (p *CLISyncSources) Load(ctx context.Context, logger log.Logger) ([]SyncSourceSetup, error) {
+func (p *CLISyncNodes) Load(ctx context.Context, logger log.Logger) ([]SyncNodeSetup, error) {
 	if err := p.Check(); err != nil { // sanity-check, in case the caller did not check.
 		return nil, err
 	}
@@ -39,7 +37,7 @@ func (p *CLISyncSources) Load(ctx context.Context, logger log.Logger) ([]SyncSou
 		}
 		secrets = append(secrets, secret)
 	}
-	setups := make([]SyncSourceSetup, 0, len(p.Endpoints))
+	setups := make([]SyncNodeSetup, 0, len(p.Endpoints))
 	for i, endpoint := range p.Endpoints {
 		var secret eth.Bytes32
 		if i >= len(secrets) {
@@ -53,7 +51,7 @@ func (p *CLISyncSources) Load(ctx context.Context, logger log.Logger) ([]SyncSou
 	return setups, nil
 }
 
-func (p *CLISyncSources) Check() error {
+func (p *CLISyncNodes) Check() error {
 	if len(p.Endpoints) == len(p.JWTSecretPaths) {
 		return nil
 	}
diff --git a/op-supervisor/supervisor/backend/syncnode/controller.go b/op-supervisor/supervisor/backend/syncnode/controller.go
new file mode 100644
index 000000000000..3e8d092c4159
--- /dev/null
+++ b/op-supervisor/supervisor/backend/syncnode/controller.go
@@ -0,0 +1,100 @@
+package syncnode
+
+import (
+	"context"
+	"fmt"
+	"sync"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/locks"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+type chainsDB interface {
+	UpdateLocalSafe(types.ChainID, eth.BlockRef, eth.BlockRef) error
+}
+
+// SyncNodeController handles the sync node operations across multiple sync nodes
+type SyncNodesController struct {
+	logger      log.Logger
+	controllers locks.RWMap[types.ChainID, SyncControl]
+
+	db chainsDB
+
+	depSet depset.DependencySet
+}
+
+// NewSyncNodeController creates a new SyncNodeController
+func NewSyncNodesController(l log.Logger, depset depset.DependencySet, db chainsDB) *SyncNodesController {
+	return &SyncNodesController{
+		logger: l,
+		depSet: depset,
+		db:     db,
+	}
+}
+
+func (snc *SyncNodesController) AttachNodeController(id types.ChainID, ctrl SyncControl) error {
+	if !snc.depSet.HasChain(id) {
+		return fmt.Errorf("chain %v not in dependency set", id)
+	}
+	snc.controllers.Set(id, ctrl)
+	return nil
+}
+
+// DeriveFromL1 derives the L2 blocks from the L1 block reference for all the chains
+// if any chain fails to derive, the first error is returned
+func (snc *SyncNodesController) DeriveFromL1(ref eth.BlockRef) error {
+	snc.logger.Debug("deriving from L1", "ref", ref)
+	returns := make(chan error, len(snc.depSet.Chains()))
+	wg := sync.WaitGroup{}
+	// for now this function just prints all the chain-ids of controlled nodes, as a placeholder
+	for _, chain := range snc.depSet.Chains() {
+		wg.Add(1)
+		go func() {
+			returns <- snc.DeriveToEnd(chain, ref)
+			wg.Done()
+		}()
+	}
+	wg.Wait()
+	// collect all errors
+	errors := []error{}
+	for i := 0; i < len(snc.depSet.Chains()); i++ {
+		err := <-returns
+		if err != nil {
+			errors = append(errors, err)
+		}
+	}
+	// log all errors, but only return the first one
+	if len(errors) > 0 {
+		snc.logger.Warn("sync nodes failed to derive from L1", "errors", errors)
+		return errors[0]
+	}
+	return nil
+}
+
+// DeriveToEnd derives the L2 blocks from the L1 block reference for a single chain
+// it will continue to derive until no more blocks are derived
+func (snc *SyncNodesController) DeriveToEnd(id types.ChainID, ref eth.BlockRef) error {
+	ctrl, ok := snc.controllers.Get(id)
+	if !ok {
+		snc.logger.Warn("missing controller for chain. Not attempting derivation", "chain", id)
+		return nil // maybe return an error?
+	}
+	for {
+		derived, err := ctrl.TryDeriveNext(context.Background(), ref)
+		if err != nil {
+			return err
+		}
+		// if no more blocks are derived, we are done
+		// (or something? this exact behavior is yet to be defined by the node)
+		if derived == (eth.BlockRef{}) {
+			return nil
+		}
+		// record the new L2 to the local database
+		if err := snc.db.UpdateLocalSafe(id, ref, derived); err != nil {
+			return err
+		}
+	}
+}
diff --git a/op-supervisor/supervisor/backend/syncnode/controller_test.go b/op-supervisor/supervisor/backend/syncnode/controller_test.go
new file mode 100644
index 000000000000..49565d3b6750
--- /dev/null
+++ b/op-supervisor/supervisor/backend/syncnode/controller_test.go
@@ -0,0 +1,205 @@
+package syncnode
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/backend/depset"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+
+type mockChainsDB struct {
+	updateLocalSafeFn func(chainID types.ChainID, ref eth.BlockRef, derived eth.BlockRef) error
+}
+
+func (m *mockChainsDB) UpdateLocalSafe(chainID types.ChainID, ref eth.BlockRef, derived eth.BlockRef) error {
+	if m.updateLocalSafeFn != nil {
+		return m.updateLocalSafeFn(chainID, ref, derived)
+	}
+	return nil
+}
+
+type mockSyncControl struct {
+	TryDeriveNextFn func(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error)
+}
+
+func (m *mockSyncControl) TryDeriveNext(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error) {
+	if m.TryDeriveNextFn != nil {
+		return m.TryDeriveNextFn(ctx, ref)
+	}
+	return eth.BlockRef{}, nil
+}
+func sampleDepSet(t *testing.T) depset.DependencySet {
+	depSet, err := depset.NewStaticConfigDependencySet(
+		map[types.ChainID]*depset.StaticConfigDependency{
+			types.ChainIDFromUInt64(900): {
+				ChainIndex:     900,
+				ActivationTime: 42,
+				HistoryMinTime: 100,
+			},
+			types.ChainIDFromUInt64(901): {
+				ChainIndex:     901,
+				ActivationTime: 30,
+				HistoryMinTime: 20,
+			},
+		})
+	require.NoError(t, err)
+	return depSet
+}
+
+// TestAttachNodeController tests the AttachNodeController function of the SyncNodesController.
+// Only controllers for chains in the dependency set can be attached.
+func TestAttachNodeController(t *testing.T) {
+	logger := log.New()
+	depSet := sampleDepSet(t)
+	controller := NewSyncNodesController(logger, depSet, nil)
+
+	require.Zero(t, controller.controllers.Len(), "controllers should be empty to start")
+
+	// Attach a controller for chain 900
+	ctrl := mockSyncControl{}
+	err := controller.AttachNodeController(types.ChainIDFromUInt64(900), &ctrl)
+	require.NoError(t, err)
+
+	require.Equal(t, 1, controller.controllers.Len(), "controllers should have 1 entry")
+
+	// Attach a controller for chain 901
+	ctrl2 := mockSyncControl{}
+	err = controller.AttachNodeController(types.ChainIDFromUInt64(901), &ctrl2)
+	require.NoError(t, err)
+
+	require.Equal(t, 2, controller.controllers.Len(), "controllers should have 2 entries")
+
+	// Attach a controller for chain 902 (which is not in the dependency set)
+	ctrl3 := mockSyncControl{}
+	err = controller.AttachNodeController(types.ChainIDFromUInt64(902), &ctrl3)
+	require.Error(t, err)
+	require.Equal(t, 2, controller.controllers.Len(), "controllers should still have 2 entries")
+}
+
+// TestDeriveFromL1 tests the DeriveFromL1 function of the SyncNodesController for multiple chains
+func TestDeriveFromL1(t *testing.T) {
+	logger := log.New()
+	depSet := sampleDepSet(t)
+
+	// keep track of the updates for each chain with the mock
+	updates := map[types.ChainID][]eth.BlockRef{}
+	mockChainsDB := mockChainsDB{}
+	updateMu := sync.Mutex{}
+	mockChainsDB.updateLocalSafeFn = func(chainID types.ChainID, ref eth.BlockRef, derived eth.BlockRef) error {
+		updateMu.Lock()
+		defer updateMu.Unlock()
+		updates[chainID] = append(updates[chainID], derived)
+		return nil
+	}
+	controller := NewSyncNodesController(logger, depSet, &mockChainsDB)
+
+	refA := eth.BlockRef{Number: 1}
+	refB := eth.BlockRef{Number: 2}
+	refC := eth.BlockRef{Number: 3}
+	derived := []eth.BlockRef{refA, refB, refC}
+
+	// Attach a controller for chain 900 with a mock controller function
+	ctrl1 := mockSyncControl{}
+	ctrl1i := 0
+	// the controller will return the next derived block each time TryDeriveNext is called
+	ctrl1.TryDeriveNextFn = func(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error) {
+		defer func() { ctrl1i++ }()
+		if ctrl1i >= len(derived) {
+			return eth.BlockRef{}, nil
+		}
+		return derived[ctrl1i], nil
+	}
+	err := controller.AttachNodeController(types.ChainIDFromUInt64(900), &ctrl1)
+	require.NoError(t, err)
+
+	// Attach a controller for chain 900 with a mock controller function
+	ctrl2 := mockSyncControl{}
+	ctrl2i := 0
+	// the controller will return the next derived block each time TryDeriveNext is called
+	ctrl2.TryDeriveNextFn = func(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error) {
+		defer func() { ctrl2i++ }()
+		if ctrl2i >= len(derived) {
+			return eth.BlockRef{}, nil
+		}
+		return derived[ctrl2i], nil
+	}
+	err = controller.AttachNodeController(types.ChainIDFromUInt64(901), &ctrl2)
+	require.NoError(t, err)
+
+	// Derive from L1
+	err = controller.DeriveFromL1(refA)
+	require.NoError(t, err)
+
+	// Check that the derived blocks were recorded for each chain
+	require.Equal(t, []eth.BlockRef{refA, refB, refC}, updates[types.ChainIDFromUInt64(900)])
+	require.Equal(t, []eth.BlockRef{refA, refB, refC}, updates[types.ChainIDFromUInt64(901)])
+
+}
+
+// TestDeriveFromL1Error tests that if a chain fails to derive from L1, the derived blocks up to the error are still recorded
+// for that chain, and all other chains that derived successfully are also recorded.
+func TestDeriveFromL1Error(t *testing.T) {
+	logger := log.New()
+	depSet := sampleDepSet(t)
+
+	// keep track of the updates for each chain with the mock
+	updates := map[types.ChainID][]eth.BlockRef{}
+	mockChainsDB := mockChainsDB{}
+	updateMu := sync.Mutex{}
+	mockChainsDB.updateLocalSafeFn = func(chainID types.ChainID, ref eth.BlockRef, derived eth.BlockRef) error {
+		updateMu.Lock()
+		defer updateMu.Unlock()
+		updates[chainID] = append(updates[chainID], derived)
+		return nil
+	}
+	controller := NewSyncNodesController(logger, depSet, &mockChainsDB)
+
+	refA := eth.BlockRef{Number: 1}
+	refB := eth.BlockRef{Number: 2}
+	refC := eth.BlockRef{Number: 3}
+	derived := []eth.BlockRef{refA, refB, refC}
+
+	// Attach a controller for chain 900 with a mock controller function
+	ctrl1 := mockSyncControl{}
+	ctrl1i := 0
+	// the controller will return the next derived block each time TryDeriveNext is called
+	ctrl1.TryDeriveNextFn = func(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error) {
+		defer func() { ctrl1i++ }()
+		if ctrl1i >= len(derived) {
+			return eth.BlockRef{}, nil
+		}
+		return derived[ctrl1i], nil
+	}
+	err := controller.AttachNodeController(types.ChainIDFromUInt64(900), &ctrl1)
+	require.NoError(t, err)
+
+	// Attach a controller for chain 900 with a mock controller function
+	ctrl2 := mockSyncControl{}
+	ctrl2i := 0
+	// this controller will error on the last derived block
+	ctrl2.TryDeriveNextFn = func(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error) {
+		defer func() { ctrl2i++ }()
+		if ctrl2i >= len(derived)-1 {
+			return eth.BlockRef{}, fmt.Errorf("error")
+		}
+		return derived[ctrl2i], nil
+	}
+	err = controller.AttachNodeController(types.ChainIDFromUInt64(901), &ctrl2)
+	require.NoError(t, err)
+
+	// Derive from L1
+	err = controller.DeriveFromL1(refA)
+	require.Error(t, err)
+
+	// Check that the derived blocks were recorded for each chain
+	// and in the case of the error, the derived blocks up to the error are recorded
+	require.Equal(t, []eth.BlockRef{refA, refB, refC}, updates[types.ChainIDFromUInt64(900)])
+	require.Equal(t, []eth.BlockRef{refA, refB}, updates[types.ChainIDFromUInt64(901)])
+
+}
diff --git a/op-supervisor/supervisor/backend/syncsrc/dial.go b/op-supervisor/supervisor/backend/syncnode/dial.go
similarity index 78%
rename from op-supervisor/supervisor/backend/syncsrc/dial.go
rename to op-supervisor/supervisor/backend/syncnode/dial.go
index 9356c9ea7ac0..16d61edb2ff6 100644
--- a/op-supervisor/supervisor/backend/syncsrc/dial.go
+++ b/op-supervisor/supervisor/backend/syncnode/dial.go
@@ -1,4 +1,4 @@
-package syncsrc
+package syncnode
 
 import (
 	"context"
@@ -13,16 +13,14 @@ import (
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
-// RPCDialSetup implements SyncSourceSetup by dialing an RPC
-// and providing an RPC-client binding to sync with.
 type RPCDialSetup struct {
 	JWTSecret eth.Bytes32
 	Endpoint  string
 }
 
-var _ SyncSourceSetup = (*RPCDialSetup)(nil)
+var _ SyncNodeSetup = (*RPCDialSetup)(nil)
 
-func (r *RPCDialSetup) Setup(ctx context.Context, logger log.Logger) (SyncSource, error) {
+func (r *RPCDialSetup) Setup(ctx context.Context, logger log.Logger) (SyncNode, error) {
 	ctx, cancel := context.WithTimeout(ctx, time.Second*60)
 	defer cancel()
 
@@ -35,7 +33,7 @@ func (r *RPCDialSetup) Setup(ctx context.Context, logger log.Logger) (SyncSource
 	if err != nil {
 		return nil, err
 	}
-	return &RPCSyncSource{
+	return &RPCSyncNode{
 		name: fmt.Sprintf("RPCSyncSource(%s)", r.Endpoint),
 		cl:   rpcCl,
 	}, nil
diff --git a/op-supervisor/supervisor/backend/syncsrc/iface.go b/op-supervisor/supervisor/backend/syncnode/iface.go
similarity index 51%
rename from op-supervisor/supervisor/backend/syncsrc/iface.go
rename to op-supervisor/supervisor/backend/syncnode/iface.go
index 3c93ce34988e..49943569f29d 100644
--- a/op-supervisor/supervisor/backend/syncsrc/iface.go
+++ b/op-supervisor/supervisor/backend/syncnode/iface.go
@@ -1,4 +1,4 @@
-package syncsrc
+package syncnode
 
 import (
 	"context"
@@ -11,19 +11,15 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
-// SyncSourceCollection turns a bundle of options into individual options for SyncSourceSetup.
-// This enables configurations to share properties.
-type SyncSourceCollection interface {
-	Load(ctx context.Context, logger log.Logger) ([]SyncSourceSetup, error)
+type SyncNodeCollection interface {
+	Load(ctx context.Context, logger log.Logger) ([]SyncNodeSetup, error)
 	Check() error
 }
 
-// SyncSourceSetup sets up a new active SyncSource. Setup may fail, e.g. an RPC endpoint is invalid.
-type SyncSourceSetup interface {
-	Setup(ctx context.Context, logger log.Logger) (SyncSource, error)
+type SyncNodeSetup interface {
+	Setup(ctx context.Context, logger log.Logger) (SyncNode, error)
 }
 
-// SyncSource provides an interface to interact with a source node to e.g. sync event data.
 type SyncSource interface {
 	BlockRefByNumber(ctx context.Context, number uint64) (eth.BlockRef, error)
 	FetchReceipts(ctx context.Context, blockHash common.Hash) (gethtypes.Receipts, error)
@@ -31,3 +27,12 @@ type SyncSource interface {
 	// String identifies the sync source
 	String() string
 }
+
+type SyncControl interface {
+	TryDeriveNext(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error)
+}
+
+type SyncNode interface {
+	SyncSource
+	SyncControl
+}
diff --git a/op-supervisor/supervisor/backend/syncsrc/rpc.go b/op-supervisor/supervisor/backend/syncnode/rpc.go
similarity index 59%
rename from op-supervisor/supervisor/backend/syncsrc/rpc.go
rename to op-supervisor/supervisor/backend/syncnode/rpc.go
index b139119f6f2b..624c462bd049 100644
--- a/op-supervisor/supervisor/backend/syncsrc/rpc.go
+++ b/op-supervisor/supervisor/backend/syncnode/rpc.go
@@ -1,4 +1,4 @@
-package syncsrc
+package syncnode
 
 import (
 	"context"
@@ -14,22 +14,23 @@ import (
 	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
-// RPCSyncSource is an active RPC, wrapped with bindings, implementing the SyncSource interface.
-type RPCSyncSource struct {
+type RPCSyncNode struct {
 	name string
 	cl   client.RPC
 }
 
-func NewRPCSyncSource(name string, cl client.RPC) *RPCSyncSource {
-	return &RPCSyncSource{
+func NewRPCSyncNode(name string, cl client.RPC) *RPCSyncNode {
+	return &RPCSyncNode{
 		name: name,
 		cl:   cl,
 	}
 }
 
-var _ SyncSource = (*RPCSyncSource)(nil)
+var _ SyncSource = (*RPCSyncNode)(nil)
+var _ SyncControl = (*RPCSyncNode)(nil)
+var _ SyncNode = (*RPCSyncNode)(nil)
 
-func (rs *RPCSyncSource) BlockRefByNumber(ctx context.Context, number uint64) (eth.BlockRef, error) {
+func (rs *RPCSyncNode) BlockRefByNumber(ctx context.Context, number uint64) (eth.BlockRef, error) {
 	var out *eth.BlockRef
 	err := rs.cl.CallContext(ctx, &out, "interop_blockRefByNumber", number)
 	if err != nil {
@@ -44,7 +45,7 @@ func (rs *RPCSyncSource) BlockRefByNumber(ctx context.Context, number uint64) (e
 	return *out, nil
 }
 
-func (rs *RPCSyncSource) FetchReceipts(ctx context.Context, blockHash common.Hash) (gethtypes.Receipts, error) {
+func (rs *RPCSyncNode) FetchReceipts(ctx context.Context, blockHash common.Hash) (gethtypes.Receipts, error) {
 	var out gethtypes.Receipts
 	err := rs.cl.CallContext(ctx, &out, "interop_fetchReceipts", blockHash)
 	if err != nil {
@@ -59,12 +60,18 @@ func (rs *RPCSyncSource) FetchReceipts(ctx context.Context, blockHash common.Has
 	return out, nil
 }
 
-func (rs *RPCSyncSource) ChainID(ctx context.Context) (types.ChainID, error) {
+func (rs *RPCSyncNode) ChainID(ctx context.Context) (types.ChainID, error) {
 	var chainID types.ChainID
 	err := rs.cl.CallContext(ctx, &chainID, "interop_chainID")
 	return chainID, err
 }
 
-func (rs *RPCSyncSource) String() string {
+func (rs *RPCSyncNode) String() string {
 	return rs.name
 }
+
+func (rs *RPCSyncNode) TryDeriveNext(ctx context.Context, ref eth.BlockRef) (eth.BlockRef, error) {
+	err := rs.cl.CallContext(ctx, &ref, "interop_tryDeriveNext")
+	// the node only returns an error currently
+	return eth.BlockRef{}, err
+}

From 71b29264e2a39f672ed95b51338a6a064f9fc7d3 Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 12 Dec 2024 00:04:27 -0500
Subject: [PATCH 442/451] fix: fuzz flake in CrossL2Inbox test (#13360)

Fixes a minor flake in CrossL2Inbox where the test can fail when
the target is the vm address itself.
---
 packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol       | 6 ++++++
 .../test/L2/L2ToL2CrossDomainMessenger.t.sol                | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
index 918b0f4b8da2..957c05332d7b 100644
--- a/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
+++ b/packages/contracts-bedrock/test/L2/CrossL2Inbox.t.sol
@@ -157,6 +157,9 @@ contract CrossL2InboxTest is Test {
         // Ensure that the target call is payable if value is sent
         if (_value > 0) assumePayable(_target);
 
+        // Ensure target is not a forge address.
+        assumeNotForgeAddress(_target);
+
         // Ensure is not a deposit transaction
         vm.mockCall({
             callee: Predeploys.L1_BLOCK_ATTRIBUTES,
@@ -413,6 +416,9 @@ contract CrossL2InboxTest is Test {
         // Ensure that the target call is payable if value is sent
         if (_value > 0) assumePayable(_target);
 
+        // Ensure target is not a forge address.
+        assumeNotForgeAddress(_target);
+
         // Ensure that the target call reverts
         vm.mockCallRevert({ callee: _target, msgValue: _value, data: _message, revertData: abi.encode(false) });
 
diff --git a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
index 0c064f686055..7c6302225fa5 100644
--- a/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2ToL2CrossDomainMessenger.t.sol
@@ -252,6 +252,9 @@ contract L2ToL2CrossDomainMessengerTest is Test {
         // Ensure that the target call is payable if value is sent
         if (_value > 0) assumePayable(_target);
 
+        // Ensure that the target is not a forge address.
+        assumeNotForgeAddress(_target);
+
         // Ensure that the target contract does not revert
         vm.mockCall({ callee: _target, msgValue: _value, data: _message, returnData: abi.encode(true) });
 

From 12862e7be07e733df831c44e7081863694d3caa7 Mon Sep 17 00:00:00 2001
From: Inphi <mlaw2501@gmail.com>
Date: Thu, 12 Dec 2024 00:53:34 -0500
Subject: [PATCH 443/451] op-deployer: Remove unsued disputegame bootstrap
 flags (#13369)

---
 op-deployer/pkg/deployer/bootstrap/flags.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/op-deployer/pkg/deployer/bootstrap/flags.go b/op-deployer/pkg/deployer/bootstrap/flags.go
index c7c720d310d5..71f64fcbc933 100644
--- a/op-deployer/pkg/deployer/bootstrap/flags.go
+++ b/op-deployer/pkg/deployer/bootstrap/flags.go
@@ -64,13 +64,13 @@ var (
 	}
 	MinProposalSizeBytesFlag = &cli.Uint64Flag{
 		Name:    MinProposalSizeBytesFlagName,
-		Usage:   "Minimum proposal size in bytes.",
+		Usage:   "PreimageOracle minimum proposal size in bytes.",
 		EnvVars: deployer.PrefixEnvVar("MIN_PROPOSAL_SIZE_BYTES"),
 		Value:   standard.MinProposalSizeBytes,
 	}
 	ChallengePeriodSecondsFlag = &cli.Uint64Flag{
 		Name:    ChallengePeriodSecondsFlagName,
-		Usage:   "Challenge period in seconds.",
+		Usage:   "PreimageOracle challenge period in seconds.",
 		EnvVars: deployer.PrefixEnvVar("CHALLENGE_PERIOD_SECONDS"),
 		Value:   standard.ChallengePeriodSeconds,
 	}
@@ -253,8 +253,6 @@ var DisputeGameFlags = []cli.Flag{
 	deployer.PrivateKeyFlag,
 	OutfileFlag,
 	ArtifactsLocatorFlag,
-	MinProposalSizeBytesFlag,
-	ChallengePeriodSecondsFlag,
 	VmFlag,
 	GameKindFlag,
 	GameTypeFlag,

From 68c2e0d3cc7eb88b2316d6c500a30035f4c41ffa Mon Sep 17 00:00:00 2001
From: smartcontracts <kelvin@optimism.io>
Date: Thu, 12 Dec 2024 00:58:09 -0500
Subject: [PATCH 444/451] feat: make CommonTest generic over Solidity versions
 (#13368)

Makes CommonTest generic over Solidity versions by removing
direct dependencies on 0.8.15 contracts. Updates some interfaces
to achieve this.
---
 .semgrep/rules/sol-rules.yaml                 | 11 +---
 .../ILegacyMintableERC20.sol                  |  0
 .../legacy/ILegacyMintableERC20Full.sol       | 28 ++++++++++
 .../universal/IOptimismMintableERC20Full.sol  | 38 +++++++++++++
 .../snapshots/semver-lock.json                | 20 +++----
 .../src/L1/L1StandardBridge.sol               |  4 +-
 .../src/L2/L2StandardBridge.sol               |  4 +-
 .../src/L2/L2StandardBridgeInterop.sol        |  4 +-
 .../src/universal/OptimismMintableERC20.sol   |  6 +-
 .../OptimismMintableERC20Factory.sol          |  4 +-
 .../src/universal/StandardBridge.sol          |  2 +-
 .../test/L2/L2StandardBridge.t.sol            |  8 ++-
 .../test/L2/L2StandardBridgeInterop.t.sol     |  9 +++
 .../test/legacy/LegacyMintableERC20.t.sol     |  2 +-
 .../test/setup/CommonTest.sol                 | 56 +++++++++++++------
 .../universal/OptimismMintableERC20.t.sol     |  2 +-
 16 files changed, 147 insertions(+), 51 deletions(-)
 rename packages/contracts-bedrock/interfaces/{universal => legacy}/ILegacyMintableERC20.sol (100%)
 create mode 100644 packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20Full.sol
 create mode 100644 packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20Full.sol

diff --git a/.semgrep/rules/sol-rules.yaml b/.semgrep/rules/sol-rules.yaml
index 177fabb6fa8d..314b8cc07979 100644
--- a/.semgrep/rules/sol-rules.yaml
+++ b/.semgrep/rules/sol-rules.yaml
@@ -84,18 +84,12 @@ rules:
     pattern-regex: function\s+\w+\s*\(\s*([^)]*?\b\w+\s+(?!_)(?!memory\b)(?!calldata\b)(?!storage\b)(?!payable\b)\w+\s*(?=,|\)))
     paths:
       exclude:
-        - packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC721.sol
-        - packages/contracts-bedrock/interfaces/universal/IWETH98.sol
-        - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
         - packages/contracts-bedrock/test
+        - packages/contracts-bedrock/interfaces
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
-        - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/interfaces/universal/IWETH.sol
         - packages/contracts-bedrock/src/universal/WETH98.sol
-        - packages/contracts-bedrock/interfaces/L2/ISuperchainWETH.sol
         - packages/contracts-bedrock/src/L2/SuperchainWETH.sol
-        - packages/contracts-bedrock/interfaces/governance/IGovernanceToken.sol
         - packages/contracts-bedrock/src/governance/GovernanceToken.sol
 
   - id: sol-style-return-arg-fmt
@@ -107,11 +101,10 @@ rules:
       exclude:
         - packages/contracts-bedrock/interfaces/dispute/IDelayedWETH.sol
         - op-chain-ops/script/testdata/scripts/ScriptExample.s.sol
+        - packages/contracts-bedrock/interfaces
         - packages/contracts-bedrock/test/safe-tools
         - packages/contracts-bedrock/scripts/libraries/Solarray.sol
         - packages/contracts-bedrock/scripts/interfaces/IGnosisSafe.sol
-        - packages/contracts-bedrock/interfaces/dispute/IPermissionedDisputeGame.sol
-        - packages/contracts-bedrock/interfaces/dispute/IFaultDisputeGame.sol
 
   - id: sol-style-doc-comment
     languages: [solidity]
diff --git a/packages/contracts-bedrock/interfaces/universal/ILegacyMintableERC20.sol b/packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20.sol
similarity index 100%
rename from packages/contracts-bedrock/interfaces/universal/ILegacyMintableERC20.sol
rename to packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20.sol
diff --git a/packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20Full.sol b/packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20Full.sol
new file mode 100644
index 000000000000..61db78679a36
--- /dev/null
+++ b/packages/contracts-bedrock/interfaces/legacy/ILegacyMintableERC20Full.sol
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+interface ILegacyMintableERC20Full {
+    event Approval(address indexed owner, address indexed spender, uint256 value);
+    event Burn(address indexed _account, uint256 _amount);
+    event Mint(address indexed _account, uint256 _amount);
+    event Transfer(address indexed from, address indexed to, uint256 value);
+
+    function allowance(address owner, address spender) external view returns (uint256);
+    function approve(address spender, uint256 amount) external returns (bool);
+    function balanceOf(address account) external view returns (uint256);
+    function burn(address _from, uint256 _amount) external;
+    function decimals() external view returns (uint8);
+    function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool);
+    function increaseAllowance(address spender, uint256 addedValue) external returns (bool);
+    function l1Token() external view returns (address);
+    function l2Bridge() external view returns (address);
+    function mint(address _to, uint256 _amount) external;
+    function name() external view returns (string memory);
+    function supportsInterface(bytes4 _interfaceId) external pure returns (bool);
+    function symbol() external view returns (string memory);
+    function totalSupply() external view returns (uint256);
+    function transfer(address to, uint256 amount) external returns (bool);
+    function transferFrom(address from, address to, uint256 amount) external returns (bool);
+
+    function __constructor__(address _l2Bridge, address _l1Token, string memory _name, string memory _symbol) external;
+}
diff --git a/packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20Full.sol b/packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20Full.sol
new file mode 100644
index 000000000000..b7de27d6f42b
--- /dev/null
+++ b/packages/contracts-bedrock/interfaces/universal/IOptimismMintableERC20Full.sol
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+interface IOptimismMintableERC20Full {
+    event Approval(address indexed owner, address indexed spender, uint256 value);
+    event Burn(address indexed account, uint256 amount);
+    event Mint(address indexed account, uint256 amount);
+    event Transfer(address indexed from, address indexed to, uint256 value);
+
+    function BRIDGE() external view returns (address);
+    function DOMAIN_SEPARATOR() external view returns (bytes32);
+    function PERMIT2() external pure returns (address);
+    function REMOTE_TOKEN() external view returns (address);
+    function allowance(address _owner, address _spender) external view returns (uint256);
+    function approve(address spender, uint256 amount) external returns (bool);
+    function balanceOf(address account) external view returns (uint256);
+    function bridge() external view returns (address);
+    function burn(address _from, uint256 _amount) external;
+    function decimals() external view returns (uint8);
+    function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool);
+    function increaseAllowance(address spender, uint256 addedValue) external returns (bool);
+    function l1Token() external view returns (address);
+    function l2Bridge() external view returns (address);
+    function mint(address _to, uint256 _amount) external;
+    function name() external view returns (string memory);
+    function nonces(address owner) external view returns (uint256);
+    function permit(address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s)
+        external;
+    function remoteToken() external view returns (address);
+    function supportsInterface(bytes4 _interfaceId) external pure returns (bool);
+    function symbol() external view returns (string memory);
+    function totalSupply() external view returns (uint256);
+    function transfer(address to, uint256 amount) external returns (bool);
+    function transferFrom(address from, address to, uint256 amount) external returns (bool);
+    function version() external view returns (string memory);
+
+    function __constructor__(address _bridge, address _remoteToken, string memory _name, string memory _symbol, uint8 _decimals) external;
+}
diff --git a/packages/contracts-bedrock/snapshots/semver-lock.json b/packages/contracts-bedrock/snapshots/semver-lock.json
index 2878c4117c40..bf30290d4503 100644
--- a/packages/contracts-bedrock/snapshots/semver-lock.json
+++ b/packages/contracts-bedrock/snapshots/semver-lock.json
@@ -12,8 +12,8 @@
     "sourceCodeHash": "0x48f4e1db42f82490e91fd33b05117b05c072444ed53bbd4e06e742d330a422bb"
   },
   "src/L1/L1StandardBridge.sol": {
-    "initCodeHash": "0x9037e1930606d8cd092738bf28dda74e8f993aade26ae5a79a9e1fe2cb1d8513",
-    "sourceCodeHash": "0x5b3dc434f58afd7667f82b8fdfdbea488441be0bae8bdff15cfc5a42ce670cc1"
+    "initCodeHash": "0x1f9b323a6e1e55a8089bb4de7b7b82d608bccc07e574d79cc690e117f02d0cda",
+    "sourceCodeHash": "0xb58db3988e7b31467983b91c402e25b00c74c38d5be92eb14e381979eb996dbd"
   },
   "src/L1/L2OutputOracle.sol": {
     "initCodeHash": "0x0e0573841e43e4c5f0df5839db2bdf387f29fed7c830f05960542e7d7109ed4a",
@@ -88,12 +88,12 @@
     "sourceCodeHash": "0xc7258cb394333527bfc58d0a8ba6bd9d90b46b60ace20a500d94192fea60aef4"
   },
   "src/L2/L2StandardBridge.sol": {
-    "initCodeHash": "0x7d2089948a373c62cdae80f329d6882eea450f2048f5ad45dbcceaaf37685d80",
-    "sourceCodeHash": "0xd64cf85ff5ecc1bf368d16532a9e29ba2dfc0f5456bbd3f9f05212c9120a2ed1"
+    "initCodeHash": "0x85d7cc69dfe340ffeee00d5a0524a199c11078504aa8007903c86572bd34a5c9",
+    "sourceCodeHash": "0x411d8cf2f9ef44949962aaed71c6b40eb4bb93768888632fa8330bf249c2301b"
   },
   "src/L2/L2StandardBridgeInterop.sol": {
-    "initCodeHash": "0x024711e1689bedcdb1e9de8b1c4a440a911634a0ce0a384246b4f9cd683a23f3",
-    "sourceCodeHash": "0xb92682bb93a87c22e6a2506b64ff609b76376a7d09f514125173c6792c354fc4"
+    "initCodeHash": "0x46e2d315b8e880f20a5c0ab5579542e6c68461e8f5202a5a5bf8c765fd8b629f",
+    "sourceCodeHash": "0x97fdf7168d578dc489deb6f4098de765d1019f4be6b6aaa176457947f7bc8397"
   },
   "src/L2/L2ToL1MessagePasser.sol": {
     "initCodeHash": "0xf9d82084dcef31a3737a76d8ee4e5842ea190d0f77ed4678adb3bbb95217050f",
@@ -192,12 +192,12 @@
     "sourceCodeHash": "0x918965e52bbd358ac827ebe35998f5d8fa5ca77d8eb9ab8986b44181b9aaa48a"
   },
   "src/universal/OptimismMintableERC20.sol": {
-    "initCodeHash": "0x51346d105fb0ebeb8733add0d53048b5d3d6f2d762c6bb446616c7f5da5eb026",
-    "sourceCodeHash": "0x876c716f9159909890eef3ffd3348a7f329af07e2899ae5ddc4a7809a3b753ce"
+    "initCodeHash": "0xc3289416829b252c830ad7d389a430986a7404df4fe0be37cb19e1c40907f047",
+    "sourceCodeHash": "0xf5e29dd5c750ea935c7281ec916ba5277f5610a0a9e984e53ae5d5245b3cf2f4"
   },
   "src/universal/OptimismMintableERC20Factory.sol": {
-    "initCodeHash": "0x080b30bbf556e8782dd2b355d5c9889324cf2ed1f9e6aca22a2e4dc42fab8ce7",
-    "sourceCodeHash": "0x47158ca0a9278bf367c4eebdb184aa31332f3b5a504f5147cf1c14777d9106ec"
+    "initCodeHash": "0xb90f9fa00ba07ade844594d0d7fa6b82458f934eb808a0538e6ff1b15a640c42",
+    "sourceCodeHash": "0x1a90221ddd0cfea197a29a3d66464c547b0ced9cffc92092c60698c89e68149c"
   },
   "src/universal/OptimismMintableERC721.sol": {
     "initCodeHash": "0xa43e7ffce142c0f2ae6ebe22decdf146dd39246830bec5cbd7903b32c2599048",
diff --git a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
index a2747096717e..43cc238a9624 100644
--- a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
@@ -75,8 +75,8 @@ contract L1StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 2.2.1-beta.3
-    string public constant version = "2.2.1-beta.3";
+    /// @custom:semver 2.2.1-beta.4
+    string public constant version = "2.2.1-beta.4";
 
     /// @notice Address of the SuperchainConfig contract.
     ISuperchainConfig public superchainConfig;
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
index 02fac4ee1dda..102671e49d7d 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
@@ -58,9 +58,9 @@ contract L2StandardBridge is StandardBridge, ISemver {
     );
 
     /// @notice Semantic version.
-    /// @custom:semver 1.11.1-beta.5
+    /// @custom:semver 1.11.1-beta.6
     function version() public pure virtual returns (string memory) {
-        return "1.11.1-beta.5";
+        return "1.11.1-beta.6";
     }
 
     /// @notice Constructs the L2StandardBridge contract.
diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
index be7323e0953d..d668d9410568 100644
--- a/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol
@@ -40,9 +40,9 @@ contract L2StandardBridgeInterop is L2StandardBridge {
     event Converted(address indexed from, address indexed to, address indexed caller, uint256 amount);
 
     /// @notice Semantic version.
-    /// @custom:semver +interop-beta.4
+    /// @custom:semver +interop-beta.5
     function version() public pure override returns (string memory) {
-        return string.concat(super.version(), "+interop-beta.4");
+        return string.concat(super.version(), "+interop-beta.5");
     }
 
     /// @notice Converts `amount` of `from` token to `to` token.
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
index 62aaf45b2fc3..93ee9b9269ab 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20.sol
@@ -12,7 +12,7 @@ import { Preinstalls } from "src/libraries/Preinstalls.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import { ISemver } from "interfaces/universal/ISemver.sol";
 import { IOptimismMintableERC20 } from "interfaces/universal/IOptimismMintableERC20.sol";
-import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/legacy/ILegacyMintableERC20.sol";
 
 /// @title OptimismMintableERC20
 /// @notice OptimismMintableERC20 is a standard extension of the base ERC20 token contract designed
@@ -47,8 +47,8 @@ contract OptimismMintableERC20 is ERC20Permit, ISemver {
     }
 
     /// @notice Semantic version.
-    /// @custom:semver 1.4.0-beta.4
-    string public constant version = "1.4.0-beta.4";
+    /// @custom:semver 1.4.0-beta.5
+    string public constant version = "1.4.0-beta.5";
 
     /// @notice Getter function for the permit2 address. It deterministically deployed
     ///         so it will always be at the same address. It is also included as a preinstall,
diff --git a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
index 62d2de8e7f3c..e62e5826526f 100644
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
@@ -51,8 +51,8 @@ contract OptimismMintableERC20Factory is ISemver, Initializable, IOptimismERC20F
     ///         the OptimismMintableERC20 token contract since this contract
     ///         is responsible for deploying OptimismMintableERC20 contracts.
     /// @notice Semantic version.
-    /// @custom:semver 1.10.1-beta.6
-    string public constant version = "1.10.1-beta.6";
+    /// @custom:semver 1.10.1-beta.7
+    string public constant version = "1.10.1-beta.7";
 
     /// @notice Constructs the OptimismMintableERC20Factory contract.
     constructor() {
diff --git a/packages/contracts-bedrock/src/universal/StandardBridge.sol b/packages/contracts-bedrock/src/universal/StandardBridge.sol
index ff01560ad1a8..51316b82dac5 100644
--- a/packages/contracts-bedrock/src/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/StandardBridge.sol
@@ -14,7 +14,7 @@ import { Constants } from "src/libraries/Constants.sol";
 // Interfaces
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IOptimismMintableERC20 } from "interfaces/universal/IOptimismMintableERC20.sol";
-import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/legacy/ILegacyMintableERC20.sol";
 import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
 
 /// @custom:upgradeable
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
index f7b61083e249..9803bb6fe184 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridge.t.sol
@@ -46,6 +46,12 @@ contract L2StandardBridge_Test is CommonTest {
         assertEq(address(l2StandardBridge.otherBridge()), address(l1StandardBridge));
     }
 
+    /// @notice Tests that the version function returns a valid string. We avoid testing the
+    ///         specific value of the string as it changes frequently.
+    function test_version_succeeds() external view {
+        assert(bytes(l2StandardBridge.version()).length > 0);
+    }
+
     /// @dev Ensures that the L2StandardBridge is always not paused. The pausability
     ///      happens on L1 and not L2.
     function test_paused_succeeds() external view {
@@ -413,7 +419,7 @@ contract PreBridgeERC20To is CommonTest {
     // so they should share the same setup and expectEmit calls
     function _preBridgeERC20To(bool _isLegacy, address _l2Token) internal {
         deal(_l2Token, alice, 100, true);
-        assertEq(ERC20(L2Token).balanceOf(alice), 100);
+        assertEq(L2Token.balanceOf(alice), 100);
         uint256 nonce = l2CrossDomainMessenger.messageNonce();
         bytes memory message =
             abi.encodeCall(IStandardBridge.finalizeBridgeERC20, (address(L1Token), _l2Token, alice, bob, 100, hex""));
diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
index a57c38a644d7..39e84556b35e 100644
--- a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
+++ b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol
@@ -50,6 +50,15 @@ contract L2StandardBridgeInterop_Test is CommonTest {
     }
 }
 
+/// @notice Test suite for getter functions.
+contract L2StandardBridgeInterop_Getters_Test is L2StandardBridgeInterop_Test {
+    /// @notice Tests that the version function returns a valid string. We avoid testing the
+    ///         specific value of the string as it changes frequently.
+    function test_version_succeeds() external view {
+        assert(bytes(l2StandardBridge.version()).length > 0);
+    }
+}
+
 /// @notice Test suite when converting from a legacy token to a OptimismSuperchainERC20 token
 contract L2StandardBridgeInterop_LegacyToSuper_Test is L2StandardBridgeInterop_Test {
     /// @notice Set up the test for converting from a legacy token to a OptimismSuperchainERC20 token
diff --git a/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol b/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
index 07f43cf5a610..4e3dc0c606eb 100644
--- a/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
+++ b/packages/contracts-bedrock/test/legacy/LegacyMintableERC20.t.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "test/setup/CommonTest.sol";
 
 import { LegacyMintableERC20 } from "src/legacy/LegacyMintableERC20.sol";
-import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/legacy/ILegacyMintableERC20.sol";
 
 contract LegacyMintableERC20_Test is CommonTest {
     LegacyMintableERC20 legacyMintableERC20;
diff --git a/packages/contracts-bedrock/test/setup/CommonTest.sol b/packages/contracts-bedrock/test/setup/CommonTest.sol
index 93ede20b629e..cdee564672f0 100644
--- a/packages/contracts-bedrock/test/setup/CommonTest.sol
+++ b/packages/contracts-bedrock/test/setup/CommonTest.sol
@@ -1,14 +1,26 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.15;
+pragma solidity ^0.8.0;
 
+// Forge
 import { Test } from "forge-std/Test.sol";
+
+// Testing
 import { Setup } from "test/setup/Setup.sol";
 import { Events } from "test/setup/Events.sol";
 import { FFIInterface } from "test/setup/FFIInterface.sol";
-import { Constants } from "src/libraries/Constants.sol";
+
+// Scripts
+import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
+
+// Contracts
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
-import { LegacyMintableERC20 } from "src/legacy/LegacyMintableERC20.sol";
+
+// Libraries
+import { Constants } from "src/libraries/Constants.sol";
+
+// Interfaces
+import { IOptimismMintableERC20Full } from "interfaces/universal/IOptimismMintableERC20Full.sol";
+import { ILegacyMintableERC20Full } from "interfaces/legacy/ILegacyMintableERC20Full.sol";
 
 /// @title CommonTest
 /// @dev An extenstion to `Test` that sets up the optimism smart contracts.
@@ -27,11 +39,11 @@ contract CommonTest is Test, Setup, Events {
 
     ERC20 L1Token;
     ERC20 BadL1Token;
-    OptimismMintableERC20 L2Token;
-    LegacyMintableERC20 LegacyL2Token;
+    IOptimismMintableERC20Full L2Token;
+    ILegacyMintableERC20Full LegacyL2Token;
     ERC20 NativeL2Token;
     ERC20 BadL2Token;
-    OptimismMintableERC20 RemoteL1Token;
+    IOptimismMintableERC20Full RemoteL1Token;
 
     function setUp() public virtual override {
         alice = makeAddr("alice");
@@ -83,16 +95,26 @@ contract CommonTest is Test, Setup, Events {
     function bridgeInitializerSetUp() public {
         L1Token = new ERC20("Native L1 Token", "L1T");
 
-        LegacyL2Token = new LegacyMintableERC20({
-            _l2Bridge: address(l2StandardBridge),
-            _l1Token: address(L1Token),
-            _name: string.concat("LegacyL2-", L1Token.name()),
-            _symbol: string.concat("LegacyL2-", L1Token.symbol())
-        });
+        LegacyL2Token = ILegacyMintableERC20Full(
+            DeployUtils.create1({
+                _name: "LegacyMintableERC20",
+                _args: DeployUtils.encodeConstructor(
+                    abi.encodeCall(
+                        ILegacyMintableERC20Full.__constructor__,
+                        (
+                            address(l2StandardBridge),
+                            address(L1Token),
+                            string.concat("LegacyL2-", L1Token.name()),
+                            string.concat("LegacyL2-", L1Token.symbol())
+                        )
+                    )
+                )
+            })
+        );
         vm.label(address(LegacyL2Token), "LegacyMintableERC20");
 
         // Deploy the L2 ERC20 now
-        L2Token = OptimismMintableERC20(
+        L2Token = IOptimismMintableERC20Full(
             l2OptimismMintableERC20Factory.createStandardL2Token(
                 address(L1Token),
                 string(abi.encodePacked("L2-", L1Token.name())),
@@ -100,7 +122,7 @@ contract CommonTest is Test, Setup, Events {
             )
         );
 
-        BadL2Token = OptimismMintableERC20(
+        BadL2Token = ERC20(
             l2OptimismMintableERC20Factory.createStandardL2Token(
                 address(1),
                 string(abi.encodePacked("L2-", L1Token.name())),
@@ -110,7 +132,7 @@ contract CommonTest is Test, Setup, Events {
 
         NativeL2Token = new ERC20("Native L2 Token", "L2T");
 
-        RemoteL1Token = OptimismMintableERC20(
+        RemoteL1Token = IOptimismMintableERC20Full(
             l1OptimismMintableERC20Factory.createStandardL2Token(
                 address(NativeL2Token),
                 string(abi.encodePacked("L1-", NativeL2Token.name())),
@@ -118,7 +140,7 @@ contract CommonTest is Test, Setup, Events {
             )
         );
 
-        BadL1Token = OptimismMintableERC20(
+        BadL1Token = ERC20(
             l1OptimismMintableERC20Factory.createStandardL2Token(
                 address(1),
                 string(abi.encodePacked("L1-", NativeL2Token.name())),
diff --git a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
index 4925c801885d..9abe08170bde 100644
--- a/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
+++ b/packages/contracts-bedrock/test/universal/OptimismMintableERC20.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { CommonTest } from "test/setup/CommonTest.sol";
 import { IOptimismMintableERC20 } from "interfaces/universal/IOptimismMintableERC20.sol";
-import { ILegacyMintableERC20 } from "interfaces/universal/ILegacyMintableERC20.sol";
+import { ILegacyMintableERC20 } from "interfaces/legacy/ILegacyMintableERC20.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 contract OptimismMintableERC20_Test is CommonTest {

From d386df3204406e2be9e47413289dd27f83059884 Mon Sep 17 00:00:00 2001
From: Maurelian <john@oplabs.co>
Date: Thu, 12 Dec 2024 10:11:47 -0500
Subject: [PATCH 445/451] feat: Move proposeAnotherOutput to L2OutputOracle
 specific test file. (#13366)

* feat: Move proposeAnotherOutput to L2OutputOracle specific test file.

* fix: gas snapshot
---
 .../contracts-bedrock/snapshots/.gas-snapshot |  6 ++---
 .../test/L1/L2OutputOracle.t.sol              | 22 +++++++++++++++++++
 .../test/setup/CommonTest.sol                 | 22 -------------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/contracts-bedrock/snapshots/.gas-snapshot b/packages/contracts-bedrock/snapshots/.gas-snapshot
index 2ab3157a714e..69ebba8c4c31 100644
--- a/packages/contracts-bedrock/snapshots/.gas-snapshot
+++ b/packages/contracts-bedrock/snapshots/.gas-snapshot
@@ -5,7 +5,7 @@ GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_b
 GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158531)
 GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369280)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967465)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967420)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564398)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076613)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467098)
@@ -13,5 +13,5 @@ GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 351280
 GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72664)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68422)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68986)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155565)
\ No newline at end of file
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 69031)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155610)
\ No newline at end of file
diff --git a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
index e4d53ddd9e78..4c4d5692c549 100644
--- a/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
+++ b/packages/contracts-bedrock/test/L1/L2OutputOracle.t.sol
@@ -23,6 +23,28 @@ contract L2OutputOracle_TestBase is CommonTest {
         super.setUp();
     }
 
+    /// @dev Helper function to propose an output.
+    function proposeAnotherOutput() public {
+        bytes32 proposedOutput2 = keccak256(abi.encode());
+        uint256 nextBlockNumber = l2OutputOracle.nextBlockNumber();
+        uint256 nextOutputIndex = l2OutputOracle.nextOutputIndex();
+        warpToProposeTime(nextBlockNumber);
+        uint256 proposedNumber = l2OutputOracle.latestBlockNumber();
+
+        uint256 submissionInterval = deploy.cfg().l2OutputOracleSubmissionInterval();
+        // Ensure the submissionInterval is enforced
+        assertEq(nextBlockNumber, proposedNumber + submissionInterval);
+
+        vm.roll(nextBlockNumber + 1);
+
+        vm.expectEmit(true, true, true, true);
+        emit OutputProposed(proposedOutput2, nextOutputIndex, nextBlockNumber, block.timestamp);
+
+        address proposer = deploy.cfg().l2OutputOracleProposer();
+        vm.prank(proposer);
+        l2OutputOracle.proposeL2Output(proposedOutput2, nextBlockNumber, 0, 0);
+    }
+
     /// @dev Tests that constructor sets the initial values correctly.
     function test_constructor_succeeds() external {
         IL2OutputOracle oracleImpl = IL2OutputOracle(address(new L2OutputOracle()));
diff --git a/packages/contracts-bedrock/test/setup/CommonTest.sol b/packages/contracts-bedrock/test/setup/CommonTest.sol
index cdee564672f0..d887a098aefd 100644
--- a/packages/contracts-bedrock/test/setup/CommonTest.sol
+++ b/packages/contracts-bedrock/test/setup/CommonTest.sol
@@ -170,28 +170,6 @@ contract CommonTest is Test, Setup, Events {
         vm.warp(l2OutputOracle.computeL2Timestamp(_nextBlockNumber) + 1);
     }
 
-    /// @dev Helper function to propose an output.
-    function proposeAnotherOutput() public {
-        bytes32 proposedOutput2 = keccak256(abi.encode());
-        uint256 nextBlockNumber = l2OutputOracle.nextBlockNumber();
-        uint256 nextOutputIndex = l2OutputOracle.nextOutputIndex();
-        warpToProposeTime(nextBlockNumber);
-        uint256 proposedNumber = l2OutputOracle.latestBlockNumber();
-
-        uint256 submissionInterval = deploy.cfg().l2OutputOracleSubmissionInterval();
-        // Ensure the submissionInterval is enforced
-        assertEq(nextBlockNumber, proposedNumber + submissionInterval);
-
-        vm.roll(nextBlockNumber + 1);
-
-        vm.expectEmit(true, true, true, true);
-        emit OutputProposed(proposedOutput2, nextOutputIndex, nextBlockNumber, block.timestamp);
-
-        address proposer = deploy.cfg().l2OutputOracleProposer();
-        vm.prank(proposer);
-        l2OutputOracle.proposeL2Output(proposedOutput2, nextBlockNumber, 0, 0);
-    }
-
     function enableLegacyContracts() public {
         // Check if the system has already been deployed, based off of the heuristic that alice and bob have not been
         // set by the `setUp` function yet.

From feab024547dd52c4429adfe9a05a52239f96fa27 Mon Sep 17 00:00:00 2001
From: bendanzhentan <455462586@qq.com>
Date: Fri, 13 Dec 2024 05:41:29 +0800
Subject: [PATCH 446/451] feat: improve logging of
 interop-devnet/create-chains.sh (#13352)

---
 interop-devnet/create-chains.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/interop-devnet/create-chains.sh b/interop-devnet/create-chains.sh
index 05e44e67ff21..b5ea011c63d1 100755
--- a/interop-devnet/create-chains.sh
+++ b/interop-devnet/create-chains.sh
@@ -2,11 +2,16 @@
 
 set -eu
 
+export OP_INTEROP_MNEMONIC="test test test test test test test test test test test junk"
+
+log_info() { echo "[INFO] $1"; }
+log_error() { echo "[ERROR] $1" >&2; }
+
 # Run this with workdir set as root of the repo
 if [ -f "../mise.toml" ]; then
-    echo "Running create-chains script."
+    log_info "Running create-chains script."
 else
-    echo "Cannot run create-chains script, must be in interop-devnet dir, but currently in:"
+    log_error "Cannot run create-chains script, must be in interop-devnet dir, but currently in:"
     pwd
     exit 1
 fi
@@ -16,14 +21,12 @@ cd ..
 
 # Check if already created
 if [ -d ".devnet-interop" ]; then
-    echo "Already created chains."
+    log_error "Already created chains. Cleanup .devnet-interop dir if you want to force a re-creation."
     exit 1
 else
-    echo "Creating new interop devnet chain configs"
+    log_info "Creating new interop devnet chain configs"
 fi
 
-export OP_INTEROP_MNEMONIC="test test test test test test test test test test test junk"
-
 go run ./op-node/cmd interop dev-setup \
   --artifacts-dir=packages/contracts-bedrock/forge-artifacts \
   --foundry-dir=packages/contracts-bedrock \
@@ -48,7 +51,7 @@ eth2-testnet-genesis deneb \
   --eth1-withdrawal-address=0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
   --eth1-match-genesis-time
 
-echo "Writing env files now..."
+log_info "Writing env files now..."
 
 # write env files for each L2 service
 
@@ -74,4 +77,4 @@ echo "OP_PROPOSER_GAME_FACTORY_ADDRESS=$(jq -r .DisputeGameFactoryProxy .devnet-
 # batcher
 echo "OP_BATCHER_PRIVATE_KEY=$($key_cmd --name=batcher)" >> "$chain_env/op-batcher.env"
 
-echo "Interop devnet setup is complete!"
+log_info "Interop devnet setup is complete!"

From 0c0f7cff9f3a5c1090d2be68c52e12fddf6b7b8a Mon Sep 17 00:00:00 2001
From: Mark Tyneway <mark.tyneway@gmail.com>
Date: Thu, 12 Dec 2024 17:19:42 -0600
Subject: [PATCH 447/451] contracts-bedrock: default to governance being off
 (#13377)

To prevent people from accidentally deploying GovToken with the same
name as OP colliding with OP Mainnet's token, turn off by default.
`op-deployer` should be doing this already, just doing this for people
who deploy through the legacy path.

See https://github.com/celo-org/optimism/pull/280#discussion_r1882874523
for context.
---
 packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
index be5f95ef39ca..0eed85d9511c 100644
--- a/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
+++ b/packages/contracts-bedrock/scripts/deploy/DeployConfig.s.sol
@@ -141,7 +141,7 @@ contract DeployConfig is Script {
         basefeeScalar = uint32(_readOr(_json, "$.gasPriceOracleBaseFeeScalar", 1368));
         blobbasefeeScalar = uint32(_readOr(_json, "$.gasPriceOracleBlobBaseFeeScalar", 810949));
 
-        enableGovernance = stdJson.readBool(_json, "$.enableGovernance");
+        enableGovernance = _readOr(_json, "$.enableGovernance", false);
         eip1559Denominator = stdJson.readUint(_json, "$.eip1559Denominator");
         eip1559Elasticity = stdJson.readUint(_json, "$.eip1559Elasticity");
         systemConfigStartBlock = stdJson.readUint(_json, "$.systemConfigStartBlock");

From 8bf7ff60f34a7c5082cec5c56bed1f76cc1893ad Mon Sep 17 00:00:00 2001
From: George Knee <georgeknee@googlemail.com>
Date: Fri, 13 Dec 2024 11:13:54 +0000
Subject: [PATCH 448/451] superchain: update registry dependency (#13383)

Brings in minato sepolia holocene_time
---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 2b8bf3ddf3a5..49cc15545b64 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/crate-crypto/go-kzg-4844 v1.0.0
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
-	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241210175229-327d7af91761
+	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241213092551-33a63fce8214
 	github.com/ethereum/go-ethereum v1.14.11
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
@@ -251,7 +251,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.4-rc.2
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101411.4-rc.4
 
 //replace github.com/ethereum/go-ethereum => ../go-ethereum
 
diff --git a/go.sum b/go.sum
index 9975b7ddaa47..355a484d01aa 100644
--- a/go.sum
+++ b/go.sum
@@ -189,10 +189,10 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
 github.com/elastic/gosigar v0.14.3/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.101411.4-rc.2 h1:4u4RUlN3iwwRxYfHGfihjZ0fwY1bfCjFH5/4hVzrwCE=
-github.com/ethereum-optimism/op-geth v1.101411.4-rc.2/go.mod h1:1InG/wgdGY/PgH8BSkjUBd6DfoSHyEN3/v0OTFyywsw=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241210175229-327d7af91761 h1:sk8fDY7QJOhP/mOnEjMj9K8G+3dmPp5MVZsJu4lhZ2E=
-github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241210175229-327d7af91761/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
+github.com/ethereum-optimism/op-geth v1.101411.4-rc.4 h1:3K7tSLwis5Z03G8Th5j5FlcyHYVSG8YybNw8Dtv+jyc=
+github.com/ethereum-optimism/op-geth v1.101411.4-rc.4/go.mod h1:n6VeI9cKFxmXCauD7Ji9lgTAg+2TYGLZu5AXgVJB4tk=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241213092551-33a63fce8214 h1:94dIMFDCafAQ3FCC1pryuhgfZc1jPoDwK4xSMOPshN8=
+github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20241213092551-33a63fce8214/go.mod h1:9feO8jcL5OZ1tvRjEfNAHz4Aggvd6373l+ZxmZZAyZs=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
 github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=

From ebda32a2fce83e51cd8c29c9f4a6a71979e8dcb3 Mon Sep 17 00:00:00 2001
From: Javed Khan <tuxcanfly@gmail.com>
Date: Fri, 21 Apr 2023 08:45:01 +0530
Subject: [PATCH 449/451] da: use celestia as da

build(deps): update go-da to v0.1.0

build(deps): update go-da to v0.2.0; add ctx

da: add cli flags for da config

da: add get timeout to da client

build(deps): bump local-celestia-devnet to v0.12.7

fix(cli): fix da rpc check

fix(cli): check return err

fix(da): blob data source reuse DataFromEVMTransactions

Cleanup Github CI workflow (#478)

Add Github CI (#472)

da: reuse useblobs for multiframetxs (#452)

da: add gas price flag (#451)

da: try using blobdata for eth fallback

chore: add log for multiframetxs setting

feat: enable multi frame txs and frame size setting for calldata txs

da: use env auth token if set

chore(op-batcher): refactor EthFallbackDisabledFlagName

feat(op-batcher): support disable eth fallback

da: upgrade to go-da v0.5.0

update `go.mod`
---
 .github/workflows/cannon.yml                  | 253 ++++++++++++++++++
 .github/workflows/ci.yml                      | 106 ++++++++
 .github/workflows/docker.yml                  | 106 ++++++++
 .github/workflows/fork-sync.yml               |  18 ++
 .github/workflows/validate.yml                |  28 ++
 README.md                                     |  81 +++++-
 bedrock-devnet/devnet/__init__.py             |  15 +-
 .../understand/Celestia-logo-color-color.svg  |   1 +
 go.mod                                        |  14 +-
 go.sum                                        |  29 +-
 op-batcher/batcher/config.go                  |  14 +
 op-batcher/batcher/driver.go                  |  66 ++++-
 op-batcher/batcher/service.go                 |  30 +++
 op-batcher/flags/flags.go                     |  17 +-
 op-celestia/cli.go                            | 120 +++++++++
 op-celestia/da.go                             |  10 +
 op-celestia/da_client.go                      |  39 +++
 op-e2e/system/e2esys/setup.go                 |   4 +
 op-node/flags/flags.go                        |   2 +
 op-node/node/config.go                        |   6 +
 op-node/node/node.go                          |   7 +
 op-node/rollup/derive/blob_data_source.go     |  21 +-
 .../rollup/derive/blob_data_source_test.go    |  15 +-
 op-node/rollup/derive/calldata_source.go      |  69 ++++-
 op-node/rollup/derive/calldata_source_test.go |   4 +-
 op-node/rollup/derive/data_source.go          |   6 +-
 op-node/rollup/driver/da.go                   |  25 ++
 op-node/service.go                            |   4 +-
 ops-bedrock/docker-compose.yml                |  27 +-
 .../op-stack-go/Dockerfile.dockerignore       |   2 +
 30 files changed, 1081 insertions(+), 58 deletions(-)
 create mode 100644 .github/workflows/cannon.yml
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .github/workflows/docker.yml
 create mode 100644 .github/workflows/fork-sync.yml
 create mode 100644 .github/workflows/validate.yml
 create mode 100644 docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg
 create mode 100644 op-celestia/cli.go
 create mode 100644 op-celestia/da.go
 create mode 100644 op-celestia/da_client.go
 create mode 100644 op-node/rollup/driver/da.go

diff --git a/.github/workflows/cannon.yml b/.github/workflows/cannon.yml
new file mode 100644
index 000000000000..ce0a8d768810
--- /dev/null
+++ b/.github/workflows/cannon.yml
@@ -0,0 +1,253 @@
+name: Cannon Tests
+
+env:
+  FOUNDRY_PROFILE: ci
+  OP_E2E_CANNON_ENABLED: "false"
+
+on:
+  push:
+    branches: [celestia-develop]
+  pull_request:
+    branches: [celestia-develop]
+  workflow_dispatch:
+
+jobs:
+  contracts-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      # Debug step to check directory structure
+      - name: Debug directory structure
+        run: |
+          echo "Current directory: $(pwd)"
+          echo "Directory contents:"
+          ls -la
+          echo "Checking for packages directory:"
+          ls -la packages || echo "No packages directory"
+
+      # Install just command
+      - name: Install just
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to "$HOME/.local/bin"
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
+      # Install Node.js without npm cache initially
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "18"
+
+      - name: Install npm dependencies
+        run: |
+          if [ ! -d "packages/contracts-bedrock" ]; then
+            echo "contracts-bedrock directory not found. Creating it..."
+            mkdir -p packages/contracts-bedrock
+          fi
+          cd packages/contracts-bedrock
+
+          # Initialize package.json if it doesn't exist
+          if [ ! -f "package.json" ]; then
+            echo "Creating package.json..."
+            echo '{
+              "name": "contracts-bedrock",
+              "version": "1.0.0",
+              "private": true,
+              "description": "Optimism Bedrock smart contracts",
+              "scripts": {
+                "test": "echo \"Error: no test specified\" && exit 1"
+              }
+            }' > package.json
+          fi
+
+          # List contents after setup
+          echo "Directory contents after setup:"
+          ls -la
+
+          npm install
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Install contract dependencies
+        working-directory: packages/contracts-bedrock
+        run: just install
+
+      - name: Pull artifacts
+        working-directory: packages/contracts-bedrock
+        run: bash scripts/ops/pull-artifacts.sh
+
+      - name: Build contracts
+        working-directory: packages/contracts-bedrock
+        run: forge build --deny-warnings
+
+      - name: Upload contract artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: contract-artifacts
+          path: |
+            packages/contracts-bedrock/artifacts
+            packages/contracts-bedrock/forge-artifacts
+            packages/contracts-bedrock/cache
+
+  cannon-prestate:
+    needs: [contracts-build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create contract artifact directories
+        run: |
+          mkdir -p packages/contracts-bedrock/{artifacts,forge-artifacts,cache}
+
+      - name: Download contract artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: contract-artifacts
+          path: packages/contracts-bedrock
+
+      - name: Build cannon
+        run: make cannon
+
+      - name: Build op-program
+        run: make op-program
+
+      - name: Create prestate directories
+        run: mkdir -p op-program/bin
+
+      - name: Cache cannon prestate
+        id: cache-prestate
+        uses: actions/cache@v4
+        with:
+          path: |
+            op-program/bin/prestate.bin.gz
+            op-program/bin/meta.json
+            op-program/bin/prestate-proof.json
+          key: cannon-prestate-${{ hashFiles('cannon/bin/cannon') }}-${{ hashFiles('op-program/bin/op-program-client.elf') }}
+
+      - name: Sanitize op-program guest
+        run: make -f cannon/Makefile sanitize-program GUEST_PROGRAM=op-program/bin/op-program-client.elf
+
+      - name: Generate cannon prestate
+        if: steps.cache-prestate.outputs.cache-hit != 'true'
+        run: make cannon-prestate
+
+      - name: Generate cannon-mt prestate
+        run: make cannon-prestate-mt
+
+      - name: Upload prestate artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: prestate-artifacts
+          path: |
+            op-program/bin/prestate.bin.gz
+            op-program/bin/meta.json
+            op-program/bin/prestate-proof.json
+
+  cannon-go-test:
+    needs: [contracts-build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create contract artifact directories
+        run: |
+          mkdir -p packages/contracts-bedrock/{artifacts,forge-artifacts,cache}
+
+      - name: Download contract artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: contract-artifacts
+          path: packages/contracts-bedrock
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.21"
+
+      - name: Build example binaries
+        working-directory: cannon/testdata/example
+        run: make elf
+
+      - name: Run Go lint
+        working-directory: cannon
+        run: make lint
+
+      - name: Create test results directory
+        run: |
+          mkdir -p tmp/test-results
+          mkdir -p tmp/testlogs
+
+      - name: Run tests
+        working-directory: cannon
+        run: |
+          go install gotest.tools/gotestsum@latest
+          gotestsum --format=testname --junitfile=../tmp/test-results/cannon.xml --jsonfile=../tmp/testlogs/log.json \
+          -- -parallel="$(nproc)" -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage.out ./...
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v4
+        with:
+          files: ./cannon/coverage.out
+          flags: cannon-go-tests
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: |
+            tmp/test-results
+            tmp/testlogs
+
+  # op-e2e-cannon-tests:
+  #   needs: [contracts-build, cannon-prestate]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Install Foundry
+  #       uses: foundry-rs/foundry-toolchain@v1
+
+  #     - name: Create directories
+  #       run: |
+  #         mkdir -p packages/contracts-bedrock/{artifacts,forge-artifacts,cache}
+  #         mkdir -p op-program/bin
+
+  #     - name: Download contract artifacts
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: contract-artifacts
+  #         path: packages/contracts-bedrock
+
+  #     - name: Download prestate artifacts
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: prestate-artifacts
+  #         path: op-program/bin
+
+  #     # Add Go installation since op-e2e tests are in Go
+  #     - name: Set up Go
+  #       uses: actions/setup-go@v5
+  #       with:
+  #         go-version: "1.21"
+
+  #     # Install any required Go dependencies
+  #     - name: Install Go dependencies
+  #       run: |
+  #         go mod download
+
+  #     # Debug step to verify forge installation and environment
+  #     - name: Debug environment
+  #       run: |
+  #         echo "Foundry version:"
+  #         forge --version
+  #         echo "Go version:"
+  #         go version
+  #         echo "Directory structure:"
+  #         ls -R packages/contracts-bedrock/
+  #         ls -R op-program/bin/
+
+  #     - name: Run cannon tests
+  #       working-directory: op-e2e
+  #       run: |
+  #         make test-cannon
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000000..c57c08f8a38a
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,106 @@
+name: CI
+
+env:
+  FOUNDRY_PROFILE: ci
+  DOCKER_BUILDKIT: 1
+  REGISTRY: ghcr.io
+  REPO: ${{ github.repository_owner }}
+
+on:
+  push:
+    branches:
+      - celestia-develop
+      - test/github-actions
+  pull_request:
+    branches:
+      - celestia-develop
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        docker_name:
+          - op-node
+          - op-batcher
+          - op-program
+          - op-proposer
+          - op-challenger
+          - proofs-tools
+          - op-dispute-mon
+          - op-conductor
+          - da-server
+          - op-supervisor
+          - cannon
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate clean branch name
+        id: clean_branch
+        run: |
+          # Replace invalid characters with dash
+          CLEAN_BRANCH="$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9.]/-/g')"
+          echo "name=${CLEAN_BRANCH}" >> "$GITHUB_OUTPUT"
+
+      - name: Set build environment
+        run: |
+          {
+            echo "REGISTRY=${{ env.REGISTRY }}"
+            echo "REPOSITORY=${{ env.REPO }}"
+            echo "GIT_COMMIT=$(git rev-parse HEAD)"
+            echo "GIT_DATE=$(git show -s --format='%ct')"
+            echo "GIT_VERSION=untagged"
+            echo "IMAGE_TAGS=${{ github.sha }},${{ steps.clean_branch.outputs.name }}"
+            echo "PLATFORMS=linux/amd64"
+          } >> "$GITHUB_ENV"
+
+      - name: Build Docker image
+        run: |
+          # Create buildx builder
+          docker buildx create --driver=docker-container --name=buildx-build --bootstrap --use
+
+          # For PRs, use --load to make the image available locally
+          # For pushes, use --push to publish to registry
+          OUTPUT_ARG=""
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            OUTPUT_ARG="--load"
+          else
+            OUTPUT_ARG="--push"
+          fi
+
+          # Build using docker-bake.hcl
+          docker buildx bake \
+            --progress plain \
+            --builder=buildx-build \
+            -f docker-bake.hcl \
+            "${OUTPUT_ARG}" \
+            "${{ matrix.docker_name }}"
+
+      - name: Save Docker image
+        if: github.event_name == 'pull_request'
+        run: |
+          CLEAN_TAG="${{ steps.clean_branch.outputs.name }}"
+          IMAGE_NAME="${{ env.REGISTRY }}/${{ env.REPO }}/${{ matrix.docker_name }}:${CLEAN_TAG}"
+          docker save "${IMAGE_NAME}" > "/tmp/${{ matrix.docker_name }}.tar"
+
+      - name: Upload Docker image
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-${{ matrix.docker_name }}
+          path: /tmp/${{ matrix.docker_name }}.tar
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000000..606bc08f0699
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,106 @@
+name: Docker
+
+env:
+  FOUNDRY_PROFILE: ci
+  DOCKER_BUILDKIT: 1
+  REGISTRY: ghcr.io
+  REPO: ${{ github.repository_owner }}
+
+on:
+  push:
+    branches:
+      - celestia-develop
+      - test/github-actions
+  pull_request:
+    branches:
+      - celestia-develop
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      matrix:
+        docker_name:
+          - op-node
+          - op-batcher
+          - op-program
+          - op-proposer
+          - op-challenger
+          - proofs-tools
+          - op-dispute-mon
+          - op-conductor
+          - da-server
+          - op-supervisor
+          - cannon
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate clean branch name
+        id: clean_branch
+        run: |
+          # Replace invalid characters with dash
+          CLEAN_BRANCH="$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9.]/-/g')"
+          echo "name=${CLEAN_BRANCH}" >> "$GITHUB_OUTPUT"
+
+      - name: Set build environment
+        run: |
+          {
+            echo "REGISTRY=${{ env.REGISTRY }}"
+            echo "REPOSITORY=${{ env.REPO }}"
+            echo "GIT_COMMIT=$(git rev-parse HEAD)"
+            echo "GIT_DATE=$(git show -s --format='%ct')"
+            echo "GIT_VERSION=untagged"
+            echo "IMAGE_TAGS=${{ github.sha }},${{ steps.clean_branch.outputs.name }}"
+            echo "PLATFORMS=linux/amd64"
+          } >> "$GITHUB_ENV"
+
+      - name: Build Docker image
+        run: |
+          # Create buildx builder
+          docker buildx create --driver=docker-container --name=buildx-build --bootstrap --use
+
+          # For PRs, use --load to make the image available locally
+          # For pushes, use --push to publish to registry
+          OUTPUT_ARG=""
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            OUTPUT_ARG="--load"
+          else
+            OUTPUT_ARG="--push"
+          fi
+
+          # Build using docker-bake.hcl
+          docker buildx bake \
+            --progress plain \
+            --builder=buildx-build \
+            -f docker-bake.hcl \
+            "${OUTPUT_ARG}" \
+            "${{ matrix.docker_name }}"
+
+      - name: Save Docker image
+        if: github.event_name == 'pull_request'
+        run: |
+          CLEAN_TAG="${{ steps.clean_branch.outputs.name }}"
+          IMAGE_NAME="${{ env.REGISTRY }}/${{ env.REPO }}/${{ matrix.docker_name }}:${CLEAN_TAG}"
+          docker save "${IMAGE_NAME}" > "/tmp/${{ matrix.docker_name }}.tar"
+
+      - name: Upload Docker image
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-${{ matrix.docker_name }}
+          path: /tmp/${{ matrix.docker_name }}.tar
diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml
new file mode 100644
index 000000000000..a2196fb742f4
--- /dev/null
+++ b/.github/workflows/fork-sync.yml
@@ -0,0 +1,18 @@
+name: Sync Fork
+
+on:
+  schedule:
+    - cron: '*/30 * * * *' # every 30 minutes
+  workflow_dispatch: # on button click
+
+jobs:
+  sync:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: tgymnich/fork-sync@v1.8
+        with:
+          base: celestia-develop
+          head: develop
+          token: ${{ secrets.REPO_PAT }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
new file mode 100644
index 000000000000..af25a9533814
--- /dev/null
+++ b/.github/workflows/validate.yml
@@ -0,0 +1,28 @@
+name: Validate Workflows
+
+on:
+  pull_request:
+    branches:
+      - celestia-develop
+    paths:
+      - ".github/workflows/**"
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Create actionlint config
+        run: |
+          echo "self-hosted-runner:
+            # Add your custom runner labels here if needed
+            labels:
+              - ubuntu-latest
+              - ubuntu-latest-16-cores" > .actionlint.yaml
+
+      - name: Validate workflows
+        uses: docker://rhysd/actionlint:latest
+        with:
+          shellcheck: true
+          fail-on-error: true
diff --git a/README.md b/README.md
index 498b1a29b718..acce71b99ab3 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,11 @@
   <br />
   <br />
   <a href="https://optimism.io"><img alt="Optimism" src="https://raw.githubusercontent.com/ethereum-optimism/brand-kit/main/assets/svg/OPTIMISM-R.svg" width=600></a>
+  <h3><a href="https://optimism.io">Optimism</a> is a low-cost and lightning-fast Ethereum L2 blockchain, built with the OP Stack.</h3>
   <br />
-  <h3><a href="https://optimism.io">Optimism</a> is Ethereum, scaled.</h3>
+  <h3>+</h3>
+  <a href="https://celestia.org"><img alt="Celestia" src="docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg" width=600></a>
+  <h3><a href="https://celestia.org">Celestia</a> is a modular data availability network that securely scales with the number of users, making it easy for anyone to launch their own blockchain.</h3>
   <br />
 </div>
 
@@ -29,8 +32,24 @@
 ## What is Optimism?
 
 [Optimism](https://www.optimism.io/) is a project dedicated to scaling Ethereum's technology and expanding its ability to coordinate people from across the world to build effective decentralized economies and governance systems. The [Optimism Collective](https://www.optimism.io/vision) builds open-source software that powers scalable blockchains and aims to address key governance and economic challenges in the wider Ethereum ecosystem. Optimism operates on the principle of **impact=profit**, the idea that individuals who positively impact the Collective should be proportionally rewarded with profit. **Change the incentives and you change the world.**
+If you're looking to run the OP Stack + Celestia setup for this repository, please visit the [Optimism & Celestia guides and tutorials](https://docs.celestia.org/developers/intro-to-op-stack/) to get started.
 
 In this repository you'll find numerous core components of the OP Stack, the decentralized software stack maintained by the Optimism Collective that powers Optimism and forms the backbone of blockchains like [OP Mainnet](https://explorer.optimism.io/) and [Base](https://base.org). The OP Stack is designed to be aggressively open-source — you are welcome to explore, modify, and extend this code.
+The OP Stack powers Optimism, an Ethereum L2 blockchain, and forms the technical foundation for the [the Optimism Collective](https://app.optimism.io/announcement)—a group committed to the **impact=profit** principle. This principle rewards individuals for their positive contributions to the collective.
+
+Optimism addresses critical coordination failures in the crypto ecosystem, such as funding public goods and infrastructure. The OP Stack focuses on creating a shared, open-source system for developing new L2 blockchains within the proposed Superchain ecosystem, promoting collaboration and preventing redundant efforts.
+
+As Optimism evolves, the OP Stack will adapt, encompassing components ranging from blockchain infrastructure to governance systems. This software suite aims to simplify L2 blockchain creation while supporting the growth and development of the Optimism ecosystem.
+
+## What is Celestia?
+
+Celestia is a modular consensus and data network, built to enable anyone to easily deploy their own blockchain with minimal overhead.
+
+Celestia is a minimal blockchain that only orders and publishes transactions and does not execute them. By decoupling the consensus and application execution layers, Celestia modularizes the blockchain technology stack and unlocks new possibilities for decentralized application builders. Lean more at [Celestia.org](https://celestia.org).
+
+## Maintenance
+
+The maintenance guide for this repository can be found in the Wiki tab of the repository or [here](https://github.com/celestiaorg/optimism/wiki).
 
 ## Documentation
 
@@ -40,6 +59,22 @@ In this repository you'll find numerous core components of the OP Stack, the dec
 ## Specification
 
 Detailed specifications for the OP Stack can be found within the [OP Stack Specs](https://github.com/ethereum-optimism/specs) repository.
+If you're interested in the technical details of how Optimism works, refer to the [Optimism Protocol Specification](https://github.com/ethereum-optimism/specs).
+If you want to build on top of Celestia, take a look at the documentation at [docs.celestia.org](https://docs.celestia.org).
+
+If you want to learn more about the OP Stack, check out the documentation at [stack.optimism.io](https://stack.optimism.io/).
+
+## Community
+
+### Optimism
+
+General discussion happens most frequently on the [Optimism discord](https://discord.gg/optimism).
+Governance discussion can also be found on the [Optimism Governance Forum](https://gov.optimism.io/).
+
+### Celestia
+
+General discussion happens most frequently on the [Celestia discord](https://discord.com/invite/YsnTPcSfWQ).
+Other discussions can be found on the [Celestia forum](https://forum.celestia.org).
 
 ## Community
 
@@ -52,13 +87,53 @@ The OP Stack is a collaborative project. By collaborating on free, open software
 
 [CONTRIBUTING.md](./CONTRIBUTING.md) contains a detailed explanation of the contributing process for this repository. Make sure to use the [Developer Quick Start](./CONTRIBUTING.md#development-quick-start) to properly set up your development environment.
 
-[Good First Issues](https://github.com/ethereum-optimism/optimism/issues?q=is:open+is:issue+label:D-good-first-issue) are a great place to look for tasks to tackle if you're not sure where to start, and see [CONTRIBUTING.md](./CONTRIBUTING.md) for info on larger projects.
+[Good First Issues](https://github.com/ethereum-optimism/optimism/issues?q=is:open+is:issue+label:D-good-first-issue) are a great place to look for tasks to tackle if you're not sure where to start.
+Read through [CONTRIBUTING.md](./CONTRIBUTING.md) for a general overview of our contribution process.
+Use the [Developer Quick Start](./CONTRIBUTING.md#development-quick-start) to get your development environment set up to start working on the Optimism Monorepo.
+Then check out the list of [Good First Issues](https://github.com/ethereum-optimism/optimism/issues?q=is:open+is:issue+label:D-good-first-issue) to find something fun to work on!
+Typo fixes are welcome; however, please create a single commit with all of the typo fixes & batch as many fixes together in a PR as possible. Spammy PRs will be closed.
 
-## Security Policy and Vulnerability Reporting
+## e2e testing
 
 Please refer to the canonical [Security Policy](https://github.com/ethereum-optimism/.github/blob/master/SECURITY.md) document for detailed information about how to report vulnerabilities in this codebase.
 Bounty hunters are encouraged to check out the [Optimism Immunefi bug bounty program](https://immunefi.com/bounty/optimism/).
 The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vulnerabilities.
+This repository has updated end-to-end tests in the `op-e2e` package to work with
+Celestia as the data availability (DA) layer.
+
+Currently, the tests assume a working [Celestia devnet](https://github.com/rollkit/local-celestia-devnet) running locally:
+
+```bash
+docker run -p 26650:26650 ghcr.io/rollkit/local-celestia-devnet:v0.12.7
+```
+
+The e2e tests can be triggered with:
+
+```bash
+cd $HOME/optimism
+cd op-e2e
+OP_E2E_DISABLE_PARALLEL=true OP_E2E_CANNON_ENABLED=false OP_NODE_DA_RPC=localhost:26650 OP_BATCHER_DA_RPC=localhost:26650 make test
+```
+
+## Bridging
+
+If you have the OP Stack + Celestia setup running, you can test out bridging from the L1
+to the L2.
+
+To do this, first navigate to the `packages/contracts-bedrock` directory and create a
+`.env` file with the following contents:
+
+```bash
+L1_PROVIDER_URL=http://localhost:8545
+L2_PROVIDER_URL=http://localhost:9545
+PRIVATE_KEY=bf7604d9d3a1c7748642b1b7b05c2bd219c9faa91458b370f85e5a40f3b03af7
+```
+
+Then, run the following from the same directory:
+
+```bash
+npx hardhat deposit --network devnetL1 --l1-provider-url http://localhost:8545 --l2-provider-url http://localhost:9545 --amount-eth <AMOUNT> --to <ADDRESS>
+```
 
 ## Directory Structure
 
diff --git a/bedrock-devnet/devnet/__init__.py b/bedrock-devnet/devnet/__init__.py
index 70243dc790c8..0bc614872428 100644
--- a/bedrock-devnet/devnet/__init__.py
+++ b/bedrock-devnet/devnet/__init__.py
@@ -283,6 +283,18 @@ def devnet_deploy(paths):
         docker_env['ALTDA_GENERIC_DA'] = 'false'
         docker_env['ALTDA_SERVICE'] = 'false'
 
+    log.info('Bringing up DA')
+    run_command(['docker', 'compose', 'up', '-d', 'da'], cwd=paths.ops_bedrock_dir, env=docker_env)
+    wait_up(26658)
+    time.sleep(15)
+    celestia_node_auth_token = os.getenv("CELESTIA_NODE_AUTH_TOKEN")
+    if not celestia_node_auth_token:
+        celestia_node_auth_token = run_command([
+            'docker', 'compose', 'exec', '--no-TTY', 'da', 'celestia', 'bridge', 'auth', 'admin', '--node.store', '/home/celestia/bridge'
+            ], cwd=paths.ops_bedrock_dir, env=docker_env, capture_output=True).stdout.decode().strip()
+    docker_env['CELESTIA_NODE_AUTH_TOKEN'] = celestia_node_auth_token
+    print('CELESTIA_NODE_AUTH_TOKEN: ', celestia_node_auth_token)
+
     # Bring up the rest of the services.
     log.info('Bringing up `op-node`, `op-proposer` and `op-batcher`.')
     run_command(['docker', 'compose', 'up', '-d', 'op-node', 'op-proposer', 'op-batcher', 'artifact-server'], cwd=paths.ops_bedrock_dir, env=docker_env)
@@ -363,10 +375,11 @@ def run_command_preset(command: CommandPreset):
     return proc.returncode
 
 
-def run_command(args, check=True, shell=False, cwd=None, env=None, timeout=None):
+def run_command(args, check=True, shell=False, cwd=None, env=None, timeout=None, capture_output=False):
     env = env if env else {}
     return subprocess.run(
         args,
+        capture_output=capture_output,
         check=check,
         shell=shell,
         env={
diff --git a/docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg b/docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg
new file mode 100644
index 000000000000..6d22cb408925
--- /dev/null
+++ b/docs/op-stack/src/assets/docs/understand/Celestia-logo-color-color.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1133.86 566.93"><defs><style>.cls-1{fill:#7b2bf9;}</style></defs><title>Celestia-logo-color-black</title><path class="cls-1" d="M1001.84,311.23l-33.18-57.55a5.81,5.81,0,0,0-9.94,0l-33.18,57.55a5.22,5.22,0,0,0-.65,2.28,5.84,5.84,0,0,0,5.57,6.23c2.27.05,4-1.09,5.41-3.53l5.13-8.92a3.75,3.75,0,0,1,3.26-1.89H983a3.76,3.76,0,0,1,3.26,1.89l5.13,8.92c1.29,2.31,3,3.46,5.14,3.53a5.78,5.78,0,0,0,6-5.73A6.53,6.53,0,0,0,1001.84,311.23Zm-27.67-17.3h-21a2.57,2.57,0,0,1-2.22-3.85l10.55-18.21a2.57,2.57,0,0,1,4.45,0l10.48,18.21A2.57,2.57,0,0,1,974.17,293.93ZM351.33,260.34a111.21,111.21,0,0,0-187.41-55.5,112.39,112.39,0,0,0-13.61,16.48,39.44,39.44,0,0,0-3.18,5,111.23,111.23,0,1,0,197.24,102,41,41,0,0,0,1.76-4.23,112.28,112.28,0,0,0,5.26-63.41Zm-38.57-50.85c.64.61,1.27,1.23,1.9,1.86a101.71,101.71,0,0,1,22.46,33.82,1.72,1.72,0,0,1-1.9,2.34,51,51,0,0,0-9.87-.7,5.14,5.14,0,0,1-5.17-4.22,149.64,149.64,0,0,0-8.54-30.36l-.63-1.51A1.09,1.09,0,0,1,312.76,209.49Zm10.57,65.24a1.19,1.19,0,0,1,2.15-.72c.84,1.17,1.64,2.35,2.41,3.53q1.53,2.35,2.85,4.68a2.55,2.55,0,0,1-.33,3q-1.79,2-3.88,4.06L325,290.82a1,1,0,0,1-1.73-.77c.07-1.67.11-3.35.14-5C323.44,281.56,323.42,278.13,323.33,274.73Zm-140-74.33a101.2,101.2,0,0,1,59.2-18.92,102.81,102.81,0,0,1,16.79,1.37,1.71,1.71,0,0,1,.79,3c-5.32,4.18-10.27,10.36-14.65,18.37a4.78,4.78,0,0,1-5.48,2.31A138.45,138.45,0,0,0,198,201a95.53,95.53,0,0,0-13.81,1.46A1.15,1.15,0,0,1,183.34,200.4ZM168.77,352.74c-2.14-4.05.63-13.42,14.71-27.66h0a3.51,3.51,0,0,0-.31-5.22l-1.68-1.34a3.51,3.51,0,0,0-4.7.25l-.55.55c-7,7.22-12,13.91-14.72,19.92a2.4,2.4,0,0,1-4.18.33,101.29,101.29,0,0,1-16.79-56.11,102.4,102.4,0,0,1,2.22-21.28,1,1,0,0,1,2-.09,84.89,84.89,0,0,0,10.31,21.52,135.18,135.18,0,0,0,24.87,28h0c3.42,3,7,5.83,10.79,8.59a190.45,190.45,0,0,0,24.74,15.35c3.91,2,7.72,4,11.62,5.72a8.83,8.83,0,0,0,6.86.19q2.76-1.08,5.55-2.25a4.43,4.43,0,0,0,2.59-5.18c-.07-.27-.12-.48-.15-.61a197.93,197.93,0,0,1-5-42.71h0v-.55c0-.83,0-1.67,0-2.5,0-.26,0-.71,0-1v-.32h0c0-.95,0-1.9,0-2.86,0-2.61.14-5.21.28-7.78h0c1-18.39,4.07-35.67,9-50.2a2.58,2.58,0,0,0-1.6-3.27c-1.32-.44-2.63-.87-3.93-1.28a2.56,2.56,0,0,0-3.19,1.61c-5.37,15.78-8.69,34.51-9.58,54.33a7.45,7.45,0,0,1-3.64,6.08,280.38,280.38,0,0,0-31.83,21.77,5.16,5.16,0,0,1-6.59-.14,125.59,125.59,0,0,1-23.12-26c-11.67-17.92-14.45-34.8-7.81-47.52l.05-.09c.85-1.41,1.73-2.79,2.64-4.16,7.63-10.09,21.82-15.94,40.64-16.6q1.78-.06,3.6-.06a132.8,132.8,0,0,1,36.54,5.54h0l.83.25.64.18h0q4.37,1.31,8.75,2.88h0l.21.07,2.28.85.72.27.69.26h0a183.63,183.63,0,0,1,18.38,8.3,176.31,176.31,0,0,1,31.87,21.12c-17.87,4.09-38.63,12-59.52,22.64a3,3,0,0,0-1.65,2.54c-.08,1.29-.17,3.89-.24,6a1.69,1.69,0,0,0,2.48,1.55h0c20.67-10.86,41.31-19,59-23.26a6.63,6.63,0,0,0,5-7.36q-.49-3.54-1.1-7a11.59,11.59,0,0,0-4.39-7.18,188,188,0,0,0-27.24-17.21,193.46,193.46,0,0,0-20-9,2.51,2.51,0,0,1-1.3-3.58c6.91-12.37,15.13-19.29,23.14-19.29h.25c9.45.17,18.87,10,25.84,27A141.36,141.36,0,0,1,311.27,245l0,0c.8,4.6,1.44,9.35,1.92,14.22l-.13.08.17.17a222.27,222.27,0,0,1,1,25.39c-.1,5.5-.39,10.92-.86,16.23a288.35,288.35,0,0,1-45.45,29.48c-5.64,3-11.29,5.77-16.87,8.34l-.26.12-1.29.58h0q-6.94,3.15-13.72,5.8h0l-.76.29-1,.37-2.26.86-.62.23-2.73,1-.33.13h0a186.82,186.82,0,0,1-27.27,7.66C180.5,359.84,171,356.84,168.77,352.74Zm27.95-39.59a265.3,265.3,0,0,1,31.07-21.53,209.59,209.59,0,0,0,4.73,41.77q-6.42-2.75-12.79-6A180.46,180.46,0,0,1,196.72,313.15Zm59,71.46a102.54,102.54,0,0,1-13.16.84,101.23,101.23,0,0,1-55.06-16.1,1.37,1.37,0,0,1,.68-2.52l.77,0A109.58,109.58,0,0,0,202.51,365a207.44,207.44,0,0,0,34.25-10.11,2.16,2.16,0,0,1,2.75,1.21v0c4.72,11.48,10.52,20.15,17,25.67A1.63,1.63,0,0,1,255.7,384.61Zm43.12-27.23c-7.29,14.32-16.25,22.36-24.94,22.2-9.45-.17-18.87-10-25.85-27v0a2.15,2.15,0,0,1,1.14-2.78l.22-.09a2.13,2.13,0,0,1,1.45-.1,141.68,141.68,0,0,0,38,5.57c1.31,0,2.61,0,3.89-.07,1.51-.05,3-.13,4.46-.25A1.74,1.74,0,0,1,298.82,357.38ZM302,345.06a86.79,86.79,0,0,1-9.59.85,120.11,120.11,0,0,1-25.69-2.05,1.15,1.15,0,0,1-.3-2.16c1.93-1,3.87-2,5.8-3a316,316,0,0,0,37.35-23.13,1.15,1.15,0,0,1,1.81,1.12A165.39,165.39,0,0,1,305,342.53,3.76,3.76,0,0,1,302,345.06ZM317,353.15c-.77.82-1.55,1.63-2.35,2.43q-2.09,2.09-4.27,4a1.13,1.13,0,0,1-1.78-1.32l.44-1q.92-2,1.77-4.14a1.17,1.17,0,0,1,.77-.67c1.45-.36,2.86-.77,4.23-1.21A1.13,1.13,0,0,1,317,353.15Zm20.5-32.35c-.49,1.25-1,2.48-1.55,3.71-.08.17-.16.34-.25.51-3.36,6.47-9,11.57-16.54,15.12a2.18,2.18,0,0,1-3-2.56,193.5,193.5,0,0,0,5.62-28.87,7.68,7.68,0,0,1,2.62-4.89c3.1-2.69,6-5.37,8.66-8l0,0a2.45,2.45,0,0,1,4.08,1C339.77,305.54,339.92,313.69,337.51,320.8Zm2-47.78a2.08,2.08,0,0,1-3.56.11l-.39-.61a120.25,120.25,0,0,0-10.45-13.72,1.7,1.7,0,0,1,1.28-2.81h0c9.14,0,13.93,2.26,15.39,5C343.07,263.31,342.7,267.34,339.55,273Zm4.93,13.48a.64.64,0,0,1-1.23.23c-.11-.27-.23-.55-.35-.82a1.53,1.53,0,0,1,.17-1.53l.37-.49c.45-.58,1.09-.49,1.09.15C344.53,284.89,344.51,285.63,344.48,286.5Zm323.64-24.12h38.34a5.75,5.75,0,0,0,5.69-6.44,5.84,5.84,0,0,0-5.84-5H658.65a5.75,5.75,0,0,0-5.73,5.73V314a5.75,5.75,0,0,0,5.73,5.73h47.81a5.75,5.75,0,0,0,5.69-6.43,5.84,5.84,0,0,0-5.84-5H668.12a3.73,3.73,0,0,1-3.73-3.73v-9.75a3.73,3.73,0,0,1,3.73-3.73H696.9a5.75,5.75,0,0,0,5.69-6.43,5.84,5.84,0,0,0-5.84-5H668.12a3.73,3.73,0,0,1-3.73-3.73v-9.75A3.73,3.73,0,0,1,668.12,262.38Zm117.19,22.28c-5.26-3.35-12.34-5.07-21.23-5.07-11.76,0-17.69-2.87-17.69-8.61s5.93-8.6,17.69-8.6A49.39,49.39,0,0,1,782.72,266c3.45,1.05,5.84-.19,7.17-3.54,1.15-3-.38-5.83-3.53-7.26a55.1,55.1,0,0,0-22.28-4.3c-8.7,0-15.68,1.81-21.13,5.35a16.8,16.8,0,0,0-8,14.72c0,6.6,2.68,11.67,7.94,15s12.33,5.07,21.22,5.07c11.76,0,17.69,2.87,17.69,8.61s-5.93,8.6-17.69,8.6h-2.87a53.2,53.2,0,0,1-18.55-3.63,5.59,5.59,0,0,0-7.26,3.44,5.86,5.86,0,0,0,3.54,7.46,56.75,56.75,0,0,0,22.27,4.2h2.87c8.7,0,15.68-1.81,21-5.35a16.68,16.68,0,0,0,8.13-14.72C793.24,293.07,790.56,288,785.31,284.66Zm114.78-33.75a5.75,5.75,0,0,0-5.74,5.73V314a5.74,5.74,0,0,0,11.47,0V256.64A5.75,5.75,0,0,0,900.09,250.91Zm-30.32,0H812.56a5.74,5.74,0,0,0-5.69,6.43,5.82,5.82,0,0,0,5.84,5h19.06a3.74,3.74,0,0,1,3.74,3.74V314a5.75,5.75,0,0,0,6.43,5.69,5.84,5.84,0,0,0,5-5.85V266.12a3.73,3.73,0,0,1,3.74-3.74h19.2a5.76,5.76,0,0,0,5.7-6.44A5.84,5.84,0,0,0,869.77,250.91ZM628.39,308.27H590.22a3.75,3.75,0,0,1-3.75-3.74V256.79a5.84,5.84,0,0,0-5-5.84,5.75,5.75,0,0,0-6.44,5.69V314a5.75,5.75,0,0,0,5.74,5.73h47.8a5.74,5.74,0,0,0,5.69-6.43A5.82,5.82,0,0,0,628.39,308.27ZM441.46,262.38a21.69,21.69,0,0,1,16.15,6.79,5.82,5.82,0,0,0,9.85-4.11,6.06,6.06,0,0,0-2.39-4.59,34.33,34.33,0,1,0,.67,49.23,5.75,5.75,0,0,0-8.13-8.12,21.93,21.93,0,0,1-16.15,6.69,22.84,22.84,0,0,1-22.95-22.95,21.93,21.93,0,0,1,6.69-16.15A22.25,22.25,0,0,1,441.46,262.38Zm66,0h38.33a5.76,5.76,0,0,0,5.7-6.44,5.84,5.84,0,0,0-5.85-5H497.94a5.76,5.76,0,0,0-5.74,5.73V314a5.76,5.76,0,0,0,5.74,5.73h47.8a5.75,5.75,0,0,0,5.7-6.43,5.84,5.84,0,0,0-5.85-5H507.41a3.73,3.73,0,0,1-3.73-3.74V294.8a3.73,3.73,0,0,1,3.73-3.74h28.77a5.75,5.75,0,0,0,5.7-6.43,5.84,5.84,0,0,0-5.85-5H507.41a3.73,3.73,0,0,1-3.73-3.74v-9.73A3.73,3.73,0,0,1,507.41,262.38Z"/></svg>
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 49cc15545b64..66c9f07abc22 100644
--- a/go.mod
+++ b/go.mod
@@ -45,6 +45,7 @@ require (
 	github.com/pkg/profile v1.7.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/protolambda/ctxlock v0.1.0
+	github.com/rollkit/go-da v0.9.0
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.27.5
 	golang.org/x/crypto v0.28.0
@@ -78,6 +79,7 @@ require (
 	github.com/consensys/bavard v0.1.13 // indirect
 	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/cosmos/gogoproto v1.7.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -97,6 +99,7 @@ require (
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/felixge/fgprof v0.9.5 // indirect
 	github.com/ferranbt/fastssz v0.1.2 // indirect
+	github.com/filecoin-project/go-jsonrpc v0.6.0 // indirect
 	github.com/flynn/noise v1.1.0 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
@@ -112,7 +115,7 @@ require (
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -229,6 +232,7 @@ require (
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.etcd.io/bbolt v1.3.5 // indirect
+	go.opencensus.io v0.22.3 // indirect
 	go.uber.org/dig v1.18.0 // indirect
 	go.uber.org/fx v1.22.2 // indirect
 	go.uber.org/mock v0.4.0 // indirect
@@ -239,10 +243,10 @@ require (
 	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/tools v0.26.0 // indirect
-	google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
-	google.golang.org/grpc v1.57.1 // indirect
+	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/grpc v1.67.1 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 355a484d01aa..508239e6aba6 100644
--- a/go.sum
+++ b/go.sum
@@ -132,6 +132,8 @@ github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7
 github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
+github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
@@ -205,6 +207,8 @@ github.com/felixge/fgprof v0.9.5 h1:8+vR6yu2vvSKn08urWyEuxx75NWPEvybbkBirEpsbVY=
 github.com/felixge/fgprof v0.9.5/go.mod h1:yKl+ERSa++RYOs32d8K6WEXCB4uXdLls4ZaZPpayhMM=
 github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=
 github.com/ferranbt/fastssz v0.1.2/go.mod h1:X5UPrE2u1UJjxHA8X54u04SBwdAQjG2sFtWs39YxyWs=
+github.com/filecoin-project/go-jsonrpc v0.6.0 h1:/fFJIAN/k6EgY90m7qbyfY28woMwyseZmh2gVs5sYjY=
+github.com/filecoin-project/go-jsonrpc v0.6.0/go.mod h1:/n/niXcS4ZQua6i37LcVbY1TmlJR0UIK9mDFQq2ICek=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg=
 github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
@@ -269,6 +273,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
 github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -718,6 +724,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rollkit/go-da v0.9.0 h1:ECpS7RSLE84w61Y5a93RfaZrAZKeiyfjVwGxzjsW2cU=
+github.com/rollkit/go-da v0.9.0/go.mod h1:LQImomegjZ/dEQLKDJA7RdUnOLINSZJwI7q1CvFPWJw=
 github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
 github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
@@ -824,6 +832,8 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
 go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
+go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw=
@@ -870,6 +880,7 @@ golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -943,6 +954,7 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1046,6 +1058,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
 golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
@@ -1059,18 +1072,18 @@ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
 google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e h1:xIXmWJ303kJCuogpj0bHq+dcjcZHU+XFyc1I0Yl9cRg=
-google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108=
-google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw=
-google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
+google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg=
-google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/op-batcher/batcher/config.go b/op-batcher/batcher/config.go
index 82be687af325..55eaa9ba4685 100644
--- a/op-batcher/batcher/config.go
+++ b/op-batcher/batcher/config.go
@@ -11,6 +11,7 @@ import (
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	"github.com/ethereum-optimism/optimism/op-batcher/compressor"
 	"github.com/ethereum-optimism/optimism/op-batcher/flags"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
@@ -60,6 +61,12 @@ type CLIConfig struct {
 	// Maximum number of blocks to add to a span batch. Default is 0 - no maximum.
 	MaxBlocksPerSpanBatch int
 
+	// MaxFrameSize is the maximum size of a frame in a batch tx.
+	MaxFrameSize uint64
+
+	// MultiFrameTxs controls whether to put all frames of a channel inside a single tx.
+	MultiFrameTxs bool
+
 	// The target number of frames to create per channel. Controls number of blobs
 	// per blob tx, if using Blob DA.
 	TargetNumFrames int
@@ -119,6 +126,7 @@ type CLIConfig struct {
 	PprofConfig   oppprof.CLIConfig
 	RPC           oprpc.CLIConfig
 	AltDA         altda.CLIConfig
+	DaConfig      celestia.CLIConfig
 }
 
 func (c *CLIConfig) Check() error {
@@ -174,6 +182,9 @@ func (c *CLIConfig) Check() error {
 	if err := c.RPC.Check(); err != nil {
 		return err
 	}
+	if err := c.DaConfig.Check(); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -192,6 +203,8 @@ func NewConfig(ctx *cli.Context) *CLIConfig {
 		MaxChannelDuration:           ctx.Uint64(flags.MaxChannelDurationFlag.Name),
 		MaxL1TxSize:                  ctx.Uint64(flags.MaxL1TxSizeBytesFlag.Name),
 		MaxBlocksPerSpanBatch:        ctx.Int(flags.MaxBlocksPerSpanBatch.Name),
+		MaxFrameSize:                 ctx.Uint64(flags.MaxFrameSizeFlag.Name),
+		MultiFrameTxs:                ctx.Bool(flags.MultiFrameTxsFlag.Name),
 		TargetNumFrames:              ctx.Int(flags.TargetNumFramesFlag.Name),
 		ApproxComprRatio:             ctx.Float64(flags.ApproxComprRatioFlag.Name),
 		Compressor:                   ctx.String(flags.CompressorFlag.Name),
@@ -213,5 +226,6 @@ func NewConfig(ctx *cli.Context) *CLIConfig {
 		ThrottleTxSize:               ctx.Uint64(flags.ThrottleTxSizeFlag.Name),
 		ThrottleBlockSize:            ctx.Uint64(flags.ThrottleBlockSizeFlag.Name),
 		ThrottleAlwaysBlockSize:      ctx.Uint64(flags.ThrottleAlwaysBlockSizeFlag.Name),
+		DaConfig:                     celestia.ReadCLIConfig(ctx),
 	}
 }
diff --git a/op-batcher/batcher/driver.go b/op-batcher/batcher/driver.go
index 5021f1ff37c9..5b619d09d753 100644
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -2,6 +2,7 @@ package batcher
 
 import (
 	"context"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
@@ -22,6 +23,7 @@ import (
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	"github.com/ethereum-optimism/optimism/op-batcher/metrics"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	"github.com/ethereum-optimism/optimism/op-service/dial"
@@ -91,6 +93,7 @@ type DriverSetup struct {
 	ChannelConfig     ChannelConfigProvider
 	AltDA             *altda.DAClient
 	ChannelOutFactory ChannelOutFactory
+	DAClient         *celestia.DAClient
 }
 
 // BatchSubmitter encapsulates a service responsible for submitting L2 tx
@@ -785,6 +788,20 @@ func (l *BatchSubmitter) publishToAltDAAndL1(txdata txData, queue *txmgr.Queue[t
 	}
 }
 
+// fallbackTxCandidate creates a fallback tx candidate for the given txdata.
+func (l *BatchSubmitter) fallbackTxCandidate(txdata txData) (*txmgr.TxCandidate, error) {
+	switch l.DAClient.FallbackMode {
+	case celestia.FallbackModeBlobData:
+		return l.blobTxCandidate(txdata)
+	case celestia.FallbackModeCallData:
+		return l.calldataTxCandidate(txdata.CallData()), nil
+	case celestia.FallbackModeDisabled:
+		return nil, fmt.Errorf("celestia: fallback disabled")
+	default:
+		return nil, fmt.Errorf("celestia: unknown fallback mode: %s", l.DAClient.FallbackMode)
+	}
+}
+
 // sendTransaction creates & queues for sending a transaction to the batch inbox address with the given `txData`.
 // This call will block if the txmgr queue is at the  max-pending limit.
 // The method will block if the queue's MaxPendingTransactions is exceeded.
@@ -798,22 +815,27 @@ func (l *BatchSubmitter) sendTransaction(txdata txData, queue *txmgr.Queue[txRef
 		return nil
 	}
 
-	var candidate *txmgr.TxCandidate
-	if txdata.asBlob {
-		if candidate, err = l.blobTxCandidate(txdata); err != nil {
-			// We could potentially fall through and try a calldata tx instead, but this would
-			// likely result in the chain spending more in gas fees than it is tuned for, so best
-			// to just fail. We do not expect this error to trigger unless there is a serious bug
-			// or configuration issue.
-			return fmt.Errorf("could not create blob tx candidate: %w", err)
-		}
-	} else {
-		// sanity check
-		if nf := len(txdata.frames); nf != 1 {
-			l.Log.Crit("Unexpected number of frames in calldata tx", "num_frames", nf)
+	// force celestia tx candidate, multiframe is set by UseBlobs which is not affected
+	txdata.asBlob = false
+	// sanity check
+	if nf := len(txdata.frames); nf > l.ChannelConfig.ChannelConfig().TargetNumFrames {
+		l.Log.Crit("Unexpected number of frames in calldata tx", "num_frames", nf)
+	}
+	candidate, err := l.celestiaTxCandidate(txdata.CallData())
+	if err != nil {
+		l.Log.Error("celestia: blob submission failed", "err", err)
+		candidate, err = l.fallbackTxCandidate(txdata)
+		if err != nil {
+			l.Log.Error("celestia: fallback failed", "err", err)
+			l.recordFailedTx(txdata.ID(), err)
+			return nil
 		}
-		candidate = l.calldataTxCandidate(txdata.CallData())
 	}
+	// restore asBlob for cancellation in case of blobdata fallback
+	if len(candidate.Blobs) > 0 {
+		txdata.asBlob = true
+	}
+	l.Log.Info("tx candidate", "ID", txdata.ID(), "len(txdata.frames)", len(txdata.frames), "txdata.asBlob", txdata.asBlob)
 
 	l.sendTx(txdata, false, candidate, queue, receiptsCh)
 	return nil
@@ -857,6 +879,22 @@ func (l *BatchSubmitter) calldataTxCandidate(data []byte) *txmgr.TxCandidate {
 	}
 }
 
+func (l *BatchSubmitter) celestiaTxCandidate(data []byte) (*txmgr.TxCandidate, error) {
+	l.Log.Info("Building Celestia transaction candidate", "size", len(data))
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Duration(l.RollupConfig.BlockTime)*time.Second)
+	ids, err := l.DAClient.Client.Submit(ctx, [][]byte{data}, l.DAClient.GasPrice, l.DAClient.Namespace)
+	cancel()
+	if err != nil {
+		return nil, err
+	}
+	if len(ids) != 1 {
+		return nil, fmt.Errorf("celestia: expected 1 id, got %d", len(ids))
+	}
+	l.Log.Info("celestia: blob successfully submitted", "id", hex.EncodeToString(ids[0]))
+	data = append([]byte{celestia.DerivationVersionCelestia}, ids[0]...)
+	return l.calldataTxCandidate(data), nil
+}
+
 func (l *BatchSubmitter) handleReceipt(r txmgr.TxReceipt[txRef]) {
 	// Record TX Status
 	if r.Err != nil {
diff --git a/op-batcher/batcher/service.go b/op-batcher/batcher/service.go
index 1b150642261f..5e32bd74b3df 100644
--- a/op-batcher/batcher/service.go
+++ b/op-batcher/batcher/service.go
@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-batcher/flags"
 	"github.com/ethereum-optimism/optimism/op-batcher/metrics"
 	"github.com/ethereum-optimism/optimism/op-batcher/rpc"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/params"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -78,6 +79,7 @@ type BatcherService struct {
 	stopped         atomic.Bool
 
 	NotSubmittingOnStart bool
+	DAClient             *celestia.DAClient
 }
 
 type DriverSetupOption func(setup *DriverSetup)
@@ -136,6 +138,13 @@ func (bs *BatcherService) initFromCLIConfig(ctx context.Context, version string,
 	if err := bs.initPProf(cfg); err != nil {
 		return fmt.Errorf("failed to init profiling: %w", err)
 	}
+	// init before driver
+	if err := bs.initAltDA(cfg); err != nil {
+		return fmt.Errorf("failed to init AltDA: %w", err)
+	}
+	if err := bs.initDA(cfg); err != nil {
+		return fmt.Errorf("failed to start da server: %w", err)
+	}
 	bs.initDriver(opts...)
 	if err := bs.initRPCServer(cfg); err != nil {
 		return fmt.Errorf("failed to start RPC server: %w", err)
@@ -220,6 +229,16 @@ func (bs *BatcherService) initChannelConfig(cfg *CLIConfig) error {
 		BatchType:             cfg.BatchType,
 	}
 
+	// override max frame size if set
+	if cfg.MaxFrameSize > 0 {
+		cc.MaxFrameSize = cfg.MaxFrameSize
+	}
+
+	// enable multi-frame txs if set
+	if cfg.MultiFrameTxs {
+		cc.UseBlobs = true
+	}
+
 	switch cfg.DataAvailabilityType {
 	case flags.BlobsType, flags.AutoType:
 		if !cfg.TestUseMaxTxSizeForBlobs {
@@ -256,6 +275,7 @@ func (bs *BatcherService) initChannelConfig(cfg *CLIConfig) error {
 	bs.Log.Info("Initialized channel-config",
 		"da_type", cfg.DataAvailabilityType,
 		"use_alt_da", bs.UseAltDA,
+		"use_blobs", cc.UseBlobs,
 		"max_frame_size", cc.MaxFrameSize,
 		"target_num_frames", cc.TargetNumFrames,
 		"compressor", cc.CompressorConfig.Kind,
@@ -340,6 +360,7 @@ func (bs *BatcherService) initDriver(opts ...DriverSetupOption) {
 		EndpointProvider: bs.EndpointProvider,
 		ChannelConfig:    bs.ChannelConfig,
 		AltDA:            bs.AltDA,
+		DAClient:         bs.DAClient,
 	}
 	for _, opt := range opts {
 		opt(&ds)
@@ -378,6 +399,15 @@ func (bs *BatcherService) initAltDA(cfg *CLIConfig) error {
 	return nil
 }
 
+func (bs *BatcherService) initDA(cfg *CLIConfig) error {
+	client, err := celestia.NewDAClient(cfg.DaConfig.Rpc, cfg.DaConfig.AuthToken, cfg.DaConfig.Namespace, cfg.DaConfig.FallbackMode, cfg.DaConfig.GasPrice)
+	if err != nil {
+		return err
+	}
+	bs.DAClient = client
+	return nil
+}
+
 // Start runs once upon start of the batcher lifecycle,
 // and starts batch-submission work if the batcher is configured to start submit data on startup.
 func (bs *BatcherService) Start(_ context.Context) error {
diff --git a/op-batcher/flags/flags.go b/op-batcher/flags/flags.go
index df8eca4a612f..3a84ce827540 100644
--- a/op-batcher/flags/flags.go
+++ b/op-batcher/flags/flags.go
@@ -10,6 +10,7 @@ import (
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	"github.com/ethereum-optimism/optimism/op-batcher/compressor"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
 	opservice "github.com/ethereum-optimism/optimism/op-service"
 	openum "github.com/ethereum-optimism/optimism/op-service/enum"
@@ -43,7 +44,6 @@ var (
 		Usage:   "HTTP provider URL for Rollup node. A comma-separated list enables the active L2 endpoint provider. Such a list needs to match the number of l2-eth-rpcs provided.",
 		EnvVars: prefixEnvVars("ROLLUP_RPC"),
 	}
-	// Optional flags
 	SubSafetyMarginFlag = &cli.Uint64Flag{
 		Name: "sub-safety-margin",
 		Usage: "The batcher tx submission safety margin (in #L1-blocks) to subtract " +
@@ -81,6 +81,18 @@ var (
 		Usage:   "Maximum number of blocks to add to a span batch. Default is 0 - no maximum.",
 		EnvVars: prefixEnvVars("MAX_BLOCKS_PER_SPAN_BATCH"),
 	}
+	MaxFrameSizeFlag = &cli.Uint64Flag{
+		Name:    "max-frame-size-bytes",
+		Usage:   "The maximum size of a frame. 0 to use default value (120k-1)",
+		Value:   0,
+		EnvVars: prefixEnvVars("MAX_FRAME_SIZE_BYTES"),
+	}
+	MultiFrameTxsFlag = &cli.BoolFlag{
+		Name:    "multi-frame-txs",
+		Usage:   "Whether to put all frames of a channel inside a single tx. Ignored for blobs, where true will be used.",
+		Value:   false,
+		EnvVars: prefixEnvVars("MULTI_FRAME_TXS"),
+	}
 	TargetNumFramesFlag = &cli.IntFlag{
 		Name:    "target-num-frames",
 		Usage:   "The target number of frames to create per channel. Controls number of blobs per blob tx, if using Blob DA.",
@@ -205,6 +217,8 @@ var optionalFlags = []cli.Flag{
 	MaxChannelDurationFlag,
 	MaxL1TxSizeBytesFlag,
 	MaxBlocksPerSpanBatch,
+	MaxFrameSizeFlag,
+	MultiFrameTxsFlag,
 	TargetNumFramesFlag,
 	ApproxComprRatioFlag,
 	CompressorFlag,
@@ -228,6 +242,7 @@ func init() {
 	optionalFlags = append(optionalFlags, oppprof.CLIFlags(EnvVarPrefix)...)
 	optionalFlags = append(optionalFlags, txmgr.CLIFlags(EnvVarPrefix)...)
 	optionalFlags = append(optionalFlags, altda.CLIFlags(EnvVarPrefix, "")...)
+	optionalFlags = append(optionalFlags, celestia.CLIFlags(EnvVarPrefix)...)
 
 	Flags = append(requiredFlags, optionalFlags...)
 }
diff --git a/op-celestia/cli.go b/op-celestia/cli.go
new file mode 100644
index 000000000000..33b2f1767552
--- /dev/null
+++ b/op-celestia/cli.go
@@ -0,0 +1,120 @@
+package celestia
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli/v2"
+
+	opservice "github.com/ethereum-optimism/optimism/op-service"
+)
+
+const (
+	// FallbackModeDisabled is the fallback mode disabled
+	FallbackModeDisabled = "disabled"
+	// FallbackModeBlobData is the fallback mode blob data
+	FallbackModeBlobData = "blobdata"
+	// FallbackModeCallData is the fallback mode call data
+	FallbackModeCallData = "calldata"
+)
+
+const (
+	// RPCFlagName defines the flag for the rpc url
+	RPCFlagName = "da.rpc"
+	// AuthTokenFlagName defines the flag for the auth token
+	AuthTokenFlagName = "da.auth_token"
+	// NamespaceFlagName defines the flag for the namespace
+	NamespaceFlagName = "da.namespace"
+	// EthFallbackDisabledFlagName defines the flag for disabling eth fallback
+	EthFallbackDisabledFlagName = "da.eth_fallback_disabled"
+	// FallbackModeFlagName defines the flag for fallback mode
+	FallbackModeFlagName = "da.fallback_mode"
+	// GasPriceFlagName defines the flag for gas price
+	GasPriceFlagName = "da.gas_price"
+
+	// NamespaceSize is the size of the hex encoded namespace string
+	NamespaceSize = 58
+
+	// defaultRPC is the default rpc dial address
+	defaultRPC = "grpc://localhost:26650"
+
+	// defaultGasPrice is the default gas price
+	defaultGasPrice = -1
+)
+
+func CLIFlags(envPrefix string) []cli.Flag {
+	return []cli.Flag{
+		&cli.StringFlag{
+			Name:    RPCFlagName,
+			Usage:   "dial address of the data availability rpc client; supports grpc, http, https",
+			Value:   defaultRPC,
+			EnvVars: opservice.PrefixEnvVar(envPrefix, "DA_RPC"),
+		},
+		&cli.StringFlag{
+			Name:    AuthTokenFlagName,
+			Usage:   "authentication token of the data availability client",
+			EnvVars: opservice.PrefixEnvVar(envPrefix, "DA_AUTH_TOKEN"),
+		},
+		&cli.StringFlag{
+			Name:    NamespaceFlagName,
+			Usage:   "namespace of the data availability client",
+			EnvVars: opservice.PrefixEnvVar(envPrefix, "DA_NAMESPACE"),
+		},
+		&cli.BoolFlag{
+			Name:    EthFallbackDisabledFlagName,
+			Usage:   "disable eth fallback (deprecated, use FallbackModeFlag instead)",
+			EnvVars: opservice.PrefixEnvVar(envPrefix, "DA_ETH_FALLBACK_DISABLED"),
+			Action: func(c *cli.Context, e bool) error {
+				if e {
+					return c.Set(FallbackModeFlagName, FallbackModeDisabled)
+				}
+				return nil
+			},
+		},
+		&cli.StringFlag{
+			Name:    FallbackModeFlagName,
+			Usage:   fmt.Sprintf("fallback mode; must be one of: %s, %s or %s", FallbackModeDisabled, FallbackModeBlobData, FallbackModeCallData),
+			EnvVars: opservice.PrefixEnvVar(envPrefix, "DA_FALLBACK_MODE"),
+			Value:   FallbackModeCallData,
+			Action: func(c *cli.Context, s string) error {
+				if s != FallbackModeDisabled && s != FallbackModeBlobData && s != FallbackModeCallData {
+					return fmt.Errorf("invalid fallback mode: %s; must be one of: %s, %s or %s", s, FallbackModeDisabled, FallbackModeBlobData, FallbackModeCallData)
+				}
+				return nil
+			},
+		},
+		&cli.Float64Flag{
+			Name:    GasPriceFlagName,
+			Usage:   "gas price of the data availability client",
+			Value:   defaultGasPrice,
+			EnvVars: opservice.PrefixEnvVar(envPrefix, "DA_GAS_PRICE"),
+		},
+	}
+}
+
+type CLIConfig struct {
+	Rpc          string
+	AuthToken    string
+	Namespace    string
+	FallbackMode string
+	GasPrice     float64
+}
+
+func (c CLIConfig) Check() error {
+	return nil
+}
+
+func NewCLIConfig() CLIConfig {
+	return CLIConfig{
+		Rpc: defaultRPC,
+	}
+}
+
+func ReadCLIConfig(ctx *cli.Context) CLIConfig {
+	return CLIConfig{
+		Rpc:          ctx.String(RPCFlagName),
+		AuthToken:    ctx.String(AuthTokenFlagName),
+		Namespace:    ctx.String(NamespaceFlagName),
+		FallbackMode: ctx.String(FallbackModeFlagName),
+		GasPrice:     ctx.Float64(GasPriceFlagName),
+	}
+}
diff --git a/op-celestia/da.go b/op-celestia/da.go
new file mode 100644
index 000000000000..feecb3a82fad
--- /dev/null
+++ b/op-celestia/da.go
@@ -0,0 +1,10 @@
+package celestia
+
+// DerivationVersionCelestia is a byte marker for celestia references submitted
+// to the batch inbox address as calldata.
+// Mnemonic 0xce = celestia
+// version 0xce references are encoded as:
+// [8]byte block height ++ [32]byte commitment
+// in little-endian encoding.
+// see: https://github.com/rollkit/celestia-da/blob/1f2df375fd2fcc59e425a50f7eb950daa5382ef0/celestia.go#L141-L160
+const DerivationVersionCelestia = 0xce
diff --git a/op-celestia/da_client.go b/op-celestia/da_client.go
new file mode 100644
index 000000000000..b15940ca335d
--- /dev/null
+++ b/op-celestia/da_client.go
@@ -0,0 +1,39 @@
+package celestia
+
+import (
+	"encoding/hex"
+	"fmt"
+	"time"
+
+	"github.com/rollkit/go-da"
+	"github.com/rollkit/go-da/proxy"
+)
+
+type DAClient struct {
+	Client       da.DA
+	GetTimeout   time.Duration
+	Namespace    da.Namespace
+	FallbackMode string
+	GasPrice     float64
+}
+
+func NewDAClient(rpc, token, namespace, fallbackMode string, gasPrice float64) (*DAClient, error) {
+	client, err := proxy.NewClient(rpc, token)
+	if err != nil {
+		return nil, err
+	}
+	ns, err := hex.DecodeString(namespace)
+	if err != nil {
+		return nil, err
+	}
+	if fallbackMode != "disabled" && fallbackMode != "blobdata" && fallbackMode != "calldata" {
+		return nil, fmt.Errorf("celestia: unknown fallback mode: %s", fallbackMode)
+	}
+	return &DAClient{
+		Client:       client,
+		GetTimeout:   time.Minute,
+		Namespace:    ns,
+		FallbackMode: fallbackMode,
+		GasPrice:     gasPrice,
+	}, nil
+}
diff --git a/op-e2e/system/e2esys/setup.go b/op-e2e/system/e2esys/setup.go
index a54a46d1e5db..dd14ee77a57a 100644
--- a/op-e2e/system/e2esys/setup.go
+++ b/op-e2e/system/e2esys/setup.go
@@ -45,6 +45,7 @@ import (
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
 	bss "github.com/ethereum-optimism/optimism/op-batcher/batcher"
 	batcherFlags "github.com/ethereum-optimism/optimism/op-batcher/flags"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/ethereum-optimism/optimism/op-e2e/config"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils"
@@ -153,6 +154,7 @@ func DefaultSystemConfig(t testing.TB, opts ...SystemConfigOpt) SystemConfig {
 				RuntimeConfigReloadInterval: time.Minute * 10,
 				ConfigPersistence:           &rollupNode.DisabledConfigPersistence{},
 				Sync:                        sync.Config{SyncMode: sync.CLSync},
+				DaConfig:                    celestia.CLIConfig{Rpc: "grpc://localhost:26650"},
 			},
 			RoleVerif: {
 				Driver: driver.Config{
@@ -169,6 +171,7 @@ func DefaultSystemConfig(t testing.TB, opts ...SystemConfigOpt) SystemConfig {
 				RuntimeConfigReloadInterval: time.Minute * 10,
 				ConfigPersistence:           &rollupNode.DisabledConfigPersistence{},
 				Sync:                        sync.Config{SyncMode: sync.CLSync},
+				DaConfig:                    celestia.CLIConfig{Rpc: "grpc://localhost:26650"},
 			},
 		},
 		Loggers: map[string]log.Logger{
@@ -930,6 +933,7 @@ func (cfg SystemConfig) Start(t *testing.T, startOpts ...StartOption) (*System,
 		DataAvailabilityType:  sys.Cfg.DataAvailabilityType,
 		CompressionAlgo:       derive.Zlib,
 		AltDA:                 batcherAltDACLIConfig,
+		DaConfig:              celestia.CLIConfig{Rpc: "localhost:26650"},
 	}
 
 	// Apply batcher cli modifications
diff --git a/op-node/flags/flags.go b/op-node/flags/flags.go
index dc02e0272092..000bfc3fd8e6 100644
--- a/op-node/flags/flags.go
+++ b/op-node/flags/flags.go
@@ -7,6 +7,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/engine"
 	"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
 	openum "github.com/ethereum-optimism/optimism/op-service/enum"
@@ -472,6 +473,7 @@ func init() {
 	optionalFlags = append(optionalFlags, DeprecatedFlags...)
 	optionalFlags = append(optionalFlags, opflags.CLIFlags(EnvVarPrefix, RollupCategory)...)
 	optionalFlags = append(optionalFlags, altda.CLIFlags(EnvVarPrefix, AltDACategory)...)
+	optionalFlags = append(optionalFlags, celestia.CLIFlags(EnvVarPrefix)...)
 	Flags = append(requiredFlags, optionalFlags...)
 }
 
diff --git a/op-node/node/config.go b/op-node/node/config.go
index 5cbb5b9de166..f4435d962beb 100644
--- a/op-node/node/config.go
+++ b/op-node/node/config.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/flags"
 	"github.com/ethereum-optimism/optimism/op-node/p2p"
 	"github.com/ethereum-optimism/optimism/op-node/rollup"
@@ -76,6 +77,8 @@ type Config struct {
 
 	// AltDA config
 	AltDA altda.CLIConfig
+
+	DaConfig celestia.CLIConfig
 }
 
 // ConductorRPCFunc retrieves the endpoint. The RPC may not immediately be available.
@@ -182,6 +185,9 @@ func (cfg *Config) Check() error {
 	if cfg.AltDA.Enabled {
 		log.Warn("Alt-DA Mode is a Beta feature of the MIT licensed OP Stack.  While it has received initial review from core contributors, it is still undergoing testing, and may have bugs or other issues.")
 	}
+	if err := cfg.DaConfig.Check(); err != nil {
+		return fmt.Errorf("da config error: %w", err)
+	}
 	return nil
 }
 
diff --git a/op-node/node/node.go b/op-node/node/node.go
index 70558dda5684..e93d55564bcc 100644
--- a/op-node/node/node.go
+++ b/op-node/node/node.go
@@ -143,6 +143,9 @@ func (n *OpNode) init(ctx context.Context, cfg *Config) error {
 	if err := n.initL2(ctx, cfg); err != nil {
 		return fmt.Errorf("failed to init L2: %w", err)
 	}
+	if err := n.initDA(ctx, cfg); err != nil {
+		return fmt.Errorf("failed to init da: %w", err)
+	}
 	if err := n.initRuntimeConfig(ctx, cfg); err != nil { // depends on L2, to signal initial runtime values to
 		return fmt.Errorf("failed to init the runtime config: %w", err)
 	}
@@ -382,6 +385,10 @@ func (n *OpNode) initL1BeaconAPI(ctx context.Context, cfg *Config) error {
 	}
 }
 
+func (n *OpNode) initDA(ctx context.Context, cfg *Config) error {
+	return driver.SetDAClient(cfg.DaConfig)
+}
+
 func (n *OpNode) initL2(ctx context.Context, cfg *Config) error {
 	rpcClient, rpcCfg, err := cfg.L2.Setup(ctx, n.log, &cfg.Rollup)
 	if err != nil {
diff --git a/op-node/rollup/derive/blob_data_source.go b/op-node/rollup/derive/blob_data_source.go
index 2c4626941b8b..95e7248464dd 100644
--- a/op-node/rollup/derive/blob_data_source.go
+++ b/op-node/rollup/derive/blob_data_source.go
@@ -86,7 +86,10 @@ func (ds *BlobDataSource) open(ctx context.Context) ([]blobOrCalldata, error) {
 		return nil, NewTemporaryError(fmt.Errorf("failed to open blob data source: %w", err))
 	}
 
-	data, hashes := dataAndHashesFromTxs(txs, &ds.dsCfg, ds.batcherAddr, ds.log)
+	data, hashes, err := dataAndHashesFromTxs(txs, &ds.dsCfg, ds.batcherAddr, ds.log)
+	if err != nil {
+		return nil, err
+	}
 
 	if len(hashes) == 0 {
 		// there are no blobs to fetch so we can return immediately
@@ -115,11 +118,12 @@ func (ds *BlobDataSource) open(ctx context.Context) ([]blobOrCalldata, error) {
 // dataAndHashesFromTxs extracts calldata and datahashes from the input transactions and returns them. It
 // creates a placeholder blobOrCalldata element for each returned blob hash that must be populated
 // by fillBlobPointers after blob bodies are retrieved.
-func dataAndHashesFromTxs(txs types.Transactions, config *DataSourceConfig, batcherAddr common.Address, logger log.Logger) ([]blobOrCalldata, []eth.IndexedBlobHash) {
+func dataAndHashesFromTxs(txs types.Transactions, config *DataSourceConfig, batcherAddr common.Address, logger log.Logger) ([]blobOrCalldata, []eth.IndexedBlobHash, error) {
 	data := []blobOrCalldata{}
 	var hashes []eth.IndexedBlobHash
 	blobIndex := 0 // index of each blob in the block's blob sidecar
 	for _, tx := range txs {
+		logger := log.New("tx", tx.Hash())
 		// skip any non-batcher transactions
 		if !isValidBatchTx(tx, config.l1Signer, config.batchInboxAddress, batcherAddr, logger) {
 			blobIndex += len(tx.BlobHashes())
@@ -127,8 +131,15 @@ func dataAndHashesFromTxs(txs types.Transactions, config *DataSourceConfig, batc
 		}
 		// handle non-blob batcher transactions by extracting their calldata
 		if tx.Type() != types.BlobTxType {
-			calldata := eth.Data(tx.Data())
-			data = append(data, blobOrCalldata{nil, &calldata})
+			calldata, err := DataFromEVMTransactions(*config, batcherAddr, types.Transactions{tx}, logger)
+			if err != nil {
+				return nil, nil, err
+			}
+			if len(calldata) == 0 {
+				log.Warn("celestia: skipping empty calldata")
+				continue
+			}
+			data = append(data, blobOrCalldata{nil, &calldata[0]})
 			continue
 		}
 		// handle blob batcher transactions by extracting their blob hashes, ignoring any calldata.
@@ -145,7 +156,7 @@ func dataAndHashesFromTxs(txs types.Transactions, config *DataSourceConfig, batc
 			blobIndex += 1
 		}
 	}
-	return data, hashes
+	return data, hashes, nil
 }
 
 // fillBlobPointers goes back through the data array and fills in the pointers to the fetched blob
diff --git a/op-node/rollup/derive/blob_data_source_test.go b/op-node/rollup/derive/blob_data_source_test.go
index e5e31dc957b9..885fbdf0684d 100644
--- a/op-node/rollup/derive/blob_data_source_test.go
+++ b/op-node/rollup/derive/blob_data_source_test.go
@@ -45,7 +45,8 @@ func TestDataAndHashesFromTxs(t *testing.T) {
 	}
 	calldataTx, _ := types.SignNewTx(privateKey, signer, txData)
 	txs := types.Transactions{calldataTx}
-	data, blobHashes := dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	data, blobHashes, err := dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	require.NoError(t, err)
 	require.Equal(t, 1, len(data))
 	require.Equal(t, 0, len(blobHashes))
 
@@ -60,14 +61,16 @@ func TestDataAndHashesFromTxs(t *testing.T) {
 	}
 	blobTx, _ := types.SignNewTx(privateKey, signer, blobTxData)
 	txs = types.Transactions{blobTx}
-	data, blobHashes = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	data, blobHashes, err = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	require.NoError(t, err)
 	require.Equal(t, 1, len(data))
 	require.Equal(t, 1, len(blobHashes))
 	require.Nil(t, data[0].calldata)
 
 	// try again with both the blob & calldata transactions and make sure both are picked up
 	txs = types.Transactions{blobTx, calldataTx}
-	data, blobHashes = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	data, blobHashes, err = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	require.NoError(t, err)
 	require.Equal(t, 2, len(data))
 	require.Equal(t, 1, len(blobHashes))
 	require.NotNil(t, data[1].calldata)
@@ -75,7 +78,8 @@ func TestDataAndHashesFromTxs(t *testing.T) {
 	// make sure blob tx to the batch inbox is ignored if not signed by the batcher
 	blobTx, _ = types.SignNewTx(testutils.RandomKey(), signer, blobTxData)
 	txs = types.Transactions{blobTx}
-	data, blobHashes = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	data, blobHashes, err = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	require.NoError(t, err)
 	require.Equal(t, 0, len(data))
 	require.Equal(t, 0, len(blobHashes))
 
@@ -84,7 +88,8 @@ func TestDataAndHashesFromTxs(t *testing.T) {
 	blobTxData.To = testutils.RandomAddress(rng)
 	blobTx, _ = types.SignNewTx(privateKey, signer, blobTxData)
 	txs = types.Transactions{blobTx}
-	data, blobHashes = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	data, blobHashes, err = dataAndHashesFromTxs(txs, &config, batcherAddr, logger)
+	require.NoError(t, err)
 	require.Equal(t, 0, len(data))
 	require.Equal(t, 0, len(blobHashes))
 }
diff --git a/op-node/rollup/derive/calldata_source.go b/op-node/rollup/derive/calldata_source.go
index 0e8147261e93..ab95b06d54a8 100644
--- a/op-node/rollup/derive/calldata_source.go
+++ b/op-node/rollup/derive/calldata_source.go
@@ -2,6 +2,7 @@ package derive
 
 import (
 	"context"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
@@ -11,9 +12,20 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
+var daClient *celestia.DAClient
+
+func SetDAClient(c *celestia.DAClient) error {
+	if daClient != nil {
+		return errors.New("da client already configured")
+	}
+	daClient = c
+	return nil
+}
+
 // CalldataSource is a fault tolerant approach to fetching data.
 // The constructor will never fail & it will instead re-attempt the fetcher
 // at a later point.
@@ -32,7 +44,7 @@ type CalldataSource struct {
 
 // NewCalldataSource creates a new calldata source. It suppresses errors in fetching the L1 block if they occur.
 // If there is an error, it will attempt to fetch the result on the next call to `Next`.
-func NewCalldataSource(ctx context.Context, log log.Logger, dsCfg DataSourceConfig, fetcher L1TransactionFetcher, ref eth.L1BlockRef, batcherAddr common.Address) DataIter {
+func NewCalldataSource(ctx context.Context, log log.Logger, dsCfg DataSourceConfig, fetcher L1TransactionFetcher, ref eth.L1BlockRef, batcherAddr common.Address) (DataIter, error) {
 	_, txs, err := fetcher.InfoAndTxsByHash(ctx, ref.Hash)
 	if err != nil {
 		return &CalldataSource{
@@ -42,12 +54,23 @@ func NewCalldataSource(ctx context.Context, log log.Logger, dsCfg DataSourceConf
 			fetcher:     fetcher,
 			log:         log,
 			batcherAddr: batcherAddr,
-		}
+		}, nil
+	}
+	data, err := DataFromEVMTransactions(dsCfg, batcherAddr, txs, log.New("origin", ref))
+	if err != nil {
+		return &CalldataSource{
+			open:        false,
+			ref:         ref,
+			dsCfg:       dsCfg,
+			fetcher:     fetcher,
+			log:         log,
+			batcherAddr: batcherAddr,
+		}, err
 	}
 	return &CalldataSource{
 		open: true,
-		data: DataFromEVMTransactions(dsCfg, batcherAddr, txs, log.New("origin", ref)),
-	}
+		data: data,
+	}, nil
 }
 
 // Next returns the next piece of data if it has it. If the constructor failed, this
@@ -57,7 +80,11 @@ func (ds *CalldataSource) Next(ctx context.Context) (eth.Data, error) {
 	if !ds.open {
 		if _, txs, err := ds.fetcher.InfoAndTxsByHash(ctx, ds.ref.Hash); err == nil {
 			ds.open = true
-			ds.data = DataFromEVMTransactions(ds.dsCfg, ds.batcherAddr, txs, ds.log)
+			ds.data, err = DataFromEVMTransactions(ds.dsCfg, ds.batcherAddr, txs, ds.log)
+			if err != nil {
+				// already wrapped
+				return nil, err
+			}
 		} else if errors.Is(err, ethereum.NotFound) {
 			return nil, NewResetError(fmt.Errorf("failed to open calldata source: %w", err))
 		} else {
@@ -76,12 +103,38 @@ func (ds *CalldataSource) Next(ctx context.Context) (eth.Data, error) {
 // DataFromEVMTransactions filters all of the transactions and returns the calldata from transactions
 // that are sent to the batch inbox address from the batch sender address.
 // This will return an empty array if no valid transactions are found.
-func DataFromEVMTransactions(dsCfg DataSourceConfig, batcherAddr common.Address, txs types.Transactions, log log.Logger) []eth.Data {
+func DataFromEVMTransactions(dsCfg DataSourceConfig, batcherAddr common.Address, txs types.Transactions, log log.Logger) ([]eth.Data, error) {
 	out := []eth.Data{}
 	for _, tx := range txs {
 		if isValidBatchTx(tx, dsCfg.l1Signer, dsCfg.batchInboxAddress, batcherAddr, log) {
-			out = append(out, tx.Data())
+			data := tx.Data()
+			switch len(data) {
+			case 0:
+				out = append(out, data)
+			default:
+				switch data[0] {
+				case celestia.DerivationVersionCelestia:
+					log.Info("celestia: blob request", "id", hex.EncodeToString(tx.Data()))
+					ctx, cancel := context.WithTimeout(context.Background(), daClient.GetTimeout)
+					blobs, err := daClient.Client.Get(ctx, [][]byte{data[1:]}, daClient.Namespace)
+					cancel()
+					if err != nil {
+						return nil, NewResetError(fmt.Errorf("celestia: failed to resolve frame: %w", err))
+					}
+					if len(blobs) != 1 {
+						log.Warn("celestia: unexpected length for blobs", "expected", 1, "got", len(blobs))
+						if len(blobs) == 0 {
+							log.Warn("celestia: skipping empty blobs")
+							continue
+						}
+					}
+					out = append(out, blobs[0])
+				default:
+					out = append(out, data)
+					log.Info("celestia: using eth fallback")
+				}
+			}
 		}
 	}
-	return out
+	return out, nil
 }
diff --git a/op-node/rollup/derive/calldata_source_test.go b/op-node/rollup/derive/calldata_source_test.go
index 01b2616cca3f..7dc17c6aa19f 100644
--- a/op-node/rollup/derive/calldata_source_test.go
+++ b/op-node/rollup/derive/calldata_source_test.go
@@ -121,8 +121,10 @@ func TestDataFromEVMTransactions(t *testing.T) {
 			}
 		}
 
-		out := DataFromEVMTransactions(DataSourceConfig{cfg.L1Signer(), cfg.BatchInboxAddress, false}, batcherAddr, txs, testlog.Logger(t, log.LevelCrit))
+		out, err := DataFromEVMTransactions(DataSourceConfig{cfg.L1Signer(), cfg.BatchInboxAddress, false}, batcherAddr, txs, testlog.Logger(t, log.LevelCrit))
+		require.NoError(t, err)
 		require.ElementsMatch(t, expectedData, out)
+		require.NoError(t, err)
 	}
 
 }
diff --git a/op-node/rollup/derive/data_source.go b/op-node/rollup/derive/data_source.go
index 8d064a7cdb8c..50f71467f232 100644
--- a/op-node/rollup/derive/data_source.go
+++ b/op-node/rollup/derive/data_source.go
@@ -68,13 +68,17 @@ func (ds *DataSourceFactory) OpenData(ctx context.Context, ref eth.L1BlockRef, b
 	// Creates a data iterator from blob or calldata source so we can forward it to the altDA source
 	// if enabled as it still requires an L1 data source for fetching input commmitments.
 	var src DataIter
+	var err error
 	if ds.ecotoneTime != nil && ref.Time >= *ds.ecotoneTime {
 		if ds.blobsFetcher == nil {
 			return nil, fmt.Errorf("ecotone upgrade active but beacon endpoint not configured")
 		}
 		src = NewBlobDataSource(ctx, ds.log, ds.dsCfg, ds.fetcher, ds.blobsFetcher, ref, batcherAddr)
 	} else {
-		src = NewCalldataSource(ctx, ds.log, ds.dsCfg, ds.fetcher, ref, batcherAddr)
+		src, err = NewCalldataSource(ctx, ds.log, ds.dsCfg, ds.fetcher, ref, batcherAddr)
+		if err != nil {
+			return src, err
+		}
 	}
 	if ds.dsCfg.altDAEnabled {
 		// altDA([calldata | blobdata](l1Ref)) -> data
diff --git a/op-node/rollup/driver/da.go b/op-node/rollup/driver/da.go
new file mode 100644
index 000000000000..6fa2cd750456
--- /dev/null
+++ b/op-node/rollup/driver/da.go
@@ -0,0 +1,25 @@
+package driver
+
+import (
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
+	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
+)
+
+func SetDAClient(cfg celestia.CLIConfig) error {
+	// NOTE: we always read using blob_data_source.go
+	// If the transaction has calldata, based on the prefix byte.
+	//     - If the prefix byte is 0xce
+	//         - We interpret the calldata as a celestia reference and fetch
+	//           the data from celestia.
+	//     - Otherwise, we use the calldata fallback mode.
+	// If the transaction has blobs, we use blobdata fallback mode.
+	// See dataAndHashesFromTxs and DataFromEVMTransactions
+	// The read path always operates in the most permissive mode and is
+	// independent of the fallback mode.
+	// Therefore the configuration value for FallbackMode passed here does not matter.
+	client, err := celestia.NewDAClient(cfg.Rpc, cfg.AuthToken, cfg.Namespace, cfg.FallbackMode, cfg.GasPrice)
+	if err != nil {
+		return err
+	}
+	return derive.SetDAClient(client)
+}
diff --git a/op-node/service.go b/op-node/service.go
index d3e9c29b3c6b..ca85dc96d38a 100644
--- a/op-node/service.go
+++ b/op-node/service.go
@@ -13,6 +13,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	altda "github.com/ethereum-optimism/optimism/op-alt-da"
+	celestia "github.com/ethereum-optimism/optimism/op-celestia"
 	"github.com/ethereum-optimism/optimism/op-node/chaincfg"
 	"github.com/ethereum-optimism/optimism/op-node/flags"
 	"github.com/ethereum-optimism/optimism/op-node/node"
@@ -114,7 +115,8 @@ func NewConfig(ctx *cli.Context, log log.Logger) (*node.Config, error) {
 		},
 		ConductorRpcTimeout: ctx.Duration(flags.ConductorRpcTimeoutFlag.Name),
 
-		AltDA: altda.ReadCLIConfig(ctx),
+		AltDA:    altda.ReadCLIConfig(ctx),
+		DaConfig: celestia.ReadCLIConfig(ctx),
 	}
 
 	if err := cfg.LoadPersisted(log); err != nil {
diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml
index adcaea8f4d1b..c1902e972734 100644
--- a/ops-bedrock/docker-compose.yml
+++ b/ops-bedrock/docker-compose.yml
@@ -14,6 +14,16 @@ volumes:
 
 
 services:
+  da:
+    image: ghcr.io/rollkit/local-celestia-devnet:v0.13.1
+    ports:
+      - "26658:26658"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:26659/header/1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
   l1:
     build:
@@ -94,6 +104,7 @@ services:
       - l1-bn
       - l1-vc
       - l2
+      - da
     build:
       context: ../
       dockerfile: ops/docker/op-stack-go/Dockerfile
@@ -102,9 +113,7 @@ services:
     command: >
       op-node
       --l1=ws://l1:8546
-      --l1.beacon=http://l1-bn:5052
-      --l1.epoch-poll-interval=12s
-      --l1.http-poll-interval=6s
+      --l1.beacon.ignore
       --l2=http://l2:8551
       --l2.jwt-secret=/config/jwt-secret.txt
       --sequencer.enabled
@@ -129,6 +138,10 @@ services:
       --altda.enabled=${ALTDA_ENABLED}
       --altda.da-service=${ALTDA_SERVICE}
       --altda.da-server=http://da-server:3100
+    environment:
+      OP_NODE_DA_RPC: "http://da:26658"
+      OP_NODE_DA_AUTH_TOKEN: "${CELESTIA_NODE_AUTH_TOKEN}"
+      OP_NODE_DA_NAMESPACE: "00000000000000000000000000000000000000000008e5f679bf7116cb"
     ports:
       - "7545:8545"
       - "9003:9003"
@@ -177,6 +190,7 @@ services:
       - l1
       - l2
       - op-node
+      - da
     build:
       context: ../
       dockerfile: ops/docker/op-stack-go/Dockerfile
@@ -190,7 +204,8 @@ services:
       OP_BATCHER_L1_ETH_RPC: http://l1:8545
       OP_BATCHER_L2_ETH_RPC: http://l2:8545
       OP_BATCHER_ROLLUP_RPC: http://op-node:8545
-      OP_BATCHER_MAX_CHANNEL_DURATION: 2
+      OFFLINE_GAS_ESTIMATION: null
+      OP_BATCHER_MAX_CHANNEL_DURATION: 1
       OP_BATCHER_SUB_SAFETY_MARGIN: 4 # SWS is 15, ChannelTimeout is 40
       OP_BATCHER_POLL_INTERVAL: 1s
       OP_BATCHER_NUM_CONFIRMATIONS: 1
@@ -203,7 +218,9 @@ services:
       OP_BATCHER_ALTDA_ENABLED: "${ALTDA_ENABLED}"
       OP_BATCHER_ALTDA_DA_SERVICE: "${ALTDA_SERVICE}"
       OP_BATCHER_ALTDA_DA_SERVER: "http://da-server:3100"
-      OP_BATCHER_DATA_AVAILABILITY_TYPE: "${DA_TYPE}"
+      OP_BATCHER_DA_RPC: "http://da:26658"
+      OP_BATCHER_DA_AUTH_TOKEN: "${CELESTIA_NODE_AUTH_TOKEN}"
+      OP_BATCHER_DA_NAMESPACE: "00000000000000000000000000000000000000000008e5f679bf7116cb"
 
   op-challenger:
     depends_on:
diff --git a/ops/docker/op-stack-go/Dockerfile.dockerignore b/ops/docker/op-stack-go/Dockerfile.dockerignore
index 847bbbb0eb75..91d9d581d6ef 100644
--- a/ops/docker/op-stack-go/Dockerfile.dockerignore
+++ b/ops/docker/op-stack-go/Dockerfile.dockerignore
@@ -4,6 +4,8 @@
 
 !/cannon
 !/op-batcher
+!/op-bootnode
+!/op-celestia
 !/op-chain-ops
 !/op-deployer
 !/op-challenger

From a5ae9f56cbd8545a3a458a85a1d36b2d62751c15 Mon Sep 17 00:00:00 2001
From: Diego <diegoferrersan@gmail.com>
Date: Sun, 5 Jan 2025 11:23:04 +0100
Subject: [PATCH 450/451] Update go.mod

---
 go.mod | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go.mod b/go.mod
index c34e55b5f460..66c9f07abc22 100644
--- a/go.mod
+++ b/go.mod
@@ -116,7 +116,6 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
 	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
 	github.com/google/uuid v1.6.0 // indirect

From 36349d14e93f06cab5116b5ea36613854f7b4a0a Mon Sep 17 00:00:00 2001
From: Diego <diegoferrersan@gmail.com>
Date: Sun, 5 Jan 2025 13:55:56 +0100
Subject: [PATCH 451/451] specify `KONA_VERSION`

---
 ops/docker/op-stack-go/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ops/docker/op-stack-go/Dockerfile b/ops/docker/op-stack-go/Dockerfile
index b6fb3f45c90b..e59de81f12d8 100644
--- a/ops/docker/op-stack-go/Dockerfile
+++ b/ops/docker/op-stack-go/Dockerfile
@@ -14,7 +14,7 @@ ARG UBUNTU_TARGET_BASE_IMAGE=ubuntu:22.04
 
 # The version of kona to use.
 # The only build that uses this is `op-challenger-target`.
-ARG KONA_VERSION=none
+ARG KONA_VERSION=kona-client-v0.1.0-beta.5
 
 # We may be cross-building for another platform. Specify which platform we need as builder.
 FROM --platform=$BUILDPLATFORM golang:1.22.7-alpine3.20 AS builder
@@ -23,12 +23,12 @@ RUN apk add --no-cache curl tar gzip make gcc musl-dev linux-headers git jq bash
 
 # install yq
 RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq && \
-    chmod +x /usr/local/bin/yq
+  chmod +x /usr/local/bin/yq
 
 # install versioned toolchain
 COPY ./mise.toml .
 RUN curl -L https://github.com/casey/just/releases/download/$(yq '.tools.just' mise.toml)/just-$(yq '.tools.just' mise.toml)-x86_64-unknown-linux-musl.tar.gz | \
-    tar xz -C /usr/local/bin just
+  tar xz -C /usr/local/bin just
 
 # We copy the go.mod/sum first, so the `go mod download` does not have to re-run if dependencies do not change.
 COPY ./go.mod /app/go.mod